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

退款方式+重置500

lihuilin/feature-20250923114949-现金
lihuilin 1 month ago
parent
b0ab36550b
commit
f01236f6dd
4 changed files with 107 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      src/views/moneyManage/executor/executor.vue
  2. 48
      src/views/moneyManage/refundDetail/refundCharge.vue
  3. 49
      src/views/moneyManage/refundDetail/refundFinance.vue
  4. 107
      src/views/moneyManage/refundDetail/refundHeader.vue

27
src/views/moneyManage/executor/executor.vue
View File

@ -35,7 +35,7 @@
<div class="search2"> <div class="search2">
<el-text size="large" style="width:4vw;">订单状态</el-text> <el-text size="large" style="width:4vw;">订单状态</el-text>
<el-select v-model="searchForm.statuses" style="width:9vw;" clearable> <el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select> </el-select>
</div> </div>
<div class="search2" style="width: 28vw;"> <div class="search2" style="width: 28vw;">
@ -104,7 +104,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="status" label="订单状态" width="120"> <el-table-column prop="status" label="订单状态" width="120">
<template #default="scope"> <template #default="scope">
{{ scope.row.status === 41 ? '已完成' : '待处理' }}
{{ scope.row.status === 41 ? '退款成功' : '待处理' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="operation" label="操作" fixed="right" width="100px"> <el-table-column prop="operation" label="操作" fixed="right" width="100px">
@ -252,6 +252,7 @@ const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload'
const dateRange = ref([]) const dateRange = ref([])
const tableData = ref([]) const tableData = ref([])
const editRow = ref({})// 编辑回显 const editRow = ref({})// 编辑回显
const statusList = ref(['待处理', '退款成功'])
const pagination = ref({ const pagination = ref({
pageNum: 1, pageNum: 1,
pageSize: 50, pageSize: 50,
@ -270,7 +271,14 @@ const editForm = ref({
// 查全部 // 查全部
const getRefund = async function () { const getRefund = async function () {
try { try {
searchForm.value.statuses = [40, 41] // 默认：看不到进度没到这里的
const statusesParam = [40, 41] // 默认：看不到进度没到这里的
if(searchForm.value.statuses === '待处理'){
statusesParam.value = [40]
} else if (searchForm.value.statuses === '退款成功'){
statusesParam.value = [41]
} else {
statusesParam.value = [40, 41]
}
const params = { const params = {
pageNum: pagination.value.pageNum, pageNum: pagination.value.pageNum,
@ -280,7 +288,7 @@ const getRefund = async function () {
name: searchForm.value.name, name: searchForm.value.name,
markets: searchForm.value.markets, markets: searchForm.value.markets,
goodsNames: searchForm.value.goodsName, goodsNames: searchForm.value.goodsName,
statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
statuses: statusesParam.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
@ -378,17 +386,6 @@ const hideEditDialog = () => {
jwcode: '' jwcode: ''
} }
} }
const statusList = ref([
{
value: 40,
label: '待处理',
},
{
value: 41,
label: '退款完成'
}
])
const channelOptions = ref([{ const channelOptions = ref([{
value: '银行转账', value: '银行转账',
label: '银行转账' label: '银行转账'

48
src/views/moneyManage/refundDetail/refundCharge.vue
View File

@ -23,7 +23,7 @@
<div class="item1"> <div class="item1">
<el-text size="large" style="width:4vw;">订单状态</el-text> <el-text size="large" style="width:4vw;">订单状态</el-text>
<el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable> <el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select> </el-select>
</div> </div>
</div> </div>
@ -75,9 +75,10 @@
<el-table-column prop="status" label="订单状态" width="120"> <el-table-column prop="status" label="订单状态" width="120">
<template #default="scope"> <template #default="scope">
{{ {{
[20, 30, 40].includes(scope.row.status) ? '审核中' :
[22, 32].includes(scope.row.status) ? '审核驳回' :
scope.row.status === 41 ? '退款完成' : scope.row.status
[20].includes(scope.row.status) ? '待审核' :
[30,40].includes(scope.row.status) ? '审核通过' :
[22, 32].includes(scope.row.status) ? '已驳回' :
scope.row.status === 41 ? '退款成功' : scope.row.status
}} }}
</template> </template>
</el-table-column> </el-table-column>
@ -104,7 +105,7 @@
<div class="top"> <div class="top">
<el-button @click="" class="smallTitle" size="small">退款申请信息</el-button> <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
<div class="top-item"> <div class="top-item">
<el-text style="width:4vw;" size="small">退款类型</el-text>
<el-text style="width:4vw;" size="small">退款方式</el-text>
<el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled> <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
<el-option label="全部退款" :value="0"></el-option> <el-option label="全部退款" :value="0"></el-option>
<el-option label="部分退款" :value="1"></el-option> <el-option label="部分退款" :value="1"></el-option>
@ -427,24 +428,7 @@ const channelOptions = ref([{
label: 'Ipay88-Link平台' label: 'Ipay88-Link平台'
} }
]) ])
const statusList = ref([
{
value: 20,
label: '待审核',
},
{
value: '审核通过',
label: '审核通过'
},
{
value: '审核驳回',
label: '审核驳回'
},
{
value: 41,
label: '退款完成'
}
])
const statusList = ref(['待审核','审核通过','已驳回','退款成功'])
// 查全部 // 查全部
const getRefund = async function () { const getRefund = async function () {
if (!hasMenuPermission(menuTree.value, permissionMapping.refundChargeShow)) { if (!hasMenuPermission(menuTree.value, permissionMapping.refundChargeShow)) {
@ -452,11 +436,17 @@ const getRefund = async function () {
return return
} }
try { try {
searchForm.value.statuses = [20, 22, 30, 32, 40, 41] // 看不到进度没到这里的
const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的
if (searchForm.value.statuses === '审核通过') { if (searchForm.value.statuses === '审核通过') {
statuses = [30, 40]
} else if (searchForm.value.statuses === '审核驳回') {
statuses = [22, 32]
statuses.value = [30, 40]
} else if (searchForm.value.statuses === '已驳回') {
statuses.value = [22, 32]
} else if (searchForm.value.statuses === '待审核') {
statuses.value = [20]
} else if (searchForm.value.statuses === '退款成功') {
statuses.value = [41]
} else {
statuses.value = [20, 22, 30, 32, 40, 41]
} }
const params = { const params = {
pageNum: pagination.value.pageNum, pageNum: pagination.value.pageNum,
@ -466,7 +456,7 @@ const getRefund = async function () {
name: searchForm.value.name,//姓名 name: searchForm.value.name,//姓名
markets: searchForm.value.markets,//地区 markets: searchForm.value.markets,//地区
goodsNames: searchForm.value.goodsName,//商品名 goodsNames: searchForm.value.goodsName,//商品名
statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
statuses: statuses.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
@ -736,7 +726,7 @@ const hideReject = function () {
const reset = function () { const reset = function () {
searchForm.value = { searchForm.value = {
jwcode: '', jwcode: '',
market: [],
markets: [],
statuses: [] statuses: []
} }
dateRange.value = [] dateRange.value = []

49
src/views/moneyManage/refundDetail/refundFinance.vue
View File

@ -22,7 +22,7 @@
<div class="item1"> <div class="item1">
<el-text size="large" style="width:4vw;">订单状态</el-text> <el-text size="large" style="width:4vw;">订单状态</el-text>
<el-select v-model="searchForm.statuses" style="width:9vw;" clearable> <el-select v-model="searchForm.statuses" style="width:9vw;" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select> </el-select>
</div> </div>
</div> </div>
@ -75,9 +75,10 @@
<el-table-column prop="status" label="订单状态" width="120"> <el-table-column prop="status" label="订单状态" width="120">
<template #default="scope"> <template #default="scope">
{{ {{
[10, 20, 30, 40].includes(scope.row.status) ? '审核中' :
[12, 22, 32].includes(scope.row.status) ? '审核驳回' :
scope.row.status === 41 ? '退款完成' : scope.row.status
[10].includes(scope.row.status) ? '待审核' :
[20, 30, 40].includes(scope.row.status) ? '审核通过' :
[12, 22, 32].includes(scope.row.status) ? '已驳回' :
[41].includes(scope.row.status) ? '退款成功' : scope.row.status
}} }}
</template> </template>
</el-table-column> </el-table-column>
@ -104,7 +105,7 @@
<div class="top"> <div class="top">
<el-button @click="" class="smallTitle" size="small">退款申请信息</el-button> <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
<div class="top-item"> <div class="top-item">
<el-text style="width:4vw;" size="small">退款类型</el-text>
<el-text style="width:4vw;" size="small">退款方式</el-text>
<el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled> <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
<el-option label="全部退款" :value="0"></el-option> <el-option label="全部退款" :value="0"></el-option>
<el-option label="部分退款" :value="1"></el-option> <el-option label="部分退款" :value="1"></el-option>
@ -405,24 +406,7 @@ const statusStepMap = {
40: [5, false], 40: [5, false],
41: [6, false] 41: [6, false]
} }
const statusList = ref([
{
value: 20,
label: '待审核',
},
{
value: '审核通过',
label: '审核通过'
},
{
value: '审核驳回',
label: '审核驳回'
},
{
value: 41,
label: '退款完成'
}
])
const statusList = ref(['待审核','审核通过','已驳回','退款成功'])
// 查全部 // 查全部
const getRefund = async function () { const getRefund = async function () {
if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceShow)) { if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceShow)) {
@ -430,10 +414,17 @@ const getRefund = async function () {
return return
} }
try { try {
const statusParam = ref([])
if (searchForm.value.statuses === '审核通过') { if (searchForm.value.statuses === '审核通过') {
searchForm.value.statuses = [20, 30, 40]
} else if (searchForm.value.statuses === '审核驳回') {
searchForm.value.statuses = [12, 22, 32]
statusParam.value = [20, 30, 40]
} else if (searchForm.value.statuses === '已驳回') {
statusParam.value = [12, 22, 32]
} else if (searchForm.value.statuses === '待审核') {
statusParam.value = [10]
} else if (searchForm.value.statuses === '退款成功') {
statusParam.value = [41]
} else {
statusParam.value = []
} }
const params = { const params = {
pageNum: pagination.value.pageNum, pageNum: pagination.value.pageNum,
@ -443,7 +434,7 @@ const getRefund = async function () {
name: searchForm.value.name,//姓名 name: searchForm.value.name,//姓名
markets: searchForm.value.markets,//地区 markets: searchForm.value.markets,//地区
goodsNames: searchForm.value.goodsName,//商品名 goodsNames: searchForm.value.goodsName,//商品名
statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
@ -789,7 +780,7 @@ const showStep = function (row) {
isReject.value = reject isReject.value = reject
} }
console.log('步骤条状态',currentStep.value)
console.log('步骤条状态', currentStep.value)
showSteps.value = true showSteps.value = true
} }
const showAudit2 = function (row) { const showAudit2 = function (row) {
@ -799,7 +790,7 @@ const showAudit2 = function (row) {
const reset = function () { const reset = function () {
searchForm.value = { searchForm.value = {
jwcode: '', jwcode: '',
market: [],
markets: [],
statuses: [] statuses: []
} }
dateRange.value = [] dateRange.value = []

107
src/views/moneyManage/refundDetail/refundHeader.vue
View File

@ -12,17 +12,18 @@
</div> </div>
<div class="item1"> <div class="item1">
<el-text size="large" style="width:4vw;">所属地区</el-text> <el-text size="large" style="width:4vw;">所属地区</el-text>
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market"
placeholder="请选择所属地区" clearable @change="handleMarketChange" />
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
clearable @change="handleMarketChange" />
</div> </div>
<div class="item1"> <div class="item1">
<el-text size="large" style="width:4vw;">产品名称</el-text> <el-text size="large" style="width:4vw;">产品名称</el-text>
<el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" placeholder="请选择产品名称" clearable />
<el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;"
placeholder="请选择产品名称" clearable />
</div> </div>
<div class="item1"> <div class="item1">
<el-text size="large" style="width:4vw;">订单状态</el-text> <el-text size="large" style="width:4vw;">订单状态</el-text>
<el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable> <el-select v-model="searchForm.statuses" style="width:9vw;" placeholder="请选择订单状态" clearable>
<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in statusList" :label="item" :value="item" :key="item" />
</el-select> </el-select>
</div> </div>
</div> </div>
@ -74,9 +75,10 @@
<el-table-column prop="status" label="订单状态" width="120"> <el-table-column prop="status" label="订单状态" width="120">
<template #default="scope"> <template #default="scope">
{{ {{
[30, 40].includes(scope.row.status) ? '审核中' :
scope.row.status === 32 ? '审核驳回' :
scope.row.status === 41 ? '退款完成' : scope.row.status
[30].includes(scope.row.status) ? '待审核' :
[40].includes(scope.row.status) ? '审核通过' :
scope.row.status === 32 ? '已驳回' :
scope.row.status === 41 ? '退款成功' : scope.row.status
}} }}
</template> </template>
</el-table-column> </el-table-column>
@ -103,7 +105,7 @@
<div class="top"> <div class="top">
<el-button @click="" class="smallTitle" size="small">退款申请信息</el-button> <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
<div class="top-item"> <div class="top-item">
<el-text style="width:4vw;" size="small">退款类型</el-text>
<el-text style="width:4vw;" size="small">退款方式</el-text>
<el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled> <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
<el-option label="全部退款" :value="0"></el-option> <el-option label="全部退款" :value="0"></el-option>
<el-option label="部分退款" :value="1"></el-option> <el-option label="部分退款" :value="1"></el-option>
@ -438,12 +440,7 @@ const channelOptions = ref([{
label: 'Ipay88-Link平台' label: 'Ipay88-Link平台'
} }
]) ])
const statusList = ref([
{ value: 30, label: '待审核' },
{ value: 40, label: '审核通过' },
{ value: 32, label: '审核驳回' },
{ value: 41, label: '退款完成' }
])
const statusList = ref(['待审核', '审核通过', '已驳回', '退款成功'])
const executorList = ref([ const executorList = ref([
{ {
value: '305485', value: '305485',
@ -485,7 +482,18 @@ const getRefund = async function () {
return return
} }
try { try {
searchForm.value.statuses = [30, 32, 40, 41] // 默认：看不到进度没到这里的
const statusParam = ref([30, 32, 40, 41])// 默认：看不到进度没到这里的
if (searchForm.value.statuses === '待审核') {
statusParam.value = [30]
} else if (searchForm.value.statuses === '审核通过') {
statusParam.value = [40]
} else if (searchForm.value.statuses === '已驳回') {
statusParam.value = [32]
} else if (searchForm.value.statuses === '退款成功') {
statusParam.value = [41]
} else {
statusParam.value = [30, 32, 40, 41]
}
const params = { const params = {
pageNum: pagination.value.pageNum, pageNum: pagination.value.pageNum,
@ -495,10 +503,7 @@ const getRefund = async function () {
name: searchForm.value.name, name: searchForm.value.name,
markets: searchForm.value.markets, markets: searchForm.value.markets,
goodsNames: searchForm.value.goodsName, goodsNames: searchForm.value.goodsName,
statuses: searchForm.value.statuses,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成；
statuses: statusParam.value,
paymentCurrency: searchForm.value.paymentCurrency, paymentCurrency: searchForm.value.paymentCurrency,
payType: searchForm.value.payType, payType: searchForm.value.payType,
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
@ -559,7 +564,7 @@ const handleReject = async function () {
rejectReason: addForm.value.remark, rejectReason: addForm.value.remark,
headFinance: adminData.value.adminName, headFinance: adminData.value.adminName,
auditId: auditRow.value.auditId, auditId: auditRow.value.auditId,
orderCode:auditRow.value.orderCode
orderCode: auditRow.value.orderCode
} }
const result = await API({ const result = await API({
url: '/Money/finalReview', url: '/Money/finalReview',
@ -577,33 +582,33 @@ const handleReject = async function () {
} }
} }
const getMarket = async function () { const getMarket = async function () {
try {
const result = await API({
url: '/market/selectMarket',
})
console.log('看看地区树', result)
const transformTree = (nodes) => {
const allChildren = nodes.flatMap(node => node.children || []);
return allChildren.map(child => {
const grandchildren = child.children && child.children.length
? transformTree([child])
: null;
try {
const result = await API({
return {
value: child.id,
label: child.name,
children: grandchildren
url: '/market/selectMarket',
})
console.log('看看地区树', result)
const transformTree = (nodes) => {
const allChildren = nodes.flatMap(node => node.children || []);
return allChildren.map(child => {
const grandchildren = child.children && child.children.length
? transformTree([child])
: null;
return {
value: child.id,
label: child.name,
children: grandchildren
};
});
}; };
});
};
market.value = transformTree(result.data)
console.log('转换后的地区树==============', market.value)
} catch (error) {
console.log('请求失败', error)
}
market.value = transformTree(result.data)
console.log('转换后的地区树==============', market.value)
} catch (error) {
console.log('请求失败', error)
}
} }
const hideReject = function () { const hideReject = function () {
showReject.value = false showReject.value = false
@ -612,7 +617,7 @@ const hideReject = function () {
const reset = function () { const reset = function () {
searchForm.value = { searchForm.value = {
jwcode: '', jwcode: '',
market: [],
markets: [],
statuses: [] statuses: []
} }
dateRange.value = [] dateRange.value = []
@ -639,7 +644,7 @@ const showStep = function (row) {
isReject.value = reject isReject.value = reject
} }
console.log('步骤条状态',currentStep.value)
console.log('步骤条状态', currentStep.value)
showSteps.value = true showSteps.value = true
} }
const productList = [ const productList = [
@ -776,12 +781,12 @@ const showAudit = function (row) {
showAudit2.value = true showAudit2.value = true
} }
const defaultTime = [ const defaultTime = [
new Date(2000, 1, 1, 0, 0, 0),
new Date(2000, 2, 1, 23, 59, 59),
new Date(2000, 1, 1, 0, 0, 0),
new Date(2000, 2, 1, 23, 59, 59),
] ]
const disabledDate = (time) => { const disabledDate = (time) => {
const limitDate = new Date(2025, 0, 1);
return time.getTime() < limitDate.getTime();
const limitDate = new Date(2025, 0, 1);
return time.getTime() < limitDate.getTime();
} }
onMounted(() => { onMounted(() => {
console.log('???????????????????', adminData.value) console.log('???????????????????', adminData.value)

Write Preview
Loading…
Cancel
Save