From 768e2b33d4045060da8740695a2b9a1ab47fe84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 29 Dec 2021 14:58:46 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/phone/qbzxdjhgk/step2.vue           | 67 ++++++++++++++++++
 .../pages/phone/qbzxdjhgk/step3.vue           | 68 ++++++++++++++++++-
 .../pages/phone/qbzxdjhgk/step4.vue           | 68 ++++++++++++++++++-
 .../pages/phone/qbzxdjhgk/step5.vue           | 68 ++++++++++++++++++-
 4 files changed, 268 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
index c93936f7f..207ebc5fd 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue
@@ -83,6 +83,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -235,12 +295,19 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
+      BZList: [],
 
     }
   },
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
index 08c28cfb4..250b8a677 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue
@@ -83,6 +83,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -228,12 +288,18 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      BZList: [],
     }
   },
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
index 825303085..87c4ed9cd 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue
@@ -83,6 +83,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -228,12 +288,18 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      BZList: [],
     }
   },
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
index dd44e41c5..d3de1e41b 100644
--- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
@@ -83,6 +83,66 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.rqbName"
+              placeholder="请输入企业标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.tsJsonName"
+              placeholder="请输入体系结构"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                        class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-option
+                v-for="item in BZList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.isRelate"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.technologic"
+              placeholder="请输入是否引用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esStandRelations"
+              placeholder="请输入采用标准"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.useLevel"
+              placeholder="请输入采标程度"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esMatingRelations"
+              placeholder="请输入配套标准"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
@@ -228,12 +288,18 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      BZList: [],
     }
   },
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {

From 042bacbaa9d0c2e535d21271a3db429cec0fc744 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 15:04:04 +0800
Subject: [PATCH 2/6] feat: There is no way the,buss plan add bussSort

---
 src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 5f11c8896..e1cefc37b 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -203,7 +203,7 @@
                                 <el-col :span="24">
                                     <el-form :model="addForm" inline class="label-input-form" label-width="180px"  :rules="addFormRules" ref="addForm">
                                         <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none">
+                                            <el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
                                                 <el-option
                                                         v-for="item in standSortOptions"
                                                         :key="item.value"

From 718ac5095a67c8e63aa89d89342842808969ab5f Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 29 Dec 2021 15:16:42 +0800
Subject: [PATCH 3/6] commit

---
 .../pages/creatProcess/bzjd/step1-1.vue       | 366 ++++++------------
 .../pages/creatProcess/bzjd/step1.vue         | 361 ++++++-----------
 .../pages/creatProcess/bzjd/step3.vue         | 151 +++++---
 .../pages/creatProcess/bzjd/step4.vue         |  74 ++--
 .../pages/creatProcess/bzjd/step5.vue         |  95 ++---
 .../pages/creatProcess/bzjd/step6.vue         |  76 ++--
 .../pages/creatProcess/bzzqyj/step1-1.vue     |   5 +-
 7 files changed, 417 insertions(+), 711 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 23c6ac1e2..0383d75d5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -183,7 +183,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
-                        <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -335,83 +335,6 @@
                 </div>
             </div>
         </el-drawer>
-        <el-drawer
-                title="国内标准库"
-                :visible.sync="listModel2"
-                size="900px"
-                custom-class="demo-drawer"
-        >
-            <div class="standardForComments">
-                <div class="content">
-                    <!-- 顶部工具栏 -->
-                    <div class="table-wrap">
-                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
-                            <el-table
-                                    v-if="listModel2"
-                                    ref="selection"
-                                    :data="standInfoList2"
-                                    tooltip-effect="dark"
-                                    style="width: 100%;padding:0 0 20px 0;"
-                                    height="100%"
-                                    border
-                                    @selection-change="handleSelection2"
-                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-                                <el-table-column type="selection" width="55" align="center"/>
-                                <el-table-column
-                                        label="标准号"
-                                >
-                                    <template slot-scope="scope">
-                                        <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
-                                        <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                        prop="standName"
-                                        label="标准名称">
-                                </el-table-column>
-                                <el-table-column
-                                        prop="issueTime"
-                                        width="110px"
-                                        label="发布日期">
-                                    <template slot-scope="scope">
-                                        {{ formatIssueDate(scope.row.issueTime) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                        prop="XCXSSRQ"
-                                        width="150px"
-                                        label="新车型实施日期">
-                                    <template slot-scope="scope">
-                                        <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                        prop="ZCCSSRQ"
-                                        width="150px"
-                                        label="在产车实施日期">
-                                    <template slot-scope="scope">
-                                        <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column
-                                        prop="textStatus"
-                                        width="120px"
-                                        label="文本状态">
-                                    <template slot-scope="scope">
-                                        <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                                    </template>
-                                </el-table-column>
-                            </el-table>
-                        </div>
-                    </div>
-                </div>
-                <pagination :page="standCommonlySearch2.page" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
-                <div class="demo-drawer-footer">
-                    <el-button size="mini" @click="closeDrawer2">取消</el-button>
-                    <el-button type="primary" size="mini" @click="enterDrawer2">确定</el-button>
-                </div>
-            </div>
-        </el-drawer>
         <Role-tree
                 check-box
                 :is-title="drawerTitle"
@@ -475,58 +398,70 @@
                 :title="PLmodalTitle"
                 :visible.sync="PLmodalshowflag"
                 :wrapperClosable="false"
-                size="800px">
+                :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
             <div class="demo-drawer-content">
-                <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
-                    <el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
-                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
-                        <el-input
-                                v-model="plForm.technicalRequir"
-                                placeholder="请输入核心技术要求"
-                                maxlength="500"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
-                        <el-input
-                                v-model="plForm.changePoint"
-                                placeholder="请输入国内标准的差异点"
-                                maxlength="500"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
-                        <el-input
-                                v-model="plForm.changePoint"
-                                placeholder="请输入上一版本差异点"
-                                maxlength="500"
-                        ></el-input>
-                    </el-form-item>
-                    <custom-date-pick-group
-                            class="myDataPick"
-                            :config="{attrName: '新车型实施日期'}"
-                            v-model="plForm.newData"
-                    ></custom-date-pick-group>
-                    <custom-date-pick-group
-                            class="myDataPick"
-                            :config="{attrName: '在产车实施日期'}"
-                            v-model="plForm.onlineData"
-                    ></custom-date-pick-group>
-                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
-                        <el-select multiple  v-model="plForm.applyArctic">
-                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
-                        <el-input
-                                style="display: none;"
-                                v-model="plForm.zrUserId"
-                        ></el-input>
-                        <el-input
-                                @click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
-                                placeholder="请选择责任人"
-                                v-model="plForm.zrUserName"
-                        ></el-input>
-                    </el-form-item>
-                </el-form>
+                <div style="display: flex; height: 100%;">
+                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1">
+                        <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
+                        <div v-else style="height: 100%;">
+                            <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
+                            <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
+                            <div style="overflow: auto;display: flex;" class="BDclass">
+                                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                            </div>
+                        </div>
+                    </div>
+                    <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
+                        <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
+                            <el-input
+                                    v-model="plForm.technicalRequir"
+                                    placeholder="请输入核心技术要求"
+                                    maxlength="500"
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
+                            <el-input
+                                    v-model="plForm.changePoint"
+                                    placeholder="请输入国内标准的差异点"
+                                    maxlength="500"
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
+                            <el-input
+                                    v-model="plForm.changePoint"
+                                    placeholder="请输入上一版本差异点"
+                                    maxlength="500"
+                            ></el-input>
+                        </el-form-item>
+                        <custom-date-pick-group
+                                class="myDataPick"
+                                :config="{attrName: '新车型实施日期'}"
+                                v-model="plForm.newData"
+                        ></custom-date-pick-group>
+                        <custom-date-pick-group
+                                class="myDataPick"
+                                :config="{attrName: '在产车实施日期'}"
+                                v-model="plForm.onlineData"
+                        ></custom-date-pick-group>
+                        <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
+                            <el-select multiple  v-model="plForm.applyArctic">
+                                <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
+                            <el-input
+                                    style="display: none;"
+                                    v-model="plForm.zrUserId"
+                            ></el-input>
+                            <el-input
+                                    @click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
+                                    placeholder="请选择责任人"
+                                    v-model="plForm.zrUserName"
+                            ></el-input>
+                        </el-form-item>
+                    </el-form>
+                </div>
             </div>
             <div id="roleFormButton2" class="demo-drawer-footer">
                 <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
@@ -537,7 +472,8 @@
                 title="查看比对内容"
                 :visible.sync="BDmodel"
                 size="1100px">
-            <div>相似度:{{ similarityDegree }}</div>
+            <div>比对条款: {{ itemsNum }}</div>
+            <div>相似度: {{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
                 <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -557,6 +493,8 @@
         name: "bzjdStep1-1",
         data() {
             return {
+                itemsNum: '',
+                BDtext: false,
                 pickerOptions: {
                     disabledDate(time) {
                         return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -571,6 +509,7 @@
                 PLmodalshowflag: false,
                 PLmodalTitle: '',
                 plForm: {
+                    itemsNum: '',
                     itemsId: '',
                     itemsId2: '',
                     technicalRequir: '',
@@ -593,8 +532,6 @@
                 itermsConditionsFlag: false,
                 itermsConditionsTitle: '',
                 textStatusMap: {},
-                listModel2: false,
-                standInfoList2: [],
                 sarType: '',
                 loading: false,
                 standId: '',
@@ -666,7 +603,6 @@
                 type: '',
                 drawerTitle: '',
                 modalshowflag: false,
-                modalshowflag2: false,
                 defaultProps: {
                     children: 'children',
                     label: 'name'
@@ -675,7 +611,8 @@
                 itemList: [],
                 zrType: '',
                 zrIndex: '',
-                zrIdList: []
+                zrIdList: [],
+                itemListOld: []
             }
         },
         components: {
@@ -705,7 +642,7 @@
             },
             getBDList () {
                 this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
+                    standHisId: this.form.oldNumber,
                     leftOrRight: 'LEFT'
                 }, {
                     _this: this
@@ -714,28 +651,29 @@
                         for (let b = 0; b < res.data.length; b++) {
                             if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
                                 this.itemList[a].itemsId = res.data[b].itemsId
+                                this.itemList[a].targetStand = res.data[b].targetStand
                             }
                         }
                     }
-                }, e => {
-                })
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'RIGHT'
-                }, {
-                    _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId2 = res.data[b].itemsId
+                    this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+                        standHisId: this.form.oldNumber,
+                        leftOrRight: 'RIGHT'
+                    }, {
+                        _this: this
+                    }, res => {
+                        for (let a = 0; a < this.itemList.length; a++) {
+                            for (let b = 0; b < res.data.length; b++) {
+                                if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
+                                    this.itemList[a].itemsId2 = res.data[b].itemsId
+                                }
                             }
                         }
-                    }
+                    }, e => {
+                    })
                 }, e => {
                 })
             },
-            checkBD (id,id2) {
+            checkBD (id,id2, itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
                     newItemId: id2,
@@ -747,6 +685,7 @@
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.$message.warning('暂无找到相似的文本')
                     } else {
+                        this.itemsNum = itemsNum
                         this.leftData = res.data.leftString
                         this.rightData = res.data.rightString
                         this.BDmodel = true
@@ -755,23 +694,39 @@
                 })
             },
             itemEdit (row, type, index) {
-                this.PLmodalType = type
-                this.PLmodalIndex = index
-                if (type === '1') {
+                let itemsEoPage = {
+                    oldItemId: row.itemsId,
+                    newItemId: row.itemsId2,
+                    flag: 1
+                }
+                this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
+                    _this: this
+                }, res => {
+                    this.PLmodalType = type
+                    this.PLmodalIndex = index
                     this.PLmodalTitle = '编辑'
-                }
-                this.plForm = {
-                    technicalRequir: row.technicalRequir,
-                    changePoint: row.changePoint,
-                    newData: row.newData,
-                    onlineData: row.onlineData,
-                    applyArctic: row.applyArctic,
-                    zrUserId: row.zrUserId,
-                    zrUserName: row.zrUserName,
-                    itemsId: row.itemsId,
-                    itemsId2: row.itemsId2
-                }
-                this.PLmodalshowflag = true
+                    if (res.data.leftString === '' && res.data.rightString === '') {
+                        this.BDtext = true
+                    } else {
+                        this.BDtext = false
+                        this.leftData = res.data.leftString
+                        this.rightData = res.data.rightString
+                        this.similarityDegree = res.data.similarityDegree
+                    }
+                    this.plForm = {
+                        itemsNum: row.itemsNum,
+                        technicalRequir: row.technicalRequir,
+                        changePoint: row.changePoint,
+                        newData: row.newData,
+                        onlineData: row.onlineData,
+                        applyArctic: row.applyArctic,
+                        zrUserId: row.zrUserId,
+                        zrUserName: row.zrUserName,
+                        itemsId: row.itemsId,
+                        itemsId2: row.itemsId2
+                    }
+                    this.PLmodalshowflag = true
+                })
             },
             saveUserInfo2 () {
                 if (this.PLmodalType === 1) {
@@ -854,6 +809,7 @@
                     this.form.itemsName1 = bringData[0].oldStandName
                     this.form.oldNumber = bringData[0].oldStandId
                     this.listModel3 = false
+                    this.getBDList()
                 } else if (this.selectedList3.length > 1) {
                     this.$message.warning("只能选择一条数据进行导入");
                 } else {
@@ -927,30 +883,6 @@
                 }, e => {
                 })
             },
-            sarStandCompareHis2 () {
-                var form = this.standCommonlySearch2
-                this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, {
-                    _this: this
-                }, res => {
-                    this.standInfoList2 = res.data.list
-                    this.standInfoList2.forEach(item => {
-                        if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) {
-                            item.XCXSSRQ = item.attrInfoMap.XCXSSRQ
-                        }
-                        if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) {
-                            item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ
-                        }
-                    })
-
-                    this.total2 = res.data.count
-                    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-                        _this: this
-                    }, res => {
-                        this.setMap(res.data.WBZTCLASS)
-                    })
-                }, e => {
-                })
-            },
             pageChange (page) {
                 this.standCommonlySearch.page = page
                 this.sarStandCompareHis()
@@ -961,16 +893,6 @@
                 this.standCommonlySearch.pageSize = pageSize
                 this.sarStandCompareHis()
             },
-            pageChange2 (page) {
-                this.standCommonlySearch2.page = page
-                this.sarStandCompareHis2()
-            },
-            // 分页每页显示数改变后方法
-            pageSizeChange2 (pageSize) {
-                this.$store.getters.userInfo.configContent = pageSize
-                this.standCommonlySearch2.pageSize = pageSize
-                this.sarStandCompareHis2()
-            },
             /** 选择导入数据的方法操作
              * */
             handleSelection(data) {
@@ -979,12 +901,6 @@
                     this.selectedList.push(data[i].id);
                 }
             },
-            handleSelection2 (data) {
-                this.selectedList2 = [];
-                for (let i = 0; i < data.length; i++) {
-                    this.selectedList2.push(data[i].id);
-                }
-            },
             closeDrawer() {
                 this.listModel = false
             },
@@ -1008,7 +924,6 @@
                     this.form.statusId = bringData[0].id
                     this.form.fileType = bringData[0].fileType
                     this.listModel = false;
-                    this.listModel3 = true
                     this.getDbList()
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
                         infoId: bringData[0].id,
@@ -1018,6 +933,7 @@
                         _this: this
                     }, res => {
                         if (res.ok) {
+                            this.listModel3 = true
                             res.data.list.forEach(item => {
                                 item.zrUserId = ''
                                 item.zrUserIdName = ''
@@ -1045,40 +961,6 @@
                     this.$message.warning("请选择一条数据进行导入");
                 }
             },
-            closeDrawer2() {
-                this.listModel2 = false
-            },
-            enterDrawer2() {
-                if (this.selectedList2.length === 1) {
-                    let deposit = new Map();
-                    this.standInfoList2.forEach(item => {
-                        deposit.set(item.id, item);
-                    });
-                    let bringData = [];
-                    for (let i = 0; i < this.selectedList2.length; i++) {
-                        bringData.push(deposit.get(this.selectedList2[i]));
-                    }
-                    // if (bringData[0].splitStatus === '0') {
-                    //     this.form.itemsNum1 = bringData[0].standNumSplit
-                    //     this.form.itemsName1 = bringData[0].standNameSplit
-                    // } else {
-                    //     this.form.itemsNum1 = bringData[0].showNumber
-                    //     this.form.itemsName1 = bringData[0].standName
-                    // }
-                    if (bringData[0].standYear) {
-                        this.form.itemsNum1 = bringData[0].standSortShow + ' ' +  bringData[0].standNumber + '-' + bringData[0].standYear
-                    } else {
-                        this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber
-                    }
-                    this.form.itemsName1 = bringData[0].standName
-                    this.form.oldNumber = bringData[0].id
-                    this.listModel2 = false
-                } else if (this.selectedList2.length > 1) {
-                    this.$message.warning("只能选择一条数据进行导入");
-                } else {
-                    this.$message.warning("请选择一条数据进行导入");
-                }
-            },
             /*** **********************************************/
             /** 流程节点负责人的选择 *****************************/
             saveUserInfo(data) {
@@ -1242,7 +1124,6 @@
 
             this.getData()
             this.sarStandCompareHis()
-            this.sarStandCompareHis2()
             this.tableHeight = $('.content').height() - 44
             window.onresize = () => {
                 this.tableHeight = $('.content').height() - 44
@@ -1263,6 +1144,9 @@
         }
         position: relative;
         height: 100%;
+        .BDclass {
+            height: calc(~'100% - 53px');
+        }
         .headerTabs {
             height: 52px;
             display: flex;
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index a47607970..55bda25a7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -190,7 +190,7 @@
                 align="center">
           <template slot-scope="scope">
             <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row, 1, scope.$index)">编辑</el-button>
-            <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+            <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -343,86 +343,6 @@
         </div>
       </div>
     </el-drawer>
-    <el-drawer
-      title="国内标准库"
-      :visible.sync="listModel2"
-      size="900px"
-      custom-class="demo-drawer"
-    >
-      <div class="standardForComments">
-        <div class="content">
-          <!-- 顶部工具栏 -->
-          <div class="table-wrap">
-            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
-              <el-table
-                v-if="listModel2"
-                ref="selection"
-                :data="standInfoList2"
-                tooltip-effect="dark"
-                style="width: 100%;padding:0 0 20px 0;"
-                height="100%"
-                border
-                @selection-change="handleSelection2"
-                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-                <el-table-column type="selection" width="55" align="center"/>
-                <el-table-column
-                  label="标准号"
-                >
-                  <template slot-scope="scope">
-                    <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{
-                        scope.row.standNumber
-                      }}-{{ scope.row.standYear }}
-                    </div>
-                    <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="standName"
-                  label="标准名称">
-                </el-table-column>
-                <el-table-column
-                  prop="issueTime"
-                  width="110px"
-                  label="发布日期">
-                  <template slot-scope="scope">
-                    {{ formatIssueDate(scope.row.issueTime) }}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="XCXSSRQ"
-                  width="150px"
-                  label="新车型实施日期">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="ZCCSSRQ"
-                  width="150px"
-                  label="在产车实施日期">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="textStatus"
-                  width="120px"
-                  label="文本状态">
-                  <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </div>
-        </div>
-        <pagination :page="standCommonlySearch2.page" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
-        <div class="demo-drawer-footer">
-          <el-button size="mini" @click="closeDrawer2">取消</el-button>
-          <el-button type="primary" size="mini" @click="enterDrawer2">确定</el-button>
-        </div>
-      </div>
-    </el-drawer>
     <el-dialog
       title="查看条款内容"
       :visible.sync="itermsConditionsFlag"
@@ -487,58 +407,70 @@
             :title="PLmodalTitle"
             :visible.sync="PLmodalshowflag"
             :wrapperClosable="false"
-            size="800px">
+            :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
       <div class="demo-drawer-content">
-        <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
-          <el-button v-if="PLmodalType === 1 && form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(plForm.itemsId, plForm.itemsId2)">查看比对</el-button>
-          <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
-            <el-input
-                    v-model="plForm.technicalRequir"
-                    placeholder="请输入核心技术要求"
-                    maxlength="500"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
-            <el-input
-                    v-model="plForm.changePoint"
-                    placeholder="请输入国内标准的差异点"
-                    maxlength="500"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
-            <el-input
-                    v-model="plForm.changePoint"
-                    placeholder="请输入上一版本差异点"
-                    maxlength="500"
-            ></el-input>
-          </el-form-item>
-          <custom-date-pick-group
-                  class="myDataPick"
-                  :config="{attrName: '新车型实施日期'}"
-                  v-model="plForm.newData"
-          ></custom-date-pick-group>
-          <custom-date-pick-group
-                  class="myDataPick"
-                  :config="{attrName: '在产车实施日期'}"
-                  v-model="plForm.onlineData"
-          ></custom-date-pick-group>
-          <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
-            <el-select multiple  v-model="plForm.applyArctic">
-              <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
-            <el-input
-                    style="display: none;"
-                    v-model="plForm.zrUserId"
-            ></el-input>
-            <el-input
-                    @click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
-                    placeholder="请选择责任人"
-                    v-model="plForm.zrUserName"
-            ></el-input>
-          </el-form-item>
-        </el-form>
+        <div style="display: flex; height: 100%;">
+          <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
+            <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
+            <div v-else style="height: 100%;">
+              <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
+              <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
+              <div style="overflow: auto;display: flex;" class="BDclass">
+                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+              </div>
+            </div>
+          </div>
+          <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
+            <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
+              <el-input
+                      v-model="plForm.technicalRequir"
+                      placeholder="请输入核心技术要求"
+                      maxlength="500"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
+              <el-input
+                      v-model="plForm.changePoint"
+                      placeholder="请输入国内标准的差异点"
+                      maxlength="500"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
+              <el-input
+                      v-model="plForm.changePoint"
+                      placeholder="请输入上一版本差异点"
+                      maxlength="500"
+              ></el-input>
+            </el-form-item>
+            <custom-date-pick-group
+                    class="myDataPick"
+                    :config="{attrName: '新车型实施日期'}"
+                    v-model="plForm.newData"
+            ></custom-date-pick-group>
+            <custom-date-pick-group
+                    class="myDataPick"
+                    :config="{attrName: '在产车实施日期'}"
+                    v-model="plForm.onlineData"
+            ></custom-date-pick-group>
+            <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
+              <el-select multiple  v-model="plForm.applyArctic">
+                <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
+              <el-input
+                      style="display: none;"
+                      v-model="plForm.zrUserId"
+              ></el-input>
+              <el-input
+                      @click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
+                      placeholder="请选择责任人"
+                      v-model="plForm.zrUserName"
+              ></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
       </div>
       <div id="roleFormButton2" class="demo-drawer-footer">
         <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
@@ -549,7 +481,8 @@
             title="查看比对内容"
             :visible.sync="BDmodel"
             size="1100px">
-      <div>相似度:{{ similarityDegree }}</div>
+      <div>比对条款: {{ itemsNum }}</div>
+      <div>相似度: {{ similarityDegree }}</div>
       <div style="height: 600px;overflow: auto;display: flex;">
         <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
         <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -570,6 +503,8 @@ export default {
   name: "bzjdStep1",
   data() {
     return {
+      itemsNum: '',
+      BDtext: false,
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -584,6 +519,7 @@ export default {
       PLmodalshowflag: false,
       PLmodalTitle: '',
       plForm: {
+        itemsNum: '',
         itemsId: '',
         itemsId2: '',
         technicalRequir: '',
@@ -595,7 +531,6 @@ export default {
         zrUserName: '',
       },
       cxList: [],
-
       bpnId: '',
       listModel3: false,
       standInfoList3: [],
@@ -606,8 +541,6 @@ export default {
       itermsConditionsFlag: false,
       itermsConditionsTitle: '',
       textStatusMap: {},
-      listModel2: false,
-      standInfoList2: [],
       sarType: '',
       loading: false,
       standId: '',
@@ -662,7 +595,6 @@ export default {
       total: 0,
       total2: 0,
       selectedList: [],
-      selectedList2: [],
       data: [],
       roleForm: {
         applyUserIdName: this.$store.getters.userInfo.userName,
@@ -724,7 +656,7 @@ export default {
     },
     getBDList () {
       this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-        standHisId: this.oldNumber,
+        standHisId: this.form.oldNumber,
         leftOrRight: 'LEFT'
       }, {
         _this: this
@@ -733,28 +665,29 @@ export default {
           for (let b = 0; b < res.data.length; b++) {
             if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
               this.itemList[a].itemsId = res.data[b].itemsId
+              this.itemList[a].targetStand = res.data[b].targetStand
             }
           }
         }
-      }, e => {
-      })
-      this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-        standHisId: this.oldNumber,
-        leftOrRight: 'RIGHT'
-      }, {
-        _this: this
-      }, res => {
-        for (let a = 0; a < this.itemList.length; a++) {
-          for (let b = 0; b < res.data.length; b++) {
-            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-              this.itemList[a].itemsId2 = res.data[b].itemsId
+        this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+          standHisId: this.form.oldNumber,
+          leftOrRight: 'RIGHT'
+        }, {
+          _this: this
+        }, res => {
+          for (let a = 0; a < this.itemList.length; a++) {
+            for (let b = 0; b < res.data.length; b++) {
+              if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
+                this.itemList[a].itemsId2 = res.data[b].itemsId
+              }
             }
           }
-        }
+        }, e => {
+        })
       }, e => {
       })
     },
-    checkBD (id,id2) {
+    checkBD (id,id2, itemsNum) {
       let itemsEoPage = {
         oldItemId: id,
         newItemId: id2,
@@ -766,6 +699,7 @@ export default {
         if (res.data.leftString === '' && res.data.rightString === '') {
           this.$message.warning('暂无找到相似的文本')
         } else {
+          this.itemsNum = itemsNum
           this.leftData = res.data.leftString
           this.rightData = res.data.rightString
           this.BDmodel = true
@@ -774,23 +708,39 @@ export default {
       })
     },
     itemEdit (row, type, index) {
-      this.PLmodalType = type
-      this.PLmodalIndex = index
-      if (type === '1') {
+      let itemsEoPage = {
+        oldItemId: row.itemsId,
+        newItemId: row.itemsId2,
+        flag: 1
+      }
+      this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
+        _this: this
+      }, res => {
+        this.PLmodalType = type
+        this.PLmodalIndex = index
         this.PLmodalTitle = '编辑'
-      }
-      this.plForm = {
-        technicalRequir: row.technicalRequir,
-        changePoint: row.changePoint,
-        newData: row.newData,
-        onlineData: row.onlineData,
-        applyArctic: row.applyArctic,
-        zrUserId: row.zrUserId,
-        zrUserName: row.zrUserName,
-        itemsId: row.itemsId,
-        itemsId2: row.itemsId2
-      }
-      this.PLmodalshowflag = true
+        if (res.data.leftString === '' && res.data.rightString === '') {
+          this.BDtext = true
+        } else {
+          this.BDtext = false
+          this.leftData = res.data.leftString
+          this.rightData = res.data.rightString
+          this.similarityDegree = res.data.similarityDegree
+        }
+        this.plForm = {
+          itemsNum: row.itemsNum,
+          technicalRequir: row.technicalRequir,
+          changePoint: row.changePoint,
+          newData: row.newData,
+          onlineData: row.onlineData,
+          applyArctic: row.applyArctic,
+          zrUserId: row.zrUserId,
+          zrUserName: row.zrUserName,
+          itemsId: row.itemsId,
+          itemsId2: row.itemsId2
+        }
+        this.PLmodalshowflag = true
+      })
     },
     saveUserInfo2 () {
       if (this.PLmodalType === 1) {
@@ -872,6 +822,7 @@ export default {
         this.form.itemsName1 = bringData[0].oldStandName
         this.form.oldNumber = bringData[0].id
         this.listModel3 = false
+        this.getBDList()
       } else if (this.selectedList3.length > 1) {
         this.$message.warning("只能选择一条数据进行导入");
       } else {
@@ -942,29 +893,6 @@ export default {
       }, e => {
       })
     },
-    sarStandCompareHis2() {
-      var form = this.standCommonlySearch2
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', form, {
-        _this: this
-      }, res => {
-        this.standInfoList2 = res.data.list
-        this.standInfoList2.forEach(item => {
-          if (item.attrInfoMap && item.attrInfoMap.XCXSSRQ) {
-            item.XCXSSRQ = item.attrInfoMap.XCXSSRQ
-          }
-          if (item.attrInfoMap && item.attrInfoMap.ZCCSSRQ) {
-            item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ
-          }
-        })
-        this.total2 = res.data.count
-        this.$http.get('sys/dictype/getDicTypeListCode', '', {
-          _this: this
-        }, res => {
-          this.setMap(res.data.WBZTCLASS)
-        })
-      }, e => {
-      })
-    },
     pageChange(page) {
       this.standCommonlySearch.page = page
       this.sarStandCompareHis()
@@ -975,16 +903,6 @@ export default {
       this.standCommonlySearch.pageSize = pageSize
       this.sarStandCompareHis()
     },
-    pageChange2(page) {
-      this.standCommonlySearch2.page = page
-      this.sarStandCompareHis2()
-    },
-    // 分页每页显示数改变后方法
-    pageSizeChange2(pageSize) {
-      this.$store.getters.userInfo.configContent = pageSize
-      this.standCommonlySearch2.pageSize = pageSize
-      this.sarStandCompareHis2()
-    },
     /** 选择导入数据的方法操作
      * */
     handleSelection(data) {
@@ -993,12 +911,6 @@ export default {
         this.selectedList.push(data[i].id);
       }
     },
-    handleSelection2(data) {
-      this.selectedList2 = [];
-      for (let i = 0; i < data.length; i++) {
-        this.selectedList2.push(data[i].id);
-      }
-    },
     closeDrawer() {
       this.listModel = false
     },
@@ -1022,7 +934,6 @@ export default {
         this.form.statusId = bringData[0].id
         this.form.fileType = bringData[0].fileType
         this.listModel = false;
-        this.listModel3 = true
         this.getDbList()
         this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
           infoId: bringData[0].id,
@@ -1032,6 +943,7 @@ export default {
           _this: this
         }, res => {
           if (res.ok) {
+            this.listModel3 = true
             res.data.list.forEach(item => {
               item.zrUserId = ''
               item.zrUserIdName = ''
@@ -1049,7 +961,6 @@ export default {
             this.itemListOld = res.data.list.filter(item =>{
               return item.workFlowShow === '0'
             })
-            this.getBDList()
           }
           this.loading = false
         })
@@ -1059,33 +970,6 @@ export default {
         this.$message.warning("请选择一条数据进行导入");
       }
     },
-    closeDrawer2() {
-      this.listModel2 = false
-    },
-    enterDrawer2() {
-      if (this.selectedList2.length === 1) {
-        let deposit = new Map();
-        this.standInfoList2.forEach(item => {
-          deposit.set(item.id, item);
-        });
-        let bringData = [];
-        for (let i = 0; i < this.selectedList2.length; i++) {
-          bringData.push(deposit.get(this.selectedList2[i]));
-        }
-        if (bringData[0].standYear) {
-          this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
-        } else {
-          this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber
-        }
-        this.form.itemsName1 = bringData[0].standName
-        this.form.oldNumber = bringData[0].id
-        this.listModel2 = false
-      } else if (this.selectedList2.length > 1) {
-        this.$message.warning("只能选择一条数据进行导入");
-      } else {
-        this.$message.warning("请选择一条数据进行导入");
-      }
-    },
     /*** **********************************************/
     /** 流程节点负责人的选择 *****************************/
     saveUserInfo(data) {
@@ -1261,7 +1145,6 @@ export default {
     })
 
     this.sarStandCompareHis()
-    this.sarStandCompareHis2()
     this.tableHeight = $('.content').height() - 44
     window.onresize = () => {
       this.tableHeight = $('.content').height() - 44
@@ -1284,7 +1167,9 @@ export default {
 
   position: relative;
   height: 100%;
-
+  .BDclass {
+    height: calc(~'100% - 53px');
+  }
   .headerTabs {
     height: 52px;
     display: flex;
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 472b63a8a..fe4426427 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -191,7 +191,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
-                        <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button v-if="form.itemsNum1" class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -292,27 +292,42 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
-<!--                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">-->
-<!--                        <el-input-->
-<!--                                v-model="plForm.technicalRequir"-->
-<!--                                placeholder="请输入核心技术要求"-->
-<!--                                maxlength="500"-->
-<!--                        ></el-input>-->
-<!--                    </el-form-item>-->
-<!--                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">-->
-<!--                        <el-input-->
-<!--                                v-model="plForm.changePoint"-->
-<!--                                placeholder="请输入国内标准的差异点"-->
-<!--                                maxlength="500"-->
-<!--                        ></el-input>-->
-<!--                    </el-form-item>-->
-<!--                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">-->
-<!--                        <el-input-->
-<!--                                v-model="plForm.changePoint"-->
-<!--                                placeholder="请输入上一版本差异点"-->
-<!--                                maxlength="500"-->
-<!--                        ></el-input>-->
-<!--                    </el-form-item>-->
+                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
+                        <el-input
+                                v-model="plForm.technicalRequir"
+                                placeholder="请输入核心技术要求"
+                                maxlength="500"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
+                        <el-input
+                                v-model="plForm.changePoint"
+                                placeholder="请输入国内标准的差异点"
+                                maxlength="500"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
+                        <el-input
+                                v-model="plForm.changePoint"
+                                placeholder="请输入上一版本差异点"
+                                maxlength="500"
+                        ></el-input>
+                    </el-form-item>
+                    <custom-date-pick-group
+                            class="myDataPick"
+                            :config="{attrName: '新车型实施日期'}"
+                            v-model="plForm.newData"
+                    ></custom-date-pick-group>
+                    <custom-date-pick-group
+                            class="myDataPick"
+                            :config="{attrName: '在产车实施日期'}"
+                            v-model="plForm.onlineData"
+                    ></custom-date-pick-group>
+                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
+                        <el-select multiple  v-model="plForm.applyArctic">
+                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
                         <el-select
                                 v-model="plForm.complianceRequir"
@@ -328,21 +343,6 @@
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>
-<!--                    <custom-date-pick-group-->
-<!--                            class="myDataPick"-->
-<!--                            :config="{attrName: '新车型实施日期'}"-->
-<!--                            v-model="plForm.newData"-->
-<!--                    ></custom-date-pick-group>-->
-<!--                    <custom-date-pick-group-->
-<!--                            class="myDataPick"-->
-<!--                            :config="{attrName: '在产车实施日期'}"-->
-<!--                            v-model="plForm.onlineData"-->
-<!--                    ></custom-date-pick-group>-->
-<!--                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >-->
-<!--                        <el-select multiple  v-model="plForm.applyArctic">-->
-<!--                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>-->
-<!--                        </el-select>-->
-<!--                    </el-form-item>-->
                 </el-form>
             </div>
             <div id="roleFormButton2" class="demo-drawer-footer">
@@ -354,10 +354,21 @@
                 title="编辑"
                 :visible.sync="modalshowflag2"
                 :wrapperClosable="false"
-                size="800px">
+                :size="form.itemsNum1 ? '1200px' : '800px'">
             <div class="demo-drawer-content">
-                <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
-                    <el-button v-if="form.itemsNum1" style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
+                <div style="display: flex; height: 100%;">
+                    <div style="width: 600px; border-right: 1px solid #ccc;">
+                        <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
+                        <div v-else style="height: 100%;">
+                            <div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
+                            <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
+                            <div style="overflow: auto;display: flex;" class="BDclass">
+                                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                            </div>
+                        </div>
+                    </div>
+                    <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
                                 v-model="editForm.technicalRequir"
@@ -410,6 +421,7 @@
                         ></el-input>
                     </el-form-item>
                 </el-form>
+                </div>
             </div>
             <div id="roleFormButton3" class="demo-drawer-footer">
                 <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
@@ -430,7 +442,8 @@
                 title="查看比对内容"
                 :visible.sync="BDmodel"
                 size="1100px">
-            <div>相似度:{{ similarityDegree }}</div>
+            <div>比对条款: {{ itemsNum }}</div>
+            <div>相似度: {{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
                 <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -451,6 +464,8 @@
         name: "bzjdStep3",
         data() {
             return {
+                BDtext: false,
+                itemsNum: '',
                 similarityDegree: '',
                 BDmodel: false,
                 oldNumber: '',
@@ -485,6 +500,7 @@
                     applyArctic: '', // 适用车型
                 },
                 editForm: {
+                    itemsNum: '',
                     technicalRequir: '', // 核心技术要求
                     changePoint: '', // 国内标准的差异点
                     complianceRequir: '', // 符合性要求
@@ -557,7 +573,7 @@
                 }, e => {
                 })
             },
-            checkBD (id,id2) {
+            checkBD (id,id2, itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
                     newItemId: id2,
@@ -569,6 +585,7 @@
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.$message.warning('暂无找到相似的文本')
                     } else {
+                        this.itemsNum = itemsNum
                         this.leftData = res.data.leftString
                         this.rightData = res.data.rightString
                         this.BDmodel = true
@@ -577,19 +594,37 @@
                 })
             },
             itemEdit (row) {
-                this.itemId = row.id
-                this.modalshowflag2 = true
-                this.editForm = {
-                    technicalRequir: row.technicalRequir, // 核心技术要求
-                    changePoint: row.changePoint, // 国内标准的差异点
-                    complianceRequir: row.complianceRequir || '1', // 符合性要求
-                    complianceState: row.complianceState, // 合规性分析
-                    newData: row.newData, // 新车型实施日期
-                    onlineData: row.onlineData, // 在产车实施日期
-                    applyArctic: row.applyArctic, // 适用车型
-                    itemsId: row.itemsId,
-                    itemsId2: row.itemsId2
+                let itemsEoPage = {
+                    oldItemId: row.itemsId,
+                    newItemId: row.itemsId2,
+                    flag: 1
                 }
+                this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
+                        _this: this
+                    }, res => {
+                    if (res.data.leftString === '' && res.data.rightString === '') {
+                        this.BDtext = true
+                    } else {
+                        this.BDtext = false
+                        this.leftData = res.data.leftString
+                        this.rightData = res.data.rightString
+                        this.similarityDegree = res.data.similarityDegree
+                    }
+                    this.itemId = row.id
+                    this.modalshowflag2 = true
+                    this.editForm = {
+                        itemsNum: row.itemsNum,
+                        technicalRequir: row.technicalRequir, // 核心技术要求
+                        changePoint: row.changePoint, // 国内标准的差异点
+                        complianceRequir: row.complianceRequir || '', // 符合性要求
+                        complianceState: row.complianceState, // 合规性分析
+                        newData: row.newData, // 新车型实施日期
+                        onlineData: row.onlineData, // 在产车实施日期
+                        applyArctic: row.applyArctic, // 适用车型
+                        itemsId: row.itemsId,
+                        itemsId2: row.itemsId2
+                    }
+                })
             },
             saveUserInfo2 () {
                 for( let a = 0; a < this.itemList.length; a++) {
@@ -682,7 +717,7 @@
                 if (this.idList.length > 0) {
                     this.plForm.technicalRequir = ''
                     this.plForm.changePoint = ''
-                    this.plForm.complianceRequir = '1'
+                    this.plForm.complianceRequir = ''
                     this.plForm.complianceState = ''
                     this.plForm.newData = ''
                     this.plForm.onlineData = ''
@@ -841,14 +876,13 @@
                         } else {
                             itemList = data.itemList
                         }
-                        console.log(itemList);
                         itemList.forEach(item => {
                             item.unitDeptName = this.$store.getters.userInfo.institutionName
                             item.onlineData = item.onlineData || ''
                             item.newData = item.newData || ''
                             item.complianceState = item.complianceState || ''
                             item.oldNumber = item.oldNumber || ''
-                            item.complianceRequir = item.complianceRequir || '1'
+                            item.complianceRequir = item.complianceRequir || ''
                             item.changePoint = item.changePoint || ''
                             item.technicalRequir = item.technicalRequir || ''
                             item.itemsTitle = item.itermsConditions
@@ -893,6 +927,9 @@
         .myText {
             line-height: 20px;
         }
+        .BDclass {
+            height: calc(~'100% - 53px');
+        }
         .myDataPick {
             /deep/.el-form-item__content {
                 margin-left: 0px !important;
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index ececf879d..3fbce2468 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -73,8 +73,8 @@
                       height="100%"
                       :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-                      row-key="id"
             >
+                <el-table-column type="selection" width="55" align="center"/>
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
@@ -85,8 +85,8 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        fixed
                         show-overflow-tooltip
+                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
@@ -101,46 +101,46 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
+                        v-if="!form.itemsNum1"
                         prop="technicalRequir"
                         width="200"
-                        v-if="!form.itemsNum1"
                         label="核心技术要求"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
-                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
+                        v-show="form.itemsNum1"
                         label="基于上一版本差异"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
-                        v-if="sarType === 'FOREIGN'"
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="相对于国行标差异点"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="newData"
+                        width="180"
                         show-overflow-tooltip
-                        width="150"
                         label="新车型实施日期"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
+                        width="180"
                         show-overflow-tooltip
-                        width="150"
                         label="在产车型实施日期"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
-                        width="150"
+                        width="200"
                         label="适用车型"
                         show-overflow-tooltip
                         align="center">
@@ -151,39 +151,41 @@
                 <el-table-column
                         prop="unitDeptName"
                         label="责任部门"
-                        width="170"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         label="责任人"
                         width="170"
                         prop="zrUserName"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
                         label="符合项状态"
+                        show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        <div v-if="scope.row.complianceRequir === '1'">符合</div>
-                        <div v-else>不符合</div>
+                        {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
                     </template>
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
                         prop="complianceState"
                         width="200"
                         label="合规性分析"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         label="操作"
                         width="140"
-                        v-if="form.itemsNum1"
+                        v-show="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
-                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -284,6 +286,7 @@
                 title="查看比对内容"
                 :visible.sync="BDmodel"
                 size="1100px">
+            <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -304,6 +307,7 @@
         name: "bzjdStep4",
         data() {
             return {
+                itemsNum: '',
                 similarityDegree: '',
                 BDmodel: false,
                 oldNumber: '',
@@ -340,39 +344,7 @@
             ProcessTitle
         },
         methods: {
-            getBDList () {
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'LEFT'
-                }, {
-                    _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId = res.data[b].itemsId
-                            }
-                        }
-                    }
-                }, e => {
-                })
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'RIGHT'
-                }, {
-                    _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId2 = res.data[b].itemsId
-                            }
-                        }
-                    }
-                }, e => {
-                })
-            },
-            checkBD (id,id2) {
+            checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
                     newItemId: id2,
@@ -384,6 +356,7 @@
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.$message.warning('暂无找到相似的文本')
                     } else {
+                        this.itemsNum = itemsNum
                         this.leftData = res.data.leftString
                         this.rightData = res.data.rightString
                         this.BDmodel = true
@@ -522,7 +495,6 @@
                         this.json = data
                         this.itemList = data.itemList
                         this.loading = false
-                        this.getBDList()
                     }).catch(e => {
                     })
                 })
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index e3c67ea82..212b770b6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -73,20 +73,20 @@
                       height="100%"
                       :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-                      row-key="id"
             >
+                <el-table-column type="selection" width="55" align="center"/>
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
-                        fixed
                         width="70"
+                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        fixed
                         show-overflow-tooltip
+                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
@@ -101,46 +101,46 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
+                        v-if="!form.itemsNum1"
                         prop="technicalRequir"
                         width="200"
-                        v-if="!form.itemsNum1"
                         label="核心技术要求"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
-                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
+                        v-show="form.itemsNum1"
                         label="基于上一版本差异"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
-                        v-if="sarType === 'FOREIGN'"
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="相对于国行标差异点"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
                         prop="newData"
-                        width="150"
+                        width="180"
+                        show-overflow-tooltip
                         label="新车型实施日期"
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
                         prop="onlineData"
-                        width="150"
+                        width="180"
+                        show-overflow-tooltip
                         label="在产车型实施日期"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
-                        width="150"
+                        width="200"
                         label="适用车型"
                         show-overflow-tooltip
                         align="center">
@@ -151,39 +151,41 @@
                 <el-table-column
                         prop="unitDeptName"
                         label="责任部门"
-                        width="170"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         label="责任人"
                         width="170"
                         prop="zrUserName"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
                         label="符合项状态"
+                        show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        <div v-if="scope.row.complianceRequir === '1'">符合</div>
-                        <div v-else>不符合</div>
+                        {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
                     </template>
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
                         prop="complianceState"
                         width="200"
                         label="合规性分析"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         label="操作"
-                        v-if="form.itemsNum1"
                         width="140"
+                        v-show="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
-                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -289,6 +291,7 @@
                 title="查看比对内容"
                 :visible.sync="BDmodel"
                 size="1100px">
+            <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -310,6 +313,7 @@
         name: "bzjdStep5",
         data() {
             return {
+                itemsNum: '',
                 similarityDegree: '',
                 BDmodel: false,
                 oldNumber: '',
@@ -346,39 +350,7 @@
             ProcessTitle
         },
         methods: {
-            getBDList () {
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'LEFT'
-                }, {
-                    _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId = res.data[b].itemsId
-                            }
-                        }
-                    }
-                }, e => {
-                })
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'RIGHT'
-                }, {
-                    _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId2 = res.data[b].itemsId
-                            }
-                        }
-                    }
-                }, e => {
-                })
-            },
-            checkBD (id,id2) {
+            checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
                     newItemId: id2,
@@ -390,6 +362,7 @@
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.$message.warning('暂无找到相似的文本')
                     } else {
+                        this.itemsNum = itemsNum
                         this.leftData = res.data.leftString
                         this.rightData = res.data.rightString
                         this.BDmodel = true
@@ -397,21 +370,6 @@
                     }
                 })
             },
-            itemEdit (row) {
-                this.itemId = row.id
-                this.modalshowflag2 = true
-                this.editForm = {
-                    technicalRequir: row.technicalRequir, // 核心技术要求
-                    changePoint: row.changePoint, // 国内标准的差异点
-                    complianceRequir: row.complianceRequir || '1', // 符合性要求
-                    complianceState: row.complianceState, // 合规性分析
-                    newData: row.newData, // 新车型实施日期
-                    onlineData: row.onlineData, // 在产车实施日期
-                    applyArctic: row.applyArctic, // 适用车型
-                    itemsId: row.itemsId,
-                    itemsId2: row.itemsId2
-                }
-            },
             handleTransfer() {
                 this.drawerModal = true
             },
@@ -525,7 +483,6 @@
                         this.json = data
                         this.itemList = data.itemList
                         this.loading = false
-                        this.getBDList()
                     }).catch(e => {
                     })
                 })
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index ffa5a74c1..c93f1e9da 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -73,21 +73,20 @@
                       height="100%"
                       :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-                      row-key="id"
             >
                 <el-table-column type="selection" width="55" align="center"/>
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
-                        fixed
                         width="70"
+                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        fixed
                         show-overflow-tooltip
+                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
@@ -102,46 +101,46 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
+                        v-if="!form.itemsNum1"
                         prop="technicalRequir"
                         width="200"
-                        v-if="!form.itemsNum1"
                         label="核心技术要求"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
-                        v-if="sarType === 'INLAND' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
+                        v-show="form.itemsNum1"
                         label="基于上一版本差异"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
-                        v-if="sarType === 'FOREIGN'"
+                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="相对于国行标差异点"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="newData"
-                        width="150"
+                        width="180"
                         show-overflow-tooltip
                         label="新车型实施日期"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
-                        width="150"
+                        width="180"
                         show-overflow-tooltip
                         label="在产车型实施日期"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
-                        width="150"
+                        width="200"
                         label="适用车型"
                         show-overflow-tooltip
                         align="center">
@@ -152,39 +151,41 @@
                 <el-table-column
                         prop="unitDeptName"
                         label="责任部门"
-                        width="170"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         label="责任人"
                         width="170"
                         prop="zrUserName"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
                         label="符合项状态"
+                        show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        <div v-if="scope.row.complianceRequir === '1'">符合</div>
-                        <div v-else>不符合</div>
+                        {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
                     </template>
                 </el-table-column>
                 <el-table-column
-                        show-overflow-tooltip
                         prop="complianceState"
                         width="200"
                         label="合规性分析"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         label="操作"
-                        v-if="form.itemsNum1"
                         width="140"
+                        v-show="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
-                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+                        <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -288,6 +289,7 @@
                 title="查看比对内容"
                 :visible.sync="BDmodel"
                 size="1100px">
+            <div>比对条款: {{ itemsNum }}</div>
             <div>相似度:{{ similarityDegree }}</div>
             <div style="height: 600px;overflow: auto;display: flex;">
                 <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -309,6 +311,7 @@
         name: "bzjdStep6",
         data() {
             return {
+                itemsNum: '',
                 similarityDegree: '',
                 BDmodel: false,
                 oldNumber: '',
@@ -345,39 +348,7 @@
             ProcessTitle
         },
         methods: {
-            getBDList () {
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'LEFT'
-                }, {
-                    _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId = res.data[b].itemsId
-                            }
-                        }
-                    }
-                }, e => {
-                })
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'RIGHT'
-                }, {
-                    _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId2 = res.data[b].itemsId
-                            }
-                        }
-                    }
-                }, e => {
-                })
-            },
-            checkBD (id,id2) {
+            checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
                     newItemId: id2,
@@ -389,6 +360,7 @@
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.$message.warning('暂无找到相似的文本')
                     } else {
+                        this.itemsNum = itemsNum
                         this.leftData = res.data.leftString
                         this.rightData = res.data.rightString
                         this.BDmodel = true
@@ -507,9 +479,9 @@
                         }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
+                        console.log(data.itemList);
                         this.itemList = data.itemList
                         this.loading = false
-                        this.getBDList()
                     }).catch(e => {
                     })
                 })
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 7af7467dc..23563feee 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -576,8 +576,7 @@ export default {
       window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     addfjList() {
-      this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
-        type: '0',
+      this.$http.get('lawss/sarStandFile/querySourceFileInfo', {
         standId: this.form.standId
       }, {
         _this: this
@@ -588,7 +587,7 @@ export default {
             this.fjList = res.data
             this.fzlistModel = true
           } else {
-            this.$message.warning('当前标准没有' + text + '文件')
+            this.$message.warning('当前标准没有文件')
             this.fjList = []
           }
         }

From aa6736e6526061b796567548e73e434e77b4dfea Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 15:19:42 +0800
Subject: [PATCH 4/6] feat: There is no way the,buss plan

---
 .../enterpriseStandardPlan/index.vue          | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index e1cefc37b..650a9363a 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -5,16 +5,17 @@
                 <el-form :modal="form" inline class="label-input-form">
                     <el-form-item label="计划状态" class="search-item">
                         <el-select v-model="form.planStatus" placeholder="请选择计划状态">
-                            <el-option label="制定" value="2"></el-option>
-                            <el-option label="修订" value="1"></el-option>
-                            <el-option label="完成" value="0"></el-option>
+                            <el-option label="未开始" value="0"></el-option>
+                            <el-option label="制定中" value="1"></el-option>
+                            <el-option label="修订中" value="2"></el-option>
+                            <el-option label="已取消" value="3"></el-option>
+                            <el-option label="已完成" value="4"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="制修订状态" class="search-item">
                         <el-select v-model="form.reviseStatus" placeholder="请选择制修订状态">
-                            <el-option label="制定完成" value="0"></el-option>
-                            <el-option label="制定中" value="1"></el-option>
-                            <el-option label="未制定" value="2"></el-option>
+                            <el-option label="制定" value="1"></el-option>
+                            <el-option label="修订" value="2"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="企标名称" class="search-item">
@@ -221,16 +222,17 @@
                                         </el-form-item>
                                         <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
-                                                <el-option label="制定" value="2"></el-option>
-                                                <el-option label="修订" value="1"></el-option>
-                                                <el-option label="完成" value="0"></el-option>
+                                                <el-option label="未开始" value="0"></el-option>
+                                                <el-option label="制定中" value="1"></el-option>
+                                                <el-option label="修订中" value="2"></el-option>
+                                                <el-option label="已取消" value="3"></el-option>
+                                                <el-option label="已完成" value="4"></el-option>
                                             </el-select>
                                         </el-form-item>
                                         <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订状态">
-                                                <el-option label="制定完成" value="0"></el-option>
-                                                <el-option label="制定中" value="1"></el-option>
-                                                <el-option label="未制定" value="2"></el-option>
+                                                <el-option label="制定" value="1"></el-option>
+                                                <el-option label="修订" value="2"></el-option>
                                             </el-select>
                                         </el-form-item>
                                         <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">

From 76e94d83acd5453d352ce700ae940087c2742559 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 29 Dec 2021 15:33:24 +0800
Subject: [PATCH 5/6] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index fe4426427..3e7de87d4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -175,7 +175,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
+                        {{ scope.row.complianceRequir === '1' ? '符合' : (scope.row.complianceRequir === '2' ? '不符合' : '') }}
                     </template>
                 </el-table-column>
                 <el-table-column

From 612dd12fade2181aaa84e78944d6dc57c62d5ef9 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 29 Dec 2021 15:34:39 +0800
Subject: [PATCH 6/6] commit

---
 .../processCenter/pages/creatProcess/bzzqyj/step1-1.vue     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 23563feee..7c46e44c3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -39,6 +39,7 @@
                   <el-date-picker
                     v-model="form.endTime"
                     type="date"
+                    :picker-options="pickerOptions"
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
@@ -365,6 +366,11 @@ export default {
   name: "bzzqyjStep1-1",
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
       drawerTitle2: '',
       type2: '',
       activeNames: '1',