Merge branch 'jinfa-20221102' into 'jinfa-20221102'

src/pages/transaction/purchaseRequisition/index.tsx

@@ -29,7 +29,7 @@ export interface RequestBillProps { }
 
 const fetchTableData = (parmas) => {
   return new Promise(reolve => {
-    getPurchaseRequisitionPage({...parmas}).then(res => {
+    getPurchaseRequisitionPage({ ...parmas }).then(res => {
       reolve(res.data)
     })
   })
@@ -52,6 +52,7 @@ const RequestBill: React.FC<RequestBillProps> = () => {
   const { run: runPause, loading: loadingEnd } = useHttpRequest(
     postPurchaseRequisitionPause,
   );
+  const { run: runRevoke, loading: loadingRevoke } = useHttpRequest(postPurchaseRequisitionRevokeProcess);
   const fetchParams = useRef<any>({});
 
   // const loadingTableData = params => {
@@ -86,7 +87,7 @@ const RequestBill: React.FC<RequestBillProps> = () => {
   };
   const handleSubmitcehui = () => {
     cehuiActions.submit().then(async ({ values }: any) => {
-      const result = await postPurchaseRequisitionRevokeProcess({ ...values, id: curentId });
+      const result = await runRevoke({ ...values, id: curentId });
       if (result.code === 1000) {
         cehuiRef.current.setVisible(false);
         setTimeout(() => {
@@ -107,8 +108,8 @@ const RequestBill: React.FC<RequestBillProps> = () => {
     setCurrentId(r.id);
     // pauseActions.setFieldValue('id', r.id)
   };
-  const handleOprate = (record,type)=>{
-    switch(type) {
+  const handleOprate = (record, type) => {
+    switch (type) {
       case 1:
         cehuiRef.current.setVisible(true);
         setCurrentId(record.id);
@@ -117,8 +118,8 @@ const RequestBill: React.FC<RequestBillProps> = () => {
         history.push(`/memberCenter/procurementAbility/purchaseRequisition/readyAddBill/edit?id=${record.id}&changeFlag=1`)
         break;
       case 3:
-        postPurchaseRequisitionToVoid({id:record.id}).then(res=>{
-          if(res.code===1000) ref.current.reloadCurrent()
+        postPurchaseRequisitionToVoid({ id: record.id }).then(res => {
+          if (res.code === 1000) ref.current.reloadCurrent()
         })
 
         break
@@ -138,23 +139,23 @@ const RequestBill: React.FC<RequestBillProps> = () => {
       [intl.formatMessage({
         id: 'purchaseRequisition.quxiaodingdan',
         defaultMessage: '取消订单',
-      })]: record.revokeProcessFlag===3,
+      })]: record.revokeProcessFlag === 3,
       [intl.formatMessage({
         id: 'purchaseRequisition.zhongzhi',
         defaultMessage: '中止',
-      })]: record.revokeProcessFlag===2,
+      })]: record.revokeProcessFlag === 2,
       [intl.formatMessage({
         id: 'purchaseRequisition.cehui',
         defaultMessage: '撤回审核',
-      })]: record.revokeProcessFlag===1,
+      })]: record.revokeProcessFlag === 1,
       [intl.formatMessage({
         id: 'purchaseRequisition.biangeng',
         defaultMessage: '变更',
-      })]: record.innerStatus=== 1001,
+      })]: record.innerStatus === 1001,
       [intl.formatMessage({
         id: 'purchaseRequisition.zuofei',
         defaultMessage: '作废',
-      })]:  record.innerStatus=== 1001,
+      })]: record.innerStatus === 1001,
     }
 
     const operationHandler = {
@@ -169,15 +170,15 @@ const RequestBill: React.FC<RequestBillProps> = () => {
       [intl.formatMessage({
         id: 'purchaseRequisition.cehui',
         defaultMessage: '撤回审核',
-      })]: () => handleOprate(record,1),
+      })]: () => handleOprate(record, 1),
       [intl.formatMessage({
         id: 'purchaseRequisition.biangeng',
         defaultMessage: '变更',
-      })]: () => handleOprate(record,2),
+      })]: () => handleOprate(record, 2),
       [intl.formatMessage({
         id: 'purchaseRequisition.zuofei',
         defaultMessage: '作废',
-      })]: () => handleOprate(record,3),
+      })]: () => handleOprate(record, 3),
     };
 
     return (
@@ -426,7 +427,7 @@ const RequestBill: React.FC<RequestBillProps> = () => {
             },
           },
         }}
-        modalProps={{ confirmLoading: loadingEnd }}
+        modalProps={{ confirmLoading: loadingRevoke }}
       />
     </PageHeaderWrapper>
   );