From c8448276fdf08d28206abb9e9d65d5515a19c564 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Fri, 23 Jan 2026 13:52:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=91=E5=B8=81=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/locales/lang/en.js | 1 + src/components/locales/lang/zh-CN.js | 1 + src/views/moneyManage/executor/executor.vue | 10 +++++----- src/views/moneyManage/refundDetail/refundHeader.vue | 8 ++++++++ src/views/moneyManage/refundDetail/refundService.vue | 8 +++++--- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 95ce268..b14158e 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -331,6 +331,7 @@ export default { limitJwcodeNine: "ID must be digits (max 9)", limitBalance: "Amount > balance", limitRefundAmount: "Refund > Order Amount", + pleaseSelectExecutor: "Please select executor", // Image Upload onlyUploadJPGPNG: "JPG/PNG only!", limitImageSize: "Max 1MB!", diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index 89f37d0..4dc4f10 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -331,6 +331,7 @@ export default { limitJwcodeNine: "精网号必须为数字且不超过九位", limitBalance: "所填金额大于该类金币余额", limitRefundAmount: "退款金额不能大于订单金额", + pleaseSelectExecutor: "请选择执行人", // 图片上传 onlyUploadJPGPNG: "只能上传 JPG/PNG 图片!", limitImageSize: "图片大小不能超过 1MB!", diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 52610fa..078d5dd 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -12,7 +12,7 @@
{{ t('common.productName') }} - +
{{ t('common.market') }} @@ -197,8 +197,8 @@ show-word-limit clearable />
- 退款理由 - {{ t('common_add.refundReason') }} +
@@ -304,8 +304,8 @@ const getRefund = async function () { statusesParam.value = [40, 41] } - const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0 - ? searchForm.value.goodsName: [] + let goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0 + ? [searchForm.value.goodsName] : [] if (searchForm.value.jwcode) { const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode); diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 3535aa1..4230485 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -485,6 +485,10 @@ const executorList = ref([ { value: '90047947', label: '宋彤彤' + }, + { + value: '90047860', + label: 'zy' } ]) // 查全部 @@ -558,6 +562,10 @@ const handlePass = async function () { ElMessage.error(t('elmessage.noPermission')) return } + if (!addForm.value.executor) { + ElMessage.error(t('elmessage.pleaseSelectExecutor')) + return + } try { const params = { id: auditRow.value.id, diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index a237c7c..38896b1 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -14,7 +14,7 @@
{{ t('common.productName') }} - +
{{ t('common.market') }} @@ -322,8 +322,10 @@ const getRefund = async function () { statusParam.value = [12, 22, 32] } - const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0 - ? searchForm.value.goodsName : [] + console.log('goodsName', searchForm.value.goodsName); + + let goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0 + ? [searchForm.value.goodsName] : [] if (searchForm.value.jwcode) { const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode); From 05161ca80b0beda952e2716b2abf7148ceb508bb Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Fri, 23 Jan 2026 14:32:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=89=E6=9C=9F=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/financialAccount/cashFlow.vue | 2 +- src/views/moneyManage/receiveDetail/receiveFinance.vue | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index 9414d2d..5f2805d 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -93,7 +93,7 @@ const fetchData = async () => { pageSize: queryParams.pageSize, fundsDTO: { jwcode: queryParams.jwcode, - markets: queryParams.markets, + localMarket:queryParams.markets, startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', payType: queryParams.payType, diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index bb20121..2948941 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -445,11 +445,11 @@
- - @@ -1191,7 +1191,11 @@ watch(auditFormisible, (val) => { const openEditForm = (row) => { console.log('row.aaa', row.handlingCharge); - editFormData.value = { ...row }; + editFormData.value = { + ...row, + paymentCurrencyOrig: row.paymentCurrency, + paymentAmountOrig: row.paymentAmount, + }; // 区分金币产品与普通产品 if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true; else isEditGold.value = false; @@ -1235,7 +1239,9 @@ const submitEditForm = async () => { receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency), receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位 receivedTime: editFormData.value.receivedTime, - receivedRemark: editFormData.value.receivedRemark || '' + receivedRemark: editFormData.value.receivedRemark || '', + paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig, + paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig), } }); From 75c0403be1f20a22f3f55d550800b0858390bc4f Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Fri, 23 Jan 2026 14:56:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/executor/executor.vue | 8 ++++++- .../moneyManage/receiveDetail/receiveFinance.vue | 4 ++-- .../moneyManage/receiveDetail/receiveManage.vue | 26 +++++++++++++--------- .../moneyManage/receiveDetail/receiveService.vue | 11 ++------- .../moneyManage/refundDetail/refundCharge.vue | 8 ++++++- .../moneyManage/refundDetail/refundFinance.vue | 8 ++++++- .../moneyManage/refundDetail/refundHeader.vue | 8 ++++++- .../moneyManage/refundDetail/refundService.vue | 8 ++++++- 8 files changed, 55 insertions(+), 26 deletions(-) diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 078d5dd..3398999 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -63,7 +63,13 @@ - + + +