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

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -440,6 +440,7 @@
                         <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                             <el-input
                                     type="textarea"
+                                    :autosize="{ minRows: 4, maxRows: 14}"
                                     v-model="plForm.changePoint"
                                     placeholder="请输入上一版本差异点"
                                     maxlength="500"

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -448,6 +448,7 @@
             <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
               <el-input
                       type="textarea"
+                      :autosize="{ minRows: 4, maxRows: 14}"
                       v-model="plForm.changePoint"
                       placeholder="请输入上一版本差异点"
                       maxlength="500"

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -319,6 +319,7 @@
                     <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                         <el-input
                                 type="textarea"
+                                :autosize="{ minRows: 4, maxRows: 14}"
                                 v-model="plForm.changePoint"
                                 placeholder="请输入上一版本差异点"
                                 maxlength="500"
@@ -406,6 +407,7 @@
                     <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                         <el-input
                                 type="textarea"
+                                :autosize="{ minRows: 4, maxRows: 14}"
                                 v-model="editForm.changePoint"
                                 placeholder="请输入上一版本差异点"
                                 maxlength="500"

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -1333,6 +1333,15 @@
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
         :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
         @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
+      <tree-select-new
+              :multiple=false
+              :lazy=false
+              :modalShowFlag="modalShowFlag6"
+              drawerTitle="标准体系"
+              width="500"
+              :data="standSystemOptions"
+              :defaultProps="defaultProps"
+              :nodeKey="nodeKey" @popoverHide="TpopoverHide" @popoverHideCancel="TpopoverHideCancel"></tree-select-new>
       <!--      导入失败-->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1604,13 +1613,20 @@
                   </el-form-item>
                   <!--            体系类别-->
                   <el-form-item label="标准体系" class="add-form-item form-item-disabled">
-                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable
+                    <el-input v-model="advanceSearchMapping.TXLB" style="display: none;"></el-input>
-                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                    <el-input v-model="advanceSearchMapping.TXLBName" placeholder="根据标准体系查找"
-                      <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
+                              clearable
-                                 :key="index"
+                              :maxlength="500"
-                                 :label="opt.label">{{ opt.label }}
+                              @click.native="BZTXhandle"
-                      </el-option>
+                              @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
-                    </el-select>
+
+<!--                    <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable-->
+<!--                               @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                      <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"-->
+<!--                                 :key="index"-->
+<!--                                 :label="opt.label">{{ opt.label }}-->
+<!--                      </el-option>-->
+<!--                    </el-select>-->
                   </el-form-item>
                   <!-- 备案日期 -->
                   <el-form-item label="备案日期" class="add-form-item form-item-disabled">
@@ -2155,6 +2171,7 @@ export default {
   },
   data() {
     return {
+      modalShowFlag6: false,
       QCDWValue: [],
       QCDWmodal: false,
       QCDWList: [],
@@ -2388,8 +2405,6 @@ export default {
         textStatus: '',//文本状态
         synopsis: '', // 内容摘要
         CLLX: '' // 适用车型
-
-
       }, // 分页查询过程中用到的对象
 
       //高级搜索映射
@@ -2410,7 +2425,8 @@ export default {
         , CBCD: ''//采标程度
         , YYBJ: ''//引用标准
         , BYYBJ: ''//被引用标准
-        , TXLB: '',//体系类别
+        , TXLB: ''//体系类别
+        , TXLBName: '',
         DYBXH: '',// 模块结构单元变形号
         DYMC: '',//模块结构单元名称
         BARQ: '' //备案日期
@@ -2900,6 +2916,17 @@ export default {
     }
   },
   methods: {
+    BZTXhandle () {
+      this.modalShowFlag6 = true
+    },
+    TpopoverHide (checkedIds, checkedData) {
+      this.advanceSearchMapping.TXLB = checkedData.menuName
+      this.advanceSearchMapping.TXLBName = checkedData.menuName
+      this.modalShowFlag6 = false
+    },
+    TpopoverHideCancel () {
+      this.modalShowFlag6 = false
+    },
     QCDWOK() {
       let arr1 = []
       if (this.sarStandardsInfoEO['QCDW']) {
@@ -4500,6 +4527,7 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
+
       for (let key in this.advanceSearchMapping) {
         const value = this.advanceSearchMapping[key];
         if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
@@ -4523,6 +4551,7 @@ export default {
             type: 'equals',
             value: value
           });
+        } else if (value !== null && value !== '' && (key === 'TXLBName')) {
         } else if (value !== null && value !== '') {
           advanceSearchVOList.push({
             connect: "and",
@@ -4531,7 +4560,6 @@ export default {
             value: value
           });
         }
-
       }
       formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
       this.SarExportSearchEo = formData

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -143,7 +143,7 @@
                         </el-table-column>
                         <el-table-column
                                 prop="draftTime"
-                                width="200"
+                                width="170"
                                 align="center"
                                 label="计划标准初稿完成时间">
                             <template slot-scope="scope">
@@ -151,7 +151,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column
-                                width="200"
+                                width="170"
                                 prop="releaseTime"
                                 align="center"
                                 label="计划标准发布时间">
@@ -160,6 +160,7 @@
                             </template>
                         </el-table-column>
                         <el-table-column
+                                width="180"
                                 align="center"
                                 prop="unitName"
                                 label="起草责任单位">