From 79dacb01de27a85951128280c00990be10ab570a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sun, 8 Aug 2021 11:46:38 +0800 Subject: [PATCH 1/4] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 4 ++-- .../pages/creatProcess/bzjd/step1.vue | 4 ++-- .../pages/creatProcess/bzjd/step2.vue | 4 ++-- .../pages/creatProcess/bzjd/step3.vue | 14 +++++++------- .../pages/creatProcess/bzjd/step4.vue | 4 ++-- .../pages/creatProcess/bzjd/step5.vue | 4 ++-- .../pages/creatProcess/bzjd/step6.vue | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 2bd84c26a..edcdc36b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -103,13 +103,13 @@ + + - - - - - - Date: Sun, 8 Aug 2021 13:37:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step3.vue | 52 ++++++++++--------- .../pages/creatProcess/xmpg/step1-1.vue | 7 +-- .../pages/creatProcess/xmpg/step1.vue | 4 +- 3 files changed, 35 insertions(+), 28 deletions(-) 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; From dd8b15406cc3d96aca3b96f7e9b5085a8ef1559b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 8 Aug 2021 14:16:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue | 3 ++- src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 1 + src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step6.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step7.vue | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 66f7e7ff7..5e3894f7f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -531,7 +531,7 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - console.log(mes.form.dataList); + let mes = JSON.parse(res.mes); this.listForm = mes.form; this.roleForm = mes.roleForm; this.commentText = mes.commentText; @@ -763,6 +763,7 @@ export default { 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.standId = this.selectedList[0].id; 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 fd53bcbf2..ad4acb396 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -736,6 +736,7 @@ export default { 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.standId = this.selectedList[0].id; this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj this.listForm.id = this.selectedList[0].id; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 06ec3df9c..6b7dfb9d1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -64,7 +64,7 @@ style="width: 100%" border @selection-change="selectStandChange" - :height="sarProStateTableHeight" + height="56%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> Date: Sun, 8 Aug 2021 14:44:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86--?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/index.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index fd2a4796b..1d6be7da5 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -186,12 +186,20 @@ prop="standNumber" label="标准号/政策号" align="center"> + +