From 17dc6983a5123e79bed120b1b6eb7b41282169ad Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 15 Jul 2024 15:40:34 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=94=AF=E4=BB=98=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../daxpay/admin/constant/api/ApiConst.api.ts | 14 +--
 .../admin/constant/api/ApiConstList.vue       | 89 +++++++++++++++++++
 .../constant/channel/ChannelConst.api.ts      | 12 +--
 .../constant/channel/ChannelConstList.vue     | 88 ++++++++++++++++++
 .../admin/constant/method/MethodConst.api.ts  | 12 +--
 .../admin/constant/method/MethodConstList.vue | 88 ++++++++++++++++++
 .../daxpay/admin/merchant/app/MchApp.api.ts   | 20 ++---
 .../admin/merchant/info/Merchant.api.ts       | 18 ++--
 .../admin/merchant/info/MerchantList.vue      | 26 +++---
 9 files changed, 316 insertions(+), 51 deletions(-)
 create mode 100644 src/views/daxpay/admin/constant/api/ApiConstList.vue
 create mode 100644 src/views/daxpay/admin/constant/channel/ChannelConstList.vue
 create mode 100644 src/views/daxpay/admin/constant/method/MethodConstList.vue

diff --git a/src/views/daxpay/admin/constant/api/ApiConst.api.ts b/src/views/daxpay/admin/constant/api/ApiConst.api.ts
index bbaa7e82f..8a7e533a9 100644
--- a/src/views/daxpay/admin/constant/api/ApiConst.api.ts
+++ b/src/views/daxpay/admin/constant/api/ApiConst.api.ts
@@ -7,7 +7,7 @@ import { BaseEntity } from '#/web'
  */
 export const page = (params) => {
   return defHttp.get<Result<PageResult<ChannelConst>>>({
-    url: '/const/method',
+    url: '/const/method/page',
     params,
   })
 }
@@ -17,20 +17,20 @@ export const page = (params) => {
  */
 export const get = (id) => {
   return defHttp.get<Result<ChannelConst>>({
-    url: '/const/method',
+    url: '/const/method/findById',
     params: { id },
   })
 }
 
 export interface ChannelConst extends BaseEntity {
   /** 编码 */
-  code: string
+  code?: string
   /** 名称 */
-  name: string
+  name?: string
   /** 接口地址 */
-  api: string
+  api?: string
   /** 是否启用 */
-  enable: boolean
+  enable?: boolean
   /** 备注 */
-  remark: string
+  remark?: string
 }
diff --git a/src/views/daxpay/admin/constant/api/ApiConstList.vue b/src/views/daxpay/admin/constant/api/ApiConstList.vue
new file mode 100644
index 000000000..2aca134c4
--- /dev/null
+++ b/src/views/daxpay/admin/constant/api/ApiConstList.vue
@@ -0,0 +1,89 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-5 bg-white">
+      <b-query
+        :query-params="model.queryParam"
+        :fields="fields"
+        @query="queryPage"
+        @reset="resetQueryParams"
+      />
+    </div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+        <vxe-column type="seq" :width="60" />
+        <vxe-column field="code" title="编码" :min-width="100" />
+        <vxe-column field="name" title="名称" min :min-width="100" />
+        <vxe-column field="api" title="接口" :min-width="220" />
+        <vxe-column field="enable" title="是否启用" :min-width="50">
+          <template #default="{ row }">
+            <a-tag v-if="row.enable" color="green">启用</a-tag>
+            <a-tag v-else color="red">停用</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="remark" title="备注" :min-width="200" />
+      </vxe-table>
+      <vxe-pager
+        size="medium"
+        :loading="loading"
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        @page-change="handleTableChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { onMounted, ref } from 'vue'
+  import { page } from './ApiConst.api'
+  import useTablePage from '@/hooks/bootx/useTablePage'
+  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { QueryField } from '@/components/Bootx/Query/Query'
+
+  // 使用hooks
+  const {
+    handleTableChange,
+    pageQueryResHandel,
+    resetQueryParams,
+    pagination,
+    pages,
+    model,
+    loading,
+  } = useTablePage(queryPage)
+
+  // 查询条件
+  const fields = [
+    { field: 'code', type: 'string', name: '编码', placeholder: '请输入编码' },
+    { field: 'name', type: 'string', name: '名称', placeholder: '请输入名称' },
+  ] as QueryField[]
+
+  const xTable = ref<VxeTableInstance>()
+  const xToolbar = ref<VxeToolbarInstance>()
+
+  onMounted(() => {
+    vxeBind()
+    queryPage()
+  })
+  function vxeBind() {
+    xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+    return Promise.resolve()
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/admin/constant/channel/ChannelConst.api.ts b/src/views/daxpay/admin/constant/channel/ChannelConst.api.ts
index 680ef2fde..64357c116 100644
--- a/src/views/daxpay/admin/constant/channel/ChannelConst.api.ts
+++ b/src/views/daxpay/admin/constant/channel/ChannelConst.api.ts
@@ -7,7 +7,7 @@ import { BaseEntity } from '#/web'
  */
 export const page = (params) => {
   return defHttp.get<Result<PageResult<ChannelConst>>>({
-    url: '/const/method',
+    url: '/const/channel/page',
     params,
   })
 }
@@ -16,18 +16,18 @@ export const page = (params) => {
  */
 export const get = (id) => {
   return defHttp.get<Result<ChannelConst>>({
-    url: '/const/method',
+    url: '/const/channel/findById',
     params: { id },
   })
 }
 
 export interface ChannelConst extends BaseEntity {
   /** 编码 */
-  code: string
+  code?: string
   /** 名称 */
-  name: string
+  name?: string
   /** 是否启用 */
-  enable: boolean
+  enable?: boolean
   /** 备注 */
-  remark: string
+  remark?: string
 }
diff --git a/src/views/daxpay/admin/constant/channel/ChannelConstList.vue b/src/views/daxpay/admin/constant/channel/ChannelConstList.vue
new file mode 100644
index 000000000..f7933bdb7
--- /dev/null
+++ b/src/views/daxpay/admin/constant/channel/ChannelConstList.vue
@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-5 bg-white">
+      <b-query
+        :query-params="model.queryParam"
+        :fields="fields"
+        @query="queryPage"
+        @reset="resetQueryParams"
+      />
+    </div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+        <vxe-column type="seq" width="60" />
+        <vxe-column field="code" title="编码" />
+        <vxe-column field="name" title="名称" />
+        <vxe-column field="enable" title="是否启用">
+          <template #default="{ row }">
+            <a-tag v-if="row.enable" color="green">启用</a-tag>
+            <a-tag v-else color="red">停用</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="remark" title="备注" />
+      </vxe-table>
+      <vxe-pager
+        size="medium"
+        :loading="loading"
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        @page-change="handleTableChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { onMounted, ref } from 'vue'
+  import { page } from './ChannelConst.api'
+  import useTablePage from '@/hooks/bootx/useTablePage'
+  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { QueryField } from '@/components/Bootx/Query/Query'
+
+  // 使用hooks
+  const {
+    handleTableChange,
+    pageQueryResHandel,
+    resetQueryParams,
+    pagination,
+    pages,
+    model,
+    loading,
+  } = useTablePage(queryPage)
+
+  // 查询条件
+  const fields = [
+    { field: 'code', type: 'string', name: '编码', placeholder: '请输入操作模块' },
+    { field: 'name', type: 'string', name: '名称', placeholder: '请输入账号名称' },
+  ] as QueryField[]
+
+  const xTable = ref<VxeTableInstance>()
+  const xToolbar = ref<VxeToolbarInstance>()
+
+  onMounted(() => {
+    vxeBind()
+    queryPage()
+  })
+  function vxeBind() {
+    xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+    return Promise.resolve()
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/admin/constant/method/MethodConst.api.ts b/src/views/daxpay/admin/constant/method/MethodConst.api.ts
index 0edd74bd0..888d67693 100644
--- a/src/views/daxpay/admin/constant/method/MethodConst.api.ts
+++ b/src/views/daxpay/admin/constant/method/MethodConst.api.ts
@@ -7,7 +7,7 @@ import { BaseEntity } from '#/web'
  */
 export const page = (params) => {
   return defHttp.get<Result<PageResult<MethodConst>>>({
-    url: '/const/method',
+    url: '/const/method/page',
     params,
   })
 }
@@ -16,18 +16,18 @@ export const page = (params) => {
  */
 export const get = (id) => {
   return defHttp.get<Result<MethodConst>>({
-    url: '/const/method',
+    url: '/const/method/findById',
     params: { id },
   })
 }
 
 export interface MethodConst extends BaseEntity {
   /** 编码 */
-  code: string
+  code?: string
   /** 名称 */
-  name: string
+  name?: string
   /** 是否启用 */
-  enable: boolean
+  enable?: boolean
   /** 备注 */
-  remark: string
+  remark?: string
 }
diff --git a/src/views/daxpay/admin/constant/method/MethodConstList.vue b/src/views/daxpay/admin/constant/method/MethodConstList.vue
new file mode 100644
index 000000000..5adf86ef3
--- /dev/null
+++ b/src/views/daxpay/admin/constant/method/MethodConstList.vue
@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-5 bg-white">
+      <b-query
+        :query-params="model.queryParam"
+        :fields="fields"
+        @query="queryPage"
+        @reset="resetQueryParams"
+      />
+    </div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+        <vxe-column type="seq" width="60" />
+        <vxe-column field="code" title="编码" />
+        <vxe-column field="name" title="名称" />
+        <vxe-column field="enable" title="是否启用">
+          <template #default="{ row }">
+            <a-tag v-if="row.enable" color="green">启用</a-tag>
+            <a-tag v-else color="red">停用</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="remark" title="备注" />
+      </vxe-table>
+      <vxe-pager
+        size="medium"
+        :loading="loading"
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        @page-change="handleTableChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { onMounted, ref } from 'vue'
+  import { page } from './MethodConst.api'
+  import useTablePage from '@/hooks/bootx/useTablePage'
+  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { QueryField } from '@/components/Bootx/Query/Query'
+
+  // 使用hooks
+  const {
+    handleTableChange,
+    pageQueryResHandel,
+    resetQueryParams,
+    pagination,
+    pages,
+    model,
+    loading,
+  } = useTablePage(queryPage)
+
+  // 查询条件
+  const fields = [
+    { field: 'code', type: 'string', name: '编码', placeholder: '请输入编码' },
+    { field: 'name', type: 'string', name: '名称', placeholder: '请输入名称' },
+  ] as QueryField[]
+
+  const xTable = ref<VxeTableInstance>()
+  const xToolbar = ref<VxeToolbarInstance>()
+
+  onMounted(() => {
+    vxeBind()
+    queryPage()
+  })
+  function vxeBind() {
+    xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+    return Promise.resolve()
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/admin/merchant/app/MchApp.api.ts b/src/views/daxpay/admin/merchant/app/MchApp.api.ts
index 49a9566dc..614af29f9 100644
--- a/src/views/daxpay/admin/merchant/app/MchApp.api.ts
+++ b/src/views/daxpay/admin/merchant/app/MchApp.api.ts
@@ -54,21 +54,21 @@ export const del = (id) => {
  */
 export interface MchApp extends BaseEntity {
   // 商户号
-  mchNo: string
+  mchNo?: string
   // 应用号
-  appId: string
+  appId?: string
   // 应用名称
-  appName: string
+  appName?: string
   // 签名方式
-  signType: string
+  signType?: string
   // 公钥
-  publicKey: string
+  publicKey?: string
   // 私钥
-  privateKey: string
+  privateKey?: string
   // 异步消息通知类型
-  notifyType: string
-  // 状态
-  notifyUrl: string
+  notifyType?: string
   // 通知地址, http/WebSocket 需要配置
-  status: string
+  notifyUrl?: string
+  // 状态
+  status?: string
 }
diff --git a/src/views/daxpay/admin/merchant/info/Merchant.api.ts b/src/views/daxpay/admin/merchant/info/Merchant.api.ts
index 65e6c4fc0..bf4fdc133 100644
--- a/src/views/daxpay/admin/merchant/info/Merchant.api.ts
+++ b/src/views/daxpay/admin/merchant/info/Merchant.api.ts
@@ -54,21 +54,21 @@ export const del = (id) => {
  */
 export interface Merchant extends BaseEntity {
   // 商户号
-  mchNo: string
+  mchNo?: string
   // 商户名称
-  mchName: string
+  mchName?: string
   // 公司名称
-  companyName: string
+  companyName?: string
   // 证件类型
-  idType: string
+  idType?: string
   // 证件号
-  idNo: string
+  idNo?: string
   // 联系方式
-  contact: string
+  contact?: string
   // 法人名称
-  legalPerson: string
+  legalPerson?: string
   // 法人证件号码
-  legalPersonIdNo: string
+  legalPersonIdNo?: string
   // 状态
-  status: string
+  status?: string
 }
diff --git a/src/views/daxpay/admin/merchant/info/MerchantList.vue b/src/views/daxpay/admin/merchant/info/MerchantList.vue
index eea9eb0fc..e44b99d21 100644
--- a/src/views/daxpay/admin/merchant/info/MerchantList.vue
+++ b/src/views/daxpay/admin/merchant/info/MerchantList.vue
@@ -19,22 +19,20 @@
         </template>
       </vxe-toolbar>
       <vxe-table ref="xTable" key-field="id" :data="pagination.records" :loading="loading">
-        <vxe-column type="seq" width="60" />
-        <vxe-column field="mchNo" title="编码" />
-        <vxe-column field="mchName" title="名称" />
-        <vxe-column field="companyName" title="公司名称" />
-        <vxe-column field="idType" title="证件类型">
+        <vxe-column type="seq" :width="60" />
+        <vxe-column field="mchNo" title="编码" :min-width="100" />
+        <vxe-column field="mchName" title="名称" :min-width="100" />
+        <vxe-column field="companyName" title="公司名称" :min-width="150" />
+        <vxe-column field="idType" title="证件类型" :min-width="80">
           <template #default="{ row }">
-            <a-tag v-if="row.idType === '0'" color="green">身份证</a-tag>
-            <a-tag v-else-if="row.idType === '1'" color="blue">护照</a-tag>
-            <a-tag v-else-if="row.idType === '2'" color="red">港澳通行证</a-tag>
+            <a-tag color="green">{{ dictConvert('idType', row.idType) }}</a-tag>
           </template>
         </vxe-column>
-        <vxe-column field="tel" title="联系方式" />
-        <vxe-column field="legalPerson" title="法人名称" />
-        <vxe-column field="tel" title="联系方式" />
-        <vxe-column field="createTime" title="创建时间" />
-        <vxe-column fixed="right" width="150" :showOverflow="false" title="操作">
+        <vxe-column field="tel" title="联系方式" :min-width="100" />
+        <vxe-column field="legalPerson" title="法人名称" :min-width="80" />
+        <vxe-column field="tel" title="联系方式" :min-width="100" />
+        <vxe-column field="createTime" title="创建时间" :min-width="80" />
+        <vxe-column fixed="right" :width="150" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <span>
               <a-link @click="show(row)">查看</a-link>
@@ -72,6 +70,7 @@
   import { useMessage } from '@/hooks/web/useMessage'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import ALink from '@/components/Link/Link.vue'
+  import { useDict } from '@/hooks/bootx/useDict'
 
   // 使用hooks
   const {
@@ -84,6 +83,7 @@
     loading,
   } = useTablePage(queryPage)
   const { createMessage, createConfirm } = useMessage()
+  const { dictConvert } = useDict()
   // 查询条件
   const fields = [
     { field: 'code', formType: STRING, name: '编码', placeholder: '请输入终端编码' },