This commit is contained in:
zlwu committed 2026-07-05 10:07:24 +08:00
1 parent 33c038b8d9
commit 54b27a3f0e
253 files changed
+30060 -14298

No files matched your search

+62 -21
View File
@@ -51,6 +51,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="承运商名称/联系人/电话"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增承运商
</el-button>
@@ -216,12 +222,12 @@
<el-dialog
v-model="dialogVisible"
:title="dialogTitle"
width="720px"
width="960px"
align-center
class="dialog-form-layout"
@close="handleDialogClose"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="right" label-width="100px" class="pl-dialog-form">
<div class="form-grid-2">
<el-form-item label="承运商名称" prop="carrierName">
<el-input v-model="formData.carrierName" placeholder="请输入承运商名称" maxlength="200" />
@@ -238,20 +244,20 @@
<el-form-item label="联系电话" prop="contactPhone">
<el-input v-model="formData.contactPhone" placeholder="请输入联系电话" maxlength="32" />
</el-form-item>
<el-form-item label="备注" class="form-col-span-2" prop="remark">
<el-input
v-model="formData.remark"
type="textarea"
:rows="3"
placeholder="请输入备注"
maxlength="512"
/>
</el-form-item>
</div>
<el-form-item label="备注" class="form-col-span-2" prop="remark">
<el-input
v-model="formData.remark"
type="textarea"
:rows="3"
placeholder="请输入备注"
maxlength="512"
/>
</el-form-item>
<el-divider content-position="left">资质附件</el-divider>
<div class="form-grid-2">
<el-form-item label="营业执照" prop="businessLicenseUrls">
<el-form-item label="营业执照" prop="businessLicenseUrls" class="form-col-span-2">
<AttachmentUploadField
ref="businessLicenseUploadRef"
v-model="formData.businessLicenseUrls"
@@ -262,7 +268,7 @@
@update:model-value="handleCertFieldChange('businessLicenseUrls')"
/>
</el-form-item>
<el-form-item label="道路经营许可证" prop="roadTransportLicenseUrls">
<el-form-item label="道路经营许可证" prop="roadTransportLicenseUrls" class="form-col-span-2">
<AttachmentUploadField
ref="roadTransportLicenseUploadRef"
v-model="formData.roadTransportLicenseUrls"
@@ -307,7 +313,11 @@
</template>
</el-dialog>
<PlCarrierViewDialog v-model:visible="viewVisible" :carrier-id="viewCarrierId">
<PlCarrierViewDialog
ref="viewDialogRef"
v-model:visible="viewVisible"
:carrier-id="viewCarrierId"
>
<template v-if="viewingRow" #hero-actions>
<el-button class="btn-main" type="primary" @click="handleEdit(viewingRow)">
<el-icon><Edit /></el-icon>编辑
@@ -340,6 +350,7 @@ import { carrierApi, type Carrier } from '@/api/pl'
import AttachmentUploadField from '@/components/business/attachment-upload-field/index.vue'
import PlCarrierViewDialog from '@/components/business/pl-carrier-view-dialog/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
import { pickBxPageResult } from '@/utils/http/bx'
@@ -351,6 +362,7 @@ import {
} from '@/utils/pl-display'
const loading = ref(false)
const quickSearchKeyword = ref('')
const listColumnDefs = [
{ prop: 'contactName', label: '联系人' },
@@ -384,6 +396,7 @@ const isEdit = ref(false)
const viewVisible = ref(false)
const viewCarrierId = ref('')
const viewingRow = ref<Carrier | null>(null)
const viewDialogRef = ref<InstanceType<typeof PlCarrierViewDialog>>()
const searchForm = reactive({
q: '',
@@ -446,9 +459,6 @@ const createQualificationRules = {
},
trigger: 'change'
}
],
transportAgreementExpireDate: [
{ required: true, message: '请选择协议有效期', trigger: 'change' }
]
}
@@ -473,7 +483,7 @@ async function fetchData() {
loading.value = true
try {
const res = await carrierApi.list({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
status: searchForm.status || undefined,
auditStatus: searchForm.auditStatus || undefined,
page: pagination.page,
@@ -490,6 +500,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -498,11 +509,23 @@ function handleReset() {
searchForm.q = ''
searchForm.status = ''
searchForm.auditStatus = ''
quickSearchKeyword.value = ''
selectedRows.value = []
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handlePageChange() {
fetchData()
}
@@ -516,6 +539,18 @@ function canApproveCarrier(row: Carrier) {
return row.auditStatus !== 'approved' && row.qualificationComplete
}
function syncViewingRowFromList() {
if (!viewingRow.value?.id) return
const updated = carrierList.value.find(row => row.id === viewingRow.value!.id)
if (updated) viewingRow.value = updated
}
async function refreshViewIfOpen() {
if (!viewVisible.value || !viewCarrierId.value) return
syncViewingRowFromList()
await viewDialogRef.value?.reload()
}
async function handleApprove(row: Carrier) {
if (!canApproveCarrier(row)) {
ElMessage.warning('承运商资质不完整,无法审核通过')
@@ -530,7 +565,8 @@ async function handleApprove(row: Carrier) {
try {
await carrierApi.approve(row.id)
ElMessage.success('审核通过')
fetchData()
await fetchData()
await refreshViewIfOpen()
} finally {
auditLoadingMap[row.id] = false
}
@@ -641,7 +677,9 @@ async function handleSubmit() {
businessLicenseUrls: formData.businessLicenseUrls,
roadTransportLicenseUrls: formData.roadTransportLicenseUrls,
transportAgreementUrls: formData.transportAgreementUrls,
transportAgreementExpireDate: formData.transportAgreementExpireDate
...(formData.transportAgreementExpireDate
? { transportAgreementExpireDate: formData.transportAgreementExpireDate }
: {})
})
}
if (isEdit.value) {
@@ -651,7 +689,10 @@ async function handleSubmit() {
}
ElMessage.success(isEdit.value ? '编辑成功' : '新增成功')
dialogVisible.value = false
fetchData()
await fetchData()
if (isEdit.value) {
await refreshViewIfOpen()
}
} finally {
submitLoading.value = false
}
+33 -11
View File
@@ -38,6 +38,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="司机姓名/手机号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增司机
</el-button>
@@ -178,7 +184,7 @@
class="dialog-form-layout"
@close="handleDialogClose"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="right" label-width="100px" class="pl-dialog-form">
<div class="form-grid-2">
<el-form-item label="姓名" prop="driverName">
<el-input v-model="formData.driverName" placeholder="请输入姓名" maxlength="100" />
@@ -225,16 +231,16 @@
style="width: 100%"
/>
</el-form-item>
<el-form-item label="备注" class="form-col-span-2" prop="remark">
<el-input
v-model="formData.remark"
type="textarea"
:rows="3"
placeholder="请输入备注"
maxlength="512"
/>
</el-form-item>
</div>
<el-form-item label="备注" class="form-col-span-2" prop="remark">
<el-input
v-model="formData.remark"
type="textarea"
:rows="3"
placeholder="请输入备注"
maxlength="512"
/>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -280,6 +286,7 @@
import { Check, Close, Delete, Edit, Plus, RefreshLeft, Search } from '@element-plus/icons-vue'
import { driverApi, type Driver } from '@/api/pl'
import SystemViewDialog, { type ViewSection } from '@/components/business/system-view-dialog/index.vue'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
@@ -324,6 +331,8 @@ const isEdit = ref(false)
const viewVisible = ref(false)
const viewRow = ref<Driver | null>(null)
const quickSearchKeyword = ref('')
const searchForm = reactive({
q: ''
})
@@ -411,7 +420,7 @@ async function fetchData() {
loading.value = true
try {
const res = await driverApi.list({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
page: pagination.page,
pageSize: pagination.pageSize
})
@@ -426,17 +435,30 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleReset() {
searchForm.q = ''
quickSearchKeyword.value = ''
selectedRows.value = []
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handlePageChange() {
fetchData()
}
@@ -8,7 +8,7 @@
<el-tabs
v-model="activeTab"
class="panel-pill-tabs panel-pill-tabs--lg"
class="panel-tabs"
@tab-change="handleTabChange"
>
<el-tab-pane label="待审批" name="pending">
@@ -8,7 +8,7 @@
<el-tabs
v-model="activeTab"
class="panel-pill-tabs panel-pill-tabs--lg"
class="panel-tabs"
@tab-change="handleTabChange"
>
<el-tab-pane label="待发放" name="disburse">
@@ -33,14 +33,37 @@
<div class="list-toolbar">
<div class="list-toolbar-row">
<div class="list-toolbar-selected">已选 <span class="sel-num">0</span> 项</div>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<div class="list-toolbar-selected">已选 <span class="sel-num">{{ selectedRows.length }}</span> 项</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="结算单号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
<div class="list-body list-wrap">
<el-table class="list-table" :data="settlementList" v-loading="loading" stripe row-key="id">
<el-table
class="list-table"
:data="settlementList"
v-loading="loading"
stripe
row-key="id"
@row-dblclick="handleView"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" min-width="55" align="center" header-align="center" />
<el-table-column
type="index"
label="序号"
@@ -54,24 +77,60 @@
<el-link type="primary" @click="handleView(row)">{{ row.settlementNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="totalFreight" label="运费合计(元)" min-width="130" align="right">
<el-table-column
v-if="isColumnVisible('totalFreight')"
prop="totalFreight"
label="运费合计(元)"
min-width="130"
align="right"
>
<template #default="{ row }">{{ formatAmount(row.totalFreight) }}</template>
</el-table-column>
<el-table-column prop="planCount" label="关联计划数" min-width="110" align="center" />
<el-table-column prop="licensePlateSummary" label="车牌摘要" min-width="140" show-overflow-tooltip />
<el-table-column prop="settlementStatus" label="结算状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('planCount')"
prop="planCount"
label="关联计划数"
min-width="110"
align="center"
/>
<el-table-column
v-if="isColumnVisible('licensePlateSummary')"
prop="licensePlateSummary"
label="车牌摘要"
min-width="140"
show-overflow-tooltip
/>
<el-table-column
v-if="isColumnVisible('settlementStatus')"
prop="settlementStatus"
label="结算状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getSettlementStatusTagType(row.settlementStatus)" size="small">
{{ getSettlementStatusLabel(row.settlementStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="approvalFinishedTime" label="审批完成时间" min-width="160" align="center">
<el-table-column
v-if="isColumnVisible('approvalFinishedTime')"
prop="approvalFinishedTime"
label="审批完成时间"
min-width="160"
align="center"
>
<template #default="{ row }">{{
row.approvalFinishedTime ? formatDateTime(row.approvalFinishedTime) : '—'
}}</template>
</el-table-column>
<el-table-column prop="submitterName" label="提交人" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('submitterName')"
prop="submitterName"
label="提交人"
min-width="100"
align="center"
>
<template #default="{ row }">{{ row.submitterName || '—' }}</template>
</el-table-column>
</el-table>
@@ -94,7 +153,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { RefreshLeft, Search } from '@element-plus/icons-vue'
import { freightApi, type FreightSettlement } from '@/api/pl'
import PlFreightSettlementViewDialog from '@/components/business/pl-freight-settlement-view-dialog/index.vue'
@@ -105,9 +166,28 @@ import {
import { formatMoneyDisplay } from '@/utils/money-format'
import { formatDateTime } from '@/utils/format'
const listColumnDefs = [
{ prop: 'totalFreight', label: '运费合计(元)' },
{ prop: 'planCount', label: '关联计划数' },
{ prop: 'licensePlateSummary', label: '车牌摘要' },
{ prop: 'settlementStatus', label: '结算状态' },
{ prop: 'approvalFinishedTime', label: '审批完成时间' },
{ prop: 'submitterName', label: '提交人' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-freight-approval-done-columns', listColumnDefs)
const loading = ref(false)
const selectedRows = ref<FreightSettlement[]>([])
const settlementList = ref<FreightSettlement[]>([])
const viewDialogRef = ref<InstanceType<typeof PlFreightSettlementViewDialog>>()
const quickSearchKeyword = ref('')
const searchForm = reactive({
q: '',
@@ -120,6 +200,10 @@ const pagination = reactive({
total: 0
})
function handleSelectionChange(rows: FreightSettlement[]) {
selectedRows.value = rows
}
function formatAmount(amount: number) {
if (!amount) return '¥0.00'
return formatMoneyDisplay(amount)
@@ -130,7 +214,7 @@ async function fetchData() {
try {
const res = await freightApi.list({
tab: 'approval_done',
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
settlementStatus: searchForm.settlementStatus || undefined,
page: pagination.page,
pageSize: pagination.pageSize
@@ -144,6 +228,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -151,6 +236,18 @@ function handleSearch() {
function handleReset() {
searchForm.q = ''
searchForm.settlementStatus = ''
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -30,6 +30,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="结算单号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button
class="btn-main"
type="primary"
@@ -54,7 +60,15 @@
>
<el-icon><CircleClose /></el-icon>驳回
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -83,18 +97,54 @@
<el-link type="primary" @click="handleView(row)">{{ row.settlementNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="totalFreight" label="运费合计(元)" min-width="130" align="right">
<el-table-column
v-if="isColumnVisible('totalFreight')"
prop="totalFreight"
label="运费合计(元)"
min-width="130"
align="right"
>
<template #default="{ row }">{{ formatAmount(row.totalFreight) }}</template>
</el-table-column>
<el-table-column prop="planCount" label="关联计划数" min-width="110" align="center" />
<el-table-column prop="licensePlateSummary" label="车牌摘要" min-width="140" show-overflow-tooltip />
<el-table-column prop="currentApproverName" label="当前审批人" min-width="110" align="center">
<el-table-column
v-if="isColumnVisible('planCount')"
prop="planCount"
label="关联计划数"
min-width="110"
align="center"
/>
<el-table-column
v-if="isColumnVisible('licensePlateSummary')"
prop="licensePlateSummary"
label="车牌摘要"
min-width="140"
show-overflow-tooltip
/>
<el-table-column
v-if="isColumnVisible('currentApproverName')"
prop="currentApproverName"
label="当前审批人"
min-width="110"
align="center"
>
<template #default="{ row }">{{ row.currentApproverName || '—' }}</template>
</el-table-column>
<el-table-column prop="submitterName" label="提交人" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('submitterName')"
prop="submitterName"
label="提交人"
min-width="100"
align="center"
>
<template #default="{ row }">{{ row.submitterName || '—' }}</template>
</el-table-column>
<el-table-column prop="createTime" label="提交时间" min-width="160" align="center">
<el-table-column
v-if="isColumnVisible('createTime')"
prop="createTime"
label="提交时间"
min-width="160"
align="center"
>
<template #default="{ row }">{{ formatDateTime(row.createTime) }}</template>
</el-table-column>
</el-table>
@@ -132,12 +182,14 @@
</el-button>
</template>
</PlFreightSettlementViewDialog>
<PlFreightApprovalDialog ref="approvalDialogRef" @success="fetchData" />
<PlFreightApprovalDialog ref="approvalDialogRef" @success="handleMutationSuccess" />
</div>
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { CircleCheck, CircleClose, RefreshLeft, Search } from '@element-plus/icons-vue'
import { freightApi, type FreightSettlement } from '@/api/pl'
import PlFreightApprovalDialog from '@/components/business/pl-freight-approval-dialog/index.vue'
@@ -145,12 +197,30 @@ import PlFreightSettlementViewDialog from '@/components/business/pl-freight-sett
import { formatMoneyDisplay } from '@/utils/money-format'
import { formatDateTime } from '@/utils/format'
const listColumnDefs = [
{ prop: 'totalFreight', label: '运费合计(元)' },
{ prop: 'planCount', label: '关联计划数' },
{ prop: 'licensePlateSummary', label: '车牌摘要' },
{ prop: 'currentApproverName', label: '当前审批人' },
{ prop: 'submitterName', label: '提交人' },
{ prop: 'createTime', label: '提交时间' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-freight-approval-pending-columns', listColumnDefs)
const loading = ref(false)
const settlementList = ref<FreightSettlement[]>([])
const selectedRows = ref<FreightSettlement[]>([])
const viewingRow = ref<FreightSettlement | null>(null)
const viewDialogRef = ref<InstanceType<typeof PlFreightSettlementViewDialog>>()
const approvalDialogRef = ref<InstanceType<typeof PlFreightApprovalDialog>>()
const quickSearchKeyword = ref('')
const searchForm = reactive({ q: '' })
@@ -174,7 +244,7 @@ async function fetchData() {
try {
const res = await freightApi.list({
tab: 'approval_pending',
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
page: pagination.page,
pageSize: pagination.pageSize
})
@@ -187,12 +257,25 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleReset() {
searchForm.q = ''
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -221,6 +304,18 @@ function handleReject(row: FreightSettlement) {
approvalDialogRef.value?.openReject(row.id, row.currentApprovalId)
}
function syncViewingRowFromList() {
if (!viewingRow.value?.id) return
const updated = settlementList.value.find(row => row.id === viewingRow.value!.id)
if (updated) viewingRow.value = updated
}
async function handleMutationSuccess() {
await fetchData()
syncViewingRowFromList()
await viewDialogRef.value?.reload()
}
function handleToolbarApprove() {
if (selectedRows.value.length !== 1) return
handleApprove(selectedRows.value[0])
@@ -30,6 +30,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="结算单号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button
class="btn-main"
type="primary"
@@ -38,7 +44,15 @@
>
<el-icon><Money /></el-icon>发放登记
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -67,17 +81,47 @@
<el-link type="primary" @click="handleView(row)">{{ row.settlementNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="totalFreight" label="运费合计(元)" min-width="130" align="right">
<el-table-column
v-if="isColumnVisible('totalFreight')"
prop="totalFreight"
label="运费合计(元)"
min-width="130"
align="right"
>
<template #default="{ row }">{{ formatAmount(row.totalFreight) }}</template>
</el-table-column>
<el-table-column prop="planCount" label="关联计划数" min-width="110" align="center" />
<el-table-column prop="licensePlateSummary" label="车牌摘要" min-width="140" show-overflow-tooltip />
<el-table-column prop="approvalFinishedTime" label="审批完成时间" min-width="160" align="center">
<el-table-column
v-if="isColumnVisible('planCount')"
prop="planCount"
label="关联计划数"
min-width="110"
align="center"
/>
<el-table-column
v-if="isColumnVisible('licensePlateSummary')"
prop="licensePlateSummary"
label="车牌摘要"
min-width="140"
show-overflow-tooltip
/>
<el-table-column
v-if="isColumnVisible('approvalFinishedTime')"
prop="approvalFinishedTime"
label="审批完成时间"
min-width="160"
align="center"
>
<template #default="{ row }">{{
row.approvalFinishedTime ? formatDateTime(row.approvalFinishedTime) : '—'
}}</template>
</el-table-column>
<el-table-column prop="submitterName" label="提交人" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('submitterName')"
prop="submitterName"
label="提交人"
min-width="100"
align="center"
>
<template #default="{ row }">{{ row.submitterName || '—' }}</template>
</el-table-column>
</el-table>
@@ -107,7 +151,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { Money, RefreshLeft, Search } from '@element-plus/icons-vue'
import { freightApi, type FreightSettlement } from '@/api/pl'
import PlFreightDisburseDialog from '@/components/business/pl-freight-disburse-dialog/index.vue'
@@ -115,6 +161,22 @@ import PlFreightSettlementViewDialog from '@/components/business/pl-freight-sett
import { formatMoneyDisplay } from '@/utils/money-format'
import { formatDateTime } from '@/utils/format'
const listColumnDefs = [
{ prop: 'totalFreight', label: '运费合计(元)' },
{ prop: 'planCount', label: '关联计划数' },
{ prop: 'licensePlateSummary', label: '车牌摘要' },
{ prop: 'approvalFinishedTime', label: '审批完成时间' },
{ prop: 'submitterName', label: '提交人' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-freight-disburse-columns', listColumnDefs)
const emit = defineEmits<{ disbursed: [] }>()
const loading = ref(false)
@@ -123,6 +185,7 @@ const selectedRows = ref<FreightSettlement[]>([])
const viewingRow = ref<FreightSettlement | null>(null)
const viewDialogRef = ref<InstanceType<typeof PlFreightSettlementViewDialog>>()
const disburseDialogRef = ref<InstanceType<typeof PlFreightDisburseDialog>>()
const quickSearchKeyword = ref('')
const searchForm = reactive({ q: '' })
@@ -146,7 +209,7 @@ async function fetchData() {
try {
const res = await freightApi.list({
tab: 'disburse',
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
page: pagination.page,
pageSize: pagination.pageSize
})
@@ -159,12 +222,25 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleReset() {
searchForm.q = ''
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -192,8 +268,16 @@ function handleToolbarDisburse() {
handleDisburse(selectedRows.value[0])
}
function handleDisburseSuccess() {
fetchData()
function syncViewingRowFromList() {
if (!viewingRow.value?.id) return
const updated = settlementList.value.find(row => row.id === viewingRow.value!.id)
if (updated) viewingRow.value = updated
}
async function handleDisburseSuccess() {
await fetchData()
syncViewingRowFromList()
await viewDialogRef.value?.reload()
emit('disbursed')
}
@@ -27,14 +27,37 @@
<div class="list-toolbar">
<div class="list-toolbar-row">
<div class="list-toolbar-selected">已选 <span class="sel-num">0</span> 项</div>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<div class="list-toolbar-selected">已选 <span class="sel-num">{{ selectedRows.length }}</span> 项</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="结算单号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
<div class="list-body list-wrap">
<el-table class="list-table" :data="settlementList" v-loading="loading" stripe row-key="id">
<el-table
class="list-table"
:data="settlementList"
v-loading="loading"
stripe
row-key="id"
@row-dblclick="handleView"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" min-width="55" align="center" header-align="center" />
<el-table-column
type="index"
label="序号"
@@ -48,20 +71,44 @@
<el-link type="primary" @click="handleView(row)">{{ row.settlementNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="totalFreight" label="运费合计(元)" min-width="130" align="right">
<el-table-column
v-if="isColumnVisible('totalFreight')"
prop="totalFreight"
label="运费合计(元)"
min-width="130"
align="right"
>
<template #default="{ row }">{{ formatAmount(row.totalFreight) }}</template>
</el-table-column>
<el-table-column prop="disburseAmount" label="发放金额(元)" min-width="130" align="right">
<el-table-column
v-if="isColumnVisible('disburseAmount')"
prop="disburseAmount"
label="发放金额(元)"
min-width="130"
align="right"
>
<template #default="{ row }">{{
row.disburseAmount ? formatAmount(row.disburseAmount) : '—'
}}</template>
</el-table-column>
<el-table-column prop="disburseTime" label="发放时间" min-width="160" align="center">
<el-table-column
v-if="isColumnVisible('disburseTime')"
prop="disburseTime"
label="发放时间"
min-width="160"
align="center"
>
<template #default="{ row }">{{
row.disburseTime ? formatDateTime(row.disburseTime) : '—'
}}</template>
</el-table-column>
<el-table-column prop="settlementStatus" label="结算状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('settlementStatus')"
prop="settlementStatus"
label="结算状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getSettlementStatusTagType(row.settlementStatus)" size="small">
{{ getSettlementStatusLabel(row.settlementStatus) }}
@@ -88,7 +135,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { RefreshLeft, Search } from '@element-plus/icons-vue'
import { freightApi, type FreightSettlement } from '@/api/pl'
import PlFreightSettlementViewDialog from '@/components/business/pl-freight-settlement-view-dialog/index.vue'
@@ -99,9 +148,26 @@ import {
import { formatMoneyDisplay } from '@/utils/money-format'
import { formatDateTime } from '@/utils/format'
const listColumnDefs = [
{ prop: 'totalFreight', label: '运费合计(元)' },
{ prop: 'disburseAmount', label: '发放金额(元)' },
{ prop: 'disburseTime', label: '发放时间' },
{ prop: 'settlementStatus', label: '结算状态' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-freight-settled-columns', listColumnDefs)
const loading = ref(false)
const selectedRows = ref<FreightSettlement[]>([])
const settlementList = ref<FreightSettlement[]>([])
const viewDialogRef = ref<InstanceType<typeof PlFreightSettlementViewDialog>>()
const quickSearchKeyword = ref('')
const searchForm = reactive({ q: '' })
@@ -111,6 +177,10 @@ const pagination = reactive({
total: 0
})
function handleSelectionChange(rows: FreightSettlement[]) {
selectedRows.value = rows
}
function formatAmount(amount: number) {
if (!amount) return '¥0.00'
return formatMoneyDisplay(amount)
@@ -121,7 +191,7 @@ async function fetchData() {
try {
const res = await freightApi.list({
tab: 'settled',
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
page: pagination.page,
pageSize: pagination.pageSize
})
@@ -134,12 +204,25 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleReset() {
searchForm.q = ''
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -50,6 +50,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="结算单号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button
v-if="selectedRows.length === 1 && isEditableDraftSettlement(selectedRows[0].settlementStatus)"
class="btn-main"
@@ -100,7 +106,15 @@
>
<el-icon><RefreshLeft /></el-icon>撤回
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -129,35 +143,89 @@
<el-link type="primary" @click="handleView(row)">{{ row.settlementNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="totalFreight" label="运费合计(元)" min-width="130" align="right">
<el-table-column
v-if="isColumnVisible('totalFreight')"
prop="totalFreight"
label="运费合计(元)"
min-width="130"
align="right"
>
<template #default="{ row }">{{ formatAmount(row.totalFreight) }}</template>
</el-table-column>
<el-table-column prop="planCount" label="关联计划数" min-width="110" align="center" />
<el-table-column prop="licensePlateSummary" label="车牌摘要" min-width="140" show-overflow-tooltip />
<el-table-column prop="settlementStatus" label="结算状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('planCount')"
prop="planCount"
label="关联计划数"
min-width="110"
align="center"
/>
<el-table-column
v-if="isColumnVisible('licensePlateSummary')"
prop="licensePlateSummary"
label="车牌摘要"
min-width="140"
show-overflow-tooltip
/>
<el-table-column
v-if="isColumnVisible('settlementStatus')"
prop="settlementStatus"
label="结算状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getSettlementStatusTagType(row.settlementStatus)" size="small">
{{ getSettlementStatusLabel(row.settlementStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="disburseAmount" label="发放金额(元)" min-width="130" align="right">
<el-table-column
v-if="isColumnVisible('disburseAmount')"
prop="disburseAmount"
label="发放金额(元)"
min-width="130"
align="right"
>
<template #default="{ row }">{{
row.disburseAmount ? formatAmount(row.disburseAmount) : '—'
}}</template>
</el-table-column>
<el-table-column prop="disburseTime" label="发放时间" min-width="160" align="center">
<el-table-column
v-if="isColumnVisible('disburseTime')"
prop="disburseTime"
label="发放时间"
min-width="160"
align="center"
>
<template #default="{ row }">{{
row.disburseTime ? formatDateTime(row.disburseTime) : '—'
}}</template>
</el-table-column>
<el-table-column prop="currentApproverName" label="当前审批人" min-width="110" align="center">
<el-table-column
v-if="isColumnVisible('currentApproverName')"
prop="currentApproverName"
label="当前审批人"
min-width="110"
align="center"
>
<template #default="{ row }">{{ row.currentApproverName || '—' }}</template>
</el-table-column>
<el-table-column prop="submitterName" label="创建人" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('submitterName')"
prop="submitterName"
label="创建人"
min-width="100"
align="center"
>
<template #default="{ row }">{{ row.submitterName || '—' }}</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" min-width="160" align="center">
<el-table-column
v-if="isColumnVisible('createTime')"
prop="createTime"
label="创建时间"
min-width="160"
align="center"
>
<template #default="{ row }">{{ formatDateTime(row.createTime) }}</template>
</el-table-column>
</el-table>
@@ -229,7 +297,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import {
CircleClose,
Edit,
@@ -251,6 +321,26 @@ import {
import { formatMoneyDisplay } from '@/utils/money-format'
import { formatDateTime } from '@/utils/format'
const listColumnDefs = [
{ prop: 'totalFreight', label: '运费合计(元)' },
{ prop: 'planCount', label: '关联计划数' },
{ prop: 'licensePlateSummary', label: '车牌摘要' },
{ prop: 'settlementStatus', label: '结算状态' },
{ prop: 'disburseAmount', label: '发放金额(元)' },
{ prop: 'disburseTime', label: '发放时间' },
{ prop: 'currentApproverName', label: '当前审批人' },
{ prop: 'submitterName', label: '创建人' },
{ prop: 'createTime', label: '创建时间' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-freight-settlement-bill-columns', listColumnDefs)
const loading = ref(false)
const cancelLoadingMap = reactive<Record<string, boolean>>({})
const carrierList = ref<Carrier[]>([])
@@ -260,6 +350,7 @@ const viewingRow = ref<FreightSettlement | null>(null)
const viewDialogRef = ref<InstanceType<typeof PlFreightSettlementViewDialog>>()
const formDialogRef = ref<InstanceType<typeof PlFreightSettlementFormDialog>>()
const approvalDialogRef = ref<InstanceType<typeof PlFreightApprovalDialog>>()
const quickSearchKeyword = ref('')
const searchForm = reactive({
carrierId: '',
@@ -288,7 +379,7 @@ async function fetchData() {
const res = await freightApi.list({
tab: 'bills',
carrierId: searchForm.carrierId || undefined,
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
settlementStatus: searchForm.settlementStatus || undefined,
page: pagination.page,
pageSize: pagination.pageSize
@@ -302,6 +393,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -310,6 +402,18 @@ function handleReset() {
searchForm.carrierId = ''
searchForm.q = ''
searchForm.settlementStatus = ''
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -50,6 +50,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="计划编号/客户/车牌"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button
class="btn-main"
type="primary"
@@ -59,7 +65,15 @@
>
<el-icon><DocumentAdd /></el-icon>生成结算单
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -71,6 +85,7 @@
stripe
row-key="id"
@selection-change="handleSelectionChange"
@row-dblclick="handleViewPlan"
>
<el-table-column type="selection" min-width="48" align="center" />
<el-table-column
@@ -86,25 +101,67 @@
<el-link type="primary" @click="handleViewPlan(row)">{{ row.planNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="planDate" label="计划日期" min-width="120" align="center" />
<el-table-column prop="planType" label="单据类型" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('planDate')"
prop="planDate"
label="计划日期"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('planType')"
prop="planType"
label="单据类型"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlanTypeTagType(row.planType)" size="small">
{{ getPlanTypeLabel(row.planType) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="客户/供应商" min-width="140" show-overflow-tooltip>
<el-table-column
v-if="isColumnVisible('partnerName')"
prop="partnerName"
label="客户/供应商"
min-width="140"
show-overflow-tooltip
>
<template #default="{ row }">
{{ row.customerName || row.supplierName || '—' }}
</template>
</el-table-column>
<el-table-column prop="licensePlate" label="车牌号" min-width="110" align="center" />
<el-table-column prop="transportCompany" label="运输公司" min-width="140" show-overflow-tooltip />
<el-table-column prop="freightAmount" label="运费(元)" min-width="120" align="right">
<el-table-column
v-if="isColumnVisible('licensePlate')"
prop="licensePlate"
label="车牌号"
min-width="110"
align="center"
/>
<el-table-column
v-if="isColumnVisible('transportCompany')"
prop="transportCompany"
label="运输公司"
min-width="140"
show-overflow-tooltip
/>
<el-table-column
v-if="isColumnVisible('freightAmount')"
prop="freightAmount"
label="运费(元)"
min-width="120"
align="right"
>
<template #default="{ row }">{{ formatAmount(row.freightAmount) }}</template>
</el-table-column>
<el-table-column prop="archiveTime" label="归档时间" min-width="160" align="center">
<el-table-column
v-if="isColumnVisible('archiveTime')"
prop="archiveTime"
label="归档时间"
min-width="160"
align="center"
>
<template #default="{ row }">{{
row.archiveTime ? formatDateTime(row.archiveTime) : '—'
}}</template>
@@ -129,7 +186,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { DocumentAdd, RefreshLeft, Search } from '@element-plus/icons-vue'
import { carrierApi, freightApi, type Carrier, type UnsettledPlanItem } from '@/api/pl'
import { pickBxList } from '@/utils/http/bx'
@@ -140,6 +199,24 @@ import { formatDateTime } from '@/utils/format'
const emit = defineEmits<{ created: [settlementId: string] }>()
const listColumnDefs = [
{ prop: 'planDate', label: '计划日期' },
{ prop: 'planType', label: '单据类型' },
{ prop: 'partnerName', label: '客户/供应商' },
{ prop: 'licensePlate', label: '车牌号' },
{ prop: 'transportCompany', label: '运输公司' },
{ prop: 'freightAmount', label: '运费(元)' },
{ prop: 'archiveTime', label: '归档时间' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-freight-unsettled-plan-columns', listColumnDefs)
const loading = ref(false)
const createLoading = ref(false)
const carrierList = ref<Carrier[]>([])
@@ -147,6 +224,7 @@ const planList = ref<UnsettledPlanItem[]>([])
const selectedRows = ref<UnsettledPlanItem[]>([])
const planViewVisible = ref(false)
const viewPlanId = ref('')
const quickSearchKeyword = ref('')
const searchForm = reactive({
carrierId: '',
@@ -171,7 +249,7 @@ async function fetchData() {
try {
const res = await freightApi.listUnsettledPlans({
carrierId: searchForm.carrierId || undefined,
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
planType: searchForm.planType || undefined,
licensePlate: searchForm.licensePlate || undefined,
page: pagination.page,
@@ -186,6 +264,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -195,6 +274,18 @@ function handleReset() {
searchForm.q = ''
searchForm.planType = ''
searchForm.licensePlate = ''
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
+1 -1
View File
@@ -8,7 +8,7 @@
<el-tabs
v-model="activeTab"
class="panel-pill-tabs panel-pill-tabs--lg"
class="panel-tabs"
@tab-change="handleTabChange"
>
<el-tab-pane label="未结算计划" name="unsettled">
@@ -34,6 +34,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="主体名称/证件号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button
class="btn-main"
type="primary"
@@ -44,14 +50,22 @@
<el-icon><CircleCheck /></el-icon>处理
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
<div class="list-body list-wrap">
<el-table
class="list-table"
:data="reminderList"
:data="displayReminderList"
v-loading="loading"
stripe
row-key="id"
@@ -59,7 +73,13 @@
>
<el-table-column type="selection" min-width="55" align="center" />
<el-table-column type="index" label="序号" min-width="68" align="center" header-align="center" />
<el-table-column prop="ownerType" label="主体类型" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('ownerType')"
prop="ownerType"
label="主体类型"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getOwnerTypeTagType(row.ownerType)" size="small">
{{ getOwnerTypeLabel(row.ownerType) }}
@@ -71,30 +91,66 @@
{{ row.ownerLabel || row.driverName || '-' }}
</template>
</el-table-column>
<el-table-column prop="documentType" label="证件类型" min-width="120" align="center">
<el-table-column
v-if="isColumnVisible('documentType')"
prop="documentType"
label="证件类型"
min-width="120"
align="center"
>
<template #default="{ row }">
<el-tag :type="getDocTypeTagType(row.documentType)" size="small">
{{ getDocTypeLabel(row.documentType) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="documentNo" label="证件号" min-width="160" align="center" />
<el-table-column prop="expireDate" label="到期日期" min-width="120" align="center" />
<el-table-column prop="daysRemaining" label="剩余天数" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('documentNo')"
prop="documentNo"
label="证件号"
min-width="160"
align="center"
/>
<el-table-column
v-if="isColumnVisible('expireDate')"
prop="expireDate"
label="到期日期"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('daysRemaining')"
prop="daysRemaining"
label="剩余天数"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getDaysTagType(row.daysRemaining)" size="small">
{{ row.daysRemaining }} 天
</el-tag>
</template>
</el-table-column>
<el-table-column prop="status" label="状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('status')"
prop="status"
label="状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="row.status === 'resolved' ? 'success' : 'warning'" size="small">
{{ row.status === 'resolved' ? '已处理' : '待处理' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="remark" label="处理备注" min-width="160" show-overflow-tooltip />
<el-table-column
v-if="isColumnVisible('remark')"
prop="remark"
label="处理备注"
min-width="160"
show-overflow-tooltip
/>
</el-table>
</div>
</section>
@@ -102,20 +158,58 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { CircleCheck, RefreshLeft, Search } from '@element-plus/icons-vue'
import { inventoryApi, type DocumentReminder } from '@/api/pl'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
const listColumnDefs = [
{ prop: 'ownerType', label: '主体类型' },
{ prop: 'documentType', label: '证件类型' },
{ prop: 'documentNo', label: '证件号' },
{ prop: 'expireDate', label: '到期日期' },
{ prop: 'daysRemaining', label: '剩余天数' },
{ prop: 'status', label: '状态' },
{ prop: 'remark', label: '处理备注', defaultVisible: false }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-inventory-document-reminder-list-columns', listColumnDefs)
const loading = ref(false)
const resolveLoading = ref(false)
const reminderList = ref<DocumentReminder[]>([])
const reminderSourceList = ref<DocumentReminder[]>([])
const quickSearchKeyword = ref('')
const selectedRows = ref<DocumentReminder[]>([])
const searchForm = reactive({
status: ''
})
const displayReminderList = computed(() => {
const keyword = quickSearchKeyword.value.trim().toLowerCase()
if (!keyword) return reminderSourceList.value
return reminderSourceList.value.filter((row) => {
const haystack = [
row.ownerLabel,
row.driverName,
row.documentNo,
getDocTypeLabel(row.documentType)
]
.filter(Boolean)
.join(' ')
.toLowerCase()
return haystack.includes(keyword)
})
})
const selectedRow = computed(() =>
selectedRows.value.length === 1 ? selectedRows.value[0] : null
)
@@ -164,21 +258,31 @@ async function fetchData() {
loading.value = true
try {
const res = await inventoryApi.documentReminders(searchForm.status || undefined)
reminderList.value = (res.data ?? res) || []
reminderSourceList.value = (res.data ?? res) || []
} finally {
loading.value = false
}
}
function handleSearch() {
quickSearchKeyword.value = ''
fetchData()
}
function handleReset() {
searchForm.status = ''
quickSearchKeyword.value = ''
fetchData()
}
function handleQuickSearch() {
// 前端过滤,无需重新请求
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
}
function handleSelectionChange(rows: DocumentReminder[]) {
selectedRows.value = rows
}
+99 -11
View File
@@ -33,9 +33,24 @@
<div class="list-toolbar">
<div class="list-toolbar-row">
<div class="list-toolbar-selected">已选 <span class="sel-num">0</span> 项</div>
<div class="list-toolbar-selected">已选 <span class="sel-num">{{ selectedRows.length }}</span> 项</div>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="产品名称/编号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -46,8 +61,10 @@
v-loading="loading"
stripe
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column
<el-table-column type="selection" min-width="55" align="center" header-align="center" />
<el-table-column
type="index"
label="序号"
min-width="68"
@@ -55,11 +72,33 @@
header-align="center"
:index="(index) => (pagination.page - 1) * pagination.pageSize + index + 1"
/>
<el-table-column prop="productName" label="产品名称" min-width="180" show-overflow-tooltip />
<el-table-column prop="productNo" label="产品编号" min-width="120" />
<el-table-column prop="model" label="规格型号" min-width="120" />
<el-table-column prop="unit" label="单位" min-width="80" align="center" />
<el-table-column prop="stockQty" label="库存数量" min-width="120" align="right">
<el-table-column prop="productName" label="产品名称" min-width="180" show-overflow-tooltip />
<el-table-column
v-if="isColumnVisible('productNo')"
prop="productNo"
label="产品编号"
min-width="120"
/>
<el-table-column
v-if="isColumnVisible('model')"
prop="model"
label="规格型号"
min-width="120"
/>
<el-table-column
v-if="isColumnVisible('unit')"
prop="unit"
label="单位"
min-width="80"
align="center"
/>
<el-table-column
v-if="isColumnVisible('stockQty')"
prop="stockQty"
label="库存数量"
min-width="120"
align="right"
>
<template #default="{ row }">
<span
:class="{
@@ -71,12 +110,22 @@
</span>
</template>
</el-table-column>
<el-table-column label="预警阈值" min-width="150" align="center">
<el-table-column
v-if="isColumnVisible('warnThreshold')"
label="预警阈值"
min-width="150"
align="center"
>
<template #default="{ row }">
{{ row.lowStockWarning || '-' }} ~ {{ row.highStockWarning || '-' }}
</template>
</el-table-column>
<el-table-column label="状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('status')"
label="状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag v-if="row.stockQty < (row.lowStockWarning || 0)" type="danger" size="small">
库存不足
@@ -110,13 +159,34 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { RefreshLeft, Search } from '@element-plus/icons-vue'
import { inventoryApi, type InventoryRecord } from '@/api/pl'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
const listColumnDefs = [
{ prop: 'productNo', label: '产品编号' },
{ prop: 'model', label: '规格型号' },
{ prop: 'unit', label: '单位' },
{ prop: 'stockQty', label: '库存数量' },
{ prop: 'warnThreshold', label: '预警阈值' },
{ prop: 'status', label: '状态' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-inventory-ledger-list-columns', listColumnDefs)
const loading = ref(false)
const selectedRows = ref<any[]>([])
const inventoryList = ref<InventoryRecord[]>([])
const quickSearchKeyword = ref('')
const searchForm = reactive({
productName: ''
@@ -128,11 +198,16 @@ const pagination = reactive({
total: 0
})
function handleSelectionChange(rows: any[]) {
selectedRows.value = rows
}
async function fetchData() {
loading.value = true
try {
const keyword = quickSearchKeyword.value.trim()
const res = await inventoryApi.ledger({
productName: searchForm.productName || undefined,
productName: keyword || searchForm.productName || undefined,
page: pagination.page,
pageSize: pagination.pageSize
})
@@ -145,12 +220,25 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleReset() {
searchForm.productName = ''
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
+26 -10
View File
@@ -1,4 +1,4 @@
<!-- 人员管理 -->
<!-- 驾押人员管理 -->
<template>
<div class="page-container">
<section class="panel">
@@ -44,6 +44,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="姓名/手机号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增人员
</el-button>
@@ -193,12 +199,12 @@
<el-dialog
v-model="dialogVisible"
:title="dialogTitle"
width="1120px"
width="1320px"
align-center
class="dialog-form-layout"
@close="handleDialogClose"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="right" label-width="100px" class="pl-dialog-form">
<div class="form-grid-3">
<el-form-item label="姓名" prop="personnelName">
<el-input v-model="formData.personnelName" placeholder="请输入姓名" maxlength="100" />
@@ -235,13 +241,14 @@
</el-form-item>
</div>
<!-- 人员证书(卡片) -->
<!-- 人员证书(列表) -->
<PlCertFormList
ref="certFormListRef"
v-model="certList"
title="人员证书"
upload-folder="pl/personnel-cert"
:cert-name-options="certNameOptions"
layout="table"
/>
</el-form>
<template #footer>
@@ -258,7 +265,7 @@
<SystemViewDialog
v-model:visible="viewVisible"
:title="viewDetail?.personnelName || '人员详情'"
:title="viewDialogTitle"
:icon="User"
:meta="viewHeroMeta"
:sections="viewSections"
@@ -282,7 +289,7 @@
</el-button>
</template>
<template #certs>
<PlCertViewList :cert-list="viewDetail?.certList || []" />
<PlCertViewList :cert-list="viewDetail?.certList || []" layout="table" />
</template>
</SystemViewDialog>
</div>
@@ -297,12 +304,14 @@ import SystemViewDialog, {
type ViewSection
} from '@/components/business/system-view-dialog/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
import { pickBxPageResult } from '@/utils/http/bx'
import { DEFAULT_LIST_PAGE_SIZE } from '@/utils/table/tableConfig'
import { formatDateTime } from '@/utils/format'
import { canDeleteByCreator, filterDeletableByCreator, allRowsDeletableByCreator, CREATOR_DELETE_TIP } from '@/utils/creator-delete'
import { getPersonnelCertMissingSuffix } from '@/utils/pl-personnel-cert'
type CertListItem = CertRow & { _key?: string }
type CertFormListRef = InstanceType<typeof PlCertFormList>
@@ -340,10 +349,11 @@ const viewLoading = ref(false)
const viewDetail = ref<PersonnelDetail | null>(null)
const certNameOptions = [
'驾驶证',
'押运员证',
'危化品从业资格证',
'身份证',
'驾驶证',
'从业资格证',
'危化品从业资格证',
'押运员证',
'健康证'
]
@@ -397,6 +407,12 @@ const viewHeroMeta = computed(() => {
return parts.join(' · ')
})
const viewDialogTitle = computed(() => {
const name = viewDetail.value?.personnelName || '人员详情'
if (!viewDetail.value) return name
return name + getPersonnelCertMissingSuffix(viewDetail.value.certList || [])
})
const viewSections = computed<ViewSection[]>(() => {
const d = viewDetail.value
if (!d) return []
@@ -427,7 +443,7 @@ const viewSections = computed<ViewSection[]>(() => {
tableMode: 'triple'
},
{
title: '人员证书',
title: `人员证书${viewDetail.value ? getPersonnelCertMissingSuffix(viewDetail.value.certList || []) : ''}`,
fields: [],
slot: 'certs'
}
+55 -74
View File
@@ -29,7 +29,7 @@
<el-option label="草稿" value="draft" />
<el-option label="进行中" value="processing" />
<el-option label="已完成" value="completed" />
<el-option label="已取消" value="cancelled" />
<el-option label="已作废" value="cancelled" />
</el-select>
</el-form-item>
<el-form-item label="运输状态">
@@ -38,52 +38,33 @@
<el-option label="已安排" value="arranged" />
</el-select>
</el-form-item>
</div>
<div v-show="filterExpanded" id="pl-plan-archive-filter-extra" class="filter-extra">
<div class="filter-grid">
<el-form-item label="客户名称">
<el-input
v-model="searchForm.customerName"
placeholder="搜索客户名称"
clearable
/>
</el-form-item>
<el-form-item label="计划日期">
<el-date-picker
v-model="dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="归档状态">
<el-select v-model="searchForm.archiveStatus" placeholder="全部" clearable>
<el-option label="未归档" value="unarchived" />
<el-option label="已归档" value="archived" />
</el-select>
</el-form-item>
</div>
<el-form-item label="客户名称">
<el-input
v-model="searchForm.customerName"
placeholder="搜索客户名称"
clearable
/>
</el-form-item>
<el-form-item label="计划日期">
<el-date-picker
v-model="dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="归档状态">
<el-select v-model="searchForm.archiveStatus" placeholder="全部" clearable>
<el-option label="未归档" value="unarchived" />
<el-option label="已归档" value="archived" />
</el-select>
</el-form-item>
</div>
<div class="filter-actions">
<div class="filter-actions-start">
<button
v-if="showFilterToggle"
type="button"
class="btn-link btn-filter-toggle"
:aria-expanded="filterExpanded"
aria-controls="pl-plan-archive-filter-extra"
@click="filterExpanded = !filterExpanded"
>
{{ filterExpanded ? '收起更多' : '展开更多' }}
<el-icon>
<ArrowUpBold v-if="filterExpanded" />
<ArrowDownBold v-else />
</el-icon>
</button>
</div>
<div class="filter-actions-start" />
<div class="filter-actions-end">
<el-button class="btn-ghost" :loading="loading" @click="handleReset">
<el-icon><RefreshLeft /></el-icon>重置
@@ -106,18 +87,12 @@
aria-label="计划日期快捷筛选"
@change="handleDateShortcut"
/>
<el-input
<ListQuickSearchInput
v-model="quickSearch"
class="quick-search-input"
placeholder="计划编号/客户名称"
clearable
@keyup.enter="handleQuickSearch"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
>
<template #suffix>
<el-icon class="quick-search-icon" @click="handleQuickSearch"><Search /></el-icon>
</template>
</el-input>
/>
<el-button
v-if="selectedPlan && selectedPlan.followStatus !== 'cancelled'"
class="btn-ghost"
@@ -283,10 +258,14 @@
<PlPlanFormDialog
v-model:visible="formDialogVisible"
:plan-id="editingPlanId"
@success="fetchData"
@success="handlePlanMutationSuccess"
/>
<PlPlanViewDialog v-model:visible="viewVisible" :plan-id="viewPlanId">
<PlPlanViewDialog
ref="viewDialogRef"
v-model:visible="viewVisible"
:plan-id="viewPlanId"
>
<template v-if="viewingPlan" #hero-actions>
<el-button
v-if="viewingPlan.followStatus !== 'cancelled'"
@@ -309,17 +288,16 @@
<PlPlanArchiveDialog
v-model:visible="archiveDialogVisible"
:plan-id="archivePlanId"
@success="fetchData"
@success="handlePlanMutationSuccess"
/>
</div>
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import {
ArrowDownBold,
ArrowUpBold,
Edit,
FolderChecked,
RefreshLeft,
@@ -337,15 +315,16 @@ import {
getPlPlanArchiveStatusLabel,
getPlPlanArchiveStatusTagType
} from '@/utils/pl-display'
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
const loading = ref(false)
const formDialogVisible = ref(false)
const editingPlanId = ref('')
const viewVisible = ref(false)
const viewPlanId = ref('')
const viewDialogRef = ref<InstanceType<typeof PlPlanViewDialog>>()
const archiveDialogVisible = ref(false)
const archivePlanId = ref('')
const filterExpanded = ref(false)
const planList = ref<Plan[]>([])
const listColumnDefs = [
@@ -371,6 +350,21 @@ const {
const selectedRows = ref<Plan[]>([])
const viewingPlan = ref<Plan | null>(null)
function syncViewingPlanFromList() {
syncViewRowFromFlatList(viewingPlan, planList.value)
}
async function refreshViewIfOpen() {
if (!viewVisible.value || !viewPlanId.value) return
syncViewingPlanFromList()
await viewDialogRef.value?.reload()
}
async function handlePlanMutationSuccess() {
await fetchData()
await refreshViewIfOpen()
}
const selectedPlan = computed(() => (selectedRows.value.length === 1 ? selectedRows.value[0] : null))
const dateRange = ref<string[]>([])
const quickSearch = ref('')
@@ -390,9 +384,6 @@ const pagination = reactive({
total: 0
})
const PLAN_FILTER_FIELD_COUNT = 7
const showFilterToggle = computed(() => PLAN_FILTER_FIELD_COUNT > 4)
function getPlanTypeTagType(type: string) {
const map: Record<string, string> = { direct: 'primary', inbound: 'success', outbound: 'warning' }
return map[type] || 'info'
@@ -418,7 +409,7 @@ function getFollowStatusLabel(status: string) {
draft: '草稿',
processing: '进行中',
completed: '已完成',
cancelled: '已取消'
cancelled: '已作废'
}
return map[status] || status
}
@@ -462,7 +453,6 @@ function handleReset() {
searchForm.archiveStatus = ''
quickSearch.value = ''
resetDateShortcut()
filterExpanded.value = false
pagination.page = 1
fetchData()
}
@@ -551,13 +541,4 @@ onMounted(() => {
.pl-plan-list-toolbar-row {
flex-wrap: wrap;
}
.quick-search-input {
width: 280px;
flex-shrink: 0;
}
.quick-search-icon {
cursor: pointer;
}
</style>
+179 -85
View File
@@ -30,7 +30,7 @@
<el-option label="草稿" value="draft" />
<el-option label="进行中" value="processing" />
<el-option label="已完成" value="completed" />
<el-option label="已取消" value="cancelled" />
<el-option label="已作废" value="cancelled" />
</el-select>
</el-form-item>
<el-form-item label="运输状态">
@@ -39,46 +39,27 @@
<el-option label="已安排" value="arranged" />
</el-select>
</el-form-item>
</div>
<div v-show="filterExpanded" id="pl-plan-cert-filter-extra" class="filter-extra">
<div class="filter-grid">
<el-form-item label="客户名称">
<el-input
v-model="searchForm.customerName"
placeholder="搜索客户名称"
clearable
/>
</el-form-item>
<el-form-item label="计划日期">
<el-date-picker
v-model="dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item>
</div>
<el-form-item label="客户名称">
<el-input
v-model="searchForm.customerName"
placeholder="搜索客户名称"
clearable
/>
</el-form-item>
<el-form-item label="计划日期">
<el-date-picker
v-model="dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item>
</div>
<div class="filter-actions">
<div class="filter-actions-start">
<button
v-if="showFilterToggle"
type="button"
class="btn-link btn-filter-toggle"
:aria-expanded="filterExpanded"
aria-controls="pl-plan-cert-filter-extra"
@click="filterExpanded = !filterExpanded"
>
{{ filterExpanded ? '收起更多' : '展开更多' }}
<el-icon>
<ArrowUpBold v-if="filterExpanded" />
<ArrowDownBold v-else />
</el-icon>
</button>
</div>
<div class="filter-actions-start" />
<div class="filter-actions-end">
<el-button class="btn-ghost" :loading="loading" @click="handleReset">
<el-icon><RefreshLeft /></el-icon>重置
@@ -101,27 +82,40 @@
aria-label="计划日期快捷筛选"
@change="handleDateShortcut"
/>
<el-input
<ListQuickSearchInput
v-model="quickSearch"
class="quick-search-input"
placeholder="计划编号/客户名称"
clearable
@keyup.enter="handleQuickSearch"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
>
<template #suffix>
<el-icon class="quick-search-icon" @click="handleQuickSearch"><Search /></el-icon>
</template>
</el-input>
/>
<el-button
v-if="selectedPlan && canUploadCert(selectedPlan)"
v-if="selectedPlan && canManageCertReady(selectedPlan) && !isHazardCertReady(selectedPlan)"
class="btn-main"
type="primary"
:disabled="selectedRows.length !== 1"
:loading="certReadyLoading"
@click="handleToolbarMarkCertReady"
>
<el-icon><CircleCheck /></el-icon>证书齐备
</el-button>
<el-button
v-if="selectedPlan && canUploadCert(selectedPlan)"
:class="selectedPlan && canManageCertReady(selectedPlan) && !isHazardCertReady(selectedPlan) ? 'btn-ghost' : 'btn-main'"
:type="selectedPlan && canManageCertReady(selectedPlan) && !isHazardCertReady(selectedPlan) ? undefined : 'primary'"
:disabled="selectedRows.length !== 1"
@click="handleToolbarUploadCert"
>
<el-icon><Upload /></el-icon>上传证书
</el-button>
<el-button
v-if="selectedPlan && canManageCertReady(selectedPlan) && isHazardCertReady(selectedPlan)"
class="btn-ghost"
:disabled="selectedRows.length !== 1"
:loading="certReadyLoading"
@click="handleToolbarUnmarkCertReady"
>
<el-icon><CircleClose /></el-icon>取消齐备
</el-button>
<ListToolbarEndActions
:loading="loading"
@@ -167,6 +161,23 @@
min-width="120"
align="center"
/>
<el-table-column v-if="isColumnVisible('planAttachments')" label="计划附件" min-width="240">
<template #default="{ row }">
<PlPlanListCertCell :products="row.products" short-hazard-tag />
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('products')" label="产品信息" min-width="240">
<template #default="{ row }">
<PlPlanListProductCell :products="row.products" />
</template>
</el-table-column>
<el-table-column
v-if="isColumnVisible('customerName')"
prop="customerName"
label="客户名称"
min-width="180"
show-overflow-tooltip
/>
<el-table-column
v-if="isColumnVisible('planType')"
prop="planType"
@@ -181,20 +192,15 @@
</template>
</el-table-column>
<el-table-column
v-if="isColumnVisible('customerName')"
prop="customerName"
label="客户名称"
min-width="180"
show-overflow-tooltip
/>
<el-table-column v-if="isColumnVisible('products')" label="产品信息" min-width="240">
v-if="isColumnVisible('hazardCertReady')"
label="证书齐备"
min-width="100"
align="center"
>
<template #default="{ row }">
<PlPlanListProductCell :products="row.products" />
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('planAttachments')" label="计划附件" min-width="400">
<template #default="{ row }">
<PlPlanListCertCell :products="row.products" />
<el-tag :type="getHazardCertReadyTagType(row)" size="small">
{{ getHazardCertReadyLabel(row) }}
</el-tag>
</template>
</el-table-column>
<el-table-column
@@ -261,31 +267,51 @@
</div>
</section>
<PlPlanViewDialog v-model:visible="viewVisible" :plan-id="viewPlanId">
<PlPlanViewDialog
ref="viewDialogRef"
v-model:visible="viewVisible"
:plan-id="viewPlanId"
>
<template v-if="viewingPlan" #hero-actions>
<el-button
v-if="canUploadCert(viewingPlan)"
v-if="canManageCertReady(viewingPlan) && !isHazardCertReady(viewingPlan)"
class="btn-main"
type="primary"
:loading="certReadyLoading"
@click="handleMarkCertReady(viewingPlan)"
>
<el-icon><CircleCheck /></el-icon>证书齐备
</el-button>
<el-button
v-if="canUploadCert(viewingPlan)"
class="btn-ghost"
@click="handleUploadCert(viewingPlan)"
>
<el-icon><Upload /></el-icon>上传证书
</el-button>
<el-button
v-if="canManageCertReady(viewingPlan) && isHazardCertReady(viewingPlan)"
class="btn-ghost"
:loading="certReadyLoading"
@click="handleUnmarkCertReady(viewingPlan)"
>
<el-icon><CircleClose /></el-icon>取消齐备
</el-button>
</template>
</PlPlanViewDialog>
<PlPlanCertUploadDialog
v-model:visible="certDialogVisible"
:plan-id="certPlanId"
@success="fetchData"
@success="handleCertUploadSuccess"
/>
</div>
</template>
<script setup lang="ts">
import {
ArrowDownBold,
ArrowUpBold,
CircleCheck,
CircleClose,
RefreshLeft,
Search,
Upload
@@ -294,27 +320,35 @@ import { planApi, type Plan } from '@/api/pl'
import PlPlanCertUploadDialog from '@/components/business/pl-plan-cert-upload-dialog/index.vue'
import PlPlanListCertCell from '@/components/business/pl-plan-list-cert-cell/index.vue'
import PlPlanListProductCell from '@/components/business/pl-plan-list-product-cell/index.vue'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import {
isHazardCertReady,
planHasHazardProducts
} from '@/composables/usePlToxicProductCertCheck'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import PlPlanViewDialog from '@/components/business/pl-plan-view-dialog/index.vue'
import ListToolbarDateShortcuts from '@/components/core/list-toolbar-date-shortcuts/index.vue'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
import { useListDateShortcut } from '@/composables/useListDateShortcut'
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
const loading = ref(false)
const certReadyLoading = ref(false)
const viewDialogRef = ref<InstanceType<typeof PlPlanViewDialog>>()
const viewVisible = ref(false)
const viewPlanId = ref('')
const certDialogVisible = ref(false)
const certPlanId = ref('')
const filterExpanded = ref(false)
const planList = ref<Plan[]>([])
const listColumnDefs = [
{ prop: 'planDate', label: '计划日期' },
{ prop: 'planType', label: '单据类型' },
{ prop: 'customerName', label: '客户名称' },
{ prop: 'products', label: '产品信息' },
{ prop: 'planAttachments', label: '计划附件' },
{ prop: 'products', label: '产品信息' },
{ prop: 'customerName', label: '客户名称' },
{ prop: 'planType', label: '单据类型' },
{ prop: 'hazardCertReady', label: '证书齐备' },
{ prop: 'followStatus', label: '跟进状态' },
{ prop: 'transportStatus', label: '运输状态' },
{ prop: 'licensePlate', label: '车牌号' },
@@ -350,9 +384,6 @@ const pagination = reactive({
total: 0
})
const PLAN_FILTER_FIELD_COUNT = 6
const showFilterToggle = computed(() => PLAN_FILTER_FIELD_COUNT > 4)
function getPlanTypeTagType(type: string) {
const map: Record<string, string> = { direct: 'primary', inbound: 'success', outbound: 'warning' }
return map[type] || 'info'
@@ -378,7 +409,7 @@ function getFollowStatusLabel(status: string) {
draft: '草稿',
processing: '进行中',
completed: '已完成',
cancelled: '已取消'
cancelled: '已作废'
}
return map[status] || status
}
@@ -420,7 +451,6 @@ function handleReset() {
searchForm.customerName = ''
quickSearch.value = ''
resetDateShortcut()
filterExpanded.value = false
pagination.page = 1
fetchData()
}
@@ -459,6 +489,79 @@ function canUploadCert(row: Plan) {
return row.archiveStatus !== 'archived' && row.followStatus !== 'cancelled'
}
function canManageCertReady(row: Plan) {
return canUploadCert(row) && planHasHazardProducts(row.products)
}
function getHazardCertReadyLabel(row: Plan) {
if (!planHasHazardProducts(row.products)) return '无需'
return isHazardCertReady(row) ? '已齐备' : '待确认'
}
function getHazardCertReadyTagType(row: Plan) {
if (!planHasHazardProducts(row.products)) return 'info'
return isHazardCertReady(row) ? 'success' : 'warning'
}
async function handleMarkCertReady(row: Plan) {
await ElMessageBox.confirm(
'确认该计划危化品证书已齐备?确认后可安排运输;之后仍可在本页补充上传附件。',
'证书齐备确认',
{ type: 'warning', confirmButtonText: '确认齐备', cancelButtonText: '取消' }
)
certReadyLoading.value = true
try {
await planApi.setHazardCertReady(row.id, true)
ElMessage.success('已标记证书齐备')
await fetchData()
await refreshViewIfOpen()
} finally {
certReadyLoading.value = false
}
}
async function handleUnmarkCertReady(row: Plan) {
await ElMessageBox.confirm('确认取消该计划的证书齐备状态?取消后将无法安排运输。', '取消齐备', {
type: 'warning',
confirmButtonText: '确认取消',
cancelButtonText: '返回'
})
certReadyLoading.value = true
try {
await planApi.setHazardCertReady(row.id, false)
ElMessage.success('已取消证书齐备')
await fetchData()
await refreshViewIfOpen()
} finally {
certReadyLoading.value = false
}
}
function handleToolbarMarkCertReady() {
if (selectedRows.value.length !== 1) return
handleMarkCertReady(selectedRows.value[0])
}
function handleToolbarUnmarkCertReady() {
if (selectedRows.value.length !== 1) return
handleUnmarkCertReady(selectedRows.value[0])
}
function syncViewingPlanFromList() {
syncViewRowFromFlatList(viewingPlan, planList.value)
}
async function refreshViewIfOpen() {
if (!viewVisible.value || !viewPlanId.value) return
syncViewingPlanFromList()
await viewDialogRef.value?.reload()
}
async function handleCertUploadSuccess() {
await fetchData()
await refreshViewIfOpen()
}
function handleView(row: Plan) {
viewingPlan.value = row
viewPlanId.value = row.id
@@ -498,13 +601,4 @@ onMounted(() => {
.pl-plan-list-toolbar-row {
flex-wrap: wrap;
}
.quick-search-input {
width: 280px;
flex-shrink: 0;
}
.quick-search-icon {
cursor: pointer;
}
</style>
+11 -5
View File
@@ -174,7 +174,11 @@
<el-button @click="handleBack">
<el-icon><Close /></el-icon>返回
</el-button>
<el-button v-if="plan.archiveStatus !== 'archived'" type="primary" @click="handleEdit">
<el-button
v-if="plan.archiveStatus !== 'archived' && plan.followStatus !== 'cancelled'"
type="primary"
@click="handleEdit"
>
<el-icon><Edit /></el-icon>编辑
</el-button>
<el-button
@@ -189,7 +193,7 @@
<el-icon><Van /></el-icon>{{ plan.transportStatus === 'arranged' ? '调整运输' : '安排运输' }}
</el-button>
<el-button v-if="plan.followStatus !== 'cancelled'" type="danger" @click="handleCancel">
<el-icon><CircleClose /></el-icon>取消
<el-icon><CircleClose /></el-icon>作废
</el-button>
</div>
</section>
@@ -244,7 +248,7 @@ function getFollowStatusTagType(status: string) {
}
function getFollowStatusLabel(status: string) {
const map: Record<string, string> = { draft: '草稿', processing: '进行中', completed: '已完成', cancelled: '已取消' }
const map: Record<string, string> = { draft: '草稿', processing: '进行中', completed: '已完成', cancelled: '已作废' }
return map[status] || status
}
@@ -283,9 +287,11 @@ function handleArrange() {
}
async function handleCancel() {
await ElMessageBox.confirm('确定取消该计划吗?', '提示', { type: 'warning' })
await ElMessageBox.confirm('确认作废该运输计划吗?作废后将无法恢复。', '作废运输计划', {
type: 'warning'
})
await planApi.cancel(planId.value)
ElMessage.success('取消成功')
ElMessage.success('作废成功')
fetchDetail()
}
+143 -114
View File
@@ -30,7 +30,7 @@
<el-option label="草稿" value="draft" />
<el-option label="进行中" value="processing" />
<el-option label="已完成" value="completed" />
<el-option label="已取消" value="cancelled" />
<el-option label="已作废" value="cancelled" />
</el-select>
</el-form-item>
<el-form-item label="运输状态">
@@ -39,46 +39,27 @@
<el-option label="已安排" value="arranged" />
</el-select>
</el-form-item>
</div>
<div v-show="filterExpanded" id="pl-plan-filter-extra" class="filter-extra">
<div class="filter-grid">
<el-form-item label="客户名称">
<el-input
v-model="searchForm.customerName"
placeholder="搜索客户名称"
clearable
/>
</el-form-item>
<el-form-item label="计划日期">
<el-date-picker
v-model="dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item>
</div>
<el-form-item label="客户名称">
<el-input
v-model="searchForm.customerName"
placeholder="搜索客户名称"
clearable
/>
</el-form-item>
<el-form-item label="计划日期">
<el-date-picker
v-model="dateRange"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item>
</div>
<div class="filter-actions">
<div class="filter-actions-start">
<button
v-if="showFilterToggle"
type="button"
class="btn-link btn-filter-toggle"
:aria-expanded="filterExpanded"
aria-controls="pl-plan-filter-extra"
@click="filterExpanded = !filterExpanded"
>
{{ filterExpanded ? '收起更多' : '展开更多' }}
<el-icon>
<ArrowUpBold v-if="filterExpanded" />
<ArrowDownBold v-else />
</el-icon>
</button>
</div>
<div class="filter-actions-start" />
<div class="filter-actions-end">
<el-button class="btn-ghost" :loading="loading" @click="handleReset">
<el-icon><RefreshLeft /></el-icon>重置
@@ -102,37 +83,23 @@
aria-label="计划日期快捷筛选"
@change="handleDateShortcut"
/>
<el-input
<ListQuickSearchInput
v-model="quickSearch"
class="quick-search-input"
placeholder="计划编号/客户名称"
clearable
@keyup.enter="handleQuickSearch"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
>
<template #suffix>
<el-icon class="quick-search-icon" @click="handleQuickSearch"><Search /></el-icon>
</template>
</el-input>
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增计划
</el-button>
<el-button
v-if="selectedPlan && selectedPlan.archiveStatus !== 'archived'"
v-if="selectedPlan && canEditPlan(selectedPlan)"
class="btn-ghost"
:disabled="selectedRows.length !== 1"
@click="handleToolbarEdit"
>
<el-icon><Edit /></el-icon>编辑
</el-button>
<el-button
v-if="selectedPlan && selectedPlan.archiveStatus !== 'archived' && selectedPlan.followStatus !== 'cancelled'"
class="btn-ghost"
:disabled="selectedRows.length !== 1"
@click="handleToolbarUploadCert"
>
<el-icon><Upload /></el-icon>上传证书
</el-button>
<el-button
v-if="selectedPlan && canArrangeTransport(selectedPlan)"
class="btn-ghost"
@@ -151,6 +118,23 @@
>
<el-icon><CircleClose /></el-icon>作废
</el-button>
<el-button
v-if="selectedPlan && canDeletePlan(selectedPlan)"
class="btn-ghost"
type="danger"
:disabled="
selectedRows.length !== 1 || !canDeleteByCreator(selectedPlan)
"
:title="
selectedRows.length === 1
? getDeletePlanDisabledTitle(selectedPlan)
: ''
"
:loading="deleteLoading"
@click="handleToolbarDelete"
>
<el-icon><Delete /></el-icon>删除
</el-button>
<ListToolbarEndActions
:loading="loading"
@@ -242,14 +226,15 @@
min-width="180"
show-overflow-tooltip
/>
<el-table-column v-if="isColumnVisible('products')" label="产品信息" min-width="240">
<el-table-column
v-if="isColumnVisible('products')"
label="产品信息"
min-width="280"
align="left"
header-align="left"
>
<template #default="{ row }">
<PlPlanListProductCell :products="row.products" />
</template>
</el-table-column>
<el-table-column v-if="isColumnVisible('planAttachments')" label="计划附件" min-width="240">
<template #default="{ row }">
<PlPlanListCertCell :products="row.products" />
<PlPlanListProductCell show-cert-status :products="row.products" />
</template>
</el-table-column>
<el-table-column
@@ -293,26 +278,23 @@
<PlPlanFormDialog
v-model:visible="formDialogVisible"
:plan-id="editingPlanId"
@success="fetchData"
@success="handlePlanMutationSuccess"
/>
<PlPlanViewDialog v-model:visible="viewVisible" :plan-id="viewPlanId">
<PlPlanViewDialog
ref="viewDialogRef"
v-model:visible="viewVisible"
:plan-id="viewPlanId"
>
<template v-if="viewingPlan" #hero-actions>
<el-button
v-if="viewingPlan.archiveStatus !== 'archived'"
v-if="canEditPlan(viewingPlan)"
class="btn-main"
type="primary"
@click="handleEdit(viewingPlan)"
>
<el-icon><Edit /></el-icon>编辑
</el-button>
<el-button
v-if="viewingPlan.archiveStatus !== 'archived' && viewingPlan.followStatus !== 'cancelled'"
class="btn-ghost"
@click="handleUploadCert(viewingPlan)"
>
<el-icon><Upload /></el-icon>上传证书
</el-button>
<el-button
v-if="canArrangeTransport(viewingPlan)"
class="btn-ghost"
@@ -329,61 +311,64 @@
>
<el-icon><CircleClose /></el-icon>作废
</el-button>
<el-button
v-if="canDeletePlan(viewingPlan)"
class="btn-ghost"
type="danger"
:disabled="!canDeleteByCreator(viewingPlan)"
:title="getDeletePlanDisabledTitle(viewingPlan)"
:loading="deleteLoading"
@click="handleDelete(viewingPlan)"
>
<el-icon><Delete /></el-icon>删除
</el-button>
</template>
</PlPlanViewDialog>
<PlPlanCertUploadDialog
v-model:visible="certDialogVisible"
:plan-id="certPlanId"
@success="fetchData"
/>
<PlPlanArrangeDialog
v-model:visible="arrangeDialogVisible"
:plan-id="arrangePlanId"
@success="fetchData"
@success="handlePlanMutationSuccess"
/>
</div>
</template>
<script setup lang="ts">
import {
ArrowDownBold,
ArrowUpBold,
CircleClose,
Delete,
Edit,
Plus,
RefreshLeft,
Search,
Upload,
Van
} from '@element-plus/icons-vue'
import { planApi, type Plan } from '@/api/pl'
import PlPlanArrangeDialog from '@/components/business/pl-plan-arrange-dialog/index.vue'
import PlPlanCertUploadDialog from '@/components/business/pl-plan-cert-upload-dialog/index.vue'
import PlPlanFormDialog from '@/components/business/pl-plan-form-dialog/index.vue'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import PlPlanListCertCell from '@/components/business/pl-plan-list-cert-cell/index.vue'
import PlPlanListProductCell from '@/components/business/pl-plan-list-product-cell/index.vue'
import PlPlanViewDialog from '@/components/business/pl-plan-view-dialog/index.vue'
import ListToolbarDateShortcuts from '@/components/core/list-toolbar-date-shortcuts/index.vue'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
import { useListDateShortcut } from '@/composables/useListDateShortcut'
import { canDeleteByCreator, CREATOR_DELETE_TIP } from '@/utils/creator-delete'
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
const route = useRoute()
const router = useRouter()
const loading = ref(false)
const voidLoading = ref(false)
const deleteLoading = ref(false)
const formDialogVisible = ref(false)
const editingPlanId = ref('')
const viewVisible = ref(false)
const viewPlanId = ref('')
const certDialogVisible = ref(false)
const certPlanId = ref('')
const viewDialogRef = ref<InstanceType<typeof PlPlanViewDialog>>()
const arrangeDialogVisible = ref(false)
const arrangePlanId = ref('')
const filterExpanded = ref(false)
const planList = ref<Plan[]>([])
const listColumnDefs = [
@@ -393,7 +378,6 @@ const listColumnDefs = [
{ prop: 'planType', label: '单据类型' },
{ prop: 'customerName', label: '客户名称' },
{ prop: 'products', label: '产品信息' },
{ prop: 'planAttachments', label: '计划附件' },
{ prop: 'licensePlate', label: '车牌号' },
{ prop: 'personnelSummary', label: '人员' },
{ prop: 'followUserName', label: '跟进人', defaultVisible: false }
@@ -409,6 +393,22 @@ const {
const selectedRows = ref<Plan[]>([])
const viewingPlan = ref<Plan | null>(null)
function syncViewingPlanFromList() {
syncViewRowFromFlatList(viewingPlan, planList.value)
}
async function refreshViewIfOpen() {
if (!viewVisible.value || !viewPlanId.value) return
syncViewingPlanFromList()
await viewDialogRef.value?.reload()
}
async function handlePlanMutationSuccess() {
await fetchData()
await refreshViewIfOpen()
}
const selectedPlan = computed(() => (selectedRows.value.length === 1 ? selectedRows.value[0] : null))
const dateRange = ref<string[]>([])
const quickSearch = ref('')
@@ -427,9 +427,6 @@ const pagination = reactive({
total: 0
})
const PLAN_FILTER_FIELD_COUNT = 6
const showFilterToggle = computed(() => PLAN_FILTER_FIELD_COUNT > 4)
function getPlanTypeTagType(type: string) {
const map: Record<string, string> = { direct: 'primary', inbound: 'success', outbound: 'warning' }
return map[type] || 'info'
@@ -455,7 +452,7 @@ function getFollowStatusLabel(status: string) {
draft: '草稿',
processing: '进行中',
completed: '已完成',
cancelled: '已取消'
cancelled: '已作废'
}
return map[status] || status
}
@@ -497,7 +494,6 @@ function handleReset() {
searchForm.customerName = ''
quickSearch.value = ''
resetDateShortcut()
filterExpanded.value = false
pagination.page = 1
fetchData()
}
@@ -548,6 +544,10 @@ function handleEdit(row: Plan) {
formDialogVisible.value = true
}
function canEditPlan(row: Plan) {
return row.archiveStatus !== 'archived' && row.followStatus !== 'cancelled'
}
function canArrangeTransport(row: Plan) {
return (
(row.transportStatus === 'pending' || row.transportStatus === 'arranged') &&
@@ -564,6 +564,49 @@ function canVoidPlan(row: Plan) {
return row.archiveStatus !== 'archived' && row.followStatus !== 'cancelled'
}
function canDeletePlan(row: Plan) {
return (
row.followStatus === 'draft' &&
row.transportStatus === 'pending' &&
row.archiveStatus !== 'archived'
)
}
function getDeletePlanDisabledTitle(row: Plan) {
if (!canDeletePlan(row)) return '只能删除草稿且未安排运输的计划'
if (!canDeleteByCreator(row)) return CREATOR_DELETE_TIP
return ''
}
async function handleDelete(row: Plan) {
if (!canDeletePlan(row)) {
ElMessage.warning('只能删除草稿且未安排运输的计划')
return
}
if (!canDeleteByCreator(row)) {
ElMessage.warning(CREATOR_DELETE_TIP)
return
}
await ElMessageBox.confirm('确定删除该运输计划吗?删除后不可恢复。', '删除运输计划', {
type: 'warning'
})
deleteLoading.value = true
try {
await planApi.delete(row.id)
ElMessage.success('删除成功')
if (viewingPlan.value?.id === row.id) {
viewVisible.value = false
viewingPlan.value = null
}
fetchData()
} catch (e) {
const message = e instanceof Error ? e.message : '删除失败'
ElMessage.error(message)
} finally {
deleteLoading.value = false
}
}
async function handleVoid(row: Plan) {
const hint =
row.transportStatus === 'arranged'
@@ -583,11 +626,6 @@ async function handleVoid(row: Plan) {
}
}
function handleUploadCert(row: Plan) {
certPlanId.value = row.id
certDialogVisible.value = true
}
function handleArrange(row: Plan) {
arrangePlanId.value = row.id
arrangeDialogVisible.value = true
@@ -598,11 +636,6 @@ function handleToolbarEdit() {
handleEdit(selectedRows.value[0])
}
function handleToolbarUploadCert() {
if (selectedRows.value.length !== 1) return
handleUploadCert(selectedRows.value[0])
}
function handleToolbarArrange() {
if (selectedRows.value.length !== 1) return
handleArrange(selectedRows.value[0])
@@ -613,6 +646,11 @@ function handleToolbarVoid() {
handleVoid(selectedRows.value[0])
}
function handleToolbarDelete() {
if (selectedRows.value.length !== 1) return
handleDelete(selectedRows.value[0])
}
useDbInstantSearch(
() => ({
planNo: searchForm.planNo,
@@ -645,13 +683,4 @@ function openArrangeFromQuery() {
.pl-plan-list-toolbar-row {
flex-wrap: wrap;
}
.quick-search-input {
width: 280px;
flex-shrink: 0;
}
.quick-search-icon {
cursor: pointer;
}
</style>
+47 -13
View File
@@ -53,6 +53,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="车牌号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增自有车辆
</el-button>
@@ -189,12 +195,12 @@
<el-dialog
v-model="dialogVisible"
:title="dialogTitle"
width="960px"
width="1360px"
align-center
class="dialog-form-layout"
@close="handleDialogClose"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="right" label-width="100px" class="pl-dialog-form">
<div class="form-grid-3">
<el-form-item label="车牌号" prop="licensePlate">
<el-input v-model="formData.licensePlate" placeholder="请输入车牌号" maxlength="20" />
@@ -311,6 +317,7 @@
title="车辆证书"
upload-folder="pl/vehicle-cert"
:cert-name-options="certNameOptions"
layout="table"
/>
</el-form>
<template #footer>
@@ -327,7 +334,7 @@
<SystemViewDialog
v-model:visible="viewVisible"
:title="viewDetail?.licensePlate || '车辆详情'"
:title="viewDialogTitle"
:icon="Van"
:meta="viewHeroMeta"
:sections="viewSections"
@@ -355,7 +362,10 @@
:cert-list="viewDetail?.certList || []"
:license-plate="viewDetail?.licensePlate"
:trailer-no="viewDetail?.trailerNo"
:vehicle-id="viewDetail?.id"
:personnel-list="viewPersonnelList"
check-self-vehicle-certs
cert-layout="table"
/>
</template>
</SystemViewDialog>
@@ -364,6 +374,7 @@
<script setup lang="ts">
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { Check, Close, Delete, Edit, Plus, RefreshLeft, Search, Van } from '@element-plus/icons-vue'
import {
@@ -395,7 +406,8 @@ import {
import {
PL_VEHICLE_CERT_NAME_OPTIONS,
splitVehicleCertsByPart,
validateVehicleRequiredCerts
getSelfVehicleCertMissingSuffix,
validateVehicleCertNamesNotEmpty
} from '@/utils/pl-vehicle-cert'
import { canDeleteByCreator, filterDeletableByCreator, allRowsDeletableByCreator, CREATOR_DELETE_TIP } from '@/utils/creator-delete'
@@ -405,6 +417,7 @@ type CertListItem = CertRow & { _key?: string }
type CertFormListRef = InstanceType<typeof PlVehicleCertPartTabs>
const loading = ref(false)
const quickSearchKeyword = ref('')
const submitLoading = ref(false)
const vehicleList = ref<Vehicle[]>([])
const carrierList = ref<Carrier[]>([])
@@ -491,6 +504,18 @@ const viewHeroMeta = computed(() => {
.join(' · ')
})
const viewDialogTitle = computed(() => {
const plate = viewDetail.value?.licensePlate || '车辆详情'
if (!viewDetail.value) return plate
return (
plate +
getSelfVehicleCertMissingSuffix({
certList: viewDetail.value.certList,
trailerNo: viewDetail.value.trailerNo
})
)
})
const viewSections = computed<ViewSection[]>(() => {
const d = viewDetail.value
if (!d) return []
@@ -658,14 +683,10 @@ function validateSubTables(): boolean {
const hasTrailer = Boolean(formData.trailerNo?.trim())
const { headCerts, trailerCerts } = splitVehicleCertsByPart(certList.value)
return validateVehicleRequiredCerts({
headCerts,
trailerCerts,
hasTrailer,
licensePlate: formData.licensePlate,
trailerNo: formData.trailerNo,
onError: message => ElMessage.warning(message)
})
return validateVehicleCertNamesNotEmpty(
[headCerts, ...(hasTrailer ? [trailerCerts] : [])],
message => ElMessage.warning(message)
)
}
async function fetchData() {
@@ -673,7 +694,7 @@ async function fetchData() {
try {
const res = await vehicleApi.list({
vehicleType: VEHICLE_TYPE_SELF,
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
vehicleStatus: searchForm.vehicleStatus || undefined,
carrierId: searchForm.carrierId || undefined,
page: pagination.page,
@@ -690,6 +711,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -698,11 +720,23 @@ function handleReset() {
searchForm.q = ''
searchForm.vehicleStatus = ''
searchForm.carrierId = ''
quickSearchKeyword.value = ''
selectedRows.value = []
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handlePageChange() {
fetchData()
}
@@ -42,6 +42,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="名称/地址"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增地址
</el-button>
@@ -61,6 +67,16 @@
>
<el-icon><Delete /></el-icon>删除
</el-button>
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -88,23 +104,58 @@
<el-link type="primary" @click="handleView(row)">{{ row.addressName }}</el-link>
</template>
</el-table-column>
<el-table-column prop="fullAddress" label="详细地址" min-width="240" show-overflow-tooltip />
<el-table-column label="坐标" min-width="160" show-overflow-tooltip>
<el-table-column
v-if="isColumnVisible('fullAddress')"
prop="fullAddress"
label="详细地址"
min-width="240"
show-overflow-tooltip
/>
<el-table-column
v-if="isColumnVisible('coordinates')"
label="坐标"
min-width="160"
show-overflow-tooltip
>
<template #default="{ row }">
<span v-if="row.lng != null && row.lat != null">{{ row.lng }}, {{ row.lat }}</span>
<span v-else>—</span>
</template>
</el-table-column>
<el-table-column prop="contactName" label="联系人" min-width="100" align="center" />
<el-table-column prop="contactPhone" label="联系电话" min-width="120" align="center" />
<el-table-column prop="status" label="状态" min-width="90" align="center">
<el-table-column
v-if="isColumnVisible('contactName')"
prop="contactName"
label="联系人"
min-width="100"
align="center"
/>
<el-table-column
v-if="isColumnVisible('contactPhone')"
prop="contactPhone"
label="联系电话"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('status')"
prop="status"
label="状态"
min-width="90"
align="center"
>
<template #default="{ row }">
<el-tag :type="row.status === '1' ? 'success' : 'info'" size="small">
{{ row.status === '1' ? '启用' : '停用' }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" min-width="140" show-overflow-tooltip />
<el-table-column
v-if="isColumnVisible('remark')"
prop="remark"
label="备注"
min-width="140"
show-overflow-tooltip
/>
</el-table>
<div class="pagination list-pager-bar">
@@ -137,7 +188,9 @@
ref="formRef"
:model="formData"
:rules="formRules"
label-position="top"
label-position="right"
label-width="100px"
class="pl-dialog-form"
scroll-to-error
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
>
@@ -183,12 +236,14 @@
</el-dialog>
<SystemViewDialog
v-model="viewVisible"
title="地址详情"
v-model:visible="viewVisible"
:title="viewDetail?.addressName || '地址详情'"
:meta="viewHeroMeta"
:loading="viewLoading"
:hero-title="viewDetail?.addressName || '—'"
:hero-meta="viewHeroMeta"
:sections="viewSections"
width="1040px"
modal-class="order-module-dialog-mask"
append-to-body
>
<template #hero-actions>
<el-button @click="handleEditFromView">
@@ -214,7 +269,10 @@ import {
type TransportAddressPayload
} from '@/api/pl/index'
import AmapAddressPicker from '@/components/business/amap-address-picker/index.vue'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import SystemViewDialog, { type ViewSection } from '@/components/business/system-view-dialog/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
import { pickBxPageResult } from '@/utils/http/bx'
import { DEFAULT_LIST_PAGE_SIZE } from '@/utils/table/tableConfig'
@@ -222,6 +280,24 @@ import { formatDateTime } from '@/utils/format'
import { canDeleteByCreator, CREATOR_DELETE_TIP } from '@/utils/creator-delete'
const loading = ref(false)
const quickSearchKeyword = ref('')
const listColumnDefs = [
{ prop: 'fullAddress', label: '详细地址' },
{ prop: 'coordinates', label: '坐标' },
{ prop: 'contactName', label: '联系人' },
{ prop: 'contactPhone', label: '联系电话' },
{ prop: 'status', label: '状态' },
{ prop: 'remark', label: '备注', defaultVisible: false }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-transport-address-list-columns', listColumnDefs)
const submitLoading = ref(false)
const addressRows = ref<TransportAddress[]>([])
const selectedRows = ref<TransportAddress[]>([])
@@ -275,15 +351,25 @@ const viewSections = computed<ViewSection[]>(() => {
return [
{
title: '基本信息',
fieldLayout: 'table',
tableMode: 'triple',
fields: [
{ label: '地址名称', value: d.addressName },
{ label: '详细地址', value: d.fullAddress, span: 'full' },
{ label: '联系人', value: d.contactName || '—' },
{ label: '联系电话', value: d.contactPhone || '—' },
{
label: '详细地址',
value: d.fullAddress,
long: true,
showMapLink: true,
mapLng: d.lng,
mapLat: d.lat,
mapName: d.addressName || d.fullAddress
},
{
label: '坐标',
value: d.lng != null && d.lat != null ? `${d.lng}, ${d.lat}` : '—'
},
{ label: '联系人', value: d.contactName || '—' },
{ label: '联系电话', value: d.contactPhone || '—' },
{
label: '状态',
value: d.status === '1' ? '启用' : '停用',
@@ -291,7 +377,7 @@ const viewSections = computed<ViewSection[]>(() => {
},
{ label: '创建时间', value: formatDateTime(d.createTime) },
{ label: '更新时间', value: formatDateTime(d.updateTime) },
{ label: '备注', value: d.remark || '—', span: 'full' }
{ label: '备注', value: d.remark || '—', long: true }
]
}
]
@@ -301,7 +387,7 @@ async function fetchData() {
loading.value = true
try {
const res = await transportAddressApi.list({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
status: searchForm.status || undefined,
page: pagination.page,
pageSize: pagination.pageSize
@@ -317,6 +403,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -324,11 +411,23 @@ function handleSearch() {
function handleReset() {
searchForm.q = ''
searchForm.status = ''
quickSearchKeyword.value = ''
selectedRows.value = []
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handlePageChange() {
fetchData()
}
+27 -3
View File
@@ -23,7 +23,7 @@
<el-option label="待执行" value="pending" />
<el-option label="执行中" value="executing" />
<el-option label="已完成" value="completed" />
<el-option label="已取消" value="cancelled" />
<el-option label="已作废" value="cancelled" />
</el-select>
</el-form-item>
<el-form-item label="审批状态">
@@ -53,6 +53,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="运输编号/车牌/司机"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button
class="btn-main"
type="primary"
@@ -240,6 +246,7 @@ import SystemViewDialog, {
type ViewSection
} from '@/components/business/system-view-dialog/index.vue'
import { transportApi, type Transport } from '@/api/pl'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { useDbInstantSearch } from '@/composables/useDbInstantSearch'
@@ -284,6 +291,8 @@ const canToolbarQrcode = computed(
() => selectedRow.value?.approvalStatus === 'approved'
)
const quickSearchKeyword = ref('')
const searchForm = reactive({
transportNo: '',
transportStatus: '',
@@ -378,7 +387,7 @@ function getTransportStatusLabel(status: string) {
pending: '待执行',
executing: '执行中',
completed: '已完成',
cancelled: '已取消'
cancelled: '已作废'
}
return map[status] || status
}
@@ -411,8 +420,10 @@ function formatAmount(amount: number) {
async function fetchData() {
loading.value = true
try {
const keyword = quickSearchKeyword.value.trim()
const res = await transportApi.list({
transportNo: searchForm.transportNo || undefined,
q: keyword || undefined,
transportNo: keyword ? undefined : searchForm.transportNo || undefined,
transportStatus: searchForm.transportStatus || undefined,
approvalStatus: searchForm.approvalStatus || undefined,
page: pagination.page,
@@ -427,6 +438,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -435,6 +447,18 @@ function handleReset() {
searchForm.transportNo = ''
searchForm.transportStatus = ''
searchForm.approvalStatus = ''
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -67,6 +67,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="申请单号/车牌"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增申请
</el-button>
@@ -87,7 +93,15 @@
<el-icon><CircleClose /></el-icon>作废
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -115,28 +129,76 @@
<el-link type="primary" @click="handleView(row)">{{ row.applyNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="licensePlate" label="车牌号" min-width="120" align="center" />
<el-table-column prop="maintenanceType" label="维保类型" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('licensePlate')"
prop="licensePlate"
label="车牌号"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('maintenanceType')"
prop="maintenanceType"
label="维保类型"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlMaintenanceTypeTagType(row.maintenanceType)" size="small">
{{ getPlMaintenanceTypeLabel(row.maintenanceType) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请日期" min-width="120" align="center" />
<el-table-column prop="startDate" label="开始日期" min-width="120" align="center" />
<el-table-column prop="expectedPickupDate" label="预计取车" min-width="120" align="center">
<el-table-column
v-if="isColumnVisible('applyDate')"
prop="applyDate"
label="申请日期"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('startDate')"
prop="startDate"
label="开始日期"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('expectedPickupDate')"
prop="expectedPickupDate"
label="预计取车"
min-width="120"
align="center"
>
<template #default="{ row }">{{ row.expectedPickupDate || '—' }}</template>
</el-table-column>
<el-table-column prop="applicantName" label="申请人" min-width="100" align="center" />
<el-table-column prop="status" label="状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('applicantName')"
prop="applicantName"
label="申请人"
min-width="100"
align="center"
/>
<el-table-column
v-if="isColumnVisible('status')"
prop="status"
label="状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlMaintenanceApplyStatusTagType(row.status)" size="small">
{{ getPlMaintenanceApplyStatusLabel(row.status) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" min-width="170" align="center" />
<el-table-column
v-if="isColumnVisible('createTime')"
prop="createTime"
label="创建时间"
min-width="170"
align="center"
/>
</el-table>
<div class="pagination list-pager-bar">
@@ -166,7 +228,9 @@
ref="formRef"
:model="formData"
:rules="formRules"
label-position="top"
label-position="right"
label-width="100px"
class="pl-dialog-form"
scroll-to-error
>
<div class="form-grid-2">
@@ -300,7 +364,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import {
Check,
CircleClose,
@@ -328,9 +394,29 @@ import {
getPlMaintenanceTypeTagType,
PL_MAINTENANCE_TYPE_PRESETS
} from '@/utils/pl-display'
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
const userStore = useUserStore()
const listColumnDefs = [
{ prop: 'licensePlate', label: '车牌号' },
{ prop: 'maintenanceType', label: '维保类型' },
{ prop: 'applyDate', label: '申请日期' },
{ prop: 'startDate', label: '开始日期' },
{ prop: 'expectedPickupDate', label: '预计取车' },
{ prop: 'applicantName', label: '申请人' },
{ prop: 'status', label: '状态' },
{ prop: 'createTime', label: '创建时间', defaultVisible: false }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-vehicle-maintenance-apply-list-columns', listColumnDefs)
const currentUserId = computed(() => {
const info = userStore.info as Record<string, unknown> | undefined
return String(info?.id || info?.userId || '')
@@ -347,6 +433,7 @@ const tableData = ref<VehicleMaintenanceApply[]>([])
const selectedRows = ref<VehicleMaintenanceApply[]>([])
const vehicleOptions = ref<Vehicle[]>([])
const dateRange = ref<string[]>([])
const quickSearchKeyword = ref('')
const searchForm = reactive({
q: '',
@@ -394,6 +481,14 @@ const viewLoading = ref(false)
const viewDetail = ref<VehicleMaintenanceApply | null>(null)
const viewingRecord = ref<VehicleMaintenanceApply | null>(null)
async function refreshViewIfOpen(editedId?: string) {
if (!viewVisible.value || !viewingRecord.value?.id) return
if (editedId && viewingRecord.value.id !== editedId) return
syncViewRowFromFlatList(viewingRecord, tableData.value)
const res = await vehicleMaintenanceApplyApi.get(viewingRecord.value.id)
viewDetail.value = res.data ?? res
}
const viewSections = computed<ViewSection[]>(() => {
const d = viewDetail.value
if (!d) return []
@@ -484,7 +579,7 @@ async function fetchData() {
loading.value = true
try {
const res = await vehicleMaintenanceApplyApi.list({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
maintenanceType: searchForm.maintenanceType || undefined,
status: searchForm.status || undefined,
applyDateFrom: dateRange.value?.[0],
@@ -501,6 +596,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -510,7 +606,20 @@ function handleReset() {
searchForm.maintenanceType = ''
searchForm.status = ''
dateRange.value = []
handleSearch()
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleSelectionChange(rows: VehicleMaintenanceApply[]) {
@@ -625,7 +734,8 @@ async function handleSubmit() {
ElMessage.success('创建成功')
}
dialogVisible.value = false
fetchData()
await fetchData()
if (isEdit.value) await refreshViewIfOpen(formData.id)
} finally {
submitLoading.value = false
}
@@ -78,6 +78,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="申请单号/车牌"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button
class="btn-main"
type="primary"
@@ -102,7 +108,15 @@
<el-icon><Plus /></el-icon>无申请补录
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -130,39 +144,105 @@
<el-link type="primary" @click="handleView(row)">{{ row.applyNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请日期" min-width="120" align="center" />
<el-table-column prop="applicantName" label="申请人" min-width="100" align="center" />
<el-table-column prop="applyStatus" label="申请状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('applyDate')"
prop="applyDate"
label="申请日期"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('applicantName')"
prop="applicantName"
label="申请人"
min-width="100"
align="center"
/>
<el-table-column
v-if="isColumnVisible('applyStatus')"
prop="applyStatus"
label="申请状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlMaintenanceApplyStatusTagType(row.applyStatus)" size="small">
{{ getPlMaintenanceApplyStatusLabel(row.applyStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="licensePlate" label="车牌号" min-width="110" align="center" />
<el-table-column prop="maintenanceType" label="维保类型" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('licensePlate')"
prop="licensePlate"
label="车牌号"
min-width="110"
align="center"
/>
<el-table-column
v-if="isColumnVisible('maintenanceType')"
prop="maintenanceType"
label="维保类型"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlMaintenanceTypeTagType(row.maintenanceType)" size="small">
{{ getPlMaintenanceTypeLabel(row.maintenanceType) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="startDate" label="开始日期" min-width="120" align="center" />
<el-table-column prop="expectedPickupDate" label="预计取车" min-width="120" align="center">
<el-table-column
v-if="isColumnVisible('startDate')"
prop="startDate"
label="开始日期"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('expectedPickupDate')"
prop="expectedPickupDate"
label="预计取车"
min-width="120"
align="center"
>
<template #default="{ row }">{{ row.expectedPickupDate || '—' }}</template>
</el-table-column>
<el-table-column prop="processNo" label="处理单号" min-width="170" show-overflow-tooltip>
<el-table-column
v-if="isColumnVisible('processNo')"
prop="processNo"
label="处理单号"
min-width="170"
show-overflow-tooltip
>
<template #default="{ row }">{{ row.processNo || '—' }}</template>
</el-table-column>
<el-table-column prop="processDate" label="处理日期" min-width="120" align="center">
<el-table-column
v-if="isColumnVisible('processDate')"
prop="processDate"
label="处理日期"
min-width="120"
align="center"
>
<template #default="{ row }">{{ row.processDate || '—' }}</template>
</el-table-column>
<el-table-column prop="amount" label="金额(元)" min-width="110" align="right">
<el-table-column
v-if="isColumnVisible('amount')"
prop="amount"
label="金额(元)"
min-width="110"
align="right"
>
<template #default="{ row }">
{{ row.amount != null ? Number(row.amount).toFixed(2) : '—' }}
</template>
</el-table-column>
<el-table-column prop="handlerName" label="处理人" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('handlerName')"
prop="handlerName"
label="处理人"
min-width="100"
align="center"
>
<template #default="{ row }">{{ row.handlerName || '—' }}</template>
</el-table-column>
</el-table>
@@ -190,7 +270,7 @@
destroy-on-close
@closed="resetForm"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="top" scroll-to-error>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="right" label-width="100px" class="pl-dialog-form" scroll-to-error>
<div v-if="dialogMode === 'process' && currentApplyRow" class="apply-summary-block">
<div class="apply-summary-title">关联申请</div>
<div class="apply-summary-grid">
@@ -328,7 +408,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { Check, Close, Delete, Edit, Plus, RefreshLeft, Search, Tools } from '@element-plus/icons-vue'
import { fetchUserOptions } from '@/api/admin'
import {
@@ -364,6 +446,29 @@ const userOptions = ref<
>([])
const loading = ref(false)
const listColumnDefs = [
{ prop: 'applyDate', label: '申请日期' },
{ prop: 'applicantName', label: '申请人' },
{ prop: 'applyStatus', label: '申请状态' },
{ prop: 'licensePlate', label: '车牌号' },
{ prop: 'maintenanceType', label: '维保类型' },
{ prop: 'startDate', label: '开始日期' },
{ prop: 'expectedPickupDate', label: '预计取车' },
{ prop: 'processNo', label: '处理单号' },
{ prop: 'processDate', label: '处理日期' },
{ prop: 'amount', label: '金额(元)' },
{ prop: 'handlerName', label: '处理人' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-vehicle-maintenance-process-list-columns', listColumnDefs)
const submitLoading = ref(false)
const deleteLoadingMap = reactive<Record<string, boolean>>({})
const selectedRows = ref<VehicleMaintenanceProcessBoardItem[]>([])
@@ -371,6 +476,7 @@ const tableData = ref<VehicleMaintenanceProcessBoardItem[]>([])
const vehicleOptions = ref<Vehicle[]>([])
const applyDateRange = ref<string[]>([])
const processDateRange = ref<string[]>([])
const quickSearchKeyword = ref('')
const searchForm = reactive({
q: '',
@@ -541,7 +647,7 @@ async function fetchData() {
loading.value = true
try {
const res = await vehicleMaintenanceProcessApi.processBoard({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
maintenanceType: searchForm.maintenanceType || undefined,
applyStatus: searchForm.applyStatus || undefined,
applyDateFrom: applyDateRange.value?.[0],
@@ -560,6 +666,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -570,7 +677,20 @@ function handleReset() {
searchForm.applyStatus = ''
applyDateRange.value = []
processDateRange.value = []
handleSearch()
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function resetForm() {
@@ -55,6 +55,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="申请单号/车牌"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增申请
</el-button>
@@ -75,7 +81,15 @@
<el-icon><CircleClose /></el-icon>作废
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -103,27 +117,69 @@
<el-link type="primary" @click="handleView(row)">{{ row.applyNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="licensePlate" label="车牌号" min-width="120" align="center" />
<el-table-column prop="rechargeType" label="充值类型" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('licensePlate')"
prop="licensePlate"
label="车牌号"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('rechargeType')"
prop="rechargeType"
label="充值类型"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlRechargeTypeTagType(row.rechargeType)" size="small">
{{ getPlRechargeTypeLabel(row.rechargeType) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请日期" min-width="120" align="center" />
<el-table-column prop="odometerKm" label="期初公里数" min-width="110" align="center">
<el-table-column
v-if="isColumnVisible('applyDate')"
prop="applyDate"
label="申请日期"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('odometerKm')"
prop="odometerKm"
label="期初公里数"
min-width="110"
align="center"
>
<template #default="{ row }">{{ row.odometerKm ?? '—' }}</template>
</el-table-column>
<el-table-column prop="applicantName" label="申请人" min-width="100" align="center" />
<el-table-column prop="status" label="状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('applicantName')"
prop="applicantName"
label="申请人"
min-width="100"
align="center"
/>
<el-table-column
v-if="isColumnVisible('status')"
prop="status"
label="状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlRechargeApplyStatusTagType(row.status)" size="small">
{{ getPlRechargeApplyStatusLabel(row.status) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" min-width="170" align="center" />
<el-table-column
v-if="isColumnVisible('createTime')"
prop="createTime"
label="创建时间"
min-width="170"
align="center"
/>
</el-table>
<div class="pagination list-pager-bar">
@@ -153,7 +209,9 @@
ref="formRef"
:model="formData"
:rules="formRules"
label-position="top"
label-position="right"
label-width="100px"
class="pl-dialog-form"
scroll-to-error
>
<div class="form-grid-2">
@@ -245,7 +303,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import {
Check,
CircleClose,
@@ -272,9 +332,28 @@ import {
getPlRechargeTypeLabel,
getPlRechargeTypeTagType
} from '@/utils/pl-display'
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
const userStore = useUserStore()
const listColumnDefs = [
{ prop: 'licensePlate', label: '车牌号' },
{ prop: 'rechargeType', label: '充值类型' },
{ prop: 'applyDate', label: '申请日期' },
{ prop: 'odometerKm', label: '期初公里数' },
{ prop: 'applicantName', label: '申请人' },
{ prop: 'status', label: '状态' },
{ prop: 'createTime', label: '创建时间', defaultVisible: false }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-vehicle-recharge-apply-list-columns', listColumnDefs)
const currentUserId = computed(() => {
const info = userStore.info as Record<string, unknown> | undefined
return String(info?.id || info?.userId || '')
@@ -291,6 +370,7 @@ const tableData = ref<VehicleRechargeApply[]>([])
const selectedRows = ref<VehicleRechargeApply[]>([])
const vehicleOptions = ref<Vehicle[]>([])
const dateRange = ref<string[]>([])
const quickSearchKeyword = ref('')
const searchForm = reactive({
q: '',
@@ -334,6 +414,14 @@ const viewLoading = ref(false)
const viewDetail = ref<VehicleRechargeApply | null>(null)
const viewingRecord = ref<VehicleRechargeApply | null>(null)
async function refreshViewIfOpen(editedId?: string) {
if (!viewVisible.value || !viewingRecord.value?.id) return
if (editedId && viewingRecord.value.id !== editedId) return
syncViewRowFromFlatList(viewingRecord, tableData.value)
const res = await vehicleRechargeApplyApi.get(viewingRecord.value.id)
viewDetail.value = res.data ?? res
}
const viewSections = computed<ViewSection[]>(() => {
const d = viewDetail.value
if (!d) return []
@@ -389,7 +477,7 @@ async function fetchData() {
loading.value = true
try {
const res = await vehicleRechargeApplyApi.list({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
rechargeType: searchForm.rechargeType || undefined,
status: searchForm.status || undefined,
applyDateFrom: dateRange.value?.[0],
@@ -406,6 +494,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -415,7 +504,20 @@ function handleReset() {
searchForm.rechargeType = ''
searchForm.status = ''
dateRange.value = []
handleSearch()
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleSelectionChange(rows: VehicleRechargeApply[]) {
@@ -521,7 +623,8 @@ async function handleSubmit() {
ElMessage.success('创建成功')
}
dialogVisible.value = false
fetchData()
await fetchData()
if (isEdit.value) await refreshViewIfOpen(formData.id)
} finally {
submitLoading.value = false
}
@@ -66,6 +66,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="申请单号/车牌"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button @click="handleSupplement">
<el-icon><Plus /></el-icon>无申请补录
</el-button>
@@ -105,7 +111,15 @@
<el-icon><Delete /></el-icon>撤销发放
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -133,46 +147,118 @@
<el-link type="primary" @click="handleView(row)">{{ row.applyNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请日期" min-width="120" align="center" />
<el-table-column prop="applicantName" label="申请人" min-width="100" align="center" />
<el-table-column prop="odometerKm" label="期初公里数" min-width="110" align="right">
<el-table-column
v-if="isColumnVisible('applyDate')"
prop="applyDate"
label="申请日期"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('applicantName')"
prop="applicantName"
label="申请人"
min-width="100"
align="center"
/>
<el-table-column
v-if="isColumnVisible('odometerKm')"
prop="odometerKm"
label="期初公里数"
min-width="110"
align="right"
>
<template #default="{ row }">
{{ row.odometerKm != null ? Number(row.odometerKm).toFixed(1) : '—' }}
</template>
</el-table-column>
<el-table-column prop="applyStatus" label="申请状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('applyStatus')"
prop="applyStatus"
label="申请状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlRechargeApplyStatusTagType(row.applyStatus)" size="small">
{{ getPlRechargeApplyStatusLabel(row.applyStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="licensePlate" label="车牌号" min-width="110" align="center" />
<el-table-column prop="rechargeType" label="充值类型" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('licensePlate')"
prop="licensePlate"
label="车牌号"
min-width="110"
align="center"
/>
<el-table-column
v-if="isColumnVisible('rechargeType')"
prop="rechargeType"
label="充值类型"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlRechargeTypeTagType(row.rechargeType)" size="small">
{{ getPlRechargeTypeLabel(row.rechargeType) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="rechargeOrderNo" label="充值订单号" min-width="170" show-overflow-tooltip>
<el-table-column
v-if="isColumnVisible('rechargeOrderNo')"
prop="rechargeOrderNo"
label="充值订单号"
min-width="170"
show-overflow-tooltip
>
<template #default="{ row }">{{ row.rechargeOrderNo || '—' }}</template>
</el-table-column>
<el-table-column prop="rechargeDate" label="充值日期" min-width="120" align="center">
<el-table-column
v-if="isColumnVisible('rechargeDate')"
prop="rechargeDate"
label="充值日期"
min-width="120"
align="center"
>
<template #default="{ row }">{{ row.rechargeDate || '—' }}</template>
</el-table-column>
<el-table-column prop="cardNo" label="卡号" min-width="130" show-overflow-tooltip>
<el-table-column
v-if="isColumnVisible('cardNo')"
prop="cardNo"
label="卡号"
min-width="130"
show-overflow-tooltip
>
<template #default="{ row }">{{ row.cardNo || '—' }}</template>
</el-table-column>
<el-table-column prop="gasStation" label="加油站/渠道" min-width="130" show-overflow-tooltip>
<el-table-column
v-if="isColumnVisible('gasStation')"
prop="gasStation"
label="加油站/渠道"
min-width="130"
show-overflow-tooltip
>
<template #default="{ row }">{{ row.gasStation || '—' }}</template>
</el-table-column>
<el-table-column prop="amount" label="金额(元)" min-width="110" align="right">
<el-table-column
v-if="isColumnVisible('amount')"
prop="amount"
label="金额(元)"
min-width="110"
align="right"
>
<template #default="{ row }">
{{ row.amount != null ? Number(row.amount).toFixed(2) : '—' }}
</template>
</el-table-column>
<el-table-column prop="recordCreateByName" label="登记人" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('recordCreateByName')"
prop="recordCreateByName"
label="登记人"
min-width="100"
align="center"
>
<template #default="{ row }">{{ row.recordCreateByName || '—' }}</template>
</el-table-column>
</el-table>
@@ -200,7 +286,7 @@
destroy-on-close
@closed="resetForm"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="top" scroll-to-error>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="right" label-width="100px" class="pl-dialog-form" scroll-to-error>
<div v-if="dialogMode === 'disburse' && currentApplyRow" class="apply-summary-block">
<div class="apply-summary-title">关联申请</div>
<div class="apply-summary-grid">
@@ -336,7 +422,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { Check, Close, Delete, Edit, Money, Plus, RefreshLeft, Search } from '@element-plus/icons-vue'
import {
vehicleApi,
@@ -362,6 +450,30 @@ const userStore = useUserStore()
const currentUserName = computed(() => userStore.info?.userName || '—')
const loading = ref(false)
const listColumnDefs = [
{ prop: 'applyDate', label: '申请日期' },
{ prop: 'applicantName', label: '申请人' },
{ prop: 'odometerKm', label: '期初公里数' },
{ prop: 'applyStatus', label: '申请状态' },
{ prop: 'licensePlate', label: '车牌号' },
{ prop: 'rechargeType', label: '充值类型' },
{ prop: 'rechargeOrderNo', label: '充值订单号' },
{ prop: 'rechargeDate', label: '充值日期' },
{ prop: 'cardNo', label: '卡号' },
{ prop: 'gasStation', label: '加油站/渠道' },
{ prop: 'amount', label: '金额(元)' },
{ prop: 'recordCreateByName', label: '登记人' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-vehicle-recharge-record-list-columns', listColumnDefs)
const submitLoading = ref(false)
const deleteLoadingMap = reactive<Record<string, boolean>>({})
const tableData = ref<VehicleRechargeDisburseBoardItem[]>([])
@@ -369,6 +481,7 @@ const selectedRows = ref<VehicleRechargeDisburseBoardItem[]>([])
const vehicleOptions = ref<Vehicle[]>([])
const applyDateRange = ref<string[]>([])
const rechargeDateRange = ref<string[]>([])
const quickSearchKeyword = ref('')
const searchForm = reactive({
q: '',
@@ -419,6 +532,13 @@ const formRules = computed(() => ({
const viewVisible = ref(false)
const viewingRecord = ref<VehicleRechargeDisburseBoardItem | null>(null)
function refreshViewIfOpen(editedApplyId?: string) {
if (!viewVisible.value || !viewingRecord.value?.applyId) return
if (editedApplyId && viewingRecord.value.applyId !== editedApplyId) return
const updated = tableData.value.find(row => row.applyId === viewingRecord.value!.applyId)
if (updated) viewingRecord.value = updated
}
const viewSections = computed<ViewSection[]>(() => {
const row = viewingRecord.value
if (!row) return []
@@ -477,7 +597,7 @@ async function fetchData() {
loading.value = true
try {
const res = await vehicleRechargeRecordApi.disburseBoard({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
rechargeType: searchForm.rechargeType || undefined,
applyStatus: searchForm.applyStatus || undefined,
applyDateFrom: applyDateRange.value?.[0],
@@ -496,6 +616,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -506,7 +627,20 @@ function handleReset() {
searchForm.applyStatus = ''
applyDateRange.value = []
rechargeDateRange.value = []
handleSearch()
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleSelectionChange(rows: VehicleRechargeDisburseBoardItem[]) {
@@ -640,7 +774,9 @@ async function handleSubmit() {
ElMessage.success('发放登记成功')
}
dialogVisible.value = false
fetchData()
await fetchData()
const applyId = formData.applyId || currentApplyRow.value?.applyId
if (applyId) refreshViewIfOpen(applyId)
} finally {
submitLoading.value = false
}
@@ -49,6 +49,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="申请单号/车牌"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增申请
</el-button>
@@ -69,7 +75,15 @@
<el-icon><CircleClose /></el-icon>作废
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -97,25 +111,79 @@
<el-link type="primary" @click="handleView(row)">{{ row.applyNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="licensePlate" label="车牌号" min-width="120" align="center" />
<el-table-column prop="applyDate" label="申请时间" min-width="120" align="center" />
<el-table-column prop="warehouseInDate" label="入库时间" min-width="120" align="center" />
<el-table-column prop="unit" label="单位" min-width="90" align="center" />
<el-table-column prop="quantity" label="入库数" min-width="100" align="right">
<el-table-column
v-if="isColumnVisible('licensePlate')"
prop="licensePlate"
label="车牌号"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('applyDate')"
prop="applyDate"
label="申请时间"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('warehouseInDate')"
prop="warehouseInDate"
label="入库时间"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('unit')"
prop="unit"
label="单位"
min-width="90"
align="center"
/>
<el-table-column
v-if="isColumnVisible('quantity')"
prop="quantity"
label="入库数"
min-width="100"
align="right"
>
<template #default="{ row }">{{ Number(row.quantity).toFixed(2) }}</template>
</el-table-column>
<el-table-column prop="applyAmount" label="申请金额(元)" min-width="120" align="right">
<el-table-column
v-if="isColumnVisible('applyAmount')"
prop="applyAmount"
label="申请金额(元)"
min-width="120"
align="right"
>
<template #default="{ row }">{{ Number(row.applyAmount).toFixed(2) }}</template>
</el-table-column>
<el-table-column prop="applicantName" label="申请人" min-width="100" align="center" />
<el-table-column prop="status" label="状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('applicantName')"
prop="applicantName"
label="申请人"
min-width="100"
align="center"
/>
<el-table-column
v-if="isColumnVisible('status')"
prop="status"
label="状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlUreaApplyStatusTagType(row.status)" size="small">
{{ getPlUreaApplyStatusLabel(row.status) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" min-width="170" align="center" />
<el-table-column
v-if="isColumnVisible('createTime')"
prop="createTime"
label="创建时间"
min-width="170"
align="center"
/>
</el-table>
<div class="pagination list-pager-bar">
@@ -145,7 +213,9 @@
ref="formRef"
:model="formData"
:rules="formRules"
label-position="top"
label-position="right"
label-width="100px"
class="pl-dialog-form"
scroll-to-error
>
<div class="form-grid-2">
@@ -249,7 +319,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import {
Check,
CircleClose,
@@ -275,6 +347,7 @@ import {
getPlUreaApplyStatusTagType,
PL_UREA_UNIT_PRESETS
} from '@/utils/pl-display'
import { syncViewRowFromFlatList } from '@/utils/view-dialog-refresh'
const userStore = useUserStore()
@@ -288,12 +361,34 @@ const userOptions = ref<
>([])
const loading = ref(false)
const listColumnDefs = [
{ prop: 'licensePlate', label: '车牌号' },
{ prop: 'applyDate', label: '申请时间' },
{ prop: 'warehouseInDate', label: '入库时间' },
{ prop: 'unit', label: '单位' },
{ prop: 'quantity', label: '入库数' },
{ prop: 'applyAmount', label: '申请金额(元)' },
{ prop: 'applicantName', label: '申请人' },
{ prop: 'status', label: '状态' },
{ prop: 'createTime', label: '创建时间' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-vehicle-urea-apply-list-columns', listColumnDefs)
const submitLoading = ref(false)
const cancelLoadingMap = reactive<Record<string, boolean>>({})
const tableData = ref<VehicleUreaApply[]>([])
const selectedRows = ref<VehicleUreaApply[]>([])
const vehicleOptions = ref<Vehicle[]>([])
const dateRange = ref<string[]>([])
const quickSearchKeyword = ref('')
const searchForm = reactive({
q: '',
@@ -341,6 +436,14 @@ const viewLoading = ref(false)
const viewDetail = ref<VehicleUreaApply | null>(null)
const viewingRecord = ref<VehicleUreaApply | null>(null)
async function refreshViewIfOpen(editedId?: string) {
if (!viewVisible.value || !viewingRecord.value?.id) return
if (editedId && viewingRecord.value.id !== editedId) return
syncViewRowFromFlatList(viewingRecord, tableData.value)
const res = await vehicleUreaApplyApi.get(viewingRecord.value.id)
viewDetail.value = res.data ?? res
}
const viewSections = computed<ViewSection[]>(() => {
const d = viewDetail.value
if (!d) return []
@@ -394,7 +497,7 @@ async function fetchData() {
loading.value = true
try {
const res = await vehicleUreaApplyApi.list({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
status: searchForm.status || undefined,
applyDateFrom: dateRange.value?.[0],
applyDateTo: dateRange.value?.[1],
@@ -410,6 +513,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -418,7 +522,20 @@ function handleReset() {
searchForm.q = ''
searchForm.status = ''
dateRange.value = []
handleSearch()
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleSelectionChange(rows: VehicleUreaApply[]) {
@@ -536,7 +653,8 @@ async function handleSubmit() {
ElMessage.success('创建成功')
}
dialogVisible.value = false
fetchData()
await fetchData()
if (isEdit.value) await refreshViewIfOpen(formData.id)
} finally {
submitLoading.value = false
}
@@ -60,6 +60,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="申请单号/车牌"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button
class="btn-main"
type="primary"
@@ -84,7 +90,15 @@
<el-icon><Plus /></el-icon>无申请补录
</el-button>
<ListToolbarEndActions :loading="loading" @refresh="fetchData" />
<ListToolbarEndActions
:loading="loading"
:column-defs="listColumnDefs"
v-model:visible-columns="visibleColumns"
v-model:check-all="checkAll"
:is-indeterminate="isIndeterminate"
@refresh="fetchData"
@reset-columns="resetToDefault"
/>
</div>
</div>
@@ -112,36 +126,108 @@
<el-link type="primary" @click="handleView(row)">{{ row.applyNo }}</el-link>
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请时间" min-width="120" align="center" />
<el-table-column prop="warehouseInDate" label="入库时间" min-width="120" align="center" />
<el-table-column prop="applicantName" label="申请人" min-width="100" align="center" />
<el-table-column prop="unit" label="单位" min-width="90" align="center" />
<el-table-column prop="quantity" label="入库数" min-width="100" align="right">
<el-table-column
v-if="isColumnVisible('applyDate')"
prop="applyDate"
label="申请时间"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('warehouseInDate')"
prop="warehouseInDate"
label="入库时间"
min-width="120"
align="center"
/>
<el-table-column
v-if="isColumnVisible('applicantName')"
prop="applicantName"
label="申请人"
min-width="100"
align="center"
/>
<el-table-column
v-if="isColumnVisible('unit')"
prop="unit"
label="单位"
min-width="90"
align="center"
/>
<el-table-column
v-if="isColumnVisible('quantity')"
prop="quantity"
label="入库数"
min-width="100"
align="right"
>
<template #default="{ row }">{{ Number(row.quantity).toFixed(2) }}</template>
</el-table-column>
<el-table-column prop="applyAmount" label="申请金额(元)" min-width="120" align="right">
<el-table-column
v-if="isColumnVisible('applyAmount')"
prop="applyAmount"
label="申请金额(元)"
min-width="120"
align="right"
>
<template #default="{ row }">{{ Number(row.applyAmount).toFixed(2) }}</template>
</el-table-column>
<el-table-column prop="applyStatus" label="申请状态" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('applyStatus')"
prop="applyStatus"
label="申请状态"
min-width="100"
align="center"
>
<template #default="{ row }">
<el-tag :type="getPlUreaApplyStatusTagType(row.applyStatus)" size="small">
{{ getPlUreaApplyStatusLabel(row.applyStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="licensePlate" label="车牌号" min-width="110" align="center" />
<el-table-column prop="disburseNo" label="发放单号" min-width="170" show-overflow-tooltip>
<el-table-column
v-if="isColumnVisible('licensePlate')"
prop="licensePlate"
label="车牌号"
min-width="110"
align="center"
/>
<el-table-column
v-if="isColumnVisible('disburseNo')"
prop="disburseNo"
label="发放单号"
min-width="170"
show-overflow-tooltip
>
<template #default="{ row }">{{ row.disburseNo || '—' }}</template>
</el-table-column>
<el-table-column prop="disburseDate" label="发放时间" min-width="120" align="center">
<el-table-column
v-if="isColumnVisible('disburseDate')"
prop="disburseDate"
label="发放时间"
min-width="120"
align="center"
>
<template #default="{ row }">{{ row.disburseDate || '—' }}</template>
</el-table-column>
<el-table-column prop="amount" label="发放金额(元)" min-width="120" align="right">
<el-table-column
v-if="isColumnVisible('amount')"
prop="amount"
label="发放金额(元)"
min-width="120"
align="right"
>
<template #default="{ row }">
{{ row.amount != null ? Number(row.amount).toFixed(2) : '—' }}
</template>
</el-table-column>
<el-table-column prop="handlerName" label="处理人" min-width="100" align="center">
<el-table-column
v-if="isColumnVisible('handlerName')"
prop="handlerName"
label="处理人"
min-width="100"
align="center"
>
<template #default="{ row }">{{ row.handlerName || '—' }}</template>
</el-table-column>
</el-table>
@@ -169,7 +255,7 @@
destroy-on-close
@closed="resetForm"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="top" scroll-to-error>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="right" label-width="100px" class="pl-dialog-form" scroll-to-error>
<div v-if="dialogMode === 'disburse' && currentApplyRow" class="apply-summary-block">
<div class="apply-summary-title">关联申请</div>
<div class="apply-summary-grid">
@@ -293,7 +379,9 @@
</template>
<script setup lang="ts">
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { Check, Close, Delete, Edit, Money, Plus, RefreshLeft, Search } from '@element-plus/icons-vue'
import {
vehicleApi,
@@ -322,6 +410,30 @@ const userOptions = ref<
>([])
const loading = ref(false)
const listColumnDefs = [
{ prop: 'applyDate', label: '申请时间' },
{ prop: 'warehouseInDate', label: '入库时间' },
{ prop: 'applicantName', label: '申请人' },
{ prop: 'unit', label: '单位' },
{ prop: 'quantity', label: '入库数' },
{ prop: 'applyAmount', label: '申请金额(元)' },
{ prop: 'applyStatus', label: '申请状态' },
{ prop: 'licensePlate', label: '车牌号' },
{ prop: 'disburseNo', label: '发放单号' },
{ prop: 'disburseDate', label: '发放时间' },
{ prop: 'amount', label: '发放金额(元)' },
{ prop: 'handlerName', label: '处理人' }
]
const {
visibleColumns,
checkAll,
isIndeterminate,
isColumnVisible,
resetToDefault
} = usePersistedListColumns('pl-vehicle-urea-disburse-list-columns', listColumnDefs)
const submitLoading = ref(false)
const deleteLoadingMap = reactive<Record<string, boolean>>({})
const selectedRows = ref<VehicleUreaDisburseBoardItem[]>([])
@@ -329,6 +441,7 @@ const tableData = ref<VehicleUreaDisburseBoardItem[]>([])
const vehicleOptions = ref<Vehicle[]>([])
const applyDateRange = ref<string[]>([])
const disburseDateRange = ref<string[]>([])
const quickSearchKeyword = ref('')
const searchForm = reactive({
q: '',
@@ -465,7 +578,7 @@ async function fetchData() {
loading.value = true
try {
const res = await vehicleUreaDisburseApi.disburseBoard({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
applyStatus: searchForm.applyStatus || undefined,
applyDateFrom: applyDateRange.value?.[0],
applyDateTo: applyDateRange.value?.[1],
@@ -483,6 +596,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -492,7 +606,20 @@ function handleReset() {
searchForm.applyStatus = ''
applyDateRange.value = []
disburseDateRange.value = []
handleSearch()
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function resetForm() {
+48 -14
View File
@@ -1,4 +1,4 @@
<!-- 车辆管理 -->
<!-- 全部车辆管理 -->
<template>
<div class="page-container">
<section class="panel">
@@ -61,6 +61,12 @@
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<ListQuickSearchInput
v-model="quickSearchKeyword"
placeholder="车牌号"
@search="handleQuickSearch"
@clear="handleQuickSearchClear"
/>
<el-button class="btn-main" type="primary" @click="handleAdd">
<el-icon><Plus /></el-icon>新增车辆
</el-button>
@@ -200,12 +206,12 @@
<el-dialog
v-model="dialogVisible"
:title="dialogTitle"
width="960px"
width="1360px"
align-center
class="dialog-form-layout"
@close="handleDialogClose"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="top">
<el-form ref="formRef" :model="formData" :rules="formRules" label-position="right" label-width="100px" class="pl-dialog-form">
<div class="form-grid-3">
<el-form-item label="车牌号" prop="licensePlate">
<el-input v-model="formData.licensePlate" placeholder="请输入车牌号" maxlength="20" />
@@ -330,6 +336,7 @@
title="车辆证书"
upload-folder="pl/vehicle-cert"
:cert-name-options="certNameOptions"
layout="table"
/>
</el-form>
<template #footer>
@@ -346,7 +353,7 @@
<SystemViewDialog
v-model:visible="viewVisible"
:title="viewDetail?.licensePlate || '车辆详情'"
:title="viewDialogTitle"
:icon="Van"
:meta="viewHeroMeta"
:sections="viewSections"
@@ -374,7 +381,10 @@
:cert-list="viewDetail?.certList || []"
:license-plate="viewDetail?.licensePlate"
:trailer-no="viewDetail?.trailerNo"
:vehicle-id="viewDetail?.id"
:personnel-list="viewPersonnelList"
:check-self-vehicle-certs="viewDetail?.vehicleType === 'self'"
cert-layout="table"
/>
</template>
</SystemViewDialog>
@@ -383,6 +393,7 @@
<script setup lang="ts">
import ListToolbarEndActions from '@/components/business/list-toolbar-end-actions/index.vue'
import ListQuickSearchInput from '@/components/business/list-quick-search-input/index.vue'
import { usePersistedListColumns } from '@/composables/usePersistedListColumns'
import { Check, Close, Delete, Edit, Plus, RefreshLeft, Search, Van } from '@element-plus/icons-vue'
import {
@@ -409,7 +420,8 @@ import { formatDateTime } from '@/utils/format'
import {
PL_VEHICLE_CERT_NAME_OPTIONS,
splitVehicleCertsByPart,
validateVehicleRequiredCerts
getSelfVehicleCertMissingSuffix,
validateVehicleCertNamesNotEmpty
} from '@/utils/pl-vehicle-cert'
import { canDeleteByCreator, filterDeletableByCreator, allRowsDeletableByCreator, CREATOR_DELETE_TIP } from '@/utils/creator-delete'
@@ -417,6 +429,7 @@ type CertListItem = CertRow & { _key?: string }
type CertFormListRef = InstanceType<typeof PlVehicleCertPartTabs>
const loading = ref(false)
const quickSearchKeyword = ref('')
const submitLoading = ref(false)
const dialogLoading = ref(false)
const vehicleList = ref<Vehicle[]>([])
@@ -523,6 +536,18 @@ const viewHeroMeta = computed(() => {
return parts.join(' · ')
})
const viewDialogTitle = computed(() => {
const plate = viewDetail.value?.licensePlate || '车辆详情'
if (!viewDetail.value || viewDetail.value.vehicleType !== 'self') return plate
return (
plate +
getSelfVehicleCertMissingSuffix({
certList: viewDetail.value.certList,
trailerNo: viewDetail.value.trailerNo
})
)
})
const viewSections = computed<ViewSection[]>(() => {
const d = viewDetail.value
if (!d) return []
@@ -713,21 +738,17 @@ function validateSubTables(): boolean {
const hasTrailer = Boolean(formData.trailerNo?.trim())
const { headCerts, trailerCerts } = splitVehicleCertsByPart(certList.value)
return validateVehicleRequiredCerts({
headCerts,
trailerCerts,
hasTrailer,
licensePlate: formData.licensePlate,
trailerNo: formData.trailerNo,
onError: message => ElMessage.warning(message)
})
return validateVehicleCertNamesNotEmpty(
[headCerts, ...(hasTrailer ? [trailerCerts] : [])],
message => ElMessage.warning(message)
)
}
async function fetchData() {
loading.value = true
try {
const res = await vehicleApi.list({
q: searchForm.q || undefined,
q: quickSearchKeyword.value.trim() || searchForm.q || undefined,
vehicleType: searchForm.vehicleType || undefined,
carrierId: searchForm.carrierId || undefined,
vehicleStatus: searchForm.vehicleStatus || undefined,
@@ -745,6 +766,7 @@ async function fetchData() {
}
function handleSearch() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
@@ -754,11 +776,23 @@ function handleReset() {
searchForm.vehicleType = ''
searchForm.carrierId = ''
searchForm.vehicleStatus = ''
quickSearchKeyword.value = ''
selectedRows.value = []
pagination.page = 1
fetchData()
}
function handleQuickSearch() {
pagination.page = 1
fetchData()
}
function handleQuickSearchClear() {
quickSearchKeyword.value = ''
pagination.page = 1
fetchData()
}
function handlePageChange() {
fetchData()
}