diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue
index 6e9946b8f..02d62b7f0 100644
--- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue
+++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue
@@ -244,7 +244,9 @@ export default {
}, {
_this: this
}, res => {
- res.data.records.map(item => {
+ this.workData = res.data.records
+ let work = res.data.records
+ work.map(item => {
item.workLeaderGroup = [];
item.workPeopleGroup = [];
var workLeaderArray = item.workLeader.split(",");
@@ -258,8 +260,8 @@ export default {
item.workPeopleGroup.push({ name: workPeopleArray[j], id: workPeopleIdArray[j] });
}
});
- this.workData = res.data.records;
this.total = res.data.total;
+ this.Loading = false
}, e => {
});
},
@@ -340,11 +342,14 @@ export default {
},
//取消新增
cancelModel() {
+ this.Loading = true
this.addForm = {
workGroup: "",
workPeopleGroup: [],
workLeaderGroup: []
};
+ this.getWorkData();
+ this.$refs.workGroup.clearSelection()
this.addModel = false;
},
//确定新增
@@ -357,6 +362,7 @@ export default {
} else if (!this.addForm.workPeopleGroup.length) {
this.$message.warning("请选择工作组组员");
} else {
+ this.Loading = true
let workLeader = "", workLeaderId = "";
this.addForm.workLeaderGroup.map(item => {
workLeader += item.name;
@@ -395,6 +401,7 @@ export default {
} else if (!this.addForm.workPeopleGroup.length) {
this.$message.warning("请选择工作组组员");
} else {
+ this.Loading = true
let workLeader = "";
let workLeaderId = "";
this.addForm.workLeaderGroup.map(item => {
diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 97939c3d3..74b85d3f5 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -205,7 +205,7 @@ export default {
prcType: row.prcType
}
})
- }else if (row.taskInfo === '起草单位高级经理审核'){
+ }else if (row.taskInfo === '批准'){
this.$router.push({
name: 'bussLibrary8',
query: {
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index b44f38fb2..bc9b0b463 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -1058,11 +1058,15 @@ export default {
this.projectList = data;
},
choiceZRR(scope, type, title, id) {
+ console.log(scope);
if (scope != null) {
this.currentIndex = scope.$index;
+ this.nodeList = [];
+ this.nodeList.push(scope.row.distributePersonId);
+ }else{
+ this.nodeList = [];
+ this.nodeList.push(id);
}
- this.nodeList = [];
- this.nodeList.push(id);
this.type = type;
this.drawerTitle = title;
this.modalshowflag = true;
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
index 4844c13fd..e91d77e4f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
@@ -2,7 +2,7 @@