From 0179e6e2a7247e38abb2e46ebee17265df581b83 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 10:29:07 +0800 Subject: [PATCH 01/11] commit --- .../processCenter/pages/creatProcess/bzdy/step1-1.vue | 7 ++++--- .../processCenter/pages/creatProcess/bzdy/step1.vue | 9 +++++---- .../processCenter/pages/creatProcess/bzdy/step2.vue | 8 +++++--- .../processCenter/pages/creatProcess/bzdy/step4.vue | 10 ++++++---- .../processCenter/pages/creatProcess/bzdy/step5.vue | 8 +++++--- .../processCenter/pages/creatProcess/bzdy/step6.vue | 11 ++++++----- .../processCenter/pages/creatProcess/bzdy/step7.vue | 10 ++++++---- .../processCenter/pages/creatProcess/bzdy/step8.vue | 10 ++++++---- .../processCenter/pages/creatProcess/bzdy/step9.vue | 11 ++++++----- .../processCenter/pages/creatProcess/bzjd/step1-1.vue | 9 +++++---- .../processCenter/pages/creatProcess/bzjd/step1.vue | 9 +++++---- .../processCenter/pages/creatProcess/bzjd/step2.vue | 9 +++++---- .../processCenter/pages/creatProcess/bzjd/step3.vue | 9 +++++---- .../processCenter/pages/creatProcess/bzjd/step4.vue | 11 ++++++----- .../processCenter/pages/creatProcess/bzjd/step5.vue | 11 ++++++----- .../processCenter/pages/creatProcess/bzjd/step6.vue | 11 ++++++----- 16 files changed, 87 insertions(+), 66 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 8dc7f0be1..8d5bcf716 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -114,7 +114,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText1"> @@ -262,6 +262,7 @@ name: "bzdyStep1-1", data() { return { + commentText1: '', pickerOptions: { disabledDate(time) { return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 @@ -368,7 +369,7 @@ } this.form = mes.form this.roleForm = mes.roleForm - this.commentText = mes.commentText + this.commentText1 = mes.commentText1 }) }, checkedRole2 (data) { @@ -561,7 +562,7 @@ }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) - json.commentText = this.commentText + json.commentText = this.commentText1 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: res.data, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index cdb198016..e8db14614 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -114,7 +114,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText1"> @@ -264,6 +264,7 @@ export default { name: "bzdyStep1", data() { return { + commentText1: '', pickerOptions: { disabledDate(time) { return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 @@ -533,7 +534,7 @@ export default { _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText + commentText1: this.commentText1 })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -557,12 +558,12 @@ export default { json: JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText + commentText1: this.commentText1 }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) - json.commentText = this.commentText + json.commentText = this.commentText1 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: res.data, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 2214ef06d..876cd147a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -97,7 +97,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText2"> @@ -196,6 +196,7 @@ name: "bzdyStep2", data() { return { + commentText2: '', drawerModal: false, foldFormFlag: false, histortData: [], @@ -313,7 +314,7 @@ _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ form: this.form, - commentText: this.commentText, + commentText2: this.commentText2, })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -327,7 +328,7 @@ if (valid) { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText2 json.responUserList = this.form.responUserList json.responUserListName = this.form.responUserListName this.$http.post('lawss/activiti/completeTask', { @@ -360,6 +361,7 @@ this.json = data || data.form this.form.responUserList = data.form? data.form.responUserList : '' this.form.responUserListName = data.form? data.form.responUserListName : '' + this.commentText2 = data.commentText2 }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index d461befa2..b93ff8b9a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -135,7 +135,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText4"> @@ -230,6 +230,7 @@ name: "bzdyStep4", data() { return { + commentText4: '', newDocUser: '', drawerModal: false, foldFormFlag: false, @@ -333,7 +334,7 @@ this.isSubmit = true var json = this.json json.actionFlag = 0 - json.commentText = this.commentText + json.commentText = this.commentText4 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskIds: this.taskIds, @@ -347,11 +348,11 @@ }) }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText4) { this.isSubmit = true var json = this.json json.actionFlag = 1 - json.commentText = this.commentText + json.commentText = this.commentText4 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskIds: this.taskIds, @@ -384,6 +385,7 @@ this.form.modelList = data.form ? data.form.modelList : data.modelList this.form.fjList = data.fjList || data.form.fjList this.newDocUser = data.form ? data.form.docUser : data.docUser + this.commentText4 = data.commentText4 }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 4068ac627..f88865b35 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -124,7 +124,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText5"> @@ -237,6 +237,7 @@ name: "bzdyStep5", data() { return { + commentText5: '', newDocUser: '', drawerModal: false, foldFormFlag: false, @@ -373,7 +374,7 @@ _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ form: json, - commentText: this.commentText, + commentText5: this.commentText5, })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -387,7 +388,7 @@ if (valid) { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText5 json.hzfileId = this.form.hzfileId json.hzfileName = this.form.hzfileName json.docUser = this.newDocUser @@ -419,6 +420,7 @@ this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName this.newDocUser = data.form ? data.form.docUser : data.docUser + this.commentText5 = data.commentText5 }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 2c98a83d7..cebd6e012 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -119,7 +119,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText6"> @@ -233,6 +233,7 @@ name: "bzdyStep6", data() { return { + commentText6: '', drawerModal: false, foldFormFlag: false, histortData: [], @@ -360,12 +361,11 @@ handleTabs(name) { this.active = name }, - handleSave() {}, handleSubmit() { this.isSubmit = true var json = this.json json.actionFlag = 0 - json.commentText = this.commentText + json.commentText = this.commentText6 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -379,11 +379,11 @@ }) }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText6) { this.isSubmit = true var json = this.json json.actionFlag = 1 - json.commentText = this.commentText + json.commentText = this.commentText6 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -412,6 +412,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName + this.commentText6 = data.commentText6 }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 3c71b2cfb..f0b0d8512 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -119,7 +119,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText7"> @@ -233,6 +233,7 @@ name: "bzdyStep7", data() { return { + commentText7: '', drawerModal: false, foldFormFlag: false, histortData: [], @@ -365,7 +366,7 @@ this.isSubmit = true var json = this.json json.actionFlag = 0 - json.commentText = this.commentText + json.commentText = this.commentText7 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskIds: this.taskIds, @@ -379,10 +380,10 @@ }) }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText7) { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText7 json.actionFlag = 1 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -412,6 +413,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName + this.commentText7 = data.commentText7 }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index cb00031b9..2ffb6b6fb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -119,7 +119,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText8"> @@ -233,6 +233,7 @@ name: "bzdyStep8", data() { return { + commentText8: '', drawerModal: false, foldFormFlag: false, histortData: [], @@ -365,7 +366,7 @@ this.isSubmit = true var json = this.json json.actionFlag = 0 - json.commentText = this.commentText + json.commentText = this.commentText8 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -379,10 +380,10 @@ }) }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText8) { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText8 json.actionFlag = 1 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -412,6 +413,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName + this.commentText8 = data.commentText8 }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 381d36b17..3d5d8ca1f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -119,7 +119,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText9"> @@ -233,6 +233,7 @@ name: "bzdyStep9", data() { return { + commentText9: '', drawerModal: false, foldFormFlag: false, histortData: [], @@ -360,12 +361,11 @@ handleTabs(name) { this.active = name }, - handleSave() {}, handleSubmit() { this.isSubmit = true var json = this.json json.actionFlag = 0 - json.commentText = this.commentText + json.commentText = this.commentText9 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -379,10 +379,10 @@ }) }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText9) { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText9 json.actionFlag = 1 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -412,6 +412,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName + this.commentText9 = data.commentText9 }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 464e44119..dda93c53c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -196,7 +196,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText1"> @@ -493,6 +493,7 @@ name: "bzjdStep1-1", data() { return { + commentText1: '', itemsNum: '', BDtext: false, pickerOptions: { @@ -835,7 +836,7 @@ mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form this.roleForm = mes.roleForm - this.commentText = mes.commentText + this.commentText1 = mes.commentText1 this.itemList = mes.itemList this.sarType = mes.sarType }) @@ -1008,7 +1009,7 @@ _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText, + commentText1: this.commentText1, itemList: this.itemList, sarType: this.sarType })) @@ -1077,7 +1078,7 @@ }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) - json.commentText = this.commentText + json.commentText = this.commentText1 json.standInData = this.sarType json.itemList = this.itemList this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 55bda25a7..7f1faad02 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -203,7 +203,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText1"> @@ -503,6 +503,7 @@ export default { name: "bzjdStep1", data() { return { + commentText1: '', itemsNum: '', BDtext: false, pickerOptions: { @@ -1017,7 +1018,7 @@ export default { _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText, + commentText1: this.commentText1, itemList: this.itemList, sarType: this.sarType })) @@ -1089,14 +1090,14 @@ export default { json: JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText, + commentText1: this.commentText1, itemList: this.itemList, sarType: this.sarType }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) - json.commentText = this.commentText + json.commentText = this.commentText1 json.standInData = this.sarType json.itemList = this.itemList json.itemListOld = this.itemListOld diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 45d840009..1ca816f4d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -172,7 +172,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText2"> @@ -282,6 +282,7 @@ name: "bzjdStep2", data() { return { + commentText2: '', drawerModal: false, //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, @@ -427,7 +428,7 @@ _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText, + commentText2: this.commentText2, itemList: this.itemList, standInData: this.sarType })) @@ -453,7 +454,7 @@ this.isSubmit = true var json = this.json json.itemList = this.itemList - json.commentText = this.commentText + json.commentText = this.commentText2 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -486,7 +487,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName - this.commentText = data.commentText + this.commentText2 = data.commentText2 if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 262b7d0e2..5211c9252 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -203,7 +203,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText3"> @@ -464,6 +464,7 @@ name: "bzjdStep3", data() { return { + commentText3: '', BDtext: false, itemsNum: '', similarityDegree: '', @@ -743,7 +744,7 @@ _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText, + commentText3: this.commentText3, itemList: this.itemList, standInData: this.sarType })) @@ -823,7 +824,7 @@ } else { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText3 json.itemList = this.itemList this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -857,7 +858,7 @@ this.acceptShow = false this.submitShow = true } - this.commentText = data.commentText + this.commentText3 = data.commentText3 this.todoId = res.id this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 6f9574225..12fe12125 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -197,7 +197,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText4"> @@ -306,6 +306,7 @@ name: "bzjdStep4", data() { return { + commentText4: '', itemsNum: '', similarityDegree: '', BDmodel: false, @@ -439,7 +440,7 @@ this.isSubmit = true var json = this.json json.resolveFlag = 1 - json.commentText = this.commentText + json.commentText = this.commentText4 json.AOLIGEI = this.AOLIGEI this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -454,11 +455,11 @@ }) }, handleSubmitNo () { - if (this.commentText) { + if (this.commentText4) { this.isSubmit = true var json = this.json json.resolveFlag = 2 - json.commentText = this.commentText + json.commentText = this.commentText4 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -483,7 +484,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName - this.commentText = data.commentText + this.commentText4 = data.commentText4 if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 405b0c756..bc959615b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -197,7 +197,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText5"> @@ -312,6 +312,7 @@ name: "bzjdStep5", data() { return { + commentText5: '', itemsNum: '', similarityDegree: '', BDmodel: false, @@ -427,7 +428,7 @@ this.isSubmit = true var json = this.json json.zrApplyFlag = 1 - json.commentText = this.commentText + json.commentText = this.commentText5 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -441,11 +442,11 @@ }) }, handleSubmitNo () { - if (this.commentText) { + if (this.commentText5) { this.isSubmit = true var json = this.json json.zrApplyFlag = 2 - json.commentText = this.commentText + json.commentText = this.commentText5 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -470,7 +471,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName - this.commentText = data.commentText + this.commentText5 = data.commentText5 if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index d8b3dee0d..3c694fde2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -197,7 +197,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText6"> @@ -310,6 +310,7 @@ name: "bzjdStep6", data() { return { + commentText6: '', itemsNum: '', similarityDegree: '', BDmodel: false, @@ -425,7 +426,7 @@ this.isSubmit = true var json = this.json json.gcApplyFlag = 1 - json.commentText = this.commentText + json.commentText = this.commentText6 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -439,11 +440,11 @@ }) }, handleSubmitNo () { - if (this.commentText) { + if (this.commentText6) { this.isSubmit = true var json = this.json json.gcApplyFlag = 2 - json.commentText = this.commentText + json.commentText = this.commentText6 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -468,7 +469,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName - this.commentText = data.commentText + this.commentText6 = data.commentText6 if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' From 8358a0522665af92c0ed73ac1f178a8ef5865cd6 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 10:48:36 +0800 Subject: [PATCH 02/11] commit --- .../pages/creatProcess/bzdy/step1-1.vue | 2 +- .../pages/creatProcess/bzdy/step2.vue | 2 +- .../pages/creatProcess/bzdy/step4.vue | 2 +- .../pages/creatProcess/bzdy/step5.vue | 2 +- .../pages/creatProcess/bzdy/step6.vue | 2 +- .../pages/creatProcess/bzdy/step7.vue | 2 +- .../pages/creatProcess/bzdy/step8.vue | 2 +- .../pages/creatProcess/bzdy/step9.vue | 2 +- .../pages/creatProcess/bzjd/step1-1.vue | 2 +- .../pages/creatProcess/bzjd/step2.vue | 2 +- .../pages/creatProcess/bzjd/step3.vue | 2 +- .../pages/creatProcess/bzjd/step4.vue | 2 +- .../pages/creatProcess/bzjd/step5.vue | 2 +- .../pages/creatProcess/bzjd/step6.vue | 2 +- .../pages/creatProcess/bzzqyj/step1-1.vue | 10 ++++------ .../pages/creatProcess/bzzqyj/step1.vue | 9 +++++---- .../pages/creatProcess/bzzqyj/step2.vue | 8 +++++--- .../pages/creatProcess/bzzqyj/step3.vue | 8 +++++--- .../pages/creatProcess/bzzqyj/step4-1.vue | 13 ++++++------- .../pages/creatProcess/bzzqyj/step4-2.vue | 12 ++++++------ .../pages/creatProcess/bzzqyj/step4.vue | 8 ++++---- .../pages/creatProcess/bzzqyj/step5.vue | 9 +++++---- .../pages/creatProcess/bzzqyj/step6.vue | 13 ++++++------- .../pages/creatProcess/bzzqyj/step7.vue | 13 ++++++------- .../pages/creatProcess/bzzqyj/step8.vue | 14 +++++++------- .../pages/creatProcess/bzzqyj/step9.vue | 13 ++++++------- 26 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 8d5bcf716..9dd9b11ab 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -369,7 +369,7 @@ } this.form = mes.form this.roleForm = mes.roleForm - this.commentText1 = mes.commentText1 + this.commentText1 = mes.commentText1 || '' }) }, checkedRole2 (data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 876cd147a..562d364e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -361,7 +361,7 @@ this.json = data || data.form this.form.responUserList = data.form? data.form.responUserList : '' this.form.responUserListName = data.form? data.form.responUserListName : '' - this.commentText2 = data.commentText2 + this.commentText2 = data.commentText2 || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index b93ff8b9a..fbe08a611 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -385,7 +385,7 @@ this.form.modelList = data.form ? data.form.modelList : data.modelList this.form.fjList = data.fjList || data.form.fjList this.newDocUser = data.form ? data.form.docUser : data.docUser - this.commentText4 = data.commentText4 + this.commentText4 = data.commentText4 || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index f88865b35..e04816c5a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -420,7 +420,7 @@ this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName this.newDocUser = data.form ? data.form.docUser : data.docUser - this.commentText5 = data.commentText5 + this.commentText5 = data.commentText5 || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index cebd6e012..5165eb8b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -412,7 +412,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName - this.commentText6 = data.commentText6 + this.commentText6 = data.commentText6 || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index f0b0d8512..13f3076f5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -413,7 +413,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName - this.commentText7 = data.commentText7 + this.commentText7 = data.commentText7 || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index 2ffb6b6fb..abb1c913d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -413,7 +413,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName - this.commentText8 = data.commentText8 + this.commentText8 = data.commentText8 || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 3d5d8ca1f..cd538ad07 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -412,7 +412,7 @@ this.tableData = data.responUserList || data.form.responUserList this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileName = data.hzfileName || data.form.hzfileName - this.commentText9 = data.commentText9 + this.commentText9 = data.commentText9 || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index dda93c53c..968ecaaee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -836,7 +836,7 @@ mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form this.roleForm = mes.roleForm - this.commentText1 = mes.commentText1 + this.commentText1 = mes.commentText1 || '' this.itemList = mes.itemList this.sarType = mes.sarType }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 1ca816f4d..4687aff42 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -487,7 +487,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName - this.commentText2 = data.commentText2 + this.commentText2 = data.commentText2 || '' if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 5211c9252..b064974c3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -858,7 +858,7 @@ this.acceptShow = false this.submitShow = true } - this.commentText3 = data.commentText3 + this.commentText3 = data.commentText3 || '' this.todoId = res.id this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 12fe12125..ae7cf116b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -484,7 +484,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName - this.commentText4 = data.commentText4 + this.commentText4 = data.commentText4 || '' if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index bc959615b..384a42003 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -471,7 +471,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName - this.commentText5 = data.commentText5 + this.commentText5 = data.commentText5 || '' if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 3c694fde2..5d7a6ccba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -469,7 +469,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName - this.commentText6 = data.commentText6 + this.commentText6 = data.commentText6 || '' if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index dce60cd1e..999e05d59 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -114,7 +114,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText1"> @@ -207,7 +207,6 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" - @save="handleSave" @submit="handleSubmit" > @@ -376,6 +375,7 @@ export default { name: "bzzqyjStep1-1", data() { return { + commentText1: '', textTypeList: [], pickerOptions: { disabledDate(time) { @@ -661,7 +661,7 @@ export default { mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD')) this.form = mes.form this.roleForm = mes.roleForm - this.commentText = mes.commentText + this.commentText1 = mes.commentText1 || '' }) }, addZqyjList() { @@ -804,8 +804,6 @@ export default { handleTabs(name) { this.active = name }, - handleSave() { - }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { @@ -817,7 +815,7 @@ export default { }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) - json.commentText = this.commentText + json.commentText = this.commentText1 json.filesId = this.roleForm.dockUserList json.filesName = this.roleForm.dockUserListName this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 947de6b05..679272a01 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -114,7 +114,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText1"> @@ -384,6 +384,7 @@ export default { name: "bzzqyjStep1", data() { return { + commentText1: '', textTypeList: [], drawerTitle2: '', type2: '', @@ -812,7 +813,7 @@ export default { _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText + commentText1: this.commentText1 })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -836,12 +837,12 @@ export default { json: JSON.stringify({ form: this.form, roleForm: this.roleForm, - commentText: this.commentText + commentText1: this.commentText1 }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) - json.commentText = this.commentText + json.commentText = this.commentText1 json.filesId = this.addFjList json.filesName = this.form.fjListName this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 3b8a22377..6aca6b40d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -97,7 +97,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText2"> @@ -195,6 +195,7 @@ export default { name: "bzzqyjStep2", data() { return { + commentText2: '', drawerModal: false, histortData: [], commentText: "", @@ -325,7 +326,7 @@ export default { _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ form: this.form, - commentText: this.commentText + commentText2: this.commentText2 })); saveTaskForPub(_formData).then(res => { this.saveLoading = false; @@ -340,7 +341,7 @@ export default { if (valid) { this.isSubmit = true; var json = this.json; - json.commentText = this.commentText; + json.commentText = this.commentText2; json.responUserList = this.form.responUserList; json.responUserListName = this.form.responUserListName; json.introduce = false; @@ -367,6 +368,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.commentText2 = data.commentText2 || '' this.form.cid = data.cid this.form.endTime = data.endTime this.form.cname = data.cname diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 0c4c7297c..814d4be51 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -184,7 +184,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText3"> @@ -336,6 +336,7 @@ name: "bzzqyjStep3", data() { return { + commentText3: '', itermsConditionsFlag: false, itermsConditionsTitle: '', options: [], @@ -565,7 +566,7 @@ _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ form: json, - commentText: this.commentText + commentText3: this.commentText3 })); saveTaskForPub(_formData).then(res => { this.saveLoading = false; @@ -591,7 +592,7 @@ if (this.data.length < 1) { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText3 json.info = [] json.form = this.form json.department = this.$store.getters.userInfo.orgName @@ -679,6 +680,7 @@ this.acceptShow = false this.submitShow = true } + this.commentText3 = data.commentText3 || '' this.form.fjList = data.fjList || data.form.fjList || [] if (data.fjListId === '') { this.form.fjListId = '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index f885298fb..925b4e94c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -163,7 +163,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText41"> @@ -274,6 +274,7 @@ name: "bzzqyjStep4-1", data() { return { + commentText41: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -401,14 +402,12 @@ handleTabs(name) { this.active = name }, - handleSave() { - }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText41 json.bzfgId = this.form.bzfgId json.bzfgName = this.form.bzfgName json.spFlag = '0' @@ -429,10 +428,10 @@ }) }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText41) { var json = this.json json.spFlag = '1' - json.commentText = this.commentText + json.commentText = this.commentText41 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -467,7 +466,7 @@ this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList this.form.modelNameList = data.modelNameList || data.form.modelNameList - console.log(data); + this.commentText41 = data.commentText41 || '' this.form.bzfgId = data.startUser this.form.bzfgName = data.startUserName // this.form.bzfgId = data.bzfgId || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index a40ec5047..7df690f5f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -155,7 +155,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText42"> @@ -266,6 +266,7 @@ name: "bzzqyjStep4-2", data() { return { + commentText42: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -393,12 +394,10 @@ handleTabs(name) { this.active = name }, - handleSave() { - }, handleSubmit() { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText42 json.bzFlag = '0' this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -413,10 +412,10 @@ }) }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText42) { var json = this.json json.bzFlag = '1' - json.commentText = this.commentText + json.commentText = this.commentText42 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -445,6 +444,7 @@ } else { this.form.fjListId = data.form.fjListId || data.fjListId } + this.commentText42 = data.commentText42 || '' this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 3eed7fa37..67653a124 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -191,7 +191,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText4"> @@ -346,6 +346,7 @@ export default { name: "bzzqyjStep4", data() { return { + commentText4: '', acceptShow: false, idList: [], options: [], @@ -587,15 +588,13 @@ export default { handleTabs(name) { this.active = name }, - handleSave() { - }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true var json = this.json json.actionFlag = 0 - json.commentText = this.commentText + json.commentText = this.commentText4 json.spId = this.form.spId json.spName = this.form.spName this.$http.post('lawss/activiti/completeTask', { @@ -655,6 +654,7 @@ export default { } else { this.form.fjListId = data.form.fjListId || data.fjListId } + this.commentText4 = data.commentText4 || '' this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 1dbab8c1c..022ee646a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -186,7 +186,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText5"> @@ -335,6 +335,7 @@ name: "bzzqyjStep5", data() { return { + commentText5: '', options: [], itemId: '', modalshowflag2: false, @@ -523,7 +524,7 @@ _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ form: json, - commentText: this.commentText + commentText5: this.commentText5 })); saveTaskForPub(_formData).then(res => { this.saveLoading = false; @@ -537,7 +538,7 @@ this.isSubmit = true; var json = this.json; json.oldinfo = this.oldData; - json.commentText = this.commentText; + json.commentText = this.commentText5; json.introduce = true; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), @@ -558,7 +559,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - + this.commentText5 = data.commentText5 || '' this.form.fjList = data.fjList || data.form.fjList if (data.fjListId === '') { this.form.fjListId = '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 2406d0f5b..6c2fe7e66 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -175,7 +175,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText6"> @@ -241,7 +241,6 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" - @save="handleSave" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -280,6 +279,7 @@ export default { name: "bzzqyjStep6", data() { return { + commentText6: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -441,13 +441,11 @@ export default { handleTabs(name) { this.active = name; }, - handleSave() { - }, handleSubmit() { this.isSubmit = true; var json = this.json; json.hqFlag = '0'; - json.commentText = this.commentText; + json.commentText = this.commentText6; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskId: this.taskIds, @@ -461,11 +459,11 @@ export default { }); }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText6) { this.isSubmit = true; var json = this.json; json.hqFlag = '1'; - json.commentText = this.commentText; + json.commentText = this.commentText6; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskIds: this.taskIds, @@ -494,6 +492,7 @@ export default { } else { this.form.fjListId = data.form.fjListId || data.fjListId } + this.commentText6 = data.commentText6 || '' this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 2fe26cbb5..50a609066 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -175,7 +175,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText7"> @@ -241,7 +241,6 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" - @save="handleSave" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -280,6 +279,7 @@ export default { name: "bzzqyjStep7", data() { return { + commentText7: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -438,13 +438,11 @@ export default { handleTabs(name) { this.active = name }, - handleSave() { - }, handleSubmit() { this.isSubmit = true var json = this.json json.bdFlag = '0' - json.commentText = this.commentText + json.commentText = this.commentText7 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -458,11 +456,11 @@ export default { }) }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText7) { this.isSubmit = true var json = this.json json.bdFlag = '1' - json.commentText = this.commentText + json.commentText = this.commentText7 this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskIds: this.taskIds, @@ -491,6 +489,7 @@ export default { } else { this.form.fjListId = data.form.fjListId || data.fjListId } + this.commentText7 = data.commentText7 || '' this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index c484a43fa..61f20b5ca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -175,7 +175,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentText8"> @@ -254,7 +254,7 @@ submitBTNText="同意" > - + v-model="commentText9"> @@ -244,7 +244,6 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" - @save="handleSave" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -283,6 +282,7 @@ export default { name: "bzzqyjStep9", data() { return { + commentText9: '', itermsConditionsFlag: false, itermsConditionsTitle: '', drawerModal: false, @@ -441,13 +441,11 @@ export default { handleTabs(name) { this.active = name; }, - handleSave() { - }, handleSubmit() { this.isSubmit = true; var json = this.json; json.presidentFlag = '0'; - json.commentText = this.commentText; + json.commentText = this.commentText9; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskId: this.taskIds, @@ -461,11 +459,11 @@ export default { }); }, handleSubmitNo() { - if (this.commentText) { + if (this.commentText9) { this.isSubmit = true; var json = this.json; json.presidentFlag = '1'; - json.commentText = this.commentText; + json.commentText = this.commentText9; this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskIds: this.taskIds, @@ -494,6 +492,7 @@ export default { } else { this.form.fjListId = data.form.fjListId || data.fjListId } + this.commentText9 = data.commentText9 || '' this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; From 370dbef41246eff1d956a66fd3f6d8b63caa1000 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 10:51:20 +0800 Subject: [PATCH 03/11] commit --- .../pages/creatProcess/bzdy/step3.vue | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 7124d9d82..a281cc8d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -110,14 +110,14 @@ 点击上传 - + @@ -127,19 +127,19 @@ - - - - - - - - - - - - - + + +
+ + +
+ +
{ this.saveLoading = false @@ -430,7 +431,7 @@ this.json.dyhz = this.form.dyhz this.isSubmit = true var json = this.json - // json.commentText = this.commentText + json.commentText = this.commentText3 json.fileId = this.form.fileId json.fileName = this.form.fileName json.docUser = this.newDocUser @@ -465,6 +466,7 @@ this.acceptShow = false this.submitShow = true } + this.commentText3 = data.commentText3 || '' this.todoId = res.id this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date From 5e847cf9463d1273eddf087b9d70c9ada3bd06d0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 11:12:11 +0800 Subject: [PATCH 04/11] commit --- .../processCenter/pages/creatProcess/bzdy/step3.vue | 12 ++++++++++-- .../tabComponents/processCenter/index.vue | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index a281cc8d0..0ceeb56dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -220,15 +220,16 @@
@@ -250,6 +251,7 @@ name: "bzdyStep3", data() { return { + fileList: [], commentText3: '', newDocUser: '', drawerModal: false, @@ -352,6 +354,11 @@ let id = item.id window.location.href = '/api/att/attFile/downloadFile?fileId=' + id }, + importFileRemove (file, fileList) { + if(fileList){ + this.fileList = fileList.slice(-1) + } + }, // 导入按钮 上传之前的钩子 beginImportFile (file) { var filename = file.name @@ -383,6 +390,7 @@ this.fileMadel = false this.form.fileId = response.data.id this.form.fileName = response.data.name + this.fileList = response.data this.$message({ showClose: true, message: response.message, diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f14ccef02..882d3509e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -682,7 +682,7 @@ export default { }) } else if (row.taskInfo === '责任对接人审批') { this.$router.push({ - name: 'phoneBzdyStep4', + name: 'bzdyStep4', query: { taskIds: row.taskIds, prcId: row.prcId, From fbb75e14b40759ca01a3c87e38e25c18a7ee3631 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 11:25:55 +0800 Subject: [PATCH 05/11] commit --- .../processCenter/pages/creatProcess/bzdy/step3.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 0ceeb56dd..3923ec215 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -355,9 +355,11 @@ window.location.href = '/api/att/attFile/downloadFile?fileId=' + id }, importFileRemove (file, fileList) { - if(fileList){ - this.fileList = fileList.slice(-1) + if (fileList) { + this.fileList = [] } + this.form.fileId = '' + this.form.fileName = '' }, // 导入按钮 上传之前的钩子 beginImportFile (file) { @@ -387,10 +389,11 @@ // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { + this.fileList = [] this.fileMadel = false this.form.fileId = response.data.id this.form.fileName = response.data.name - this.fileList = response.data + this.fileList.push(response.data) this.$message({ showClose: true, message: response.message, From 1dc6865c38fe841be0acee4fe77df129bde959fe Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 11:30:38 +0800 Subject: [PATCH 06/11] commit --- .../processCenter/pages/creatProcess/bzdy/step3.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 3923ec215..e69931e04 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -223,7 +223,7 @@ drag :action="fileUrl" ref="importfile" - :file-list="fileList" + :file-list="form.fileList" name="file" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" @@ -251,7 +251,6 @@ name: "bzdyStep3", data() { return { - fileList: [], commentText3: '', newDocUser: '', drawerModal: false, @@ -267,6 +266,7 @@ acceptShow: false, todoId: '', form: { + fileList: [], dyhz: '', title: '', // 调研标题 date: '', // 完成时间 @@ -356,7 +356,7 @@ }, importFileRemove (file, fileList) { if (fileList) { - this.fileList = [] + this.form.fileList = [] } this.form.fileId = '' this.form.fileName = '' @@ -389,11 +389,11 @@ // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { - this.fileList = [] + this.form.fileList = [] this.fileMadel = false this.form.fileId = response.data.id this.form.fileName = response.data.name - this.fileList.push(response.data) + this.form.fileList.push(response.data) this.$message({ showClose: true, message: response.message, @@ -469,6 +469,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){ this.acceptShow = true @@ -490,6 +491,7 @@ this.form.fileId = data.form ? data.form.fileId : '' this.form.dyhz = data.form ? data.form.dyhz : '' this.newDocUser = data.form ? data.form.docUser : data.docUser + this.form.fileList = data.form ? data.form.fileList : [] }).catch(e => { }) }) From 81c48805457b403e1c8e941c25e4980a78d00947 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 14:35:15 +0800 Subject: [PATCH 07/11] commit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 814d4be51..893a085af 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -336,6 +336,7 @@ name: "bzzqyjStep3", data() { return { + onlyKey: '', commentText3: '', itermsConditionsFlag: false, itermsConditionsTitle: '', @@ -592,6 +593,7 @@ if (this.data.length < 1) { this.isSubmit = true var json = this.json + json.onlyKey = this.onlyKey json.commentText = this.commentText3 json.info = [] json.form = this.form @@ -696,6 +698,8 @@ this.json = data this.getItemList(data.standId,data.textType) this.data = data.info || data.data || data.form.data || [] + this.onlyKey = data.onlyKey + console.log(data); }).catch(e => { }) }) From f83f5e35899ac767c4f87eaa61b6388b6494931b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 14:46:14 +0800 Subject: [PATCH 08/11] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 7f1faad02..408e2fc85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -421,7 +421,7 @@
- +
- + Date: Fri, 31 Dec 2021 15:44:33 +0800 Subject: [PATCH 09/11] commit --- .../CustomFormComponents/InputForAllStandards2.vue | 2 +- .../processCenter/pages/creatProcess/bzzqyj/step3.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index a69bd111f..a9f6f123d 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -335,7 +335,7 @@ page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'ALL', + standType: 'INLAND', quoteIdList: '', validFlag: '0' } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 893a085af..4807528be 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -562,6 +562,7 @@ let _formData = new FormData(); let json = this.form json.data = this.data + json.onlyKey = this.onlyKey _formData.append("id", this.bpnId || ""); _formData.append("prcType", "3"); _formData.append("taskIds", this.taskIds); @@ -635,10 +636,11 @@ else { this.isSubmit = true var json = this.json - json.commentText = this.commentText + json.commentText = this.commentText3 json.info = this.data json.form = this.form json.department = this.$store.getters.userInfo.orgName + json.onlyKey = this.onlyKey this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -662,7 +664,6 @@ }, {}, res => { if (res.ok) { this.options = res.data.list - console.log(res); } }, e => { }) @@ -696,10 +697,9 @@ this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id this.json = data + this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey this.getItemList(data.standId,data.textType) this.data = data.info || data.data || data.form.data || [] - this.onlyKey = data.onlyKey - console.log(data); }).catch(e => { }) }) From 40dee75a660fbe74a0d69abab4162fed8357ef0e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 15:56:01 +0800 Subject: [PATCH 10/11] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 6 +++++- src/pages/processCenter/pages/creatProcess/bzjd/step4.vue | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index cb9ddd400..f60530f31 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -464,6 +464,7 @@ name: "bzjdStep3", data() { return { + AOLIGEI: '', commentText3: '', BDtext: false, itemsNum: '', @@ -746,7 +747,8 @@ roleForm: this.roleForm, commentText3: this.commentText3, itemList: this.itemList, - standInData: this.sarType + standInData: this.sarType, + AOLIGEI: this.AOLIGEI })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -826,6 +828,7 @@ var json = this.json json.commentText = this.commentText3 json.itemList = this.itemList + json.AOLIGEI = this.AOLIGEI this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -858,6 +861,7 @@ this.acceptShow = false this.submitShow = true } + this.AOLIGEI = data.AOLIGEI this.commentText3 = data.commentText3 || '' this.todoId = res.id this.form.itemsNum = data.itemsNum || data.form.itemsNum diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index ae7cf116b..1095dfb25 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -441,7 +441,6 @@ var json = this.json json.resolveFlag = 1 json.commentText = this.commentText4 - json.AOLIGEI = this.AOLIGEI this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, From 3d5d3235c706742e9afcd78cf1f83c59cfdd7607 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 16:04:09 +0800 Subject: [PATCH 11/11] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step3.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index e69931e04..9ba5342de 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -410,10 +410,10 @@ handleSave() { this.saveLoading = true let _formData = new FormData() - this.form.docUser = this.newDocUser _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ form: this.form, + docUser: this.newDocUser, commentText3: this.commentText3, })) saveTaskForPub(_formData).then(res => { @@ -469,7 +469,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){ this.acceptShow = true @@ -490,7 +489,7 @@ this.form.fileName = data.form? data.form.fileName : '' this.form.fileId = data.form ? data.form.fileId : '' this.form.dyhz = data.form ? data.form.dyhz : '' - this.newDocUser = data.form ? data.form.docUser : data.docUser + this.newDocUser = data.docUser this.form.fileList = data.form ? data.form.fileList : [] }).catch(e => { })