From dab533249bcf7f95e637d519f676660a9f510f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 18 Apr 2022 10:24:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?52618=20=E6=A0=87=E5=87=86=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20=E6=89=B9?= =?UTF-8?q?=E5=87=86=E8=8A=82=E7=82=B9=20=E5=85=B3=E8=81=94=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=BA=94=E8=AF=A5=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=96=E5=A1=AB=E5=86=99=20=E7=8E=B0=E5=9C=A8=E6=98=AF?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index b1603a844..7ec0cbff6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -558,6 +558,7 @@ Date: Mon, 18 Apr 2022 10:46:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?52616=20=E6=A0=87=E5=87=86=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20=E9=87=87?= =?UTF-8?q?=E6=A0=87=E7=BC=96=E5=8F=B7=E3=80=81=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7=E3=80=81=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=A0=87=E5=87=86=EF=BC=8C=20=E7=95=99=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=A1=E6=81=AF=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 9cdf64e6e..8f7316366 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2764,6 +2764,10 @@ export default { // this.$refs.selections.selectAll(false) // } // this.sarBussionessLawsEO.replaceLawsNum = '' + this.replaceLawsNumForm = { + standName: '', + standNumber: '', + } this.replaceLawsNumModel = true this.replaceLawType = '' this.replaceLawType = type diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 592bfdd2e..bf2950723 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2166,6 +2166,10 @@ export default { // this.$refs.selections.selectAll(false) // } // this.sarBussionessLawsEO.replaceLawsNum = '' + this.replaceLawsNumForm = { + standName: '', + standNumber: '', + } this.replaceLawsNumModel = true this.replaceLawType = '' this.replaceLawType = type From 6e68b67ac4f8aa21b5e27f4bedf9c872e3f0a40f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 18 Apr 2022 10:59:40 +0800 Subject: [PATCH 3/4] feat: There is no way the, bug #52525 #52527 --- .../pages/phone/qbfs/common/formListStep5.vue | 219 ++++++++++-------- .../processCenter/pages/phone/qbfs/step5.vue | 10 +- .../phone/qbrk-product/common/formList.vue | 38 +-- 3 files changed, 151 insertions(+), 116 deletions(-) diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue index dd6ce86be..77fa27e75 100644 --- a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue +++ b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue @@ -16,6 +16,18 @@ > + + + + + + - - - - - - -
- {{ item.name }} - - +
+ {{ item.name }} + +
-
- {{ item.name }} - - +
+ {{ item.name }} + +
-
- {{ item.name }} - - +
+ {{ item.name }} + +
-
- {{ item.name }} - - +
+ {{ item.name }} + +
@@ -129,49 +129,47 @@ > - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
@@ -193,6 +191,17 @@ clearable >
+ + + + + - - - - - -
- {{ item.name }} - - +
+ {{ item.name }} + +
@@ -353,10 +351,10 @@ > -
- {{ item.name | ellipsis2 }} - - +
+ {{ item.name }} + +
@@ -380,9 +378,9 @@
- {{ item.name | ellipsis2 }} - - + {{ item.name }} + +
@@ -406,12 +404,7 @@
- +
- + @@ -639,7 +632,6 @@ export default { this.showDrawer = true this.showForm = row this.showForm.FSDList=this.assemble(this.showForm.FSD,this.showForm.FSDName); - console.log(this.showForm) }, showDrawerClose () { this.showDrawer = false @@ -822,5 +814,38 @@ export default { diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue index b6208581a..5773497bb 100644 --- a/src/pages/processCenter/pages/phone/qbfs/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue @@ -17,7 +17,7 @@ :rules="formRules" style="border: none" class="label-input-form" - label-width="150px" + label-width="210px" >
+ 正在加载数据
@@ -213,6 +214,7 @@ export default { } }; return { + tablePHeight:'', dataLoading:true, bpnId: '', formKey:1, @@ -367,6 +369,10 @@ export default { } this.processTable() this.getData() + this.tablePHeight = $('.content').height() + window.onresize = () => { + this.tablePHeight = $('.content').height() + } }, watch:{ 'qbfsForm.reviewResults': { diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue index e65f9ce25..f32af4fdd 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue @@ -512,23 +512,27 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 60768153f..35b1d5dac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -235,6 +235,7 @@
{ // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 if (item === row) { - this.$refs.selection.toggleRowSelection(row, false); + this.$refs.detailedSelection.toggleRowSelection(row, false); } // 不然就让当前的一行勾选 else { - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); } }); } else { - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); } }, select(selection, row) { // 清除 所有勾选项 - this.$refs.selection.clearSelection(); + this.$refs.detailedSelection.clearSelection(); // 当表格数据都没有被勾选的时候 就返回 // 主要用于将当前勾选的表格状态清除 if (selection.length === 0) return; - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); }, //标准表格选择框改变 selectStandChange(data) { @@ -1633,5 +1635,10 @@ export default { height: calc(~'100% - 65px'); overflow: auto; } + .drawer-table{ + /deep/.el-drawer__body{ + overflow-y: hidden; + } + } } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 8f52060af..d45ece1f4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -235,6 +235,7 @@
{ // 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中 if (item === row) { - this.$refs.selection.toggleRowSelection(row, false); + this.$refs.detailedSelection.toggleRowSelection(row, false); } // 不然就让当前的一行勾选 else { - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); } }) } else { - this.$refs.selection.toggleRowSelection(row, true); + this.$refs.detailedSelection.toggleRowSelection(row, true); } }, choiceZRR(type, title, id) { @@ -1595,5 +1598,10 @@ export default { height: calc(~'100% - 65px'); overflow: auto; } + .drawer-table{ + /deep/.el-drawer__body{ + overflow-y: hidden; + } + } }