[update]流程完善

This commit is contained in:
danshihao
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 CalendarField from '@/components/CalendarField'
import ZUpload from '@/components/ZUpload' import ZUpload from '@/components/ZUpload'
import { approvalInspectPlan, getInspectPlanDetail, rejectInspectPlan, transferInspectPlan } from '@/api/api' import { approvalInspectPlan, getInspectPlanDetail, rejectInspectPlan, transferInspectPlan } from '@/api/api'
import { getAction } from '@/api/manage'
export default { export default {
name: 'EnterpriseStandardInspectionPlanFlow', name: 'EnterpriseStandardInspectionPlanFlow',
components: { ZUpload, CalendarField, SelectUser, ProcessCommonLayout }, components: { ZUpload, CalendarField, SelectUser, ProcessCommonLayout },
@@ -227,14 +226,6 @@ export default {
loadPage () { loadPage () {
this.loading = true this.loading = true
const { projectId, taskId } = this.$route.query const { projectId, taskId } = this.$route.query
Promise.all([
// 获取业务数据
getAction(this.url.list, { projectId }).then(res => {
if (res.success) {
this.dataSource = res.result || []
}
}).finally(() => {}),
// 获取流程数据 // 获取流程数据
getInspectPlanDetail({ projectId, taskId }).then(res => { getInspectPlanDetail({ projectId, taskId }).then(res => {
if (res.success) { if (res.success) {
@@ -253,9 +244,10 @@ export default {
commitText: processApprovalRecord.commitText, commitText: processApprovalRecord.commitText,
commitFile: processApprovalRecord.commitFile commitFile: processApprovalRecord.commitFile
} }
// 回显业务信息
this.dataSource = data.processEsInspectPlanList || []
} }
}).finally(() => {}) }).finally(() => {
]).finally(() => {
this.loading = false this.loading = false
}) })
}, },
@@ -287,11 +279,15 @@ export default {
const params = {} const params = {}
let validateError = null let validateError = null
// 业务数据
params.processEsInspectPlanList = this.info.processEsInspectPlanList || []
// 流程信息 // 流程信息
params.processAll = Object.assign({}, this.info.processAll, { params.processAll = Object.assign({}, this.info.processAll, {
projectId: this.projectId, projectId: this.projectId,
nodeId: this.$route.query.nodeId, 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 SelectUser from '@/components/SelectUser'
import CalendarField from '@/components/CalendarField' import CalendarField from '@/components/CalendarField'
import ZUpload from '@/components/ZUpload' import ZUpload from '@/components/ZUpload'
import { getAction } from '@/api/manage'
import { import {
approvalInspectProcess, approvalInspectProcess,
getInspectProcessDetail, getInspectProcessDetail,
@@ -287,14 +286,6 @@ export default {
loadPage () { loadPage () {
this.loading = true this.loading = true
const { projectId, taskId } = this.$route.query const { projectId, taskId } = this.$route.query
Promise.all([
// 获取业务数据
getAction(this.url.list, { projectId }).then(res => {
if (res.success) {
this.dataSource = res.result || []
}
}).finally(() => {}),
// 获取流程数据 // 获取流程数据
getInspectProcessDetail({ projectId, taskId }).then(res => { getInspectProcessDetail({ projectId, taskId }).then(res => {
if (res.success) { if (res.success) {
@@ -313,9 +304,10 @@ export default {
commitText: processApprovalRecord.commitText, commitText: processApprovalRecord.commitText,
commitFile: processApprovalRecord.commitFile commitFile: processApprovalRecord.commitFile
} }
// 回显业务信息
this.dataSource = data.processEsInspectVOList || []
} }
}).finally(() => {}) }).finally(() => {
]).finally(() => {
this.loading = false this.loading = false
}) })
}, },
@@ -347,11 +339,15 @@ export default {
const params = {} const params = {}
let validateError = null let validateError = null
// 业务数据
params.processEsInspectList = this.info.processEsInspectVOList || []
// 流程信息 // 流程信息
params.processAll = Object.assign({}, this.info.processAll, { params.processAll = Object.assign({}, this.info.processAll, {
projectId: this.projectId, projectId: this.projectId,
nodeId: this.$route.query.nodeId, 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, { params.processAll = Object.assign({}, this.info.processAll, {
projectId: this.projectId, projectId: this.projectId,
nodeId: this.$route.query.nodeId, 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 SelectUser from '@/components/SelectUser'
import CalendarField from '@/components/CalendarField' import CalendarField from '@/components/CalendarField'
import ZUpload from '@/components/ZUpload' import ZUpload from '@/components/ZUpload'
import { getAction } from '@/api/manage'
import { import {
approvalInspectExtension, approvalInspectExtension,
getInspectExtensionDetail, getInspectExtensionDetail,
@@ -226,14 +225,6 @@ export default {
loadPage () { loadPage () {
this.loading = true this.loading = true
const { projectId, taskId } = this.$route.query const { projectId, taskId } = this.$route.query
Promise.all([
// 获取业务数据
getAction(this.url.list, { projectId }).then(res => {
if (res.success) {
this.dataSource = res.result || []
}
}).finally(() => {}),
// 获取流程数据 // 获取流程数据
getInspectExtensionDetail({ projectId, taskId }).then(res => { getInspectExtensionDetail({ projectId, taskId }).then(res => {
if (res.success) { if (res.success) {
@@ -252,9 +243,10 @@ export default {
commitText: processApprovalRecord.commitText, commitText: processApprovalRecord.commitText,
commitFile: processApprovalRecord.commitFile commitFile: processApprovalRecord.commitFile
} }
// 回显业务信息
this.dataSource = data.processEsInspectDelayApplyVOList || []
} }
}).finally(() => {}) }).finally(() => {
]).finally(() => {
this.loading = false this.loading = false
}) })
}, },
@@ -286,11 +278,15 @@ export default {
const params = {} const params = {}
let validateError = null let validateError = null
// 业务信息
params.processEsInspectDelayApplyList = this.info.processEsInspectDelayApplyVOList || []
// 流程信息 // 流程信息
params.processAll = Object.assign({}, this.info.processAll, { params.processAll = Object.assign({}, this.info.processAll, {
projectId: this.projectId, projectId: this.projectId,
nodeId: this.$route.query.nodeId, 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, { params.processAll = Object.assign({}, this.info.processAll, {
projectId: this.projectId, projectId: this.projectId,
nodeId: this.$route.query.nodeId, nodeId: this.$route.query.nodeId,
taskId: this.$route.query.taskId taskId: this.$route.query.taskId,
prcType: 20
}) })
// 审批意见 // 审批意见