update 流程校验调整
This commit is contained in:
+6
-1
@@ -270,7 +270,7 @@
|
|||||||
<div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
|
<div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
|
||||||
<process-detail-list :process-key="ProcessKey.PROJECT_COMPLIANCE_EVALUATION.value">
|
<process-detail-list :process-key="ProcessKey.PROJECT_COMPLIANCE_EVALUATION.value">
|
||||||
<template #personnelInfo>
|
<template #personnelInfo>
|
||||||
<personnel-info ref="personnelInfo" :data="personnelInfoData" :current-node="currentNode" />
|
<personnel-info ref="personnelInfo" :data="personnelInfoData" :current-node="personnelInfoCurrentNode" />
|
||||||
</template>
|
</template>
|
||||||
</process-detail-list>
|
</process-detail-list>
|
||||||
</div>
|
</div>
|
||||||
@@ -813,6 +813,10 @@ export default {
|
|||||||
return this.$t('workCenter.standardCompliance.projectAppraisal')
|
return this.$t('workCenter.standardCompliance.projectAppraisal')
|
||||||
}
|
}
|
||||||
return this.$t('basicServiceInformation')
|
return this.$t('basicServiceInformation')
|
||||||
|
},
|
||||||
|
// 人员信息的当前节点,如果是模块负责人修改,在人员信息需要显示当前节点是模块负责人审批
|
||||||
|
personnelInfoCurrentNode () {
|
||||||
|
return this.currentNode === ProjectComplianceEvaluationProcessNode.moduleOwnerModification.value ? ProjectComplianceEvaluationProcessNode.moduleOwnerApproval.value : this.currentNode
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
@@ -1145,6 +1149,7 @@ export default {
|
|||||||
basicTaskInfoDTO.taskId = basicTaskInfoDTO.taskId || this.$route.query.taskId
|
basicTaskInfoDTO.taskId = basicTaskInfoDTO.taskId || this.$route.query.taskId
|
||||||
} else {
|
} else {
|
||||||
flag = false
|
flag = false
|
||||||
|
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
// 抄送人员校验
|
// 抄送人员校验
|
||||||
|
|||||||
@@ -253,7 +253,10 @@
|
|||||||
<div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
|
<div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
|
||||||
<process-detail-list :process-key="processKey">
|
<process-detail-list :process-key="processKey">
|
||||||
<template #personnelInfo>
|
<template #personnelInfo>
|
||||||
<personnel-info ref="personnelInfo" :data="personnelInfoData" :current-node="currentNode" :special-process-node-prefix="currentNodePrefix"/>
|
<personnel-info ref="personnelInfo"
|
||||||
|
:data="personnelInfoData"
|
||||||
|
:current-node="currentNode"
|
||||||
|
:special-process-node-prefix="currentNodePrefix" />
|
||||||
</template>
|
</template>
|
||||||
</process-detail-list>
|
</process-detail-list>
|
||||||
</div>
|
</div>
|
||||||
@@ -950,7 +953,7 @@ export default {
|
|||||||
dealFormData (isSave) {
|
dealFormData (isSave) {
|
||||||
// 提交的表单数据,流程信息,流程审批信息,征求意见列表,业务分派信息,业务基本信息
|
// 提交的表单数据,流程信息,流程审批信息,征求意见列表,业务分派信息,业务基本信息
|
||||||
let formData = {}, processInfo = {}, approvalInfo = {}, consultationListData = [], dispatchInfo = {}, basicServiceInfo = {},
|
let formData = {}, processInfo = {}, approvalInfo = {}, consultationListData = [], dispatchInfo = {}, basicServiceInfo = {},
|
||||||
userInfoMap = {}, flag = true
|
userInfoMap = {}, flag = true, baseFlag
|
||||||
// 保存,只需要有填写内容即可
|
// 保存,只需要有填写内容即可
|
||||||
if (isSave) {
|
if (isSave) {
|
||||||
// 流程信息
|
// 流程信息
|
||||||
@@ -1005,6 +1008,7 @@ export default {
|
|||||||
dispatchInfo = Object.assign(this.dispatchInfo, values)
|
dispatchInfo = Object.assign(this.dispatchInfo, values)
|
||||||
} else {
|
} else {
|
||||||
flag = false
|
flag = false
|
||||||
|
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@@ -1014,6 +1018,7 @@ export default {
|
|||||||
if (this.showConsultationList && (this.currentNode.indexOf(ConsultationProcess.moduleOwnerSummary.value) !== -1 || this.currentNode.indexOf(ConsultationProcess.leaderSummary.value) !== -1) && !this.$refs.expandTable.submit()) {
|
if (this.showConsultationList && (this.currentNode.indexOf(ConsultationProcess.moduleOwnerSummary.value) !== -1 || this.currentNode.indexOf(ConsultationProcess.leaderSummary.value) !== -1) && !this.$refs.expandTable.submit()) {
|
||||||
flag = false
|
flag = false
|
||||||
}
|
}
|
||||||
|
baseFlag = flag
|
||||||
// 用户信息
|
// 用户信息
|
||||||
const userInfo = this.$refs.personnelInfo.getDataObjVerify()
|
const userInfo = this.$refs.personnelInfo.getDataObjVerify()
|
||||||
if (!userInfo) {
|
if (!userInfo) {
|
||||||
@@ -1021,6 +1026,11 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
userInfoMap = userInfo
|
userInfoMap = userInfo
|
||||||
}
|
}
|
||||||
|
if (!flag && !baseFlag) {
|
||||||
|
this.switchValue = 'base'
|
||||||
|
} else if (!flag && !userInfo) {
|
||||||
|
this.switchValue = 'user'
|
||||||
|
}
|
||||||
consultationListData = this.dataSource || []
|
consultationListData = this.dataSource || []
|
||||||
}
|
}
|
||||||
if (!flag) {
|
if (!flag) {
|
||||||
|
|||||||
@@ -798,8 +798,10 @@ export default {
|
|||||||
formData.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
formData.basicTaskInfoDTO.taskId = this.$route.query.taskId
|
||||||
} else {
|
} else {
|
||||||
flag = false
|
flag = false
|
||||||
|
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
const baseFlag = flag
|
||||||
// 处理人员信息
|
// 处理人员信息
|
||||||
const userInfo = this.$refs.personnelInfo.getDataObjVerify()
|
const userInfo = this.$refs.personnelInfo.getDataObjVerify()
|
||||||
if (!userInfo) {
|
if (!userInfo) {
|
||||||
@@ -807,6 +809,12 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
formData.userInfoMap = userInfo
|
formData.userInfoMap = userInfo
|
||||||
}
|
}
|
||||||
|
if (!flag && !baseFlag) {
|
||||||
|
this.switchValue = 'base'
|
||||||
|
}
|
||||||
|
if (!flag && !userInfo) {
|
||||||
|
this.switchValue = 'user'
|
||||||
|
}
|
||||||
if (flag) {
|
if (flag) {
|
||||||
return formData
|
return formData
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -372,11 +372,18 @@ export default {
|
|||||||
approvalInfo.taskId = approvalInfo.taskId || this.$route.query.taskId
|
approvalInfo.taskId = approvalInfo.taskId || this.$route.query.taskId
|
||||||
} else {
|
} else {
|
||||||
flag = false
|
flag = false
|
||||||
|
this.$message.warning(this.$t('pleaseEnterRemarks'))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
const baseFlag = flag
|
||||||
// 人员信息
|
// 人员信息
|
||||||
const userInfo = this.$refs.personnelInfo.getDataObjVerify()
|
const userInfo = this.$refs.personnelInfo.getDataObjVerify()
|
||||||
userInfoMap = userInfo ? userInfo : flag = false
|
userInfoMap = userInfo ? userInfo : flag = false
|
||||||
|
if (!flag && !baseFlag) {
|
||||||
|
this.switchValue = 'base'
|
||||||
|
} else if (!flag && !userInfo) {
|
||||||
|
this.switchValue = 'user'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
formData = {
|
formData = {
|
||||||
basicProcessInfoDTO: processInfo,
|
basicProcessInfoDTO: processInfo,
|
||||||
|
|||||||
Reference in New Issue
Block a user