From 447e573b3b080165571326b21d1a69e899694150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 5 Dec 2021 15:03:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B5=81=E7=A8=8B=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmqdqr/step1-1.vue            | 10 +++++-----
 .../pages/creatProcess/xmqdqr/step1.vue              | 10 +++++-----
 .../pages/creatProcess/xmqdqr/step2.vue              |  2 +-
 .../pages/creatProcess/xmqdqr/step4.vue              |  2 +-
 .../pages/creatProcess/xmqdqr/step5.vue              |  2 +-
 .../localProductsOrProjectLibrary/pages/details.vue  | 12 +++++++++++-
 6 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
index 940d01219..bbf9fc527 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
@@ -96,15 +96,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择产品经理" placement="top"
+            <el-timeline-item timestamp="选择产品工程经理" placement="top"
                               :color="roleForm.confirmId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="confirmName" style="margin-bottom: 0">
-                  <h4>产品经理</h4>
+                  <h4>产品工程经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.confirmName" placeholder="选择产品经理"
-                              @click.native="choiceZRR('confirmId', '选择产品经理', roleForm.confirmId)"></el-input>
+                    <el-input v-model="roleForm.confirmName" placeholder="选择产品工程经理"
+                              @click.native="choiceZRR('confirmId', '选择产品工程经理', roleForm.confirmId)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -449,7 +449,7 @@ export default {
       // 角色验证
       roleFormRules: {
         confirmName: [
-          { required: true, message: "请选择产品经理", trigger: "change" }
+          { required: true, message: "请选择产品工程经理", trigger: "change" }
         ]
       }
     };
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index 55912d6bf..26c2a7824 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -103,15 +103,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择产品经理" placement="top"
+            <el-timeline-item timestamp="选择产品工程经理" placement="top"
                               :color="roleForm.confirmId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="confirmName" style="margin-bottom: 0">
-                  <h4>产品经理</h4>
+                  <h4>产品工程经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.confirmName" placeholder="选择产品经理"
-                              @click.native="choiceZRR('confirmId', '选择产品经理', roleForm.confirmId)"></el-input>
+                    <el-input v-model="roleForm.confirmName" placeholder="选择产品工程经理"
+                              @click.native="choiceZRR('confirmId', '选择产品工程经理', roleForm.confirmId)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -461,7 +461,7 @@ export default {
       // 角色验证
       roleFormRules: {
         confirmName: [
-          { required: true, message: "请选择产品经理", trigger: "change" }
+          { required: true, message: "请选择产品工程经理", trigger: "change" }
         ],
         approveName: [
           { required: true, message: "请选择审批人", trigger: "change" }
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index ae447c6ff..3c6393c96 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">产品经理分发任务</template>
+      <template slot="proNode">产品工程经理分发任务</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index c8e90435c..b3842c57e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">产品经理汇总</template>
+      <template slot="proNode">产品工程经理汇总</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
index 72aada999..ab14aa929 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">产品经理汇总</template>
+      <template slot="proNode">法规部经理审批</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 5f0242084..f7142f3af 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -10,7 +10,7 @@
       <el-card class="contaiinerCard" style="margin: 5px">
         <div style="padding: 20px">
           <el-row style="margin-top: 10px">
-            <el-col :span="5">产品平台1: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
+            <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
             <el-col :span="5" :push="2">
               <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
@@ -36,6 +36,7 @@
             <el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
           </el-row>
           <el-row style="margin-top: 10px">
+            <el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
             <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
             <el-col :span="5" :push="1"> 项目计划开始时间: <span
               class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
@@ -168,6 +169,15 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="endTimes"
+            sortable
+            width="190px"
+            label="整改完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTimes ? scope.row.endTimes.substring(0,10) : '' }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <pagination
           style="position: relative;"