From 16c9c664b0a28e0943cea033231104843ac890ef 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 17:01:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/cancel.vue            | 41 +++++++++----
 .../qbzxdjhgk/component/delay.vue             | 46 ++++++++++-----
 .../qbzxdjhgk/component/establish.vue         | 57 ++++++-------------
 .../qbzxdjhgk/component/merge.vue             | 57 ++++++++++++-------
 .../qbzxdjhgk/component/rename.vue            | 46 ++++++++++-----
 .../pages/creatProcess/qbzxdjhgk/step1-5.vue  | 17 +++++-
 .../pages/creatProcess/qbzxdjhgk/step1.vue    |  1 -
 .../pages/creatProcess/qbzxdjhgk/step2.vue    | 16 +++++-
 .../pages/creatProcess/qbzxdjhgk/step3.vue    | 17 +++++-
 .../pages/creatProcess/qbzxdjhgk/step4.vue    | 17 +++++-
 .../pages/creatProcess/qbzxdjhgk/step5.vue    | 17 +++++-
 11 files changed, 222 insertions(+), 110 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 91ba66aff..e51337005 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -22,6 +22,16 @@
                 clearable
               ></el-input>
             </el-form-item>
+            <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+                <el-option
+                  v-for="(item, index) in standSortOptions"
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -54,11 +64,11 @@
                 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-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="请输入企业标准"
+                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">
@@ -199,9 +209,8 @@
                 </el-form-item>
                 <el-form-item label="制修订状态" class="search-item search-item-last">
                   <el-select v-model="standardSearch.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 class="search-item btn-box">
@@ -248,7 +257,8 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -256,7 +266,7 @@
                 align="center"
                 label="制修订状态">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                  <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -326,6 +336,9 @@ export default {
   data(){
     return{
       formRules: {
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         cancelReason: [
           {required: true, message: '请输入取消原因', trigger:'blur'},
         ]
@@ -334,6 +347,7 @@ export default {
       ListModel: false,
       standinfoList: [],
       BZList: [],
+      standSortOptions: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -376,6 +390,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods: {
@@ -432,22 +447,28 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
+          (this.selectList[0] === '3'? '已取消' : '已完成')))
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+        this.qbfsForm.reviseStatus = 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(',')
         }
+        if(this.selectList[0].bussSort){
+          this.qbfsForm.bussSort = this.selectList[0].bussSort.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
+        if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
+          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 63da88cbe..2b0953c9e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -22,6 +22,16 @@
                clearable
              ></el-input>
            </el-form-item>
+           <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+             <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+               <el-option
+                 v-for="(item, index) in standSortOptions"
+                 :key="index"
+                 :value="item.value"
+                 :label="item.label">
+               </el-option>
+             </el-select>
+           </el-form-item>
            <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
              <el-input
                readonly
@@ -32,9 +42,8 @@
            </el-form-item>
            <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
              <el-select disabled 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="1"></el-option>
+               <el-option label="修订" value="2"></el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -54,11 +63,11 @@
                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-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="请输入企业标准"
+               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">
@@ -216,9 +225,8 @@
                </el-form-item>
                <el-form-item label="制修订状态" class="search-item search-item-last">
                  <el-select  v-model="standardSearch.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 class="search-item btn-box">
@@ -265,7 +273,8 @@
                label="计划状态"
                align="center">
                <template slot-scope="scope">
-                 <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                 <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+                   (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
                </template>
              </el-table-column>
              <el-table-column
@@ -273,7 +282,7 @@
                align="center"
                label="制修订状态">
                <template slot-scope="scope">
-                 <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                 <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
                </template>
              </el-table-column>
              <el-table-column
@@ -343,7 +352,11 @@ export default {
   data(){
     return{
       BZList: [],
+      standSortOptions: [],
       formRules: {
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         yqDraftTime: [
           { required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' },
         ],
@@ -398,6 +411,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods: {
@@ -455,22 +469,28 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
+          (this.selectList[0] === '3'? '已取消' : '已完成')))
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+        this.qbfsForm.reviseStatus = 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(',')
         }
+        if(this.selectList[0].bussSort){
+          this.qbfsForm.bussSort = this.selectList[0].bussSort.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
+        if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
+          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 a952cac68..23c33f0ad 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -11,6 +11,16 @@
           clearable
         ></el-input>
       </el-form-item>
+      <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+          <el-option
+            v-for="(item, index) in standSortOptions"
+            :key="index"
+            :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 form-item-disabled">
         <el-input
           v-model="qbfsForm.esName"
@@ -74,7 +84,7 @@
                   @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-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">
@@ -82,7 +92,7 @@
         <el-input
           clearable
           v-model="qbfsForm.rqbName"
-          placeholder="请选择企业标准"
+          placeholder="请选择被修订标准代号"
           readonly
           @click.native="choiceQYBZ">
         </el-input>
@@ -349,6 +359,7 @@ export default {
       modalshowflag: false,
       nodeList2: [],
       nodeList: [],
+      standSortOptions: [],
       BZList: [],
       qcdwOptions: [],
       qbfsForm: {
@@ -372,46 +383,13 @@ export default {
         newReason: "" //新增原因
         // remarks: '', // 备注
       },
-      useOptions: [
-        {
-          value: "ISO",
-          label: "ISO"
-        }, {
-          value: "ESE",
-          label: "ESE"
-        }, {
-          value: "EC/EEC",
-          label: "EC/EEC"
-        }, {
-          value: "IEC",
-          label: "IEC"
-        }, {
-          value: "GB",
-          label: "GB"
-        }, {
-          value: "GB/T",
-          label: "GB/T"
-        }, {
-          value: "QC/T",
-          label: "QC/T"
-        }, {
-          value: "JT/T",
-          label: "JT/T"
-        }, {
-          value: "HJ",
-          label: "HJ"
-        }, {
-          value: "TB",
-          label: "团标"
-        },{
-          value: "QT",
-          label: "其他"
-        },
-        ],
       qbfsFormRules: {
         unit: [
           { required: true, message: "请选择起草单位", trigger: "change" }
         ],
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         esName: [
           { required: true, message: "请输入企标名称", trigger: "blur" }
         ],
@@ -464,6 +442,7 @@ export default {
        _this: this
      }, res => {
        this.BZList = res.data.ENERGYTYPES //标准范围
+       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
        this.standSystemOptions = res.data.TXLBBUSS // 体系结构
        this.qcdwOptions = res.data.QCDW // 起草单位
      })
@@ -646,8 +625,6 @@ export default {
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
 #establish {
-  height: 100%;
-  background: #fff;
   .classDisplay {
     /deep/.el-form-item__content {
       width: calc(~'100% - 180px');
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index c57d0d1d7..fb1329fd4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -53,6 +53,16 @@
                 clearable
               ></el-input>
             </el-form-item>
+            <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+                <el-option
+                  v-for="(item, index) in standSortOptions"
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.esName"
@@ -62,9 +72,8 @@
             </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 label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -87,7 +96,7 @@
                         @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-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">
@@ -95,7 +104,7 @@
               <el-input
                 clearable
                 v-model="qbfsForm.rqbName"
-                placeholder="请选择企业标准"
+                placeholder="请选择被修订标准代号"
                 readonly
                 @click.native="choiceQYBZ">
               </el-input>
@@ -127,11 +136,13 @@
 
           </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">
-              <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 label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
@@ -213,9 +224,8 @@
                 </el-form-item>
                 <el-form-item label="制修订状态" class="search-item search-item-last">
                   <el-select v-model="standardSearch.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 class="search-item btn-box">
@@ -262,7 +272,8 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -270,7 +281,7 @@
                 align="center"
                 label="制修订状态">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                  <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -496,6 +507,8 @@ export default {
         label: 'menuName'
       },
       TXJGList: [],
+      BZList: [],
+      standSortOptions: [],
       QYBZList: [],
       QYBZformSelect: [],
       standSystemOptions: [],
@@ -528,6 +541,9 @@ export default {
       pageSize: this.$store.getters.userInfo.configContent,
       selectList: [],
       qbfsFormRules: {
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         esName1: [
           {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
         ],
@@ -616,6 +632,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
       this.standSystemOptions = res.data.TXLBBUSS // 体系结构
       this.qcdwOptions = res.data.QCDW // 起草单位
     })
@@ -825,8 +842,9 @@ export default {
         if(this.showType === 'one'){
           this.qbfsForm.esId1 = this.selectList[0].id || '--'
           this.qbfsForm.esName1 = this.selectList[0].esName || '--'
-          this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
-          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+          this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
+            (this.selectList[0] === '3'? '已取消' : '已完成')))
+          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
           this.standShow = true
         }else{
           if(this.qbfsForm.esName1 === this.selectList[0].esName ){
@@ -834,8 +852,9 @@ export default {
           }else{
             this.qbfsForm.esId2 = this.selectList[0].id || '--'
             this.qbfsForm.esName2 = this.selectList[0].esName || '--'
-            this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
-            this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+            this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
+              (this.selectList[0] === '3'? '已取消' : '已完成')))
+            this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
             this.standShow2 = true
           }
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 8fe1d1227..6d859619d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -22,6 +22,16 @@
                 clearable
               ></el-input>
             </el-form-item>
+            <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+                <el-option
+                  v-for="(item, index) in standSortOptions"
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -32,9 +42,8 @@
             </el-form-item>
             <el-form-item prop="reviseStatus"  label="制修订状态" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
               <el-select disabled  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 label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -54,11 +63,11 @@
                 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-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="请输入企业标准"
+                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">
@@ -207,9 +216,8 @@
                 </el-form-item>
                 <el-form-item label="制修订状态" class="search-item search-item-last">
                   <el-select v-model="standardSearch.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 class="search-item btn-box">
@@ -256,7 +264,8 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -264,7 +273,7 @@
                 align="center"
                 label="制修订状态">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                  <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -334,6 +343,9 @@ export default {
   data(){
     return{
       formRules: {
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         renameEs: [
           {required: true, message: '请输入更名后企标名称', trigger:'blur'},
         ],
@@ -345,6 +357,7 @@ export default {
       ListModel: false,
       standinfoList: [],
       BZList: [],
+      standSortOptions: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -385,6 +398,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods: {
@@ -441,22 +455,28 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
+          (this.selectList[0] === '3'? '已取消' : '已完成')))
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+        this.qbfsForm.reviseStatus = 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(',')
         }
+        if(this.selectList[0].bussSort){
+          this.qbfsForm.bussSort = this.selectList[0].bussSort.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
+        if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
+          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 dbde6d77d..29c7e88bd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :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 form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               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-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="请输入企业标准"
+              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">
@@ -348,7 +358,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      standSortOptions: [],
     }
   },
   mounted() {
@@ -359,6 +369,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index c0f297174..8f696fab7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -455,7 +455,6 @@ 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 61f5b6413..ee883d1ed 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :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 form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               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-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="请输入企业标准"
+              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">
@@ -335,6 +345,7 @@ export default {
   data(){
     return {
       BZList: [],
+      standSortOptions: [],
       active: '1',
       type: '',
       commentText: '',
@@ -359,6 +370,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
index b9b2737fc..7c3edf08b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :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 form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               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-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="请输入企业标准"
+              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">
@@ -346,7 +356,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      standSortOptions: [],
     }
   },
   mounted() {
@@ -357,6 +367,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
index 1129be8e7..b87aaa715 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :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 form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               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-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="请输入企业标准"
+              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">
@@ -348,7 +358,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      standSortOptions: [],
     }
   },
   mounted() {
@@ -359,6 +369,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
index 936a1db64..0854c961e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :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 form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               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-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="请输入企业标准"
+              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">
@@ -348,7 +358,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      standSortOptions: [],
     }
   },
   mounted() {
@@ -359,6 +369,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{