出入库审批

src/views/activiti/task/MyTask.vue

@@ -50,6 +50,7 @@ import DetailYYAudit from '@/views/store/outstoreform/modules/DetailYYAudit'
 import { getTaskPage } from '@/api/activiti/activiti'
 import { fetchCustomFieldTemplateData, fetchCustomFieldTemplateVOData } from '@/api/customize/fieldTemplateData'
 import { changeOutStoreFormForAudit } from '@/api/activiti/activiti-outstoreform'
+import { fetchOutStoreForm } from '@/api/store/outstoreform'
 
 export default {
   name: 'TaskList',
@@ -154,6 +155,12 @@ export default {
     handleAudit (record) {
       this.visible = false
       if (record.targetCode === 'out_store_back') { // 仓库审批跳转到仓库审批页面
+        fetchOutStoreForm({ id: record.targetId }).then(res => {
+          const templateData = res.data.detailList
+          const recordTemp = res.data
+          recordTemp.taskId = record.taskId
+          this.$refs.detailAuditScrapModal.base(recordTemp, templateData)
+        })
         this.$refs.detailYYAuditModal.base(record)
       } else {
         fetchCustomFieldTemplateVOData({ id: record.targetId }).then(res => {

src/views/store/outstoreform/OutStoreFormYY.vue

@@ -99,6 +99,7 @@ import TicketForm from './modules/TicketForm'
 
 import { updateStoreBack, getOutStoreFormPage, deleteOutStoreForms, fetchOutStoreForm, exportOutStoreForm } from '@/api/store/outstoreform'
 import { startOutStoreForm } from '@/api/activiti/activiti-outstoreform'
+import { startSbInfoScrap } from '@/api/activiti/activiti-sb-scrap'
 
 export default {
   name: 'OutStoreFormList',
@@ -275,10 +276,19 @@ export default {
       })
     },
     updateStore (id) {
-      startOutStoreForm({ id: id }).then(res => {
+      const params = {}
+      params.id = id
+      params.processInstanceId = ''
+      params.auditModelName = '仓库审批'
+      params.auditModelKey = 'out_store_back'
+      startSbInfoScrap(params).then(res => {
         this.$message.info('已提交，请等待主管审核')
         this.$refs.table.refresh()
       })
+      /* startOutStoreForm({ id: id }).then(res => {
+        this.$message.info('已提交，请等待主管审核')
+        this.$refs.table.refresh()
+      }) */
     },
     updateStoreBack (id) {
       updateStoreBack({ id: id }).then(res => {