gjy 3 år sedan
förälder
incheckning
b4b67bcbc2

+ 4 - 1
src/api/V2/purchasingManagement/index.js

@@ -29,4 +29,7 @@ export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'
 // 测试
 export const API_POST_SUBMIT = '/purchaseOrder/api/submitPurchaseOrder'
 // 审核通过不通过接口
-export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+// export const API_POST_WORKFLOW_API_HANDLE ='/newWorkflow/api/handle'
+// 审核接口调用之后
+export const API_POST_QUERY_WORKFLOWINFO ='/newWorkflow/query/workflowInfo'

+ 2 - 1
src/api/V2/taskspost/index.js

@@ -19,7 +19,8 @@ export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 // 运输任务-编辑
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
 // 审核通过不通过接口
-export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+// export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+export const API_POST_WORKFLOW_API_HANDLE ='/newWorkflow/api/handle'
 // 审核编辑
 export const API_POST_INOUTWAREHOUSETASK = `/inOutWarehouseTask/api/checkOrUpdateInOutTask`
 // 出入库任务-新增(编辑)

+ 4 - 1
src/model/purchasingManagement/index.js

@@ -16,7 +16,8 @@ import {
     API_POST_DELETEPURCHASE,
     API_GET_PRICE_PURCHASE,
     API_POST_SUBMIT,
-    API_POST_WORKFLOW_API_HANDLE
+    API_POST_WORKFLOW_API_HANDLE,
+    API_POST_QUERY_WORKFLOWINFO
 } from '@/api/V2/purchasingManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
 //采购详情列表
@@ -51,3 +52,5 @@ export const getTransactionPriceList = appRx.get(API_GET_PRICE_PURCHASE, errorCa
 export const postsubmit = appRx.post(API_POST_SUBMIT, errorCatcher,errorHandle,filter)
 // 审核通过不通过
 export const posthandle = appRx.post(API_POST_WORKFLOW_API_HANDLE, errorCatcher,errorHandle,filter)
+// 审核之后调用
+export const postqueryhandle = appRx.post(API_POST_QUERY_WORKFLOWINFO, errorCatcher,errorHandle,filter)

+ 6 - 1
src/views/houseSelfCollect/paymentManagement.vue

@@ -335,7 +335,8 @@
     settlementEdit
   } from '@/model/houseSelfCollect/index'
   import {
-    posthandle
+    posthandle,
+    postqueryhandle
   } from '@/model/purchasingManagement/index'
   import paymentPrint from './component/paymentPrint.vue'
   import {
@@ -364,6 +365,7 @@
         customerlist: {
           payeeAddressUrls: [],
         },
+        
         ruleForm: {
           type: [
             '打印身份证(正反面)',
@@ -1235,6 +1237,8 @@
               })
               .toPromise()
               .then((response) => {
+                // postqueryhandle({workflowId:item.workflowId}).toPromise()
+                // .then((response) => {
                 this.audit(
                   this.modification[index + 1],
                   index + 1,
@@ -1242,6 +1246,7 @@
                   status2,
                   reason
                 )
+              // })
               })
               .catch((req) => {
                 this.$message.warning(req.message)

+ 5 - 1
src/views/warehouse/warehouseManagementList.vue

@@ -45,7 +45,7 @@
       </template>
     </BaseHeaderLayout>
     <div v-show="this.warehouseType == '1'" class="main_css">
-      <el-table show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList"
+      <el-table ref='table' show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList"
         style="width: 100%; margin-top: 20px" height="calc(100% - 45px)">
         <el-table-column prop="warehouseName" label="仓库名">
         </el-table-column>
@@ -914,6 +914,10 @@
 
             }
             this.warehouseList = response
+            this.$nextTick(() => {
+                this.$refs.table.doLayout();
+                // el-table加ref="multipleTable"
+            });
           })
         getsponsible({
             compId: localStorage.getItem('ws-pf_compId')