From 50427275dc8086c2ac5f0dbaae44c1a2afa4b933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 26 Oct 2023 14:29:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=87=8D=E7=82=B9=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=A0=87=E5=87=86/=E6=94=BF=E7=AD=96=E5=90=88?= =?UTF-8?q?=E8=A7=84=E6=80=A7=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/productPlanningList.vue | 6 +-- .../policyComplianceReview/index.vue | 38 +++++++++---------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue index 60d3cee37..0da547b0c 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue @@ -351,18 +351,18 @@ getData(row) { this.infoTableDatas = row.infoTableDatas || [] this.infoTableDatas = [...this.infoTableDatas] - this.multipleTableData = row.cpghDataList || [] + this.multipleTableData = row.cpghbDataList || [] this.multipleTableData = [...this.multipleTableData] }, submit(callback) { if (this.multipleTableData && this.multipleTableData.length > 0) { - callback && callback(this.multipleTableData,this.deleteList) + callback && callback(this.multipleTableData,this.deleteList.join(',')) } else { this.$message.warning('请至少添加一条数据') } }, save(callback) { - callback && callback(this.multipleTableData,this.deleteList) + callback && callback(this.multipleTableData,this.deleteList.join(',')) }, } } diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue index a0b9d2505..058caa0c1 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue @@ -192,9 +192,9 @@ import processFile from "../../components/processFile"; import approvalHistory from "./components/approvalHistory";//审批历史 import personnelInformation from "./components/personnelInformation";//人员信息 - import fetchList from "./components/fetchList"; - import businessDivisionList from "./components/businessDivisionList"; - import productPlanningList from "./components/productPlanningList"; + import fetchList from "./components/fetchList";//未选择责任人时的列表 + import businessDivisionList from "./components/businessDivisionList";//责任人为事业部时的列表 + import productPlanningList from "./components/productPlanningList";//责任人为产品规划部的列表 import { queryTaskFirst, saveTaskFirst, @@ -263,20 +263,20 @@ } }, computed: { - showPersonnel() { + showPersonnel() {//显示人员信息 if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey3') { return true } return false }, - showApprovalHistory() { + showApprovalHistory() {//显示历史记录 if (!this.taskKey) { return false } return true }, - disabledXX() { + disabledXX() {//是否可以操作基础信息 if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey3') { return false @@ -346,7 +346,7 @@ return false }, - isFetchList() { //是否展示征求意见列表 + isFetchList() {//根据流程节点判断 是否展示列表 if (!this.taskKey || this.taskKey == 'PolicyComplianceProgramReviewProcessKey1' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey2' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey3' || @@ -357,7 +357,7 @@ } return false }, - isBusinessDivisionList() { + isBusinessDivisionList() {//根据流程节点判断 展示责任人为事业部的列表 if ((this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey9' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey10' || @@ -371,7 +371,7 @@ } return false }, - isProductPlanningList() { + isProductPlanningList() {//根据流程节点判断 展示责任人为产品规划部的列表 if ((this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey9' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey10' || @@ -453,7 +453,6 @@ saveTaskForPub(_formData).then(res => { this.closeButtonLoading() this.$message.success("保存成功"); - this.$refs.solicitationListRef.getData() }).catch(e => { this.closeButtonLoading() }); @@ -470,7 +469,6 @@ saveTaskForPub(_formData).then(res => { this.closeButtonLoading() this.$message.success("保存成功"); - this.$refs.solicitationListRef.getData() }).catch(e => { this.closeButtonLoading() }); @@ -490,7 +488,6 @@ saveTaskForPub(_formData).then(res => { this.closeButtonLoading() this.$message.success("保存成功"); - this.$refs.solicitationListRef.getData() }).catch(e => { this.closeButtonLoading() }); @@ -500,7 +497,7 @@ let dataForm = JSON.parse(JSON.stringify(this.dataForm)) this.$refs.solicitationListRef.save((row, ids) => { _formData.append("taskIds", this.$route.query.taskIds); - dataForm.cpghDataList = row + dataForm.cpghbDataList = row _formData.append("json", JSON.stringify({ form: this.dataForm, commentText: this.commentText, @@ -510,7 +507,6 @@ saveTaskForPub(_formData).then(res => { this.closeButtonLoading() this.$message.success("保存成功"); - this.$refs.solicitationListRef.getData() }).catch(e => { this.closeButtonLoading() }); @@ -644,14 +640,15 @@ this.completeTask(this.$route.query.taskIds, query) }) } else if (this.dataForm.departmentType == 'productPlanning') {//产品规划部提交 - this.$refs.productPlanningListRef.submit((row) => { + this.$refs.productPlanningListRef.submit((row, ids) => { const json = Object.assign(this.dataForm); json.commentText = this.commentText - json.cpghDataList = row + json.cpghbDataList = row json.approvalFlag = 0 let query = { form: json, - commentText: this.commentText + commentText: this.commentText, + removeIds: ids, } this.openButtonLoading() this.completeTask(this.$route.query.taskIds, query) @@ -691,14 +688,15 @@ this.completeTask(this.$route.query.taskIds, query) }) } else if (this.dataForm.departmentType == 'productPlanning') {//产品规划部驳回 - this.$refs.productPlanningListRef.save((row) => { + this.$refs.productPlanningListRef.save((row, ids) => { const json = Object.assign(this.dataForm); json.commentText = this.commentText - json.cpghDataList = row + json.cpghbDataList = row json.approvalFlag = 1 let query = { form: json, - commentText: this.commentText + commentText: this.commentText, + removeIds: ids } this.openButtonLoading() this.completeTask(this.$route.query.taskIds, query)