From 7002d1cc5b5a6582f5ac163d476bc59df49b55e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 31 Aug 2021 15:18:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9bug?= =?UTF-8?q?=E5=8F=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-1.vue | 780 ++++++++++++++++++ .../pages/creatProcess/xmqdqr/step1-2.vue | 741 +++++++++++++++++ .../pages/creatProcess/xmqdqr/step1.vue | 33 +- .../pages/processDetail/index.vue | 3 + .../tabComponents/taskDraft/index.vue | 10 + src/router/index.js | 18 + 6 files changed, 1574 insertions(+), 11 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue new file mode 100644 index 000000000..daf6f0784 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -0,0 +1,780 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue new file mode 100644 index 000000000..e9c4a5451 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -0,0 +1,741 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 628214c8b..2b8fd94e8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -232,11 +232,20 @@
- - + + placeholder="请选择" + filterable + size="small" + > + + { this.ProjectDatas = res.data.total.records; this.total = res.data.total.total; + this.page = 1; }, e => { }); @@ -530,6 +540,7 @@ export default { } else { this.qdform.detailedListName = this.selectedList[0].detailedListName; this.qdform.detailedListId = this.selectedList[0].id; + this.qdform.detailedListVision = this.selectedList[0].detailedListVision; this.detailedListModel = false; } }, @@ -578,14 +589,14 @@ export default { }, //提交事件 handleSubmit() { - this.qdform.commentText = this.commentText + this.qdform.commentText = this.commentText; var json = Object.assign(this.qdform, this.roleForm); this.$refs["qdqrForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { - this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "10"}, { + this.isSubmit = true; + this.$http.get("lawss/activiti/startProcess", { type: "10" }, { _this: this }, res => { if (res.ok) { @@ -600,7 +611,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.isSubmit = false + this.isSubmit = false; }); } }); @@ -622,7 +633,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "10"); _formData.append("json", JSON.stringify({ - taskInfo: '确认人确认', + taskInfo: "确认人确认", form: this.qdform, roleForm: this.roleForm, commentText: this.commentText @@ -634,7 +645,7 @@ export default { }).catch(e => { this.saveLoading = false; }); - }, + } }, mounted() { // 查询各下拉框数据 diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 5dabf5193..f450ea977 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -228,6 +228,9 @@ export default { }else if(prcType === '3'){ //标准征求意见 this.toProcessDetail('bzzqyjStep1-9',row) + }else if(prcType === '10'){ + //项目清单确认 + this.toProcessDetail('xmqdqrStep1-2',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 1826a1a9b..d549fffd8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -345,6 +345,16 @@ export default { } }) break + case '10': + this.$router.push({ + name: 'xmqdqrStep1-1', + query: { + type: '10', + processName: '项目清单确认流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index c5f00b910..a5808bd79 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -547,6 +547,24 @@ const routes = [ title: '项目清单确认流程' } }, + { + path: '/xmqdqrStep1-1', + name: 'xmqdqrStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, + { + path: '/xmqdqrStep1-2', + name: 'xmqdqrStep1-2', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1', From d5cd0bec9e98a4ff800a403ef234ccca298ce84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 31 Aug 2021 15:26:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E5=BC=80=E5=8F=91=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-1.vue | 1 + .../pages/creatProcess/xmqdqr/step1-2.vue | 166 ------------------ 2 files changed, 1 insertion(+), 166 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index daf6f0784..0a35e1982 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -551,6 +551,7 @@ export default { } else { this.qdform.detailedListName = this.selectedList[0].detailedListName; this.qdform.detailedListId = this.selectedList[0].id; + this.qdform.detailedListVision = this.selectedList[0].detailedListVision; this.detailedListModel = false; } }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue index e9c4a5451..4529bca2e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue @@ -50,12 +50,6 @@ -
-
- 添加 - 批量删除 -
-
流程列表加载中
- - -
-
-
-
- - - - - - - - - - - - - - - - - - - 查询 - - 清空 - - - -
- - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- 取消 - 添加 -
- @@ -407,7 +269,6 @@ export default { saveLoading: false, projectId: "", detailedId: "", - standModel: false, standSortOptions: [], standList: [], projectStand:[], @@ -520,33 +381,6 @@ export default { }); }); }, - addList() { - this.standModel = true; - }, - //批量删除 - delectList(){ - if (this.projectStand.length < 1) { - this.$message.warning("请选择一条数据进行删除"); - } else { - this.$confirm("您确认删除这些数据?", "提示", { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.projectStand.map(item => { - let index; - index = this.dataList.findIndex(items => { - return items.standId === item.standId; - }); - if (index > -1) { - this.dataList.splice(index, 1); - } - }); - }).catch(() => { - }); - } - }, //添加标准勾选框数据 selectStand(data) { this.standList = data; From 81dd2bf5fca9019038d3bd5cca2bd9aea76c0cb5 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 31 Aug 2021 15:43:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=20=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84--=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E6=9F=A5?= =?UTF-8?q?=E6=89=BE=E7=9A=84=E6=A0=87=E5=87=86=E7=9A=84=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E6=8A=8A=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81=E6=94=B9?= =?UTF-8?q?=E6=88=90=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InputForStandards.vue | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 946f39711..39274d02a 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -106,9 +106,12 @@ + {{$t('m.dataAcquisition')}} @@ -168,6 +171,8 @@ export default { }, data () { return { + textStatus:'',//文本状态 + textStatusMap: {}, // 文本状态id与name对应 replaceLawsNumModel: false, sarBussionessLawsEO: { replaceLawsNum: '' @@ -203,7 +208,22 @@ export default { return !!this.config.isMust } }, + mounted() { + //从数据库中查询下拉框数据 + this.$http.get("sys/dictype/getDicTypeListCode", {}, { + _this: this + }, res => { + this.standStateOptions = res.data.WBZTCLASS; // 文本状态 + this.setMap(this.standStateOptions); + }); + }, methods: { + // 将文本状态的id与name对应 + setMap(data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, handleChange (event) { // const value = event.target.value const value = event From 510811ede84b6b196c87db17405f9b3a874a29e7 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 31 Aug 2021 16:01:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=EF=BC=88?= =?UTF-8?q?+=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step2.vue | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 6bbd2d579..c75b9ef5a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -499,34 +499,34 @@ export default { this.qdform.prcNum = this.prcNum; this.qdform.prcName = this.prcName; this.qdform["id"] = item.id; - this.projectId = item.projectId; + // this.projectId = item.projectId; this.detailedId = item.detailedListId; - this.getStandData(); + // this.getStandData(); this.getStand(); }); }, //查询清单下的标准 - getStandData() { - this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, { - _this: this - }, res => { - this.dataList = res.data.records; - this.dataList.forEach(item => { - // 责任部门转换 - if (item.zrbm !== null || item.zrbm !== "") { - let k = (item.zrbm || "").split(","); - for (let i in this.zrbmOptions) { - for (let m = 0; m < k.length; m++) { - if (this.zrbmOptions[i].value === k[m]) { - k[m] = this.zrbmOptions[i].label; - } - item.zrbm = k.join(","); - } - } - } - }); - }); - }, + // getStandData() { + // this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, { + // _this: this + // }, res => { + // this.dataList = res.data.records; + // this.dataList.forEach(item => { + // // 责任部门转换 + // if (item.zrbm !== null || item.zrbm !== "") { + // let k = (item.zrbm || "").split(","); + // for (let i in this.zrbmOptions) { + // for (let m = 0; m < k.length; m++) { + // if (this.zrbmOptions[i].value === k[m]) { + // k[m] = this.zrbmOptions[i].label; + // } + // item.zrbm = k.join(","); + // } + // } + // } + // }); + // }); + // }, //提交事件 handleSubmit() { this.isSubmit = true;