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
a69e114da1
commit
04b38988d2
1 changed files with 176 additions and 100 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. 276
      src/views/moneyManage/receiveDetail/receiveDetail.vue

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

@ -48,7 +48,8 @@
</div>
<div class="rowItem">
<el-text style="width: 4vw;">产品名称</el-text>
<el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;" clearable/>
<el-cascader v-model="searchData.goodsName" :options="productList" style="width: 10vw;"
clearable />
</div>
<div class="rowItem" style="width: 30vw">
<el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
@ -123,32 +124,37 @@
<el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
<el-table-column fixed="left" prop="name" label="姓名" width="110px" />
<el-table-column prop="marketName" label="所属地区" width="80px" />
<el-table-column prop="activity" label="活动名称" width="120px" />
<el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip/>
<el-table-column prop="goodsName" label="产品名称" width="120px" />
<el-table-column prop="goodNum" label="产品数量" width="120px" />
<el-table-column prop="goodNum" label="产品数量" width="130px" >
<template #default="scope">
<span v-if="scope.row.goodsName == '金币充值'">{{ scope.row.permanentGold }}</span>
<span v-else>{{ scope.row.goodNum }}</span>
</template>
</el-table-column>
<el-table-column prop="paymentCurrency" label="付款币种" width="100px">
</el-table-column>
<el-table-column prop="paymentAmount" label="付款金额" width="120px">
</el-table-column>
<el-table-column prop="receivedCurrency" label="到账币种" v-if="!kefu && activeTab == 'pass'"
width="150px"></el-table-column>
<el-table-column prop="receivedAmount" label="到账金额" v-if="!kefu && activeTab == 'pass'"
width="150px">
<el-table-column prop="receivedCurrency" label="到账币种"
v-if="!kefu && activeTab == 'pass' || activeTab == 'done'" width="150px"></el-table-column>
<el-table-column prop="receivedAmount" label="到账金额"
v-if="!kefu && activeTab == 'pass' || activeTab == 'done'" width="150px">
<template #default="scope">
<div v-if="!scope.row.receivedAmount">
<text style="color: #FA5A1E;">待补充</text>
</div>
</template>
</el-table-column>
<el-table-column prop="handlingCharge" label="手续费" v-if="!kefu && activeTab == 'pass'"
width="150px">
<el-table-column prop="handlingCharge" label="手续费"
v-if="!kefu && activeTab == 'pass' || activeTab == 'done'" width="150px">
<template #default="scope">
<div v-if="!scope.row.handlingCharge">
<text style="color: #FA5A1E;">待补充</text>
</div>
</template>
</el-table-column>
<el-table-column prop="payType" label="支付方式" width="110px">
<el-table-column prop="payType" label="支付方式" width="130px">
</el-table-column>
<el-table-column prop="payTime" label="付款时间" width="180px" />
<el-table-column prop="voucher" label="转账凭证" width="110px">
@ -169,10 +175,10 @@
<el-table-column prop="submitterName" label="提交人" width="150px"
show-overflow-tooltip></el-table-column>
<el-table-column prop="auditName" label="审核人"
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">
v-if="!kefu && activeTab == 'pass' || activeTab == 'reject' || activeTab == 'done'"
width="150px" show-overflow-tooltip></el-table-column>
<el-table-column prop="receivedTime" label="到账时间"
v-if="caiwu && activeTab == 'pass' || activeTab == 'done'" width="180px">
</el-table-column>
<el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
show-overflow-tooltip></el-table-column>
@ -742,8 +748,8 @@ const getlist = async () => {
cashRoleId: cashRoleId,
paymentCurrency: payCurrencySelect,
submitterMarket: receivedMarket,
goodsName:goodsName,
market:MarketNameForId(searchData.value.market)
goodsName: goodsName,
market: MarketNameForId(searchData.value.market)
}
}
})
@ -1093,7 +1099,10 @@ const submitRefund = async () => {
remark: refundFormData.value.remark, // 备注信息（可选）
refundReason: refundFormData.value.refundReason, // 退款备注-客服填写（可选）
refundModel: refundFormData.value.refundModel, // 退款方式：0-全额，1-部分（可选）
id: refundFormData.value.id //订单id
id: refundFormData.value.id, //订单id
orderCode: refundFormData.value.orderCode,
permanentGold: (refundFormData.value.permanentGold) * 100 || null,
freeGold: (refundFormData.value.freeGold) * 100 || null
}
})
if (result.code == 200) {
@ -1392,7 +1401,7 @@ const productList = [
"children": [
{
"value": "金币充值",
"label": "金币充值",
"label": "金币充值"
}
]
},
@ -1401,118 +1410,185 @@ const productList = [
"label": "软件产品",
"children": [
{
"value": "美股",
"label": "美股",
"value": "软件",
"label": "软件",
"children": [
{
"value": "美股软件",
"label": "美股软件"
}
]
},
{
"value": "港股",
"label": "港股",
"children": [
"value": "美股",
"label": "美股",
"children": [
{
"value": "美股软件",
"label": "美股软件"
}
]
},
{
"value": "港股软件",
"label": "港股软件"
}
]
},
{
"value": "A股",
"label": "A股",
"children": [
"value": "港股",
"label": "港股",
"children": [
{
"value": "港股软件",
"label": "港股软件"
}
]
},
{
"value": "A股软件",
"label": "A股软件"
}
]
},
{
"value": "新加坡股",
"label": "新加坡股",
"children": [
"value": "A股",
"label": "A股",
"children": [
{
"value": "A股软件",
"label": "A股软件"
}
]
},
{
"value": "新加坡股软件",
"label": "新加坡股软件"
}
]
},
{
"value": "马股",
"label": "马股",
"children": [
"value": "新加坡股",
"label": "新加坡股",
"children": [
{
"value": "新加坡股软件",
"label": "新加坡股软件"
}
]
},
{
"value": "马股软件",
"label": "马股软件"
}
]
},
{
"value": "日本股",
"label": "日本股",
"children": [
"value": "马股",
"label": "马股",
"children": [
{
"value": "马股软件",
"label": "马股软件"
}
]
},
{
"value": "日本股软件",
"label": "日本股软件"
}
]
},
{
"value": "泰股",
"label": "泰股",
"children": [
"value": "日本股",
"label": "日本股",
"children": [
{
"value": "日本股软件",
"label": "日本股软件"
}
]
},
{
"value": "泰股软件",
"label": "泰股软件"
}
]
},
{
"value": "越南股",
"label": "越南股",
"children": [
"value": "泰股",
"label": "泰股",
"children": [
{
"value": "泰股软件",
"label": "泰股软件"
}
]
},
{
"value": "越南股",
"label": "越南股",
"children": [
{
"value": "越南股软件",
"label": "越南股软件"
}
]
},
{
"value": "越南股软件",
"label": "越南股软件"
"value": "印尼股",
"label": "印尼股",
"children": [
{
"value": "印尼股软件",
"label": "印尼股软件"
}
]
},
{
"value": "韩国股",
"label": "韩国股",
"children": [
{
"value": "韩国股软件",
"label": "韩国股软件"
}
]
},
{
"value": "台湾股",
"label": "台湾股",
"children": [
{
"value": "台湾股软件",
"label": "台湾股软件"
}
]
}
]
},
{
"value": "印尼股",
"label": "印尼股",
"value": "AI机构探测神器",
"label": "AI机构探测神器",
"children": [
{
"value": "印尼股软件",
"label": "印尼股软件"
"value": "AI机构追踪",
"label": "AI机构追踪"
},
{
"value": "AI机构出击",
"label": "AI机构出击"
},
{
"value": "AI机构资金",
"label": "AI机构资金"
},
{
"value": "AI机活跃度",
"label": "AI机活跃度"
}
]
},
{
"value": "韩国股",
"label": "韩国股",
"value": "超级机构探测神器",
"label": "超级机构探测神器",
"children": [
{
"value": "韩国股软件",
"label": "韩国股软件"
"value": "超级机构透视",
"label": "超级机构透视"
},
{
"value": "超级机构伏击",
"label": "超级机构伏击"
},
{
"value": "超级机构猎杀",
"label": "超级机构猎杀"
},
{
"value": "超级机构脉博",
"label": "超级机构脉博"
},
{
"value": "超级机构罗盘",
"label": "超级机构罗盘"
}
]
},
{
"value": "台湾股",
"label": "台湾股",
"value": "其他",
"label": "其他",
"children": [
{
"value": "台湾股软件",
"label": "台湾股软件"
"value": "静态信息费",
"label": "静态信息费"
},
{
"value": "博股会员",
"label": "博股会员"
}
]
}
]
},
}
]
// 获取活动信息
const getActivitys = async function () {
@ -1610,7 +1686,7 @@ onMounted(async function () {
.content {
//整体内容
height: 100%;
width: 83vw;
width: 80vw;
.card1 {
// 筛选框

Write Preview
Loading…
Cancel
Save