diff --git a/src/pages/home1/components/empennage/index.vue b/src/pages/home1/components/empennage/index.vue index fc4e71fc0..f330a0010 100644 --- a/src/pages/home1/components/empennage/index.vue +++ b/src/pages/home1/components/empennage/index.vue @@ -3,7 +3,10 @@ { - this.saveLoading = false - this.$message.success('保存成功') - }).catch(e => { - this.saveLoading = false - }) + this.saveLoading = true; + let _formData = new FormData(); + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "3"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: this.json, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); }, handleSubmit() { if (this.data.length < 1) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index a974c66a6..286b3a83d 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -380,7 +380,10 @@ export default { }, // 批量删除按钮table,选择数据 selectedDelete(val) { - this.deleteDataList = val + this.deleteDataList = [] + for (let i = 0; i < val.length; i++) { + this.deleteDataList.push(val[i].id); + } }, // 点击批量删除事件 deleteList() { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 1e94a8294..58698f842 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -308,11 +308,12 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - let listJSON = JSON.parse(JSON.stringify(item.responUserList)) - if (listJSON.length !== undefined) { - this.dataList = listJSON[0].standardInfoList - } else { + if (item.responUserList !== undefined) { + let listJSON = JSON.parse(JSON.stringify(item.responUserList)) this.dataList = [listJSON][0].standardInfoList + } else { + let listJSONInfo = item.info + this.dataList = [listJSONInfo] } this.dataList.forEach(item => { if (item.fileText.length !== 0) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue new file mode 100644 index 000000000..ae036fbb8 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue @@ -0,0 +1,480 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 19ce38b54..8d0acf0d1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -247,6 +247,7 @@ export default { backLoading: false, dataList: [], json: {}, + taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, // 当前页数 @@ -342,6 +343,9 @@ export default { handleSubmit() { this.isSubmit = true var json = this.json + json.info = { + fileDataList: this.dataList + } json.actionFlag = 0 json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 35ad69a7f..a4255e8e0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -452,24 +452,24 @@ export default { }, //保存事件 - handleSave() { - this.saveLoading = true; - let _formData = new FormData(); - _formData.append("id", this.bpnId || ""); - _formData.append("prcType", "5"); - _formData.append('taskIds', this.taskIds) - _formData.append("json", JSON.stringify({ - form: this.listForm, - commentText: this.commentText - })); - saveTaskForPub(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); - }, + // handleSave() { + // this.saveLoading = true; + // let _formData = new FormData(); + // _formData.append("id", this.bpnId || ""); + // _formData.append("prcType", "5"); + // _formData.append('taskIds', this.taskIds) + // _formData.append("json", JSON.stringify({ + // form: this.listForm, + // commentText: this.commentText + // })); + // saveTaskForPub(_formData).then(res => { + // this.saveLoading = false; + // this.$message.success("保存成功"); + // this.bpnId = res.result; + // }).catch(e => { + // this.saveLoading = false; + // }); + // }, //提交事件 handleSubmit() { this.listForm.breakdownList.forEach(item => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 690d3e50f..a4b8cd042 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -569,7 +569,7 @@ export default { this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; + json.prcCreateUserName = this.$store.getters.userInfo.userName; json.standId = this.listForm.standId; this.$refs["listForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index f90bc40ff..ba3f729f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 65545af80..7ad7547ab 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -570,7 +570,7 @@ export default { this.listForm.commentText = this.commentText; var json = Object.assign(this.listForm, this.roleForm); json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; + json.prcCreateUserName = this.$store.getters.userInfo.userName; json.standId = this.listForm.standId; this.$refs["listForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 8c501b270..a6811563d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -42,16 +42,18 @@ -
-
- 批量分发责任人 - -
-
+ + + + + + -