From ea57efb5787fa89e4790410d78f27e4f44847fe9 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Tue, 19 Apr 2022 09:28:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052447=20=E5=9B=BD?= =?UTF-8?q?=E5=86=85=E7=9A=84=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E7=9A=84?= =?UTF-8?q?=E5=BD=92=E5=8F=A3=E7=AE=A1=E7=90=86=E9=83=A8=E9=97=A8=EF=BC=8C?= =?UTF-8?q?=E8=A6=81=E6=94=AF=E6=8C=81=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=9F=A5=E6=89=BE=E4=B8=8B=E6=8B=89=E9=A1=B9=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B9=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 2738ed61f..8e1af160b 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1768,11 +1768,16 @@ - - {{ opt.label }} - - + + + + + + From 3912897f16a5efe198f10a06bbe6b24d24e3992f Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Tue, 19 Apr 2022 09:49:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052587=20=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=BD=92=E6=A1=A3=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E5=90=8E=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=93=9D=E8=89=B2=E5=AD=97=E4=BD=93=20=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/nonConfomity/pages/historicalData.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index 192c3f3a5..f2c5ffc12 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -457,7 +457,7 @@ export default { let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { - id: item.id, + id: item.standId, pageType: 'INLAND_STAND' // pageType: item.standType + '_STAND' } From 56363b25dd88801ed93b604fd4e36c30d1759d2c Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Tue, 19 Apr 2022 10:02:21 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052589=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=20=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=20=E5=9C=88=E4=BD=8F=E7=9A=84=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=A1=86=E9=9C=80=E8=A6=81=E5=B1=95=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=9B=B4=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index cb13c7c2e..b3389d5ff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -437,6 +437,7 @@ v-model="plForm.technicalRequir" placeholder="请输入核心技术要求" maxlength="500" + :autosize="{minRows:10,maxRows:10}" > @@ -532,7 +533,7 @@ export default { BDmodel: false, PLmodalType: '', PLmodalIndex: '', - PLmodalshowflag: false, + PLmodalshowflag: true, PLmodalTitle: '', plForm: { itemsNum: '', From de705119e5c0be5f1e6daee48c1b8046e5f58e2a Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Tue, 19 Apr 2022 10:12:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052590=20=E9=A6=96?= =?UTF-8?q?=E9=A1=B5--=E4=BB=A3=E5=8A=9E=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=BD=93=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E8=B6=85=E9=95=BF?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E7=94=A8=E4=B8=89=E4=B8=AA=E7=82=B9=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E8=80=8C=E6=98=AF=E7=9B=B4=E6=8E=A5=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index a1c289dcd..6db629d24 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -9,13 +9,13 @@ From 74366493c0196e2c6406d80e1757be52e6a902d5 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Tue, 19 Apr 2022 10:24:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052600=20=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E8=AE=A1=E5=88=92-=E6=96=B0=E5=A2=9E=20=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=AE=8C=E8=B4=A3=E4=BB=BB=E5=8D=95=E4=BD=8D=E4=BA=86?= =?UTF-8?q?=20=E8=BF=98=E6=9C=89=E7=BA=A2=E8=89=B2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterpriseStandardPlan/index.vue | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index fa068aab2..7dd20272b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -809,7 +809,7 @@ {required: true, message: '请选择起草人', trigger: 'change'}, ], rqbJson: [ - {required: true, message: '请选择代替企标编号', trigger: 'change'}, + {required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']}, ] }, form: { @@ -1038,6 +1038,7 @@ } this.addForm.unit = list this.addForm.unitName = listName + this.$refs.addForm.validateField('unitName') this.modalshowflagZRBM = false }, choiceZRBM(id) { @@ -1161,7 +1162,32 @@ }, addData () { this.addDrawerTitle = '新增' - this.addForm = {} + this.addForm = { + bussSort:'', + esMatingRelations: '', + technologic: '', + useLevel: '', + isRelate: '', + esStandRelations: '', + area: [], + tsJson: '', + tsJsonName: '', + rqbJson: '', + rqbName: '', + unit: '', // 单位 + unitName: '', + esName: '', // 企标名称 + planStatus: '', // 计划状态 + reviseStatus: '', // 制修订状态 + resPerson: '', // 评审责任人 + resPersonName: '', + wgLeader: '', // 工作组组长 + wgLeaderName: '', + draftTime: '', // 计划标准初稿完成时间 + releaseTime: '', // 计划标准发布时间 + drafter: '', // 起草人 + drafterName: '' + } this.DrawerType = 'add' this.addForm.planStatus = '0' this.addDrawer = true From e35ad1a39fcc92599b1e85ac3c8ea92823229820 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Tue, 19 Apr 2022 10:26:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index b3389d5ff..ec130c6a5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -533,7 +533,7 @@ export default { BDmodel: false, PLmodalType: '', PLmodalIndex: '', - PLmodalshowflag: true, + PLmodalshowflag: false, PLmodalTitle: '', plForm: { itemsNum: '',