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

src/pages/details/otherStandardDetails/index.vue

@@ -408,12 +408,14 @@
                   </template>
                 </p>
                 <el-button
-                    v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
+                    v-for="itemNam in itemExistList"
+                    v-if="child.attrField === itemNam "
                     @click="showItemsModel(child.attrField)"
                     class="decomposition-btn"
                     icon="icon-separate"
                 >标准分解单
                 </el-button>
+
               </div>
             </div>
 
@@ -519,6 +521,7 @@
       </div>
       <div class="content">
         <el-table
+            @sort-change='sort'
             ref="multipleTable"
             :data="standItemList"
             tooltip-effect="dark"
@@ -535,6 +538,7 @@
               align="center">
           </el-table-column>
           <el-table-column
+              sortable="custom"
               show-overflow-tooltip
               prop="itemsNum"
               label="条款号"
@@ -608,7 +612,6 @@
               width="100">
             <template slot-scope="scope">
               {{scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-'}}
-
             </template>
           </el-table-column>
           <el-table-column
@@ -1237,6 +1240,7 @@ export default {
   },
   data() {
     return {
+      itemExistList:[],
       interpretationContent: '',
       relatedTermsDrawerVisible: false,
       btnLoading: false,
@@ -1264,6 +1268,8 @@ export default {
       knowType: '',
       KnowTitle: '',
       knowIdList: '',
+      order:'',
+      orderBy:'',
       total7: 0,
       page7: 1,
       pageSize7: this.$store.getters.userInfo.configContent,
@@ -2128,6 +2134,8 @@ export default {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
+          this.itemExistList=this.sarStandardsInfoEO.attrInfoMap.itemExistList;
+          console.log("hllo",this.sarStandardsInfoEO);
           if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
             this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
           }
@@ -2348,13 +2356,18 @@ export default {
         }.bind(this)
       })
     },
+    sort(column){
+        this.order=column.order;
+        this.orderBy=column.prop;
+        this.selectSarStandItems();
+    },
     // 分解单----查看标准条款相关
     selectSarStandItems(id, flag) {
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
       this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
         ...this.standItemSearch,
-        pageSize: this.pageSize7, page: this.page7,
+        pageSize: this.pageSize7, page: this.page7,order:this.order,orderBy:this.orderBy
       }, {}, res => {
         this.selectedItemList = []
         if (res.ok) {