Merge branch 'feature/1223' into develop

project/src/components/dataBoard/throwPerson/throwPersonPuton.vue

@@ -56,15 +56,18 @@
       <ux-table-column v-for="item in desCol" :key="item.prop" :resizable="true" :field="item.prop" :title="item.label"
         :min-width="item.min_width ? item.min_width : 120" :fixed="item.fixed ? item.fixed : ''" align="center">
         <template #header>
-          <div class="flex-align-jus-center">
+          <div
+            :class="['flex-align-jus-center', item.sort ? 'pointer' : '', sort_field == item.prop ? 'sortFieldStyle' : '']"
+            @click="item.sort ? sortFieldEvent(item.prop) : ''">
             {{ item.label }}
+            <i class="el-icon-caret-bottom" v-if="item.sort"></i>
             <el-tooltip v-if="item.notes" :content="item.notes" placement="top">
               <div><i class="el-icon-question"></i></div>
             </el-tooltip>
           </div>
         </template>
         <template v-slot="{ row }">
-          <span>{{ row[item.prop] || row[item.prop] == 0 ? $formatNum(row[item.prop]) : '-' }}</span>
+          <span :class="sort_field == item.prop ? 'sortFieldStyle' : ''">{{ row[item.prop] || row[item.prop] == 0 ? $formatNum(row[item.prop]) : '-' }}</span>
         </template>
       </ux-table-column>
     </ux-grid>
@@ -124,7 +127,7 @@ export default {
       pages: 0,
       total: 0,
       page_size: 20,
-      sort_field: 'first_day_roi',
+      sort_field: '',
       dataInfo: {},
       default_time: [this.$getDay(-30, false), this.$getDay(0, false)],
       time: [],
@@ -137,7 +140,7 @@ export default {
         { prop: "user_name", label: "投手", min_width: 160 },
         { prop: "start_date", label: "开始日期", min_width: 160 },
         { prop: "end_date", label: "截止日期", min_width: 160 },
-        { prop: "cost", label: "累计消耗" },
+        { prop: "cost", label: "累计消耗", sort: true },
         { prop: "pay_money", label: "累计充值" },
         { prop: "scan_follow_total", label: "企微粉丝人数" },
         { prop: "qw_cost", label: "企微成本" },
@@ -247,6 +250,7 @@ export default {
           user_id: this.user_id,
           start: this.time[0],
           end: this.time[1],
+          sort_field: this.sort_field,
           page: type == 'export' ? 1 : this.page,
           pagesize: type == 'export' ? this.$store.state.exportNumber : this.page_size,
         }
@@ -276,7 +280,11 @@ export default {
       this.init(val)
     },
     sortFieldEvent (type) {
-      this.sort_field = type;
+      if (type === this.sort_field) { // 重复点击当前排序字段 => 重置排序字段
+        this.sort_field = ''
+      } else {
+        this.sort_field = type;
+      }
       this.init(1)
     },
     exportEvent (data) {