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

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -163,12 +163,12 @@
                    v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
         </el-button>
         <el-button class="common-button-default"
-                   v-btn-permission="'249aaa052affd5ad579ecffb8fd6b084'"
+                   v-btn-permission="''"
                    size="mini"
                    @click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
         </el-button>
         <el-button class="common-button-default"
-                   v-btn-permission="'7b0ee71c73a89a28e8e754b371e50dde'"
+                   v-btn-permission="''"
                    size="mini"
                    @click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
         </el-button>
@@ -1745,6 +1745,13 @@
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
 
+                  <!--    模块结构单元名称     -->
+                  <el-form-item title="模块结构单元名称" label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYMC" clearable
+                              placeholder="模块结构单元名称"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
+
                 </el-col>
                 <el-col :span="12">
                   <!--            起草单位-->
@@ -1839,6 +1846,12 @@
                               placeholder="关联模块--卡车VPPS中文名称"
                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
                   </el-form-item>
+
+                  <el-form-item title="模块结构单元变型号" label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                    <el-input v-model="advanceSearchMapping.DYBXH" clearable
+                              placeholder="模块结构单元变型号"
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </div>
@@ -2314,7 +2327,9 @@ export default {
         , CBCD: ''//采标程度
         , YYBJ: ''//引用标准
         , BYYBJ: ''//被引用标准
-        , TXLB: ''//体系类别
+        , TXLB: '',//体系类别
+        DYBXH: '',// 模块结构单元变形号
+        DYMC: '',//模块结构单元名称
       },
       // 树形结构
       // tree function

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -132,11 +132,6 @@
             label="责任部门"
             width="180px"
           >
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">
-                {{ zrbmMap[scope.row.zrbm] }}
-              </span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -507,7 +502,6 @@ export default {
       standList1: [],//调取添加的数据
       id: '',//批量删除.
       saveExportType: '',// 导出文件模态框控制，和文件名称
-      zrbmMap: {},
       textStatusMap: {} // 文本状态id与name对应
     }
   },
@@ -975,7 +969,6 @@ export default {
       }, res => {
         this.energyKindOptions = res.data.ENERGYTYPES //适用车型
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-        this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)
         this.showLocalProductData(this.getLocalPro)
       }, e => {