From 6a0dd76bbe4c472802c9c21ec32b363b4a29e4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 26 Aug 2021 13:39:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step2.vue | 687 +++++++++--------- .../pages/creatProcess/bzzqyj/step3.vue | 31 +- .../pages/creatProcess/xmpg/step3.vue | 36 +- .../pages/creatProcess/xmpg2/step1-12.vue | 2 +- 4 files changed, 399 insertions(+), 357 deletions(-) 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/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-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 @@
- +
基础信息
From d7d5068f4f94d4acce7a06153ebd8803fca55e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 26 Aug 2021 13:50:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1-9.vue | 406 ++++++++++++++++++ .../pages/processDetail/index.vue | 3 + src/router/index.js | 9 + 3 files changed, 418 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue 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/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/router/index.js b/src/router/index.js index 5669438e8..27c5a2d7f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -745,6 +745,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzzqyjStep1-9', + name: 'bzzqyjStep1-9', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzdyStep4', name: 'bzdyStep4', From 98a08f62b657cf72b867baba3850577dd9271a85 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 26 Aug 2021 14:25:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E7=9A=84=E8=B7=B3=E8=BD=AC=EF=BC=8C=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E5=BF=83=E7=9A=84=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/wfhxzg/step1.vue | 5 ++++- .../processCenter/pages/creatProcess/wfhxzg/step4.vue | 9 +++++---- .../processCenter/pages/creatProcess/wfhxzg/step5.vue | 5 +++++ .../processList/tabComponents/processCenter/index.vue | 8 +++++++- 4 files changed, 21 insertions(+), 6 deletions(-) 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 @@
+ +