From e86d53e7f83f666f0a106236ac03f58795aa7f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 15 Dec 2021 09:08:11 +0800
Subject: [PATCH 1/8] commit
---
src/pages/processCenter/pages/newProcess/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index fd8e38103..5e8c2d695 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -125,14 +125,14 @@
-
-
+
+
From 448484691a21bf70d70cdfd565237eb8d0dea07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 15 Dec 2021 09:12:26 +0800
Subject: [PATCH 2/8] commit
---
.../processCenter/pages/newProcess/index.vue | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 5e8c2d695..726e0d607 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -139,6 +139,21 @@
+
+
+
+
+
+
![]()
+
+
+
+
+
+
-
-
-
-
-
-
![]()
-
-
-
-
-
-
From 8f30e36ec5f37716f73bd798cfb00f67f65198da Mon Sep 17 00:00:00 2001
From: shenyanpei
Date: Wed, 15 Dec 2021 10:16:49 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/process.js | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/api/process.js b/src/api/process.js
index 132ac33b5..1d8b7a763 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -681,3 +681,11 @@ export function getStandInfoById (data) {
params: data
})
}
+// 标准法规工作组接口
+export function workGroup(data) {
+ return axios({
+ url: 'api/wg_work_group/researchData',
+ method: 'get',
+ params: data
+ })
+}
From 4703d2d42531c31ec88af7f0ecd4313c7ddf6e80 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 15 Dec 2021 10:30:37 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../details/otherStandardDetails/index.vue | 70 +++++++++----------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 84fe82c79..970392e3e 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3235,41 +3235,41 @@ export default {
}, {
_this: this
}, res => {
- displayLocation.map(item => {
- if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
- item.child.forEach(items =>{
- let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry"));
- if (accessCountry.country === undefined) {
- accessCountry.country = '文本'
- }
- if(items.attrField === 'SSRQ') {
- items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':'
- if (accessCountry.ssrq !== undefined) {
- item.value = accessCountry.ssrq
- }
- } else if (items.attrField === 'ZCCSSRQ') {
- items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':'
- if (accessCountry.zccssrqgj !== undefined) {
- item.value = accessCountry.zccssrqgj
- }
- } else if(items.attrField === 'XCXSSRQ') {
- items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':'
- if (accessCountry.xcxssrqgj !== undefined) {
- item.value = accessCountry.xcxssrqgj
- }
-
- }
- })
- for (let key in res.data) {
- item.one.push({
- attrName: key,
- value: res.data[key].join(','),
- isShowImp: '0',
- id: key
- })
- }
- }
- })
+ // displayLocation.map(item => {
+ // if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
+ // item.child.forEach(items =>{
+ // let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry"));
+ // if (accessCountry.country === undefined) {
+ // accessCountry.country = '文本'
+ // }
+ // if(items.attrField === 'SSRQ') {
+ // items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':'
+ // if (accessCountry.ssrq !== undefined) {
+ // item.value = accessCountry.ssrq
+ // }
+ // } else if (items.attrField === 'ZCCSSRQ') {
+ // items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':'
+ // if (accessCountry.zccssrqgj !== undefined) {
+ // item.value = accessCountry.zccssrqgj
+ // }
+ // } else if(items.attrField === 'XCXSSRQ') {
+ // items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':'
+ // if (accessCountry.xcxssrqgj !== undefined) {
+ // item.value = accessCountry.xcxssrqgj
+ // }
+ //
+ // }
+ // })
+ // for (let key in res.data) {
+ // item.one.push({
+ // attrName: key,
+ // value: res.data[key].join(','),
+ // isShowImp: '0',
+ // id: key
+ // })
+ // }
+ // }
+ // })
this.dynamicFormField = displayLocation
})
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
From a6f0ee7322b516134828ae17dadf6d28b1fe978d Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 15 Dec 2021 10:35:00 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E9=80=82=E7=94=A8=E8=BD=A6=E5=9E=8B?=
=?UTF-8?q?=EF=BC=8C=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=80=82?=
=?UTF-8?q?=E7=94=A8=E4=BA=A7=E5=93=81=E7=BA=BF=EF=BC=8C=E9=80=82=E7=94=A8?=
=?UTF-8?q?=E8=AE=A4=E8=AF=81=EF=BC=8C=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?=
=?UTF-8?q?=EF=BC=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B=E5=B8=88=EF=BC=9A?=
=?UTF-8?q?=E5=8D=95=E9=80=89=E6=94=B9=E5=A4=9A=E9=80=89=EF=BC=8C=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step4.vue | 180 ++++++++++++------
1 file changed, 124 insertions(+), 56 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 7cdc5ac8b..d96aa2ad4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -704,6 +704,14 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+