From 9a67cf3613fc6fc9b71d7eb0a6e4ad6e331e0203 Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 16:56:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?bug=EF=BC=9A=20=20=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B--=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9A=84=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E5=8A=A0=E6=A3=80=E7=B4=A2=EF=BC=8C=E5=8F=82?= =?UTF-8?q?=E8=80=83=E6=9C=9F=E6=9C=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 27 ++++++++++++++----- .../pages/creatProcess/bzrk/step2.vue | 15 +++++------ .../pages/creatProcess/bzrk/step3.vue | 11 ++++---- .../pages/creatProcess/bzrk/step4.vue | 10 +++---- .../pages/creatProcess/bzrk/step5.vue | 15 +++++------ 5 files changed, 45 insertions(+), 33 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c7ada11bb..e71c807e6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -554,11 +554,9 @@ :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - + + + @@ -963,7 +961,13 @@ :visible.sync="modalShowFlag" :wrapperClosable="false" size="800px"> + + - - - + + + + + - + + + @@ -795,6 +792,7 @@ export default { standStateOptions: [], // 文本状态 standSystemOptions: [], // 标准体系 applyArcticOptions: [], // 适用车型 + gkglbmOptions: [], // 归口管理部门 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 @@ -1054,6 +1052,7 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.key++ }) this.busVsFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 6c3ddd005..72d26af15 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -534,11 +534,9 @@ :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - + + + @@ -1225,6 +1223,7 @@ export default { modelOptions: [], // 模块体系架构 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 + gkglbmOptions: [], // 归口管理部门 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 wssmrOptions: [], // 我司署名人 @@ -1750,6 +1749,7 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.treeStatus = true this.key++ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index b062aa82e..1ab67e299 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -344,14 +344,11 @@ clearable > - - - + + + + + Date: Tue, 27 Jul 2021 17:04:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standInvolveProjectDetail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 5cfaa58ff..e881b4ce8 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -345,6 +345,7 @@ export default { this.querySarProStateZero() }, // 查看项目符合性 querySarProStateZero () { + this.sarProStateTotalPage = 1 var form = this.sarProStateEO // form.standId = this.standId form.current = this.sarProStateTotalPage From f305f2926148884d43c89f8e7f4d08d176ba9eea Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 17:06:01 +0800 Subject: [PATCH 3/5] bug --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index e71c807e6..82d2110e0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1683,6 +1683,7 @@ } }, saveUserInfo () { + this.filterText = '' if (this.userType === 'zrUserId') { this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",") this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",") @@ -1694,6 +1695,7 @@ this.modalShowFlag = false }, cancelUserInfo () { + this.filterText = '' this.modalShowFlag = false }, drawerCheck (data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 1ab67e299..cd985bbda 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -345,7 +345,7 @@ > - + From b669b0dc71547a6d72a4d9797a1d241ef1b050fb Mon Sep 17 00:00:00 2001 From: fanlin Date: Tue, 27 Jul 2021 17:20:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug=20=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 251 +++++++++++++++++- 1 file changed, 239 insertions(+), 12 deletions(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 6556822d2..dccbd54bf 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -261,9 +261,73 @@ 提交 - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -275,14 +339,19 @@ + + + + + v-model="sarStandardsSearch.standSort" + :placeholder="$t('m.standardCategoryTips')" + @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)" + :options="standSortOptions" + clearable/> @@ -296,20 +365,161 @@ + + + + + + + + + + + + + + {{ opt.label}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ opt.label}} + + + + + + {{ opt.label}} + + + + + + + {{ opt.label}} + + - {{ opt.label}} - - {{ opt.label}} + {{ opt.label}} + + + + {{ opt.label}} + + + + + + {{ opt.label}} + + + + + + {{ opt.label}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- +
+ 搜索 + 取消 +
+ Date: Tue, 27 Jul 2021 17:32:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bug:=20=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3=E4=B8=8B=E7=9A=84=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index bc158ef55..4986f378b 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3362,8 +3362,8 @@ export default { this.isSubmit = false if (res.ok) { this.personCollect.collectType = 'INLAND_STAND' - this.personCollect.id = this.id - this.personCollect.collectResId = this.collectId + this.personCollect.id = this.collectId + this.personCollect.collectResId = this.id this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')' this.personCollect.userId = this.$store.getters.userInfo.userId this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {