diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index ede994365..90225c661 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -661,13 +661,14 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes) + console.log(mes); this.bpnId = this.$route.query.bpnId if (mes.form.endTime) { mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD')) } else { mes.form.endTime = '' } - this.addFjList = mes.filesId + this.addFjList = mes.filesId || mes.form.filesId || '' this.form.fjListName = mes.filesName this.form = mes.form this.roleForm = mes.roleForm @@ -878,6 +879,7 @@ export default { handleSave () { this.saveLoading = true let _formData = new FormData() + this.form.filesId = this.addFjList _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.userName) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index 0b87159c2..a80b09eba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -169,19 +169,6 @@ - - -
- - -
- -
{ let data = JSON.parse(res.mesg) + this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey this.commentText2 = data.commentText2 || '' this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index fe5399ae3..51c43b171 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -349,6 +349,7 @@ export default { data() { return { standId: '', + onlyKey: '', modaltitle2: '', addType: '', commentText4: '', @@ -623,6 +624,7 @@ export default { let _formData = new FormData(); let json = this.json json.info = this.data + json.onlyKey = this.onlyKey json.spId = this.form.spId json.spName = this.form.spName _formData.append("id", this.bpnId || ""); @@ -630,8 +632,9 @@ export default { _formData.append("taskIds", this.taskIds); _formData.append("json", JSON.stringify({ form: json, - commentText: this.commentText4 + commentText4: this.commentText4 })); + console.log(json); saveTaskForPub(_formData).then(res => { this.saveLoading = false; this.$message.success("保存成功"); @@ -649,6 +652,7 @@ export default { json.commentText = this.commentText4 json.spId = this.form.spId json.info = this.data + json.onlyKey = this.onlyKey json.spName = this.form.spName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -702,7 +706,12 @@ export default { this.acceptShow = false this.submitShow = true } - this.commentText4 = data.commentText || data.commentText4 || '' + this.commentText4 = data.commentText4 || '' + if(data.onlyKey){ + this.onlyKey = data.onlyKey + }else{ + this.onlyKey = data.form.onlyKey + } this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index a9f199be1..97f4abc32 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -351,6 +351,7 @@ return { clickFlag: false, commentText5: '', + onlyKey: '', options: [], itemId: '', modalshowflag2: false, @@ -557,6 +558,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); @@ -593,6 +595,7 @@ this.isSubmit = true; var json = this.json; json.oldinfo = this.oldData; + json.onlyKey = this.onlyKey json.commentText = this.commentText5; json.introduce = true; this.$http.post("lawss/activiti/completeTask", { @@ -617,8 +620,8 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - console.log(data); this.commentText5 = data.commentText5 || '' + this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue index 02ee8be31..e59fad088 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -305,70 +305,66 @@ handleTabs(name) { this.active = name }, - handleSubmit() { - this.isSubmit = true - var json = this.json - json.commentText = this.commentText42 - json.bzFlag = '0' - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.account - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - this.isSubmit = false - }) - }, - handleSubmitNo() { - if (this.commentText42) { - var json = this.json - json.bzFlag = '1' - json.commentText = this.commentText42 - this.$http.post('lawss/activiti/completeTask', { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.account - }, {}, res => { - if (res.success) { - this.$message.success('提交成功') - this.$router.push('/processCenter') - } - }) - } else { - this.$message.warning('请输入反馈意见') + handleSubmit() { + this.isSubmit = true + let json = this.json + json.info = this.data + json.commentText = this.commentText42 + json.bzFlag = '0' + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + }, + handleSubmitNo() { + if (this.commentText42) { + var json = this.json + json.bzFlag = '1' + json.commentText = this.commentText42 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('提交成功') + this.$router.push('/processCenter') } + }) + } else { + this.$message.warning('请输入反馈意见') + } - }, - getData() { - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - if (data.fjListId === '') { - this.form.fjListId = '' - } 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 - this.form.textType = data.textType || data.form.textType - this.form.modelList = data.modelList || data.form.modelList - this.form.modelNameList = data.modelNameList || data.form.modelNameList - this.form.bzfgId = data.bzfgId || '' - this.json = data - this.data = data.info || data.data - }).catch(e => { - }) - }) - }, + }, + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.taskIds, + pId: this.pId + }).then(res => { + let data = JSON.parse(res.mesg) + this.form.fjList = data.fjList || data.form.fjList + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName + this.commentText42 = data.commentText42 || '' + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.bzfgId = data.bzfgId || '' + this.json = data + this.data = data.info || data.data + }).catch(e => { + }) + }) + }, }, mounted() { this.getHistoryData()