update 财务中心查询接口新增字段、增加搜索

jsowell-ui/src/views/financial/merchant.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <!-- <el-form
+    <el-form
       :model="queryParams"
       ref="queryForm"
       size="small"
@@ -8,13 +8,15 @@
       label-width="110px"
       @submit.native.prevent
     >
-      <el-form-item label="运营商名称" prop="merchantName">
-        <el-input
-          v-model="queryParams.merchantName"
-          placeholder="请输入运营商名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="运营商" prop="merchantId" label-width="120">
+        <el-select v-model="queryParams.merchantId" filterable clearable placeholder="请选择运营商">
+          <el-option
+            v-for="item in merchantList"
+            :key="item.merchantName"
+            :label="item.merchantName"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -28,8 +30,9 @@
           >重置</el-button
         >
       </el-form-item>
-    </el-form> -->
-    <el-table :data="merchantList" style="width: 100%" v-loading="loading">
+    </el-form>
+
+    <el-table :data="merchantInfoList" style="width: 100%" v-loading="loading">
       <el-table-column prop="merchantName" label="运营商" align="center">
         <template slot-scope="scope">
           <router-link
@@ -60,6 +63,25 @@
           />
         </template>
       </el-table-column>
+      <el-table-column
+        prop="adapayMemberId"
+        label="汇付会员id"
+        align="center"
+      />
+<!--      <el-table-column prop="auditStatus" label="汇付会员审核状态" align="center" width="130">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag-->
+<!--            :options="dict.type.account_audit_status"-->
+<!--            :value="scope.row.status"-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column
+        prop="settleAccountId"
+        label="汇付结算账户id"
+        align="center"
+      />
+
       <el-table-column
         prop="managerName"
         label="联系人"
@@ -108,20 +130,20 @@
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
-      @pagination="getMerchantList"
+      @pagination="getList"
     />
   </div>
 </template>
 
 <script>
-import { getFinancialMerchantList } from "@/api/pile/merchant";
+import {getFinancialMerchantList, getMerchantList} from "@/api/pile/merchant";
 
 export default {
-  dicts: ["merchant_status"],
+  dicts: ["merchant_status", "account_audit_status"],
   data() {
     return {
       // 运营商列表
-      merchantList: [],
+      merchantInfoList: [],
       loading: true,
       showOrHideText: "显示更多查询条件",
       buttonBoolean: false,
@@ -131,11 +153,14 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        merchantId: null,
+        merchantName: null,
       },
     };
   },
   created() {
     this.getMerchantList();
+    this.getList();
   },
   methods: {
     showOrHide() {
@@ -149,21 +174,27 @@ export default {
         this.buttonBoolean = !this.buttonBoolean;
       }
     },
-    // 获取运营商列表
-    getMerchantList() {
+    // 获取列表
+    getList() {
       this.loading = true;
       getFinancialMerchantList(this.queryParams).then((response) => {
-        this.merchantList = response.rows;
-        // console.log("response", response);
+        this.merchantInfoList = response.rows;
+        console.log("response", response);
         this.total = response.total;
         this.loading = false;
       });
     },
+    getMerchantList() {
+      getMerchantList().then((response) => {
+        this.merchantList = response.rows;
+        console.log("merchantList", this.merchantList)
+      });
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       console.log("搜索的值", this.queryParams);
       this.queryParams.pageNum = 1;
-      this.getMerchantList();
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -174,9 +205,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep
-  .el-descriptions--medium:not(.is-bordered)
-  .el-descriptions-item__cell {
+::v-deep .el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell {
   padding-bottom: 4px;
 }