{
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
+ if(!this.commentText){
+ this.$message.warning('请填写审批意见')
+ }else{
+ let son = {
+ signFlag: '2',
+ commentText: this.commentText,
+ dataList: this.dataList,
+ roleForm: this.roleForm
}
- }, e => {
- });
+ var json = JSON.stringify(son)
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ }, e => {
+ });
+ }
},
//转办按钮
handleTransfer(){
diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
index 5a6de76a0..fde49c6a6 100644
--- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue
@@ -388,26 +388,30 @@ export default {
},
//驳回按钮
beforeBack(){
- let son = {
- yzFlag: '2',
- commentText: this.commentText,
- dataList: this.dataList,
- roleForm: this.roleForm
- }
- var json = JSON.stringify(son)
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: this.taskIds,
- userId: this.userId,
- json: json
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
+ if(!this.commentText){
+ this.$message.warning('请填写审批意见')
+ }else{
+ let son = {
+ yzFlag: '2',
+ commentText: this.commentText,
+ dataList: this.dataList,
+ roleForm: this.roleForm
}
- }, e => {
- });
+ var json = JSON.stringify(son)
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: this.taskIds,
+ userId: this.userId,
+ json: json
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ }, e => {
+ });
+ }
},
//转办按钮
handleTransfer(){
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index 9101f2de9..9c2083c7c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -444,10 +444,9 @@ export default {
},
//提交事件
handleSubmit() {
+ this.peopleFlag = true;
this.listForm.dataList.forEach(item => {
- if (item.liablePeople !== undefined) {
- this.peopleFlag = true;
- } else {
+ if (!item.liablePeople) {
this.peopleFlag = false;
}
});
diff --git a/src/pages/processCenter/pages/phone/wbsm/step4.vue b/src/pages/processCenter/pages/phone/wbsm/step4.vue
new file mode 100644
index 000000000..e966bff51
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/wbsm/step4.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/phone/wbsm/step5.vue b/src/pages/processCenter/pages/phone/wbsm/step5.vue
new file mode 100644
index 000000000..60a5fa44d
--- /dev/null
+++ b/src/pages/processCenter/pages/phone/wbsm/step5.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 8914299d4..249a08612 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -264,7 +264,10 @@ export default {
}else if(prcType === '10'){
//项目清单确认
this.toProcessDetail('xmqdqrStep1-3',row)
- } else if(prcType === '20') {
+ } else if(prcType === '16'){
+ //外部署名
+ this.toProcessDetail('wbsmStep1-5',row)
+ }else if(prcType === '20') {
// 入会流程
this.toProcessDetail('bzrhStep6-1',row)
} else if(prcType === '21') {
diff --git a/src/router/index.js b/src/router/index.js
index 535f26f7c..81a29c1ec 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1511,6 +1511,15 @@ const routes = [
title: '外部署名推荐审批流程'
}
},
+ {
+ path: '/wbsmStep1-5',
+ name: 'wbsmStep1-5',
+ component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step1-5.vue'),
+ meta: {
+ requireAuth: true,
+ title: '外部署名推荐审批流程'
+ }
+ },
{
path: '/cywbbzzxdStep1',
name: 'cywbbzzxdStep1',
@@ -2122,6 +2131,36 @@ const routes = [
title: '加入标准化协会信息提报流程'
}
},
+ {
+ path: '/phoneWbsmStep3',
+ name: 'phoneWbsmStep3',
+ component: () => import('@/pages/processCenter/pages/phone/wbsm/step3.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '外部署名推荐审批流程'
+ }
+ },
+ {
+ path: '/phoneWbsmStep4',
+ name: 'phoneWbsmStep4',
+ component: () => import('@/pages/processCenter/pages/phone/wbsm/step4.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '外部署名推荐审批流程'
+ }
+ },
+ {
+ path: '/phoneWbsmStep5',
+ name: 'phoneWbsmStep5',
+ component: () => import('@/pages/processCenter/pages/phone/wbsm/step5.vue'),
+ meta: {
+ isBoolean: true,
+ requireAuth: true,
+ title: '外部署名推荐审批流程'
+ }
+ },
{
path: '/phoneWfhxStep5',
name: 'phoneWfhxStep5',