From 37da8ce2e2e1daa679cb33c9c0f45c25b6aab842 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, 14 Sep 2021 16:37:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home1/components/todoList/index.vue | 23 +- .../pages/creatProcess/xmqdqr/step1-1.vue | 20 +- .../xmqdqr/{step1-2.vue => step1-3.vue} | 52 +- .../pages/creatProcess/xmqdqr/step1.vue | 23 +- .../pages/creatProcess/xmqdqr/step2.vue | 6 +- .../pages/creatProcess/xmqdqr/step3.vue | 671 ++++++++++++++++++ .../pages/processDetail/index.vue | 2 +- .../tabComponents/processCenter/index.vue | 11 + src/router/index.js | 15 +- 9 files changed, 778 insertions(+), 45 deletions(-) rename src/pages/processCenter/pages/creatProcess/xmqdqr/{step1-2.vue => step1-3.vue} (94%) create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue index 062572dca..450a7fec0 100644 --- a/src/pages/home1/components/todoList/index.vue +++ b/src/pages/home1/components/todoList/index.vue @@ -621,19 +621,18 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '标准法规部经理审批') { + this.$router.push({ + name: 'xmqdqrStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } - // else if (row.taskInfo === '上传佐证材料填写信息') { - // this.$router.push({ - // name: 'wfhxzgStep4', - // query: { - // taskIds: row.taskIds, - // prcId: row.prcId, - // prcNum: row.prcNum, - // prcName: row.prcName, - // prcType: row.prcType - // } - // }) - // } break } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index d1f2a26ed..0a6ea27a5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -106,6 +106,19 @@ + + + +

审批人

+
+ + +
+
+
+
@@ -412,7 +425,9 @@ export default { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, confirmId: "", - confirmName: "" + confirmName: "", + approveId: "", + approveName: "", }, //表单验证 formRules: { @@ -579,6 +594,9 @@ export default { if (this.type === "confirmId") { this.roleForm.confirmId = data[0].id; this.roleForm.confirmName = data[0].name; + }else if(this.type === "approveId"){ + this.roleForm.approveId = data[0].id; + this.roleForm.approveName = data[0].name; } this.modalshowflag = false; }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue similarity index 94% rename from src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue rename to src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue index 2b0c6bf74..3d84e860f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -253,7 +253,7 @@ import ProcessTitle from "../../components/ProcessTitle"; import { inboundLiaisonDetail, queryDetail } from "api/process"; export default { - name: "xmqdqrStep1-2", + name: "xmqdqrStep1-3", components: { ProcessTitle, ProcessHeader, @@ -348,44 +348,46 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { if(item.form === undefined){ this.qdform = JSON.parse(JSON.stringify(item)); this.qdform.prcNum = this.prcNum; this.qdform.prcName = this.prcName; this.qdform["id"] = item.id; + this.dataList = item.dataList this.projectId = item.projectId - this.getStandData(); + // this.getStandData(); }else{ this.qdform = item.form this.dataList =item.form.dataList this.projectId = item.form.projectId - this.getStandData(); + // this.getStandData(); } }); }, //查询清单下的标准 - 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(","); + // } + // } + // } + // }); + // }); + // }, //添加标准勾选框数据 selectStand(data) { this.standList = data; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 67446e72b..82865c0aa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -105,6 +105,19 @@ + + + +

审批人

+
+ + +
+
+
+
@@ -412,7 +425,9 @@ export default { startUserName: this.$store.getters.userInfo.userName, startUser: this.$store.getters.userInfo.userId, confirmId: "", - confirmName: "" + confirmName: "", + approveId: "", + approveName:"", }, //表单验证 formRules: { @@ -430,6 +445,9 @@ export default { roleFormRules: { confirmName: [ { required: true, message: "请选择确认人", trigger: "change" } + ], + approveName: [ + { required: true, message: "请选择审批人", trigger: "change" } ] } }; @@ -577,6 +595,9 @@ export default { if (this.type === "confirmId") { this.roleForm.confirmId = data[0].id; this.roleForm.confirmName = data[0].name; + }else if(this.type === "approveId"){ + this.roleForm.approveId = data[0].id; + this.roleForm.approveName = data[0].name; } this.modalshowflag = false; }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 57afe1297..6917d8890 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -340,7 +340,7 @@