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 1/9] 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 2/9] =?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 3/9] 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 = ''

From 19890c2559d44501252b2d004cc2fcfef28faec9 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 16:21:29 +0800
Subject: [PATCH 4/9] feat: There is no way the,buss process name

---
 .../pages/creatProcess/qbrk-product/step1.vue |  22 +-
 .../pages/creatProcess/qbrk/step1.vue         | 221 ++++++++++--------
 2 files changed, 141 insertions(+), 102 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index fc1f6205e..dbccea007 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -493,7 +493,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院各中心兼职标准化员/各事业部标准化员" prop="bussUser4Name" placement="top" :color="roleForm.bussUser4Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="标准化初审" prop="bussUser4Name" placement="top" :color="roleForm.bussUser4Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser4Name" style="margin-bottom: 0">
                                         <h4>总院各中心兼职标准化员/各事业部标准化员</h4>
@@ -503,7 +503,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择会签征求意见人员" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="征求意见" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser5Name" style="margin-bottom: 0">
                                         <h4>会签征求意见人员</h4>
@@ -513,7 +513,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择意见汇总及标准修改人员" placement="top" :color="roleForm.bussUser6Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="意见汇总及标准修改" placement="top" :color="roleForm.bussUser6Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser6Name" style="margin-bottom: 0">
                                         <h4>意见汇总及标准修改人员</h4>
@@ -523,7 +523,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院标准法规部产品标准工程师/各事业部标准法规部人员" prop="bussUser7Name" placement="top" :color="roleForm.bussUser7Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="标准化复审" prop="bussUser7Name" placement="top" :color="roleForm.bussUser7Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser7Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部产品标准工程师/各事业部标准法规部人员</h4>
@@ -533,7 +533,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院项目总工/各事业部整车所产品经理" prop="bussUser8Name" placement="top" :color="roleForm.bussUser8Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审核" prop="bussUser8Name" placement="top" :color="roleForm.bussUser8Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser8Name" style="margin-bottom: 0">
                                         <h4>总院项目总工/各事业部整车所产品经理</h4>
@@ -543,7 +543,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择标总院标准法规部高级经理/各事业部标准业务/认证业务经理" prop="bussUser9Name" placement="top" :color="roleForm.bussUser9Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审核" prop="bussUser9Name" placement="top" :color="roleForm.bussUser9Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser9Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部高级经理/各事业部标准业务/认证业务经理</h4>
@@ -553,7 +553,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院标准法规部高级经理/各事业部标准业务/认证业务经理" prop="bussUser10Name" placement="top" :color="roleForm.bussUser10Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审定" prop="bussUser10Name" placement="top" :color="roleForm.bussUser10Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser10Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部高级经理/各事业部标准业务/认证业务经理</h4>
@@ -563,7 +563,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院技术管理中心主任/各事业部主管标准业务高级经理" prop="bussUser11Name" placement="top" :color="roleForm.bussUser11Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审定" prop="bussUser11Name" placement="top" :color="roleForm.bussUser11Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser11Name" style="margin-bottom: 0">
                                         <h4>总院技术管理中心主任/各事业部主管标准业务高级经理</h4>
@@ -573,7 +573,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院平台总监/各事业部研发副总裁" prop="bussUser12Name" placement="top" :color="roleForm.bussUser12Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="批准" prop="bussUser12Name" placement="top" :color="roleForm.bussUser12Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser12Name" style="margin-bottom: 0">
                                         <h4>总院平台总监/各事业部研发副总裁</h4>
@@ -583,7 +583,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院标准法规部产品标准工程师/各事业部标准化员" prop="bussUser13Name" placement="top" :color="roleForm.bussUser13Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="发布" prop="bussUser13Name" placement="top" :color="roleForm.bussUser13Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser13Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部产品标准工程师/各事业部标准化员</h4>
@@ -593,7 +593,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择抄送人员" prop="bussUser14Name" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="抄送" prop="bussUser14Name" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser14Name" style="margin-bottom: 0">
                                         <h4>抄送人员</h4>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 97879e923..f044e431d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -96,7 +96,6 @@
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
                                             type="primary"
-                                            :disabled="true"
                                             :loading="loadSarStandard"
                                             @click="handleSearchStandard">
                                         根据企标编号、企标名称查询
@@ -493,7 +492,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院各中心兼职标准化员/各事业部标准化员" prop="bzhUserName" placement="top" :color="roleForm.bzhUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="标准化初审" prop="bzhUserName" placement="top" :color="roleForm.bzhUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bzhUserName" style="margin-bottom: 0">
                                         <h4>总院各中心兼职标准化员/各事业部标准化员</h4>
@@ -503,7 +502,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择会签征求意见人员" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="征求意见" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="hqUserName" style="margin-bottom: 0">
                                         <h4>会签征求意见人员</h4>
@@ -513,7 +512,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择技术委员会评审/评审意见修改人员" placement="top" :color="roleForm.xdUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="评审/评审意见修改" placement="top" :color="roleForm.xdUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="xdUserName" style="margin-bottom: 0">
                                         <h4>技术委员会评审/评审意见修改人员</h4>
@@ -523,7 +522,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择标准法规部标准化工程师" prop="fggcsUserName" placement="top" :color="roleForm.fggcsUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="复审" prop="fggcsUserName" placement="top" :color="roleForm.fggcsUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="fggcsUserName" style="margin-bottom: 0">
                                         <h4>标准法规部标准化工程师</h4>
@@ -533,7 +532,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择起草单位高级经理" prop="fggcsUserName" placement="top" :color="roleForm.jsfzrUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审核" prop="fggcsUserName" placement="top" :color="roleForm.jsfzrUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="jsfzrUserName" style="margin-bottom: 0">
                                         <h4>起草单位高级经理</h4>
@@ -543,7 +542,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择标准法规部高级经理" prop="bzUserName" placement="top" :color="roleForm.bzUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审核" prop="bzUserName" placement="top" :color="roleForm.bzUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bzUserName" style="margin-bottom: 0">
                                         <h4>标准法规部高级经理</h4>
@@ -553,7 +552,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择起草单位中心主任" prop="fzrUserName" placement="top" :color="roleForm.fzrUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审定" prop="fzrUserName" placement="top" :color="roleForm.fzrUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="fzrUserName" style="margin-bottom: 0">
                                         <h4>起草单位中心主任</h4>
@@ -563,7 +562,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院院长或总院主管副院长" prop="zhrUserName" placement="top" :color="roleForm.zhrUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="批准" prop="zhrUserName" placement="top" :color="roleForm.zhrUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="zhrUserName" style="margin-bottom: 0">
                                         <h4>总院院长或总院主管副院长</h4>
@@ -573,7 +572,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择标准法规部标准化工程师发布人员" prop="pxUserName" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="发布" prop="pxUserName" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="pxUserName" style="margin-bottom: 0">
                                         <h4>标准法规部标准化工程师发布人员</h4>
@@ -792,38 +791,34 @@
                 <div class="content">
                     <div class="standard-table-search">
                         <el-form :model="standardSearchForm" inline class="label-input-form search-area">
-                            <el-form-item label="政策编号" style="margin-right:-20px" prop="lawsNumber" class="search-item" >
-                                <el-input
-                                        v-model="standardSearchForm.lawsNumber"
-                                        clearable placeholder="根据编号查找"
-                                        :maxlength="100"
-                                        @keyup.enter.native="handleSearchStandard"/>
-                            </el-form-item>
-                            <el-form-item label="中文名称" style="margin-right:-20px" prop="lawsName" class="search-item" >
-                                <el-input
-                                        v-model="standardSearchForm.lawsName"
-                                        placeholder="请输入中文名称"
-                                        clearable
-                                        :maxlength="100"></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" style="margin-right:-20px" prop="lawsEnName" class="search-item" >
-                                <el-input
-                                        v-model="standardSearchForm.lawsEnName"
-                                        placeholder="请输入英文名称"
-                                        clearable
-                                        :maxlength="100"></el-input>
-                            </el-form-item>
-                            <el-formItem label="文本状态" prop="lawsTextState" class="search-item">
-                                <el-select v-model="standardSearchForm.lawsTextState" filterable clearable>
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            placeholder="请选择"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
+                            <el-form-item label="计划状态" style="margin-right:-20px" prop="planStatus" class="search-item" >
+                                <el-select v-model="standardSearchForm.planStatus" placeholder="请选择计划状态">
+                                    <el-option label="制定" value="2"></el-option>
+                                    <el-option label="修订" value="1"></el-option>
+                                    <el-option label="完成" value="0"></el-option>
                                 </el-select>
-                            </el-formItem>
+                            </el-form-item>
+                            <el-form-item label="制修订状态" style="margin-right:-20px" prop="reviseStatus" class="search-item" >
+                                <el-select v-model="standardSearchForm.reviseStatus" placeholder="请选择制修订状态">
+                                    <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="企标名称" style="margin-right:-20px" prop="esName" class="search-item" >
+                                <el-input
+                                        v-model="standardSearchForm.esName"
+                                        placeholder="请输入企标名称"
+                                        clearable
+                                        :maxlength="100"></el-input>
+                            </el-form-item>
+                            <el-form-item label="起草责任单位" style="margin-right:-20px" prop="unit" class="search-item" >
+                                <el-input
+                                        v-model="standardSearchForm.unit"
+                                        placeholder="请输入起草责任单位"
+                                        clearable
+                                        :maxlength="100"></el-input>
+                            </el-form-item>
                             <el-form-item>
                                 <el-button
                                         icon="el-icon-search"
@@ -863,41 +858,86 @@
                                     align="center"
                             ></el-table-column>
                             <el-table-column
-                                    label="政策编号"
+                                    prop="bussSort"
+                                    label="企标类别"
                                     align="center"
-                            >
+                                    width="120">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="esName"
+                                    label="企标名称"
+                                    align="center"
+                                    width="120">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="planStatus"
+                                    label="计划状态"
+                                    align="center"
+                                    width="150">
                                 <template slot-scope="scope">
-                                    <a @click="handlePreview(scope.row)">{{ scope.row.lawsNumber }}</a>
+                                    <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
                                 </template>
                             </el-table-column>
                             <el-table-column
-                                    prop="lawsName"
-                                    label="中文名称"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="lawsEnName"
-                                    label="英文名称"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="textStatus"
-                                    label="文本状态"
-                                    align="center">
-                              <template slot-scope="scope">
-                                <span>{{ scope.row.standStatusShow }}</span>
-                              </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center" width="80">
+                                    prop="reviseStatus"
+                                    width="150"
+                                    align="center"
+                                    label="制修订状态">
                                 <template slot-scope="scope">
-                                    <el-button
-                                            class="opera-btn"
-                                            size="mini"
-                                            type="primary"
-                                            @click="handlePreview(scope.row)">查看
-                                    </el-button>
+                                    <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
                                 </template>
                             </el-table-column>
+                            <el-table-column
+                                    prop="drafterName"
+                                    width="120"
+                                    align="center"
+                                    label="起草人">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="resPersonName"
+                                    width="120"
+                                    align="center"
+                                    label="评审责任人">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="wgLeaderName"
+                                    width="120"
+                                    align="center"
+                                    label="工作组组长">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="draftTime"
+                                    width="200"
+                                    align="center"
+                                    label="计划标准初稿完成时间">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    width="200"
+                                    prop="releaseTime"
+                                    align="center"
+                                    label="计划标准发布时间">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    align="center"
+                                    prop="unitName"
+                                    label="起草责任单位">
+                            </el-table-column>
+<!--                            <el-table-column label="操作" align="center" width="80">-->
+<!--                                <template slot-scope="scope">-->
+<!--                                    <el-button-->
+<!--                                            class="opera-btn"-->
+<!--                                            size="mini"-->
+<!--                                            type="primary"-->
+<!--                                            @click="handlePreview(scope.row)">查看-->
+<!--                                    </el-button>-->
+<!--                                </template>-->
+<!--                            </el-table-column>-->
                         </el-table>
                     </div>
                     <pagination
@@ -1059,11 +1099,10 @@
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                     total: 0,
-                    standType: 'INLAND',
-                    standSort: '',
-                    standName: '',
-                    standEnName: '',
-                    standNumber: ''
+                    unit: '',
+                    esName: '',
+                    planStatus: '',
+                    reviseStatus: '',
                 },
                 tableData: {
                     // 标准表格数据
@@ -1751,6 +1790,7 @@
               case 'fbgbjbd':
                 this.getFileList(value,this.FBGBJBDFileList);
                 break;
+
               case 'ssg':
                 this.getFileList(value,this.ssgFileList);
                 break;
@@ -1818,11 +1858,11 @@
                 this.standardCheckedList = data
             },
             handleResetSearch() {
-                this.standardSearchForm.standType = 'BUSINESS'
-                this.standardSearchForm.standNumber = ''
-                this.standardSearchForm.standSort = ''
-                this.standardSearchForm.standName = ''
-                this.standardSearchForm.standEnName = ''
+                this.standardSearchForm.page = 1
+                this.standardSearchForm.unit = ''
+                this.standardSearchForm.esName = ''
+                this.standardSearchForm.planStatus = ''
+                this.standardSearchForm.reviseStatus = ''
                 setTimeout(() => {
                     this.handleSearchStandard()
                 }, 100)
@@ -1836,10 +1876,13 @@
             },
             getDomesticStandardTable () {
                 this.loadSarStandard = true
-                this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => {
+                this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.standardSearchForm, {
+                    _this: this
+                }, res => {
                     this.loadSarStandard = false
                     if (res.ok) {
                         this.tableData.standardData = res.data.list
+                        console.log(this.tableData.standardData)
                         this.standardSearchForm.total = res.data.count
                     }
                 }, e => {
@@ -1847,19 +1890,15 @@
                 })
             },
             handleSearchStandard () {
-                if (this.form.standType === '') {
-                    this.$message.warning('请选择标准来源')
-                } else {
-                    this.standardDrawer = true
-                    this.$nextTick(() => {
-                        // 动态设置表格高度
+                this.standardDrawer = true
+                this.$nextTick(() => {
+                    // 动态设置表格高度
+                    this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+                    window.onresize = () => {
                         this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
-                        window.onresize = () => {
-                            this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
-                        }
-                    })
-                    this.getDomesticStandardTable()
-                }
+                    }
+                })
+                this.getDomesticStandardTable()
             },
             saveUserInfo () {
               this.filterText = ''

From ab3e0db922d40988583be20e0a724148f492d700 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 29 Dec 2021 16:34:54 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=20-=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=20-=201.=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8A=E6=96=B9=E7=9A=84=E2=80=9C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E2=80=9D=EF=BC=8C=E8=AE=BE=E7=BD=AE=E2=80=9C=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E2=80=9D=E2=80=9C=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E2=80=9D=E9=9D=9E=E5=BF=85=E5=A1=AB=EF=BC=88?=
 =?UTF-8?q?=E5=90=A6=E5=88=99=E6=97=A0=E6=B3=95=E5=8D=95=E7=8B=AC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=90=8E=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9=EF=BC=89?=
 =?UTF-8?q?=EF=BC=9B=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=202.=E6=AD=A4=E2=80=9C=E7=BC=96=E8=BE=91=E2=80=9D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E2=80=9C=E6=A0=87=E5=87=86=E6=80=A7=E8=B4=A8=E2=80=9D?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index f897487fb..5056c4522 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -945,22 +945,22 @@
                             placeholder="请输入标准英文名称"
                             clearable></el-input>
                 </el-form-item>
-                <el-form-item prop="standNature" label-width="150px" class="add-form-item">
-                  <template slot="label">标准性质</template>
-                  <el-select v-model="sarStandardsInfoEO.standNature"
-                             placeholder="请选择标准性质"
-                             clearable>
-                    <el-option
-                      v-for="item in standNatureOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                    >
-                      {{ item.label }}
-                    </el-option>
-                  </el-select>
-                </el-form-item>
+<!--                <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
+<!--                  <template slot="label">标准性质</template>-->
+<!--                  <el-select v-model="sarStandardsInfoEO.standNature"-->
+<!--                             placeholder="请选择标准性质"-->
+<!--                             clearable>-->
+<!--                    <el-option-->
+<!--                      v-for="item in standNatureOptions"-->
+<!--                      placeholder="请选择"-->
+<!--                      :key="item.value"-->
+<!--                      :value="item.value"-->
+<!--                      :label="item.label"-->
+<!--                    >-->
+<!--                      {{ item.label }}-->
+<!--                    </el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
                 <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                               prop="standState" label-width="150px" class="add-form-item">
                   <template slot="label">文本状态</template>
@@ -2280,11 +2280,11 @@ export default {
           {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
         ],
         standName: [
-          {required: true, message: '中文名称不能为空', trigger: 'change'},
+          {required: false, message: '中文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
         standEnName: [
-          {required: true, message: '英文名称不能为空', trigger: 'change'},
+          {required: false, message: '英文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
           // {validator: this.verify.valiateEnName, trigger: 'blur'}
         ],

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 6/9] =?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?=
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:{

From 4a48ca8e40c677b40e54dcbe4c25556045e5e3fa Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 29 Dec 2021 17:41:16 +0800
Subject: [PATCH 7/9] feat: There is no way the,buss plan

---
 .../pages/creatProcess/qbrk/step1.vue         | 66 +++++++------------
 .../enterpriseStandardPlan/index.vue          |  4 +-
 2 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index f044e431d..0cb8df5e0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -875,7 +875,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
@@ -949,12 +949,6 @@
                 </div>
             </div>
             <div class="demo-drawer-footer">
-                <el-button
-                        round
-                        class="common-button-primary"
-                        icon="el-icon-check"
-                        type="primary"
-                        @click="handleProcessStandardNext(1)">新增</el-button>
                 <el-button
                         round
                         class="common-button-primary"
@@ -1101,7 +1095,7 @@
                     total: 0,
                     unit: '',
                     esName: '',
-                    planStatus: '',
+                    planStatus: '0,3',
                     reviseStatus: '',
                 },
                 tableData: {
@@ -1206,6 +1200,7 @@
                 countryArr:'',
               commentCycleDate:'',
                 form: {
+                    planId:'',
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
@@ -1343,7 +1338,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                   standEnName: [
                     { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1446,6 +1441,15 @@
           },
         },
         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)
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1736,42 +1740,17 @@
                     // 带入
                     case 2:
                         if (this.standardCheckedList.length === 1) {
-                          this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
-                            _this: this
-                          }, res => {
-                            if(res && res.data){
-                              const bringData = res.data
-
-                              const json = Object.assign(bringData, bringData.attrInfoMap);
-                              this.form = JSON.parse(JSON.stringify(json))
-                              this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : []
-                              this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : []
-                              this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : []
-                              this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : []
-                              this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : []
-                              this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : []
-                              this.form.prcNum = this.prcNum
-                              this.form.prcName = this.prcName
-                              this.form['id'] = bringData.id
-                              this.standardDrawer = false
-                              this.verifySarStandard = true
-                              this.busVsFunc()
-                              this.modelFunc()
-                              this.$forceUpdate()
-                            }
-                            // 遍历对象初始化文件信息
-                            for(const p in this.form) {
-                              if (typeof (this.form[p ]) != "function") {
-                                this.initializeFileList(p,this.form[p]);
-                              }
-                            }
-                            console.log("res",res);
-                          })
+                            this.form.standName = this.standardCheckedList[0].esName
+                            this.form.standSort = this.standardCheckedList[0].bussSort
+                            this.form.planId = this.standardCheckedList[0].id
+                            this.standardDrawer = false
+                            this.verifySarStandard = true
+                            this.$forceUpdate()
 
                         } else if (this.standardCheckedList.length > 1) {
-                            this.$message.warning('最多可以带入一条政策信息')
+                            this.$message.warning('最多可以带入一条计划信息')
                         } else {
-                            this.$message.warning('请选择要带入的政策信息')
+                            this.$message.warning('请选择要带入的计划信息')
                         }
                         break
                     // 取消
@@ -1862,7 +1841,7 @@
                 this.standardSearchForm.unit = ''
                 this.standardSearchForm.esName = ''
                 this.standardSearchForm.planStatus = ''
-                this.standardSearchForm.reviseStatus = ''
+                this.standardSearchForm.reviseStatus = '0,3'
                 setTimeout(() => {
                     this.handleSearchStandard()
                 }, 100)
@@ -1882,7 +1861,6 @@
                     this.loadSarStandard = false
                     if (res.ok) {
                         this.tableData.standardData = res.data.list
-                        console.log(this.tableData.standardData)
                         this.standardSearchForm.total = res.data.count
                     }
                 }, e => {
diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index b1ce65a48..7900f7e05 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -5,6 +5,7 @@
                 <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="0"></el-option>
                             <el-option label="制定中" value="1"></el-option>
                             <el-option label="修订中" value="2"></el-option>
@@ -14,6 +15,7 @@
                     </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="1"></el-option>
                             <el-option label="修订" value="2"></el-option>
                         </el-select>
@@ -118,7 +120,7 @@
                                 align="center"
                                 label="制修订状态">
                             <template slot-scope="scope">
-                            <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                            <div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
                         </template>
                         </el-table-column>
                         <el-table-column

From f704f6d8e87b0ed792dbb7f7a2571212435db7c0 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 29 Dec 2021 17:49:52 +0800
Subject: [PATCH 8/9] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step2.vue  | 1 +
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue  | 1 +
 src/pages/processCenter/pages/creatProcess/bzjd/step4.vue  | 1 +
 src/pages/processCenter/pages/creatProcess/bzjd/step5.vue  | 1 +
 src/pages/processCenter/pages/creatProcess/bzjd/step6.vue  | 2 +-
 .../processCenter/pages/creatProcess/bzzqyj/step1.vue      | 7 ++++++-
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 8a29886b1..0bd81f495 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -485,6 +485,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText = data.commentText
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 3e7de87d4..64051a107 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -857,6 +857,7 @@
                             this.acceptShow = false
                             this.submitShow = true
                         }
+                        this.commentText = data.commentText
                         this.todoId = res.id
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 3fbce2468..1f0ab47e7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -484,6 +484,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText = data.commentText
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 212b770b6..6fb68cad4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -472,6 +472,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText = data.commentText
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index c93f1e9da..cf5303764 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -470,6 +470,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText = data.commentText
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''
@@ -479,7 +480,6 @@
                         }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
-                        console.log(data.itemList);
                         this.itemList = data.itemList
                         this.loading = false
                     }).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 49a58d99f..850227d12 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -236,7 +236,6 @@
                       type="primary"
                       size="mini"
                       class="common-button-primary"
-
                       @click="sarStandCompareHisInfo">查询
                     </el-button>
                     <el-button
@@ -728,6 +727,12 @@ export default {
         this.form.standType = bringData[0].standType
         this.form.standId = bringData[0].id
         this.listModel = false;
+        this.$http.get('SarStandItems/sar-stand-items/getFileType', {
+          standId: bringData[0].id
+        }, res => {
+          console.log(data);
+          console.log(res.data);
+        })
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
       } else {

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

---
 .../pages/creatProcess/qbrk/step1.vue         | 92 ++++++++++++++-----
 1 file changed, 70 insertions(+), 22 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 0cb8df5e0..2c8735abf 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -25,7 +25,7 @@
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standSort" filterable clearable>
+                                    <el-select v-model="form.standSort" filterable clearable :disabled="planDisabled">
                                         <el-option
                                                 v-for="item in standSortOptions"
                                                 placeholder="请选择企标类别"
@@ -35,8 +35,9 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+                                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled" >
                                     <el-input
+                                            :disabled="planDisabled"
                                             v-model="form.standName"
                                             placeholder="请输入中文名称"
                                             clearable
@@ -98,7 +99,7 @@
                                             type="primary"
                                             :loading="loadSarStandard"
                                             @click="handleSearchStandard">
-                                        根据企标编号、企标名称查询
+                                        根据企标名称、起草责任单位查询
                                     </el-button>
                                 </el-form-item>
                                 <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -790,30 +791,31 @@
             <div class="standard-content">
                 <div class="content">
                     <div class="standard-table-search">
-                        <el-form :model="standardSearchForm" inline class="label-input-form search-area">
-                            <el-form-item label="计划状态" style="margin-right:-20px" prop="planStatus" class="search-item" >
-                                <el-select v-model="standardSearchForm.planStatus" placeholder="请选择计划状态">
-                                    <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="制修订状态" style="margin-right:-20px" prop="reviseStatus" class="search-item" >
-                                <el-select v-model="standardSearchForm.reviseStatus" placeholder="请选择制修订状态">
-                                    <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="企标名称" style="margin-right:-20px" prop="esName" class="search-item" >
+                        <el-form :model="standardSearchForm" inline class="label-input-form search-area" style="justify-content:left">
+<!--                            <el-form-item label="计划状态" style="margin-right:-20px" prop="planStatus" class="search-item" >-->
+<!--                                <el-select v-model="standardSearchForm.planStatus" placeholder="请选择计划状态">-->
+<!--                                    <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="制修订状态" style="margin-right:-20px" prop="reviseStatus" class="search-item" >-->
+<!--                                <el-select v-model="standardSearchForm.reviseStatus" placeholder="请选择制修订状态">-->
+<!--                                    <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="企标名称" style="margin-right:20px" prop="esName" class="search-item" >
                                 <el-input
                                         v-model="standardSearchForm.esName"
                                         placeholder="请输入企标名称"
                                         clearable
                                         :maxlength="100"></el-input>
                             </el-form-item>
-                            <el-form-item label="起草责任单位" style="margin-right:-20px" prop="unit" class="search-item" >
+                            <el-form-item label="起草责任单位" style="margin-right:20px" prop="unit" class="search-item" >
                                 <el-input
+                                        style="width:176px"
                                         v-model="standardSearchForm.unit"
                                         placeholder="请输入起草责任单位"
                                         clearable
@@ -1019,6 +1021,27 @@
                 // callback()
             };
 
+            const validateStandName = (rule, value, callback) => {
+                if(this.form.planId === undefined || this.form.planId === null || this.form.planId === ''){
+                    callback(new Error('请先选择企标计划带入企标名称！'))
+                }else if(value === undefined || value === null || value === ''){
+                    callback(new Error('请输入企标名称！'))
+                }else {
+                    callback()
+                }
+            };
+
+            const validateStandSort = (rule, value, callback) => {
+                if(this.form.planId === undefined || this.form.planId === null || this.form.planId === ''){
+                    callback(new Error('请先选择企标计划带入企标类别！'))
+                }else if(value === undefined || value === null || value === ''){
+                    callback(new Error('请选择企标类别！'))
+                }else {
+                    callback()
+                }
+                callback()
+            };
+
             const validateModelName = (rule, value, callback) => {
                 if(this.FBGBUSSFileList.length === 0){
                     callback(new Error('请上传发布稿文件！'))
@@ -1199,8 +1222,10 @@
                 fileType: '',
                 countryArr:'',
               commentCycleDate:'',
+              planDisabled:true,
                 form: {
                     planId:'',
+                    reviseStatus:'',
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
@@ -1325,7 +1350,7 @@
                         { required: true, message: '选择维护模块名称', validator: validateModelName,trigger: 'blur' },
                     ],
                     standSort: [
-                        { required: true, message: '请选择企标类别', trigger: 'change' }
+                        { required: true, validator:validateStandSort,trigger: 'change' }
                     ],
                     standNumber: [
                         { required: true, message: '请输入企标编号', trigger: 'blur' },
@@ -1336,7 +1361,7 @@
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
                     ],
                     standName: [
-                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
+                        { required: true, validator:validateStandName, trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
                         {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
@@ -1743,8 +1768,10 @@
                             this.form.standName = this.standardCheckedList[0].esName
                             this.form.standSort = this.standardCheckedList[0].bussSort
                             this.form.planId = this.standardCheckedList[0].id
+                            this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
                             this.standardDrawer = false
                             this.verifySarStandard = true
+                            this.planDisabled = false
                             this.$forceUpdate()
 
                         } else if (this.standardCheckedList.length > 1) {
@@ -2594,6 +2621,27 @@
                                         }, res => {
                                             if (res.success) {
                                                 this.$message.success(res.message)
+                                                const planForm = {}
+                                                planForm.id = this.form.planId
+                                                planForm.planStatus = this.form.reviseStatus !== undefined ? ( this.form.reviseStatus === '1' ? '1' : '2') :''
+                                                this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, {
+                                                    _this: this
+                                                }, res => {
+                                                    this.submitLoading = false
+                                                    if (res.ok) {
+                                                        if (res.data === '操作成功') {
+                                                            this.addDrawer = false
+                                                            this.$message.success(tips + '成功')
+                                                            this.getData()
+                                                        } else {
+                                                            this.addDrawer = false
+                                                            this.$message.warning(res.data)
+                                                            this.getData()
+                                                        }
+                                                    } else {
+                                                        this.$message.warning(tips + '失败')
+                                                    }
+                                                })
                                                 this.isSubmit = false
                                                 // 流程提交之后，应该流转至待办任务页面
                                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})