Merge remote-tracking branch 'origin/develop' into develop

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 || ''

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

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 || ''

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 || ''

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 => {

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 {

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>

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
@@ -96,10 +97,9 @@
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
                                             type="primary"
-                                            :disabled="true"
                                             :loading="loadSarStandard"
                                             @click="handleSearchStandard">
-                                        根据企标编号、企标名称查询
+                                        根据企标名称、起草责任单位查询
                                     </el-button>
                                 </el-form-item>
                                 <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -493,7 +493,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 +503,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 +513,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 +523,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 +533,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 +543,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 +553,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 +563,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 +573,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>
@@ -791,39 +791,36 @@
             <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 :model="standardSearchForm" inline class="label-input-form search-area" style="justify-content:left">
-                            <el-form-item label="政策编号" style="margin-right:-20px" prop="lawsNumber" class="search-item" >
+<!--                            <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.lawsNumber"
+                                        v-model="standardSearchForm.esName"
-                                        clearable placeholder="根据编号查找"
+                                        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-form-item label="起草责任单位" style="margin-right:20px" prop="unit" class="search-item" >
                                 <el-input
-                                        v-model="standardSearchForm.lawsEnName"
+                                        style="width:176px"
-                                        placeholder="请输入英文名称"
+                                        v-model="standardSearchForm.unit"
+                                        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-select>
-                            </el-formItem>
                             <el-form-item>
                                 <el-button
                                         icon="el-icon-search"
@@ -863,41 +860,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>{{ getMap1(scope.row.planStatus)}}</div>
                                 </template>
                             </el-table-column>
                             <el-table-column
-                                    prop="lawsName"
+                                    prop="reviseStatus"
-                                    label="中文名称"
+                                    width="150"
-                                    align="center">
+                                    align="center"
-                            </el-table-column>
+                                    label="制修订状态">
-                            <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">
                                 <template slot-scope="scope">
-                                    <el-button
+                                    <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
-                                            class="opera-btn"
-                                            size="mini"
-                                            type="primary"
-                                            @click="handlePreview(scope.row)">查看
-                                    </el-button>
                                 </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
@@ -909,12 +951,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"
@@ -985,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('请上传发布稿文件！'))
@@ -1059,11 +1116,10 @@
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                     total: 0,
-                    standType: 'INLAND',
+                    unit: '',
-                    standSort: '',
+                    esName: '',
-                    standName: '',
+                    planStatus: '0,3',
-                    standEnName: '',
+                    reviseStatus: '',
-                    standNumber: ''
                 },
                 tableData: {
                     // 标准表格数据
@@ -1166,7 +1222,10 @@
                 fileType: '',
                 countryArr:'',
               commentCycleDate:'',
+              planDisabled:true,
                 form: {
+                    planId:'',
+                    reviseStatus:'',
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
@@ -1291,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' },
@@ -1302,9 +1361,9 @@
                         { 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.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                   standEnName: [
                     { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1407,6 +1466,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)
@@ -1697,42 +1765,19 @@
                     // 带入
                     case 2:
                         if (this.standardCheckedList.length === 1) {
-                          this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
+                            this.form.standName = this.standardCheckedList[0].esName
-                            _this: this
+                            this.form.standSort = this.standardCheckedList[0].bussSort
-                          }, res => {
+                            this.form.planId = this.standardCheckedList[0].id
-                            if(res && res.data){
+                            this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
-                              const bringData = res.data
+                            this.standardDrawer = false
-
+                            this.verifySarStandard = true
-                              const json = Object.assign(bringData, bringData.attrInfoMap);
+                            this.planDisabled = false
-                              this.form = JSON.parse(JSON.stringify(json))
+                            this.$forceUpdate()
-                              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);
-                          })
 
                         } else if (this.standardCheckedList.length > 1) {
-                            this.$message.warning('最多可以带入一条政策信息')
+                            this.$message.warning('最多可以带入一条计划信息')
                         } else {
-                            this.$message.warning('请选择要带入的政策信息')
+                            this.$message.warning('请选择要带入的计划信息')
                         }
                         break
                     // 取消
@@ -1751,6 +1796,7 @@
               case 'fbgbjbd':
                 this.getFileList(value,this.FBGBJBDFileList);
                 break;
+
               case 'ssg':
                 this.getFileList(value,this.ssgFileList);
                 break;
@@ -1818,11 +1864,11 @@
                 this.standardCheckedList = data
             },
             handleResetSearch() {
-                this.standardSearchForm.standType = 'BUSINESS'
+                this.standardSearchForm.page = 1
-                this.standardSearchForm.standNumber = ''
+                this.standardSearchForm.unit = ''
-                this.standardSearchForm.standSort = ''
+                this.standardSearchForm.esName = ''
-                this.standardSearchForm.standName = ''
+                this.standardSearchForm.planStatus = ''
-                this.standardSearchForm.standEnName = ''
+                this.standardSearchForm.reviseStatus = '0,3'
                 setTimeout(() => {
                     this.handleSearchStandard()
                 }, 100)
@@ -1836,7 +1882,9 @@
             },
             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
@@ -1847,19 +1895,15 @@
                 })
             },
             handleSearchStandard () {
-                if (this.form.standType === '') {
+                this.standardDrawer = true
-                    this.$message.warning('请选择标准来源')
+                this.$nextTick(() => {
-                } else {
+                    // 动态设置表格高度
-                    this.standardDrawer = true
+                    this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
-                    this.$nextTick(() => {
+                    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 = ''
@@ -2577,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'})

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
       }
     },

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="1"></el-option>
-               <el-option label="制定中" value="制定中"></el-option>
+               <el-option label="修订" value="2"></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">
@@ -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
       }
     },

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');

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-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-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-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.planStatus1 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
-          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+            (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.planStatus2 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
-            this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+              (this.selectList[0] === '3'? '已取消' : '已完成')))
+            this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
             this.standShow2 = true
           }
         }

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
       }
     },

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:{

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,

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:{

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:{

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:{

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:{

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