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 @@
项目清单确认流程
- 确认人确认
+ 法规部经理审批
@@ -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 @@
@@ -349,7 +349,7 @@
@@ -423,7 +423,9 @@ export default {
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
+ drawerTitle:'',
active: "1",
+ nodeList: [],
loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
new file mode 100644
index 000000000..893d865fc
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -0,0 +1,671 @@
+
+
+
+ 项目清单确认流程
+ 法规部经理审批
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 40c5d9a12..b4ed07c11 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -257,7 +257,7 @@ export default {
this.toProcessDetail('bzzqyjStep1-9',row)
}else if(prcType === '10'){
//项目清单确认
- this.toProcessDetail('xmqdqrStep1-2',row)
+ this.toProcessDetail('xmqdqrStep1-3',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 a3a901222..3d2d0dde1 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -856,6 +856,17 @@ 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
+ }
+ })
}
break
}
diff --git a/src/router/index.js b/src/router/index.js
index 40b714995..946409ed6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -557,9 +557,18 @@ const routes = [
}
},
{
- path: '/xmqdqrStep1-2',
- name: 'xmqdqrStep1-2',
- component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue'),
+ path: '/xmqdqrStep1-3',
+ name: 'xmqdqrStep1-3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
+ {
+ path: '/xmqdqrStep3',
+ name: 'xmqdqrStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'),
meta: {
requireAuth: true,
title: '项目清单确认流程'