diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue new file mode 100644 index 000000000..ee4045a82 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -0,0 +1,406 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index fb8005d12..313e30fb3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -1,337 +1,376 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 0ff0abfea..b3e076e97 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -208,6 +208,7 @@ { - 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.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 19ce38b54..49fecb77b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -196,6 +196,7 @@ { - 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-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/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 61c5784cd..ec904a42a 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -225,6 +225,9 @@ export default { //标准调研流程 }else if(prcType === '2'){ this.toProcessDetail('bzdyStep1-9',row) + }else if(prcType === '3'){ + //标准征求意见 + this.toProcessDetail('bzzqyjStep1-9',row) } } else { this.$message.warning('当前流程未全部办理完成,无法查看') diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index b7e8c8ef4..40c7f5a42 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -75,6 +75,9 @@ align="center" width="150" > + + import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzdyStep4', name: 'bzdyStep4',