From 24d33e20610a6a4f40c776df77dd4ca151ee2359 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Mon, 11 Apr 2022 13:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../creatProcess/zdrzbzORzchgxxmsc/step9.vue | 235 ++++++++++++++----
.../tabComponents/processCenter/index.vue | 4 +-
2 files changed, 182 insertions(+), 57 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue
index d210f04cb..dc4bcd13f 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue
@@ -110,87 +110,206 @@
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
-
-
+ show-overflow-tooltip
+ prop="G0"
+ label="G0"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G1"
+ label="G1"
+ min-width="150"
+ align="center"
+ >
+ show-overflow-tooltip
+ prop="G2"
+ label="G2"
+ min-width="150"
+ align="center"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -300,6 +419,9 @@ export default {
name: "zdrzbzORzchgxxmscStep9",
data() {
return {
+ ruleForm: {
+ multipleTableData: [],
+ },
infoTableDatas: [],
//用来判断反馈情况的是哪个部门,1代表各事业部,2代表产品规划部,0代表其他部门
feedbackDept: "",
@@ -509,6 +631,9 @@ export default {
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.json = data
+ if (typeof Array(data.table) && data.feedbackDept === '2') {
+ this.ruleForm.multipleTableData = data.table
+ }
this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept)
}).catch(e => {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index f9f0afa02..f935713ac 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -1457,7 +1457,7 @@ export default {
prcType: row.prcType
}
})
- } else if(row.taskInfo === '法规认证部副总监批准'){
+ } else if(row.taskInfo === '法规认证部副总监审核'){
this.$router.push({
name: 'zdrzbzORzchgxxmscStep3',
query: {
@@ -1529,7 +1529,7 @@ export default {
}
})
}
- else if(row.taskInfo === '法规认证部副总监审定'){
+ else if(row.taskInfo === '法规认证部副总监批准'){
this.$router.push({
name: 'zdrzbzORzchgxxmscStep9',
query: {