diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue index 4eed2dcd0..fcd8260b8 100644 --- a/src/components/CustomFormComponents/DatePickerGroup.vue +++ b/src/components/CustomFormComponents/DatePickerGroup.vue @@ -163,6 +163,7 @@ export default { } }, mounted () { + console.log(this.config); this.tagList = this.value !== '' && this.value !== null && typeof (this.value) !== 'undefined' ? this.value.split(',') : [] } } diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue index 16727a8e8..390e63cc5 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue @@ -399,7 +399,7 @@ this.$nextTick(()=>{ this.multipleTableItemForm = {} this.multipleTableItemForm = {...this.multipleTableItemForm} - this.$refs['multipleTableItemRef'].resetFields() + this.$refs['multipleTableItemRef'].clearValidate() }) }, cancel() { diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionEdit.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionEdit.vue new file mode 100644 index 000000000..6f651d9bc --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionEdit.vue @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionList.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionList.vue index e811471ae..e016ce453 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionList.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionList.vue @@ -6,7 +6,7 @@ tooltip-effect="dark" border style="width: 100%;" - height="100%" + height="500" :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + 编辑 + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue index f97cfd2bb..43be19abd 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue @@ -1,7 +1,7 @@ - + 调取 删除 @@ -225,8 +225,18 @@ } ], deleteSelectedList: [], + taskKey: this.$route.query.taskDefinitionKey, } }, + computed:{ + showTableButton() { + if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey3') { + return true + } + return false + }, + }, methods: { getData(row) { this.infoTableDatas = row diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue index 3b6736d5b..517d6df80 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue @@ -40,11 +40,11 @@ - @@ -242,8 +242,8 @@ endTime: [ {required: true, message: '请选择截止时间', trigger: 'change'}, ], - responsibleUnitDeadline: [ - {required: true, message: '请选择责任单位截止时间', trigger: 'change'}, + approvalUnitDeadline: [ + {required: true, message: '请选择审批单位截止时间', trigger: 'change'}, ], zrrUserNames: [ {required: true, message: '请选择责任人', trigger: 'change'}, @@ -275,6 +275,7 @@ isSubmit: false, isReject: false, roleForm: {}, + departmentList: [], } }, computed: { @@ -372,27 +373,29 @@ return false }, isBusinessDivisionList() { - if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || + 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.taskKey == 'PolicyComplianceProgramReviewProcessKey15') && + this.dataForm.departmentType == 'undertaking') { return true } return false }, isProductPlanningList() { - if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || + 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.taskKey == 'PolicyComplianceProgramReviewProcessKey15') && + this.dataForm.departmentType == 'productPlanning') { return true } return false @@ -511,8 +514,49 @@ }) } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey2' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey4' || - this.taskKey == 'PolicyComplianceProgramReviewProcessKey5' || - this.taskKey == 'PolicyComplianceProgramReviewProcessKey7') { //审核、审定、批准、责任人分配任务 + this.taskKey == 'PolicyComplianceProgramReviewProcessKey5') { //审核、审定、批准、责任人分配任务 + const json = Object.assign(this.dataForm); + json.commentText = this.commentText + json.approvalFlag = 0 + let query = { + form: json, + commentText: this.commentText + } + this.completeTask(this.$route.query.taskIds, query) + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey7') { + let undertaking = this.departmentList[0].institutionName.includes('事业') + let productPlanning = this.departmentList[0].institutionName.includes('产品规划') + for (let i = 0; i < this.departmentList.length; i++) { + if (this.departmentList[i].institutionName.includes('事业') || + this.departmentList[i].institutionName.includes('产品规划')) { + if (undertaking) { + if (this.departmentList[i].institutionName.includes('产品规划')) { + this.$message.warning("只能选择同一个部门的人员"); + this.closeButtonLoading() + return + } + } + if (productPlanning) { + if (this.departmentList[i].institutionName.includes('事业')) { + this.$message.warning("只能选择同一个部门的人员"); + this.closeButtonLoading() + return + } + } + } else { + this.$message.warning("只能选择事业部人员或产品规划部人员"); + this.closeButtonLoading() + return + } + } + if (productPlanning) { + this.dataForm.departmentType = 'productPlanning' + } else if (undertaking) { + this.dataForm.departmentType = 'undertaking' + } else { + this.$message.warning("请选择责任人"); + return + } const json = Object.assign(this.dataForm); json.commentText = this.commentText json.approvalFlag = 0 @@ -543,19 +587,22 @@ this.taskKey == 'PolicyComplianceProgramReviewProcessKey14' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey15') {//责任人任务处理 this.closeButtonLoading() - this.$refs.solicitationListRef.submit((row, ids) => { - const json = Object.assign(this.dataForm); - json.commentText = this.commentText - json.approvalFlag = 0 - let query = { - form: json, - policySolicitOpinionEOList: row, - removeIds: ids, - commentText: this.commentText - } - this.openButtonLoading() - this.completeTask(this.$route.query.taskIds, query) - }) + if (this.dataForm.departmentType == 'undertaking') { + this.$refs.businessDivisionListRef.submit((row) => { + console.log(row); + return + const json = Object.assign(this.dataForm); + json.commentText = this.commentText + json.infoTableDatas = row + json.approvalFlag = 0 + let query = { + form: json, + commentText: this.commentText + } + this.openButtonLoading() + this.completeTask(this.$route.query.taskIds, query) + }) + } } } else { return this.$message.warning('请完善基础信息') @@ -670,6 +717,7 @@ names.push(data[i].name) } } + this.departmentList = [] if (this.selectType == '转办处理人') { changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -687,6 +735,8 @@ } }) } else if (this.selectType == '责任人') { + this.departmentList = data + console.log(this.departmentList); this.dataForm.zrrUserIds = ids.join(',') this.dataForm.zrrUserNames = names.join(',') this.dataForm = {...this.dataForm} @@ -755,6 +805,15 @@ if (this.showPersonnel) { this.$refs.personnelInformationRef.getData(row.form) } + if (this.isFetchList) { + this.$refs.fetchListRef.getData(row.form.infoTableDatas) + } + console.log(this.isBusinessDivisionList); + if (this.isBusinessDivisionList) { + this.$nextTick(() => { + this.$refs.businessDivisionListRef.getData(row.form.infoTableDatas) + }) + } }, getTaskDraftData() { this.dataLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue index 91e823422..abbf069f1 100644 --- a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue @@ -129,7 +129,7 @@ { type: "string", max: 200, - message: "章节编号不能超过100个字符", + message: "章节编号不能超过200个字符", trigger: "blur" } ], @@ -137,7 +137,7 @@ { type: "string", max: 200, - message: "章节条目不能超过100个字符", + message: "章节条目不能超过200个字符", trigger: "blur" } ], @@ -145,7 +145,7 @@ { type: "string", max: 200, - message: "修改前不能超过100个字符", + message: "修改前不能超过200个字符", trigger: "blur" } ], @@ -153,7 +153,7 @@ { type: "string", max: 200, - message: "修改后不能超过100个字符", + message: "修改后不能超过200个字符", trigger: "blur" } ], @@ -161,7 +161,7 @@ { type: "string", max: 200, - message: "修改理由不能超过100个字符", + message: "修改理由不能超过200个字符", trigger: "blur" } ], @@ -169,7 +169,7 @@ { type: "string", max: 200, - message: "处理意见不能超过100个字符", + message: "处理意见不能超过200个字符", trigger: "blur" } ], @@ -177,7 +177,7 @@ { type: "string", max: 200, - message: "处理原因不能超过100个字符", + message: "处理原因不能超过200个字符", trigger: "blur" } ], @@ -185,7 +185,7 @@ { type: "string", max: 200, - message: "原因不能超过100个字符", + message: "原因不能超过200个字符", trigger: "blur" } ], diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index b875e6b86..40aa28e3d 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2266,6 +2266,19 @@ } }) break + case '30': + this.$router.push({ + path: 'policyComplianceReview', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + taskDefinitionKey: row.taskDefinitionKey + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']),