xyvcard-settle 0.0.17 → 0.0.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import { _ as f } from "./history.vue_vue_type_script_setup_true_lang-DyQJ8Zj_.mjs";
1
+ import { _ as f } from "./history.vue_vue_type_script_setup_true_lang-BMWf3S8J.mjs";
2
2
  export {
3
3
  f as default
4
4
  };
@@ -1,4 +1,4 @@
1
- import { defineComponent as W, getCurrentInstance as X, ref as D, resolveComponent as d, createElementBlock as Z, openBlock as c, createVNode as l, withCtx as t, createBlock as y, withKeys as v, unref as o, createCommentVNode as N, createTextVNode as b, toDisplayString as g, isRef as A } from "vue";
1
+ import { defineComponent as W, getCurrentInstance as X, ref as D, resolveComponent as d, createElementBlock as Z, openBlock as c, createVNode as l, withCtx as t, createBlock as y, withKeys as v, unref as o, createCommentVNode as I, createTextVNode as b, toDisplayString as g, isRef as A } from "vue";
2
2
  import { useUserStore as x, clearEmpty as ee, request as te, useTableHooks as le } from "jmash-core";
3
3
  import { useI18n as ae } from "vue-i18n";
4
4
  import { D as V, C as E } from "./index-Bn8Vw_ua.mjs";
@@ -56,32 +56,15 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
56
56
  {
57
57
  label: "settleTradeReceipt.merchantName",
58
58
  prop: "merchantName",
59
- width: "150",
59
+ width: "300",
60
60
  sortable: "custom",
61
61
  isColumn: !0
62
62
  },
63
- // 渠道
64
- {
65
- label: "settleTradeReceipt.channelId",
66
- prop: "instsId",
67
- slotName: "instsId",
68
- columnType: "slot",
69
- width: "150",
70
- isColumn: !0
71
- },
72
- // 商户经营名称
73
- // {
74
- // label: "商户经营名称",
75
- // prop: "merchantNo",
76
- // width: "150",
77
- // sortable: "custom",
78
- // isColumn: true,
79
- // },
80
63
  // 连锁号
81
64
  {
82
65
  label: "settleTradeReceipt.likeMerchantNo",
83
66
  prop: "merchantNo",
84
- width: "300",
67
+ width: "150",
85
68
  sortable: "custom",
86
69
  isColumn: !0
87
70
  },
@@ -99,7 +82,7 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
99
82
  {
100
83
  label: "settleTradeReceipt.transferMoneyAmount",
101
84
  prop: "transferMoneyAmount",
102
- width: "150",
85
+ width: "120",
103
86
  sortable: "custom",
104
87
  isColumn: !0
105
88
  },
@@ -107,7 +90,7 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
107
90
  {
108
91
  label: "settleTradeReceipt.feeAmt",
109
92
  prop: "feeAmt",
110
- width: "150",
93
+ width: "120",
111
94
  sortable: "custom",
112
95
  isColumn: !0
113
96
  },
@@ -115,7 +98,7 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
115
98
  {
116
99
  label: "settleTradeReceipt.transferMoneyStatus",
117
100
  prop: "transferMoneyStatus",
118
- width: "150",
101
+ width: "120",
119
102
  sortable: "custom",
120
103
  isColumn: !0
121
104
  },
@@ -146,7 +129,7 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
146
129
  u.handleSort(a.prop, a.order);
147
130
  }
148
131
  return u.getList(), (a, e) => {
149
- const $ = d("el-input"), i = d("el-form-item"), p = d("el-col"), I = d("el-date-picker"), F = d("jmash-select"), _ = d("el-row"), R = d("el-button"), H = d("el-form"), L = d("jmash-column-select"), O = d("jmash-table"), G = d("jmash-pagination"), J = d("el-card");
132
+ const $ = d("el-input"), i = d("el-form-item"), p = d("el-col"), N = d("el-date-picker"), F = d("jmash-select"), _ = d("el-row"), R = d("el-button"), H = d("el-form"), L = d("jmash-column-select"), O = d("jmash-table"), G = d("jmash-pagination"), J = d("el-card");
150
133
  return c(), Z("div", se, [
151
134
  l(H, {
152
135
  ref_key: "queryFormRef",
@@ -209,7 +192,7 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
209
192
  prop: "analysisTimeStart"
210
193
  }, {
211
194
  default: t(() => [
212
- l(I, {
195
+ l(N, {
213
196
  modelValue: m.value,
214
197
  "onUpdate:modelValue": e[6] || (e[6] = (s) => m.value = s),
215
198
  type: "daterange",
@@ -280,7 +263,7 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
280
263
  default: t(() => {
281
264
  var n, s;
282
265
  return [
283
- (n = o(k)) != null && n.includes("@") ? N("", !0) : (c(), y(p, {
266
+ (n = o(k)) != null && n.includes("@") ? I("", !0) : (c(), y(p, {
284
267
  key: 0,
285
268
  span: 6
286
269
  }, {
@@ -290,7 +273,7 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
290
273
  prop: "analysisTimeStart"
291
274
  }, {
292
275
  default: t(() => [
293
- l(I, {
276
+ l(N, {
294
277
  modelValue: m.value,
295
278
  "onUpdate:modelValue": e[9] || (e[9] = (T) => m.value = T),
296
279
  type: "daterange",
@@ -407,7 +390,7 @@ const re = new oe(), se = { class: "app-container" }, ce = /* @__PURE__ */ W({
407
390
  "page-size": r.value.pageSize,
408
391
  "onUpdate:pageSize": e[17] || (e[17] = (n) => r.value.pageSize = n),
409
392
  onPagination: e[18] || (e[18] = (n) => o(u).getList())
410
- }, null, 8, ["total", "current-page", "page-size"])) : N("", !0)
393
+ }, null, 8, ["total", "current-page", "page-size"])) : I("", !0)
411
394
  ]),
412
395
  default: t(() => [
413
396
  l(O, {
@@ -1,6 +1,6 @@
1
- import { defineComponent as x, getCurrentInstance as G, ref as N, resolveComponent as i, createElementBlock as J, openBlock as D, createElementVNode as b, createVNode as a, withCtx as l, withKeys as v, unref as o, createTextVNode as d, toDisplayString as p, createBlock as W, createCommentVNode as X, isRef as M } from "vue";
1
+ import { defineComponent as x, getCurrentInstance as G, ref as N, resolveComponent as i, createElementBlock as J, openBlock as D, createElementVNode as f, createVNode as a, withCtx as l, withKeys as c, unref as o, createTextVNode as d, toDisplayString as p, createBlock as W, createCommentVNode as X, isRef as M } from "vue";
2
2
  import { useUserStore as Z, clearEmpty as q, request as ee, useTableHooks as te } from "jmash-core";
3
- import { D as y, C as h } from "./index-Bn8Vw_ua.mjs";
3
+ import { D as y, C as R } from "./index-Bn8Vw_ua.mjs";
4
4
  import { useI18n as ae } from "vue-i18n";
5
5
  import { useRoute as le } from "vue-router";
6
6
  class oe {
@@ -11,42 +11,42 @@ class oe {
11
11
  }
12
12
  // 查询翻页信息支付订单
13
13
  findPage(s) {
14
- const c = Z().user.tenant;
14
+ const v = Z().user.tenant;
15
15
  return s && (s.hasOrderStatus = s.orderStatus !== void 0, s.hasBillsStatus = s.billsStatus !== void 0, s.hasTradeType = s.tradeType !== void 0, s.hasPayMode = s.payMode !== void 0, s.hasTradeStatus = s.tradeStatus !== void 0), q(s), ee({
16
- url: "/v1/payment/trade/my/page/" + c,
16
+ url: "/v1/payment/trade/my/page/" + v,
17
17
  method: "get",
18
18
  params: s
19
19
  });
20
20
  }
21
21
  }
22
- const re = new oe(), ne = { class: "app-container" }, de = { class: "search-container" }, se = { class: "total-num" }, ue = { class: "blue_color" }, pe = { class: "blue_color" }, me = { class: "blue_color" }, ie = { class: "blue_color" }, ye = { class: "blue_color" }, be = { class: "blue_color" }, Ve = /* @__PURE__ */ x({
22
+ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-container" }, se = { class: "total-num" }, ue = { class: "blue_color" }, pe = { class: "blue_color" }, me = { class: "blue_color" }, ie = { class: "blue_color" }, ye = { class: "blue_color" }, fe = { class: "blue_color" }, we = /* @__PURE__ */ x({
23
23
  __name: "index",
24
- setup(R) {
24
+ setup(h) {
25
25
  y.instsBizDict.useValues(), y.merchantBizDict.useValues(), y.agentBizDict.useValues();
26
- const { t: s } = ae(), { proxy: c } = G(), $ = le(), z = localStorage.getItem("tokenExt"), n = N({
26
+ const { t: s } = ae(), { proxy: v } = G(), $ = le(), z = localStorage.getItem("tokenExt"), n = N({
27
27
  agentCode: $.query.agentCode,
28
28
  merchantId: $.query.merchantId,
29
29
  tokenExt: z ?? ""
30
30
  }), {
31
31
  tableHooks: m,
32
32
  multipleTableRef: k,
33
- queryFormRef: B,
34
- listLoading: P,
33
+ queryFormRef: P,
34
+ listLoading: B,
35
35
  tableData: E,
36
- total: w
36
+ total: V
37
37
  } = te(s, re, n);
38
38
  let T = m.totalRecord;
39
39
  const g = N([]);
40
40
  function U(r) {
41
- g.value = r, g.value.length === 2 && (n.value.startCreateTime = c.$moment.formatDate(
41
+ g.value = r, g.value.length === 2 && (n.value.startCreateTime = v.$moment.formatDate(
42
42
  r[0],
43
- h.RPC_FORMAT_TIME
44
- ), n.value.endCreateTime = c.$moment.formatDate(
43
+ R.RPC_FORMAT_TIME
44
+ ), n.value.endCreateTime = v.$moment.formatDate(
45
45
  r[1],
46
- h.RPC_FORMAT_TIME
46
+ R.RPC_FORMAT_TIME
47
47
  ));
48
48
  }
49
- let V = N([
49
+ let w = N([
50
50
  // 序号
51
51
  {
52
52
  label: "payTrade.index",
@@ -100,6 +100,8 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
100
100
  {
101
101
  label: "payTrade.feeRatePct",
102
102
  prop: "feeRatePct",
103
+ slotName: "feeRatePct",
104
+ columnType: "slot",
103
105
  width: "100",
104
106
  sortable: "custom",
105
107
  isColumn: !0
@@ -181,12 +183,12 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
181
183
  m.handleSort(r.prop, r.order);
182
184
  }
183
185
  return m.getList(), (r, e) => {
184
- const I = i("el-input"), f = i("el-form-item"), u = i("el-col"), C = i("jmash-select"), S = i("el-row"), j = i("el-date-picker"), _ = i("el-button"), K = i("el-form"), O = i("jmash-column-select"), F = i("jmash-table"), H = i("jmash-pagination"), L = i("el-card");
186
+ const I = i("el-input"), b = i("el-form-item"), u = i("el-col"), C = i("jmash-select"), S = i("el-row"), j = i("el-date-picker"), _ = i("el-button"), K = i("el-form"), O = i("jmash-column-select"), F = i("jmash-table"), H = i("jmash-pagination"), L = i("el-card");
185
187
  return D(), J("div", ne, [
186
- b("div", de, [
188
+ f("div", de, [
187
189
  a(K, {
188
190
  ref_key: "queryFormRef",
189
- ref: B,
191
+ ref: P,
190
192
  model: n.value,
191
193
  inline: !0
192
194
  }, {
@@ -195,7 +197,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
195
197
  default: l(() => [
196
198
  a(u, { span: 6 }, {
197
199
  default: l(() => [
198
- a(f, {
200
+ a(b, {
199
201
  label: r.$t("payTrade.orderNo"),
200
202
  prop: "orderNo"
201
203
  }, {
@@ -204,7 +206,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
204
206
  modelValue: n.value.orderNo,
205
207
  "onUpdate:modelValue": e[0] || (e[0] = (t) => n.value.orderNo = t),
206
208
  placeholder: r.$t("payTrade.orderNo"),
207
- onKeyup: e[1] || (e[1] = v((t) => o(m).handleQuery(), ["enter"])),
209
+ onKeyup: e[1] || (e[1] = c((t) => o(m).handleQuery(), ["enter"])),
208
210
  class: "!w-[203px]"
209
211
  }, null, 8, ["modelValue", "placeholder"])
210
212
  ]),
@@ -215,7 +217,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
215
217
  }),
216
218
  a(u, { span: 6 }, {
217
219
  default: l(() => [
218
- a(f, {
220
+ a(b, {
219
221
  label: r.$t("payTrade.payMode"),
220
222
  prop: "payMode"
221
223
  }, {
@@ -225,7 +227,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
225
227
  "onUpdate:modelValue": e[2] || (e[2] = (t) => n.value.payMode = t),
226
228
  placeholder: r.$t("payTrade.payModeRead"),
227
229
  data: o(y).payModeBizDict.values,
228
- onKeyup: e[3] || (e[3] = v((t) => o(m).handleQuery(), ["enter"])),
230
+ onKeyup: e[3] || (e[3] = c((t) => o(m).handleQuery(), ["enter"])),
229
231
  class: "!w-[203px]",
230
232
  filterable: "",
231
233
  clearable: ""
@@ -238,7 +240,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
238
240
  }),
239
241
  a(u, { span: 6 }, {
240
242
  default: l(() => [
241
- a(f, {
243
+ a(b, {
242
244
  label: r.$t("payTrade.tradeType"),
243
245
  prop: "tradeType"
244
246
  }, {
@@ -248,7 +250,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
248
250
  "onUpdate:modelValue": e[4] || (e[4] = (t) => n.value.tradeType = t),
249
251
  placeholder: r.$t("payTrade.tradeTypeRead"),
250
252
  data: o(y).tradeTypeBizDict.values,
251
- onKeyup: e[5] || (e[5] = v((t) => o(m).handleQuery(), ["enter"])),
253
+ onKeyup: e[5] || (e[5] = c((t) => o(m).handleQuery(), ["enter"])),
252
254
  class: "!w-[203px]",
253
255
  filterable: "",
254
256
  clearable: ""
@@ -261,7 +263,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
261
263
  }),
262
264
  a(u, { span: 6 }, {
263
265
  default: l(() => [
264
- a(f, {
266
+ a(b, {
265
267
  label: r.$t("payTrade.instsId"),
266
268
  prop: "instsId"
267
269
  }, {
@@ -271,7 +273,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
271
273
  "onUpdate:modelValue": e[6] || (e[6] = (t) => n.value.instsId = t),
272
274
  placeholder: r.$t("payTrade.instsIdRead"),
273
275
  data: o(y).instsBizDict.values,
274
- onKeyup: e[7] || (e[7] = v((t) => o(m).handleQuery(), ["enter"])),
276
+ onKeyup: e[7] || (e[7] = c((t) => o(m).handleQuery(), ["enter"])),
275
277
  class: "!w-[203px]",
276
278
  filterable: "",
277
279
  clearable: ""
@@ -289,7 +291,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
289
291
  default: l(() => [
290
292
  a(u, { span: 6 }, {
291
293
  default: l(() => [
292
- a(f, {
294
+ a(b, {
293
295
  label: r.$t("payTrade.termNo"),
294
296
  prop: "termNo"
295
297
  }, {
@@ -298,7 +300,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
298
300
  modelValue: n.value.termNo,
299
301
  "onUpdate:modelValue": e[8] || (e[8] = (t) => n.value.termNo = t),
300
302
  placeholder: r.$t("payTrade.termNo"),
301
- onKeyup: e[9] || (e[9] = v((t) => o(m).handleQuery(), ["enter"])),
303
+ onKeyup: e[9] || (e[9] = c((t) => o(m).handleQuery(), ["enter"])),
302
304
  class: "!w-[203px]"
303
305
  }, null, 8, ["modelValue", "placeholder"])
304
306
  ]),
@@ -309,7 +311,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
309
311
  }),
310
312
  a(u, { span: 6 }, {
311
313
  default: l(() => [
312
- a(f, {
314
+ a(b, {
313
315
  label: r.$t("payTrade.orderStatus"),
314
316
  prop: "orderStatus"
315
317
  }, {
@@ -319,7 +321,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
319
321
  "onUpdate:modelValue": e[10] || (e[10] = (t) => n.value.orderStatus = t),
320
322
  placeholder: r.$t("payTrade.orderStatusRead"),
321
323
  data: o(y).orderStatusBizDict.values,
322
- onKeyup: e[11] || (e[11] = v((t) => o(m).handleQuery(), ["enter"])),
324
+ onKeyup: e[11] || (e[11] = c((t) => o(m).handleQuery(), ["enter"])),
323
325
  class: "!w-[203px]",
324
326
  filterable: "",
325
327
  clearable: ""
@@ -332,7 +334,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
332
334
  }),
333
335
  a(u, { span: 6 }, {
334
336
  default: l(() => [
335
- a(f, {
337
+ a(b, {
336
338
  label: r.$t("payTrade.createTime"),
337
339
  prop: "startCreateTime"
338
340
  }, {
@@ -357,7 +359,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
357
359
  }),
358
360
  a(u, { span: 6 }, {
359
361
  default: l(() => [
360
- a(f, { class: "search-btn" }, {
362
+ a(b, { class: "search-btn" }, {
361
363
  default: l(() => [
362
364
  a(_, {
363
365
  type: "primary",
@@ -388,7 +390,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
388
390
  ]),
389
391
  _: 1
390
392
  }, 8, ["model"]),
391
- e[20] || (e[20] = b("div", { class: "clear" }, null, -1))
393
+ e[20] || (e[20] = f("div", { class: "clear" }, null, -1))
392
394
  ]),
393
395
  a(L, {
394
396
  shadow: "never",
@@ -403,8 +405,8 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
403
405
  }, {
404
406
  default: l(() => [
405
407
  a(O, {
406
- modelValue: o(V),
407
- "onUpdate:modelValue": e[15] || (e[15] = (t) => M(V) ? V.value = t : V = t),
408
+ modelValue: o(w),
409
+ "onUpdate:modelValue": e[15] || (e[15] = (t) => M(w) ? w.value = t : w = t),
408
410
  "label-name": "settle/settle-trade-analysis"
409
411
  }, null, 8, ["modelValue"])
410
412
  ]),
@@ -415,10 +417,10 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
415
417
  })
416
418
  ]),
417
419
  footer: l(() => [
418
- o(w) > 0 ? (D(), W(H, {
420
+ o(V) > 0 ? (D(), W(H, {
419
421
  key: 0,
420
- total: o(w),
421
- "onUpdate:total": e[16] || (e[16] = (t) => M(w) ? w.value = t : null),
422
+ total: o(V),
423
+ "onUpdate:total": e[16] || (e[16] = (t) => M(V) ? V.value = t : null),
422
424
  "current-page": n.value.curPage,
423
425
  "onUpdate:currentPage": e[17] || (e[17] = (t) => n.value.curPage = t),
424
426
  "page-size": n.value.pageSize,
@@ -427,13 +429,13 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
427
429
  }, null, 8, ["total", "current-page", "page-size"])) : X("", !0)
428
430
  ]),
429
431
  default: l(() => [
430
- b("div", se, [
432
+ f("div", se, [
431
433
  a(S, { gutter: 20 }, {
432
434
  default: l(() => [
433
435
  a(u, { span: 4 }, {
434
436
  default: l(() => [
435
437
  e[21] || (e[21] = d(" 交易笔数: ")),
436
- b("span", ue, p(o(T).totalSize), 1),
438
+ f("span", ue, p(o(T).totalSize), 1),
437
439
  e[22] || (e[22] = d(" 笔 "))
438
440
  ]),
439
441
  _: 1
@@ -441,7 +443,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
441
443
  a(u, { span: 4 }, {
442
444
  default: l(() => [
443
445
  e[23] || (e[23] = d(" 交易金额: ")),
444
- b("span", pe, p(o(T).totalAmount), 1),
446
+ f("span", pe, p(o(T).totalAmount), 1),
445
447
  e[24] || (e[24] = d(" 元 "))
446
448
  ]),
447
449
  _: 1
@@ -449,7 +451,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
449
451
  a(u, { span: 4 }, {
450
452
  default: l(() => [
451
453
  e[25] || (e[25] = d(" 收款笔数: ")),
452
- b("span", me, p(o(T).paidOrder), 1),
454
+ f("span", me, p(o(T).paidOrder), 1),
453
455
  e[26] || (e[26] = d(" 笔 "))
454
456
  ]),
455
457
  _: 1
@@ -457,7 +459,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
457
459
  a(u, { span: 4 }, {
458
460
  default: l(() => [
459
461
  e[27] || (e[27] = d(" 收款金额: ")),
460
- b("span", ie, p(o(T).paidAmount), 1),
462
+ f("span", ie, p(o(T).paidAmount), 1),
461
463
  e[28] || (e[28] = d(" 元 "))
462
464
  ]),
463
465
  _: 1
@@ -465,7 +467,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
465
467
  a(u, { span: 4 }, {
466
468
  default: l(() => [
467
469
  e[29] || (e[29] = d(" 退款笔数: ")),
468
- b("span", ye, p(o(T).refundOrder), 1),
470
+ f("span", ye, p(o(T).refundOrder), 1),
469
471
  e[30] || (e[30] = d(" 笔 "))
470
472
  ]),
471
473
  _: 1
@@ -473,7 +475,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
473
475
  a(u, { span: 4 }, {
474
476
  default: l(() => [
475
477
  e[31] || (e[31] = d(" 退款金额: ")),
476
- b("span", be, p(o(T).refundAmount), 1),
478
+ f("span", fe, p(o(T).refundAmount), 1),
477
479
  e[32] || (e[32] = d(" 元 "))
478
480
  ]),
479
481
  _: 1
@@ -487,12 +489,15 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
487
489
  ref: k,
488
490
  "row-key": "payTradePk",
489
491
  isSelection: !1,
490
- "list-loading": o(P),
492
+ "list-loading": o(B),
491
493
  data: o(E),
492
- "table-label": o(V),
494
+ "table-label": o(w),
493
495
  onSelectionChange: A,
494
496
  onSortChange: Q
495
497
  }, {
498
+ feeRatePct: l((t) => [
499
+ d(p(t.data.row.feeRatePct) + "% ", 1)
500
+ ]),
496
501
  tradeType: l((t) => [
497
502
  d(p(o(y).tradeTypeBizDict.getEnumValue(t.data.row.tradeType)), 1)
498
503
  ]),
@@ -509,7 +514,7 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
509
514
  d(p(o(y).merchantBizDict.getValue(t.data.row.merchantId)), 1)
510
515
  ]),
511
516
  createTime: l((t) => [
512
- d(p(o(c).$moment.formatDate(
517
+ d(p(o(v).$moment.formatDate(
513
518
  t.data.row.createTime,
514
519
  "YYYY-MM-DD HH:mm"
515
520
  )), 1)
@@ -524,5 +529,5 @@ const re = new oe(), ne = { class: "app-container" }, de = { class: "search-cont
524
529
  }
525
530
  });
526
531
  export {
527
- Ve as default
532
+ we as default
528
533
  };
@@ -1,6 +1,6 @@
1
1
  import { defineComponent as r, ref as p, resolveComponent as s, createElementBlock as i, openBlock as d, createElementVNode as u, createVNode as e, withCtx as n } from "vue";
2
2
  import { _ as f } from "./history.vue_vue_type_script_setup_true_lang-Dbqhypfx.mjs";
3
- import { _ as b } from "./today.vue_vue_type_script_setup_true_lang-6aEPYmOn.mjs";
3
+ import { _ as b } from "./today.vue_vue_type_script_setup_true_lang-Bd3zjPgQ.mjs";
4
4
  const v = { class: "app-container" }, h = { class: "search-container" }, w = /* @__PURE__ */ r({
5
5
  __name: "index",
6
6
  setup(C) {
@@ -1,6 +1,6 @@
1
1
  import { defineComponent as r, ref as p, resolveComponent as s, createElementBlock as i, openBlock as d, createElementVNode as u, createVNode as e, withCtx as n } from "vue";
2
- import { _ as f } from "./history.vue_vue_type_script_setup_true_lang-DyQJ8Zj_.mjs";
3
- import { _ as b } from "./today.vue_vue_type_script_setup_true_lang-D2rKgtGh.mjs";
2
+ import { _ as f } from "./history.vue_vue_type_script_setup_true_lang-BMWf3S8J.mjs";
3
+ import { _ as b } from "./today.vue_vue_type_script_setup_true_lang-G2Mu9j2x.mjs";
4
4
  const v = { class: "app-container" }, h = { class: "search-container" }, w = /* @__PURE__ */ r({
5
5
  __name: "index",
6
6
  setup(C) {
@@ -1,6 +1,6 @@
1
- import { defineComponent as x, getCurrentInstance as ee, ref as R, resolveComponent as b, createElementBlock as ae, openBlock as N, createElementVNode as T, createVNode as a, withCtx as t, withKeys as v, unref as o, createBlock as D, createCommentVNode as B, createTextVNode as n, toDisplayString as y, isRef as _ } from "vue";
1
+ import { defineComponent as q, getCurrentInstance as ee, ref as k, resolveComponent as f, createElementBlock as ae, openBlock as N, createElementVNode as T, createVNode as a, withCtx as t, withKeys as v, unref as o, createBlock as h, createCommentVNode as B, createTextVNode as n, toDisplayString as i, isRef as _ } from "vue";
2
2
  import { useUserStore as te, clearEmpty as le, request as oe, useTableHooks as re } from "jmash-core";
3
- import { D as i, C as U } from "./index-Bn8Vw_ua.mjs";
3
+ import { D as y, C as P } from "./index-Bn8Vw_ua.mjs";
4
4
  import { useI18n as de } from "vue-i18n";
5
5
  import { useRoute as ne } from "vue-router";
6
6
  class se {
@@ -18,39 +18,14 @@ class se {
18
18
  params: u
19
19
  });
20
20
  }
21
- // // 查询支付订单
22
- // findById(query: OrderKey): AxiosPromise<OrderModel> {
23
- // const tenant=useUserStore().user.tenant;
24
- // clearEmpty(query);
25
- // return request({
26
- // url: "/v1/payment/order/id/"+tenant+"/"+query.orderId,
27
- // method: "get",
28
- // });
29
- // }
30
- // 导出支付订单Excel文件
31
- // exportExcel(queryParams: OrderExportReq): AxiosPromise {
32
- // const tenant=useUserStore().user.tenant;
33
- // clearEmpty(queryParams);
34
- // const query = qs.stringify(queryParams, {
35
- // arrayFormat: "brackets",
36
- // allowDots: true,
37
- // });
38
- // return request({
39
- // url: "/v1/payment/order/"+tenant+"/orders.xlsx?"+query,
40
- // method: "get",
41
- // responseType: "blob",
42
- // });
43
- // }
44
21
  }
45
- const ue = new se(), pe = { class: "app-container" }, me = { class: "search-container" }, ie = { class: "total-num" }, ye = { class: "blue_color" }, be = { class: "blue_color" }, fe = { class: "blue_color" }, Te = { class: "blue_color" }, ve = { class: "blue_color" }, ce = { class: "blue_color" }, Se = /* @__PURE__ */ x({
22
+ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-container" }, ie = { class: "total-num" }, ye = { class: "blue_color" }, fe = { class: "blue_color" }, be = { class: "blue_color" }, Te = { class: "blue_color" }, ve = { class: "blue_color" }, ce = { class: "blue_color" }, Se = /* @__PURE__ */ q({
46
23
  __name: "index",
47
- setup(P) {
48
- i.instsBizDict.useValues(), i.merchantBizDict.useValues(), i.agentBizDict.useValues();
49
- const { t: u } = de(), { proxy: C } = ee(), I = ne(), A = localStorage.getItem("tokenExt"), M = I.query.tenant;
50
- I.query.agentCode;
51
- const d = R({
52
- agentCode: I.query.agentCode,
53
- merchantId: I.query.merchantId,
24
+ setup(U) {
25
+ y.instsBizDict.useValues(), y.merchantBizDict.useValues(), y.agentBizDict.useValues();
26
+ const { t: u } = de(), { proxy: C } = ee(), D = ne(), A = localStorage.getItem("tokenExt"), M = D.query.tenant, d = k({
27
+ agentCode: D.query.agentCode,
28
+ merchantId: D.query.merchantId,
54
29
  tokenExt: A ?? ""
55
30
  }), {
56
31
  tableHooks: p,
@@ -58,20 +33,20 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
58
33
  queryFormRef: Q,
59
34
  listLoading: Y,
60
35
  tableData: K,
61
- total: h
36
+ total: I
62
37
  } = re(u, ue, d);
63
38
  let c = p.totalRecord;
64
- const $ = R([]);
39
+ const w = k([]);
65
40
  function j(r) {
66
- $.value = r, $.value.length === 2 && (d.value.startCreateTime = C.$moment.formatDate(
41
+ w.value = r, w.value.length === 2 && (d.value.startCreateTime = C.$moment.formatDate(
67
42
  r[0],
68
- U.RPC_FORMAT_TIME
43
+ P.RPC_FORMAT_TIME
69
44
  ), d.value.endCreateTime = C.$moment.formatDate(
70
45
  r[1],
71
- U.RPC_FORMAT_TIME
46
+ P.RPC_FORMAT_TIME
72
47
  ));
73
48
  }
74
- let w = R([
49
+ let $ = k([
75
50
  // 序号
76
51
  {
77
52
  label: "payTrade.index",
@@ -125,6 +100,8 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
125
100
  {
126
101
  label: "payTrade.feeRatePct",
127
102
  prop: "feeRatePct",
103
+ slotName: "feeRatePct",
104
+ columnType: "slot",
128
105
  width: "100",
129
106
  sortable: "custom",
130
107
  isColumn: !0
@@ -197,7 +174,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
197
174
  }
198
175
  ]);
199
176
  function O() {
200
- d.value.merchantId = "", $.value = [], d.value.agentCode = "", p.resetQuery(), console.log(d.value, "=> ");
177
+ d.value.merchantId = "", w.value = [], d.value.agentCode = "", p.resetQuery(), console.log(d.value, "=> ");
201
178
  }
202
179
  function F(r) {
203
180
  p.selectionRows.value = r;
@@ -206,7 +183,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
206
183
  p.handleSort(r.prop, r.order);
207
184
  }
208
185
  return p.getList(), (r, e) => {
209
- const k = b("el-input"), f = b("el-form-item"), s = b("el-col"), g = b("jmash-select"), S = b("el-row"), L = b("el-tree-select"), G = b("el-date-picker"), z = b("el-button"), J = b("el-form"), W = b("jmash-column-select"), X = b("jmash-table"), Z = b("jmash-pagination"), q = b("el-card");
186
+ const R = f("el-input"), b = f("el-form-item"), s = f("el-col"), g = f("jmash-select"), S = f("el-row"), L = f("el-tree-select"), G = f("el-date-picker"), z = f("el-button"), J = f("el-form"), W = f("jmash-column-select"), X = f("jmash-table"), Z = f("jmash-pagination"), x = f("el-card");
210
187
  return N(), ae("div", pe, [
211
188
  T("div", me, [
212
189
  a(J, {
@@ -220,12 +197,12 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
220
197
  default: t(() => [
221
198
  a(s, { span: 6 }, {
222
199
  default: t(() => [
223
- a(f, {
200
+ a(b, {
224
201
  label: r.$t("payTrade.merchantNo"),
225
202
  prop: "likeMerchantNo"
226
203
  }, {
227
204
  default: t(() => [
228
- a(k, {
205
+ a(R, {
229
206
  modelValue: d.value.likeMerchantNo,
230
207
  "onUpdate:modelValue": e[0] || (e[0] = (l) => d.value.likeMerchantNo = l),
231
208
  placeholder: r.$t("payTrade.likeMerchantNoRead"),
@@ -240,7 +217,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
240
217
  }),
241
218
  a(s, { span: 6 }, {
242
219
  default: t(() => [
243
- a(f, {
220
+ a(b, {
244
221
  label: r.$t("payTrade.merchantId"),
245
222
  prop: "version"
246
223
  }, {
@@ -249,7 +226,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
249
226
  modelValue: d.value.merchantId,
250
227
  "onUpdate:modelValue": e[2] || (e[2] = (l) => d.value.merchantId = l),
251
228
  placeholder: r.$t("payTrade.merchantIdRead"),
252
- data: o(i).merchantBizDict.values,
229
+ data: o(y).merchantBizDict.values,
253
230
  onKeyup: e[3] || (e[3] = v((l) => o(p).handleQuery(), ["enter"])),
254
231
  class: "!w-[203px]",
255
232
  filterable: "",
@@ -263,12 +240,12 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
263
240
  }),
264
241
  a(s, { span: 6 }, {
265
242
  default: t(() => [
266
- a(f, {
243
+ a(b, {
267
244
  label: r.$t("payTrade.termNo"),
268
245
  prop: "termNo"
269
246
  }, {
270
247
  default: t(() => [
271
- a(k, {
248
+ a(R, {
272
249
  modelValue: d.value.termNo,
273
250
  "onUpdate:modelValue": e[4] || (e[4] = (l) => d.value.termNo = l),
274
251
  placeholder: r.$t("payTrade.termNo"),
@@ -283,7 +260,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
283
260
  }),
284
261
  a(s, { span: 6 }, {
285
262
  default: t(() => [
286
- a(f, {
263
+ a(b, {
287
264
  label: r.$t("payTrade.payMode"),
288
265
  prop: "payMode"
289
266
  }, {
@@ -292,7 +269,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
292
269
  modelValue: d.value.payMode,
293
270
  "onUpdate:modelValue": e[6] || (e[6] = (l) => d.value.payMode = l),
294
271
  placeholder: r.$t("payTrade.payModeRead"),
295
- data: o(i).payModeBizDict.values,
272
+ data: o(y).payModeBizDict.values,
296
273
  onKeyup: e[7] || (e[7] = v((l) => o(p).handleQuery(), ["enter"])),
297
274
  class: "!w-[203px]",
298
275
  filterable: "",
@@ -313,7 +290,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
313
290
  return [
314
291
  a(s, { span: 6 }, {
315
292
  default: t(() => [
316
- a(f, {
293
+ a(b, {
317
294
  label: r.$t("payTrade.tradeType"),
318
295
  prop: "tradeType"
319
296
  }, {
@@ -322,7 +299,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
322
299
  modelValue: d.value.tradeType,
323
300
  "onUpdate:modelValue": e[8] || (e[8] = (m) => d.value.tradeType = m),
324
301
  placeholder: r.$t("payTrade.tradeTypeRead"),
325
- data: o(i).tradeTypeBizDict.values,
302
+ data: o(y).tradeTypeBizDict.values,
326
303
  onKeyup: e[9] || (e[9] = v((m) => o(p).handleQuery(), ["enter"])),
327
304
  class: "!w-[203px]",
328
305
  filterable: "",
@@ -336,7 +313,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
336
313
  }),
337
314
  a(s, { span: 6 }, {
338
315
  default: t(() => [
339
- a(f, {
316
+ a(b, {
340
317
  label: r.$t("payTrade.instsId"),
341
318
  prop: "instsId"
342
319
  }, {
@@ -345,7 +322,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
345
322
  modelValue: d.value.instsId,
346
323
  "onUpdate:modelValue": e[10] || (e[10] = (m) => d.value.instsId = m),
347
324
  placeholder: r.$t("payTrade.instsIdRead"),
348
- data: o(i).instsBizDict.values,
325
+ data: o(y).instsBizDict.values,
349
326
  onKeyup: e[11] || (e[11] = v((m) => o(p).handleQuery(), ["enter"])),
350
327
  class: "!w-[203px]",
351
328
  filterable: "",
@@ -359,12 +336,12 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
359
336
  }),
360
337
  a(s, { span: 6 }, {
361
338
  default: t(() => [
362
- a(f, {
339
+ a(b, {
363
340
  label: r.$t("payTrade.orderNo"),
364
341
  prop: "orderNo"
365
342
  }, {
366
343
  default: t(() => [
367
- a(k, {
344
+ a(R, {
368
345
  modelValue: d.value.orderNo,
369
346
  "onUpdate:modelValue": e[12] || (e[12] = (m) => d.value.orderNo = m),
370
347
  placeholder: r.$t("payTrade.orderNo"),
@@ -377,12 +354,12 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
377
354
  ]),
378
355
  _: 1
379
356
  }),
380
- (l = o(M)) != null && l.includes("@") ? (N(), D(s, {
357
+ (l = o(M)) != null && l.includes("@") ? (N(), h(s, {
381
358
  key: 1,
382
359
  span: 6
383
360
  }, {
384
361
  default: t(() => [
385
- a(f, {
362
+ a(b, {
386
363
  label: r.$t("payTrade.orderStatus"),
387
364
  prop: "orderStatus"
388
365
  }, {
@@ -391,7 +368,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
391
368
  modelValue: d.value.orderStatus,
392
369
  "onUpdate:modelValue": e[15] || (e[15] = (m) => d.value.orderStatus = m),
393
370
  placeholder: r.$t("payTrade.orderStatusRead"),
394
- data: o(i).orderStatusBizDict.values,
371
+ data: o(y).orderStatusBizDict.values,
395
372
  onKeyup: e[16] || (e[16] = v((m) => o(p).handleQuery(), ["enter"])),
396
373
  class: "!w-[203px]",
397
374
  filterable: "",
@@ -402,19 +379,19 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
402
379
  }, 8, ["label"])
403
380
  ]),
404
381
  _: 1
405
- })) : (N(), D(s, {
382
+ })) : (N(), h(s, {
406
383
  key: 0,
407
384
  span: 6
408
385
  }, {
409
386
  default: t(() => [
410
- a(f, {
387
+ a(b, {
411
388
  label: r.$t("settleTradeAnalysis.agentCode")
412
389
  }, {
413
390
  default: t(() => [
414
391
  a(L, {
415
392
  modelValue: d.value.agentCode,
416
393
  "onUpdate:modelValue": e[14] || (e[14] = (m) => d.value.agentCode = m),
417
- data: o(i).agentBizDict.values,
394
+ data: o(y).agentBizDict.values,
418
395
  "node-key": "value",
419
396
  filterable: "",
420
397
  clearable: "",
@@ -435,12 +412,12 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
435
412
  default: t(() => {
436
413
  var l, m;
437
414
  return [
438
- (l = o(M)) != null && l.includes("@") ? B("", !0) : (N(), D(s, {
415
+ (l = o(M)) != null && l.includes("@") ? B("", !0) : (N(), h(s, {
439
416
  key: 0,
440
417
  span: 6
441
418
  }, {
442
419
  default: t(() => [
443
- a(f, {
420
+ a(b, {
444
421
  label: r.$t("payTrade.orderStatus"),
445
422
  prop: "orderStatus"
446
423
  }, {
@@ -449,7 +426,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
449
426
  modelValue: d.value.orderStatus,
450
427
  "onUpdate:modelValue": e[17] || (e[17] = (V) => d.value.orderStatus = V),
451
428
  placeholder: r.$t("payTrade.orderStatusRead"),
452
- data: o(i).orderStatusBizDict.values,
429
+ data: o(y).orderStatusBizDict.values,
453
430
  onKeyup: e[18] || (e[18] = v((V) => o(p).handleQuery(), ["enter"])),
454
431
  class: "!w-[203px]",
455
432
  filterable: "",
@@ -463,14 +440,14 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
463
440
  })),
464
441
  a(s, { span: 6 }, {
465
442
  default: t(() => [
466
- a(f, {
443
+ a(b, {
467
444
  label: r.$t("payTrade.createTime"),
468
445
  prop: "startCreateTime"
469
446
  }, {
470
447
  default: t(() => [
471
448
  a(G, {
472
- modelValue: $.value,
473
- "onUpdate:modelValue": e[19] || (e[19] = (V) => $.value = V),
449
+ modelValue: w.value,
450
+ "onUpdate:modelValue": e[19] || (e[19] = (V) => w.value = V),
474
451
  type: "daterange",
475
452
  format: "YYYY-MM-DD",
476
453
  "value-format": "YYYY-MM-DD",
@@ -489,14 +466,14 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
489
466
  span: (m = o(M)) != null && m.includes("@") ? 18 : 12
490
467
  }, {
491
468
  default: t(() => [
492
- a(f, { class: "search-btn" }, {
469
+ a(b, { class: "search-btn" }, {
493
470
  default: t(() => [
494
471
  a(z, {
495
472
  type: "primary",
496
473
  onClick: e[20] || (e[20] = (V) => o(p).handleQuery())
497
474
  }, {
498
475
  default: t(() => [
499
- n(y(r.$t("common.search")), 1)
476
+ n(i(r.$t("common.search")), 1)
500
477
  ]),
501
478
  _: 1
502
479
  }),
@@ -504,7 +481,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
504
481
  onClick: e[21] || (e[21] = (V) => O())
505
482
  }, {
506
483
  default: t(() => [
507
- n(y(r.$t("common.reset")), 1)
484
+ n(i(r.$t("common.reset")), 1)
508
485
  ]),
509
486
  _: 1
510
487
  })
@@ -523,7 +500,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
523
500
  }, 8, ["model"]),
524
501
  e[27] || (e[27] = T("div", { class: "clear" }, null, -1))
525
502
  ]),
526
- a(q, {
503
+ a(x, {
527
504
  shadow: "never",
528
505
  class: "table-container"
529
506
  }, {
@@ -536,8 +513,8 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
536
513
  }, {
537
514
  default: t(() => [
538
515
  a(W, {
539
- modelValue: o(w),
540
- "onUpdate:modelValue": e[22] || (e[22] = (l) => _(w) ? w.value = l : w = l),
516
+ modelValue: o($),
517
+ "onUpdate:modelValue": e[22] || (e[22] = (l) => _($) ? $.value = l : $ = l),
541
518
  "label-name": "settle/settle-trade-analysis"
542
519
  }, null, 8, ["modelValue"])
543
520
  ]),
@@ -548,10 +525,10 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
548
525
  })
549
526
  ]),
550
527
  footer: t(() => [
551
- o(h) > 0 ? (N(), D(Z, {
528
+ o(I) > 0 ? (N(), h(Z, {
552
529
  key: 0,
553
- total: o(h),
554
- "onUpdate:total": e[23] || (e[23] = (l) => _(h) ? h.value = l : null),
530
+ total: o(I),
531
+ "onUpdate:total": e[23] || (e[23] = (l) => _(I) ? I.value = l : null),
555
532
  "current-page": d.value.curPage,
556
533
  "onUpdate:currentPage": e[24] || (e[24] = (l) => d.value.curPage = l),
557
534
  "page-size": d.value.pageSize,
@@ -566,7 +543,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
566
543
  a(s, { span: 4 }, {
567
544
  default: t(() => [
568
545
  e[28] || (e[28] = n(" 交易笔数: ")),
569
- T("span", ye, y(o(c).totalSize), 1),
546
+ T("span", ye, i(o(c).totalSize), 1),
570
547
  e[29] || (e[29] = n(" 笔 "))
571
548
  ]),
572
549
  _: 1
@@ -574,7 +551,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
574
551
  a(s, { span: 4 }, {
575
552
  default: t(() => [
576
553
  e[30] || (e[30] = n(" 交易金额: ")),
577
- T("span", be, y(o(c).totalAmount), 1),
554
+ T("span", fe, i(o(c).totalAmount), 1),
578
555
  e[31] || (e[31] = n(" 元 "))
579
556
  ]),
580
557
  _: 1
@@ -582,7 +559,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
582
559
  a(s, { span: 4 }, {
583
560
  default: t(() => [
584
561
  e[32] || (e[32] = n(" 收款笔数: ")),
585
- T("span", fe, y(o(c).paidOrder), 1),
562
+ T("span", be, i(o(c).paidOrder), 1),
586
563
  e[33] || (e[33] = n(" 笔 "))
587
564
  ]),
588
565
  _: 1
@@ -590,7 +567,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
590
567
  a(s, { span: 4 }, {
591
568
  default: t(() => [
592
569
  e[34] || (e[34] = n(" 收款金额: ")),
593
- T("span", Te, y(o(c).paidAmount), 1),
570
+ T("span", Te, i(o(c).paidAmount), 1),
594
571
  e[35] || (e[35] = n(" 元 "))
595
572
  ]),
596
573
  _: 1
@@ -598,7 +575,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
598
575
  a(s, { span: 4 }, {
599
576
  default: t(() => [
600
577
  e[36] || (e[36] = n(" 退款笔数: ")),
601
- T("span", ve, y(o(c).refundOrder), 1),
578
+ T("span", ve, i(o(c).refundOrder), 1),
602
579
  e[37] || (e[37] = n(" 笔 "))
603
580
  ]),
604
581
  _: 1
@@ -606,7 +583,7 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
606
583
  a(s, { span: 4 }, {
607
584
  default: t(() => [
608
585
  e[38] || (e[38] = n(" 退款金额: ")),
609
- T("span", ce, y(o(c).refundAmount), 1),
586
+ T("span", ce, i(o(c).refundAmount), 1),
610
587
  e[39] || (e[39] = n(" 元 "))
611
588
  ]),
612
589
  _: 1
@@ -622,27 +599,30 @@ const ue = new se(), pe = { class: "app-container" }, me = { class: "search-cont
622
599
  isSelection: !1,
623
600
  "list-loading": o(Y),
624
601
  data: o(K),
625
- "table-label": o(w),
602
+ "table-label": o($),
626
603
  onSelectionChange: F,
627
604
  onSortChange: H
628
605
  }, {
606
+ feeRatePct: t((l) => [
607
+ n(i(l.data.row.feeRatePct) + "% ", 1)
608
+ ]),
629
609
  tradeType: t((l) => [
630
- n(y(o(i).tradeTypeBizDict.getEnumValue(l.data.row.tradeType)), 1)
610
+ n(i(o(y).tradeTypeBizDict.getEnumValue(l.data.row.tradeType)), 1)
631
611
  ]),
632
612
  instsId: t((l) => [
633
- n(y(o(i).instsBizDict.getValue(l.data.row.instsId)), 1)
613
+ n(i(o(y).instsBizDict.getValue(l.data.row.instsId)), 1)
634
614
  ]),
635
615
  orderStatus: t((l) => [
636
- n(y(o(i).orderStatusBizDict.getEnumValue(l.data.row.orderStatus)), 1)
616
+ n(i(o(y).orderStatusBizDict.getEnumValue(l.data.row.orderStatus)), 1)
637
617
  ]),
638
618
  payMode: t((l) => [
639
- n(y(o(i).payModeBizDict.getEnumValue(l.data.row.payMode)), 1)
619
+ n(i(o(y).payModeBizDict.getEnumValue(l.data.row.payMode)), 1)
640
620
  ]),
641
621
  merchantId: t((l) => [
642
- n(y(o(i).merchantBizDict.getValue(l.data.row.merchantId)), 1)
622
+ n(i(o(y).merchantBizDict.getValue(l.data.row.merchantId)), 1)
643
623
  ]),
644
624
  createTime: t((l) => [
645
- n(y(o(C).$moment.formatDate(
625
+ n(i(o(C).$moment.formatDate(
646
626
  l.data.row.createTime,
647
627
  "YYYY-MM-DD HH:mm"
648
628
  )), 1)
@@ -197,12 +197,12 @@ const ie = new ue(), me = { class: "app-container" }, pe = { class: "search-cont
197
197
  default: l(() => [
198
198
  t(y, {
199
199
  label: o.$t("payTrade.instsId"),
200
- prop: "instsId"
200
+ prop: "channelId"
201
201
  }, {
202
202
  default: l(() => [
203
203
  t(K, {
204
- modelValue: s.value.instsId,
205
- "onUpdate:modelValue": e[3] || (e[3] = (a) => s.value.instsId = a),
204
+ modelValue: s.value.channelId,
205
+ "onUpdate:modelValue": e[3] || (e[3] = (a) => s.value.channelId = a),
206
206
  placeholder: o.$t("settleTradeAnalysis.channelIdRead"),
207
207
  data: n(b).instsBizDict.values,
208
208
  onKeyup: e[4] || (e[4] = V((a) => n(i).handleQuery(), ["enter"])),
package/dist/index.mjs CHANGED
@@ -2679,7 +2679,7 @@ const Ti = {
2679
2679
  }
2680
2680
  };
2681
2681
  }
2682
- }, xi = /* @__PURE__ */ Object.assign({ "./views/payment/pay-trade-personal/index.vue": () => import("./index-D7MHr-YT.mjs"), "./views/payment/pay-trade/index.vue": () => import("./index-XzW-OVqZ.mjs"), "./views/payment/settle-trade-analysis/index.vue": () => import("./index-90kNtQuh.mjs"), "./views/payment/settle-trade-merchant-personal/index.vue": () => import("./index-Dkcgyu5g.mjs"), "./views/payment/settle-trade-merchant/index.vue": () => import("./index-yBUEGCAI.mjs"), "./views/payment/settle-trade-receipt-personal/history.vue": () => import("./history-BqGlNUWq.mjs"), "./views/payment/settle-trade-receipt-personal/index.vue": () => import("./index-ChRHO9vx.mjs"), "./views/payment/settle-trade-receipt-personal/today.vue": () => import("./today-RvGAeLaQ.mjs"), "./views/payment/settle-trade-receipt/history.vue": () => import("./history-BL4EtEnt.mjs"), "./views/payment/settle-trade-receipt/index.vue": () => import("./index-DD85xv5U.mjs"), "./views/payment/settle-trade-receipt/today.vue": () => import("./today-CUA-DCIS.mjs") }), Ni = {
2682
+ }, xi = /* @__PURE__ */ Object.assign({ "./views/payment/pay-trade-personal/index.vue": () => import("./index-4mAQF6sI.mjs"), "./views/payment/pay-trade/index.vue": () => import("./index-DRyh7Csl.mjs"), "./views/payment/settle-trade-analysis/index.vue": () => import("./index-Q5OOFu9F.mjs"), "./views/payment/settle-trade-merchant-personal/index.vue": () => import("./index-Dkcgyu5g.mjs"), "./views/payment/settle-trade-merchant/index.vue": () => import("./index-yBUEGCAI.mjs"), "./views/payment/settle-trade-receipt-personal/history.vue": () => import("./history-BqGlNUWq.mjs"), "./views/payment/settle-trade-receipt-personal/index.vue": () => import("./index-7sGznIYQ.mjs"), "./views/payment/settle-trade-receipt-personal/today.vue": () => import("./today-DCYHokzf.mjs"), "./views/payment/settle-trade-receipt/history.vue": () => import("./history-Bf1plXQZ.mjs"), "./views/payment/settle-trade-receipt/index.vue": () => import("./index-B5IIg45W.mjs"), "./views/payment/settle-trade-receipt/today.vue": () => import("./today-CM47Nc1C.mjs") }), Ni = {
2683
2683
  install(e) {
2684
2684
  ps(xi, 7), Ys(vs), e.use(Ti);
2685
2685
  }
@@ -1,4 +1,4 @@
1
- import { _ as f } from "./today.vue_vue_type_script_setup_true_lang-D2rKgtGh.mjs";
1
+ import { _ as f } from "./today.vue_vue_type_script_setup_true_lang-G2Mu9j2x.mjs";
2
2
  export {
3
3
  f as default
4
4
  };
@@ -1,4 +1,4 @@
1
- import { _ as f } from "./today.vue_vue_type_script_setup_true_lang-6aEPYmOn.mjs";
1
+ import { _ as f } from "./today.vue_vue_type_script_setup_true_lang-Bd3zjPgQ.mjs";
2
2
  export {
3
3
  f as default
4
4
  };
@@ -12,12 +12,11 @@ class le {
12
12
  findPage(d) {
13
13
  const h = O().user.tenant;
14
14
  return W(d), X({
15
- url: "/v1/settle/receipt/today/my/page/" + h,
15
+ url: "/v1/settle/receipt/today/my/" + h,
16
16
  method: "get",
17
17
  params: d
18
18
  });
19
19
  }
20
- //
21
20
  }
22
21
  const ae = new le(), ne = { class: "app-container" }, de = /* @__PURE__ */ K({
23
22
  __name: "today",
@@ -50,7 +49,7 @@ const ae = new le(), ne = { class: "app-container" }, de = /* @__PURE__ */ K({
50
49
  {
51
50
  label: "settleTradeReceipt.merchantName",
52
51
  prop: "merchantName",
53
- width: "150",
52
+ width: "300",
54
53
  sortable: "custom",
55
54
  isColumn: !0
56
55
  },
@@ -1,4 +1,4 @@
1
- import { defineComponent as F, getCurrentInstance as G, ref as f, resolveComponent as s, createElementBlock as R, openBlock as h, createVNode as a, withCtx as l, withKeys as w, unref as r, Fragment as J, renderList as O, createBlock as k, createTextVNode as b, toDisplayString as y, createCommentVNode as W, isRef as V } from "vue";
1
+ import { defineComponent as F, getCurrentInstance as G, ref as f, resolveComponent as s, createElementBlock as w, openBlock as h, createVNode as a, withCtx as l, withKeys as k, unref as r, Fragment as J, renderList as O, createBlock as V, createTextVNode as b, toDisplayString as y, createCommentVNode as W, isRef as S } from "vue";
2
2
  import { useUserStore as X, clearEmpty as Z, request as ee, useTableHooks as te } from "jmash-core";
3
3
  import { useI18n as le } from "vue-i18n";
4
4
  import { D as m, I as ae } from "./index-Bn8Vw_ua.mjs";
@@ -12,7 +12,7 @@ class ne {
12
12
  findPage(d) {
13
13
  const _ = X().user.tenant;
14
14
  return Z(d), ee({
15
- url: "/v1/settle/receipt/today/page/" + _,
15
+ url: "/v1/settle/receipt/today/" + _,
16
16
  method: "get",
17
17
  params: d
18
18
  });
@@ -20,24 +20,24 @@ class ne {
20
20
  }
21
21
  const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
22
22
  __name: "today",
23
- setup(S) {
23
+ setup(M) {
24
24
  const { t: d } = le();
25
25
  m.instsBizDict.useValues(), m.merchantBizDict.useValues();
26
- const { proxy: _ } = G(), M = localStorage.getItem("tokenExt"), I = f([]), v = f(""), o = f({
27
- tokenExt: M ?? "",
26
+ const { proxy: _ } = G(), D = localStorage.getItem("tokenExt"), I = f([]), v = f(""), o = f({
27
+ tokenExt: D ?? "",
28
28
  channelId: v.value
29
29
  });
30
- function D() {
30
+ function $() {
31
31
  o.value.channelId = "", ae.findList({ merchantId: o.value.merchantId }).then((n) => {
32
32
  console.log(n, "=> res1231"), I.value = n.data.results, v.value = n.data.results.map((t) => t.channelId);
33
33
  });
34
34
  }
35
35
  const {
36
36
  tableHooks: u,
37
- multipleTableRef: $,
38
- queryFormRef: z,
39
- listLoading: N,
40
- tableData: j,
37
+ multipleTableRef: z,
38
+ queryFormRef: N,
39
+ listLoading: j,
40
+ tableData: T,
41
41
  total: p
42
42
  } = te(d, oe, o);
43
43
  let i = f([
@@ -52,7 +52,7 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
52
52
  {
53
53
  label: "settleTradeReceipt.merchantName",
54
54
  prop: "merchantName",
55
- width: "150",
55
+ width: "300",
56
56
  sortable: "custom",
57
57
  isColumn: !0
58
58
  },
@@ -125,7 +125,7 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
125
125
  }
126
126
  ]);
127
127
  function A() {
128
- o.value.merchantId = "", o.value.channelId = "";
128
+ o.value.merchantId = "", o.value.channelId = "", T.value = [];
129
129
  }
130
130
  function B(n) {
131
131
  u.selectionRows.value = n;
@@ -137,16 +137,16 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
137
137
  u.handleQuery(), u.getList();
138
138
  }
139
139
  return (n, t) => {
140
- const L = s("jmash-select"), g = s("el-form-item"), c = s("el-col"), P = s("el-option"), E = s("el-select"), T = s("el-button"), C = s("el-row"), Q = s("el-form"), H = s("jmash-column-select"), K = s("jmash-table"), Y = s("jmash-pagination"), q = s("el-card");
141
- return h(), R("div", re, [
140
+ const L = s("jmash-select"), g = s("el-form-item"), c = s("el-col"), P = s("el-option"), E = s("el-select"), C = s("el-button"), R = s("el-row"), Q = s("el-form"), H = s("jmash-column-select"), K = s("jmash-table"), Y = s("jmash-pagination"), q = s("el-card");
141
+ return h(), w("div", re, [
142
142
  a(Q, {
143
143
  ref_key: "queryFormRef",
144
- ref: z,
144
+ ref: N,
145
145
  model: o.value,
146
146
  inline: !0
147
147
  }, {
148
148
  default: l(() => [
149
- a(C, null, {
149
+ a(R, null, {
150
150
  default: l(() => [
151
151
  a(c, { span: 6 }, {
152
152
  default: l(() => [
@@ -160,11 +160,11 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
160
160
  "onUpdate:modelValue": t[0] || (t[0] = (e) => o.value.merchantId = e),
161
161
  placeholder: n.$t("payTrade.merchantIdRead"),
162
162
  data: r(m).merchantBizDict.values,
163
- onKeyup: t[1] || (t[1] = w((e) => r(u).handleQuery(), ["enter"])),
163
+ onKeyup: t[1] || (t[1] = k((e) => r(u).handleQuery(), ["enter"])),
164
164
  class: "!w-[203px]",
165
165
  filterable: "",
166
166
  clearable: "",
167
- onChange: D
167
+ onChange: $
168
168
  }, null, 8, ["modelValue", "placeholder", "data"])
169
169
  ]),
170
170
  _: 1
@@ -183,13 +183,13 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
183
183
  modelValue: o.value.channelId,
184
184
  "onUpdate:modelValue": t[2] || (t[2] = (e) => o.value.channelId = e),
185
185
  placeholder: n.$t("settleTradeAnalysis.channelIdRead"),
186
- onKeyup: t[3] || (t[3] = w((e) => r(u).handleQuery(), ["enter"])),
186
+ onKeyup: t[3] || (t[3] = k((e) => r(u).handleQuery(), ["enter"])),
187
187
  class: "!w-[203px]",
188
188
  filterable: "",
189
189
  clearable: ""
190
190
  }, {
191
191
  default: l(() => [
192
- (h(!0), R(J, null, O(I.value, (e) => (h(), k(P, {
192
+ (h(!0), w(J, null, O(I.value, (e) => (h(), V(P, {
193
193
  key: e.channelId,
194
194
  label: r(m).instsBizDict.getValue(e.instsId) || e.instsId,
195
195
  value: e.channelId
@@ -207,7 +207,7 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
207
207
  default: l(() => [
208
208
  a(g, { class: "search-btn" }, {
209
209
  default: l(() => [
210
- a(T, {
210
+ a(C, {
211
211
  type: "primary",
212
212
  onClick: t[4] || (t[4] = (e) => x())
213
213
  }, {
@@ -216,7 +216,7 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
216
216
  ]),
217
217
  _: 1
218
218
  }),
219
- a(T, {
219
+ a(C, {
220
220
  onClick: t[5] || (t[5] = (e) => A())
221
221
  }, {
222
222
  default: l(() => [
@@ -241,7 +241,7 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
241
241
  class: "table-container"
242
242
  }, {
243
243
  header: l(() => [
244
- a(C, null, {
244
+ a(R, null, {
245
245
  default: l(() => [
246
246
  a(c, {
247
247
  span: 24,
@@ -250,7 +250,7 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
250
250
  default: l(() => [
251
251
  a(H, {
252
252
  modelValue: r(i),
253
- "onUpdate:modelValue": t[6] || (t[6] = (e) => V(i) ? i.value = e : i = e),
253
+ "onUpdate:modelValue": t[6] || (t[6] = (e) => S(i) ? i.value = e : i = e),
254
254
  "label-name": "settle/settle-trade-receipt"
255
255
  }, null, 8, ["modelValue"])
256
256
  ]),
@@ -261,10 +261,10 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
261
261
  })
262
262
  ]),
263
263
  footer: l(() => [
264
- r(p) > 0 ? (h(), k(Y, {
264
+ r(p) > 0 ? (h(), V(Y, {
265
265
  key: 0,
266
266
  total: r(p),
267
- "onUpdate:total": t[7] || (t[7] = (e) => V(p) ? p.value = e : null),
267
+ "onUpdate:total": t[7] || (t[7] = (e) => S(p) ? p.value = e : null),
268
268
  "current-page": o.value.curPage,
269
269
  "onUpdate:currentPage": t[8] || (t[8] = (e) => o.value.curPage = e),
270
270
  "page-size": o.value.pageSize,
@@ -275,11 +275,11 @@ const oe = new ne(), re = { class: "app-container" }, me = /* @__PURE__ */ F({
275
275
  default: l(() => [
276
276
  a(K, {
277
277
  ref_key: "multipleTableRef",
278
- ref: $,
278
+ ref: z,
279
279
  "row-key": "receiptId",
280
280
  isSelection: !1,
281
- "list-loading": r(N),
282
- data: r(j),
281
+ "list-loading": r(j),
282
+ data: r(T),
283
283
  "table-label": r(i),
284
284
  onSelectionChange: B,
285
285
  onSortChange: U
@@ -1,11 +1,11 @@
1
- import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList, EntityExportReq } from "jmash-core";
1
+ import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList } from "jmash-core";
2
2
  export interface SettleTradeAnalysisApi extends EntityApi {
3
3
  }
4
4
  export interface SettleAgentTradeAnalysisReq extends EntityReq {
5
5
  agentCode?: string;
6
6
  merchantId?: string;
7
7
  likeMerchantNo?: string;
8
- instsId?: string;
8
+ channelId?: string;
9
9
  analysisTimeStart?: string;
10
10
  analysisTimeEnd?: string;
11
11
  marketBy?: string;
@@ -48,6 +48,3 @@ export interface SettleAgentTradeAnalysisKeyList extends EntityKeyList {
48
48
  tenant?: string;
49
49
  settleTradeAnalysisKey?: Array<SettleTradeAnalysisKey>;
50
50
  }
51
- export interface SettleAgentTradeAnalysisExportReq extends EntityExportReq {
52
- req: SettleAgentTradeAnalysisReq;
53
- }
@@ -1,4 +1,4 @@
1
- import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList, EntityExportReq } from "jmash-core";
1
+ import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList } from "jmash-core";
2
2
  export interface SettleMerchantTradeAnalysisApi extends EntityApi {
3
3
  }
4
4
  export interface SettleMerchantTradeAnalysisReq extends EntityReq {
@@ -60,6 +60,3 @@ export interface SettleMerchantTradeAnalysisKeyList extends EntityKeyList {
60
60
  tenant?: string;
61
61
  settleTradeAnalysisKey?: Array<SettleTradeAnalysisKey>;
62
62
  }
63
- export interface SettleMerchantTradeAnalysisExportReq extends EntityExportReq {
64
- req: SettleMerchantTradeAnalysisReq;
65
- }
@@ -1,4 +1,4 @@
1
- import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList, EntityExportReq } from "jmash-core";
1
+ import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList } from "jmash-core";
2
2
  export interface MySettleMerchantTradeAnalysisApi extends EntityApi {
3
3
  }
4
4
  export interface MySettleMerchantTradeAnalysisReq extends EntityReq {
@@ -60,6 +60,3 @@ export interface MySettleMerchantTradeAnalysisKeyList extends EntityKeyList {
60
60
  tenant?: string;
61
61
  settleTradeAnalysisKey?: Array<MySettleTradeAnalysisKey>;
62
62
  }
63
- export interface MySettleMerchantTradeAnalysisExportReq extends EntityExportReq {
64
- req: MySettleMerchantTradeAnalysisReq;
65
- }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xyvcard-settle",
3
- "version": "0.0.17",
3
+ "version": "0.0.19",
4
4
  "private": false,
5
5
  "module": "dist/index.mjs",
6
6
  "types": "dts/src/index.d.ts",