diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 7b9baad49..31c0d3706 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -42,11 +42,23 @@
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 40f863469..a23755792 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -46,6 +46,19 @@
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index f41b18984..846b4c546 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -70,6 +70,19 @@
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 66cb24c1f..cfdcc286a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -46,6 +46,19 @@
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index 500446124..5f6332d45 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -229,6 +229,7 @@
title="选择工作组组长"
:visible.sync="workModel"
size="900px"
+ @close="closeWorkDrawer"
custom-class="demo-drawer"
>
@@ -261,14 +262,14 @@
+ 数据加载中...
@@ -380,6 +381,7 @@ export default {
name: "qbzxdlxStep1",
data() {
return {
+ tableLoading: false,
importModalshowflag: false, //导入弹窗
showUploadlist: true, // 导入过程中新增数据时,如果数据错误,不出现导入列表
importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档
@@ -594,6 +596,7 @@ export default {
closeWorkDrawer(){
this.workModel = false
this.workSearch.workGroupName = ''
+ this.getWorkData()
this.$refs.workGroup.clearSelection()
},
OkWork(){
@@ -622,10 +625,12 @@ export default {
}, res => {
this.workData = res.data.records;
this.total = res.data.total;
+ this.tableLoading = false
}, e => {
});
},
choiceLeader(){
+ this.getWorkData()
this.workModel = true
},
choiceZRBM(type, title, id) {
@@ -1114,6 +1119,10 @@ export default {
border: 0;
}
}
+ .table-height{
+ height: calc(~'100% - 65px');
+ overflow: auto;
+ }
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index ec89346b1..a5acf3841 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -174,7 +174,7 @@