[update]流程完善

2024-01-10 08:53:48 +08:00
parent 4f5c36a357
commit b16f1cd3a3
5 changed files with 79 additions and 89 deletions
@@ -109,7 +109,6 @@ import SelectUser from '@/components/SelectUser'
 import CalendarField from '@/components/CalendarField'
 import ZUpload from '@/components/ZUpload'
 import { approvalInspectPlan, getInspectPlanDetail, rejectInspectPlan, transferInspectPlan } from '@/api/api'
-import { getAction } from '@/api/manage'
 export default {
  name: 'EnterpriseStandardInspectionPlanFlow',
  components: { ZUpload, CalendarField, SelectUser, ProcessCommonLayout },
@@ -227,35 +226,28 @@ export default {
    loadPage () {
      this.loading = true
      const { projectId, taskId } = this.$route.query
-      Promise.all([
-        // 获取业务数据
-        getAction(this.url.list, { projectId }).then(res => {
-          if (res.success) {
-            this.dataSource = res.result || []
+      // 获取流程数据
+      getInspectPlanDetail({ projectId, taskId }).then(res => {
+        if (res.success) {
+          const data = res.result || {}
+          this.info = data
+          const processAll = data.processAll || {}
+          const processApprovalRecord = data.processApprovalRecord || {}
+          // 回显流程信息
+          this.processInfoForm = {
+            prcName: processAll.prcName,
+            dueTime: processAll.dueTime,
+            prcMes: processAll.prcMes
          }
-        }).finally(() => {}),
-
-        // 获取流程数据
-        getInspectPlanDetail({ projectId, taskId }).then(res => {
-          if (res.success) {
-            const data = res.result || {}
-            this.info = data
-            const processAll = data.processAll || {}
-            const processApprovalRecord = data.processApprovalRecord || {}
-            // 回显流程信息
-            this.processInfoForm = {
-              prcName: processAll.prcName,
-              dueTime: processAll.dueTime,
-              prcMes: processAll.prcMes
-            }
-            // 回显审批信息
-            this.approvalInfoForm = {
-              commitText: processApprovalRecord.commitText,
-              commitFile: processApprovalRecord.commitFile
-            }
+          // 回显审批信息
+          this.approvalInfoForm = {
+            commitText: processApprovalRecord.commitText,
+            commitFile: processApprovalRecord.commitFile
          }
-        }).finally(() => {})
-      ]).finally(() => {
+          // 回显业务信息
+          this.dataSource = data.processEsInspectPlanList || []
+        }
+      }).finally(() => {
        this.loading = false
      })
    },
@@ -287,11 +279,15 @@ export default {
      const params = {}
      let validateError = null

+      // 业务数据
+      params.processEsInspectPlanList = this.info.processEsInspectPlanList || []
+
      // 流程信息
      params.processAll = Object.assign({}, this.info.processAll, {
        projectId: this.projectId,
        nodeId: this.$route.query.nodeId,
-        taskId: this.$route.query.taskId
+        taskId: this.$route.query.taskId,
+        prcType: 16
      })

      // 审批意见
@@ -121,7 +121,6 @@ import ProcessCommonLayout from '@/components/ProcessCommonLayout'
 import SelectUser from '@/components/SelectUser'
 import CalendarField from '@/components/CalendarField'
 import ZUpload from '@/components/ZUpload'
-import { getAction } from '@/api/manage'
 import {
  approvalInspectProcess,
  getInspectProcessDetail,
@@ -287,35 +286,28 @@ export default {
    loadPage () {
      this.loading = true
      const { projectId, taskId } = this.$route.query
-      Promise.all([
-        // 获取业务数据
-        getAction(this.url.list, { projectId }).then(res => {
-          if (res.success) {
-            this.dataSource = res.result || []
+      // 获取流程数据
+      getInspectProcessDetail({ projectId, taskId }).then(res => {
+        if (res.success) {
+          const data = res.result || {}
+          this.info = data
+          const processAll = data.processAll || {}
+          const processApprovalRecord = data.processApprovalRecord || {}
+          // 回显流程信息
+          this.processInfoForm = {
+            prcName: processAll.prcName,
+            dueTime: processAll.dueTime,
+            prcMes: processAll.prcMes
          }
-        }).finally(() => {}),
-
-        // 获取流程数据
-        getInspectProcessDetail({ projectId, taskId }).then(res => {
-          if (res.success) {
-            const data = res.result || {}
-            this.info = data
-            const processAll = data.processAll || {}
-            const processApprovalRecord = data.processApprovalRecord || {}
-            // 回显流程信息
-            this.processInfoForm = {
-              prcName: processAll.prcName,
-              dueTime: processAll.dueTime,
-              prcMes: processAll.prcMes
-            }
-            // 回显审批信息
-            this.approvalInfoForm = {
-              commitText: processApprovalRecord.commitText,
-              commitFile: processApprovalRecord.commitFile
-            }
+          // 回显审批信息
+          this.approvalInfoForm = {
+            commitText: processApprovalRecord.commitText,
+            commitFile: processApprovalRecord.commitFile
          }
-        }).finally(() => {})
-      ]).finally(() => {
+          // 回显业务信息
+          this.dataSource = data.processEsInspectVOList || []
+        }
+      }).finally(() => {
        this.loading = false
      })
    },
@@ -347,11 +339,15 @@ export default {
      const params = {}
      let validateError = null

+      // 业务数据
+      params.processEsInspectList = this.info.processEsInspectVOList || []
+
      // 流程信息
      params.processAll = Object.assign({}, this.info.processAll, {
        projectId: this.projectId,
        nodeId: this.$route.query.nodeId,
-        taskId: this.$route.query.taskId
+        taskId: this.$route.query.taskId,
+        prcType: 17
      })

      // 审批意见
@@ -351,7 +351,8 @@ export default {
      params.processAll = Object.assign({}, this.info.processAll, {
        projectId: this.projectId,
        nodeId: this.$route.query.nodeId,
-        taskId: this.$route.query.taskId
+        taskId: this.$route.query.taskId,
+        prcType: 19
      })

      // 审批意见
@@ -108,7 +108,6 @@ import { ApprovalOpinions, InspectionExtensionRequestProcess, ProcessKey } from
 import SelectUser from '@/components/SelectUser'
 import CalendarField from '@/components/CalendarField'
 import ZUpload from '@/components/ZUpload'
-import { getAction } from '@/api/manage'
 import {
  approvalInspectExtension,
  getInspectExtensionDetail,
@@ -226,35 +225,28 @@ export default {
    loadPage () {
      this.loading = true
      const { projectId, taskId } = this.$route.query
-      Promise.all([
-        // 获取业务数据
-        getAction(this.url.list, { projectId }).then(res => {
-          if (res.success) {
-            this.dataSource = res.result || []
+      // 获取流程数据
+      getInspectExtensionDetail({ projectId, taskId }).then(res => {
+        if (res.success) {
+          const data = res.result || {}
+          this.info = data
+          const processAll = data.processAll || {}
+          const processApprovalRecord = data.processApprovalRecord || {}
+          // 回显流程信息
+          this.processInfoForm = {
+            prcName: processAll.prcName,
+            dueTime: processAll.dueTime,
+            prcMes: processAll.prcMes
          }
-        }).finally(() => {}),
-
-        // 获取流程数据
-        getInspectExtensionDetail({ projectId, taskId }).then(res => {
-          if (res.success) {
-            const data = res.result || {}
-            this.info = data
-            const processAll = data.processAll || {}
-            const processApprovalRecord = data.processApprovalRecord || {}
-            // 回显流程信息
-            this.processInfoForm = {
-              prcName: processAll.prcName,
-              dueTime: processAll.dueTime,
-              prcMes: processAll.prcMes
-            }
-            // 回显审批信息
-            this.approvalInfoForm = {
-              commitText: processApprovalRecord.commitText,
-              commitFile: processApprovalRecord.commitFile
-            }
+          // 回显审批信息
+          this.approvalInfoForm = {
+            commitText: processApprovalRecord.commitText,
+            commitFile: processApprovalRecord.commitFile
          }
-        }).finally(() => {})
-      ]).finally(() => {
+          // 回显业务信息
+          this.dataSource = data.processEsInspectDelayApplyVOList || []
+        }
+      }).finally(() => {
        this.loading = false
      })
    },
@@ -286,11 +278,15 @@ export default {
      const params = {}
      let validateError = null

+      // 业务信息
+      params.processEsInspectDelayApplyList = this.info.processEsInspectDelayApplyVOList || []
+
      // 流程信息
      params.processAll = Object.assign({}, this.info.processAll, {
        projectId: this.projectId,
        nodeId: this.$route.query.nodeId,
-        taskId: this.$route.query.taskId
+        taskId: this.$route.query.taskId,
+        prcType: 18
      })

      // 审批意见
@@ -281,7 +281,8 @@ export default {
      params.processAll = Object.assign({}, this.info.processAll, {
        projectId: this.projectId,
        nodeId: this.$route.query.nodeId,
-        taskId: this.$route.query.taskId
+        taskId: this.$route.query.taskId,
+        prcType: 20
      })

      // 审批意见