diff --git a/.env.development b/.env.development index 6863c9d..78c0c88 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 60af7a3..3cf3222 100644 --- a/src/views/moneyManage/receiveDetail/receiveDetail.vue +++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue @@ -677,6 +677,7 @@ const getlist = async () => { cashRoleId = '1' if (activeTab.value == 'wait') { searchData.value.status = 0 + } else if (activeTab.value == 'pass') { searchData.value.status = 1346 } else if (activeTab.value == 'reject') { @@ -693,9 +694,10 @@ const getlist = async () => { ...searchData.value, ...getTime.value, submitterId: adminData.value.id, - receivedMarket: receivedMarket, + receivedMarket: MarketNameForId(receivedMarket), cashRoleId: cashRoleId, - paymentCurrency: payCurrencySelect + paymentCurrency: payCurrencySelect, + submitterMarket:receivedMarket } } }) @@ -846,7 +848,8 @@ const handleAddForm = async () => { goodNum: addFormData.value.goodNum || 0, paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '', receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '', - paymentAmount: (addFormData.value.paymentAmount) * 100 + paymentAmount: (addFormData.value.paymentAmount) * 100, + submitterMarket:adminData.value.markets } }) if (result.code == 200) { @@ -985,10 +988,10 @@ const submitRefund = async () => { goodsName: refundFormData.value.goodsName, // 商品名称(必填) goodNum: refundFormData.value.goodNum, // 商品数量(必填,默认0) paymentCurrency: refundFormData.value.paymentCurrency, // 付款币种(必填) - paymentAmount: refundFormData.value.paymentAmount, // 付款金额(必填) + paymentAmount: (refundFormData.value.paymentAmount)*100, // 付款金额(必填) receivedCurrency: refundFormData.value.receivedCurrency, // 到账币种(必填) - receivedAmount: refundFormData.value.receivedAmount, // 到账金额(必填) - handlingCharge: refundFormData.value.handlingCharge, // 手续费(可选) + receivedAmount: (refundFormData.value.receivedAmount)*100, // 到账金额(必填) + handlingCharge: (refundFormData.value.handlingCharge)*100, // 手续费(可选) receivedMarket: refundFormData.value.receivedMarket, // 到账地区(可选) payType: refundFormData.value.payType, // 支付方式(必填) payTime: refundFormData.value.payTime, // 付款时间,格式:yyyy-MM-dd HH:mm:ss(可选)