From 3917ef308faba61e718e4045a3f7f460a32410b4 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 10:47:35 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 233d6e12a..1404296b9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -90,23 +90,23 @@
                           </span>
 <!--                          多个文件时-->
                           <span v-else-if="child.value && child.value.length > 0">
-                            <div style="margin-left: 19%">
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
-                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                             :title="file.oldFileName">{{ file.oldFileName }}</a>
-                          <i
-                              title="下载"
-                              @click="downloadFile(file.id)"
-                              class="icon-download"
-                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
-                          />
-                          <i
-                              title="下载带水印"
-                              @click="downloadFileByWater(file.id, file.fileSuffix)"
-                              class="icon-download2"
-                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
-                          />
-                              </div>
+                            <span style="margin-left: 19%">
+                              <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                                 @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                 :title="file.oldFileName">{{ file.oldFileName }}</a>
+                              <i
+                                  title="下载"
+                                  @click="downloadFile(file.id)"
+                                  class="icon-download"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                              />
+                              <i
+                                  title="下载带水印"
+                                  @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                  class="icon-download2"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                              />
+                            </span>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
                           <el-button

From b39ffb58780f6edcb32ceb7bbe13db32e552c4fc Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 11:27:19 +0800
Subject: [PATCH 02/17] feat: There is no way the,buss plan add bussSort

---
 .../enterpriseStandardPlan/index.vue          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index d93411e8d..ef5a30c9e 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -90,6 +90,12 @@
                                 align="center"
                                 width="55">
                         </el-table-column>
+                        <el-table-column
+                                prop="bussSort"
+                                label="企标类别"
+                                align="center"
+                                width="120">
+                        </el-table-column>
                         <el-table-column
                                 prop="esName"
                                 label="企标名称"
@@ -196,6 +202,16 @@
                             <el-row :gutter="24">
                                 <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-option
+                                                        v-for="item in standSortOptions"
+                                                        :key="item.value"
+                                                        :value="item.value"
+                                                        :label="item.label"
+                                                ></el-option>
+                                            </el-select>
+                                        </el-form-item>
                                         <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-input
                                                     :disabled="DrawerType === 'see'"
@@ -556,6 +572,7 @@
                 TXJGList: [],
                 TXJGmodal: false,
                 standSystemOptions: [],
+                standSortOptions: [],
                 defaultProps: {
                     children: 'children',
                     label: 'menuName'
@@ -591,6 +608,7 @@
                 DrawerType: '',
                 ids: [],
                 addForm: {
+                    bussSort:'',
                     esMatingRelations: '',
                     technologic: '',
                     useLevel: '',
@@ -623,6 +641,9 @@
                     esName: [
                         {required: true, message: '请输入企标名称', trigger: 'blur'},
                     ],
+                    bussSort: [
+                        {required: true, message: '请选择企标类别', trigger: 'change'},
+                    ],
                     planStatus: [
                         {required: true, message: '请选择计划状态', trigger: 'change'},
                     ],
@@ -941,6 +962,7 @@
                         this.DrawerType = 'edit'
                         this.addDrawer = true
                         this.addForm = {
+                            bussSort: command[0].bussSort,
                             esMatingRelations: command[0].esMatingRelations,
                             technologic: command[0].technologic,
                             useLevel: command[0].useLevel,
@@ -1025,6 +1047,7 @@
             }, res => {
                 this.QCDWList = res.data.QCDW // 起草单位
                 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
+                this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
                 this.BZList = res.data.ENERGYTYPES
             }, e => {
             })

From f8f0b695629f5650bdf8a8916d84cd4a56d830c0 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 13:51:26 +0800
Subject: [PATCH 03/17] feat: There is no way the,buss hh process

---
 .../processCenter/pages/creatProcess/qbrk/common/formList.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index c927509da..8f4833d00 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -305,7 +305,7 @@ export default {
     },
     summaryFileList: {
       type: Array,
-      required: true
+      required: false
     },
     disabledState: {
       type: Boolean,

From 37e1fb3b9417f442f49746666f54f459ec840104 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 14:06:24 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=B9=8B=E5=89=8D=E4=B8=8D=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue   | 25 +++++++++++++++++--
 .../pages/creatProcess/bzhHy-ch/step1.vue     |  9 ++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index 24e890362..a00639dc4 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -174,10 +174,11 @@
               </el-table-column>
             </el-table>
           </el-form-item>
-          <el-form-item class="add-form-item" label="会议时间:">
+          <el-form-item class="picker_style" style="margin-bottom: 0;min-height: 50px;line-height: 50px;border-bottom: 1px dashed #e5e5e5;" label="会议时间:">
             <el-date-picker
               v-model="editMeetForm.date"
               type="datetime"
+              :picker-options="datePicker"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               align="right">
@@ -339,7 +340,13 @@ export default {
       // 议题选中时储存数组
       deleteTable: [],
       loading: false,
-      dialogTitle: ''
+      dialogTitle: '',
+
+      datePicker: {
+        disabledDate(date) {
+          return date.getTime() <  Date.now() - 24 * 60 * 60 * 1000
+        }
+      }
     }
   },
   mounted() {
@@ -819,6 +826,19 @@ export default {
 @import '~@/assets/styles/style';
 
 .standCalendar {
+  .content_form {
+    /deep/.el-input--suffix .el-input__inner {
+      border: 0;
+    }
+    label-input-form {
+      .picker_style {
+        margin-bottom: 0;
+        min-height: 50px;
+        line-height: 50px;
+        border-bottom: 1px dashed #e5e5e5;
+      }
+    }
+  }
   .date-picker {
     .item {
       /deep/ .el-input {
@@ -874,6 +894,7 @@ export default {
     margin-top: 50px;
   }
 
+
   .card_info {
     height: 190px;
     margin-top: 10px;
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 31875535c..ce92499e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -82,6 +82,7 @@
                   <el-date-picker
                     v-model="ch_pageData.meetingStartTime"
                     type="datetime"
+                    :picker-options="datePicker"
                     value-format="yyyy-MM-dd HH:mm:ss"
                     placeholder="选择日期时间"
                     align="right">
@@ -453,7 +454,13 @@ export default {
       isSubmit: false,
       saveLoading: false,
       commentInfo: '',
-      bpnId: ''
+      bpnId: '',
+      // 设置当前日期之前不可选择
+      datePicker: {
+        disabledDate(date) {
+          return date.getTime() <  Date.now() - 24 * 60 * 60 * 1000
+        }
+      }
     }
   },
   mounted() {

From abb197c50905792482923a171629be6b1605e942 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:09:25 +0800
Subject: [PATCH 05/17] =?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=E7=AB=8B=E9=A1=B9?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/cancel.vue            |  90 +++-
 .../qbzxdjhgk/component/delay.vue             |  94 +++-
 .../qbzxdjhgk/component/establish.vue         | 476 +++++++++++++++---
 .../qbzxdjhgk/component/merge.vue             | 387 +++++++++++++-
 .../qbzxdjhgk/component/rename.vue            |  76 +++
 .../pages/creatProcess/qbzxdjhgk/step1-5.vue  |  82 ++-
 .../pages/creatProcess/qbzxdjhgk/step1.vue    |  20 +-
 .../pages/creatProcess/qbzxdjhgk/step2.vue    |  68 +++
 .../pages/creatProcess/qbzxdjhgk/step3.vue    |  67 +++
 .../pages/creatProcess/qbzxdjhgk/step4.vue    |  67 +++
 .../pages/creatProcess/qbzxdjhgk/step5.vue    |  67 +++
 11 files changed, 1377 insertions(+), 117 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index e77ff7e04..91ba66aff 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -54,13 +54,26 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+            <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
               <el-input
-                type="textarea"
-                v-model="qbfsForm.cancelReason"
-                placeholder="请输入取消原因"
-                clearable
-              ></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  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-col>
           <el-col :span="12">
@@ -116,6 +129,52 @@
                 ></el-input>
               </div>
             </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="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+              <el-input
+                type="textarea"
+                v-model="qbfsForm.cancelReason"
+                placeholder="请输入取消原因"
+                clearable
+              ></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
       </div>
@@ -268,12 +327,13 @@ export default {
     return{
       formRules: {
         cancelReason: [
-          {required: true, message: '请输入延期原因', trigger:'blur'},
+          {required: true, message: '请输入取消原因', trigger:'blur'},
         ]
 
       },
       ListModel: false,
       standinfoList: [],
+      BZList: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -311,6 +371,12 @@ export default {
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods: {
     validateForm () {
@@ -372,6 +438,16 @@ export default {
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
+        if(this.selectList[0].area){
+          this.qbfsForm.area = this.selectList[0].area.split(',')
+        }
+        this.qbfsForm.rqbName = this.selectList[0].rqbName
+        this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
+        this.qbfsForm.isRelate = this.selectList[0].isRelate
+        this.qbfsForm.useLevel = this.selectList[0].useLevel
+        this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
+        this.qbfsForm.technologic = this.selectList[0].technologic
+        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
         this.ListModel = false
       }
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 33119c5c4..63da88cbe 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -54,6 +54,27 @@
                placeholder="请选择初稿完成时间">
              </el-date-picker>
            </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  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 label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
              <el-date-picker
                v-model="qbfsForm.yqDraftTime"
@@ -62,14 +83,6 @@
                placeholder="请选择延期后初稿完成时间">
              </el-date-picker>
            </el-form-item>
-           <el-form-item label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
-             <el-input
-               type="textarea"
-               v-model="qbfsForm.delayReason"
-               placeholder="请输入延期原因"
-               clearable
-             ></el-input>
-           </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item   prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -124,6 +137,45 @@
                ></el-input>
              </div>
            </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="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
              <el-date-picker
                v-model="qbfsForm.yqReleaseTime"
@@ -132,6 +184,14 @@
                placeholder="请选择延期后标准发布时间">
              </el-date-picker>
            </el-form-item>
+           <el-form-item label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
+             <el-input
+               type="textarea"
+               v-model="qbfsForm.delayReason"
+               placeholder="请输入延期原因"
+               clearable
+             ></el-input>
+           </el-form-item>
          </el-col>
        </el-row>
      </div>
@@ -282,6 +342,7 @@ export default {
   props: ['message'],
   data(){
     return{
+      BZList: [],
       formRules: {
         yqDraftTime: [
           { required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' },
@@ -332,6 +393,12 @@ export default {
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods: {
     validateForm () {
@@ -378,6 +445,7 @@ export default {
     },
     //带入标准
     OkDrawer(){
+      console.log(this.selectList);
       if(this.selectList.length > 1){
         this.$message.warning('您只能带入一条标准')
       }else if(this.selectList.length < 1){
@@ -393,6 +461,16 @@ export default {
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
+        if(this.selectList[0].area){
+          this.qbfsForm.area = this.selectList[0].area.split(',')
+        }
+        this.qbfsForm.rqbName = this.selectList[0].rqbName
+        this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
+        this.qbfsForm.isRelate = this.selectList[0].isRelate
+        this.qbfsForm.useLevel = this.selectList[0].useLevel
+        this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
+        this.qbfsForm.technologic = this.selectList[0].technologic
+        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
         this.ListModel = false
       }
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 6bed46d34..a952cac68 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div id="establish">
     <process-title>
       <template slot="title">立项信息</template>
     </process-title>
@@ -17,58 +17,22 @@
           placeholder="请输入企标名称"
           :maxlength="500"/>
       </el-form-item>
-      <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
-          <el-option label="制定" value="制定"></el-option>
-          <el-option label="修订" value="修订"></el-option>
-          <el-option label="完成" value="完成"></el-option>
+      <el-form-item prop="planStatus" label="计划类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划类型">
+          <el-option label="未开始" value="未开始"></el-option>
+          <el-option label="制定中" value="制定中"></el-option>
+          <el-option label="修订中" value="修订中"></el-option>
+          <el-option label="已取消" value="已取消"></el-option>
+          <el-option label="已完成" value="已完成"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
-          <el-option label="制定完成" value="制定完成"></el-option>
-          <el-option label="制定中" value="制定中"></el-option>
-          <el-option label="未制定" value="未制定"></el-option>
+          <el-option label="制定" value="制定"></el-option>
+          <el-option label="修订" value="修订"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="standScope" label="标准范围" style="width: 100%; margin-right:10px"
-                    class="add-form-item form-item-disabled">
-        <el-select v-model="qbfsForm.standScope" placeholder="请选择标准范围">
-          <el-option label="N1" value="N1"></el-option>
-          <el-option label="N2" value="N2"></el-option>
-          <el-option label="N3" value="N3"></el-option>
-          <el-option label="M1" value="M1"></el-option>
-          <el-option label="M2" value="M2"></el-option>
-          <el-option label="M3" value="M3"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="useStand" label="是否采用标准" style="width: 100%; margin-right:10px"
-                    class="add-form-item form-item-disabled">
-        <el-select @change="useStandChange"  v-model="qbfsForm.useStand" placeholder="请选择是否采用标准">
-          <el-option label="是" value="yes"></el-option>
-          <el-option label="否" value="no"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item v-if="!useShow" prop="indexBasis" label="简述指标依据" style="width: 100%; margin-right:10px"
-                    class="add-form-item form-item-disabled">
-        <el-input
-          type="textarea"
-          v-model="qbfsForm.indexBasis"
-          placeholder="请输入指标依据"
-          :maxlength="500"/>
-      </el-form-item>
-<!--      <el-form-item prop="useStand" label="采用何种标准" style="width: 100%; margin-right:10px"-->
-<!--                    class="add-form-item form-item-disabled">-->
-<!--        <el-select v-model="qbfsForm.useStand" placeholder="请选择采用何种标准">-->
-<!--          <el-option-->
-<!--            v-for="item in useOptions"-->
-<!--            :key="item.value"-->
-<!--            :label="item.label"-->
-<!--            :value="item.value">-->
-<!--          </el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
       <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
@@ -110,6 +74,82 @@
                   @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
         </el-input>
       </el-form-item>
+      <el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-input
+          style="display: none;"
+          v-model="qbfsForm.rqbJson">
+        </el-input>
+        <el-input
+          clearable
+          v-model="qbfsForm.rqbName"
+          placeholder="请选择企业标准"
+          readonly
+          @click.native="choiceQYBZ">
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-input
+          style="display: none;"
+          v-model="qbfsForm.tsJson">
+        </el-input>
+        <el-input
+          clearable
+          v-model="qbfsForm.tsJsonName"
+          placeholder="请选择体系结构"
+          readonly
+          @click.native="choiceTXJG(qbfsForm.tsJson)">
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select 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 prop="isRelate" label="是否引用标准" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select  v-model="qbfsForm.isRelate" placeholder="请选择是否引用标准">
+          <el-option label="是" value="是"></el-option>
+          <el-option label="否" value="否"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="qbfsForm.isRelate === '否'" prop="technologic" label="简述指标依据" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-input
+          type="textarea"
+          v-model="qbfsForm.technologic"
+          placeholder="请输入指标依据"
+          :maxlength="500"/>
+      </el-form-item>
+        <template v-if="qbfsForm.isRelate === '是'">
+          <custom-input-for-all-standards
+            class="classDisplay"
+            :config="{attrName: '采用标准'}"
+            :labelWidth="'180px'"
+            v-model="qbfsForm.esStandRelations"
+          ></custom-input-for-all-standards>
+        </template>
+      <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select  v-model="qbfsForm.useLevel" placeholder="请选择采标程度">
+          <el-option label="等同" value="等同"></el-option>
+          <el-option label="修改" value="修改"></el-option>
+          <el-option label="非等效" value="非等效"></el-option>
+        </el-select>
+      </el-form-item>
+      <template>
+        <custom-input-for-all-standards2
+          class="classDisplay"
+          :config="{attrName: '配套标准'}"
+          :labelWidth="'180px'"
+          v-model="qbfsForm.esMatingRelations"
+        ></custom-input-for-all-standards2>
+      </template>
       <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
         <el-input
           type="textarea"
@@ -117,13 +157,130 @@
           placeholder="请输入新增原因"
           :maxlength="500"/>
       </el-form-item>
-      <!--                                        <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
-      <!--                                            <el-input-->
-      <!--                                                    v-model="qbfsForm.remarks"-->
-      <!--                                                    placeholder="请输入备注"-->
-      <!--                                                    :maxlength="500"/>-->
-      <!--                                        </el-form-item>-->
     </el-form>
+<!--    选择企业标准弹窗-->
+    <el-drawer
+      title="选择企业标准"
+      :visible.sync="QYBZmodal"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: 100%;">
+          <!-- 顶部工具栏 -->
+          <div class="search-area">
+            <el-form :model="QYBZform" inline class="label-input-form">
+              <el-formItem label="标准号" prop="numberName" class="search-item">
+                <el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
+              </el-formItem>
+              <el-formItem label="标准名称" prop="standName" class="search-item">
+                <el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
+              </el-formItem>
+              <el-formItem class="search-item btn-box">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  class="common-button-primary"
+                  @click="QYBZget">查询
+                </el-button>
+                <el-button
+                  class="common-button-default"
+                  size="mini"
+                  @click="clearQYBZ">清空
+                </el-button>
+              </el-formItem>
+            </el-form>
+          </div>
+          <div class="table-wrap" style="height: 100%;">
+            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+              <el-table
+                ref="selection"
+                :data="QYBZList"
+                tooltip-effect="dark"
+                style="width: 100%;padding:0 0 20px 0;"
+                height="100%"
+                border
+                @selection-change="handleSelectionQYBZ"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                  label="企标编号"
+                  prop="standCode"
+                >
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="standName"
+                  label="中文名称"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  label="发布日期"
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="putTime"
+                  label="实施日期"
+                  sortable
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standStatusShow"
+                  label="文本状态"
+                  width="110"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.standStatusShow}}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
+            <loading :loading="QYBZShow">数据加载中……</loading>
+          </div>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
+        </div>
+      </div>
+    </el-drawer>
+<!--    选择体系结构弹窗-->
+    <el-drawer
+      title="选择体系结构"
+      :visible.sync="TXJGmodal"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: 100%;">
+          <el-tree
+            v-if="TXJGmodal"
+            ref="TXJGTree"
+            :data="standSystemOptions"
+            show-checkbox
+            node-key="id"
+            default-expand-all
+            check-strictly
+            :default-checked-keys="TXJGList"
+            :props="defaultProps">
+          </el-tree>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
+        </div>
+      </div>
+    </el-drawer>
     <!--    多选择责任人-->
     <Role-tree
       :is-title="drawerTitle2"
@@ -150,18 +307,40 @@
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
 import MechanismTree from "@/components/mechanismTree";
-
+import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
+import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
 export default {
   name: "establish",
   components: {
     ProcessTitle,
-    MechanismTree
+    MechanismTree,
+    CustomInputForAllStandards,
+    CustomInputForAllStandards2
   },
   props: ['message'],
   data(){
     return {
-      useShow: false,
+      QYBZmodal: false,
+      TXJGmodal: false,
       modalshowflagZRBM: false,
+      QYBZShow: false,
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      },
+      TXJGList: [],
+      QYBZList: [],
+      QYBZformSelect: [],
+      standSystemOptions: [],
+      QYBZform: {
+        page: 1,
+        pageSzie: this.$store.getters.userInfo.configContent,
+        validFlag: '0',
+        userId: this.$store.getters.userInfo.userId,
+        standCode: '',
+        standName: '',
+        total: 0,
+      },
       nodeListZRBM: [],
       drawerTitle2: '',
       drawerTitle: '',
@@ -170,6 +349,7 @@ export default {
       modalshowflag: false,
       nodeList2: [],
       nodeList: [],
+      BZList: [],
       qcdwOptions: [],
       qbfsForm: {
         type: "5",
@@ -178,9 +358,9 @@ export default {
         esName: "", // 企标名称
         planStatus: "", // 计划状态
         reviseStatus: "", // 制修订状态
-        standScope: "", //标准范围
-        useStand: "", //采用何种标准
-        indexBasis: '',  //指标依据
+        area: "", //标准范围
+        isRelate: "", //采用何种标准
+        technologic: '',  //指标依据
         resPerson: "", // 评审责任人
         resPersonName: "",
         wgLeader: "", // 工作组组长
@@ -241,21 +421,15 @@ export default {
         reviseStatus: [
           { required: true, message: "请选择制修订状态", trigger: "blur" }
         ],
-        standScope: [
-          { required: true, message: "请选择标准范围", trigger: "blur" }
-        ],
-        useStand: [
-          { required: true, message: "请选择采用何种标准", trigger: "blur" }
-        ],
-        indexBasis: [
-          { required: true, message: "请输入指标依据", trigger: "blur" }
-        ],
         resPersonName: [
           { required: true, message: "请输入评审责任人", trigger: "blur" }
         ],
         wgLeaderName: [
           { required: true, message: "请输入工作组组长", trigger: "blur" }
         ],
+        unitName: [
+          { required: true, message: "请选择起草责任单位", trigger: "blur" }
+        ],
         draftTime: [
           { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
         ],
@@ -289,13 +463,91 @@ export default {
      this.$http.get('sys/dictype/getDicTypeListCode', '',{
        _this: this
      }, res => {
-       console.log(res);
+       this.BZList = res.data.ENERGYTYPES //标准范围
+       this.standSystemOptions = res.data.TXLBBUSS // 体系结构
        this.qcdwOptions = res.data.QCDW // 起草单位
      })
   },
   methods: {
-    useStandChange(){
-       this.useShow = !this.useShow
+    TXJGcloseDrawer () {
+      this.TXJGmodal = false
+    },
+    TXJGenterDrawer () {
+      let list = this.$refs.TXJGTree.getCheckedNodes()
+      let id = ''
+      let name = ''
+      list.map(item => {
+        if (id.length > 0) {
+          id += ','
+          id += item.id
+          name += ','
+          name += item.menuName
+        } else {
+          id = item.id
+          name = item.menuName
+        }
+      })
+      this.qbfsForm.tsJson = id
+      this.qbfsForm.tsJsonName = name
+      this.TXJGmodal = false
+    },
+    //选择体系结构
+    choiceTXJG (id) {
+      if (id) {
+        this.TXJGList = id.split(',')
+      } else {
+        this.TXJGList = []
+      }
+      this.TXJGmodal = true
+    },
+    //选择企业标准
+    choiceQYBZ(){
+      this.QYBZformSelect = []
+      this.QYBZget()
+      this.QYBZmodal = true
+    },
+    QYBZcloseDrawer () {
+      this.clearQYBZ()
+    },
+    QYBZenterDrawer () {
+      if (this.QYBZformSelect.length > 1) {
+        this.$message.warning('请选择一条标准')
+      } else if (this.QYBZformSelect.length < 1){
+        this.$message.warning('请选择要带入的标准')
+      } else {
+        this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
+        this.qbfsForm.rqbName = this.QYBZformSelect[0].standName
+        this.clearQYBZ()
+        this.QYBZmodal = false
+      }
+    },
+    handleSelectionQYBZ  (val) {
+      this.QYBZformSelect = val
+    },
+    QYBZpageChange (page) {
+      this.QYBZform.page = page
+      this.QYBZget()
+    },
+    QYBZpageSizeChange (pageSize) {
+      this.QYBZform.pageSize = pageSize
+      this.QYBZget()
+    },
+    QYBZget () {
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
+        _this: this, loading: 'QYBZShow'
+      }, res => {
+        this.QYBZList = res.data.list
+        this.QYBZform.total = res.data.count
+      }, e => {
+      })
+    },
+    clearQYBZ () {
+      this.QYBZform = {
+        page: 1,
+        standCode: '',
+        standName: '',
+      }
+      this.QYBZget()
     },
     choiceZRBM(type, title, id) {
       this.nodeListZRBM = []
@@ -390,6 +642,88 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+@import '~@/assets/styles/style';
+#establish {
+  height: 100%;
+  background: #fff;
+  .classDisplay {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+      .el-input__inner {
+        width: calc(~'100% - 80px');
+      }
+    }
+  }
+  .standardForComments {
+    height: calc(~'100% - 56px');
+    background: #fff;
+    flex-direction: column;
+    .action-bar {
+      margin-bottom: 5px;
+      padding: 0;
+    }
 
+    .content {
+      flex: auto;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+
+      .table-wrap {
+        flex: auto;
+        overflow: hidden;
+        position: relative;
+      }
+    }
+
+    & > .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
+  /deep/.table-wrap {
+    .el-table__fixed {
+      height: calc(~'100% - 20px') !important;
+    }
+  }
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+      height: 50px;
+    }
+  }
+  display: flex;
+  flex-direction: column;
+  .content-center {
+    padding: 10px;
+  }
+  .container {
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    .table-wrap {
+      flex: 1;
+      overflow: hidden;
+      position: relative;
+      .inner-wrap {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .footer {
+      /deep/ .pagination {
+        position: static;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 23973cf52..c57d0d1d7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -86,16 +86,45 @@
               <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
                         @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
               </el-input>
-<!--              <el-select v-model="qbfsForm.unit" filterable multiple  clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in qcdwOptions"-->
-<!--                  placeholder="请选择起草责任单位"-->
-<!--                  :key="item.value"-->
-<!--                  :value="item.label"-->
-<!--                  :label="item.label"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
             </el-form-item>
+            <el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.rqbJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.rqbName"
+                placeholder="请选择企业标准"
+                readonly
+                @click.native="choiceQYBZ">
+              </el-input>
+            </el-form-item>
+            <template>
+              <custom-input-for-all-standards2
+                class="classDisplay"
+                :config="{attrName: '配套标准'}"
+                :labelWidth="'180px'"
+                v-model="qbfsForm.esMatingRelations"
+              ></custom-input-for-all-standards2>
+            </template>
+            <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-select  v-model="qbfsForm.useLevel" placeholder="请选择采标程度">
+                <el-option label="等同" value="等同"></el-option>
+                <el-option label="修改" value="修改"></el-option>
+                <el-option label="非等效" value="非等效"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="qbfsForm.isRelate === '否'" prop="technologic" label="简述指标依据" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-input
+                type="textarea"
+                v-model="qbfsForm.technologic"
+                placeholder="请输入指标依据"
+                :maxlength="500"/>
+            </el-form-item>
+
           </el-col>
           <el-col :span="12">
             <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -124,6 +153,34 @@
                 placeholder="请选择标准发布时间">
               </el-date-picker>
             </el-form-item>
+            <el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none;"
+                v-model="qbfsForm.tsJson">
+              </el-input>
+              <el-input
+                clearable
+                v-model="qbfsForm.tsJsonName"
+                placeholder="请选择体系结构"
+                readonly
+                @click.native="choiceTXJG(qbfsForm.tsJson)">
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="isRelate" label="是否引用标准" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-select  v-model="qbfsForm.isRelate" placeholder="请选择是否引用标准">
+                <el-option label="是" value="是"></el-option>
+                <el-option label="否" value="否"></el-option>
+              </el-select>
+            </el-form-item>
+            <template v-if="qbfsForm.isRelate === '是'">
+              <custom-input-for-all-standards
+                class="classDisplay"
+                :config="{attrName: '采用标准'}"
+                :labelWidth="'180px'"
+                v-model="qbfsForm.esStandRelations"
+              ></custom-input-for-all-standards>
+            </template>
             <el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
               <el-input
                 type="textarea"
@@ -268,6 +325,129 @@
         <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
       </div>
     </el-drawer>
+    <!--    选择企业标准弹窗-->
+    <el-drawer
+      title="选择企业标准"
+      :visible.sync="QYBZmodal"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: 100%;">
+          <!-- 顶部工具栏 -->
+          <div class="search-area">
+            <el-form :model="QYBZform" inline class="label-input-form">
+              <el-formItem label="标准号" prop="numberName" class="search-item">
+                <el-input v-model="QYBZform.standCode" clearable placeholder="根据标准号查找" :maxlength="100"/>
+              </el-formItem>
+              <el-formItem label="标准名称" prop="standName" class="search-item">
+                <el-input v-model="QYBZform.standName" clearable placeholder="根据标准名称查找" :maxlength="100"/>
+              </el-formItem>
+              <el-formItem class="search-item btn-box">
+                <el-button
+                  type="primary"
+                  size="mini"
+                  class="common-button-primary"
+                  @click="QYBZget">查询
+                </el-button>
+                <el-button
+                  class="common-button-default"
+                  size="mini"
+                  @click="clearQYBZ">清空
+                </el-button>
+              </el-formItem>
+            </el-form>
+          </div>
+          <div class="table-wrap" style="height: 100%;">
+            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+              <el-table
+                ref="selection"
+                :data="QYBZList"
+                tooltip-effect="dark"
+                style="width: 100%;padding:0 0 20px 0;"
+                height="100%"
+                border
+                @selection-change="handleSelectionQYBZ"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                  label="企标编号"
+                  prop="standCode"
+                >
+                </el-table-column>
+                <el-table-column
+                  show-overflow-tooltip
+                  prop="standName"
+                  label="中文名称"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="issueTime"
+                  label="发布日期"
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="putTime"
+                  label="实施日期"
+                  sortable
+                  width="120"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="standStatusShow"
+                  label="文本状态"
+                  width="110"
+                >
+                  <template slot-scope="scope">
+                    <span>{{scope.row.standStatusShow}}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+            <pagination :page="QYBZform.page" :total="QYBZform.total" @pageChange="QYBZpageChange" @pageSizeChange="QYBZpageSizeChange"></pagination>
+            <loading :loading="QYBZShow">数据加载中……</loading>
+          </div>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="QYBZcloseDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="QYBZenterDrawer">导入</el-button>
+        </div>
+      </div>
+    </el-drawer>
+    <!--    选择体系结构弹窗-->
+    <el-drawer
+      title="选择体系结构"
+      :visible.sync="TXJGmodal"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: 100%;">
+          <el-tree
+            v-if="TXJGmodal"
+            ref="TXJGTree"
+            :data="standSystemOptions"
+            show-checkbox
+            node-key="id"
+            default-expand-all
+            check-strictly
+            :default-checked-keys="TXJGList"
+            :props="defaultProps">
+          </el-tree>
+        </div>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="TXJGcloseDrawer">取消</el-button>
+          <el-button type="primary" size="mini" @click="TXJGenterDrawer">确定</el-button>
+        </div>
+      </div>
+    </el-drawer>
     <!--    多选择责任人-->
     <Role-tree
       :is-title="drawerTitle2"
@@ -294,16 +474,40 @@
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
 import MechanismTree from '@/components/mechanismTree'
+import CustomInputForAllStandards from "@/components/CustomFormComponents/InputForAllStandards";
+import CustomInputForAllStandards2 from "@/components/CustomFormComponents/InputForAllStandards2";
 
 export default {
   name: "merge",
   components: {
     ProcessTitle,
-    MechanismTree
+    MechanismTree,
+    CustomInputForAllStandards,
+    CustomInputForAllStandards2
   },
   props: ['message'],
   data(){
     return {
+      QYBZmodal: false,
+      TXJGmodal: false,
+      QYBZShow: false,
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      },
+      TXJGList: [],
+      QYBZList: [],
+      QYBZformSelect: [],
+      standSystemOptions: [],
+      QYBZform: {
+        page: 1,
+        pageSzie: this.$store.getters.userInfo.configContent,
+        validFlag: '0',
+        userId: this.$store.getters.userInfo.userId,
+        standCode: '',
+        standName: '',
+        total: 0,
+      },
       modalshowflagZRBM: false,
       nodeListZRBM: [],
       drawerTitle2: '',
@@ -411,7 +615,8 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
-      console.log(res);
+      this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSystemOptions = res.data.TXLBBUSS // 体系结构
       this.qcdwOptions = res.data.QCDW // 起草单位
     })
     this.getStandDataBtn()
@@ -427,6 +632,86 @@ export default {
     }
   },
   methods: {
+    TXJGcloseDrawer () {
+      this.TXJGmodal = false
+    },
+    TXJGenterDrawer () {
+      let list = this.$refs.TXJGTree.getCheckedNodes()
+      let id = ''
+      let name = ''
+      list.map(item => {
+        if (id.length > 0) {
+          id += ','
+          id += item.id
+          name += ','
+          name += item.menuName
+        } else {
+          id = item.id
+          name = item.menuName
+        }
+      })
+      this.qbfsForm.tsJson = id
+      this.qbfsForm.tsJsonName = name
+      this.TXJGmodal = false
+    },
+    //选择体系结构
+    choiceTXJG (id) {
+      if (id) {
+        this.TXJGList = id.split(',')
+      } else {
+        this.TXJGList = []
+      }
+      this.TXJGmodal = true
+    },
+    //选择企业标准
+    choiceQYBZ(){
+      this.QYBZformSelect = []
+      this.QYBZget()
+      this.QYBZmodal = true
+    },
+    QYBZcloseDrawer () {
+      this.clearQYBZ()
+    },
+    QYBZenterDrawer () {
+      if (this.QYBZformSelect.length > 1) {
+        this.$message.warning('请选择一条标准')
+      } else if (this.QYBZformSelect.length < 1){
+        this.$message.warning('请选择要带入的标准')
+      } else {
+        this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
+        this.qbfsForm.rqbName = this.QYBZformSelect[0].standName
+        this.clearQYBZ()
+        this.QYBZmodal = false
+      }
+    },
+    handleSelectionQYBZ  (val) {
+      this.QYBZformSelect = val
+    },
+    QYBZpageChange (page) {
+      this.QYBZform.page = page
+      this.QYBZget()
+    },
+    QYBZpageSizeChange (pageSize) {
+      this.QYBZform.pageSize = pageSize
+      this.QYBZget()
+    },
+    QYBZget () {
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
+        _this: this, loading: 'QYBZShow'
+      }, res => {
+        this.QYBZList = res.data.list
+        this.QYBZform.total = res.data.count
+      }, e => {
+      })
+    },
+    clearQYBZ () {
+      this.QYBZform = {
+        page: 1,
+        standCode: '',
+        standName: '',
+      }
+      this.QYBZget()
+    },
     choiceZRBM(type, title, id) {
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
@@ -601,7 +886,87 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import '~@/assets/styles/mixins';
+@import '~@/assets/styles/style';
 .merge {
+  height: 100%;
+  background: #fff;
+  .classDisplay {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+      .el-input__inner {
+        width: calc(~'100% - 80px');
+      }
+    }
+  }
+  .standardForComments {
+    height: calc(~'100% - 56px');
+    background: #fff;
+    flex-direction: column;
+    .action-bar {
+      margin-bottom: 5px;
+      padding: 0;
+    }
 
+    .content {
+      flex: auto;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+
+      .table-wrap {
+        flex: auto;
+        overflow: hidden;
+        position: relative;
+      }
+    }
+
+    & > .pagination {
+      position: static;
+
+      /deep/ .pagination-slot {
+        padding: 0;
+      }
+    }
+  }
+  /deep/.table-wrap {
+    .el-table__fixed {
+      height: calc(~'100% - 20px') !important;
+    }
+  }
+  .add-form-item {
+    /deep/.el-form-item__content {
+      width: calc(~'100% - 180px');
+      height: 50px;
+    }
+  }
+  display: flex;
+  flex-direction: column;
+  .content-center {
+    padding: 10px;
+  }
+  .container {
+    flex: 1;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    .table-wrap {
+      flex: 1;
+      overflow: hidden;
+      position: relative;
+      .inner-wrap {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .footer {
+      /deep/ .pagination {
+        position: static;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 97a49d619..8fe1d1227 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -54,6 +54,27 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </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  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 label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.renameEs"
@@ -115,6 +136,45 @@
                 ></el-input>
               </div>
             </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="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
               <el-input
                 type="textarea"
@@ -284,6 +344,7 @@ export default {
       },
       ListModel: false,
       standinfoList: [],
+      BZList: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -320,6 +381,11 @@ export default {
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods: {
     validateForm () {
@@ -381,6 +447,16 @@ export default {
         this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
+        if(this.selectList[0].area){
+          this.qbfsForm.area = this.selectList[0].area.split(',')
+        }
+        this.qbfsForm.rqbName = this.selectList[0].rqbName
+        this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
+        this.qbfsForm.isRelate = this.selectList[0].isRelate
+        this.qbfsForm.useLevel = this.selectList[0].useLevel
+        this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
+        this.qbfsForm.technologic = this.selectList[0].technologic
+        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
         this.ListModel = false
       }
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
index 7ac67bbd9..dbde6d77d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -82,6 +82,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"
@@ -169,7 +229,7 @@
       </div>
     </div>
     <div class="content" v-show="active === '3'">
-      <div class="flow-list">
+      <div class="flow-list" style="height: 100%">
         <el-table
           height="100%"
           ref="selection"
@@ -234,6 +294,19 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+<!--    <ProcessFooter-->
+<!--      show-back-->
+<!--      show-transfer-->
+<!--      show-submit-->
+<!--      :transfer-loading="isTransfer"-->
+<!--      :submitLoading="isSubmit"-->
+<!--      :saveLoading="saveLoading"-->
+<!--      :approval="true"-->
+<!--      @back="beforeBack"-->
+<!--      @transfer="handleTransfer"-->
+<!--      @submit="handleSubmit"-->
+<!--    >-->
+<!--    </ProcessFooter>-->
     <!-- 福田全公司选人解决方案 -->
     <Role-tree
       check-box
@@ -261,6 +334,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -280,6 +354,12 @@ export default {
   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/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index a7f8c1792..c0f297174 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -439,25 +439,6 @@ export default {
         this.saveLoading = false
       })
     },
-    // repeatName(){
-    //   let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-    //   this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
-    //     _this: this
-    //   }, res => {
-    //     if(qbzxdFrom.type === '1'){
-    //       let dataList = res.data
-    //       dataList.forEach(item => {
-    //         if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
-    //           this.comFlag = 1
-    //         }
-    //       })
-    //     }else if(qbzxdFrom.type === '5'){
-    //       if(!res.data.length){
-    //         this.comFlag = 1
-    //       }
-    //     }
-    //   })
-    // },
     //流程提交
     handleSubmit() {
       if(!this.$refs["childForm"].qbfsForm.type){
@@ -474,6 +455,7 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   let json = Object.assign(qbzxdFrom, this.roleForm);
+                  console.log(json);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
index 5be9a3a1f..61f5b6413 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -82,6 +82,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"
@@ -274,6 +334,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -293,6 +354,12 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {
@@ -329,6 +396,7 @@ export default {
       console.log(item);
       this.$nextTick(() => {
         this.qbfsForm = JSON.parse(JSON.stringify(item))
+        console.log(item.area.join(','));
         this.type = item.type
       })
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index 94cd454fb..b9b2737fc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -82,6 +82,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"
@@ -272,6 +332,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -291,6 +352,12 @@ export default {
   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/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
index 944f67249..1129be8e7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -82,6 +82,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"
@@ -274,6 +334,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -293,6 +354,12 @@ export default {
   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/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index 6978aa1c0..936a1db64 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -82,6 +82,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"
@@ -274,6 +334,7 @@ export default {
   },
   data(){
     return {
+      BZList: [],
       active: '1',
       type: '',
       commentText: '',
@@ -293,6 +354,12 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
+    //查询下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '',{
+      _this: this
+    }, res => {
+      this.BZList = res.data.ENERGYTYPES //标准范围
+    })
   },
   methods:{
     processTable() {

From eec172188565387327e6d14f38f0f7358faa1112 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 14:11:49 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standCalendar/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index a00639dc4..738fc2820 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -174,7 +174,7 @@
               </el-table-column>
             </el-table>
           </el-form-item>
-          <el-form-item class="picker_style" style="margin-bottom: 0;min-height: 50px;line-height: 50px;border-bottom: 1px dashed #e5e5e5;" label="会议时间:">
+          <el-form-item class="picker_style" label="会议时间:">
             <el-date-picker
               v-model="editMeetForm.date"
               type="datetime"
@@ -341,7 +341,7 @@ export default {
       deleteTable: [],
       loading: false,
       dialogTitle: '',
-
+      // 当前日期之前不可选择
       datePicker: {
         disabledDate(date) {
           return date.getTime() <  Date.now() - 24 * 60 * 60 * 1000
@@ -829,6 +829,7 @@ export default {
   .content_form {
     /deep/.el-input--suffix .el-input__inner {
       border: 0;
+      color: #828387;
     }
     label-input-form {
       .picker_style {

From 3cbd04113b1a350ca27984a05ed08ff929557d18 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 14:20:20 +0800
Subject: [PATCH 07/17] feat: There is no way the,buss plan

---
 .../enterpriseStandardPlan/index.vue           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index ef5a30c9e..5f11c8896 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -5,16 +5,16 @@
                 <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="制定"></el-option>
-                            <el-option label="修订" value="修订"></el-option>
-                            <el-option label="完成" value="完成"></el-option>
+                            <el-option label="制定" value="2"></el-option>
+                            <el-option label="修订" value="1"></el-option>
+                            <el-option label="完成" value="0"></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="制定完成"></el-option>
-                            <el-option label="制定中" value="制定中"></el-option>
-                            <el-option label="未制定" value="未制定"></el-option>
+                            <el-option label="制定完成" value="0"></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">
@@ -116,9 +116,9 @@
                                 width="150"
                                 align="center"
                                 label="制修订状态">
-<!--                            <template slot-scope="scope">-->
-<!--                                <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>-->
-<!--                            </template>-->
+                            <template slot-scope="scope">
+                            <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                        </template>
                         </el-table-column>
                         <el-table-column
                                 prop="drafterName"

From b3aae436124ed70acd8f3a2729deb7871a001403 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 14:49:35 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E9=80=82=E7=94=A8=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                | 3 ++-
 .../foreignStandardsAndRegulations/index.vue                 | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 0043f6bc0..84d5db3ed 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1672,7 +1672,7 @@
                     <custom-select-array
                         style="margin-left: -14px"
                         :config="applyArcticOptions"
-                        v-model="sarStandardsSearch['applyArctic']"
+                        v-model="sarStandardsSearch['CLLX']"
                     ></custom-select-array>
                   </template>
 <!--                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">-->
@@ -2305,6 +2305,7 @@ export default {
         standNature: '',//标准性质
         textStatus: '',//文本状态
         synopsis: '', // 内容摘要
+        CLLX: '' // 适用车型
 
 
       }, // 分页查询过程中用到的对象
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index f897487fb..665448eeb 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -619,7 +619,7 @@
                     <custom-select-array
                         :config="applyArcticOptions"
                         style="margin-left: -14px"
-                        v-model="sarStandardsSearch['applyArctic']"
+                        v-model="sarStandardsSearch['CLLX']"
                     ></custom-select-array>
                   </template>
 <!--                  <el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
@@ -1850,7 +1850,8 @@ export default {
         standState: '',
         standNature: '',//标准性质
         synopsis: '', // 内容摘要
-        textStatus: ''//文本状态
+        textStatus: '',//文本状态
+        CLLX: ''
       },
       //高级搜索映射
       advanceSearchMapping: {

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 09/17] =?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 10/17] 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 11/17] 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 12/17] 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 13/17] 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 14/17] 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',

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

---
 .../enterpriseStandardPlan/index.vue                  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 650a9363a..b1ce65a48 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -109,7 +109,7 @@
                                 align="center"
                                 width="150">
                             <template slot-scope="scope">
-                                <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                                <div>{{ getMap1(scope.row.planStatus)}}</div>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -684,6 +684,15 @@
         props: {},
         watch: {},
         methods: {
+            getMap1(item){
+                const map = new Map();
+                map.set('0','未开始')
+                map.set('1','制定中')
+                map.set('2','修订中')
+                map.set('3','已取消')
+                map.set('4','已完成')
+                return map.get(item)
+            },
             TXJGcloseDrawer () {
                 this.TXJGmodal = false
             },

From c5a23d5057b3624721477f3ef5363761b9a0dddb Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 29 Dec 2021 15:58:42 +0800
Subject: [PATCH 16/17] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8F=98=E5=9E=8B=E5=8F=B7=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step4.vue         | 19 ++-----------------
 .../foreignStandardsAndRegulations/index.vue  | 13 +++++++++----
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 78340e107..cd698d361 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -156,13 +156,11 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <cus-tom-data-picker-group
-                    :key="'ssrq'"
                     :config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
                     v-model="form.ssrq"
                     :disabled="false"
                 ></cus-tom-data-picker-group>
                 <cus-tom-data-picker-group
-                    :key="'zccssrq'"
                     :config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
                     v-model="form.zccssrq"
                     :disabled="false"
@@ -184,7 +182,6 @@
               </el-col>
               <el-col :span="12">
                 <cus-tom-data-picker-group
-                    :key="'xcxssrq'"
                     :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
                     v-model="form.xcxssrq"
                     :disabled="false">
@@ -750,7 +747,6 @@
                 <template>
                   <custom-select-array
                       style="margin-left: -12px"
-                      :key="applyArcticOptions.options"
                       :config="applyArcticOptions"
                       v-model="form['cllx']"
                   ></custom-select-array>
@@ -759,7 +755,6 @@
                 <template>
                   <custom-select-array
                       style="margin-left: -12px"
-                      :key="categoryOptions.options"
                       :config="categoryOptions"
                       v-model="form['nylx']"
                   ></custom-select-array>
@@ -868,7 +863,6 @@
                 <!--适用产品线-->
                 <template>
                   <custom-select-array
-                      :key="sycpxOptions.options"
                       style="margin-left: -12px"
                       :config="sycpxOptions"
                       v-model="form['sycpx']"
@@ -888,7 +882,6 @@
                 <!--适用认证-->
                 <template>
                   <custom-select-array
-                      :key="applyAuthOptions.options"
                       style="margin-left: -12px"
                       :config="applyAuthOptions"
                       v-model="form['syrz']"
@@ -948,15 +941,6 @@
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
                   </el-input>
-<!--                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
-<!--                      <el-option-->
-<!--                              v-for="item in wssmrOptions"-->
-<!--                              placeholder="请选择"-->
-<!--                              :key="item.value"-->
-<!--                              :value="item.value"-->
-<!--                              :label="item.label"-->
-<!--                      ></el-option>-->
-<!--                  </el-select>-->
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
                   <el-select v-model="form.cysd" placeholder="请选择我司参与深度">
@@ -1428,6 +1412,7 @@ export default {
   },
   data () {
     return {
+      modalShowRoleFlag: false,
       fileList: [],
       caFileList: [],
       FBGBJBDFileList: [],
@@ -1684,6 +1669,7 @@ export default {
       drawerModal: false,
       nodeList: [],
       selectPeople:'',
+      nodeList2: []
     }
   },
   computed: {
@@ -1803,7 +1789,6 @@ export default {
       }
     },
     choiceZRRS (type, title, id) {
-      console.log('2077',title)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 665448eeb..202f032bc 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1659,7 +1659,7 @@
         :urlChild="urlChild"
         :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
         :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
-      <tree-select-new
+      <tree-select-module
         width="500"
         :lazy=true
         :multiple=true
@@ -1669,7 +1669,9 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
+        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+        @popoverHideCancel="popoverHideModelCancel()">
+      </tree-select-module>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1740,6 +1742,7 @@ import {interfaceUrl} from "@/sysConfig";
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 import store from "@/store";
+import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
 
 
@@ -1765,6 +1768,7 @@ export default {
     CustomDatePickWithText2,
     TreeSelect,
     TreeSelectNew,
+    treeSelectModule,
     ProcessTitle
   },
   data() {
@@ -2587,7 +2591,8 @@ export default {
       this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      if (checkedData) {
+      console.log(checkedData)
+      if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
           this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
@@ -2595,8 +2600,8 @@ export default {
           this.sarStandardsInfoEO.DYBXH = checkedData.model
           this.sarStandardsInfoEO.DYMC = checkedData.name
         }
+        this.modalShowFlag4 = false
       }
-      this.modalShowFlag4 = false
       this.$forceUpdate()
     }, popoverHideModelCancel() {
       this.modalShowFlag4 = false

From 6cfb2f8bc0f6c33f844afe89cd27b064de201f11 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 29 Dec 2021 16:10:51 +0800
Subject: [PATCH 17/17] commit

---
 .../InputForAllStandards.vue                  |   1 +
 .../InputForAllStandards2.vue                 |   1 +
 .../pages/creatProcess/bzjd/step1-6.vue       | 108 +++++++++---------
 .../enterpriseStandardPlan/index.vue          |  37 +++---
 4 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue
index d33c1a176..9e3ef0db1 100644
--- a/src/components/CustomFormComponents/InputForAllStandards.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards.vue
@@ -21,6 +21,7 @@
         size="mini"
         style="position:absolute;top: 10px;right: 0;"
         @click="selectLaws"
+        :disabled="disabled"
         v-if="(processModel && !disabled) || !processModel"
       >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button>
     </el-form-item>
diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue
index 48ffe0938..a69bd111f 100644
--- a/src/components/CustomFormComponents/InputForAllStandards2.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards2.vue
@@ -21,6 +21,7 @@
                     size="mini"
                     style="position:absolute;top: 10px;right: 0;"
                     @click="selectLaws"
+                    :disabled="disabled"
                     v-if="(processModel && !disabled) || !processModel"
             >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button>
         </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index 4ef4b219b..0a73ae122 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -137,8 +137,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="条款号"
@@ -149,8 +149,8 @@
         <el-table-column
                 prop="itemsName"
                 label="条款名称"
-                fixed
                 show-overflow-tooltip
+                fixed
                 align="center">
         </el-table-column>
         <el-table-column
@@ -165,90 +165,91 @@
           </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="complianceRequir"
-          width="150"
-          label="符合项状态"
-          align="center">
-          <template slot-scope="scope">
-            <div v-if="scope.row.complianceRequir === '1'">符合</div>
-            <div v-else>不符合</div>
-          </template>
+                prop="newData"
+                width="180"
+                show-overflow-tooltip
+                label="新车型实施日期"
+                align="center">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
-          prop="complianceState"
-          width="200"
-          label="合规性分析"
-          align="center">
+                prop="onlineData"
+                width="180"
+                show-overflow-tooltip
+                label="在产车型实施日期"
+                align="center">
         </el-table-column>
         <el-table-column
-          prop="newData"
-          width="150"
-          show-overflow-tooltip
-          label="新车型实施日期"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="onlineData"
-          width="150"
-          show-overflow-tooltip
-          label="在产车型实施日期"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="applyArctic"
-          width="150"
-          show-overflow-tooltip
-          label="适用车型"
-          align="center">
+                prop="applyArctic"
+                width="200"
+                label="适用车型"
+                show-overflow-tooltip
+                align="center">
           <template slot-scope="scope">
             {{ scope.row.applyArctic.toString() }}
           </template>
         </el-table-column>
         <el-table-column
-          prop="unitDeptName"
-          label="责任部门"
-          show-overflow-tooltip
-          width="170"
-          align="center">
+                prop="unitDeptName"
+                label="责任部门"
+                width="200"
+                show-overflow-tooltip
+                align="center">
         </el-table-column>
         <el-table-column
-          label="责任人"
-          width="170"
-          prop="zrUserName"
-          align="center">
+                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">
+            {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+                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>
@@ -336,6 +337,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>
@@ -355,6 +357,7 @@ export default {
   name: "bzjdStep1-6",
   data() {
     return {
+      itemsNum: '',
       similarityDegree: '',
       BDmodel: false,
       oldNumber: '',
@@ -422,7 +425,7 @@ export default {
       }, e => {
       })
     },
-    checkBD (id,id2) {
+    checkBD (id,id2,itemsNum) {
       let itemsEoPage = {
         oldItemId: id,
         newItemId: id2,
@@ -434,6 +437,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
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 650a9363a..a62d6235f 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -204,10 +204,10 @@
                                 <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" placeholder="请选择企标类别">
+                                            <el-select :disabled="DrawerType === 'see'" v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
                                                 <el-option
-                                                        v-for="item in standSortOptions"
-                                                        :key="item.value"
+                                                        v-for="(item, index) in standSortOptions"
+                                                        :key="index"
                                                         :value="item.value"
                                                         :label="item.label"
                                                 ></el-option>
@@ -321,7 +321,7 @@
                                         </el-form-item>
                                         <el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex;justify-content: space-between;align-items: center;">
-                                                <el-select v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+                                                <el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
                                                     <el-option
                                                             v-for="item in BZList"
                                                             :key="item.value"
@@ -333,7 +333,7 @@
                                         </el-form-item>
                                         <el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
-                                                <el-radio-group v-model="addForm.isRelate">
+                                                <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
                                                     <el-radio label="是" value="是"></el-radio>
                                                     <el-radio label="否" value="否"></el-radio>
                                                 </el-radio-group>
@@ -343,13 +343,14 @@
                                             <custom-input-for-all-standards
                                                     class="classDisplay"
                                                     :config="{attrName: '采用标准'}"
+                                                    :disabled="DrawerType === 'see'"
                                                     :labelWidth="'180px'"
                                                     v-model="addForm.esStandRelations"
                                             ></custom-input-for-all-standards>
                                         </template>
                                         <el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
-                                                <el-radio-group v-model="addForm.useLevel">
+                                                <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.useLevel">
                                                     <el-radio label="等同" value="等同"></el-radio>
                                                     <el-radio label="修改" value="修改"></el-radio>
                                                     <el-radio label="非等效" value="非等效"></el-radio>
@@ -359,6 +360,7 @@
                                         <el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex;justify-content: space-between;align-items: center;">
                                                 <el-input
+                                                        :disabled="DrawerType === 'see'"
                                                         v-model="addForm.technologic"
                                                         placeholder="请简述技术指标依据">
                                                 </el-input>
@@ -367,6 +369,7 @@
                                         <template>
                                             <custom-input-for-all-standards2
                                                     class="classDisplay"
+                                                    :disabled="DrawerType === 'see'"
                                                     :config="{attrName: '配套标准'}"
                                                     :labelWidth="'180px'"
                                                     v-model="addForm.esMatingRelations"
@@ -707,12 +710,16 @@
                 this.TXJGmodal = false
             },
             choiceTXJG (id) {
-                if (id) {
-                    this.TXJGList = id.split(',')
+                if ( this.DrawerType === 'see') {
+                    return
                 } else {
-                    this.TXJGList = []
+                    if (id) {
+                        this.TXJGList = id.split(',')
+                    } else {
+                        this.TXJGList = []
+                    }
+                    this.TXJGmodal = true
                 }
-                this.TXJGmodal = true
             },
             QYBZcloseDrawer () {
                 this.clearQYBZ()
@@ -757,9 +764,13 @@
                 }
             },
             choiceQYBZ (id) {
-                this.QYBZformSelect = []
-                this.QYBZget()
-                this.QYBZmodal = true
+                if (this.DrawerType === 'see') {
+                    return
+                } else {
+                    this.QYBZformSelect = []
+                    this.QYBZget()
+                    this.QYBZmodal = true
+                }
             },
             drawerCheckZRBM (data) {
                 let list = ''