1231233

src/api/cai/unionTotal.js

@@ -9,6 +9,14 @@ export function listUnionTotal(query) {
   })
 }
 
+export function unionList() {
+  return request({
+    url: '/cai/unionTotal/unionList',
+    method: 'get'
+  })
+}
+
+
 // 查询工会每日收益详细
 export function getUnionTotal(id) {
   return request({

src/views/cai/unionTotal/index.vue

@@ -20,14 +20,25 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="工会" prop="unionName">
+      <el-form-item label="工会" prop="unionId">
+        <el-select v-model="queryParams.unionId" clearable size="small">
+          <el-option
+              v-for="dict in unionList"
+              :key="dict.id"
+              :label="dict.name"
+              :value="dict.id"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="工会" prop="unionName">
         <el-input
             v-model="queryParams.unionName"
             placeholder="请输入工会"
             clearable
             @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -35,20 +46,10 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-        >导出（未实现）
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="unionTotalList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="unionTotalList" @selection-change="handleSelectionChange" @sort-change="handleSortChange">
       <el-table-column label="统计类型" align="center" prop="dataType">
         <template v-slot="scope">
           <cai-dict-tag :options="unionTotalDataTypeList" :value="scope.row.dataType"/>
@@ -56,8 +57,8 @@
       </el-table-column>
       <el-table-column label="时间" align="center" prop="countDate" width="180"/>
       <el-table-column label="工会名称" align="center" prop="unionName" />
-      <el-table-column label="工会主播收入" align="center" prop="anchorEarningsTotal"/>
+      <el-table-column label="工会主播收入" align="center" prop="anchorEarningsTotal" sortable="custom" :sort-orders="['descending', 'ascending']"/>
-      <el-table-column label="工会收益" align="center" prop="unionEarningsTotal"/>
+      <el-table-column label="工会收益" align="center" prop="unionEarningsTotal" sortable="custom" :sort-orders="['descending', 'ascending']"/>
       <el-table-column label="统计时间" align="center" prop="refreshTime" width="180"/>
     </el-table>
 
@@ -72,7 +73,7 @@
 </template>
 
 <script>
-import {listUnionTotal} from "@/api/cai/unionTotal";
+import {listUnionTotal, unionList} from "@/api/cai/unionTotal";
 import {unionTotalDataTypeList} from "@/constant/statusMap";
 
 export default {
@@ -96,12 +97,15 @@ export default {
       total: 0,
       // 工会每日收益表格数据
       unionTotalList: [],
+      unionList:[],
       // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        orderByColumn: undefined,
+        isAsc: undefined,
         countDate: undefined,
         dataType: undefined,
         unionId: undefined,
@@ -111,6 +115,7 @@ export default {
   },
   created() {
     this.getList();
+    this.queryUnionList();
   },
   methods: {
     /** 查询工会每日收益列表 */
@@ -122,6 +127,16 @@ export default {
         this.loading = false;
       });
     },
+    queryUnionList(){
+      unionList().then(respon => {
+        this.unionList = respon.data
+      })
+    },
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

src/views/cai/userUnion/index.vue

@@ -37,7 +37,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="userUnionList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="userUnionList" @selection-change="handleSelectionChange" @sort-change="handleSortChange">
 <!--      <el-table-column type="selection" width="55" align="center"/>-->
       <el-table-column :label="systemName+'号'" align="center" prop="usercode" width="60"/>
       <el-table-column label="工会名" align="center" prop="name" />
@@ -49,8 +49,8 @@
       <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
       <el-table-column label="工会人数" align="center" prop="allNum"/>
       <el-table-column label="主播人数" align="center" prop="anchorNum"/>
-      <el-table-column label="主播收入" align="center" prop="anchorEarningsTotal"/>
+      <el-table-column label="主播收入" align="center" prop="anchorEarningsTotal" sortable="custom" :sort-orders="['descending', 'ascending']"/>
-      <el-table-column label="工会收入" align="center" prop="unionEarningsTotal"/>
+      <el-table-column label="工会收入" align="center" prop="unionEarningsTotal" sortable="custom" :sort-orders="['descending', 'ascending']"/>
 <!--      <el-table-column label="分成人数" align="center" prop="inDivideNum"/>-->
 <!--      <el-table-column label="不分成人数" align="center" prop="notDivideNum"/>-->
       <el-table-column label="状态" align="center" prop="status">
@@ -131,6 +131,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        orderByColumn: "anchorEarningsTotal",
+        isAsc: "descending",
         usercode: undefined,
         mobile: undefined,
       },
@@ -149,6 +151,11 @@ export default {
         this.loading = false
       })
     },
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1