Merge branch '20220505-公告公示附件大小和数量' into 'release_20220617'

6.17 公告公示附件大小和数量 See merge request eshop/fe_service_ebtp_frontend!121
2022-06-17 21:19:37 +08:00
parent eee1cf6d73 d6be967de7
commit 9741ad9df9
9 changed files with 45 additions and 45 deletions
--- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/components/BiddingAnnouncement.tsx
+++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/components/BiddingAnnouncement.tsx
@ -519,7 +519,7 @@ const BiddingAnnouncement: React.FC<BiddingAnnouncementProps> = (props) => {
              name="attDatasetId"
              extra="单个附件最大30MB"
            >
-              {UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} bid={UploadID} /> : null}
+              {UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} maxCount={3} bid={UploadID} /> : null}
            </Form.Item>
            {/* 发布媒体 */}
            <Medias
--- a/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/components/BiddingAnnouncement4Change.tsx
+++ b/src/pages/ZZhaoMu/Bid/BiddingAnnouncement/components/BiddingAnnouncement4Change.tsx
@ -477,7 +477,7 @@ const BiddingAnnouncement: React.FC<BiddingAnnouncementProps> = (props) => {
              name="attDatasetId"
              extra="单个附件最大30MB"
            >
-              {UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} bid={UploadID} /> : null}
+              {UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} maxCount={3} bid={UploadID} /> : null}
            </Form.Item>

            <Collapse defaultActiveKey={["1", "2"]} ghost expandIcon={() => <BarsOutlined />}>
--- a/src/pages/ZZhaoMu/Calibration/BidPublicityResult/components/BidPublicityResults.tsx
+++ b/src/pages/ZZhaoMu/Calibration/BidPublicityResult/components/BidPublicityResults.tsx
@ -37,7 +37,7 @@ const layout = {
 var objDeepCopy = function (source: any) {
  var sourceCopy = source instanceof Array ? [] : {};
  for (var item in source) {
-      sourceCopy[item] = typeof source[item] === 'object' ? objDeepCopy(source[item]) : source[item];
+    sourceCopy[item] = typeof source[item] === 'object' ? objDeepCopy(source[item]) : source[item];
  }
  return sourceCopy;
 }
@ -83,18 +83,18 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
      dataIndex: 'rooms',
      render: (text: any, record: any) => {
        let defaultValue: any = []
-        record.rooms.map((item: any)=>{
-          if(item.select == 1){
-            defaultValue.push(record.bsId+'&'+item.assessRoomId+'-'+item.assessRoomSort)
+        record.rooms.map((item: any) => {
+          if (item.select == 1) {
+            defaultValue.push(record.bsId + '&' + item.assessRoomId + '-' + item.assessRoomSort)
          }
        })
        return (
          <>
-            <Checkbox.Group 
+            <Checkbox.Group
              disabled={editInformation}
              options={record.rooms}
-              value={defaultValue} 
-              onChange={(e) => { onCheckChange(e, record) }} 
+              value={defaultValue}
+              onChange={(e) => { onCheckChange(e, record) }}
            />
          </>
        )
@ -159,7 +159,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
              val.value = item.bsId + '&' + val.assessRoomId + '-' + val.assessRoomSort
              val.label = '轮次' + val.assessRoomSort
              val.select = 1
-              bags+=1
+              bags += 1
            })
          })
          setRoundsTotal(bags) // 轮次数量
@ -192,19 +192,19 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
        const data = res.data
        setBagsTotal(data?.sections.length) // 包数量
        let bags: any = 0
-        data?.sections.map((item: any)=>{
-          item.rooms.map((val: any)=>{
-            bags+=1
+        data?.sections.map((item: any) => {
+          item.rooms.map((val: any) => {
+            bags += 1
          })
        })
        setRoundsTotal(bags) // 轮次数量
-        editVal.map((item: any)=>{
-          data?.sections.map((val: any)=>{
-            if(item.bsId == val.bsId){
+        editVal.map((item: any) => {
+          data?.sections.map((val: any) => {
+            if (item.bsId == val.bsId) {
              item.bag = 1
-              item.rooms.map((val1: any)=>{
-                val.rooms.map((val2: any)=>{
-                  if(val1.assessRoomSort == val2.assessRoomSort){
+              item.rooms.map((val1: any) => {
+                val.rooms.map((val2: any) => {
+                  if (val1.assessRoomSort == val2.assessRoomSort) {
                    val1.select = 1
                  }
                })
@ -232,12 +232,12 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
  const roundsOk = () => { // 选中标段轮次确定
    let bags: any = 0
    let rounds: any = 0
-    columnsData.map((item: any)=>{
-      if(item.bag && item.bag == 1 && item.rooms.length > 0){
-        bags+=1
-        item.rooms.map((val: any)=>{
-          if(val.select == 1){
-            rounds+=1
+    columnsData.map((item: any) => {
+      if (item.bag && item.bag == 1 && item.rooms.length > 0) {
+        bags += 1
+        item.rooms.map((val: any) => {
+          if (val.select == 1) {
+            rounds += 1
          }
        })
      }
@ -245,10 +245,10 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
    setOldColumnsData(objDeepCopy(columnsData))
    setBagsTotal(bags)
    setRoundsTotal(rounds)
-    if(bags != 0 && rounds != 0){
-      form.setFieldsValue({"sectionIds": '已选'+bags+'个包，'+rounds+'轮'})
+    if (bags != 0 && rounds != 0) {
+      form.setFieldsValue({ "sectionIds": '已选' + bags + '个包，' + rounds + '轮' })
    } else {
-      form.setFieldsValue({"sectionIds": ''})
+      form.setFieldsValue({ "sectionIds": '' })
    }
    setRoundsVisible(false)
  }
@ -266,7 +266,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
    columnsData.map((item: any) => {
      if (item.bsId == record.bsId) {
        item.rooms.map((val1: any) => {
-          if(e.length > 0){
+          if (e.length > 0) {
            item.bag = 1
            val1.select = 0
            e.map((val: any) => {
@ -309,7 +309,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
        }
        setSping(true);
        creatNotice(type, fromData).then(res => {
-          if(res?.code == 4004 && res?.success == false) { //2021.9.7 zhoujianlong 新增和修改招募公示增加风控
+          if (res?.code == 4004 && res?.success == false) { //2021.9.7 zhoujianlong 新增和修改招募公示增加风控
            const data = res?.data?.result == undefined ? [] : res?.data?.result
            setRiskData(data)
            setRiskVisible(true)
@ -449,7 +449,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
                ]}
              >
                {
-                  bagsTotal > 0 ? <Input value={'已选'+bagsTotal+'个包，'+roundsTotal+'轮'} style={{ width: '70%' }} disabled /> : <Input style={{ width: '70%' }} disabled />
+                  bagsTotal > 0 ? <Input value={'已选' + bagsTotal + '个包，' + roundsTotal + '轮'} style={{ width: '70%' }} disabled /> : <Input style={{ width: '70%' }} disabled />
                }
                <Button type="primary" style={{ float: 'right' }} onClick={() => chooseRounds()}>选择</Button>
              </Form.Item>
@ -458,7 +458,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
                name="attDatasetId"
                extra="单个附件最大30MB"
              >
-                {UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} bid={UploadID} /> : null}
+                {UploadID != "empty" ? <ExtendUpload uploadProps={UploadProps} maxCount={3} bid={UploadID} /> : null}
              </Form.Item>
              {/* 发布媒体 */}
              <Medias
@ -474,7 +474,7 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
              <BraftText braftRef={braftRef} echo={echo} disabled={editInformation} />
            </Form>
            {/**风控组件 */}
-            {riskVisible && <RiskPrevention 
+            {riskVisible && <RiskPrevention
              modalVisible={riskVisible}
              onCancel={() => {
                setRiskVisible(false)
@ -497,10 +497,10 @@ const BidPublicityResults: React.FC<BiddingAnnouncementProps> = (props) => {
        style={{ maxHeight: modalHeight }}
        bodyStyle={{ maxHeight: modalHeight - 107, overflowY: 'auto' }}
        footer={[
-          editInformation ?  
-          <Button onClick={()=> setRoundsVisible(false)}>关闭</Button> :
-          <><Button onClick={chooseCancel}>取消</Button>, 
-          <Button onClick={roundsOk} type="primary">确定</Button></>
+          editInformation ?
+            <Button onClick={() => setRoundsVisible(false)}>关闭</Button> :
+            <><Button onClick={chooseCancel}>取消</Button>,
+              <Button onClick={roundsOk} type="primary">确定</Button></>
        ]}
        centered
        width={800}