feat: 合同更改

src/pages/contract/manage/add/components/FormList.tsx

@@ -51,7 +51,32 @@ const FormList = (props: any) => {
     }, []);
     console.log('testtttttttttt:',newArray)
 
+    let newData =   newArray.map((item: any, index: number) => {
+      let num = 0
+      let prpIdsList = item.prpIds.toString().split(',')
 
+      console.log('此项中判断后的prpIdsList',prpIdsList)
+      console.log('purchaseDatapurchaseData',purchaseData)
+
+      let startList = Object.keys(Row).length === 0 ? purchaseData : selectRow
+
+      startList.forEach(i=>{
+        if(prpIdsList?.length && prpIdsList.indexOf(i.prpId.toString()) > -1 ){
+          console.log('判断此项中有选中的：',i.productNo,i.num)
+          if(i.productNo ==item.productNo && i.prpId == prpIdsList[prpIdsList.indexOf(i.prpId.toString())]){
+            num = i.num + num
+          }
+        }
+      })
+
+      item.bidCount = num
+      item.rowId = index + 1
+      item.price = '';
+      item.materielId = item.id
+      console.log('循环的item',item)
+    })
+
+    console.log('最终的list：',newData,newArray)
 
     return newArray
   }
@@ -73,30 +98,9 @@ const FormList = (props: any) => {
       list = handlePurchaseData(list)
 
       console.log('处理后的  list-----------',list)
-      list.map((item: any, index: number) => {
-        
-
-        let num = 0
-        let prpIdsList = item.prpIds.toString().split(',')
-
-        console.log('此项中判断后的prpIdsList',prpIdsList)
-
-        purchaseData.forEach(i=>{
-          if(prpIdsList?.length && prpIdsList.indexOf(i.prpId.toString()) > -1 ){
-            console.log('判断此项中有选中的：',i.productNo,i.num)
-            if(i.productNo ==item.productNo && i.prpId == prpIdsList[prpIdsList.indexOf(i.prpId.toString())]){
-              num = i.num + num
-            }
-          }
-        })
-
-        item.bidCount = num
-        item.rowId = index + 1
-        item.price = '';
-        item.materielId = item.id
-      })
+      
 
-      setData(()=> list)
+      setData(list)
       setIsPurchaseModalVisible(false)
     }else{
       list.map((item: any, index: number) => {
@@ -161,6 +165,31 @@ const FormList = (props: any) => {
       current: '1',
       pageSize: '10',
     }
+    console.log('getlist 时 ',sourceType)
+    if(sourceType == 4){
+      let list = JSON.parse(sessionStorage.getItem('recordList'))
+      list =  list?.map((i:any)=>{
+        i.id = i.prpId
+        i.customerCategory ={
+          name : i.category || ''
+        }
+        i.brand = {
+          name: i.brand || ''
+        }
+        i.unitName = i.unit
+        i.type = i.spec
+        i.bidCount = i.quantity
+        i.num = i.quantity
+        i.prpIds = i.prpId
+        return i
+      })
+      setPurchaseData(list)
+
+      list = handlePurchaseData(list)
+      console.log('接收并处理后的list:',list)
+      setData(list)
+      return
+    }
     let fn;
     switch (sourceType) {
       case '1':
@@ -410,6 +439,7 @@ const FormList = (props: any) => {
           <Button
             type='link'
             onClick={()=> {
+              console.log('guanlian click:',record.productNo)
               setLookAssociatedproductNo(record.productNo)
               setAssociatedDocumentsVisible(true)
             }}
@@ -447,10 +477,15 @@ const FormList = (props: any) => {
   }, [Row])
 
   useEffect(()=>{
-    console.log('sourceTypesourceType更新，选择了',sourceType)
+    
     RowCtl.setSelectedRowKeys([]);
     RowCtl.setSelectRow([]);
-    setData([])
+    if(Object.keys(Row).length === 0 ){
+      console.log('sourceTypesourceType更新，选择了------------------',sourceType,Object.keys(Row))
+      
+      setData([])
+    }
+   
   },[sourceType])
 
   /* 回调出来的数据 */
@@ -547,7 +582,7 @@ const FormList = (props: any) => {
     console.log(expandedKeys)
   };
 
-  console.log('purchaseDatapurchaseDatapurchaseDatapurchaseData',dataList)
+  console.log('lookAssociatedproductNo:',lookAssociatedproductNo,'sourcetype:',sourceType,'最后展示的data：',dataList,'purchaseData:',purchaseData)
   return (
     <div className={styles.box}>
       {
@@ -599,7 +634,7 @@ const FormList = (props: any) => {
         <Table
           columns={purchasecolumns}
           rowKey="rowId"
-          dataSource={RowCtl.selectRow.filter((i)=> i.productNo == lookAssociatedproductNo)}
+          dataSource={(Object.keys(Row).length === 0 ? RowCtl.selectRow  : purchaseData).filter((i)=> i.productNo == lookAssociatedproductNo) }
           // expandable={{
           //   expandedRowRender: (record, index) => listItem(record, index),
           // }}

src/pages/contract/manage/add/components/Information.tsx

@@ -69,6 +69,7 @@ const Information = (props: any) => {
   /* 显示弹出 */
   const Choose = (sourceType?) => {
     clearModalParams()
+    console.log('choose type',sourceType)
     if (sourceType) {
       let Data = basicsVO;
       Data.sourceType = sourceType;
@@ -133,6 +134,8 @@ const Information = (props: any) => {
     attrValueForm.setFieldsValue(basicsVO)
     setfalg(Row.sourceNo ? true : false)
     setmanual(Row.partyBName ? true : false)
+    
+    sethandleChange(basicsVO.sourceType)
   }, [basicsVO])
 
   /**
@@ -152,7 +155,7 @@ const Information = (props: any) => {
       case '3':
         fn = getContractPurchaseViePricePageToBeCreate
         break;
-      case '4':
+      case '5':
         fn = postMemberManageLowerProviderPage
         break;
       default:
@@ -168,7 +171,8 @@ const Information = (props: any) => {
   }
   /* 确认选中 */
   const Confirm = () => {
-    if (basicsVO.sourceType == '4') {
+    console.log('change member confirm:',Change)
+    if (basicsVO.sourceType == '5') {
       setfalg(!falg)
       basicsVO.partyBName = RowCtl.selectRow[0].name;
       basicsVO.partyBMemberId = RowCtl.selectRow[0].memberId;
@@ -206,7 +210,6 @@ const Information = (props: any) => {
           partyBRoleId = selectRow.awardRoleId
           sourceNo = selectRow.viePriceNO
 
-
           break;
         default:
           break;
@@ -284,6 +287,9 @@ const Information = (props: any) => {
   const rangeConfig = {
     rules: [{ type: 'array' as const, required: true, message: intl.formatMessage({ id: 'contract.qingxuanzekaishihuozhejie' }) }],
   };
+
+  console.log('渲染前: change:',Change,'basicsVO.sourceType:',basicsVO.sourceType)
+
   return (
     <div className={style.revise_info}>
       <Form
@@ -387,7 +393,7 @@ const Information = (props: any) => {
             manual && basicsVO.sourceType != 4 ?
               <Input placeholder={intl.formatMessage({ id: 'contract.zuichang60gezifu30ge' })} disabled />
               :
-              <Search placeholder={intl.formatMessage({ id: 'contract.zuichang60gezifu30ge' })} readOnly enterButton={<div onClick={() => Choose('4')} ><LinkOutlined /> {intl.formatMessage({ id: 'contract.xuanze' })}</div>} />
+              <Search placeholder={intl.formatMessage({ id: 'contract.zuichang60gezifu30ge' })} readOnly enterButton={<div onClick={() => Choose('5')} ><LinkOutlined /> {intl.formatMessage({ id: 'contract.xuanze' })}</div>} />
           }
         </Form.Item>
 

src/pages/contract/manage/purchaseRequisition/index.tsx

@@ -128,8 +128,10 @@ const BiddingList = () => {
   }
   const Like = (record) => {
     console.log('record',record)
-    record.sourceId = record.inviteBidId;
-    record.sourceNo = record.requisitionNo;
+    record.sourceId = record.sourceId;
+    record.sourceNo = record.sourceNo;
+    record.requisitionNo = record.requisitionNo;
+
     record.totalAmount = record.amount;  
     record.partyBMemberId = record.vendorMemberId;
     record.partyBRoleId = record.vendorRoleId;
@@ -178,7 +180,24 @@ const BiddingList = () => {
 
   const handlePurchaseData = ()=>{
     let data = selectRow
-    console.log('')
+
+    let record = data[0]
+    console.log('record',record)
+    // record.sourceId = record.sourceId;
+    // record.sourceNo = record.sourceNo;
+    // record.requisitionNo = record.requisitionNo;
+
+    record.totalAmount = record.amount;
+    record.partyBMemberId = isAllEqual(selectRow) ? record.vendorMemberId : null;
+    record.partyBRoleId = isAllEqual(selectRow) ? record.vendorRoleId  : null;
+    record.partyBName = isAllEqual(selectRow) ? record.vendorMemberName  : null;
+    record.sourceType = "4";
+    console.log('更改后的record：',record)
+    sessionStorage.setItem('record', JSON.stringify(data[0]));
+
+    console.log('储藏值为：',data)
+    sessionStorage.setItem('recordList', JSON.stringify(data));
+    history.push(`/memberCenter/contract/manage/add/addList/contracAdd?contractId=${''}&sourceType=4`)
 
   }