From 292c91acf69bde647abf24381dc3e969861624a6 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 27 Dec 2021 10:45:02 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?= =?UTF-8?q?=20=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=20-=20?= =?UTF-8?q?=E6=88=91=E5=8F=B8=E5=8F=82=E4=B8=8E=E5=88=B6=E6=A0=87=E6=8E=92?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 14 ++++++++++++++ .../pages/creatProcess/bzrk/step4.vue | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 27e97489d..98d416e6a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -745,6 +745,17 @@ > + + + + + @@ -1511,6 +1522,7 @@ qcdw: [], // 起草单位 wssmr: [], // 我司署名人 cysd: '', // 我司参与深度 + cyzbpm:[],// 我司参与制标排名 cllx: [], // 适用车型 nylx: [],// 能源类型 sycpx: [],// 适用产品线 @@ -1616,6 +1628,7 @@ options:[] }, // 适用认证 cysdOptions: [], // 我司参与深度 + cyzbpmOptions:[], // 我司参与制标排名 cbcdOptions: [], // 采标程度 wssmrOptions: [], // 我司署名人 sycpxOptions: { @@ -2978,6 +2991,7 @@ this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 this.wssmrOptions = res.data.WSSMR // 我司署名人 this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 43fcc191e..01984b937 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -946,6 +946,17 @@ > + + + + + @@ -1574,6 +1585,7 @@ export default { qcdw: '', // 起草单位 wssmr: '', // 我司署名人 cysd: '', // 我司参与深度 + cyzbpm:[],// 我司参与制标排名 cllx: '', // 适用车型 nylx: '',// 能源类型 sycpx: '',// 适用产品线 @@ -1623,6 +1635,7 @@ export default { options:[] }, // 适用认证 cysdOptions: [], // 我司参与深度 + cyzbpmOptions:[], // 我司参与制标排名 wssmrOptions: [], // 我司署名人 qcdwOptions: [], // 起草单位 sycpxOptions: { @@ -2579,6 +2592,7 @@ export default { this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名 this.wssmrOptions = res.data.WSSMR // 我司署名人 this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线 From b9dd1aa1cd38b9dc579edf104c710b6bb9d2782f Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 27 Dec 2021 10:59:07 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=B5=B7=E5=A4=96=20-=20=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20-=20=E5=8A=A0=E4=BA=86=E4=B8=AA=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index f5d615690..8fd05fba9 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -57,6 +57,7 @@ {{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}

+ @@ -281,9 +300,17 @@ export default { type: Boolean, default: false }, + opinionsShow: { + type: Boolean, + default: false + }, }, data () { return { + opinionsAdoptedOptions:[ + {value: '1',label: '采纳'}, + {value: '2',label: '不采纳'}, + ], countryOptions:[],//国家地区 standSortOptions: [], // 标准类别 standNatureOptions: [], // 标准性质 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 21b88d8df..9e20fee47 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -18,255 +18,17 @@ label-width="210px" >
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - {{value.name}} -
-
- - - -
-
- -
- - {{value.name}} -
-
- - - -
-
-
- - -
- - {{value.name}} -
-
- - - -
-
- -
- - {{value.name}} -
-
- - - -
-
-
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - -
- - {{value.name}} -
-
- - - -
-
-
- - - - - - - - -
-
+
@@ -812,6 +574,7 @@ + + diff --git a/src/pages/processCenter/pages/phone/qbfs/step2.vue b/src/pages/processCenter/pages/phone/qbfs/step2.vue new file mode 100644 index 000000000..681239939 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/step2.vue @@ -0,0 +1,458 @@ + + + + + + diff --git a/src/router/index.js b/src/router/index.js index 1fd281938..705d5d585 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2359,6 +2359,16 @@ const routes = [ title: '未符合项整改流程' } }, + { + path: '/phoneCywbbzzxdStep2', + name: 'phoneCywbbzzxdStep2', + component: () => import('@/pages/processCenter/pages/phone/cywbbzzxd/step2.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, { path: '/phoneCywbbzzxdStep4', name: 'phoneCywbbzzxdStep4', @@ -2429,6 +2439,16 @@ const routes = [ title: '企标制修订计划管控流程' } }, + { + path: '/phoneQbfsStep2', + name: 'phoneQbfsStep2', + component: () => import('@/pages/processCenter/pages/phone/qbfs/step2.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '企标复审流程' + } + }, { path: '/phoneQbfsStep4', name: 'phoneQbfsStep4', From 514b79190a329b079c9984e4dcce3a4bfc769c48 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 27 Dec 2021 16:18:01 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E5=BA=93=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=84=8F=E8=A7=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 6333 +++++++++-------- .../pages/creatProcess/bzrk/step3.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 433 +- .../components/DatePickerGroup.vue | 7 +- 4 files changed, 3481 insertions(+), 3294 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 09d2cf8f8..045f04913 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1,3143 +1,3328 @@ - - - - - - - - - - - - - - - - + - + + + + - - - - - - - - + - - - - - - - - + - - - - - - - - - - - - - - - + + + + +
@@ -805,10 +811,10 @@ - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - +