diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index c39d5759b..9e2199b2c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -1186,10 +1186,10 @@ export default { }, handleSubmit() { this.isSubmit = true + this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - json.submitType = this.submitType this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 231233b99..d0fb69bfe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -875,10 +875,11 @@ :lazy=true :multiple=true :check-strictly=true - :show-checkBox=true :modalShowFlag="modalShowFlag4" :drawerTitle="drawerTitle" :url="url" + :type="'TRUCK'" + :show-checkBox="showCheckBox" :urlChild="urlChild" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"> @@ -895,6 +896,7 @@ :drawerTitle="drawerTitle" :url="url" :type="'CAR'" + :show-checkBox="showCheckBox" :urlChild="urlChild" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"> @@ -1596,6 +1598,7 @@ export default { commentText: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 + showCheckBox: true, // 树形控件是否展示多选框 active: '1', // 默认显示 isSubmit: false, saveLoading: false, @@ -1988,11 +1991,19 @@ export default { this.modalShowFlag4 = true this.url = '' this.urlChild = '' - this.url = "sarModelTree/list" + this.url = "sarModelTree/listByType" this.urlChild = "sarModelTree/childByList" this.key3++ }, - + choiceZRR5(type, title, id) { + this.drawerTitle = title + this.modalShowFlag5 = true + this.url = '' + this.urlChild = '' + this.url = "sarModelTree/listByType" + this.urlChild = "sarModelTree/childByList" + this.key4++ + }, choiceTree(type, title, id) { this.drawerTitle = title this.getListTree(this.form) @@ -2801,10 +2812,10 @@ export default { if (res.ok) { this.fileInfoHandle(); this.isSubmit = true + this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - json.submitType = this.submitType this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -2829,10 +2840,10 @@ export default { } else { this.fileInfoHandle(); this.isSubmit = true + this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - json.submitType = this.submitType this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId,