diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index f2baded1b..b431e0e06 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -521,6 +521,8 @@
newText: '',
reason: '',
id: id,
+ department: this.$store.getters.userInfo.upDeptName,
+ responUserName: this.$store.getters.userInfo.userName,
}
this.data.push(json)
this.itemId = id
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 1a73bdd22..4689b0ce1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -3,7 +3,7 @@
标准征求意见流程
- 对接人批准
+ 责任部门对接人汇总并选择审批人
+
+
+
+
@@ -212,12 +220,7 @@
:saveLoading="saveLoading"
show-transfer
@transfer="handleTransfer"
- @save="handleSave"
@submit="handleSubmit"
- show-back
- @back="handleSubmitNo"
- approval
- submitBTNText="同意"
>
关闭
+
@@ -281,6 +291,8 @@ export default {
textType: '',
modelList: [],
modelNameList: '',
+ spId: '',
+ spName: '',
},
formRules: {
responUserList: [
@@ -296,6 +308,15 @@ export default {
ProcessTitle
},
methods: {
+ checkedRole2(data) {
+ this.form.spId = data[0].id
+ this.form.spName = data[0].name
+ },
+ choiceZRR(id) {
+ this.nodeList = []
+ this.nodeList.push(id)
+ this.modalshowflag = true;
+ },
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
@@ -367,6 +388,8 @@ export default {
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
+ json.spId = this.form.spId
+ json.spName = this.form.spName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -379,26 +402,26 @@ export default {
this.isSubmit = false
})
},
- handleSubmitNo() {
- if (this.commentText) {
- var json = this.json
- json.actionFlag = 1
- json.commentText = this.commentText
- this.$http.post('lawss/activiti/completeTask', {
- json: JSON.stringify(json),
- taskId: this.taskIds,
- userId: this.$store.getters.userInfo.userId
- }, {}, res => {
- if (res.success) {
- this.$message.success('提交成功')
- this.$router.push('/processCenter')
- }
- })
- } else {
- this.$message.warning('请输入反馈意见')
- }
-
- },
+ // handleSubmitNo() {
+ // if (this.commentText) {
+ // var json = this.json
+ // json.actionFlag = 1
+ // json.commentText = this.commentText
+ // this.$http.post('lawss/activiti/completeTask', {
+ // json: JSON.stringify(json),
+ // taskId: this.taskIds,
+ // userId: this.$store.getters.userInfo.userId
+ // }, {}, res => {
+ // if (res.success) {
+ // this.$message.success('提交成功')
+ // this.$router.push('/processCenter')
+ // }
+ // })
+ // } else {
+ // this.$message.warning('请输入反馈意见')
+ // }
+ //
+ // },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -418,8 +441,9 @@ export default {
this.form.textType = data.textType
this.form.modelList = data.modelList
this.form.modelNameList = data.modelNameList
+ this.form.spId = data.spId || ''
+ this.form.spName = data.spName || ''
this.json = data
- console.log(data);
this.data = data.info || data.data
}).catch(e => {
})
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index a1eb3947f..82d854de8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -614,7 +614,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') {
+ } else if (row.taskInfo === '审批人审批') {
this.$router.push({
name: 'bzzqyjStep5',
query: {