diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index a098e5bef..7e4958433 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -142,6 +142,7 @@ > @@ -193,6 +195,7 @@ @@ -217,6 +220,7 @@ :disabled="acceptShow" class="datePickLen" clearable + @click.native="handlePrice(scope.row)" v-model="scope.row.completionTime" type="date" placeholder="请选择日期"> @@ -582,6 +586,7 @@ export default { }, data() { return { + comFlag: true, total: 0, currentPage: 1, pageSize: 20, @@ -640,20 +645,10 @@ export default { listForm: { projectNumber: "", //项目编号 projectName: "", //项目名称 - dataList: [ - { - complianceReasons: "", - zcComplianceReasons: "" - } - ], //项目下的标准数据 + dataList: [], //项目下的标准数据 children: [] //标准下的分解单数据 }, - dataList: [ - { - complianceReasons: "", - zcComplianceReasons: "" - } - ], //展示的标准数据 + dataList: [], //展示的标准数据 commentText: "", //审批意见 detailData: [], //流程历史数据 userId: this.$store.getters.userInfo.userId, @@ -716,54 +711,17 @@ export default { item.countermeasures = this.batchEditForm.countermeasures; //完成时间 item.completionTime = this.batchEditForm.completionTime; + }else if(item.standId === items){ + item.complianceReasons = this.batchEditForm.complianceReasons; + //不合规 + item.noCompliance = this.batchEditForm.noCompliance; + //应对措施 + item.countermeasures = this.batchEditForm.countermeasures; + //完成时间 + item.completionTime = this.batchEditForm.completionTime; } }); }); - // for (let a = 0; a < this.dataList.length; a++) { - // for (let b = 0; b < this.selectList.length; b++) { - // if (this.dataList[a].id === this.selectList[b]) { - // console.log('11'); - // //合规 - // this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons - // //不合规 - // this.dataList[a].noCompliance = this.batchEditForm.noCompliance - // //应对措施 - // this.dataList[a].countermeasures = this.batchEditForm.countermeasures - // //完成时间 - // this.dataList[a].completionTime = this.batchEditForm.completionTime - // //合规 - // this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons - // //不合规 - // this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance - // //应对措施 - // this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures - // //完成时间 - // this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime - // } else { - // for (let i = 0; i < this.dataList[a].children.length; i++) { - // if (this.dataList[a].children[i].id === this.selectList[b]) { - // //合规 - // this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons - // //不合规 - // this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance - // //应对措施 - // this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures - // //完成时间 - // this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime - // //合规 - // this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons - // //不合规 - // this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance - // //应对措施 - // this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures - // //完成时间 - // this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime - // } - // } - // } - // - // } - // } this.modalshowflag = false; }, cancelBatchEditForm() { @@ -871,6 +829,7 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { @@ -881,6 +840,9 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -897,6 +859,7 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; } else { @@ -904,6 +867,9 @@ export default { let dataChildren = [] let dataListChildren = [] this.listForm.dataList.forEach(item => { + if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){ + this.dataList.push(item) + } item.children.forEach(items=> { if(items.key === item.standId){ this.$set(items, "standName", item.standName); @@ -920,6 +886,7 @@ export default { dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item) }) + dataListChildren = this.dataList.concat(dataListChildren) this.dataList = dataListChildren this.total = this.dataList.length; // this.dataList = item.form.dataList[0].children; @@ -964,31 +931,46 @@ export default { this.isSubmit = false; }); }, + handlePrice(row){ + if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){ + this.comFlag = true + }else{ + this.comFlag = false + } + }, //提交事件 handleSubmit() { - this.isSubmit = true; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }, e => { - }); + // complianceReasons 合规原因 + // noCompliance 不合规项 + // countermeasures 应对措施 + //completionTime 完成时间 + if(!this.comFlag){ + this.$message.warning('请填写完整的不符合项信息') + }else{ + this.isSubmit = true; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }, e => { + }); + } }, //标准表格选择框改变 selectStandChange(data) { this.selectList = []; for (let i = 0; i < data.length; i++) { - this.selectList.push(data[i].id); + this.selectList.push(data[i].id || data[i].standId); localStorage.setItem("selectList", JSON.stringify(this.selectList)); } },