diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index f9111a9e3..c4e5737f1 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -119,6 +119,10 @@ { label: "政策征求意见流程", value: "29" + }, + { + label: '重点认证标准/政策合规性项目审查流程', + value: "30" } ], formDisableFlag: false, diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue index 1f2fcf8f7..f97cfd2bb 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue @@ -228,6 +228,17 @@ } }, methods: { + getData(row) { + this.infoTableDatas = row + this.infoTableDatas = [...this.infoTableDatas] + }, + submit(callback) { + if (this.infoTableDatas && this.infoTableDatas.length > 0) { + callback && callback() + } else { + this.$message.warning('请至少添加一条数据') + } + }, // 点击查看 handlePreview(item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/personnelInformation.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/personnelInformation.vue index 0f3564408..2f3247888 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/personnelInformation.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/personnelInformation.vue @@ -231,7 +231,6 @@ this.type = type; this.drawerTitle = title; this.checkBox = isTrue - console.log(this.nodeList); this.modalshowflag = true; }, //选择人 diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue index 1c7667ddb..3b6736d5b 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -89,7 +89,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -133,21 +133,7 @@ - - - - - - - - - + @@ -162,9 +148,9 @@
- - - + + +
@@ -293,53 +279,61 @@ }, computed: { showPersonnel() { - return true + if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey3') { + return true + } + return false }, showApprovalHistory() { + if (!this.taskKey) { + return false + } return true }, disabledXX() { - return false + if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey3') { + return false + } + return true }, taskKeyName() { - if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') { + if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1') { return '起草' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey2') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey2') { return '审核' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey3') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey3') { return '起草修改' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey4') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey4') { return '审定' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey5') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey5') { return '批准' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey7') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey7') { return '责任对接人分配任务' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey8') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey8') { return '责任人任务处理' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey9') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey9') { return '责任对接人汇总' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey10') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey10') { return '责任单位审批' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey11') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey11') { return '管理员' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey12') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey12') { return '审核' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey13') { - return '会签' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey14') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey13') { return '审定' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey15') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey14') { return '批准' - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey16') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey15') { return '抄送' } }, showSave() { //是否展示保存 - if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1' || - this.taskKey == 'PolicySolicitOpinionProcessKey3' || this.taskKey == 'PolicySolicitOpinionProcessKey7' || - this.taskKey == 'PolicySolicitOpinionProcessKey8' || this.taskKey == 'PolicySolicitOpinionProcessKey9' || - this.taskKey == 'PolicySolicitOpinionProcessKey12') { + if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey3' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey7' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey9') { return true } return false @@ -353,31 +347,52 @@ }, showReject() {//是否展示驳回 - if (this.taskKey == 'PolicySolicitOpinionProcessKey2' || - this.taskKey == 'PolicySolicitOpinionProcessKey4' || - this.taskKey == 'PolicySolicitOpinionProcessKey5' || - this.taskKey == 'PolicySolicitOpinionProcessKey9' || - this.taskKey == 'PolicySolicitOpinionProcessKey10' || - this.taskKey == 'PolicySolicitOpinionProcessKey11' || - this.taskKey == 'PolicySolicitOpinionProcessKey12' || - this.taskKey == 'PolicySolicitOpinionProcessKey13' || - this.taskKey == 'PolicySolicitOpinionProcessKey14' || - this.taskKey == 'PolicySolicitOpinionProcessKey15') { + if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey2' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey4' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey5' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey10' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey12' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey13' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey14') { return true } return false }, - showSolicitation() { //是否展示征求意见列表 - if (this.taskKey == 'PolicySolicitOpinionProcessKey8' || - this.taskKey == 'PolicySolicitOpinionProcessKey9' || - this.taskKey == 'PolicySolicitOpinionProcessKey10' || - this.taskKey == 'PolicySolicitOpinionProcessKey11' || - this.taskKey == 'PolicySolicitOpinionProcessKey12' || - this.taskKey == 'PolicySolicitOpinionProcessKey13' || - this.taskKey == 'PolicySolicitOpinionProcessKey14' || - this.taskKey == 'PolicySolicitOpinionProcessKey15' || - this.taskKey == 'PolicySolicitOpinionProcessKey16') { + isFetchList() { //是否展示征求意见列表 + if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey2' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey3' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey4' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey5' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey7') { + return true + } + return false + }, + isBusinessDivisionList() { + if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey9' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey10' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey12' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey13' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey14' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey15') { + return true + } + return false + }, + isProductPlanningList() { + if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey9' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey10' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey12' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey13' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey14' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey15') { return true } return false @@ -433,13 +448,11 @@ }, //保存事件 handleSave() { - this.openButtonLoading() - if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') { + if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1') { this.draftSaving() - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey8' || - this.taskKey == 'PolicySolicitOpinionProcessKey9' || - this.taskKey == 'PolicySolicitOpinionProcessKey12') { + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey9') { let _formData = new FormData(); this.$refs.solicitationListRef.save((row, ids) => { _formData.append("taskIds", this.$route.query.taskIds); @@ -464,11 +477,12 @@ draftSaving() { let _formData = new FormData(); let json = this.dataForm + json.infoTableDatas = this.$refs.fetchListRef.infoTableDatas json.commentText = this.commentText _formData.append('id', this.bpnId || '') _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.userName); - _formData.append("prcType", "29"); + _formData.append("prcType", "30"); _formData.append("json", JSON.stringify({ form: json, roleForm: this.$refs.personnelInformationRef.roleForm, @@ -487,16 +501,18 @@ this.$refs['zczqyjForm'].validate((valid) => { if (valid) { this.openButtonLoading() - if (!this.taskKey || this.taskKey == 'PolicySolicitOpinionProcessKey1') {//起草 + if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1') {//起草 this.closeButtonLoading() this.$refs.personnelInformationRef.submit((row) => { - this.openButtonLoading() - this.startProcessRollBack(row) + this.$refs.fetchListRef.submit((val) => { + this.openButtonLoading() + this.startProcessRollBack(row) + }) }) - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey2' || - this.taskKey == 'PolicySolicitOpinionProcessKey4' || - this.taskKey == 'PolicySolicitOpinionProcessKey5' || - this.taskKey == 'PolicySolicitOpinionProcessKey7') { //审核、审定、批准、责任人分配任务 + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey2' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey4' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey5' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey7') { //审核、审定、批准、责任人分配任务 const json = Object.assign(this.dataForm); json.commentText = this.commentText json.approvalFlag = 0 @@ -505,7 +521,7 @@ commentText: this.commentText } this.completeTask(this.$route.query.taskIds, query) - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey3') {//起草修改 + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey3') {//起草修改 this.closeButtonLoading() this.$refs.personnelInformationRef.submit((row) => { const json = Object.assign(this.dataForm, row); @@ -518,15 +534,14 @@ this.openButtonLoading() this.completeTask(this.$route.query.taskIds, query) }) - } else if (this.taskKey == 'PolicySolicitOpinionProcessKey8' || - this.taskKey == 'PolicySolicitOpinionProcessKey9' || - this.taskKey == 'PolicySolicitOpinionProcessKey10' || - this.taskKey == 'PolicySolicitOpinionProcessKey11' || - this.taskKey == 'PolicySolicitOpinionProcessKey12' || - this.taskKey == 'PolicySolicitOpinionProcessKey13' || - this.taskKey == 'PolicySolicitOpinionProcessKey14' || - this.taskKey == 'PolicySolicitOpinionProcessKey15' || - this.taskKey == 'PolicySolicitOpinionProcessKey16') {//责任人任务处理 + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey9' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey10' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey12' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey13' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey14' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey15') {//责任人任务处理 this.closeButtonLoading() this.$refs.solicitationListRef.submit((row, ids) => { const json = Object.assign(this.dataForm); @@ -594,6 +609,7 @@ startProcessRollBack(roleForm) { const json = Object.assign(this.dataForm, roleForm); json.commentText = this.commentText + json.infoTableDatas = this.$refs.fetchListRef.infoTableDatas let query = { form: json, commentText: this.commentText @@ -601,7 +617,7 @@ this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, - type: '29', + type: '30', json: JSON.stringify(query) }, {_this: this}, res => { if (res.ok) { @@ -746,8 +762,10 @@ bpnId: this.bpnId }).then(res => { let mes = JSON.parse(res.mes); + console.log(mes); this.dataForm = mes.form this.$refs.personnelInformationRef.getData(mes.roleForm) + this.$refs.fetchListRef.getData(mes.form.infoTableDatas) this.commentText = mes.commentText this.dataLoading = false }); diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 415a25527..2b7c546e0 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -977,6 +977,14 @@ } }) break + case '30': + this.$router.push({ + path: 'policyComplianceReview', + query: { + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']),