feat 对账明细和差异单查询条件

xxm1995 · Mar 5, 2024 · 97466ee · 97466ee
1 parent 052af82
commit 97466ee
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 15 deletions.
diff --git a/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue b/src/views/payment/order/reconcile/detail/ReconcileDetailList.vue
@@ -2,9 +2,16 @@
  <basic-drawer forceRender v-bind="$attrs" title="对账单明细列表" width="60%" :visible="visible" @close="visible = false">
  <b-query :query-params="model.queryParam" :default-item-count="3" :fields="fields" @query="queryPage" @reset="resetQueryParams" />
  <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
- <vxe-table row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+ <vxe-table
+ row-id="id"
+ ref="xTable"
+ :data="pagination.records"
+ :loading="loading"
+ :sort-config="{ remote: true, trigger: 'cell' }"
+ @sort-change="sortChange"
+ >
  <vxe-column type="seq" width="60" />
- <vxe-column field="title" title="商品名称" />
+ <vxe-column field="title" title="订单名称" />
  <vxe-column field="amount" title="交易金额" />
  <vxe-column field="orderId" title="本地订单ID" />
  <vxe-column field="gatewayOrderNo" title="网关订单号" />
@@ -13,7 +20,7 @@
  <a-tag>{{ dictConvert('ReconcileTrade', row.type) }}</a-tag>
  </template>
  </vxe-column>
- <vxe-column field="createTime" title="创建时间" />
+ <vxe-column field="createTime" title="创建时间" sortable />
  <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
  <template #default="{ row }">
  <span>
@@ -40,7 +47,7 @@
  import { page, ReconcileDetail } from './ReconcileDetail.api'
  import useTablePage from '/@/hooks/bootx/useTablePage'
  import ReconcileDetailInfo from './ReconcileDetailInfo.vue'
- import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+ import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
  import { useMessage } from '/@/hooks/web/useMessage'
  import { LIST, QueryField, STRING } from '/@/components/Bootx/Query/Query'
  import BasicDrawer from '/@/components/Drawer/src/BasicDrawer.vue'
@@ -50,7 +57,8 @@
  import ALink from '/@/components/Link/Link.vue'
 
  // 使用hooks
- const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, pages, model, loading } = useTablePage(queryPage)
+ const { handleTableChange, pageQueryResHandel, resetQueryParams, pagination, sortChange, pages, sortParam, model, loading } =
+ useTablePage(queryPage)
  const { notification, createMessage } = useMessage()
  const { dictDropDown, dictConvert } = useDict()
 
@@ -60,10 +68,9 @@
  const fields = computed(() => {
  return [
  { field: 'title', type: STRING, name: '订单名称', placeholder: '请输入订单名称' },
- { field: 'paymentId', type: STRING, name: '本地支付ID', placeholder: '请输入本地支付ID' },
- { field: 'refundId', type: STRING, name: '本地退款ID', placeholder: '请输入本地退款ID' },
- { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入网关订单号' },
  { field: 'type', type: LIST, name: '交易类型', placeholder: '请选择交易类型', selectList: reconcileTradeList },
+ { field: 'orderId', type: STRING, name: '本地订单', placeholder: '请输入本地订单ID' },
+ { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入网关订单号' },
  ] as QueryField[]
  })
  let visible = $ref(false)
@@ -85,7 +92,7 @@
  * 初始化基础数据
  */
  async function initData() {
- reconcileTradeList = await dictDropDown('PayReconcileTrade')
+ reconcileTradeList = await dictDropDown('ReconcileTrade')
  }
  /**
  * 入口
@@ -94,6 +101,8 @@
  function init(record) {
  visible = true
  reconcileDetail = record
+ model.queryParam = {}
+ xTable?.clearSort()
  queryPage()
  }
 
@@ -105,6 +114,7 @@
  page({
  ...model.queryParam,
  ...pages,
+ ...sortParam,
  recordOrderId: reconcileDetail?.id,
  }).then(({ data }) => {
  pageQueryResHandel(data)

diff --git a/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue b/src/views/payment/order/reconcile/diff/ReconcileDiffListModel.vue
@@ -24,8 +24,8 @@
  </vxe-column>
  <vxe-column field="orderId" title="本地订单" />
  <vxe-column field="gatewayOrderNo" title="网关订单" />
- <vxe-column field="amount" title="交易金额" />
- <vxe-column field="orderTime" title="订单时间" />
+ <vxe-column field="amount" title="交易金额" sortable />
+ <vxe-column field="orderTime" title="订单时间" sortable />
  <vxe-column fixed="right" width="80" :showOverflow="false" title="操作">
  <template #default="{ row }">
  <a-link @click="show(row)">查看</a-link>
@@ -60,15 +60,23 @@
  import { ReconcileDetail } from '/@/views/payment/order/reconcile/detail/ReconcileDetail.api'
 
  // 使用hooks
- const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, pagination, pages, model, loading } = useTablePage(queryPage)
+ const { handleTableChange, pageQueryResHandel, resetQueryParams, sortChange, pagination, pages, sortParam, model, loading } =
+ useTablePage(queryPage)
  const { notification, createMessage } = useMessage()
  const { dictDropDown, dictConvert } = useDict()
 
- let reconcileTradeList = $ref<LabeledValue[]>([])
+ let orderTypeList = $ref<LabeledValue[]>([])
+ let diffTypeList = $ref<LabeledValue[]>([])
 
  // 查询条件
  const fields = computed(() => {
- return [{ field: 'title', type: STRING, name: '订单名称', placeholder: '请输入订单名称' }] as QueryField[]
+ return [
+ { field: 'title', type: STRING, name: '订单名称', placeholder: '请输入订单名称' },
+ { field: 'orderType', type: LIST, name: '订单类型', placeholder: '请选择订单类型', selectList: orderTypeList },
+ { field: 'diffType', type: LIST, name: '差异类型', placeholder: '请选择差异类型', selectList: diffTypeList },
+ { field: 'orderId', type: STRING, name: '本地定单', placeholder: '请输入本地定单ID' },
+ { field: 'gatewayOrderNo', type: STRING, name: '网关订单号', placeholder: '请输入网关订单号' },
+ ] as QueryField[]
  })
  let visible = $ref(false)
  let reconcileDetail = $ref<ReconcileDetail>()
@@ -89,14 +97,17 @@
  * 初始化基础数据
  */
  async function initData() {
- reconcileTradeList = await dictDropDown('PayReconcileTrade')
+ orderTypeList = await dictDropDown('ReconcileTrade')
+ diffTypeList = await dictDropDown('ReconcileDiffType')
  }
  /**
  * 入口
  */
  function init(record: ReconcileDetail) {
  visible = true
  reconcileDetail = record
+ model.queryParam = {}
+ xTable?.clearSort()
  queryPage()
  }
 
@@ -108,6 +119,7 @@
  page({
  ...model.queryParam,
  ...pages,
+ ...sortParam,
  recordId: reconcileDetail?.id,
  }).then(({ data }) => {
  pageQueryResHandel(data)