组件替换表格排序及排序提示信息

src/views/event/components/index.vue

@@ -312,25 +312,14 @@ export default {
 
     //获取排序字段// 子组件table排序
     handleSort({ column, prop, order, str }) {
-      this.sort=[]//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending:1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
       this.queryParams.current = 1
       //1表示展开行2表示基础表格
       if (str == '1') {

src/views/event/components/view/table.vue

@@ -9,7 +9,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :key="item.value" :prop="item.value" :label="item.name" align="center"
+      <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" align="center"
         sortable="custom">
         <template slot-scope="scope">
           <div v-if="['name', 'reportProjectNum', 'patentProjectNum'].includes(item.value)">
@@ -247,25 +247,15 @@ export default {
     },
     // 排序方法
     handleSort({ column, prop, order }) {
-      this.sort=[]//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending: 1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
+      
       this.params.current = 0
       this.disabled = false
       this.tableData.splice(0)

src/views/patentMining/components/view/commonTable.vue

@@ -10,7 +10,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column v-for="item in column.filter(item => !item.ifHidden)" :key="item.value" :prop="item.value"
+      <el-table-column v-for="item in column.filter(item => !item.ifHidden)" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value"
         :label="item.name" align="center" sortable="custom">
         <template slot-scope="scope">
           <div v-if="['name'].includes(item.value)">
@@ -199,25 +199,14 @@ export default {
     },
     // 排序方法
     handleSort({ column, prop, order }) {
-      this.sort = []//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending: 1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
       this.params.current = 0
       this.disabled = false
       this.tableData.splice(0)

src/views/patentMining/components/viewIndex.vue

@@ -191,25 +191,14 @@ export default {
     },
     //排序
     handleSort({ column, prop, order, str }) {
-      this.sort = []//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending: 1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
       this.queryParams.current = 1
       //1表示展开行2表示基础表格
       if (str == '1') {

src/views/product/components/framework/view/table.vue

@@ -7,10 +7,10 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="架构名称" prop="name" sortable="custom" align="center"></el-table-column>
-      <el-table-column label="创建人" prop="createName" sortable="custom" align="center"> </el-table-column>
-      <el-table-column label="创建时间" prop="createTime" sortable="custom" align="center"></el-table-column>
-      <el-table-column label="架构说明" prop="description" sortable="custom" align="center">
+      <el-table-column label="架构名称" prop="name" sortable="custom" align="center" :render-header=" $commonJS.renderHeaderMethods"></el-table-column>
+      <el-table-column label="创建人" prop="createName" sortable="custom" align="center" :render-header=" $commonJS.renderHeaderMethods"> </el-table-column>
+      <el-table-column label="创建时间" prop="createTime" sortable="custom" align="center" :render-header=" $commonJS.renderHeaderMethods"></el-table-column>
+      <el-table-column label="架构说明" prop="description" sortable="custom" align="center" :render-header=" $commonJS.renderHeaderMethods">
         <template slot-scope="scope">
           <div>
             <span>{{ scope.row.description?scope.row.description:'--' }}</span>

src/views/product/components/framework/viewIndex.vue

@@ -158,25 +158,14 @@ export default {
   methods: {
     //获取排序字段// 子组件table排序
     handleSort({ column, prop, order, }) {
-      this.sort = []//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending: 1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
       this.queryParams.current = 1
       //1表示展开行2表示基础表格
       this.getTableList()

src/views/product/components/index.vue

@@ -334,25 +334,14 @@ export default {
     },
     //排序
     handleSort({ column, prop, order, str }) {
-      this.sort=[]//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending:1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
       this.queryParams.current = 1
       this.getList()
     },

src/views/product/components/view/categoryTable.vue

@@ -10,7 +10,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-for="item in column" :key="item.value" :prop="item.value" :label="item.name" align="center" sortable="custom">
+      <el-table-column v-for="item in column" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" align="center" sortable="custom">
         <template slot-scope="scope">
           <div v-if="['name'].includes(item.value)">
             <el-link @click="handleItem(scope.row, item.value)" :type="isChoose?'primary':'default'">{{ scope.row[item.value] }}</el-link>

src/views/product/components/view/productTable.vue

@@ -14,21 +14,7 @@
         </template>
       </el-table-column>
 
-      <!-- <el-table-column label="产品名称" prop="productName" align="center"> </el-table-column>
-      <el-table-column label="上市时间" prop="marketTime" align="center"> 
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.marketTime?scope.row.marketTime.slice(0,10):'--' }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="所属公司" prop="companyName" align="center"> 
-        desc
-      </el-table-column>
-      <el-table-column label="参考许可费率" prop="licenseRate" align="center"> </el-table-column>
-      <el-table-column label="创建人" prop="createPersonName" align="center"> </el-table-column>
-      <el-table-column label="产品说明" prop="productExplain" align="center"> </el-table-column> -->
-      <el-table-column v-for="item in column" :key="item.value" :prop="item.value" :label="item.name" align="center" sortable="custom">
+      <el-table-column v-for="item in column" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" align="center" sortable="custom">
         <template slot-scope="scope">
           <div v-if="['name'].includes(item.value)">
             <el-link @click="handleItem(scope.row, item.value)" :type="isChoose?'primary':'default'">{{ scope.row[item.value] }}</el-link>
@@ -284,25 +270,14 @@ export default {
     },
      // 排序方法
      sortChange({ column, prop, order }) {
-      this.sort=[]//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending: 1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
       this.queryParams.current = 0
       this.disabled = false
       this.data.splice(0)

src/views/report/components/index.vue

@@ -327,25 +327,14 @@ export default {
     },
     //排序
     handleSort({ column, prop, order }) {
-      this.sort = []//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending: 1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
       this.queryParams.current = 1
       this.isGrouping()
     },

src/views/report/components/view/table.vue

@@ -11,7 +11,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column v-for="item in column" :key="item.value" :prop="item.value" :label="item.name" sortable="custom" align="center">
+        <el-table-column v-for="item in column" :key="item.value" :prop="item.value" :render-header=" $commonJS.renderHeaderMethods" :label="item.name" sortable="custom" align="center">
           <template slot-scope="scope">
             <div v-if="['name'].includes(item.value)">
               <el-link @click="handleItem(scope.row,item.value)">{{ scope.row[item.value] }}</el-link>
@@ -229,25 +229,14 @@ export default {
     },
     // 排序方法
     handleSort({ column, prop, order }) {
-      this.sort=[]//如需要多个字段排序，则不需要清空
-      if (order == null) {
-        return;
-      }
-      var orderType = {
-        ascending: 0,
-        descending: 1
-      }
-      var params = this.sort.find(item => {
-        return item.orderBy == prop
-      })
-      if (params) {
-        params.orderType = orderType[order]
-      } else {
-        params = {}
-        params.orderBy = prop
-        params.orderType = orderType[order]
-        this.sort.push(params)
+      //如需要多个字段排序，则不需要清空
+      var params = {
+        sort:this.sort,
+        column,
+        prop,
+        order,
       }
+      this.sort = this.$commonJS.getSortData(params)
       this.params.current = 0
       this.disabled = false
       this.tableData.splice(0)