From 8358a0522665af92c0ed73ac1f178a8ef5865cd6 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 31 Dec 2021 10:48:36 +0800 Subject: [PATCH 1/2] 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 2/2] 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