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
93cfe4d109
commit
ebdc7c7b16
2 changed files with 58 additions and 13 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. 2
      src/components/workspace/CashManagement.vue
  2. 69
      src/views/moneyManage/receiveDetail/receiveDetail.vue

2
src/components/workspace/CashManagement.vue
View File

@ -227,8 +227,8 @@ const renderChart = () => {
}
onMounted(() => {
fetchCashData()
getAdminData()
fetchCashData()
})
</script>

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

@ -176,7 +176,7 @@
</el-table-column>
<el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="订单状态" v-if="activeTab == 'pass' && !kefu" width="150px"
<el-table-column prop="status" label="订单状态" v-if="activeTab == 'done' && !kefu" width="150px"
show-overflow-tooltip>
<template #default="scope">
<span v-if="scope.row.status == 6">退款</span>
@ -215,7 +215,8 @@
<span v-else></span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="120px" v-if="activeTab != 'reject'">
<el-table-column fixed="right" label="操作" width="120px"
v-if="activeTab != 'reject' && activeTab != 'done'">
<template #default=scope>
<span v-if="kefu && scope.row.status == 4" style="color: #FA5A1E;"
@click="openConfirm('refund', scope.row)">退款</span>
@ -355,9 +356,9 @@
<span class="dialog-footer">
<el-button style="background-color: #7E91FF;" @click="closeAddForm">取消</el-button>
<el-button v-if="addOrEdit == 1" style="background-color: #2741DE; margin-left: 2.5vw;"
type="primary" @click="handleAddForm">确定</el-button>
type="primary" @click="throttledhandleAddForm">确定</el-button>
<el-button v-else-if="addOrEdit == 2" style="background-color: #2741DE; margin-left: 2.5vw;"
type="primary" @click="handleEditForm">编辑</el-button>
type="primary" @click="throttledhandleEditForm">编辑</el-button>
</span>
</template>
</el-dialog>
@ -376,20 +377,23 @@
<el-form-item label="活动名称">
<el-input disabled="true" v-model="auditFormData.activity" placeholder="请输入活动名称" />
</el-form-item>
<el-form-item label="产品名称" required>
<el-form-item label="产品名称">
<el-select disabled="true" v-model="auditFormData.goodsName" />
</el-form-item>
<el-form-item label="付款币种" required>
<el-form-item label="付款币种">
<el-select disabled="true" v-model="auditFormData.paymentCurrency" placeholder="请选择付款币种"
@change="handleCurrencyChange" />
</el-form-item>
<el-form-item label="付款金额">
<el-input disabled="true" v-model="auditFormData.paymentAmount" placeholder="请输入付款金额" />
</el-form-item>
<el-form-item label="支付方式" required>
<el-form-item label="支付方式">
<el-select disabled="true" v-model="auditFormData.payType" :items="paytypeOptions"
placeholder="请选择支付方式" />
</el-form-item>
<el-form-item label="到账地区">
<el-select disabled="true" v-model="auditFormData.receivedMarket" placeholder="到账地区" />
</el-form-item>
<el-form-item label="付款时间">
<el-date-picker disabled="true" type="datetime" v-model="auditFormData.payTime"
placeholder="请选择付款时间" />
@ -431,7 +435,7 @@
<span class="dialog-footer" v-if="ifReject">
<el-button style="background-color: #7E91FF;" @click="closeAuditForm">取消</el-button>
<el-button style="background-color: #2741DE; margin-left: 2.5vw;" type="primary"
@click="handelAuditReject">确定</el-button>
@click="throttledhandelAuditReject">确定</el-button>
</span>
</template>
</el-dialog>
@ -491,6 +495,10 @@
<el-select disabled="true" v-model="editFormData.payType" placeholder="请选择支付方式"
clearable></el-select>
</el-form-item>
<el-form-item label="到账地区">
<el-select disabled="true" v-model="editFormData.receivedMarket" placeholder="请选择到账地区"
clearable></el-select>
</el-form-item>
<el-form-item label="付款时间">
<el-date-picker disabled="true" type="datetime" v-model="editFormData.payTime"
placeholder="请选择付款时间" />
@ -543,7 +551,7 @@
取消
</text>
</button>
<button class="editBtn2" @click="submitEditForm">
<button class="editBtn2" @click="throttledsubmitEditForm">
<text class="txt">
提交
</text>
@ -635,7 +643,7 @@
<div>ps:请在退款理由表明用户的退款需求。</div>
<div style="display:flex;justify-content: center;margin-top: 5vh;">
<el-button type="default" @click="">重置</el-button>
<el-button type="primary" @click="submitRefund">提交</el-button>
<el-button type="primary" @click="throttledsubmitRefund">提交</el-button>
</div>
</div>
</div>
@ -660,6 +668,7 @@ import { isNode } from 'mathjs';
const adminStore = useAdminStore();
const { menuTree } = storeToRefs(adminStore);
console.log('menutree', menuTree.value);
import _ from 'lodash'
//===================== 查询相关 =================================
const tableData = ref([])
const searchData = ref({
@ -711,7 +720,7 @@ const getlist = async () => {
} else if (activeTab.value == 'pass') {
searchData.value.status = 13
}else if(activeTab.value == 'done'){
} else if (activeTab.value == 'done') {
searchData.value.status = 46
} else if (activeTab.value == 'reject') {
searchData.value.status = 2
@ -756,7 +765,7 @@ const navigateTo = async (tab) => {
} else if (tab === 'pass') {
activeTab.value = 'pass'
await getlist()
}else if (tab === 'done') {
} else if (tab === 'done') {
activeTab.value = 'done'
await getlist()
}
@ -854,6 +863,7 @@ const openRejectReason = (reason) => {
// if you want to disable its autofocus
// autofocus: false,
confirmButtonText: '确认',
customClass: 'reject-reason-box',
})
}
const uploadRef = ref()
@ -864,6 +874,7 @@ const openAddForm = (row) => {
addOrEdit.value = 2
addFormData.value = { ...row };
jwcodeSeachMarket()
ifGold()
addFormisible.value = true
} else {
@ -1558,6 +1569,23 @@ const CurrencyForId = (name) => {
return name
}
}
//节流
const throttledhandleAddForm = _.throttle(handleAddForm, 5000, {
trailing: false
})
const throttledhandleEditForm = _.throttle(handleEditForm, 5000, {
trailing: false
})
const throttledhandelAuditReject = _.throttle(handelAuditReject, 5000, {
trailing: false
})
const throttledsubmitEditForm = _.throttle(submitEditForm, 5000, {
trailing: false
})
const throttledsubmitRefund = _.throttle(submitRefund, 5000, {
trailing: false
})
onMounted(async function () {
await getAdminData()
await getActivitys()
@ -2023,4 +2051,21 @@ onMounted(async function () {
:deep(.el-table__row:hover > .el-table__cell) {
background-color: #E5EBFE !important;
}
/* 自定义弹窗样式 */
.reject-reason-box {
/* 调整弹窗整体高度 */
--el-message-box-height: 500px;
/* 控制弹窗总高度 */
}
/* 调整内容区域样式，确保超出滚动 */
.reject-reason-box .el-message-box__content {
max-height: 350px;
/* 内容区域最大高度（根据总高度调整） */
overflow-y: auto;
/* 超出部分显示垂直滚动条 */
white-space: pre-wrap;
/* 处理换行符，避免内容挤在一起 */
}
</style>
Write Preview
Loading…
Cancel
Save