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

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -16,7 +16,7 @@
         <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
           <span class="transition-box-span">
-             {{ sarAccessEO.countryArea }}
+             {{ sarAccessEO.countryAreaShow }}
             </span>
         </p>
         <p v-else></p>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -23,7 +23,9 @@
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
                       @mouseleave="mouseleave(data)">
                         <span
-                            :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label }} </span>
+                            :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
+                        <span v-if="node.label.length<15"> {{ node.label}} </span>
+                        <span v-else> {{ node.label.substring(0,15)+'...'}} </span>
                         <span>
                           <el-button
                               type="text"

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -433,7 +433,7 @@
                             label="企标编号"
                             prop="standCode"
                             label-width="150px"
-                            class="add-form-item form-item-disabled"
+                            class="add-form-item"
                     >
                         <el-input
                                 v-model="sarBussionessStandEO.standCode"
@@ -1930,12 +1930,14 @@ export default {
           if(checkedData) {
               if(checkedData.length > 0){
                   this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
                   this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                  this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
               }else {
                   this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code
-                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
                   this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName
+                  this.sarBussionessSearch.VPPSBMBUSS = checkedData.code
+                  this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName
               }
           }
           this.modalShowFlag2 = false
@@ -3401,10 +3403,10 @@ export default {
         this.SarExportSearchEo = item
       }
       // 处理我的收藏和个性化标签传参
-      if (this.selectSarMenu.id === 'wdsc') {
+      if (this.selectSarMenu.id === 'qbwdsc') {
         this.sarBussionessSearch.menuId = undefined
         this.sarBussionessSearch.labelMenuId = undefined
-        this.sarBussionessSearch.collectMenuId = 'wdsc'
+        this.sarBussionessSearch.collectMenuId = 'qbwdsc'
       } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
         this.sarBussionessSearch.menuId = undefined
         this.sarBussionessSearch.labelMenuId = this.selectSarMenu.id

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -21,7 +21,9 @@
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
+                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
+                        <span v-if="node.label.length<15"> {{ node.label}} </span>
+                        <span v-else> {{ node.label.substring(0,15)+'...'}} </span>
                         <span>
                           <el-button
                                   type="text"
@@ -164,7 +166,10 @@
               label="标准号"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+<!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
+<!--                暂时使用-->
+                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+
                 <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>