前端

src/api/V2/houseSelfCollect/index.js

@@ -95,3 +95,5 @@ export const API_GAT_QRCODE = '/weighingManagement/generateQRCodeImage'
 export const API_GAT_GETQRCODE = '/weighingManagement/getQRcode'
 //车型
 export const API_GAT_INFO = '/commonSysParameter/getInfo'
+// 审核之后接口
+export const API_POST_WORKFLOW_TASK = `/newWorkflow/getTaskWebsocket`

src/api/V2/taskspost/index.js

@@ -21,6 +21,8 @@ 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 ='/newWorkflow/api/handle'
+// 审核之后接口
+export const API_POST_WORKFLOW_TASK = `/newWorkflow/query/taskCandidates`
 // 审核编辑
 export const API_POST_INOUTWAREHOUSETASK = `/inOutWarehouseTask/api/checkOrUpdateInOutTask`
 // 出入库任务-新增（编辑）

src/components/mapdrag/indexMap.vue

@@ -265,7 +265,7 @@
           viewMode: '3D',
           pitch: 0, //地圖仰角
           center: [122.122, 40.227],
-          mapStyle: 'amap://styles/c0ed286f357b7f4c7312476637a7ab04',
+          mapStyle: 'amap://styles/dark',
           buildingAnimation: false,
           showIndoorMap: false,
         });

src/model/houseSelfCollect/index.js

@@ -49,7 +49,8 @@ import {
   API_POST_INSPECTIONCHECK,
   API_GAT_QRCODE,
   API_GAT_GETQRCODE,
-  API_GAT_INFO
+  API_GAT_INFO,
+  API_POST_WORKFLOW_TASK
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -149,3 +150,5 @@ export const getQRcode  = appRx.get(API_GAT_QRCODE, errorCatcher, errorHandle, f
 export const getQRCodeData  = appRx.get(API_GAT_GETQRCODE, errorCatcher, errorHandle, filter)
 // 车型
 export const getcartype  = appRx.get(API_GAT_INFO, errorCatcher, errorHandle, filter)
+// 审核之后
+export const workflowcontent = appRx.get(API_POST_WORKFLOW_TASK, errorCatcher, errorHandle, filter)

src/model/tasksport/index.js

@@ -24,7 +24,8 @@ import {
     API_POST_OUT_MOVESTATES,
     API_POST_DEL_HAULAGE_STAGE,
     API_GET_STAFF,
-    API_GET_TASKHISTORIES
+    API_GET_TASKHISTORIES,
+    API_POST_WORKFLOW_TASK
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -34,6 +35,8 @@ export const addtrantask = appRx.post(API_POST_TRAN_ADD, errorCatcher, errorHand
 export const getidentity = appRx.get(API_POST_PERSON, errorCatcher, errorHandle, filter)
 // 审核通过不通过
 export const woekflowhandle = appRx.post(API_POST_WORKFLOW_API_HANDLE, errorCatcher, errorHandle, filter)
+// 审核之后
+export const workflowcontent = appRx.get(API_POST_WORKFLOW_TASK, errorCatcher, errorHandle, filter)
 // 审核编辑
 export const warehousetask = appRx.post(API_POST_INOUTWAREHOUSETASK, errorCatcher, errorHandle, filter)
 //运输任务查看

src/views/houseSelfCollect/paymentManagement.vue

@@ -332,7 +332,8 @@
     getJurisdiction,
     invoicing,
     export1,
-    settlementEdit
+    settlementEdit,
+    workflowcontent
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
@@ -1220,6 +1221,12 @@
               })
               .toPromise()
               .then((response) => {
+                 workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'付款管理'}).toPromise()
+            .then((response1) => {
+              console.log(response1)
+              // this.$message.success('审核成功')
+              // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+            })
                 this.audit(
                   this.modification[index + 1],
                   index + 1,
@@ -1237,6 +1244,12 @@
               })
               .toPromise()
               .then((response) => {
+                 workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'付款管理'}).toPromise()
+            .then((response1) => {
+              console.log(response1)
+              // this.$message.success('审核成功')
+              // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+            })
                 // postqueryhandle({workflowId:item.workflowId}).toPromise()
                 // .then((response) => {
                 this.audit(

src/views/statisticalReport/autoSettlementList.vue

@@ -599,6 +599,9 @@ import {
   // postaudit,
   //   getselectctcontractno,
 } from '@/model/statisticalReport/index'
+import {
+    workflowcontent
+  } from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -1168,7 +1171,11 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            this.audit(this.modification[index + 1], index + 1, status)
+             workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'汽运结算报表'}).toPromise()
+            .then((response1) => {
+              this.audit(this.modification[index + 1], index + 1, status)
+            })
+            
           })
           .catch((req) => {
             this.$message.warning(req.message)

src/views/statisticalReport/huoyunList.vue

@@ -400,6 +400,9 @@ import {
   // postaudit,
   //   getselectctcontractno,
 } from '@/model/statisticalReport/index'
+import {
+    workflowcontent
+  } from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -1010,7 +1013,10 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            this.audit(this.modification[index + 1], index + 1, status)
+            workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'火运结算报表'}).toPromise()
+            .then((response1) => {
+              this.audit(this.modification[index + 1], index + 1, status)
+            })
           })
           .catch((req) => {
             this.$message.warning(req.message)

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -135,6 +135,9 @@
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import {
+    workflowcontent
+  } from '@/model/houseSelfCollect/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -317,8 +320,11 @@
             })
             .toPromise()
             .then((response) => {
+              workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'采购平仓报表'}).toPromise()
+            .then((response1) => {
               this.audit(this.modification[index + 1], index + 1, status)
             })
+            })
             .catch((req) => {
               this.$message.warning(req.message)
             })

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -227,6 +227,9 @@
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import {
+    workflowcontent
+  } from '@/model/houseSelfCollect/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -650,8 +653,12 @@
             })
             .toPromise()
             .then((response) => {
+              
+              workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'采购入库报表'}).toPromise()
+            .then((response1) => {
               this.audit(this.modification[index + 1], index + 1, status, status2, reason)
             })
+            })
             .catch((req) => {
               this.$message.warning(req.message)
             })

src/views/statisticalReport/salesClosingCashierList.vue

@@ -350,6 +350,7 @@ import {
 } from '@/model/statisticalReport/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
+import { workflowcontent } from '@/model/houseSelfCollect/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -470,7 +471,11 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            this.audit(this.multipleSelection[index + 1], index + 1, status)
+            workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'销售平仓报表'}).toPromise()
+            .then((response1) => {
+              this.audit(this.multipleSelection[index + 1], index + 1, status)
+            })
+            
           })
           .catch((req) => {
             this.$message.warning(req.message)

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -425,6 +425,7 @@ import {
   salesinvoicing,
   salesbatchinvoicing,
 } from '@/model/statisticalReport/index'
+import { workflowcontent } from '@/model/houseSelfCollect/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -615,7 +616,10 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            this.audit(this.modification[index + 1], index + 1, status)
+            workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'汽运结算报表'}).toPromise()
+            .then((response1) => {
+               this.audit(this.modification[index + 1], index + 1, status)
+            })
           })
           .catch((req) => {
             this.$message.warning(req.message)

src/views/statisticalReport/shippingList.vue

@@ -430,6 +430,7 @@ import {
   SetYunShuPrice,
 } from '@/model/statisticalReport/index'
 import { posthandle } from '@/model/purchasingManagement/index'
+import { workflowcontent } from '@/model/houseSelfCollect/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -1011,7 +1012,11 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            this.audit(this.warehouseList.records[index + 1], index + 1, status)
+             workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'船运结算报表'}).toPromise()
+            .then((response1) => {
+               this.audit(this.warehouseList.records[index + 1], index + 1, status)
+            })
+           
           })
           .catch((req) => {
             this.$message.warning(req.message)

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -438,6 +438,7 @@ import {
   addDisOrRemarks,
   stockPurchasePayMoney,
 } from '@/model/statisticalReport/index'
+import { workflowcontent } from '@/model/houseSelfCollect/index'
 import { downloadFile } from '@/utils/batchDown'
 import { posthandle } from '@/model/purchasingManagement/index'
 import Pagination from '@/components/Pagination'
@@ -910,13 +911,17 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            this.audit(
+            
+            workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'现货采购入库报表'}).toPromise()
+            .then((response1) => {
+               this.audit(
               this.modification[index + 1],
               index + 1,
               status,
               status2,
               reason
             )
+            })
           })
           .catch((req) => {
             this.$message.warning(req.message)

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -853,6 +853,7 @@ import {
   warehousetask,
   woekflowhandle,
   gettaskhistories,
+  workflowcontent
 } from '@/model/tasksport/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
@@ -1136,6 +1137,7 @@ export default {
       }
     },
     requestadd(list, status) {
+      console.log(list)
       list.compId = localStorage.getItem('ws-pf_compId')
       list.publisher =
         localStorage.getItem('ws-pf_roleName') +
@@ -1151,9 +1153,17 @@ export default {
           })
             .toPromise()
             .then((response) => {
-              this.$message.success('审核成功')
+            //   workflowcontent({workflowId:list.workflowId,businessKey:list.id}).toPromise()
+            // .then((response1) => {
+            //   console.log(response1)
+            workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'出入库任务'}).toPromise()
+            .then((response1) => {
+               this.$message.success('审核成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
+            
+            // })
+          })
         })
     },
     requestaudit(list, status) {
@@ -1172,9 +1182,13 @@ export default {
           })
             .toPromise()
             .then((response) => {
+               workflowcontent({workflowId:item.workflowId,businessKey:item.id,type:'出入库任务'}).toPromise()
+            .then((response1) => {
               this.$message.success('驳回成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
+              
+            })
         })
     },
     //提交按钮