提交
This commit is contained in:
1 parent
88da74d72a
commit
9fcb9270e6
53 files changed
+612846
-3438
No files matched your search
@@ -174,6 +174,14 @@
|
||||
>
|
||||
<el-icon><DocumentCopy /></el-icon>三方人车快速创建
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="canForceFollowStatus"
|
||||
class="btn-ghost"
|
||||
:disabled="!selectedPlan"
|
||||
@click="openForceFollowStatusDialog"
|
||||
>
|
||||
<el-icon><EditPen /></el-icon>强制改状态
|
||||
</el-button>
|
||||
|
||||
<ListToolbarEndActions
|
||||
:loading="loading"
|
||||
@@ -530,6 +538,64 @@
|
||||
<PlSubpackSlipPrintDialog ref="subpackSlipPrintRef" />
|
||||
|
||||
<PlPasteRecognizeDialog v-model:visible="pasteVisible" mode="vehicle-bundle" />
|
||||
|
||||
<el-dialog
|
||||
v-model="forceFollowDialogVisible"
|
||||
title="强制修改跟进状态"
|
||||
width="640px"
|
||||
align-center
|
||||
class="dialog-form-layout"
|
||||
modal-class="order-module-dialog-mask"
|
||||
destroy-on-close
|
||||
@closed="resetForceFollowDialog"
|
||||
>
|
||||
<el-form label-position="top" class="form-grid-2">
|
||||
<el-form-item label="计划编号" style="margin-bottom: 0">
|
||||
<span>{{ selectedPlan?.planNo || '—' }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据类型" style="margin-bottom: 0">
|
||||
<span>{{ getPlanTypeLabel(selectedPlan?.planType) }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="供方" style="margin-bottom: 0">
|
||||
<span>{{ selectedPlan?.supplierName || '—' }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="需方" style="margin-bottom: 0">
|
||||
<span>{{ selectedPlan?.customerName || '—' }}</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品信息" class="form-col-span-2" style="margin-bottom: 0">
|
||||
<PlPlanListProductCell :products="selectedPlan?.products || []" />
|
||||
</el-form-item>
|
||||
<el-form-item label="当前跟进状态" style="margin-bottom: 0">
|
||||
<el-tag
|
||||
v-if="selectedPlan"
|
||||
:type="getPlPlanFollowStatusTagType(selectedPlan.followStatus)"
|
||||
size="small"
|
||||
>
|
||||
{{ getPlPlanFollowStatusLabel(selectedPlan.followStatus) }}
|
||||
</el-tag>
|
||||
<span v-else>—</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标跟进状态" required style="margin-bottom: 0">
|
||||
<el-select v-model="forceFollowStatusValue" placeholder="请选择" style="width: 100%">
|
||||
<el-option
|
||||
v-for="opt in PL_PLAN_FOLLOW_STATUS_OPTIONS"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<p class="form-tip form-col-span-2">仅修改跟进状态字段,不会联动作废或运输安排。</p>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="forceFollowDialogVisible = false">
|
||||
<el-icon><Close /></el-icon>取消
|
||||
</el-button>
|
||||
<el-button type="primary" :loading="forceFollowLoading" @click="submitForceFollowStatus">
|
||||
<el-icon><Check /></el-icon>确定
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -537,16 +603,20 @@
|
||||
import {
|
||||
ArrowDown,
|
||||
Bell,
|
||||
Check,
|
||||
CircleClose,
|
||||
Close,
|
||||
CopyDocument,
|
||||
DocumentCopy,
|
||||
Edit,
|
||||
EditPen,
|
||||
Plus,
|
||||
Printer,
|
||||
RefreshLeft,
|
||||
Search,
|
||||
Van
|
||||
} from '@element-plus/icons-vue'
|
||||
import { fetchGetMenuCodes } from '@/api/auth'
|
||||
import { planApi, type Plan } from '@/api/pl'
|
||||
import PlInboundSlipPrintDialog from '@/components/business/pl-inbound-slip-print-dialog/index.vue'
|
||||
import PlDeliverySlipPrintDialog from '@/components/business/pl-delivery-slip-print-dialog/index.vue'
|
||||
@@ -587,6 +657,10 @@ const router = useRouter()
|
||||
const loading = ref(false)
|
||||
const voidLoading = ref(false)
|
||||
const waitNoticeLoading = ref(false)
|
||||
const canForceFollowStatus = ref(false)
|
||||
const forceFollowDialogVisible = ref(false)
|
||||
const forceFollowLoading = ref(false)
|
||||
const forceFollowStatusValue = ref('')
|
||||
const formDialogVisible = ref(false)
|
||||
const pasteVisible = ref(false)
|
||||
const editingPlanId = ref('')
|
||||
@@ -1056,6 +1130,53 @@ function handleToolbarVoid() {
|
||||
handleVoid(selectedRows.value[0])
|
||||
}
|
||||
|
||||
function openForceFollowStatusDialog() {
|
||||
if (!selectedPlan.value) return
|
||||
forceFollowStatusValue.value = selectedPlan.value.followStatus || ''
|
||||
forceFollowDialogVisible.value = true
|
||||
}
|
||||
|
||||
function resetForceFollowDialog() {
|
||||
forceFollowStatusValue.value = ''
|
||||
}
|
||||
|
||||
async function submitForceFollowStatus() {
|
||||
if (!selectedPlan.value) return
|
||||
const next = (forceFollowStatusValue.value || '').trim()
|
||||
if (!next) {
|
||||
ElMessage.warning('请选择目标跟进状态')
|
||||
return
|
||||
}
|
||||
if (next === selectedPlan.value.followStatus) {
|
||||
ElMessage.warning('目标状态与当前状态相同')
|
||||
return
|
||||
}
|
||||
forceFollowLoading.value = true
|
||||
try {
|
||||
await planApi.forceFollowStatus(selectedPlan.value.id, next)
|
||||
ElMessage.success('跟进状态已更新')
|
||||
forceFollowDialogVisible.value = false
|
||||
fetchData()
|
||||
} catch (e) {
|
||||
const message = e instanceof Error ? e.message : '修改失败'
|
||||
ElMessage.error(message)
|
||||
} finally {
|
||||
forceFollowLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function loadForceFollowPermission() {
|
||||
try {
|
||||
const perm = await fetchGetMenuCodes()
|
||||
canForceFollowStatus.value =
|
||||
!!perm?.all ||
|
||||
!!perm?.isSuperAdmin ||
|
||||
(perm?.menuCodes || []).includes('pl:plan:force-follow-status')
|
||||
} catch {
|
||||
canForceFollowStatus.value = false
|
||||
}
|
||||
}
|
||||
|
||||
useDbInstantSearch(
|
||||
() => ({
|
||||
planNo: searchForm.planNo,
|
||||
@@ -1073,6 +1194,7 @@ useDbInstantSearch(
|
||||
)
|
||||
|
||||
onMounted(() => {
|
||||
loadForceFollowPermission()
|
||||
fetchData()
|
||||
openArrangeFromQuery()
|
||||
})
|
||||
|
||||
@@ -0,0 +1,446 @@
|
||||
<template>
|
||||
<PublicMobileShell>
|
||||
<div class="public-pl-history-page">
|
||||
<van-nav-bar
|
||||
title="现场记录"
|
||||
left-arrow
|
||||
:border="false"
|
||||
class="site-nav-bar"
|
||||
@click-left="goBack"
|
||||
/>
|
||||
|
||||
<div class="filters">
|
||||
<div class="filter-row">
|
||||
<van-field
|
||||
class="date-field"
|
||||
readonly
|
||||
is-link
|
||||
clickable
|
||||
:model-value="pickDate"
|
||||
placeholder="选择日期"
|
||||
@click="openDatePicker"
|
||||
/>
|
||||
<input
|
||||
v-model="keyword"
|
||||
type="search"
|
||||
class="search-input"
|
||||
placeholder="供方/需方"
|
||||
enterkeyhint="search"
|
||||
/>
|
||||
</div>
|
||||
<div class="chips">
|
||||
<button
|
||||
v-for="q in quickOptions"
|
||||
:key="q.offset"
|
||||
type="button"
|
||||
class="chip"
|
||||
:class="{ on: pickDate === q.ymd }"
|
||||
@click="setQuick(q.offset)"
|
||||
>
|
||||
{{ q.label }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<van-popup v-model:show="showDatePicker" position="bottom" round>
|
||||
<van-date-picker
|
||||
v-model="datePickerValue"
|
||||
title="选择日期"
|
||||
:min-date="minDate"
|
||||
:max-date="maxDate"
|
||||
@confirm="onDateConfirm"
|
||||
@cancel="showDatePicker = false"
|
||||
/>
|
||||
</van-popup>
|
||||
|
||||
<van-empty v-if="errorMessage" :description="errorMessage" />
|
||||
<van-list
|
||||
v-else
|
||||
v-model:loading="listLoading"
|
||||
:finished="finished"
|
||||
:immediate-check="false"
|
||||
finished-text="没有更多了"
|
||||
@load="loadMore"
|
||||
>
|
||||
<van-empty v-if="!records.length && !listLoading" description="暂无现场记录" />
|
||||
<div
|
||||
v-for="(row, index) in records"
|
||||
:key="`${row.kind}-${row.orderId}`"
|
||||
class="record-card"
|
||||
role="button"
|
||||
@click="openRecord(row)"
|
||||
>
|
||||
<span class="index-tag">{{ index + 1 }}</span>
|
||||
<div class="record-top">
|
||||
<span class="plan-no">{{ row.orderNo || row.planNo || '—' }}</span>
|
||||
<span class="tag" :class="tagClass(row)">{{ row.statusLabel || '进行中' }}</span>
|
||||
</div>
|
||||
<div class="meta">类型:{{ kindLabel(row.kind) }} · 计划:{{ row.planNo || '—' }}</div>
|
||||
<div class="meta">
|
||||
往来:{{ row.partnerCompany || '—' }} · 车牌:{{ row.vehicleNo || '—' }}
|
||||
</div>
|
||||
<div class="meta">
|
||||
供方:{{ row.supplierName || '—' }} · 需方:{{ row.customerName || '—' }}
|
||||
</div>
|
||||
</div>
|
||||
</van-list>
|
||||
</div>
|
||||
</PublicMobileShell>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { showFailToast } from 'vant'
|
||||
import { watchDebounced } from '@vueuse/core'
|
||||
import {
|
||||
createPublicIoOrderApi,
|
||||
type PublicIoOrderHistoryRecord
|
||||
} from '@/api/pl/public-io-order'
|
||||
import PublicMobileShell from '@/layouts/PublicMobileShell.vue'
|
||||
|
||||
import 'vant/es/toast/style'
|
||||
import 'vant/es/list/style'
|
||||
import 'vant/es/field/style'
|
||||
import 'vant/es/popup/style'
|
||||
import 'vant/es/date-picker/style'
|
||||
import '@/styles/public-mobile-vant.scss'
|
||||
|
||||
const PAGE_SIZE = 20
|
||||
|
||||
const props = defineProps<{ kind: 'inbound' | 'outbound' }>()
|
||||
const api = createPublicIoOrderApi(props.kind)
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const token = computed(() => String(route.params.token || ''))
|
||||
|
||||
const listLoading = ref(false)
|
||||
const finished = ref(false)
|
||||
const errorMessage = ref('')
|
||||
const records = ref<PublicIoOrderHistoryRecord[]>([])
|
||||
const total = ref(0)
|
||||
const page = ref(1)
|
||||
const pickDate = ref(addDays(0))
|
||||
const keyword = ref('')
|
||||
const showDatePicker = ref(false)
|
||||
const datePickerValue = ref<string[]>(ymdToParts(pickDate.value))
|
||||
const minDate = new Date(new Date().getFullYear() - 2, 0, 1)
|
||||
const maxDate = new Date(new Date().getFullYear() + 2, 11, 31)
|
||||
let requestSeq = 0
|
||||
|
||||
const quickOptions = [
|
||||
{ label: '今日', offset: 0, ymd: addDays(0) },
|
||||
{ label: '明日', offset: 1, ymd: addDays(1) },
|
||||
{ label: '后天', offset: 2, ymd: addDays(2) }
|
||||
]
|
||||
|
||||
function formatYmd(d: Date) {
|
||||
const y = d.getFullYear()
|
||||
const m = String(d.getMonth() + 1).padStart(2, '0')
|
||||
const day = String(d.getDate()).padStart(2, '0')
|
||||
return `${y}-${m}-${day}`
|
||||
}
|
||||
|
||||
function addDays(n: number) {
|
||||
const d = new Date()
|
||||
d.setHours(0, 0, 0, 0)
|
||||
d.setDate(d.getDate() + n)
|
||||
return formatYmd(d)
|
||||
}
|
||||
|
||||
function ymdToParts(ymd: string): string[] {
|
||||
const [y, m, d] = String(ymd || '').split('-')
|
||||
if (!y || !m || !d) return ymdToParts(addDays(0))
|
||||
return [y, m, d]
|
||||
}
|
||||
|
||||
function openDatePicker() {
|
||||
datePickerValue.value = ymdToParts(pickDate.value)
|
||||
showDatePicker.value = true
|
||||
}
|
||||
|
||||
function onDateConfirm({ selectedValues }: { selectedValues: string[] }) {
|
||||
pickDate.value = selectedValues.join('-')
|
||||
showDatePicker.value = false
|
||||
reload()
|
||||
}
|
||||
|
||||
function kindLabel(kind?: string) {
|
||||
if (kind === 'inbound') return '入库'
|
||||
if (kind === 'outbound') return '出库'
|
||||
return '—'
|
||||
}
|
||||
|
||||
function tagClass(row: PublicIoOrderHistoryRecord) {
|
||||
if (row.orderVoided || row.statusLabel === '已作废') return 'tag--danger'
|
||||
if (row.planArchived || row.statusLabel === '已归档') return 'tag--muted'
|
||||
return 'tag--success'
|
||||
}
|
||||
|
||||
function detailRouteName() {
|
||||
return props.kind === 'inbound' ? 'PublicPlInboundOrder' : 'PublicPlOutboundOrder'
|
||||
}
|
||||
|
||||
function goBack() {
|
||||
router.push({ name: detailRouteName(), params: { token: token.value } })
|
||||
}
|
||||
|
||||
function setQuick(offset: number) {
|
||||
pickDate.value = addDays(offset)
|
||||
datePickerValue.value = ymdToParts(pickDate.value)
|
||||
reload()
|
||||
}
|
||||
|
||||
function openRecord(row: PublicIoOrderHistoryRecord) {
|
||||
const accessToken = (row.siteAccessToken || '').trim()
|
||||
if (!accessToken) {
|
||||
showFailToast('该记录暂无现场链接')
|
||||
return
|
||||
}
|
||||
const name = row.kind === 'outbound' ? 'PublicPlOutboundOrder' : 'PublicPlInboundOrder'
|
||||
router.push({ name, params: { token: accessToken } })
|
||||
}
|
||||
|
||||
function reload() {
|
||||
page.value = 1
|
||||
finished.value = false
|
||||
records.value = []
|
||||
total.value = 0
|
||||
errorMessage.value = ''
|
||||
loadMore()
|
||||
}
|
||||
|
||||
async function loadMore() {
|
||||
if (finished.value && page.value > 1) {
|
||||
listLoading.value = false
|
||||
return
|
||||
}
|
||||
const seq = ++requestSeq
|
||||
listLoading.value = true
|
||||
try {
|
||||
const data = await api.getHistory(
|
||||
token.value,
|
||||
pickDate.value,
|
||||
keyword.value,
|
||||
page.value,
|
||||
PAGE_SIZE
|
||||
)
|
||||
if (seq !== requestSeq) return
|
||||
errorMessage.value = ''
|
||||
const rows = data?.records || []
|
||||
total.value = Number(data?.total || 0)
|
||||
if (page.value === 1) {
|
||||
records.value = rows
|
||||
} else {
|
||||
records.value = records.value.concat(rows)
|
||||
}
|
||||
const loaded = records.value.length
|
||||
finished.value = loaded >= total.value || rows.length < PAGE_SIZE
|
||||
if (!finished.value) {
|
||||
page.value += 1
|
||||
}
|
||||
} catch (e: any) {
|
||||
if (seq !== requestSeq) return
|
||||
errorMessage.value = e?.message || '链接无效或已失效'
|
||||
records.value = []
|
||||
total.value = 0
|
||||
finished.value = true
|
||||
} finally {
|
||||
if (seq === requestSeq) {
|
||||
listLoading.value = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
watchDebounced(
|
||||
keyword,
|
||||
() => {
|
||||
reload()
|
||||
},
|
||||
{ debounce: 300 }
|
||||
)
|
||||
|
||||
onMounted(reload)
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.site-nav-bar {
|
||||
margin: -12px -16px 12px;
|
||||
border-radius: 0 0 12px 12px;
|
||||
overflow: hidden;
|
||||
|
||||
:deep(.van-nav-bar) {
|
||||
background: #059669;
|
||||
}
|
||||
|
||||
:deep(.van-nav-bar__title),
|
||||
:deep(.van-nav-bar__arrow) {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
:deep(.van-nav-bar__title) {
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
|
||||
.filters {
|
||||
margin-bottom: 12px;
|
||||
padding: 12px 14px;
|
||||
border-radius: 12px;
|
||||
background: #fff;
|
||||
border: 1px solid #e2e8f0;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.filter-row {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1.1fr) minmax(0, 1fr);
|
||||
gap: 8px;
|
||||
max-width: 100%;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.date-field {
|
||||
padding: 0 12px;
|
||||
min-height: 40px;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
border: 1px solid #cbd5e1;
|
||||
border-radius: 8px;
|
||||
align-items: center;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
|
||||
:deep(.van-field__control) {
|
||||
font-size: 14px;
|
||||
color: #1e293b;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
}
|
||||
|
||||
:deep(.van-field__right-icon) {
|
||||
margin-right: 0;
|
||||
color: #64748b;
|
||||
}
|
||||
}
|
||||
|
||||
.search-input {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
min-width: 0;
|
||||
height: 40px;
|
||||
padding: 0 12px;
|
||||
border: 1px solid #cbd5e1;
|
||||
border-radius: 8px;
|
||||
font-size: 14px;
|
||||
color: #1e293b;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.chips {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.chip {
|
||||
height: 30px;
|
||||
padding: 0 12px;
|
||||
border-radius: 999px;
|
||||
border: 1px solid #d1fae5;
|
||||
background: #ecfdf5;
|
||||
color: #047857;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.chip.on {
|
||||
background: #059669;
|
||||
border-color: #059669;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.record-card {
|
||||
position: relative;
|
||||
margin-bottom: 10px;
|
||||
padding: 16px 14px 14px;
|
||||
border-radius: 12px;
|
||||
background: #fff;
|
||||
border: 1px solid #e2e8f0;
|
||||
cursor: pointer;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.index-tag {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
min-width: 24px;
|
||||
height: 22px;
|
||||
padding: 0 8px;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 12px 0 10px 0;
|
||||
background: #059669;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.record-top {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 8px;
|
||||
margin-bottom: 8px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
.plan-no {
|
||||
font-size: 15px;
|
||||
font-weight: 700;
|
||||
color: #0f172a;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.tag {
|
||||
flex-shrink: 0;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
padding: 2px 8px;
|
||||
border-radius: 999px;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.tag--success {
|
||||
background: #059669;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.tag--danger {
|
||||
background: #dc2626;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.tag--muted {
|
||||
background: #94a3b8;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.meta {
|
||||
font-size: 13px;
|
||||
color: #64748b;
|
||||
line-height: 1.45;
|
||||
word-break: break-all;
|
||||
|
||||
& + .meta {
|
||||
margin-top: 4px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -179,13 +179,28 @@
|
||||
<van-cell-group v-if="page.siteFeedbackTime" inset class="section-card">
|
||||
<van-cell title="上次保存" :value="formatDateTime(page.siteFeedbackTime)" />
|
||||
</van-cell-group>
|
||||
</template>
|
||||
|
||||
<footer v-if="!isReadOnly" class="page-footer">
|
||||
<footer v-if="page && !errorMessage && !loading" class="page-footer">
|
||||
<div v-if="!page.archived && !isReadOnly" class="btn-row">
|
||||
<van-button block round type="primary" class="history-btn" @click="goHistory">
|
||||
现场记录
|
||||
</van-button>
|
||||
<van-button type="primary" block round :loading="saving" @click="handleSave">
|
||||
提交
|
||||
</van-button>
|
||||
</footer>
|
||||
</template>
|
||||
</div>
|
||||
<van-button
|
||||
v-else
|
||||
block
|
||||
round
|
||||
type="primary"
|
||||
class="history-btn"
|
||||
@click="goHistory"
|
||||
>
|
||||
现场记录
|
||||
</van-button>
|
||||
</footer>
|
||||
</div>
|
||||
</PublicMobileShell>
|
||||
</template>
|
||||
@@ -218,6 +233,7 @@
|
||||
const props = defineProps<{ kind: 'inbound' | 'outbound' }>()
|
||||
const api = createPublicIoOrderApi(props.kind)
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const token = computed(() => String(route.params.token || ''))
|
||||
const navTitle = computed(() =>
|
||||
props.kind === 'inbound' ? '入库单 · 现场回执' : '出库单 · 现场回执'
|
||||
@@ -287,6 +303,11 @@
|
||||
return (s && map[s]) || s || '—'
|
||||
}
|
||||
|
||||
function goHistory() {
|
||||
const name = props.kind === 'inbound' ? 'PublicPlInboundHistory' : 'PublicPlOutboundHistory'
|
||||
router.push({ name, params: { token: token.value } })
|
||||
}
|
||||
|
||||
function resolveFileUrl(url: string) {
|
||||
if (!url) return ''
|
||||
if (/^https?:\/\//i.test(url)) return url
|
||||
@@ -512,6 +533,16 @@
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.btn-row {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.history-btn {
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.multiline-cell :deep(.van-cell__value) {
|
||||
text-align: left;
|
||||
line-height: 1.35;
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
<template>
|
||||
<PublicIoOrderHistoryPage kind="inbound" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import PublicIoOrderHistoryPage from '../_shared/PublicIoOrderHistoryPage.vue'
|
||||
</script>
|
||||
@@ -0,0 +1,7 @@
|
||||
<template>
|
||||
<PublicIoOrderHistoryPage kind="outbound" />
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import PublicIoOrderHistoryPage from '../_shared/PublicIoOrderHistoryPage.vue'
|
||||
</script>
|
||||
@@ -13,30 +13,51 @@
|
||||
<van-empty v-else-if="errorMessage" :description="errorMessage" />
|
||||
<template v-else>
|
||||
<div class="filters">
|
||||
<div class="chips">
|
||||
<button
|
||||
v-for="q in quickOptions"
|
||||
:key="q.offset"
|
||||
type="button"
|
||||
class="chip"
|
||||
:class="{ on: pickDate === q.ymd }"
|
||||
@click="setQuick(q.offset)"
|
||||
>
|
||||
{{ q.label }}
|
||||
</button>
|
||||
<div class="filter-row">
|
||||
<van-field
|
||||
class="date-field"
|
||||
readonly
|
||||
is-link
|
||||
clickable
|
||||
:model-value="pickDate"
|
||||
placeholder="选择日期"
|
||||
@click="openDatePicker"
|
||||
/>
|
||||
<div class="chips">
|
||||
<button
|
||||
v-for="q in quickOptions"
|
||||
:key="q.offset"
|
||||
type="button"
|
||||
class="chip"
|
||||
:class="{ on: pickDate === q.ymd }"
|
||||
@click="setQuick(q.offset)"
|
||||
>
|
||||
{{ q.label }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<input v-model="pickDate" type="date" class="date-input" @change="load" />
|
||||
<div class="hint">{{ filterHint }}</div>
|
||||
</div>
|
||||
|
||||
<van-popup v-model:show="showDatePicker" position="bottom" round>
|
||||
<van-date-picker
|
||||
v-model="datePickerValue"
|
||||
title="选择日期"
|
||||
:min-date="minDate"
|
||||
:max-date="maxDate"
|
||||
@confirm="onDateConfirm"
|
||||
@cancel="showDatePicker = false"
|
||||
/>
|
||||
</van-popup>
|
||||
|
||||
<van-empty v-if="!records.length" description="暂无运输记录" />
|
||||
<div
|
||||
v-for="row in records"
|
||||
v-for="(row, index) in records"
|
||||
:key="row.planId"
|
||||
class="record-card"
|
||||
role="button"
|
||||
@click="openRecord(row)"
|
||||
>
|
||||
<span class="index-tag">{{ index + 1 }}</span>
|
||||
<div class="record-top">
|
||||
<span class="plan-no">{{ row.planNo }}</span>
|
||||
<span class="tag" :class="tagClass(row)">{{ row.statusLabel || '进行中' }}</span>
|
||||
@@ -62,6 +83,9 @@
|
||||
import PublicMobileShell from '@/layouts/PublicMobileShell.vue'
|
||||
|
||||
import 'vant/es/toast/style'
|
||||
import 'vant/es/field/style'
|
||||
import 'vant/es/popup/style'
|
||||
import 'vant/es/date-picker/style'
|
||||
import '@/styles/public-mobile-vant.scss'
|
||||
|
||||
const route = useRoute()
|
||||
@@ -72,15 +96,17 @@
|
||||
const errorMessage = ref('')
|
||||
const records = ref<PublicTransportHistoryRecord[]>([])
|
||||
const pickDate = ref(addDays(0))
|
||||
const showDatePicker = ref(false)
|
||||
const datePickerValue = ref<string[]>(ymdToParts(pickDate.value))
|
||||
const minDate = new Date(new Date().getFullYear() - 2, 0, 1)
|
||||
const maxDate = new Date(new Date().getFullYear() + 2, 11, 31)
|
||||
|
||||
const quickOptions = [
|
||||
{ label: '今天', offset: 0, ymd: addDays(0) },
|
||||
{ label: '明天', offset: 1, ymd: addDays(1) },
|
||||
{ label: '今日', offset: 0, ymd: addDays(0) },
|
||||
{ label: '明日', offset: 1, ymd: addDays(1) },
|
||||
{ label: '后天', offset: 2, ymd: addDays(2) }
|
||||
]
|
||||
|
||||
const filterHint = computed(() => `筛选日期:${pickDate.value}(取货或送货落在当天)`)
|
||||
|
||||
function formatYmd(d: Date) {
|
||||
const y = d.getFullYear()
|
||||
const m = String(d.getMonth() + 1).padStart(2, '0')
|
||||
@@ -95,6 +121,23 @@
|
||||
return formatYmd(d)
|
||||
}
|
||||
|
||||
function ymdToParts(ymd: string): string[] {
|
||||
const [y, m, d] = String(ymd || '').split('-')
|
||||
if (!y || !m || !d) return ymdToParts(addDays(0))
|
||||
return [y, m, d]
|
||||
}
|
||||
|
||||
function openDatePicker() {
|
||||
datePickerValue.value = ymdToParts(pickDate.value)
|
||||
showDatePicker.value = true
|
||||
}
|
||||
|
||||
function onDateConfirm({ selectedValues }: { selectedValues: string[] }) {
|
||||
pickDate.value = selectedValues.join('-')
|
||||
showDatePicker.value = false
|
||||
load()
|
||||
}
|
||||
|
||||
function formatDay(value?: string) {
|
||||
if (!value) return '—'
|
||||
const normalized = value.replace('T', ' ')
|
||||
@@ -113,6 +156,7 @@
|
||||
|
||||
function setQuick(offset: number) {
|
||||
pickDate.value = addDays(offset)
|
||||
datePickerValue.value = ymdToParts(pickDate.value)
|
||||
load()
|
||||
}
|
||||
|
||||
@@ -174,25 +218,66 @@
|
||||
border-radius: 12px;
|
||||
background: #fff;
|
||||
border: 1px solid #e2e8f0;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.filter-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-width: 0;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.date-field {
|
||||
flex: 0 1 11.5em;
|
||||
min-width: 0;
|
||||
padding: 0 10px;
|
||||
min-height: 40px;
|
||||
border: 1px solid #cbd5e1;
|
||||
border-radius: 8px;
|
||||
align-items: center;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
|
||||
:deep(.van-field__control) {
|
||||
font-size: 14px;
|
||||
color: #1e293b;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
}
|
||||
|
||||
:deep(.van-field__right-icon) {
|
||||
margin-right: 0;
|
||||
color: #64748b;
|
||||
}
|
||||
}
|
||||
|
||||
.chips {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 8px;
|
||||
margin-bottom: 10px;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
margin-top: 0;
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.chip {
|
||||
height: 30px;
|
||||
padding: 0 12px;
|
||||
padding: 0 10px;
|
||||
border-radius: 999px;
|
||||
border: 1px solid #d1fae5;
|
||||
background: #ecfdf5;
|
||||
color: #047857;
|
||||
font-size: 13px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
flex-shrink: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.chip.on {
|
||||
@@ -201,32 +286,33 @@
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.date-input {
|
||||
width: 100%;
|
||||
height: 40px;
|
||||
padding: 0 12px;
|
||||
border: 1px solid #cbd5e1;
|
||||
border-radius: 8px;
|
||||
font-size: 14px;
|
||||
color: #1e293b;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.hint {
|
||||
margin-top: 8px;
|
||||
font-size: 12px;
|
||||
color: #64748b;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.record-card {
|
||||
position: relative;
|
||||
margin-bottom: 10px;
|
||||
padding: 14px;
|
||||
padding: 16px 14px 14px;
|
||||
border-radius: 12px;
|
||||
background: #fff;
|
||||
border: 1px solid #e2e8f0;
|
||||
cursor: pointer;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.index-tag {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
min-width: 24px;
|
||||
height: 22px;
|
||||
padding: 0 8px;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 12px 0 10px 0;
|
||||
background: #059669;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.record-top {
|
||||
@@ -235,6 +321,7 @@
|
||||
justify-content: space-between;
|
||||
gap: 8px;
|
||||
margin-bottom: 8px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
.plan-no {
|
||||
|
||||
@@ -204,12 +204,23 @@
|
||||
|
||||
<footer v-if="page && !errorMessage && !loading" class="page-footer">
|
||||
<div v-if="!page.planVoided && !page.planArchived" class="btn-row">
|
||||
<van-button block round plain type="primary" @click="goHistory">运输记录</van-button>
|
||||
<van-button block round type="primary" class="history-btn" @click="goHistory">
|
||||
运输记录
|
||||
</van-button>
|
||||
<van-button type="primary" block round :loading="saving" @click="handleSave">
|
||||
保存回执
|
||||
</van-button>
|
||||
</div>
|
||||
<van-button v-else block round plain type="primary" @click="goHistory">运输记录</van-button>
|
||||
<van-button
|
||||
v-else
|
||||
block
|
||||
round
|
||||
type="primary"
|
||||
class="history-btn"
|
||||
@click="goHistory"
|
||||
>
|
||||
运输记录
|
||||
</van-button>
|
||||
</footer>
|
||||
</div>
|
||||
</PublicMobileShell>
|
||||
@@ -714,4 +725,8 @@
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.history-btn {
|
||||
color: #fff !important;
|
||||
}
|
||||
</style>
|
||||
Reference in new issue
Block a user