diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index e2122fbc4..b9b21b9ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -604,6 +604,7 @@ export default { totalNo: 0, pageSizeNo: this.$store.getters.userInfo.configContent, product: new Map(), + hisListForm:{}, listForm: { standNumber: "", //标准编号 standName: "",//标准名称 @@ -663,6 +664,7 @@ export default { getFormFieldList (item) { console.log(item); this.$nextTick(() => { + this.hisListForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum this.listForm.prcName = this.prcName @@ -929,11 +931,12 @@ export default { type: "5", json: { taskInfo: "选择已拆分标准", - form: this.listForm, + form: this.hisListForm, roleForm: this.roleForm, commentText: this.commentText } }; + let json = this.hisListForm this.$http.post("lawss/activiti/completeTaskNew", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue index 5846c6439..e41f61e51 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -280,6 +280,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList (item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)) this.listForm.prcNum = this.prcNum diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index d30dab66f..74e27f107 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -439,24 +439,45 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { + console.log(item); this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)); - this.listForm.prcNum = this.prcNum; - this.listForm.prcName = this.prcName; - this.listForm["id"] = item.id; - this.projectGroup = item.dataList[0].projectGroup; - this.$http.get('SarStandItems/sar-stand-items/findAllItems', { - ids: item.standId, - type: item.fileType - },{ - _this: this - }, res => { - this.breakdownList = res.data - this.breakdownList.map(item => { - delete item.termsConditions + if(!item.form){ + this.listForm = JSON.parse(JSON.stringify(item)); + this.listForm.prcNum = this.prcNum; + this.listForm.prcName = this.prcName; + this.listForm["id"] = item.id; + this.projectGroup = item.dataList[0].projectGroup; + this.$http.get('SarStandItems/sar-stand-items/findAllItems', { + ids: item.standId, + type: item.fileType + },{ + _this: this + }, res => { + this.breakdownList = res.data + this.breakdownList.map(item => { + delete item.termsConditions + }) }) - }) - this.getProductData(); + this.getProductData(); + }else{ + this.listForm = JSON.parse(JSON.stringify(item.form)); + this.commentText = item.commentText + this.dataList = item.dataList + this.projectGroup = item.dataList[0].projectGroup; + this.$http.get('SarStandItems/sar-stand-items/findAllItems', { + ids: item.form.standId, + type: item.form.fileType + },{ + _this: this + }, res => { + this.breakdownList = res.data + this.breakdownList.map(item => { + delete item.termsConditions + }) + }) + this.getProductData(); + } + }); }, choiceZRRS(row, type, index) { @@ -641,13 +662,14 @@ export default { //保存 handleSave() { this.saveLoading = true; - this.listForm.dataList = this.dataList; + // this.listForm.dataList = this.dataList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "5"); _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ form: this.listForm, + dataList: this.dataList, commentText: this.commentText })); saveTaskForPub(_formData).then(res => {