From 8939637e586f73b93671bd135e10df0aa43ad4d0 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 16:43:27 +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/addModel.vue | 238 +++++++++--------- .../components/productPlanningList.vue | 68 +++-- .../policyComplianceReview/index.vue | 41 +-- 3 files changed, 186 insertions(+), 161 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue index 540cc9d04..4945de102 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue @@ -14,201 +14,193 @@ - - - - - - + - - + - - + + {{ item.lawName }} - + - - - - - - - - - - - - - - - - + - + - - + + - - + @@ -232,164 +224,166 @@ return { multipleTableTitle: '', multipleTableItemDialog: false, - multipleTableItemForm: {}, + multipleTableItemForm: { + infoTableData: {}, + }, infoTableDatas: [], multipleTableItemFormRules: { - yewu: [ + business: [ { required: true, message: '请输入业务名称', trigger: 'blur' } ], - pingtai: [ + platform: [ { required: true, message: '请输入平台', trigger: 'blur' } ], - xiangmu: [ + project: [ { required: true, - message: '请输入项目名称', + message: '请输入项目', trigger: 'blur' } ], - xiangmumiaoshu: [ + projectDescription: [ { required: false, message: '请输入项目描述', trigger: 'blur' } ], - dangqianjiedian: [ + currentNode: [ { required: false, message: '请输入当前节点', trigger: 'blur' } ], - G0: [ + gZeroDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G1: [ + gOneDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G2: [ + gTwoDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G3: [ + gThreeDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G4: [ + gFourDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G5: [ + gFiveDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G6: [ + gSixDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G7: [ + gSevenDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G8: [ + gEightDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G9: [ + gNineDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G10: [ + gTenDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G11: [ + gElevenDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G12: [ + gTwelveDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - G13: [ + gThirteenDate: [ { required: true, message: '请选择时间', trigger: 'change' } ], - gainianzhuangtai: [ + conceptualState: [ { required: true, message: '请输入概念状态', trigger: 'blur' } ], - gainianzhuangtaiDate: [ + conceptPlanReleaseTime: [ { required: true, message: '请选择概念计划下发时间', trigger: 'change' } ], - gainianxiudingjihua: [ + conceptRevisionPlan: [ { required: true, message: '请输入概念修订计划', trigger: 'blur' } ], - qitashuoming: [ + additionalNotes: [ { required: false, message: '请输入其他说明', @@ -405,7 +399,9 @@ this.multipleTableItemDialog = true this.infoTableDatas = JSON.parse(JSON.stringify(list)) this.multipleTableTitle = '新增' - this.multipleTableItemForm = {} + this.multipleTableItemForm = { + infoTableData: {}, + } this.multipleTableItemForm = {...this.multipleTableItemForm} this.$nextTick(() => { this.$refs['multipleTableItemRef'].clearValidate() @@ -428,11 +424,12 @@ this.$refs['multipleTableItemRef'].validate((valid) => { if (valid) { let timestamp = new Date().getTime(); - if (!this.multipleTableItemForm.dataId && !this.multipleTableItemForm.id) { - this.multipleTableItemForm.dataId = timestamp + let multipleTableItemForm = JSON.parse(JSON.stringify(this.multipleTableItemForm)) + if (!multipleTableItemForm.dataId && !multipleTableItemForm.id) { + multipleTableItemForm.dataId = timestamp } this.isSubmit = true - this.$emit('addModelForm', this.multipleTableItemForm) + this.$emit('addModelForm', multipleTableItemForm) this.multipleTableItemDialog = false this.$nextTick(() => { this.isSubmit = false @@ -448,4 +445,13 @@ .demo-drawer-footer { height: 70px !important; } + + ::v-deep .add-form-item { + width: 100%; + } + + ::v-deep .el-form-item__content { + width: calc(100% - 200px); + } + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue index 0da547b0c..55e1bba28 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue @@ -32,13 +32,13 @@ label="业务" show-overflow-tooltip align="center" - prop="yewu" + prop="business" width="150" > 0) { + this.multipleTableData.forEach(res => { + if (res.infoTableData) { + res.infoTableData = JSON.parse(res.infoTableData) + } + }) + } this.multipleTableData = [...this.multipleTableData] }, submit(callback) { if (this.multipleTableData && this.multipleTableData.length > 0) { - callback && callback(this.multipleTableData,this.deleteList.join(',')) + let multipleTableItemForm = JSON.parse(JSON.stringify(this.multipleTableData)) + for (let i = 0; i < multipleTableItemForm.length > 0; i++) { + multipleTableItemForm[i].infoTableData = JSON.stringify(multipleTableItemForm[i].infoTableData) + } + callback && callback(multipleTableItemForm, this.deleteList.join(',')) } else { this.$message.warning('请至少添加一条数据') } }, save(callback) { - callback && callback(this.multipleTableData,this.deleteList.join(',')) + let multipleTableItemForm = JSON.parse(JSON.stringify(this.multipleTableData)) + for (let i = 0; i < multipleTableItemForm.length > 0; i++) { + multipleTableItemForm[i].infoTableData = JSON.stringify(multipleTableItemForm[i].infoTableData) + } + callback && callback(multipleTableItemForm, this.deleteList.join(',')) }, } } diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue index 058caa0c1..12e35318a 100644 --- a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue @@ -360,13 +360,15 @@ isBusinessDivisionList() {//根据流程节点判断 展示责任人为事业部的列表 if ((this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey9' || - this.taskKey == 'PolicyComplianceProgramReviewProcessKey10' || - this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey10') && + this.dataForm.departmentType == 'undertaking') { + return true + } else if ((this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey12' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey13' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey14' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey15') && - this.dataForm.departmentType == 'undertaking') { + this.dataForm.sybDataList && this.dataForm.sybDataList.length > 0) { return true } return false @@ -374,13 +376,15 @@ isProductPlanningList() {//根据流程节点判断 展示责任人为产品规划部的列表 if ((this.taskKey == 'PolicyComplianceProgramReviewProcessKey8' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey9' || - this.taskKey == 'PolicyComplianceProgramReviewProcessKey10' || - this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' || + this.taskKey == 'PolicyComplianceProgramReviewProcessKey10') && + this.dataForm.departmentType == 'productPlanning') { + return true + } else if ((this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey12' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey13' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey14' || this.taskKey == 'PolicyComplianceProgramReviewProcessKey15') && - this.dataForm.departmentType == 'productPlanning') { + this.dataForm.cpghbDataList && this.dataForm.cpghbDataList.length > 0) { return true } return false @@ -492,14 +496,14 @@ this.closeButtonLoading() }); }) - } else if (this.data.departmentType == 'productPlanning') {//产品规划部保存 + } else if (this.dataForm.departmentType == 'productPlanning') {//产品规划部保存 let _formData = new FormData(); let dataForm = JSON.parse(JSON.stringify(this.dataForm)) - this.$refs.solicitationListRef.save((row, ids) => { + this.$refs.productPlanningListRef.save((row, ids) => { _formData.append("taskIds", this.$route.query.taskIds); dataForm.cpghbDataList = row _formData.append("json", JSON.stringify({ - form: this.dataForm, + form: dataForm, commentText: this.commentText, removeIds: ids, currentUserId: this.$store.getters.userInfo.userId @@ -550,9 +554,14 @@ this.startProcessRollBack(row) }) }) - } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey2' || - this.taskKey == 'PolicyComplianceProgramReviewProcessKey4' || - this.taskKey == 'PolicyComplianceProgramReviewProcessKey5') { //审核、审定、批准 + } else if (this.taskKey == 'PolicyComplianceProgramReviewProcessKey2' ||//审核 + this.taskKey == 'PolicyComplianceProgramReviewProcessKey4' ||//审定 + this.taskKey == 'PolicyComplianceProgramReviewProcessKey5' ||//批准 + this.taskKey == 'PolicyComplianceProgramReviewProcessKey11' ||//管理员 + this.taskKey == 'PolicyComplianceProgramReviewProcessKey12' ||//审核 + this.taskKey == 'PolicyComplianceProgramReviewProcessKey13' ||//审定 + this.taskKey == 'PolicyComplianceProgramReviewProcessKey14' ||//批准 + this.taskKey == 'PolicyComplianceProgramReviewProcessKey15') { //抄送 const json = Object.assign(this.dataForm); json.commentText = this.commentText json.approvalFlag = 0 @@ -619,12 +628,7 @@ })//责任人任务处理 } 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.taskKey == 'PolicyComplianceProgramReviewProcessKey10') {//责任单位审批 this.closeButtonLoading() if (this.dataForm.departmentType == 'undertaking') {//事业部提交 this.$refs.businessDivisionListRef.submit((row) => { @@ -857,7 +861,6 @@ }, formProcessing(row) { this.dataForm = row.form - // this.dataForm.departmentType = 'productPlanning' this.dataForm = {...this.dataForm} if (this.showPersonnel) {//拿到人员信息的数据 this.$refs.personnelInformationRef.getData(row.form)