修改bug

src/pages/contract/coordination/details/index.tsx

@@ -105,9 +105,11 @@ const Details = (props: any) => {
         if (basics.sourceId) {
           switch (basics.sourceType) {
             case 1: {
-              if (basics.turn && basics.sourceId) {
-                basicInfo.col2[1].url = `/memberCenter/procurementAbility/confirmOffer/offerInquire/preview?id=${basics.sourceId}&turn=${basics.turn}`
-              }
+              // memberCenter/procurementAbility/offter/offter/preview?id=1568&numberXJPJ63501
+              // if (basics.turn && basics.sourceId) {
+              basicInfo.col2[1].url = `/memberCenter/procurementAbility/offter/offter/preview?id=${basics.sourceId}&numberXJPJ63501=${basics.sourceNo}`
+              // basicInfo.col2[1].url = `/memberCenter/procurementAbility/confirmOffer/offerInquire/preview?id=${basics.sourceId}&turn=${basics.turn}`
+              // }
               break;
             };
             case 2: {

src/pages/contract/funds/addbill/add.tsx

@@ -51,28 +51,23 @@ const Add: React.FC<{}> = (props: any) => {
   ]
 
   const submit = async () => {
-    setLoading(true);
-    if (!Loading) {
-      const basicsVO = await currentBasic.current.get();
-      const detailList = await Object.keys(detailData.current).length != 0 ? await detailData.current.get() : [];
-      basicsVO.data.sourceType = sourceType ? sourceType : 3;
-      let data = {
-        basics: basicsVO.data,
-        detailList: detailList,
-      }
-      PublicApi.postContractApplyAmountSave(data).then(res => {
-        console.log(res);
-        if (res.code === 1000) {
-          history.push('/memberCenter/contract/funds/addbill')
-        }
-      }).finally(() => {
-      }).catch((err) => {
-        // resolve([]);
-      });
-      setTimeout(() => {
-        setLoading(false);
-      }, 2000)
+    const basicsVO = await currentBasic.current.get();
+    const detailList = await Object.keys(detailData.current).length != 0 ? await detailData.current.get() : [];
+    basicsVO.data.sourceType = sourceType ? sourceType : 3;
+    let data = {
+      basics: basicsVO.data,
+      detailList: detailList,
     }
+    PublicApi.postContractApplyAmountSave(data).then(res => {
+      console.log(res);
+      if (res.code === 1000) {
+        history.push('/memberCenter/contract/funds/addbill')
+      }
+    }).finally(() => {
+    }).catch((err) => {
+      // resolve([]);
+    });
+
 
   }
 

src/pages/contract/funds/addbill/components/info.tsx

@@ -92,7 +92,7 @@ const AddInfo = (props: any) => {
     },
     {
       title: '合同剩余金额',
-      dataIndex: 'totalAmount',
+      dataIndex: 'freeAmount',
       align: 'left',
       render: (text) =>
         <div>
@@ -299,7 +299,7 @@ const AddInfo = (props: any) => {
               },
             ]}
           >
-            <Input placeholder='请输入请款单摘要' onChange={(e) => onSetKey(e, 'applyAbstract')} />
+            <Input placeholder='请输入请款单摘要' onChange={(e) => onSetKey(e, 'applyAbstract')} maxLength={60} />
           </Form.Item>
           <Form.Item
             label="合同编号"

src/pages/contract/funds/editbill/components/table.tsx

@@ -198,10 +198,10 @@ const table = (props: any) => {
               id: item.id,
               applyAmount: item.applyAmount,
               orderId: item.orderId,
-              orderNO: item.applyNo,
+              orderNO: item.orderNO,
+              executeId: item.executeId ? item.executeId : '',
               isHasTax: item.isHasTax,
               taxRate: item.taxRate,
-              executeId: item.id ? item.id : '',
             }
           )
         })