Browse Source

Merge branch 'lihuilin/feature-20250923114949-现金' into milestone-20250913-现金管理

lihuilin/feature-20250923114949-现金
lihuilin 1 month ago
parent
commit
fbd5822035
  1. BIN
      src/assets/images/已驳回.png
  2. 12
      src/views/moneyManage/executor/executor.vue
  3. 143
      src/views/moneyManage/refundDetail/refundCharge.vue
  4. 143
      src/views/moneyManage/refundDetail/refundFinance.vue
  5. 142
      src/views/moneyManage/refundDetail/refundHeader.vue
  6. 8
      src/views/moneyManage/refundDetail/refundService.vue

BIN
src/assets/images/已驳回.png

After

Width: 46  |  Height: 46  |  Size: 2.8 KiB

12
src/views/moneyManage/executor/executor.vue

@ -11,7 +11,7 @@
</div>
<div class="search">
<el-text size="large" style="width:4vw;">所属地区</el-text>
<el-cascader style="width: 9vw;" v-model="searchForm.marketName" :options="market" placeholder="请选择所属地区"
<el-cascader style="width: 9vw;" v-model="searchForm.market" :options="market" placeholder="请选择所属地区"
clearable />
</div>
<div class="search">
@ -59,7 +59,7 @@
<el-table-column type="index" label="序号" width="60" fixed="left" />
<el-table-column prop="name" label="Homily ID" width="120" fixed="left" />
<el-table-column prop="jwcode" label="姓名" width="120" fixed="left" show-overflow-tooltip />
<el-table-column prop="market" label="所属地区" width="120" />
<el-table-column prop="marketName" label="所属地区" width="120" />
<el-table-column prop="goodsName" label="产品名称" width="120" />
<el-table-column prop="goodNum" label="产品数量" width="120" />
<el-table-column prop="refundType" label="退款方式" width="120">
@ -123,8 +123,7 @@
</el-table-column>
</el-table>
<el-pagination v-model:current-page="pagination.pageNum" v-model:page-size="pagination.pageSize"
layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" style="margin-top: 1vh;"
@size-change="handlePageSizeChange" @current-change="handleCurrentChange" />
layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" style="margin-top: 1vh;" />
</el-card>
<el-dialog v-model="showEdit" class="edit" overflow draggable style="width: 40vw;">
@ -140,7 +139,7 @@
</div>
<div class="dialog-item">
<el-text style="width:4vw;">所属地区</el-text>
<el-input v-model="editRow.market" style="width:10vw;" disabled />
<el-input v-model="editRow.marketName" style="width:10vw;" disabled />
</div>
<div class="dialog-item">
<el-text style="width:4vw;">产品名称</el-text>
@ -262,7 +261,8 @@ const pagination = ref({
const market = ref([])
const uploadRef = ref(null)
const searchForm = ref({
jwcode: ''
jwcode: '',
markets:[]
})
const showEdit = ref(false)
const editForm = ref({

143
src/views/moneyManage/refundDetail/refundCharge.vue

@ -61,7 +61,7 @@
<el-table-column type="index" label="序号" width="60" fixed="left" />
<el-table-column prop="name" label="Homily ID" width="120" fixed="left" />
<el-table-column prop="jwcode" label="姓名" width="120" fixed="left" show-overflow-tooltip />
<el-table-column prop="market" label="所属地区" width="120" />
<el-table-column prop="marketName" label="所属地区" width="120" />
<el-table-column prop="goodsName" label="产品名称" width="130" show-overflow-tooltip />
<el-table-column prop="goodNum" label="产品数量" width="120" />
<el-table-column prop="refundModel" label="退款方式" width="120">
@ -125,7 +125,7 @@
</div>
<div class="center-item">
<el-text style="width:4vw;" size="small">所属地区</el-text>
<el-input v-model="auditRow.market" size="small" style="width:10vw;" disabled />
<el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
</div>
<div class="center-item">
<el-text style="width:4vw;" size="small">产品名称</el-text>
@ -210,7 +210,7 @@
</div>
</el-dialog>
<el-dialog v-model="showSteps" title="唉!!!" overflow draggable width="1206px" height="506px" :style="{
<el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
backgroundImage: 'url(/src/assets/images/背景图.png)',
backgroundSize: 'cover',
backgroundPosition: 'center'
@ -218,72 +218,69 @@
<div class="steps">
<div class="steps-content">
<el-steps :active="currentStep" align-center>
<el-step title="提交人">
<el-step>
<template #title>
<div>提交人<br>{{ submitterName }}</div>
<div>
提交人<br>{{ submitterName || '未知提交人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep === 1" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 1" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img src="@/assets/images/已审核.png" alt="已完成">
</template>
</el-step>
<el-step>
<template #title>
<div>地区财务<br>{{ areaFinance }}</div>
<div>
地区财务<br>{{ areaFinance || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 2" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 2" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 2" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 12" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 2" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 2 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>地区负责人<br>{{ areaCharge }}</div>
<div>
地区负责人<br>{{ areaCharge || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 3" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 3" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 3" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 22" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 3" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 3 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>总部财务<br>{{ headFinance }}</div>
<div>
总部财务<br>{{ headFinance || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 4" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 4" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 4" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 32" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 4" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 4 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>指定执行人<br>{{ executor }}</div>
<div>
指定执行人<br>{{ executor || '未记录执行人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 5" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 5" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 5" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 5" src="@/assets/images/待审核.png" alt="待处理">
<img v-else-if="currentStep === 6" src="@/assets/images/已审核.png" alt="已完成">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
</el-steps>
@ -311,6 +308,7 @@ const searchForm = ref({
jwcode: '',
markets: []
})
const isReject = ref(false)//
const addForm = ref({
remark: ''
})
@ -332,6 +330,16 @@ const areaCharge = ref('')// 地区负责人
const headFinance = ref('')//
const executor = ref('')//
const uploadRef = ref(null)
const statusStepMap = {
10: [2, false],
12: [12, true],
20: [3, false],
22: [22, true],
30: [4, false],
32: [32, true],
40: [5, false],
41: [6, false]
}
const currencies = ref([
{
value: '新币',
@ -521,7 +529,8 @@ const handleReject = async function () {
status: 22,
rejectReason: addForm.value.remark,
areaCharge: adminData.value.adminName,
auditId: auditRow.value.auditId
auditId: auditRow.value.auditId,
orderCode:auditRow.value.orderCode
}
const result = await API({
url: '/Money/review',
@ -531,45 +540,36 @@ const handleReject = async function () {
ElMessage.success('审核驳回')
showAudit.value = false
getRefund()
addForm.value.remark = ''
showReject.value = false
}
} catch (error) {
ElMessage.error(error.message || '审核失败')
}
}
const showStep = function (row) {
if (!hasMenuPermission(menuTree.value, permissionMapping.refundChargeProgShow)) {
ElMessage.error('无此权限');
return;
if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) {
ElMessage.error('无此权限')
return
}
console.log("row", row)
currentStep.value = 1;
if (row.status === 41) {
executor.value = row.executorName
currentStep.value = 6;
} else {
if (row.areaServise !== null && row.areaServise !== '') {
submitterName.value = row.areaServise
console.log(submitterName.value)
currentStep.value = 2;
}
if (row.areaFinance !== null && row.areaFinance !== '') {
areaFinance.value = row.areaFinance
console.log(areaFinance.value)
currentStep.value = 3;
}
if (row.areaCharge !== null && row.areaCharge !== '') {
areaCharge.value = row.areaCharge
console.log(areaCharge.value)
currentStep.value = 4;
}
if (row.headFinance !== null && row.headFinance !== '') {
headFinance.value = row.headFinance
console.log(headFinance.value)
currentStep.value = 5;
}
isReject.value = false
submitterName.value = row.areaServise || ''
areaFinance.value = row.areaFinance || ''
areaCharge.value = row.areaCharge || ''
headFinance.value = row.headFinance || ''
executor.value = row.executorName || ''
currentStep.value = 1
const status = row.status
if (statusStepMap[status]) {
const [step, reject] = statusStepMap[status]
currentStep.value = step
isReject.value = reject
}
console.log("当前步骤:", currentStep.value);
showSteps.value = true;
console.log('步骤条状态',currentStep.value)
showSteps.value = true
}
const productList = [
{
@ -717,7 +717,7 @@ const getMarket = async function () {
: null;
return {
value: child.name,
value: child.id,
label: child.name,
children: grandchildren
};
@ -755,7 +755,6 @@ const disabledDate = (time) => {
return time.getTime() < limitDate.getTime();
}
onMounted(() => {
console.log('???????????????????', adminData.value)
getRefund()
getMarket()
})

143
src/views/moneyManage/refundDetail/refundFinance.vue

@ -60,7 +60,7 @@
<el-table-column type="index" label="序号" width="60" fixed="left" />
<el-table-column prop="jwcode" label="Homily ID" width="120" fixed="left" />
<el-table-column prop="name" label="姓名" width="120" fixed="left" show-overflow-tooltip />
<el-table-column prop="market" label="所属地区" width="120" />
<el-table-column prop="marketName" label="所属地区" width="120" />
<el-table-column prop="activity" label="活动名称" width="120px" show-overflow-tooltip />
<el-table-column prop="goodsName" label="产品名称" width="130" show-overflow-tooltip />
<el-table-column prop="goodNum" label="产品数量" width="120" />
@ -125,7 +125,7 @@
</div>
<div class="center-item">
<el-text style="width:4vw;" size="small">所属地区</el-text>
<el-input v-model="auditRow.market" size="small" style="width:10vw;" disabled />
<el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
</div>
<div class="center-item">
<el-text style="width:4vw;" size="small">产品名称</el-text>
@ -210,7 +210,7 @@
</div>
</el-dialog>
<el-dialog v-model="showSteps" title="唉!!!" overflow draggable width="1206px" height="506px" :style="{
<el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
backgroundImage: 'url(/src/assets/images/背景图.png)',
backgroundSize: 'cover',
backgroundPosition: 'center'
@ -218,72 +218,69 @@
<div class="steps">
<div class="steps-content">
<el-steps :active="currentStep" align-center>
<el-step title="提交人">
<el-step>
<template #title>
<div>提交人<br>{{ submitterName }}</div>
<div>
提交人<br>{{ submitterName || '未知提交人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep === 1" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 1" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img src="@/assets/images/已审核.png" alt="已完成">
</template>
</el-step>
<el-step>
<template #title>
<div>地区财务<br>{{ areaFinance }}</div>
<div>
地区财务<br>{{ areaFinance || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 2" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 2" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 2" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 12" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 2" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 2 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>地区负责人<br>{{ areaCharge }}</div>
<div>
地区负责人<br>{{ areaCharge || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 3" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 3" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 3" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 22" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 3" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 3 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>总部财务<br>{{ headFinance }}</div>
<div>
总部财务<br>{{ headFinance || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 4" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 4" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 4" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 32" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 4" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 4 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>指定执行人<br>{{ executor }}</div>
<div>
指定执行人<br>{{ executor || '未记录执行人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 5" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 5" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 5" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 5" src="@/assets/images/待审核.png" alt="待处理">
<img v-else-if="currentStep === 6" src="@/assets/images/已审核.png" alt="已完成">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
</el-steps>
@ -319,6 +316,7 @@ const addForm = ref({
const auditForm = ref({
refundType: ''
})
const isReject = ref(false)//
const showReject = ref(false)
const pagination = ref({
pageNum: 1,
@ -397,6 +395,16 @@ const payments = ref([{
label: 'Ipay88-Link平台'
}
])
const statusStepMap = {
10: [2, false],
12: [12, true],
20: [3, false],
22: [22, true],
30: [4, false],
32: [32, true],
40: [5, false],
41: [6, false]
}
const statusList = ref([
{
value: 20,
@ -497,7 +505,8 @@ const handleReject = async function () {
status: 12,
rejectReason: addForm.value.remark,
areaFinance: adminData.value.adminName,
auditId: auditRow.value.auditId
auditId: auditRow.value.auditId,
orderCode: auditRow.value.orderCode
}
const result = await API({
url: '/Money/finalReview',
@ -747,7 +756,7 @@ const getMarket = async function () {
: null;
return {
value: child.name,
value: child.id,
label: child.name,
children: grandchildren
};
@ -761,39 +770,27 @@ const getMarket = async function () {
}
const showStep = function (row) {
if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) {
ElMessage.error('无此权限');
return;
ElMessage.error('无此权限')
return
}
console.log("row", row)
currentStep.value = 1;
if (row.status === 41) {
executor.value = row.executorName
console.log('执行人', executor.value)
currentStep.value = 6;
} else {
if (row.areaServise !== null && row.areaServise !== '') {
submitterName.value = row.areaServise
console.log('提交人', submitterName.value)
currentStep.value = 2;
}
if (row.areaFinance !== null && row.areaFinance !== '') {
areaFinance.value = row.areaFinance
console.log('地区财务', areaFinance.value)
currentStep.value = 3;
}
if (row.areaCharge !== null && row.areaCharge !== '') {
areaCharge.value = row.areaCharge
console.log('地区负责人', areaCharge.value)
currentStep.value = 4;
}
if (row.headFinance !== null && row.headFinance !== '') {
headFinance.value = row.headFinance
console.log('总部财务', headFinance.value)
currentStep.value = 5;
}
isReject.value = false
submitterName.value = row.areaServise || ''
areaFinance.value = row.areaFinance || ''
areaCharge.value = row.areaCharge || ''
headFinance.value = row.headFinance || ''
executor.value = row.executorName || ''
currentStep.value = 1
const status = row.status
if (statusStepMap[status]) {
const [step, reject] = statusStepMap[status]
currentStep.value = step
isReject.value = reject
}
console.log("当前步骤:", currentStep.value);
showSteps.value = true;
console.log('步骤条状态',currentStep.value)
showSteps.value = true
}
const showAudit2 = function (row) {
auditRow.value = row
@ -802,8 +799,8 @@ const showAudit2 = function (row) {
const reset = function () {
searchForm.value = {
jwcode: '',
market: searchForm.value.market,
statuses: searchForm.value.statuses
market: [],
statuses: []
}
dateRange.value = []
getRefund()

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

@ -60,7 +60,7 @@
<el-table-column type="index" label="序号" width="60" fixed="left" />
<el-table-column prop="name" label="Homily ID" width="120" fixed="left" />
<el-table-column prop="jwcode" label="姓名" width="120" fixed="left" show-overflow-tooltip />
<el-table-column prop="market" label="所属地区" width="120" />
<el-table-column prop="marketName" label="所属地区" width="120" />
<el-table-column prop="goodsName" label="产品名称" width="130" show-overflow-tooltip />
<el-table-column prop="goodNum" label="产品数量" width="120" />
<el-table-column prop="refundModel" label="退款方式" width="120">
@ -86,7 +86,7 @@
<el-button v-if="scope.row.status === 30" type="primary" text @click="showAudit(scope.row)">
审核
</el-button>
<el-button v-else type="primary" text @click="showStep">
<el-button v-else type="primary" text @click="showStep(scope.row)">
查看进度
</el-button>
</div>
@ -219,7 +219,7 @@
</div>
</el-dialog>
<el-dialog v-model="showSteps" title="唉!!!" overflow draggable width="1206px" height="506px" :style="{
<el-dialog v-model="showSteps" title="退款进度" overflow draggable width="1206px" height="506px" :style="{
backgroundImage: 'url(/src/assets/images/背景图.png)',
backgroundSize: 'cover',
backgroundPosition: 'center'
@ -227,72 +227,69 @@
<div class="steps">
<div class="steps-content">
<el-steps :active="currentStep" align-center>
<el-step title="提交人">
<el-step>
<template #title>
<div>提交人<br>{{ submitterName }}</div>
<div>
提交人<br>{{ submitterName || '未知提交人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep === 1" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 1" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img src="@/assets/images/已审核.png" alt="已完成">
</template>
</el-step>
<el-step>
<template #title>
<div>地区财务<br>{{ areaFinance }}</div>
<div>
地区财务<br>{{ areaFinance || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 2" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 2" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 2" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 12" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 2" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 2 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>地区负责人<br>{{ areaCharge }}</div>
<div>
地区负责人<br>{{ areaCharge || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 3" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 3" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 3" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 22" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 3" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 3 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>总部财务<br>{{ headFinance }}</div>
<div>
总部财务<br>{{ headFinance || '未记录审核人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 4" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 4" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 4" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 32" src="@/assets/images/已驳回.png" alt="已驳回">
<img v-else-if="currentStep === 4" src="@/assets/images/待审核.png" alt="待审核">
<img v-else-if="currentStep > 4 && currentStep < 7" src="@/assets/images/已审核.png" alt="已审核">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
<el-step>
<template #title>
<div>指定执行人<br>{{ executor }}</div>
<div>
指定执行人<br>{{ executor || '未记录执行人' }}
</div>
</template>
<template #icon>
<img v-if="currentStep < 5" src="@/assets/images/还没传到.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 5" src="@/assets/images/待审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep > 5" src="@/assets/images/已审核.png" alt="步骤图标"
style="width: 30px; height: 30px;">
<img v-if="currentStep === 5" src="@/assets/images/待审核.png" alt="待处理">
<img v-else-if="currentStep === 6" src="@/assets/images/已审核.png" alt="已完成">
<img v-else src="@/assets/images/还没传到.png" alt="未开始">
</template>
</el-step>
</el-steps>
@ -321,6 +318,7 @@ const searchForm = ref({
markets: [],
statuses: []
})
const isReject = ref(false)//
const addForm = ref({
remark: ''
})
@ -343,6 +341,16 @@ const areaFinance = ref('')// 地区财务
const areaCharge = ref('')//
const headFinance = ref('')//
const executor = ref('')//
const statusStepMap = {
10: [2, false],
12: [12, true],
20: [3, false],
22: [22, true],
30: [4, false],
32: [32, true],
40: [5, false],
41: [6, false]
}
const currencies = ref([
{
value: '新币',
@ -550,7 +558,8 @@ const handleReject = async function () {
status: 32,
rejectReason: addForm.value.remark,
headFinance: adminData.value.adminName,
auditId: auditRow.value.auditId
auditId: auditRow.value.auditId,
orderCode:auditRow.value.orderCode
}
const result = await API({
url: '/Money/finalReview',
@ -560,6 +569,8 @@ const handleReject = async function () {
ElMessage.success('审核驳回')
showAudit2.value = false
getRefund()
addForm.value.remark = ''
showReject.value = false
}
} catch (error) {
ElMessage.error(error.message || '审核失败')
@ -582,7 +593,7 @@ const getMarket = async function () {
: null;
return {
value: child.name,
value: child.id,
label: child.name,
children: grandchildren
};
@ -608,39 +619,28 @@ const reset = function () {
getRefund()
}
const showStep = function (row) {
if (!hasMenuPermission(menuTree.value, permissionMapping.refundHeaderProgShow)) {
ElMessage.error('无此权限');
return;
if (!hasMenuPermission(menuTree.value, permissionMapping.refundFinanceProgShow)) {
ElMessage.error('无此权限')
return
}
console.log("row", row)
currentStep.value = 1;
if (row.status === 41) {
executor.value = row.executorName
currentStep.value = 6;
} else {
if (row.areaServise !== null && row.areaServise !== '') {
submitterName.value = row.areaServise
console.log(submitterName.value)
currentStep.value = 2;
}
if (row.areaFinance !== null && row.areaFinance !== '') {
areaFinance.value = row.areaFinance
console.log(areaFinance.value)
currentStep.value = 3;
}
if (row.areaCharge !== null && row.areaCharge !== '') {
areaCharge.value = row.areaCharge
console.log(areaCharge.value)
currentStep.value = 4;
}
if (row.headFinance !== null && row.headFinance !== '') {
headFinance.value = row.headFinance
console.log(headFinance.value)
currentStep.value = 5;
}
isReject.value = false
submitterName.value = row.areaServise || ''
areaFinance.value = row.areaFinance || ''
areaCharge.value = row.areaCharge || ''
headFinance.value = row.headFinance || ''
executor.value = row.executorName || ''
currentStep.value = 1
const status = row.status
if (statusStepMap[status]) {
const [step, reject] = statusStepMap[status]
currentStep.value = step
isReject.value = reject
}
console.log("当前步骤:", currentStep.value);
showSteps.value = true;
console.log('步骤条状态',currentStep.value)
showSteps.value = true
}
const productList = [
{

8
src/views/moneyManage/refundDetail/refundService.vue

@ -291,7 +291,7 @@ const getRefund = async function () {
cashRecordDone: {
jwcode: searchForm.value.jwcode,//
name: searchForm.value.name,//
market: searchForm.value.market,//
markets: searchForm.value.market,//
goodsNames: searchForm.value.goodsName,//
statuses: searchForm.value.statuses,//1012
// 2022
@ -394,7 +394,7 @@ const getMarket = async function () {
: null;
return {
value: child.name,
value: child.id,
label: child.name,
children: grandchildren
};
@ -657,8 +657,8 @@ const productList = [
const reset = function () {
searchForm.value = {
jwcode: '',
market: searchForm.value.market,
statuses: searchForm.value.statuses
market: [],
statuses: []
}
dateRange.value = []
getRefund()

Loading…
Cancel
Save