Просмотр исходного кода

Merge tag 'Hotfix-56' into develop

Finish Hotfix-56
chen 3 лет назад
Родитель
Сommit
5b38e7914a
2 измененных файлов с 27 добавлено и 1 удалено
  1. 8 0
      src/api/finance/blance_sum.js
  2. 19 1
      src/views/finance/balance_sum.vue

+ 8 - 0
src/api/finance/blance_sum.js

@@ -16,3 +16,11 @@ export function getAdminWebsitByparent(params) {
     params,
   });
 }
+// 钱包列表(非返利钱包)
+export function getFinanceList(params) {
+  return request({
+    url: "/finance/list",
+    method: "get",
+    params,
+  });
+}

+ 19 - 1
src/views/finance/balance_sum.vue

@@ -13,6 +13,14 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="钱包" prop="walletId">
+              <el-select v-model="searchForm.walletId" class="selectStyle" placeholder="请选择" filterable>
+                <el-option v-for="(v, i) in walletList" :key="i" :label="v.name" :value="v.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="区域" prop="area">
               <el-select v-model="searchForm.area" class="selectStyle" placeholder="请选择" filterable>
                 <el-option v-for="(v, i) in areaList" :key="i" :label="v.name" :value="v.adminWebsitId">
@@ -20,7 +28,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="12">
+          <el-col :xs="24" :sm="24" :lg="6">
             <el-form-item label="" class="fr">
               <el-button size="mini" @click="clearFn">清空</el-button>
               <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
@@ -92,6 +100,7 @@ import { getCustomerList } from "@/api/finance/account_list";
 import {
   getFinanceTotalCustomer,
   getAdminWebsitByparent,
+  getFinanceList,
 } from "@/api/finance/blance_sum";
 export default {
   data() {
@@ -101,10 +110,12 @@ export default {
       // listTotal: 0, // 列表总数
       areaList: [],
       dataList: [], // 列表数据
+      walletList: [], //钱包数据
       searchForm: {
         // customerName: "",
         customerNumber: "",
         area: "",
+        walletId: "",
       }, //搜索表单
       customerList: [],
       listLoading: false, // 列表加载loading
@@ -113,12 +124,19 @@ export default {
   created() {
     this.getAreaList();
     this.getDataList();
+    this.getWalletList();
     this.getCustomerDataList({
       pageSize: -1,
       pageNum: 1,
     });
   },
   methods: {
+    //获取钱包数据
+    async getWalletList() {
+      let res = await getFinanceList();
+      console.log(res, 122);
+      this.walletList = res.data;
+    },
     //获取区域数据
     async getAreaList() {
       let res = await getAdminWebsitByparent({ parentId: 1 });