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

bug修改

zhangyong/milestone-20250913-现金管理
ZhangYong 1 month ago
parent
2a79aa8586
commit
7a06a2d210
1 changed files with 47 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      src/views/moneyManage/receiveDetail/receiveDetail.vue

58
src/views/moneyManage/receiveDetail/receiveDetail.vue
View File

@ -125,9 +125,9 @@
</el-table-column>
<el-table-column prop="paymentAmount" label="付款金额" width="120px">
</el-table-column>
<el-table-column prop="receivedCurrency" label="到账币种" v-if="caiwu && activeTab == 'pass'"
<el-table-column prop="receivedCurrency" label="到账币种" v-if="!kefu && activeTab == 'pass'"
width="150px"></el-table-column>
<el-table-column prop="receivedAmount" label="到账金额" v-if="caiwu && activeTab == 'pass'"
<el-table-column prop="receivedAmount" label="到账金额" v-if="!kefu && activeTab == 'pass'"
width="150px">
<template #default="scope">
<div v-if="!scope.row.receivedAmount">
@ -135,7 +135,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="handlingCharge" label="手续费" v-if="caiwu && activeTab == 'pass'"
<el-table-column prop="handlingCharge" label="手续费" v-if="!kefu && activeTab == 'pass'"
width="150px">
<template #default="scope">
<div v-if="!scope.row.handlingCharge">
@ -164,7 +164,7 @@
<el-table-column prop="submitterName" label="提交人" width="150px"
show-overflow-tooltip></el-table-column>
<el-table-column prop="auditName" label="审核人"
v-if="caiwu && activeTab == 'pass' || activeTab == 'reject'" width="150px"
v-if="!kefu && activeTab == 'pass' || activeTab == 'reject'" width="150px"
show-overflow-tooltip></el-table-column>
<el-table-column prop="receivedTime" label="到账时间" v-if="caiwu && activeTab == 'pass'"
width="150px">
@ -451,6 +451,29 @@
<el-select disabled="true" v-model="editFormData.goodsName" placeholder="请选择产品名称"
clearable></el-select>
</el-form-item>
<el-form-item v-show="!isEditGold" label="产品数量">
<div style="padding-right: 50px; display: flex;">
<el-input disabled="true" style="padding-right: 10px;" v-model="editFormData.goodNum"
placeholder="请输入产品数量" />
<span style="color: #999999;">个</span>
</div>
</el-form-item>
<div v-show="isEditGold" style="margin-bottom: 15px; display: flex;">
<div style=" display: flex; ">
<span
style="color: #999999; display: flex; white-space: nowrap;align-items: center;">永久金币：</span>
<el-input disabled="true"
style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
v-model="editFormData.permanentGold" />
</div>
<div style="padding-right: 5px; display: flex;">
<span
style="color: #999999; display: flex; white-space: nowrap;align-items: center;">免费金币：</span>
<el-input disabled="true"
style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
v-model="editFormData.freeGold" />
</div>
</div>
<el-form-item label="付款币种">
<CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
:items="customOptions" placeholder="请选择付款币种" />
@ -637,7 +660,10 @@ const tableData = ref([])
const searchData = ref({
})
const defaultTime = [
new Date(2000, 1, 1, 0, 0, 0),
new Date(2000, 2, 1, 23, 59, 59),
]
const getTime = ref([])
const search = () => {
@ -697,7 +723,7 @@ const getlist = async () => {
receivedMarket: MarketNameForId(receivedMarket),
cashRoleId: cashRoleId,
paymentCurrency: payCurrencySelect,
submitterMarket:receivedMarket
submitterMarket: receivedMarket
}
}
})
@ -773,6 +799,14 @@ const ifGold = () => {
isGold.value = false
}
}
const isEditGold = ref(false)
const EditifGold = () => {
if (editFormData.value.goodsName == '金币充值') {
isEditGold.value = true
} else {
isEditGold.value = false
}
}
//是否为默认归属平台
const isGroup = ref(false)
@ -852,7 +886,7 @@ const handleAddForm = async () => {
paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '',
receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '',
paymentAmount: (addFormData.value.paymentAmount) * 100,
submitterMarket:adminData.value.markets
submitterMarket: adminData.value.markets
}
})
if (result.code == 200) {
@ -991,16 +1025,16 @@ const submitRefund = async () => {
goodsName: refundFormData.value.goodsName, // 商品名称（必填）
goodNum: refundFormData.value.goodNum, // 商品数量（必填，默认0）
paymentCurrency: refundFormData.value.paymentCurrency, // 付款币种（必填）
paymentAmount: (refundFormData.value.paymentAmount)*100, // 付款金额（必填）
paymentAmount: (refundFormData.value.paymentAmount) * 100, // 付款金额（必填）
receivedCurrency: refundFormData.value.receivedCurrency, // 到账币种（必填）
receivedAmount: (refundFormData.value.receivedAmount)*100, // 到账金额（必填）
handlingCharge: (refundFormData.value.handlingCharge)*100, // 手续费（可选）
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（可选）
receivedTime: refundFormData.value.receivedTime, // 到账时间，格式：yyyy-MM-dd HH:mm:ss（可选）
areaServise: adminData.value.adminName, // 提交人（可选）
submitterId:adminData.value.id,
submitterId: adminData.value.id,
voucher: refundFormData.value.voucher, // 转账凭证URL（可选）
remark: refundFormData.value.remark, // 备注信息（可选）
refundReason: refundFormData.value.refundReason, // 退款备注-客服填写（可选）
@ -1077,6 +1111,7 @@ const editFormisible = ref(false)
const openEditForm = (row) => {
console.log('编辑时该行数据：', row);
editFormData.value = row
EditifGold()
if (row.status == 3) {
ifOnline.value = true
} else {
@ -1087,6 +1122,7 @@ const openEditForm = (row) => {
const closeEditForm = () => {
editFormisible.value = false
editFormData.value = {}
getlist()
}
//提交编辑
const submitEditForm = async () => {

Write Preview
Loading…
Cancel
Save