From 029e6d71ca5790e3f62d97fc6fb2b3f7cc312b9b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 23 Nov 2021 16:58:36 +0800 Subject: [PATCH] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 16 ++++++++-------- .../pages/creatProcess/bzjd/step1.vue | 16 ++++++++-------- .../pages/creatProcess/bzzqyj/step1-1.vue | 12 ++++++------ .../pages/creatProcess/bzzqyj/step1.vue | 12 ++++++------ .../pages/creatProcess/bzzqyj/step2.vue | 5 +++++ .../pages/creatProcess/bzzqyj/step3.vue | 17 +++++++++++------ .../pages/creatProcess/bzzqyj/step4.vue | 6 +++++- .../pages/creatProcess/bzzqyj/step5.vue | 6 +++++- .../pages/creatProcess/bzzqyj/step6.vue | 6 +++++- .../pages/creatProcess/bzzqyj/step7.vue | 6 +++++- .../pages/creatProcess/bzzqyj/step8.vue | 6 +++++- .../pages/creatProcess/bzzqyj/step9.vue | 6 +++++- .../tabComponents/processCenter/index.vue | 2 +- 13 files changed, 75 insertions(+), 41 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index acd410c04..02735c0ca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -26,7 +26,7 @@
- 带入 + 导入
@@ -84,7 +84,7 @@
- 带入 + 导入
@@ -329,7 +329,7 @@ 数据加载中……
取消 - 带入 + 导入
@@ -649,7 +649,7 @@ this.standCommonlySearch2.pageSize = pageSize this.sarStandCompareHis2() }, - /** 选择带入数据的方法操作 + /** 选择导入数据的方法操作 * */ handleSelection(data) { this.selectedList = []; @@ -710,9 +710,9 @@ this.loading = false }) } else if (this.selectedList.length > 1) { - this.$message.warning("只能选择一条数据进行带入"); + this.$message.warning("只能选择一条数据进行导入"); } else { - this.$message.warning("请选择一条数据进行带入"); + this.$message.warning("请选择一条数据进行导入"); } }, closeDrawer2() { @@ -744,9 +744,9 @@ this.form.oldNumber = bringData[0].id this.listModel2 = false } else if (this.selectedList2.length > 1) { - this.$message.warning("只能选择一条数据进行带入"); + this.$message.warning("只能选择一条数据进行导入"); } else { - this.$message.warning("请选择一条数据进行带入"); + this.$message.warning("请选择一条数据进行导入"); } }, /*** **********************************************/ diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 132805150..99ee89033 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -27,7 +27,7 @@
- 带入 + 导入
@@ -94,7 +94,7 @@
- 带入 + 导入
@@ -345,7 +345,7 @@ 数据加载中……
取消 - 带入 + 导入
@@ -680,7 +680,7 @@ export default { this.standCommonlySearch2.pageSize = pageSize this.sarStandCompareHis2() }, - /** 选择带入数据的方法操作 + /** 选择导入数据的方法操作 * */ handleSelection(data) { this.selectedList = []; @@ -747,9 +747,9 @@ export default { this.loading = false }) } else if (this.selectedList.length > 1) { - this.$message.warning("只能选择一条数据进行带入"); + this.$message.warning("只能选择一条数据进行导入"); } else { - this.$message.warning("请选择一条数据进行带入"); + this.$message.warning("请选择一条数据进行导入"); } }, closeDrawer2() { @@ -781,9 +781,9 @@ export default { this.form.oldNumber = bringData[0].id this.listModel2 = false } else if (this.selectedList2.length > 1) { - this.$message.warning("只能选择一条数据进行带入"); + this.$message.warning("只能选择一条数据进行导入"); } else { - this.$message.warning("请选择一条数据进行带入"); + this.$message.warning("请选择一条数据进行导入"); } }, /*** **********************************************/ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 6f6141a01..edd83a846 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -97,12 +97,12 @@ -

责任部门对接人

+

责任领导

@@ -253,7 +253,7 @@ -

责任部门对接人

+

责任领导

@@ -254,7 +254,7 @@ { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index e11860ba6..1c447a791 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -485,7 +485,8 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - let commitStatus = res.commitStatus + console.log(data); + let commitStatus = res.commitStatus if(commitStatus && commitStatus > 0){ this.acceptShow = true this.submitShow = false @@ -493,12 +494,16 @@ export default { this.acceptShow = false this.submitShow = true } - this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId - this.form.cid = data.cid || data.form.cid - this.form.endTime = data.endTime || data.form.endTime + this.form.fjList = data.fjList || data.form.fjList || [] + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } + this.form.cid = data.cid || data.form.cid + this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id - this.json = data + this.json = data this.data = data.info || data.data || data.form.data || [] }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 035b50399..d5933345e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -373,7 +373,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } 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 21e11d8c9..6beb38976 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -420,7 +420,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg); this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } 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/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 33a0caa49..d68e7e09b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -437,7 +437,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg); this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } 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 708a4ea2c..66919dec5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -434,7 +434,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } 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 8cfe376a3..8bd0319ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -434,7 +434,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } 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/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 9887dfac6..2a9039e77 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -434,7 +434,11 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList - this.form.fjListId = data.fjListId || data.form.fjListId + if (data.fjListId === '') { + this.form.fjListId = '' + } else { + this.form.fjListId = data.form.fjListId || data.fjListId + } 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/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 73022ed85..d119d117b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -247,7 +247,7 @@ export default { this.queryProcess() }, queryProcess () { // 查询待办流程 - this.$http.postData('lawss/activiti/todoTaskList', { + this.$http.postData('lawss/activiti/todoTaskListNew', { current: this.pageNo, size: parseInt(this.$store.getters.userInfo.configContent), userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,