Browse Source

Merge branch 'milestone-20260212-日常优化2.0' into milestone-20260304-钱包体系

jiangcheng/feature-20260306102603-钱包体系
zhangrenyuan 1 month ago
parent
commit
3a6f816073
  1. 1
      src/components/locales/lang/zh-CN.js
  2. 5
      src/views/moneyManage/financialAccount/cashFlow.vue

1
src/components/locales/lang/zh-CN.js

@ -206,6 +206,7 @@ export default {
staffShown: "员工数据已显示",
jumpSuccess: "跳转成功",
jumpFailed: "跳转失败",
refundFailed: "退款失败",
oldPasswordError: "原密码错误,请重新输入",
addSuccess: "添加成功", // 大写是添加成功,小写是新增
addsuccess: "新增成功",

5
src/views/moneyManage/financialAccount/cashFlow.vue

@ -206,7 +206,7 @@ const resetRefund = () => {
}
const handleRefund = async () => {
try {
if (refundFormData.value.refundModel == 1) {
if (refundFormData.value.refundModel == 0) {
refundFormData.value.permanentGold = refundFormData.value.oldpermanentGold
refundFormData.value.freeGold = refundFormData.value.oldfreeGold
}
@ -221,10 +221,11 @@ const handleRefund = async () => {
refundModel: refundFormData.value.refundModel,
orderCode: refundFormData.value.orderCode,
submitterId: adminData.value.id,
submitterMarket: adminData.value.markets,
permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
freeGold: (refundFormData.value.freeGold) * 100 || 0,
partRefundGold: refundFormData.value.refundModel == 1 ? (refundFormData.value.permanentGold * 100 || 0) : 0,
partRefundFree: refundFormData.value.refundModel == 1 ? (refundFormData.value.freeGold * 100 || 0) : 0,
}
console.log('这是退款参数:', params);

Loading…
Cancel
Save