diff --git a/.env.development b/.env.development
index f5ced3b..0989c6a 100644
--- a/.env.development
+++ b/.env.development
@@ -11,7 +11,7 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# zhangyong
# VITE_API_BASE='http://192.168.3.83:8081/'
# 本地
-# VITE_API_BASE='http://localhost:8081/'
+VITE_API_BASE='http://localhost:8081/'
# sunjiabei
# VITE_API_BASE='http://192.168.1.70:8081/'
diff --git a/src/views/moneyManage/receiveDetail/receiveDetail.vue b/src/views/moneyManage/receiveDetail/receiveDetail.vue
index 51dea08..04d9aa2 100644
--- a/src/views/moneyManage/receiveDetail/receiveDetail.vue
+++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue
@@ -218,7 +218,7 @@
编辑
撤回
+ @click="openConfirm('recall',scope.row)">撤回
查看驳回理由
取消
-
+
@@ -452,11 +452,12 @@
clearable>
-
+
-
+
{
submitterId: adminData.value.id,
permanentGold: (addFormData.value.permanentGold || 0) * 100,
freeGold: (addFormData.value.freeGold || 0) * 100,
- goodNum: paymentAmount || 0,
+ goodNum: addFormData.value.goodNum || 0,
paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '',
receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '',
- paymentAmount:(addFormData.value.freeGold)*100
+ paymentAmount: (addFormData.value.paymentAmount) * 100
}
})
if (result.code == 200) {
@@ -1012,6 +1013,7 @@ const submitRefund = async () => {
const textContent = ref('')
const recallDialog = ref(false)
const refundConfirmDialog = ref(false)
+const RecallNum = ref('')
const openConfirm = (val, row) => {
console.log('打开弹窗', val, row);
if (val == 'refund') {
@@ -1022,11 +1024,31 @@ const openConfirm = (val, row) => {
if (val == 'recall') {
textContent.value = '将要撤回该信息!'
recallDialog.value = true
+ RecallNum.value = row.orderCode
}
}
const closeRecall = () => {
recallDialog.value = false
textContent.value = ''
+ RecallNum.value = ''
+}
+const handleRecall = async() => {
+ try {
+ const result = await request({
+ url: '/cashCollection/cancel',
+ data: {
+ orderCode: RecallNum.value,
+ }
+ })
+ if (result.code == 200) {
+ ElMessage.success('撤回成功')
+ getlist()
+ closeRecall()
+ }
+ console.log('返回参数:', result);
+ } catch (error) {
+ console.log(error);
+ }
}
const closeConfirmRefund = () => {
refundConfirmDialog.value = false
@@ -1042,9 +1064,9 @@ const editFormisible = ref(false)
const openEditForm = (row) => {
console.log('编辑时该行数据:', row);
editFormData.value = row
- if(row.status == 3){
+ if (row.status == 3) {
ifOnline.value = true
- }else{
+ } else {
ifOnline.value = false
}
editFormisible.value = true
@@ -1065,7 +1087,7 @@ const submitEditForm = async () => {
orderCode: editFormData.value.orderCode,
handlingCharge: editFormData.value.handlingCharge * 100,
paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
- paymentAmount: (editFormData.value.paymentAmount)*100,
+ paymentAmount: (editFormData.value.paymentAmount) * 100,
receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
receivedAmount: editFormData.value.receivedAmount * 100,
receivedTime: editFormData.value.receivedTime,