From d688b4b2138c8687c441be15c31ca24ab96798ed Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 7 Jan 2022 10:34:31 +0800
Subject: [PATCH 1/2] commit

---
 .../standContrast/pages/comparisonClauses.vue       |  6 ++++--
 .../enterpriseStandardPlan/index.vue                | 13 +++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/pages/localTool/standContrast/pages/comparisonClauses.vue b/src/pages/localTool/standContrast/pages/comparisonClauses.vue
index 352d7122b..bc012a93b 100644
--- a/src/pages/localTool/standContrast/pages/comparisonClauses.vue
+++ b/src/pages/localTool/standContrast/pages/comparisonClauses.vue
@@ -56,7 +56,8 @@
                     </el-col>
                   </el-row>
                 </div>
-                <div v-for="(item,index) in leftString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>
+                <div v-html="leftString" v-if="comparisonFlag === '2'"></div>
+<!--                <div v-for="(item,index) in leftString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>-->
               </div>
             </div>
           </div>
@@ -109,7 +110,8 @@
                     </el-col>
                   </el-row>
                 </div>
-                <div v-for="(item,index) in rightString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>
+<!--                <div v-for="(item,index) in rightString" v-html="item" :key="index" v-if="comparisonFlag === '2'"></div>-->
+                <div v-html="rightString" v-if="comparisonFlag === '2'"></div>
               </div>
             </div>
           </div>
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index fb30ab98c..3367086b7 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -755,7 +755,11 @@
                 }
             },
             QYBZcloseDrawer () {
-                this.clearQYBZ()
+                this.QYBZform = {
+                    page: 1,
+                    standCode: '',
+                    standName: '',
+                }
             },
             QYBZenterDrawer () {
                 if (this.QYBZformSelect.length > 1) {
@@ -765,7 +769,11 @@
                 } else {
                     this.addForm.rqbJson = this.QYBZformSelect[0].id
                     this.addForm.rqbName = this.QYBZformSelect[0].standCode
-                    this.clearQYBZ()
+                    this.QYBZform = {
+                        page: 1,
+                        standCode: '',
+                        standName: '',
+                    }
                     this.QYBZmodal = false
                 }
             },
@@ -795,6 +803,7 @@
                     standCode: '',
                     standName: '',
                 }
+                this.QYBZget()
             },
             choiceQYBZ (id) {
                 if (this.DrawerType === 'see') {

From 187e8804b1e6d2ee1fc848529977cf8907fea27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 7 Jan 2022 10:41:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdjhgk/step1-5.vue  |  2 +-
 .../pages/creatProcess/qbzxdjhgk/step1.vue    | 49 ++++++++++---------
 .../pages/creatProcess/qbzxdjhgk/step2.vue    |  2 +-
 .../pages/creatProcess/qbzxdjhgk/step3.vue    |  2 +-
 .../pages/creatProcess/qbzxdjhgk/step4.vue    |  2 +-
 .../pages/creatProcess/qbzxdjhgk/step5.vue    |  2 +-
 6 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
index 0014cd9f8..7c1ca6056 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -2,7 +2,7 @@
   <div class="qbzxd-jhgk">
     <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/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index 8f696fab7..73b3e97c7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -2,7 +2,7 @@
   <div class="qbzxd-jhgk">
     <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>
@@ -68,80 +68,85 @@
             <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.prcCreateUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
-                  <h4>标准法规工程师</h4>
+                  <h4>标准立项申请人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.prcCreateUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.prcCreateUserName" placeholder="流程发起人"
+                    <el-input v-model="roleForm.prcCreateUserName" placeholder="标准立项申请人"
                               disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择申请部门高级经理审核" placement="top"
+            <el-timeline-item timestamp="选择标准立项单位整车/系统总工审核" placement="top"
                               :color="roleForm.dockUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
-                  <h4>申请部门高级经理</h4>
+                  <h4>标准立项单位整车/系统总工</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择申请部门高级经理"
-                              @click.native="choiceZRR('dockUser', '选择申请部门高级经理', roleForm.dockUser)">
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择标准立项单位整车/系统总工"
+                              @click.native="choiceZRR('dockUser', '选择标准立项单位整车/系统总工', roleForm.dockUser)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择申请部门中心主任会签" placement="top"
+            <el-timeline-item timestamp="选择会签人员会签" placement="top"
                               :color="roleForm.countersigner ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="countersignerName" style="margin-bottom: 0">
-                  <h4>申请部门中心主任</h4>
+                  <h4>创新技术委员会成员/标准体系工作组成员(必选)</h4>
+                  <h4>二级研发(部所所长、总工、中心主任/研究院院长)(必选)</h4>
+                  <h4>质量相关人员(可选)</h4>
+                  <h4>制造部相关人员(可选)</h4>
+                  <h4>采购部相关人员(可选)</h4>
+                  <h4>海外相关人员(可选)</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.countersigner" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.countersignerName" placeholder="选择申请部门中心主任"
+                    <el-input v-model="roleForm.countersignerName" placeholder="选择会签人员"
                               @click.native="choiceZRRS">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择标准法规工作组组长审定" placement="top"
+            <el-timeline-item timestamp="选择标准体系专业工作组组长审定" placement="top"
                               :color="roleForm.examine ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="examineName" style="margin-bottom: 0">
-                  <h4>标准法规工作组组长</h4>
+                  <h4>标准体系专业工作组组长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.examine" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.examineName" placeholder="选择标准法规工作组组长"
-                              @click.native="choiceZRR('examine', '选择标准法规工作组组长', roleForm.examine)">
+                    <el-input v-model="roleForm.examineName" placeholder="选择标准体系专业工作组组长"
+                              @click.native="choiceZRR('examine', '选择标准体系专业工作组组长', roleForm.examine)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择标准法规部部长批准" placement="top"
+            <el-timeline-item timestamp="选择工程研究总院标准法规部高级经理批准" placement="top"
                               :color="roleForm.approver ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="approverName" style="margin-bottom: 0">
-                  <h4>标准法规部部长</h4>
+                  <h4>工程研究总院标准法规部高级经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.approver" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.approverName" placeholder="选择标准法规部部长"
-                              @click.native="choiceZRR('approver', '选择标准法规部部长', roleForm.approver)">
+                    <el-input v-model="roleForm.approverName" placeholder="选择工程研究总院标准法规部高级经理"
+                              @click.native="choiceZRR('approver', '选择工程研究总院标准法规部高级经理', roleForm.approver)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择标准法规部工程师抄送" placement="top"
+            <el-timeline-item timestamp="选择相关单位人员、工程研究总院标准法规部周知" placement="top"
                               :color="roleForm.engineer ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="engineerName" style="margin-bottom: 0">
-                  <h4>标准法规部工程师</h4>
+                  <h4>相关单位人员、工程研究总院标准法规部周知</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.engineer" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.engineerName" placeholder="选择标准法规部工程师"
-                              @click.native="choiceZRR('engineer', '选择标准法规部工程师', roleForm.engineer)">
+                    <el-input v-model="roleForm.engineerName" placeholder="选择相关单位人员、工程研究总院标准法规部周知"
+                              @click.native="choiceZRR('engineer', '选择相关单位人员、工程研究总院标准法规部周知', roleForm.engineer)">
                     </el-input>
                   </div>
                 </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
index 85f3c1774..9e2ef5889 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -2,7 +2,7 @@
   <div class="qbzxd-jhgk">
     <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/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index 09dbbfae0..b388590b8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -2,7 +2,7 @@
   <div class="qbzxd-jhgk">
     <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/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
index 93143033c..ebd00421f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -2,7 +2,7 @@
   <div class="qbzxd-jhgk">
     <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/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index a783a5123..c021631fd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -2,7 +2,7 @@
   <div class="qbzxd-jhgk">
     <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>