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

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3365,7 +3365,7 @@ export default {
             }
             break
           case 'textStatus' :
-            this.orderBy = 5;
+            this.orderBy = 4;
             this.nowOrder = sortObj.column.order
             if (this.nowOrder === 'ascending') {
               this.nowOrder = 2

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

@@ -279,6 +279,7 @@
           border
           class="drag-table"
           :row-class-name="dragRowClassName"
+          @sort-change="sortChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
           @selection-change="standSelectChange"
@@ -793,6 +794,7 @@
               height="100%"
               border
               :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+              @sort-change="sortChangeConfig"
               @selection-change="selectConfigStandChange">
               <el-table-column
                 type="selection"
@@ -1302,6 +1304,9 @@ export default {
   },
   data () {
     return {
+        orderBy: '',
+        nowOrder: '',
+        nowOrderBy: '',
       props: {
         label: 'menuName',
       children: 'children'
@@ -2568,6 +2573,41 @@ export default {
         })
       }
     },
+      // 配置标准-表格排序
+      sortChangeConfig(sortObj) {
+          if (sortObj.column.order !== 'normal') {
+              switch (sortObj.prop) {
+                  case 'issueTime' :
+                      // 后台联调
+                      if (sortObj.order === null) {
+                          this.sarConfigStandSearch.nowOrderBy = ''
+                      } else {
+                          this.sarConfigStandSearch.nowOrderBy = '1'
+                      }
+                      break;
+                  case 'putTime' :
+                      // 后台联调
+                      if (sortObj.order === null) {
+                          this.sarConfigStandSearch.nowOrderBy = ''
+                      } else {
+                          this.sarConfigStandSearch.nowOrderBy = '2'
+                      }
+                      break;
+          }
+              switch (sortObj.order) {
+                  case 'ascending' :
+                      this.sarConfigStandSearch.nowOrder = '2'
+                      break;
+                  case 'descending' :
+                      this.sarConfigStandSearch.nowOrder = '1'
+                      break;
+                  default:
+                      this.sarConfigStandSearch.nowOrder = ''
+                      break;
+              }
+          }
+          this.selectConfiguraStand()
+      },
     // 表格
     selectConfigStandChange (alldata) {
       this.selectConfigStand = []
@@ -3508,34 +3548,38 @@ export default {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
       this.sarBussionessSearch.pageSize = this.$store.getters.userInfo.configContent
+      const data = item || this.lawsStandInfoSearch
+      const formData = {...data}
+      if (!item) {
+            formData.menuId = this.sarBussionessSearch.menuId
+        } else {
+            formData.menuId = this.selectSarMenu.id
+       }
       if (nodeId !== undefined) {
-        this.sarBussionessSearch.menuId = nodeId
+          formData.menuId = nodeId
       }
       if (this.sarBussionessSearch.menuId == null || this.sarBussionessSearch.menuId === '') {
         if (this.countRootId === 1) {
-          this.sarBussionessSearch.menuId = this.parentNode.id
+            formData.menuId = this.parentNode.id
         }
       }
-      // this.SarExportSearchEo = item === null || item === undefined || item === '' ? this.sarBussionessSearch : item
-      if (!item) {
-        this.SarExportSearchEo = this.sarBussionessSearch
-      } else {
-        this.SarExportSearchEo = item
-      }
       // 处理我的收藏和个性化标签传参
       if (this.selectSarMenu.id === 'qbwdsc') {
-        this.sarBussionessSearch.labelMenuId = undefined
+          formData.labelMenuId = undefined
-        this.sarBussionessSearch.menuId = 'qbwdsc'
+          formData.menuId = 'qbwdsc'
-        this.sarBussionessSearch.collectMenuId = 'qbwdsc'
+          formData.collectMenuId = 'qbwdsc'
       } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
-        this.sarBussionessSearch.menuId = undefined
+          formData.menuId = undefined
-        this.sarBussionessSearch.labelMenuId = this.selectSarMenu.id
+          formData.labelMenuId = this.selectSarMenu.id
-        this.sarBussionessSearch.collectMenuId = undefined
+          formData.collectMenuId = undefined
       } else {
-        this.sarBussionessSearch.labelMenuId = undefined
+          formData.labelMenuId = undefined
-        this.sarBussionessSearch.collectMenuId = undefined
+          formData.collectMenuId = undefined
       }
-        this.sarBussionessSearch.userId = this.$store.getters.userInfo.userId
+        // 排序
+        formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
+        formData.nowOrder = this.nowOrder
+        formData.userId = this.$store.getters.userInfo.userId
         if(type === 'sel'){
             const advanceSearchVOList = [];
             if(this.formFieldListData !== undefined && this.formFieldListData !== null){
@@ -3553,9 +3597,10 @@ export default {
                     }
                 })
             }
-            this.sarBussionessSearch.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+            formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
         }
-      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', !item ? this.sarBussionessSearch : item, {
+        this.SarExportSearchEo = formData
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {
         _this: this, loading: 'loading'
       }, res => {
         for (let i = 0; i < res.data.list.length; i++) {
@@ -3583,6 +3628,48 @@ export default {
     dragRowClassName (row, index) {
       return 'drag-row' + ' ' + 'id=' + row.row.id
     },
+      // 表格排序
+      sortChange(sortObj) {
+          if (sortObj.column.order !== 'normal') {
+              this.nowOrder = ''
+              this.orderBy = ''
+              switch (sortObj.column.property) {
+                  case 'issueTime' :
+                      // 后台联调
+                      this.orderBy = 1;
+                      this.nowOrder = sortObj.column.order
+                      if (this.nowOrder === 'ascending') {
+                          this.nowOrder = 2
+                      } else if (this.nowOrder === 'descending') {
+                          this.nowOrder = 1
+                      }
+                      break
+                  case 'putTime' :
+                      // 后台联调
+                      this.orderBy = 2;
+                      this.nowOrder = sortObj.column.order
+                      if (this.nowOrder === 'ascending') {
+                          this.nowOrder = 2
+                      } else if (this.nowOrder === 'descending') {
+                          this.nowOrder = 1
+                      }
+                      break
+                  case 'standStatusShow' :
+                      this.orderBy = 3;
+                      this.nowOrder = sortObj.column.order
+                      if (this.nowOrder === 'ascending') {
+                          this.nowOrder = 2
+                      } else if (this.nowOrder === 'descending') {
+                          this.nowOrder = 1
+                      }
+                      break
+              }
+          }
+          // this.getDomesticStandardTable(this.tableFlag)
+          //搜索后排序,应该以被搜索后的数据排序
+          this.getBussionStandTable(this.sarBussionessSearch)
+
+      },
     // 修改成表格样式后，选择项勾选改变
     standSelectChange (data) {
       this.selectedList = []
@@ -3895,7 +3982,6 @@ export default {
         applyArctic: formData.applyArctic
       }
       formData['attrSearchStr'] = JSON.stringify(attrSearchMap)
-      this.SarExportSearchEo = item || this.sarBussionessSearch
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
       }, res => {

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -177,6 +177,7 @@
                 border
                 class="drag-table"
                 :row-class-name="dragRowClassName"
+                @sort-change="sortChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
                 @selection-change="standSelectChange"
@@ -766,6 +767,7 @@
                     height="100%"
                     border
                     :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                    @sort-change="sortChangeConfig"
                     @selection-change="selectConfigStandChange">
               <el-table-column
                       type="selection"
@@ -1346,6 +1348,9 @@
     },
     data () {
       return {
+        orderBy: '',
+        nowOrder: '',
+        nowOrderBy: '',
           pickerOptions: {
               shortcuts: [{
                   text: '最近一周',
@@ -3638,32 +3643,28 @@
           item.pageSize = this.$store.getters.userInfo.configContent
         }
         this.lawsStandInfoSearch.pageSize = this.$store.getters.userInfo.configContent
+        const data = item || this.lawsStandInfoSearch
+        const formData = {...data}
         if (nodeId !== undefined) {
-          this.lawsStandInfoSearch.menuId = nodeId
+          formData.menuId = nodeId
         }
         if ( (this.lawsStandInfoSearch.menuId == null || this.lawsStandInfoSearch.menuId === '') && this.selectSarMenu.id) {
-            this.lawsStandInfoSearch.menuId = this.selectSarMenu.id
+          formData.menuId = this.selectSarMenu.id
-        }
-        // this.SarExportSearchEo = item === null || item === undefined || item === '' ? this.lawsStandInfoSearch : item
-        if (!item) {
-          this.SarExportSearchEo = this.lawsStandInfoSearch
-        } else {
-          this.SarExportSearchEo = item
         }
         // 处理我的收藏和个性化标签传参
         if (this.selectSarMenu.id === 'qbwdsc') {
-          this.lawsStandInfoSearch.labelMenuId = undefined
+          formData.labelMenuId = undefined
-          this.lawsStandInfoSearch.menuId = 'qbwdsc'
+          formData.menuId = 'qbwdsc'
-          this.lawsStandInfoSearch.collectMenuId = 'qbwdsc'
+          formData.collectMenuId = 'qbwdsc'
         } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
-          this.lawsStandInfoSearch.menuId = undefined
+          formData.menuId = undefined
-          this.lawsStandInfoSearch.labelMenuId = this.selectSarMenu.id
+          formData.labelMenuId = this.selectSarMenu.id
-          this.lawsStandInfoSearch.collectMenuId = undefined
+          formData.collectMenuId = undefined
         } else {
-          this.lawsStandInfoSearch.labelMenuId = undefined
+          formData.labelMenuId = undefined
-          this.lawsStandInfoSearch.collectMenuId = undefined
+          formData.collectMenuId = undefined
         }
-        this.lawsStandInfoSearch.userId = this.$store.getters.userInfo.userId
+        formData.userId = this.$store.getters.userInfo.userId
         if(type === 'sel'){
           const advanceSearchVOList = [];
           if(this.formFieldListData !== undefined && this.formFieldListData !== null){
@@ -3681,13 +3682,14 @@
               }
             })
           }
-          this.lawsStandInfoSearch.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+          formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
           if(this.commentCycleDate && this.commentCycleDate.length === 2){
-            this.lawsStandInfoSearch.commentCycleStart = this.commentCycleDate[0]
+            formData.commentCycleStart = this.commentCycleDate[0]
-            this.lawsStandInfoSearch.commentCycleEnd = this.commentCycleDate[1]
+            formData.commentCycleEnd = this.commentCycleDate[1]
           }
         }
-        this.$http.get('lawss/sarLawsInfo/page', !item ? this.lawsStandInfoSearch : item, {
+        this.SarExportSearchEo = formData
+        this.$http.get('lawss/sarLawsInfo/page', formData, {
           _this: this, loading: 'loading'
         }, res => {
           for (let i = 0; i < res.data.list.length; i++) {
@@ -3715,6 +3717,83 @@
       dragRowClassName (row, index) {
         return 'drag-row' + ' ' + 'id=' + row.row.id
       },
+      // 配置标准-表格排序
+      sortChangeConfig(sortObj) {
+        if (sortObj.column.order !== 'normal') {
+          switch (sortObj.prop) {
+            case 'issueTime' :
+              // 后台联调
+              if (sortObj.order === null) {
+                this.sarConfigStandSearch.nowOrderBy = ''
+              } else {
+                this.sarConfigStandSearch.nowOrderBy = '1'
+              }
+              break;
+            case 'XCXSSRQLAWS' :
+              // 后台联调
+              if (sortObj.order === null) {
+                this.sarConfigStandSearch.nowOrderBy = ''
+              } else {
+                this.sarConfigStandSearch.nowOrderBy = '2'
+              }
+              break;
+          }
+          switch (sortObj.order) {
+            case 'ascending' :
+              this.sarConfigStandSearch.nowOrder = '2'
+              break;
+            case 'descending' :
+              this.sarConfigStandSearch.nowOrder = '1'
+              break;
+            default:
+              this.sarConfigStandSearch.nowOrder = ''
+              break;
+          }
+        }
+        this.selectConfiguraStand()
+      },
+      // 表格排序
+      sortChange(sortObj) {
+        if (sortObj.column.order !== 'normal') {
+          this.nowOrder = ''
+          this.orderBy = ''
+          switch (sortObj.column.property) {
+            case 'issueTime' :
+              // 后台联调
+              this.orderBy = 1;
+              this.nowOrder = sortObj.column.order
+              if (this.nowOrder === 'ascending') {
+                this.nowOrder = 2
+              } else if (this.nowOrder === 'descending') {
+                this.nowOrder = 1
+              }
+              break
+            case 'putTime' :
+              // 后台联调
+              this.orderBy = 2;
+              this.nowOrder = sortObj.column.order
+              if (this.nowOrder === 'ascending') {
+                this.nowOrder = 2
+              } else if (this.nowOrder === 'descending') {
+                this.nowOrder = 1
+              }
+              break
+            case 'standStatusShow' :
+              this.orderBy = 3;
+              this.nowOrder = sortObj.column.order
+              if (this.nowOrder === 'ascending') {
+                this.nowOrder = 2
+              } else if (this.nowOrder === 'descending') {
+                this.nowOrder = 1
+              }
+              break
+          }
+        }
+        // this.getDomesticStandardTable(this.tableFlag)
+        //搜索后排序,应该以被搜索后的数据排序
+        this.getDomesticStandardTable(this.lawsStandInfoSearch)
+
+      },
       // 修改成表格样式后，选择项勾选改变
       standSelectChange (data) {
         this.selectedList = []
@@ -4009,6 +4088,11 @@
         this.lawsStandInfoSearch.pageSize = this.$store.getters.userInfo.configContent
         const data = item || this.lawsStandInfoSearch
         const formData = {...data}
+        if (!item) {
+          formData.menuId = this.sarBussionessSearch.menuId
+        } else {
+          formData.menuId = this.selectSarMenu.id
+        }
         formData.menuId = this.selectSarMenu.id
         // 处理我的收藏和个性化标签传参
         if (this.selectSarMenu.id === 'wdsc') {
@@ -4027,7 +4111,10 @@
           applyArctic: formData.applyArctic
         }
         formData['attrSearchStr'] = JSON.stringify(attrSearchMap)
-        this.SarExportSearchEo = item || this.lawsStandInfoSearch
+        // 排序
+        formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
+        formData.nowOrder = this.nowOrder
+        this.SarExportSearchEo = formData
         this.$http.get('lawss/sarLawsInfo/page', formData, {
           _this: this, loading: 'loading'
         }, res => {