diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
index 8e5ccbcdf..d9066941d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
@@ -388,7 +388,7 @@
this.isSubmit = false
})
} else {
- this.$message.warning('请输入反馈意见')
+ this.$message.warning('请输入审批意见')
}
},
getData() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index 97c639876..abb1f4830 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -415,7 +415,7 @@
this.isSubmit = false
})
} else {
- this.$message.warning('请输入反馈意见')
+ this.$message.warning('请输入审批意见')
}
},
getData() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
index 39ed192d7..a97671a00 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
@@ -434,12 +434,15 @@ export default {
this.dataList.map(item => {
delete item.termsConditions
})
- this.dataList.forEach(item => {
- if(item.implementer){
- comFlag = true
- return
- }
- })
+ console.log( this.dataList)
+ // this.dataList.forEach(item => {
+ // if(item.implementer){
+ // comFlag = true
+ // return
+ // }
+ // })
+ if(this.dataList.every(item => item.implementer)) comFlag = true
+
if(!comFlag){
this.$message.warning('请选择落实人')
}else{
@@ -520,11 +523,13 @@ export default {
this.selectProject = data
},
choiceZRRS(row, type, index) {
+ let _index = this.dataList.findIndex(item => item.id===row.id&&item.projectName===row.projectName)
localStorage.setItem('selectProject', JSON.stringify(this.selectProject))
this.type = type;
if (type === 1) {
this.nodeList2 = [];
- this.lsIndex = index;
+ // this.lsIndex = index;
+ this.lsIndex = _index;
if (row.implementerId) {
this.nodeList2 = row.implementerId.split(",");
} else {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 00918cc45..091fc48ec 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1337,7 +1337,8 @@ export default {
}, res => {
if (res.success) {
if (this.formTongGuo.approvalOpinion == "1") {
- this.$message.warning("驳回成功");
+ // this.$message.warning("驳回成功");
+ this.$message.success("驳回成功");
this.isSubmit = false;
this.formTongGuo.commentText = "";
// 流程提交之后,应该流转至待办任务页面
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index fe11b3b53..6a97bb9cd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -119,7 +119,7 @@