diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue index 39e9c614b..1ce8fefd8 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue @@ -276,6 +276,15 @@ this.roleForm = {...this.roleForm} this.modalshowflag = false; }, + submit(callback) { + this.$refs['Form'].validate((valid) => { + if (valid) { + callback && callback(this.roleForm) + } else { + return this.$message.warning('请完善人员信息') + } + }) + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue index 67ba009c2..ef3d3f66d 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue @@ -175,18 +175,18 @@ addOrEdit: 'add', editNum: 0, selectList: [], - taskKey: this.$route.query.taskKey, + taskKey: this.$route.query.taskKey,//流程节点key } }, computed: { - isNodeDisplay() { + isNodeDisplay() {//是否展示新增和批量删除 if (this.taskKey == 'PolicySolicitOpinionProcessKey8' || this.taskKey == 'PolicySolicitOpinionProcessKey9') { return true } return false }, - isGenerateSummary() { + isGenerateSummary() {//是否展示生成汇总单和生成上报意见 if (this.taskKey == 'PolicySolicitOpinionProcessKey13' || this.taskKey == 'PolicySolicitOpinionProcessKey14' || this.taskKey == 'PolicySolicitOpinionProcessKey15') { @@ -194,13 +194,14 @@ } return false }, - isExport() { + isExport() {//是否展示导出 if (this.taskKey == 'PolicySolicitOpinionProcessKey12') { return true } return false }, isPersonInCharge() { + //是否展示责任人 if (this.taskKey == 'PolicySolicitOpinionProcessKey9' || this.taskKey == 'PolicySolicitOpinionProcessKey10' || this.taskKey == 'PolicySolicitOpinionProcessKey11') { @@ -208,7 +209,7 @@ } return false }, - isCompleteFlag() { + isCompleteFlag() {//是否展示提出部门、提出人、处理意见、原因 if (this.taskKey == 'PolicySolicitOpinionProcessKey12' || this.taskKey == 'PolicySolicitOpinionProcessKey13' || this.taskKey == 'PolicySolicitOpinionProcessKey14' || @@ -218,7 +219,7 @@ } return false }, - isOperate() { + isOperate() {//是否展示操作列 if (this.taskKey == 'PolicySolicitOpinionProcessKey8' || this.taskKey == 'PolicySolicitOpinionProcessKey9' || this.taskKey == 'PolicySolicitOpinionProcessKey12') { @@ -226,7 +227,7 @@ } return false }, - showSelection() { + showSelection() {//是否展示选择 if (this.taskKey == 'PolicySolicitOpinionProcessKey8' || this.taskKey == 'PolicySolicitOpinionProcessKey9') { return true @@ -312,6 +313,7 @@ this.histortData = [...this.histortData] } }, + }, } diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue index ce5d20b18..eeb05e126 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -339,6 +339,39 @@ } }, computed: { + taskKeyName() { + if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') { + return '起草' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey2') { + return '审核' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey3') { + return '起草修改' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey4') { + return '审定' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey5') { + return '批准' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey7') { + return '责任对接人分配任务' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey8') { + return '责任人任务处理' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey9') { + return '责任对接人汇总' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey10') { + return '责任单位审批' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey11') { + return '管理员' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey12') { + return '审核' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey13') { + return '会签' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey14') { + return '审定' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey15') { + return '批准' + } else if (this.taskKey == 'PolicySolicitOpinionProcessKey16') { + return '抄送' + } + }, showSave() { //是否展示保存 if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1' || this.taskKey == 'PolicySolicitOpinionProcessKey3' || this.taskKey == 'PolicySolicitOpinionProcessKey7' || @@ -474,22 +507,21 @@ handleSubmit() { this.$refs['zczqyjForm'].validate((valid) => { if (valid) { - this.$refs['Form'].validate((valid) => { - if (valid) { + if (this.showPersonnel) { + this.$refs.personnelInformationRef.submit(() => { this.isSubmit = true this.saveLoading = true; - } else { - return this.$message.warning('请完善人员信息') - } - }) + }) + } } else { return this.$message.warning('请完善基础信息') } }) }, handleReject() { - + // approvalFlag value:0通过 1驳回 }, + //启动流程 startProcessRollBack() { const json = Object.assign(this.form, this.roleForm); json.commentText = this.commentText @@ -512,6 +544,7 @@ } }) }, + //提交流程 completeTask(taskId) { const json = Object.assign(this.form, this.roleForm); json.commentText = this.commentText @@ -599,7 +632,7 @@ this.processStep = window.URL.createObjectURL(res.data) }) }, - + //选择人员 selectOperation(title, id, isTrue) { this.title = title this.checkBox = isTrue