diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 5a93368..a7ba2d2 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -941,7 +941,7 @@ const submitRefund = async () => { freeGold: (refundFormData.value.freeGold) * 100 || 0, partRefundGold: (refundFormData.value.partRefundGold) * 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) { @@ -1085,6 +1085,8 @@ watch(auditFormisible, (val) => { // 2.5 编辑手续费功能 // 打开编辑弹窗 const openEditForm = (row) => { + console.log('row.aaa', row.handlingCharge); + editFormData.value = { ...row }; // 区分金币产品与普通产品 if (row.goodsName === '金币充值') isEditGold.value = true; @@ -1112,12 +1114,13 @@ const submitEditForm = async () => { if (editFormData.value.receivedTime) { 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({ url: '/cashCollection/complete', data: { orderCode: editFormData.value.orderCode, - handlingCharge: editFormData.value.handlingCharge * 100 , // 转为分单位 + handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency), paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency), diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index 5a93368..a7ba2d2 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -941,7 +941,7 @@ const submitRefund = async () => { freeGold: (refundFormData.value.freeGold) * 100 || 0, partRefundGold: (refundFormData.value.partRefundGold) * 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) { @@ -1085,6 +1085,8 @@ watch(auditFormisible, (val) => { // 2.5 编辑手续费功能 // 打开编辑弹窗 const openEditForm = (row) => { + console.log('row.aaa', row.handlingCharge); + editFormData.value = { ...row }; // 区分金币产品与普通产品 if (row.goodsName === '金币充值') isEditGold.value = true; @@ -1112,12 +1114,13 @@ const submitEditForm = async () => { if (editFormData.value.receivedTime) { 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({ url: '/cashCollection/complete', data: { orderCode: editFormData.value.orderCode, - handlingCharge: editFormData.value.handlingCharge * 100 , // 转为分单位 + handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency), paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),