diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index b2d848d1b..187975a72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -397,7 +397,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, saveinboundTask } from "api/process"; +import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; export default { name: "bzqdfbStep3", @@ -693,16 +693,24 @@ export default { getFormFieldList (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.listForm.dataList = item.dataList - this.dataList = item.dataList - this.listForm.applyUpdUserId = item.applyUpdUserId - this.listForm.jlUserId = item.jlUserId - this.listForm.zrUserId = item.zrUserId - this.fileIds = item.fileId; - this.getFileInfo(); + if(item.form === undefined){ + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList + this.listForm.applyUpdUserId = item.applyUpdUserId + this.listForm.jlUserId = item.jlUserId + this.listForm.zrUserId = item.zrUserId + this.fileIds = item.fileId; + this.getFileInfo(); + } else { + this.listForm = item.form + this.dataList = item.form.dataList + this.listForm.dataList = item.form.dataList + this.fileIds = item.form.fileId; + this.getFileInfo(); + } }) }, //保存事件 @@ -713,23 +721,19 @@ export default { _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "4"); + _formData.append('taskIds', this.taskIds) _formData.append("json", JSON.stringify({ - taskInfo: '根据会签意见修订', form: this.listForm, - roleForm: this.roleForm, - prcNum: this.$route.query.prcNum, - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId, commentText: this.commentText })); - saveinboundTask(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.$router.push('/processCenter') - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + + // saveTaskForPub(_formData).then(res => { + // this.saveLoading = false; + // this.$message.success("保存成功"); + // this.bpnId = res.result; + // }).catch(e => { + // this.saveLoading = false; + // }); }, //提交事件 handleSubmit() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index baef49e58..66f7e7ff7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -531,13 +531,13 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - let mes = JSON.parse(res.mes); + console.log(mes.form.dataList); this.listForm = mes.form; this.roleForm = mes.roleForm; this.commentText = mes.commentText; this.dataList = mes.form.dataList; this.dataList.forEach(item => { - if(!item.projectLine){ + if(!item.productLine){ this.dataList = null } }) @@ -760,8 +760,9 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length == 1) { - this.listForm.standNumber = this.selectedList[0].standNumber; + this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.standType = this.selectedList[0].standType; this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index a36e82cb4..fd53bcbf2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -470,6 +470,7 @@ export default { listForm: { standNumber: "", //标准编号 standName: "",//标准名称 + standType: "", //标准类型 XCXSSRQ: "", //新车型实施日期 ZCCSSRQ: "", //在产车实施日期 certifiedEngineer: "", //认证工程师 @@ -732,8 +733,9 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length === 1) { - this.listForm.standNumber = this.selectedList[0].standSortShow + '-' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; + this.listForm.standNumber = this.selectedList[0].standSortShow + '\xa0\xa0' + this.selectedList[0].standNumber + '-' + this.selectedList[0].standYear ; this.listForm.standName = this.selectedList[0].standName; + this.listForm.standType = this.selectedList[0].standType; this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id;