From 7e32e3ab33b119debe5a3ee5e088a52cd1cdd941 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 28 Dec 2021 17:46:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20-=20?= =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AD=A5=20-=20=E6=8A=8A=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E6=9C=9F=E9=83=BD=E5=8E=BB=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step5.vue | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index c8f404d14..011c25da2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -170,32 +170,32 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + From 6f6c28151eaa10cfbd19281c6d586d29be3671f1 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 28 Dec 2021 17:50:12 +0800 Subject: [PATCH 2/6] feat: There is no way the,vpps car and bus --- .../searchCenter/pages/advancedSearch.vue | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index b84453434..0fcf27ebd 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -305,21 +305,7 @@ - - + @@ -332,21 +318,7 @@ - - + From f03807f9ab4ebca679b38cb251fdc5027abe8239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 18:01:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step2.vue | 5 +- .../pages/creatProcess/bzqdfb/step3.vue | 136 +++++++++--------- .../pages/creatProcess/bzqdfb/step4.vue | 5 +- 3 files changed, 75 insertions(+), 71 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index a70f42992..19e5fbd11 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -49,7 +49,7 @@ /> @@ -360,7 +360,8 @@ export default { name: item.oldFileName, uid: item.uid, status: item.status, - id: item.id + id: item.id, + fileSuffix: item.fileSuffix }); }); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 7128517c9..a10230dd2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -274,75 +274,77 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -429,7 +429,8 @@ export default { name: item.oldFileName, uid: item.uid, status: item.status, - id: item.id + id: item.id, + fileSuffix: item.fileSuffix }); }); }); From 1336553e5f96f0a229eea4cc77064d05ffab6db1 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 28 Dec 2021 19:32:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20-=201=E5=92=8C4=20-=20=E6=8A=8A=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E7=9A=84=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E8=AE=BE=E7=BD=AE=E6=88=90=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 2 ++ .../pages/creatProcess/bzrk/step4.vue | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index a4475fb17..4de50bcb7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1836,9 +1836,11 @@ export default { /** val === '1' (国外) val === '0'（ 国内 ）*/ // 国内英文名称不必填 国外必填 ，标准性质国内不体现 if (val === '1') { + this.rules.standName[0].required = false this.rules.standEnName[0].required = true; this.rules.standNature[0].required = false } else { + this.rules.standName[0].required = true this.rules.standNature[0].required = true this.rules.standEnName[0].required = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 8101bf075..78340e107 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -26,7 +26,7 @@ - + 国内标准入库 海外标准入库 @@ -1692,6 +1692,23 @@ export default { }, }, methods: { + // 标准来源改变事件 + standInChange(val) { + this.verifySarStandard = false + + /** val === '1' (国外) val === '0'（ 国内 ）*/ + // 国内英文名称不必填 国外必填 ，标准性质国内不体现 + if (val === '1') { + this.rules.standName[0].required = false + this.rules.standNature[0].required = false + this.rules.standEnName[0].required = true; + } else { + this.rules.standName[0].required = true + this.rules.standNature[0].required = true + this.rules.standEnName[0].required = false; + } + this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' + }, getBusStandFileByAttId(attId) { return new Promise((resolve, reject) => { getBusStandFileByAttId({ From 3952d0d0ead62e4113c09822f51852f59ca70a47 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 28 Dec 2021 19:44:12 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 8438138d2..33a90a927 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -226,6 +226,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -753,6 +755,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, //保存事件 handleSave() { this.saveLoading = true; From 62b680c6c0ba266fb73a7e5b463bfa0831963ab7 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 28 Dec 2021 20:47:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20-=20=E5=8F=91=E5=B8=83=E7=A8=BF=20-=20?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=E5=8E=BB=E6=8E=89=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=8A=8A=E6=89=80=E6=9C=89=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 54 ++++++++++++++++--- 1 file changed, 47 insertions(+), 7 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 79f6eacee..9a68b51e8 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -69,6 +69,44 @@ + - +

@@ -2076,7 +2114,9 @@ export default { console.log('1943',child1) const list = [] if (child1 && child1.length > 1) { - list.push(child1[0]) + for (let i = 0; i < child1.length; i++) { + list.push(child1[i]) + } return list } return child1