Quellcode durchsuchen

fix:补充文件信息查阅排序逻辑特殊处理

liujiayin vor 2 Jahren
Ursprung
Commit
79a6dfacf3

+ 7 - 3
src/views/infosManage/externalFiles/externalFiles.vue

@@ -25,12 +25,13 @@
         <template v-else>
           <ibps-crud key="istree"
                      ref="crud"
-                     :data="selectListData"
+                     :data="listData"
                      :toolbars="listConfig.toolbars"
                      :search-form="listConfig.searchForm"
                      :pk-key="pkKey"
                      :columns="listConfig.columns"
                      :loading="loading"
+                     :pagination="pagination"
                      @sort-change="handleSortChange"
                      @action-event="handleAction"
                      @pagination-change="handlePaginationChange">
@@ -85,6 +86,7 @@ export default {
       },
       pkKey: 'id', // 主键  如果主键不是pk需要传主键
       loading: false,
+      listData: [],
       selectListData: [],
       listTreeData: [],
       bianlistData: {
@@ -176,7 +178,9 @@ export default {
       }
       if (sorts.sorts) {
         if (JSON.stringify(sorts.sorts) !== "{}") {
-          wheres = wheres + ` order by  ${Object.keys(sorts.sorts)}  ${Object.values(sorts.sorts)}`
+          wheres = wheres + ` order by SUBSTRING_INDEX(SUBSTRING_INDEX(${Object.keys(sorts.sorts)}, '.', 1), '-', -1)*1 ${Object.values(sorts.sorts)}, 
+            SUBSTRING_INDEX(SUBSTRING_INDEX(${Object.keys(sorts.sorts)}, '.', -1), '-', 1)*1 ${Object.values(sorts.sorts)},
+            SUBSTRING_INDEX(${Object.keys(sorts.sorts)}, '-', -1)*1 ${Object.values(sorts.sorts)}`
         }
       }
       if (sorts.fileType == '参考技术文献(受限)' || sorts.fileType == '客户技术资料(受限)') {
@@ -242,7 +246,7 @@ export default {
       */
     getSearcFormData() {
       const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
-      params['fileType'] = this.typeData[this.oldorgId.id].label
+      params['fileType'] = this.oldorgId.label
       params['userId'] = this.$store.getters.userInfo.employee.id
       params['sorts'] = this.sorts
       return params

+ 15 - 9
src/views/infosManage/internalFiles/internalFiles.vue

@@ -25,12 +25,13 @@
         <template v-else>
           <ibps-crud key="istree"
                      ref="crud"
-                     :data="tableData"
+                     :data="listData"
                      :toolbars="listConfig.toolbars"
                      :search-form="listConfig.searchForm"
                      :pk-key="pkKey"
                      :columns="listConfig.columns"
                      :loading="loading"
+                     :pagination="pagination"
                      @sort-change="handleSortChange"
                      @action-event="handleAction"
                      @pagination-change="handlePaginationChange">
@@ -96,7 +97,8 @@ export default {
       },
       pkKey: 'id', // 主键  如果主键不是pk需要传主键
       loading: false,
-      tableData: [],
+      listData: [],
+      selectListData: [],
       listTreeData: [],
       bianlistData: {
         dataResult: [],
@@ -198,13 +200,16 @@ export default {
       }
       if (sorts.sorts) {
         if (JSON.stringify(sorts.sorts) !== "{}") {
-          wheres = wheres + ` order by  ${Object.keys(sorts.sorts)}  ${Object.values(sorts.sorts)}`
+          wheres = wheres + ` order by SUBSTRING_INDEX(SUBSTRING_INDEX(${Object.keys(sorts.sorts)}, '.', 1), '-', -1)*1 ${Object.values(sorts.sorts)}, 
+            SUBSTRING_INDEX(SUBSTRING_INDEX(${Object.keys(sorts.sorts)}, '.', -1), '-', 1)*1 ${Object.values(sorts.sorts)},
+            SUBSTRING_INDEX(${Object.keys(sorts.sorts)}, '-', -1)*1 ${Object.values(sorts.sorts)}`
         }
       }
+
       let sql = `select * FROM t_wjgl WHERE wen_jian_zhuang_t = '已发放' AND yi_gai_zuo_fei_ = '否' ${wheres}`
       curdPost('sql', sql).then(res => {
         let tableDatas = res.variables.data
-        this.tableData = JSON.parse(JSON.stringify(tableDatas))
+        this.selectListData = JSON.parse(JSON.stringify(tableDatas))
         let filterDatas = []
         this.bianlistData.pageResult.totalCount = tableDatas.length
         this.bianlistData.pageResult.totalPages = Math.ceil(tableDatas.length / this.pagination.limit)
@@ -217,6 +222,7 @@ export default {
             filterDatas.push(tableDatas[index])
           }
         }
+        console.log('filterDatas', filterDatas)
         this.bianlistData.dataResult = filterDatas
         ActionUtils.handleListData(this, this.bianlistData)
       }).catch(res => {
@@ -256,14 +262,14 @@ export default {
       this.bianlistData.pageResult.limit = page.limit
       this.bianlistData.pageResult.page = page.page
       let filterDatas = []
-      if (this.tableData.length >= (page.limit * page.page)) {
+      if (this.selectListData.length >= (page.limit * page.page)) {
         for (let index = (page.limit * page.page) - page.limit; index < (page.limit * page.page); index++) {
-          filterDatas.push(this.tableData[index])
+          filterDatas.push(this.selectListData[index])
         }
         this.bianlistData.dataResult = JSON.parse(JSON.stringify(filterDatas))
       } else {
-        for (let index = (page.limit * page.page) - page.limit; index < this.tableData.length; index++) {
-          filterDatas.push(this.tableData[index])
+        for (let index = (page.limit * page.page) - page.limit; index < this.selectListData.length; index++) {
+          filterDatas.push(this.selectListData[index])
         }
         this.bianlistData.dataResult = JSON.parse(JSON.stringify(filterDatas))
       }
@@ -275,7 +281,7 @@ export default {
      */
     getSearcFormData() {
       const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
-      params['fileType'] = this.typeData[this.oldorgId.id].label
+      params['fileType'] = this.oldorgId.label
       params['userId'] = this.$store.getters.userInfo.employee.id
       params['sorts'] = this.sorts
       return params