From 099def45e7e2c687af09d72ad5111ab7c2405f82 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Thu, 30 Nov 2023 18:40:25 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E7=A0=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 6 +++++- .../processCenter/pages/creatProcess/qbrk/step10.vue | 8 ++++++-- .../processCenter/pages/creatProcess/qbrk/step11.vue | 3 +++ src/pages/processCenter/pages/creatProcess/qbrk/step2.vue | 7 +++++-- src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 8 ++++++-- src/pages/processCenter/pages/creatProcess/qbrk/step4.vue | 8 ++++++-- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 6 ++++++ src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 8 ++++++-- src/pages/processCenter/pages/creatProcess/qbrk/step7.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/qbrk/step8.vue | 4 +++- src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 8 ++++++-- 11 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 298c17893..5e9d7d09f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -927,6 +927,8 @@ {{$t('m.dataAcquisition')}} {{$t('m.dataAcquisition')}} {{$t('m.dataAcquisition')}} {{$t('m.dataAcquisition')}} {{$t('m.dataAcquisition')}} {{$t('m.dataAcquisition')}} + + {{$t('m.dataAcquisition')}} Date: Mon, 4 Dec 2023 15:09:51 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E7=A0=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomFormComponents/InputForAllStandards2.vue | 4 +++- .../pages/creatProcess/qbzxdjhgk/component/establish.vue | 6 +++--- .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index ac49e6fcc..1a754008f 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -143,6 +143,8 @@ - + 数据加载中…… @@ -498,7 +498,7 @@ export default { }, total: 0, page: 1, - pageSize: this.$store.getters.userInfo.configContent, + pageSize: 20, QYBZmodal: false, TXJGmodal: false, modalshowflagZRBM: false, @@ -514,7 +514,7 @@ export default { standSystemOptions: [], QYBZform: { page: 1, - pageSize: this.$store.getters.userInfo.configContent, + pageSize: 20, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index a6a186cd6..05a724aa5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -349,6 +349,7 @@ {{$t('m.dataAcquisition')}} - + 数据加载中…… @@ -650,7 +651,7 @@ export default { standSystemOptions: [], QYBZform: { page: 1, - pageSize: this.$store.getters.userInfo.configContent, + pageSize: 20, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '', @@ -674,7 +675,7 @@ export default { showType: '', page: 1, total: 0, - pageSize: this.$store.getters.userInfo.configContent, + pageSize: 20, selectList: [], qbfsFormRules: { bussSort: [ From c71b61ccf1c492ca9b3a56fa681c5e93f7dcf265 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Mon, 4 Dec 2023 15:13:49 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E7=A0=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step2.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index c94025bd2..bb6dc334f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -394,7 +394,8 @@ {{$t('m.dataAcquisition')}} Date: Mon, 4 Dec 2023 15:46:35 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E7=A0=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 6f23e4add..061a83dd7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -432,7 +432,7 @@ - + 数据加载中…… @@ -679,7 +679,7 @@ export default { standSystemOptions: [], QYBZform: { page: 1, - pageSize: this.$store.getters.userInfo.configContent, + pageSize: 20, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '', From 9a81d89d5e4b49efcc6f301f9a9f1579cad19af1 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Mon, 4 Dec 2023 15:58:36 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E7=A0=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/cywbbzzxd/step3.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index 8dc324fb8..23e4adda5 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -329,7 +329,11 @@ width="55" align="center"> - + + +