huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

手续费不填为o问题

lihuilin/feature-20251104102812-现金二期
ZhangYong 1 week ago
parent
012718026a
commit
a6049c22fe
2 changed files with 12 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  2. 7
      src/views/moneyManage/receiveDetail/receiveManage.vue

7
src/views/moneyManage/receiveDetail/receiveFinance.vue
View File

@ -941,7 +941,7 @@ const submitRefund = async () => {
freeGold: (refundFormData.value.freeGold) * 100 || 0, freeGold: (refundFormData.value.freeGold) * 100 || 0,
partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0, partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0, partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
handlingCharge: (refundFormData.value.handlingCharge) * 100 || 0,
handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
} }
}) })
if (result.code == 200) { if (result.code == 200) {
@ -1085,6 +1085,8 @@ watch(auditFormisible, (val) => {
// 2.5 编辑手续费功能 // 2.5 编辑手续费功能
// 打开编辑弹窗 // 打开编辑弹窗
const openEditForm = (row) => { const openEditForm = (row) => {
console.log('row.aaa', row.handlingCharge);
editFormData.value = { ...row }; editFormData.value = { ...row };
// 区分金币产品与普通产品 // 区分金币产品与普通产品
if (row.goodsName === '金币充值') isEditGold.value = true; if (row.goodsName === '金币充值') isEditGold.value = true;
@ -1112,12 +1114,13 @@ const submitEditForm = async () => {
if (editFormData.value.receivedTime) { if (editFormData.value.receivedTime) {
editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss'); editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
} }
console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
const result = await request({ const result = await request({
url: '/cashCollection/complete', url: '/cashCollection/complete',
data: { data: {
orderCode: editFormData.value.orderCode, orderCode: editFormData.value.orderCode,
handlingCharge: editFormData.value.handlingCharge * 100 , // 转为分单位
handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位
paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency), paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency), receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),

7
src/views/moneyManage/receiveDetail/receiveManage.vue
View File

@ -941,7 +941,7 @@ const submitRefund = async () => {
freeGold: (refundFormData.value.freeGold) * 100 || 0, freeGold: (refundFormData.value.freeGold) * 100 || 0,
partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0, partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0, partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
handlingCharge: (refundFormData.value.handlingCharge) * 100 || 0,
handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
} }
}) })
if (result.code == 200) { if (result.code == 200) {
@ -1085,6 +1085,8 @@ watch(auditFormisible, (val) => {
// 2.5 编辑手续费功能 // 2.5 编辑手续费功能
// 打开编辑弹窗 // 打开编辑弹窗
const openEditForm = (row) => { const openEditForm = (row) => {
console.log('row.aaa', row.handlingCharge);
editFormData.value = { ...row }; editFormData.value = { ...row };
// 区分金币产品与普通产品 // 区分金币产品与普通产品
if (row.goodsName === '金币充值') isEditGold.value = true; if (row.goodsName === '金币充值') isEditGold.value = true;
@ -1112,12 +1114,13 @@ const submitEditForm = async () => {
if (editFormData.value.receivedTime) { if (editFormData.value.receivedTime) {
editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss'); editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
} }
console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
const result = await request({ const result = await request({
url: '/cashCollection/complete', url: '/cashCollection/complete',
data: { data: {
orderCode: editFormData.value.orderCode, orderCode: editFormData.value.orderCode,
handlingCharge: editFormData.value.handlingCharge * 100 , // 转为分单位
handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位
paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency), paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency), receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),

Write Preview
Loading…
Cancel
Save