diff --git a/public/index.html b/public/index.html index 3dcf1a0ed..a4234806f 100644 --- a/public/index.html +++ b/public/index.html @@ -12,9 +12,9 @@ - + + +
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index a407658e0..7e5cd7c67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -237,6 +237,7 @@ 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; + } + } } 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/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 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index f7d04fd5c..fd44331f2 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -51,8 +51,31 @@ - - + + + + + + + + + 是 @@ -977,5 +1000,29 @@ export default { } } } + /deep/ .el-select__tags-text{ + color: #000000 !important; + cursor: not-allowed !important; + opacity: 1 !important; + -webkit-text-fill-color: #000000 !important; + background: transparent !important; + font-weight: 400 !important; + mso-ansi-font-weight: 400 !important; + mso-bidi-font-weight: 400 !important; + } + + /deep/ .el-input__inner{ + color: #000000 !important; + cursor: not-allowed !important; + opacity: 1 !important; + -webkit-text-fill-color: #000000 !important; + background: transparent !important; + font-weight: 400 !important; + mso-ansi-font-weight: 400 !important; + mso-bidi-font-weight: 400 !important; + } + /deep/ .fileClass{ + line-height: 22px !important; + } } 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 @@
- +
@@ -449,10 +442,10 @@ > -
- {{ item.name | ellipsis15 }} - - +
+ {{ item.name }} + +
@@ -472,7 +465,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 @@