Browse Source

Merge branch 'milestone-20250913-现金管理' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20250913-现金管理

zhangrenyuan/feature-20250917134308-现金管理
zhangrenyuan 1 month ago
parent
commit
137a041f99
  1. 4
      .env.development
  2. 4
      src/views/moneyManage/receiveDetail/receiveDetail.vue
  3. 6
      src/views/moneyManage/refundDetail/refundHeader.vue

4
.env.development

@ -1,4 +1,4 @@
VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# 测试环境
# VITE_API_BASE='http://54.255.212.181:10704/'
# 正式环境
@ -17,4 +17,4 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# lijianlin
# VITE_API_BASE='http://192.168.9.41:8081/'
# VITE_API_BASE='http://localhost:8081/'
VITE_API_BASE='http://localhost:8081/'

4
src/views/moneyManage/receiveDetail/receiveDetail.vue

@ -1160,8 +1160,8 @@ const submitRefund = async () => {
refundModel: refundFormData.value.refundModel, // 退0-1-
id: refundFormData.value.id, //id
orderCode: refundFormData.value.orderCode,
permanentGold: (refundFormData.value.permanentGold) * 100 || null,
freeGold: (refundFormData.value.freeGold) * 100 || null
permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
freeGold: (refundFormData.value.freeGold) * 100 || 0
}
})
if (result.code == 200) {

6
src/views/moneyManage/refundDetail/refundHeader.vue

@ -521,7 +521,11 @@ const handlePass = async function () {
status: 40,
headFinance: adminData.value.adminName,
auditId: auditRow.value.auditId,
goodsName: auditRow.value.goodsName
goodsName: auditRow.value.goodsName,
permanentGold: auditRow.value.permanentGold,
freeGold: auditRow.value.freeGold,
orderCode: auditRow.value.orderCode,
jwcode: auditRow.value.jwcode
}
const result = await API({
url: '/Money/finalReview',

Loading…
Cancel
Save