From 05ae32825daf3177a9ce33bc3777b4faca537f31 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 11:00:43 +0800
Subject: [PATCH 1/4] feat: There is no way the,
---
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index d6b350f39..cb1830288 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -977,7 +977,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
- :nodeKey="nodeKey" @popoverHide="popoverHide">
+ :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel">
+ :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel">
From c44ed3054896d2868a77129a6260c7b563634b4f Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 14:03:35 +0800
Subject: [PATCH 2/4] feat: There is no way the,
---
.../pages/creatProcess/zcrk/step1.vue | 95 ++++++++++---------
1 file changed, 48 insertions(+), 47 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 641508646..b577a8962 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -162,10 +162,10 @@
>
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{'手动查找'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -651,7 +658,7 @@
@@ -694,12 +701,11 @@
- {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSort }} {{ scope.row.standNumber }}
+ {{ scope.row.lawsNumber }}
{
@@ -1881,20 +1887,15 @@
})
}
this.selectedListRep.map((item) => {
- let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
- }
+ let texts = item.lawsNumber
textArr.push(texts)
textArr = [...new Set(textArr)]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
- if(this.replaceLawType === 'dtbjh'){
- this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+ if(this.replaceLawType === 'YYBZZCLAWS'){
+ this.form.YYBZZCLAWS = this.form.YYBZZCLAWS ? this.form.YYBZZCLAWS + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
@@ -1949,7 +1950,7 @@
this.replaceLawsNumForm.quoteIdList = ''
}
this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
- this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+ this.$http.get('lawss/sarLawsInfo/page', this.replaceLawsNumForm, {
_this: this,
loading: 'replaceLoading'
}, res => {
From 73c1c23f10bda87d4bc76f6fc3280e9a1e21e1a4 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 14:09:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=20-=20=E9=AB=98?=
=?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E8=A2=AB=E4=BB=A3=E6=9B=BF?=
=?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domesticStandardsAndRegulations/index.vue | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 3fdf0f328..8e20e6439 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1841,17 +1841,17 @@
-
-
-
-
-
- -->
+
+
+
+
+
+
From 92bfe58788a9ed63bf8151515e38cc1b7a661198 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 21 Dec 2021 14:12:24 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=BA=93=20-=20=E9=AB=98?=
=?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2=20-=20=E4=BD=93=E7=B3=BB=E7=B1=BB?=
=?UTF-8?q?=E5=88=AB=E6=94=B9=E6=88=90=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB?=
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 8e20e6439..acbf66a62 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1545,8 +1545,8 @@
-
-
+