diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 266344463..07e605e5a 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -66,6 +66,15 @@ :loading="submitLoading" v-if="showSubmit" >{{ submitBTNTextShow }} + 确认 @@ -131,6 +140,10 @@ export default { type: Boolean, default: false }, + showConfirm: { + type: Boolean, + default: false + }, // 是否显示委托按钮 showEntrust: { type: Boolean, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue index fb27029e4..76bcc77c7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -349,14 +349,15 @@ export default { //动态表单读取 getFormFieldList(item) { this.$nextTick(() => { - this.qdform = JSON.parse(JSON.stringify(item)); - this.qdform.prcNum = this.prcNum; - this.qdform.prcName = this.prcName; - this.qdform["id"] = item.id; - this.projectId = item.projectId; - this.detailedId = item.detailedListId; - this.getStandData(); - this.getStand(); + if(item.form === undefined){ + this.qdform = JSON.parse(JSON.stringify(item)); + this.qdform.prcNum = this.prcNum; + this.qdform.prcName = this.prcName; + this.qdform["id"] = item.id; + }else{ + this.qdform = item.form + this.dataList =item.form.dataList + } }); }, //查询清单下的标准 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index d6786ff8b..ec81787ca 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -382,10 +382,13 @@ @@ -395,7 +398,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, queryDetail } from "api/process"; +import { inboundLiaisonDetail, queryDetail, saveTaskForPub } from "api/process"; export default { name: "xmqdqrStep2", @@ -517,14 +520,22 @@ export default { //动态表单读取 getFormFieldList(item) { this.$nextTick(() => { - this.qdform = JSON.parse(JSON.stringify(item)); - this.qdform.prcNum = this.prcNum; - this.qdform.prcName = this.prcName; - this.qdform["id"] = item.id; - // this.projectId = item.projectId; - this.detailedId = item.detailedListId; - // this.getStandData(); - this.getStand(); + if(item.form === undefined){ + this.qdform = JSON.parse(JSON.stringify(item)); + this.qdform.prcNum = this.prcNum; + this.qdform.prcName = this.prcName; + this.qdform["id"] = item.id; + // this.projectId = item.projectId; + //获取清单id 查询对应清单下的标准 + this.detailedId = item.detailedListId; + // this.getStandData(); + this.getStand(); + }else{ + this.qdform = item.form + this.dataList =item.form.dataList + this.detailedId = item.form.detailedListId; + this.getStand(); + } }); }, //查询清单下的标准 @@ -549,6 +560,26 @@ export default { // }); // }); // }, + //保存事件 + handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + this.qdform.dataList = this.dataList + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "10"); + _formData.append('taskIds', this.taskIds) + _formData.append("json", JSON.stringify({ + form: this.qdform, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); + }, //提交事件 handleSubmit() { this.isSubmit = true; @@ -623,7 +654,7 @@ export default { this.standList.map(item => { let addIndex addIndex = this.dataList.findIndex(items =>{ - return items.standId === item.id + return items.id === item.id }) if(addIndex > -1){ this.$message.warning('请勿重复添加数据') @@ -656,7 +687,8 @@ export default { this.pageSize = pageSize; this.getStand(); }, - getStand(data) { + //查询清单下的标准 + getStand() { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: this.detailedId, page: this.page,