From b2a359b2ba42a74a61fc560a4a208c2dec022049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 13 Sep 2021 10:36:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-1.vue     | 14 ++++---------
 .../pages/creatProcess/bzqdfb/step1.vue       | 20 +++++++------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 8f68ca173..6937d3afb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -231,7 +231,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
-                              @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                              disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -788,10 +788,10 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
         dockUser: "",
-        ministerUser: "",
+        ministerUser: this.$store.getters.userInfo.userId,
         directorUser: "",
         dockUserName: "",
-        ministerUserName: "",
+        ministerUserName: this.$store.getters.userInfo.userName,
         directorUserName: ""
       },
       formRules: {
@@ -806,9 +806,6 @@ export default {
         dockUserName: [
           { required: true, message: "请选择会签责任人", trigger: "change" }
         ],
-        ministerUserName: [
-          { required: true, message: "请选择修订责任人", trigger: "change" }
-        ],
         directorUserName: [
           { required: true, message: "请选择审批责任人", trigger: "change" }
         ]
@@ -898,10 +895,7 @@ export default {
       if (this.type === "dockUser") {
         this.roleForm.dockUser = this.roleRow.id;
         this.roleForm.dockUserName = this.roleRow.name;
-      } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = data[0].id;
-        this.roleForm.ministerUserName = data[0].name;
-      } else if (this.type === "directorUser") {
+      }  else if (this.type === "directorUser") {
         this.roleForm.directorUser = data[0].id;
         this.roleForm.directorUserName = data[0].name;
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index f8f02eaf0..b961e76cb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -131,20 +131,20 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="XCXSSRQ"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="ZCCSSRQ"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -231,7 +231,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.ministerUserName" placeholder="选择标准/政策法规工程师"
-                              @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"></el-input>
+                              disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -758,10 +758,10 @@ export default {
         prcCreateUserName: this.$store.getters.userInfo.userName,
         prcCreateUser: this.$store.getters.userInfo.userId,
         dockUser: "",
-        ministerUser: "",
+        ministerUser: this.$store.getters.userInfo.userId,
         directorUser: "",
         dockUserName: "",
-        ministerUserName: "",
+        ministerUserName: this.$store.getters.userInfo.userName,
         directorUserName: ""
       },
       formRules: {
@@ -776,9 +776,6 @@ export default {
         dockUserName: [
           {required: true, message: "请选择会签责任人", trigger: "change"}
         ],
-        ministerUserName: [
-          {required: true, message: "请选择修订责任人", trigger: "change"}
-        ],
         directorUserName: [
           {required: true, message: "请选择审批责任人", trigger: "change"}
         ]
@@ -857,9 +854,6 @@ export default {
       if (this.type === "dockUser") {
         this.roleForm.dockUser = this.roleRow.id;
         this.roleForm.dockUserName = this.roleRow.name;
-      } else if (this.type === "ministerUser") {
-        this.roleForm.ministerUser = data[0].id;
-        this.roleForm.ministerUserName = data[0].name;
       } else if (this.type === "directorUser") {
         this.roleForm.directorUser = data[0].id;
         this.roleForm.directorUserName = data[0].name;