应付模块菜单调整,新增应付费用编辑等
This commit is contained in:
@@ -0,0 +1,368 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :inline="true" :model="query" class="mb8">
|
||||
<el-form-item label="订单号">
|
||||
<el-input v-model="query.orderNo" type="textarea" :rows="2" clearable placeholder="多个订单号可用逗号、空格或换行分隔" style="width: 280px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="提单号">
|
||||
<el-input v-model="query.ladingNo" clearable placeholder="提单号" style="width: 180px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="客户">
|
||||
<el-input v-model="query.customerName" clearable placeholder="客户名称或代码" style="width: 180px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="search">查询</el-button>
|
||||
<el-button icon="Refresh" @click="reset">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row class="mb8">
|
||||
<el-button type="primary" plain icon="RefreshRight" v-hasPermi="['price:payOrder:recalc']" @click="openRecalc">费用重算</el-button>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="rows" border>
|
||||
<el-table-column prop="orderNo" label="订单号" min-width="160" fixed="left" show-overflow-tooltip />
|
||||
<el-table-column prop="ladingNo" label="提单号" min-width="150" fixed="left" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.ladingNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="trackingNo" label="运单号" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="customerName" label="客户" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="productName" label="产品" min-width="160" show-overflow-tooltip />
|
||||
<el-table-column prop="countryName" label="目的国" width="110" show-overflow-tooltip />
|
||||
<el-table-column prop="channelName" label="渠道" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="chargeWeight" label="计费重" width="90" align="right" />
|
||||
<el-table-column prop="payTotal" label="应付总额" width="110" align="right" />
|
||||
<el-table-column prop="currency" label="币种" width="80" align="center" />
|
||||
<el-table-column label="计费状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<dict-tag v-if="row.payCalcStatus != null && row.payCalcStatus !== ''" :options="bms_pay_calc_status" :value="row.payCalcStatus" />
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="payCalcMsg" label="失败原因" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.payCalcMsg || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="bizDate" label="计费时间" width="170" align="center" />
|
||||
<el-table-column label="操作" width="140" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" v-hasPermi="['price:payOrder:query']" @click="openDetail(row)">详情</el-button>
|
||||
<el-button link type="primary" v-hasPermi="['price:payOrder:fee']" @click="openFees(row)">费用</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="query.pageNum" v-model:limit="query.pageSize" @pagination="loadList" />
|
||||
|
||||
<bill-detail v-model="detailOpen" title="订单详情" :loading="detailLoading" :detail="detail" />
|
||||
|
||||
<el-dialog v-model="feeOpen" :title="feeTitle" width="1280px" append-to-body destroy-on-close>
|
||||
<div v-loading="feeLoading" class="fee-board">
|
||||
<section v-for="section in sections" :key="section.level" class="fee-section">
|
||||
<div class="fee-head">{{ section.title }}</div>
|
||||
<div class="fee-tools">
|
||||
<el-button v-hasPermi="['price:payOrder:feeAdd']" type="primary" plain size="small" @click="addFeeRow(section)">增加费用</el-button>
|
||||
</div>
|
||||
<el-table :data="section.fees" border empty-text="无">
|
||||
<el-table-column label="费用项" min-width="180">
|
||||
<template #default="{ row }">
|
||||
<el-select v-if="row.editing" v-model="row.pick" filterable allow-create default-first-option placeholder="选择或输入" style="width: 100%" @change="pickFee(row)">
|
||||
<el-option v-for="item in (bms_fee_type || [])" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
<span v-else>{{ row.feeName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="金额" width="140" align="right">
|
||||
<template #default="{ row }">
|
||||
<el-input-number v-if="row.editing" v-model="row.amount" :precision="2" :controls="false" style="width: 100%" />
|
||||
<span v-else>{{ row.amount }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="币种" width="110" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-select v-if="row.editing" v-model="row.currency" filterable style="width: 100%">
|
||||
<el-option v-for="item in (bms_currency || [])" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
<span v-else>{{ row.currency }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="说明" min-width="180">
|
||||
<template #default="{ row }">
|
||||
<el-input v-if="row.editing" v-model="row.remark" maxlength="200" />
|
||||
<span v-else>{{ row.remark }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="来源" width="100" align="center">
|
||||
<template #default="{ row }">{{ sourceText(row.feeSource) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createBy" label="创建人" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="createTime" label="创建时间" width="160" />
|
||||
<el-table-column prop="updateBy" label="更新人" width="100" show-overflow-tooltip />
|
||||
<el-table-column prop="updateTime" label="更新时间" width="160" />
|
||||
<el-table-column label="操作" width="130" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button v-if="row.editing" link type="primary" @click="saveFeeRow(section, row)">保存</el-button>
|
||||
<el-button v-if="row.editing" link type="danger" @click="removeFeeRow(section, row)">删除</el-button>
|
||||
<el-button v-else v-hasPermi="['price:payOrder:feeRemove']" link type="danger" @click="removeFeeRow(section, row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</section>
|
||||
<section class="fee-section">
|
||||
<div class="fee-head">费用日志</div>
|
||||
<el-table :data="feeLogs" border empty-text="无" max-height="280">
|
||||
<el-table-column prop="feeName" label="费用项" min-width="160" show-overflow-tooltip />
|
||||
<el-table-column prop="amount" label="金额" width="120" align="right" />
|
||||
<el-table-column prop="currency" label="币种" width="90" align="center" />
|
||||
<el-table-column label="操作类型" width="120" align="center">
|
||||
<template #default="{ row }">
|
||||
<dict-tag :options="bms_pay_fee_log_type" :value="row.operationType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createBy" label="操作人" width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="createTime" label="操作时间" width="170" align="center" />
|
||||
</el-table>
|
||||
</section>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-model="recalcOpen" title="费用重算" width="720px" append-to-body @closed="resetRecalc">
|
||||
<el-form label-width="90px">
|
||||
<el-form-item label="重算方式">
|
||||
<el-radio-group v-model="recalcForm.sourceType">
|
||||
<el-radio value="ORDER">订单号</el-radio>
|
||||
<el-radio value="LADING">提单号</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item :label="recalcForm.sourceType === 'LADING' ? '提单号' : '订单号'">
|
||||
<el-input v-model="recalcForm.text" type="textarea" :rows="6" placeholder="多个单号可用逗号、空格或换行分隔,一次最多500个" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div v-if="recalcResult" class="recalc-result">
|
||||
<span>成功 {{ recalcResult.successCount }} 票,失败 {{ recalcResult.failCount }} 票</span>
|
||||
<el-table :data="recalcFails" border size="small" max-height="240" empty-text="没有失败记录">
|
||||
<el-table-column prop="orderNo" label="订单号" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="ladingNo" label="提单号" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="message" label="原因" min-width="220" show-overflow-tooltip />
|
||||
</el-table>
|
||||
</div>
|
||||
<template #footer>
|
||||
<el-button @click="recalcOpen = false">关闭</el-button>
|
||||
<el-button type="primary" :loading="recalcSaving" @click="submitRecalc">确认</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="PayOrderList">
|
||||
import { getBill } from '@/api/price/billing'
|
||||
import { addPayOrderFee, listPayOrder, listPayOrderFees, recalcPayOrder, removePayOrderFee } from '@/api/price/payOrder'
|
||||
import BillDetail from '../components/BillDetail.vue'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { bms_pay_calc_status, bms_fee_type, bms_currency, bms_pay_fee_log_type } = useDict('bms_pay_calc_status', 'bms_fee_type', 'bms_currency', 'bms_pay_fee_log_type')
|
||||
|
||||
const loading = ref(false)
|
||||
const rows = ref([])
|
||||
const total = ref(0)
|
||||
const query = reactive({ orderNo: '', ladingNo: '', customerName: '', pageNum: 1, pageSize: 20 })
|
||||
|
||||
const detailOpen = ref(false)
|
||||
const detailLoading = ref(false)
|
||||
const detail = ref(null)
|
||||
|
||||
const feeOpen = ref(false)
|
||||
const feeLoading = ref(false)
|
||||
const feeTitle = ref('应付费用')
|
||||
const feeBillId = ref('')
|
||||
const sections = ref([])
|
||||
const feeLogs = ref([])
|
||||
const recalcOpen = ref(false)
|
||||
const recalcSaving = ref(false)
|
||||
const recalcForm = reactive({ sourceType: 'ORDER', text: '' })
|
||||
const recalcResult = ref(null)
|
||||
const recalcFails = computed(() => (recalcResult.value?.lines || []).filter(line => !line.success))
|
||||
|
||||
const sources = {
|
||||
CALC: '尾程计算',
|
||||
LADING: '提单分摊',
|
||||
MANUAL: '手工'
|
||||
}
|
||||
|
||||
function sourceText(value) {
|
||||
return sources[value] || value || '-'
|
||||
}
|
||||
|
||||
function search() {
|
||||
query.pageNum = 1
|
||||
loadList()
|
||||
}
|
||||
|
||||
function reset() {
|
||||
query.orderNo = ''
|
||||
query.ladingNo = ''
|
||||
query.customerName = ''
|
||||
search()
|
||||
}
|
||||
|
||||
function loadList() {
|
||||
loading.value = true
|
||||
listPayOrder(query).then(res => {
|
||||
rows.value = res.rows || []
|
||||
total.value = res.total || 0
|
||||
}).finally(() => {
|
||||
loading.value = false
|
||||
})
|
||||
}
|
||||
|
||||
function openDetail(row) {
|
||||
detail.value = null
|
||||
detailOpen.value = true
|
||||
detailLoading.value = true
|
||||
getBill(row.billId).then(res => {
|
||||
detail.value = res.data || null
|
||||
}).finally(() => {
|
||||
detailLoading.value = false
|
||||
})
|
||||
}
|
||||
|
||||
function openFees(row) {
|
||||
feeTitle.value = (row.orderNo || '订单') + '的应付费用'
|
||||
feeBillId.value = row.billId
|
||||
sections.value = []
|
||||
feeLogs.value = []
|
||||
feeOpen.value = true
|
||||
loadFees()
|
||||
}
|
||||
|
||||
function loadFees() {
|
||||
if (!feeBillId.value) {
|
||||
return
|
||||
}
|
||||
feeLoading.value = true
|
||||
listPayOrderFees(feeBillId.value).then(res => {
|
||||
sections.value = res.data?.sections || []
|
||||
feeLogs.value = res.data?.logs || []
|
||||
}).catch(() => {
|
||||
proxy.$modal.msgError('费用加载失败')
|
||||
}).finally(() => {
|
||||
feeLoading.value = false
|
||||
})
|
||||
}
|
||||
|
||||
function addFeeRow(section) {
|
||||
if ((section.fees || []).some(item => item.editing)) {
|
||||
proxy.$modal.msgWarning('请先保存当前新增的费用')
|
||||
return
|
||||
}
|
||||
if (!section.fees) {
|
||||
section.fees = []
|
||||
}
|
||||
section.fees.push({
|
||||
editing: true,
|
||||
pick: '',
|
||||
feeType: '',
|
||||
feeName: '',
|
||||
amount: null,
|
||||
currency: 'CNY',
|
||||
remark: '',
|
||||
feeSource: 'MANUAL'
|
||||
})
|
||||
}
|
||||
|
||||
function pickFee(row) {
|
||||
const dict = (bms_fee_type.value || []).find(item => item.value === row.pick)
|
||||
if (dict) {
|
||||
row.feeType = dict.value
|
||||
row.feeName = dict.label
|
||||
return
|
||||
}
|
||||
row.feeType = row.pick
|
||||
row.feeName = row.pick
|
||||
}
|
||||
|
||||
function saveFeeRow(section, row) {
|
||||
if (!row.feeName) {
|
||||
proxy.$modal.msgWarning('请填写费用项')
|
||||
return
|
||||
}
|
||||
if (row.amount === null || row.amount === undefined || row.amount === '') {
|
||||
proxy.$modal.msgWarning('请填写金额')
|
||||
return
|
||||
}
|
||||
feeLoading.value = true
|
||||
addPayOrderFee(feeBillId.value, {
|
||||
feeType: row.feeType,
|
||||
feeName: row.feeName,
|
||||
level: section.level,
|
||||
amount: row.amount,
|
||||
currency: row.currency || 'CNY',
|
||||
remark: row.remark
|
||||
}).then(() => {
|
||||
proxy.$modal.msgSuccess('已增加费用')
|
||||
loadFees()
|
||||
loadList()
|
||||
}).catch(() => {
|
||||
feeLoading.value = false
|
||||
})
|
||||
}
|
||||
|
||||
function removeFeeRow(section, row) {
|
||||
if (row.editing) {
|
||||
section.fees = section.fees.filter(item => item !== row)
|
||||
return
|
||||
}
|
||||
proxy.$modal.confirm('确认删除这条费用?').then(() => {
|
||||
feeLoading.value = true
|
||||
return removePayOrderFee(row.feeId)
|
||||
}).then(() => {
|
||||
proxy.$modal.msgSuccess('已删除')
|
||||
loadFees()
|
||||
loadList()
|
||||
}).catch(() => {
|
||||
feeLoading.value = false
|
||||
})
|
||||
}
|
||||
|
||||
function openRecalc() {
|
||||
recalcResult.value = null
|
||||
recalcOpen.value = true
|
||||
}
|
||||
|
||||
function resetRecalc() {
|
||||
recalcForm.sourceType = 'ORDER'
|
||||
recalcForm.text = ''
|
||||
recalcResult.value = null
|
||||
}
|
||||
|
||||
function submitRecalc() {
|
||||
if (!recalcForm.text || !recalcForm.text.trim()) {
|
||||
proxy.$modal.msgWarning(recalcForm.sourceType === 'LADING' ? '请填写提单号' : '请填写订单号')
|
||||
return
|
||||
}
|
||||
recalcSaving.value = true
|
||||
recalcPayOrder({ sourceType: recalcForm.sourceType, text: recalcForm.text }).then(res => {
|
||||
recalcResult.value = res.data || { successCount: 0, failCount: 0, lines: [] }
|
||||
loadList()
|
||||
}).finally(() => {
|
||||
recalcSaving.value = false
|
||||
})
|
||||
}
|
||||
|
||||
loadList()
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.fee-board { max-height: 68vh; overflow: auto; }
|
||||
.fee-section { margin-bottom: 16px; }
|
||||
.fee-head {
|
||||
margin-bottom: 8px;
|
||||
padding: 8px 12px;
|
||||
text-align: center;
|
||||
font-weight: 600;
|
||||
font-size: 15px;
|
||||
background: var(--el-fill-color-light);
|
||||
border: 1px solid var(--el-border-color);
|
||||
}
|
||||
.fee-tools { margin-bottom: 8px; text-align: right; }
|
||||
.recalc-result { margin-top: 8px; }
|
||||
.recalc-result > span { display: block; margin-bottom: 8px; }
|
||||
</style>
|
||||
Reference in New Issue
Block a user