From 76e3c3d83202000d7ac3335a8ccdbf187fe9be92 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 25 May 2023 16:17:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E6=89=B9=E5=87=86-=E5=9B=9E=E6=98=BE=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/common/formList-1.vue | 7 +++++-- .../pages/creatProcess/qbrk/step11-1.vue | 11 ++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue index e08993ecf..4663ca0bf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue @@ -314,7 +314,7 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" row-key="id" - :data="form.infoList" + :data="modelData" border default-expand-all> { + // return new Promise((resolve, reject) => { inboundLiaisonDetail({ taskIds: this.taskIds, pId: this.pId @@ -2266,10 +2267,14 @@ this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName); + this.$nextTick(()=>{ + this.form.modelData = processForm.modelData + this.modelData = processForm.modelData + }) } }).catch(e => { }) - }) + // }) } }, processTable () { @@ -2325,7 +2330,7 @@ }) }, }, - mounted () { + created () { this.getData() this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { From cb3d62480753cfebeb1918b890e0028936192769 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 25 May 2023 16:56:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1.vue | 19 ++++++++++++------- .../domesticStandardsAndRegulations/index.vue | 4 ++-- .../foreignStandardsAndRegulations/index.vue | 4 ++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 31d856393..a33be077b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -179,7 +179,7 @@ - @@ -189,6 +189,7 @@ { + try { + this.form.modelData.forEach(item => { this.zrIdList.forEach(items => { - if (item.id === items) { - item.zrUserId = data[0].id - item.zrUserIdName = data[0].name - } + if (item.id === items) { + item.zrUserId = data[0].id + item.zrUserIdName = data[0].name + } }) - }) + }) + }catch (e) { + console.log(e) + } } if (this.userType === 'bzhUserId') { this.roleForm.bzhUserId = data[0].id diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index cbbcc6c94..f79f80ffa 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2844,7 +2844,7 @@ export default { standNumber: [ {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'}, - {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'} + // {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'} ], synopsis: [ {type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'} @@ -2879,7 +2879,7 @@ export default { standNumber: [ {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'}, - {validator: this.verify.validateStandardItem2, trigger: 'change'} + // {validator: this.verify.validateStandardItem2, trigger: 'change'} ], standYear: [ {required: true, message: '标准年份不能为空', trigger: 'change'}, diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 56bacabf5..523c3a413 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2434,7 +2434,7 @@ export default { standNumber: [ {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'}, - {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'} + // {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'} ], synopsis: [ {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'} @@ -2468,7 +2468,7 @@ export default { standNumber: [ {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'}, - {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'} + // {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'} ], standYear: [ // {required: true, message: '标准年份/系列不能为空', trigger: 'change'},