提交
This commit is contained in:
1 parent
038a60b09e
commit
3740a7dd80
45 files changed
+10945
-6192
No files matched your search
@@ -200,6 +200,9 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="经办人" min-width="100" align="center" header-align="center">
|
||||
<template #default="{ row }">{{ row.operatorName || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-if="!mineOnly"
|
||||
label="领用人"
|
||||
@@ -575,6 +578,10 @@
|
||||
value: getSourceLabel(row.sourceType),
|
||||
tagType: getSourceTagType(row.sourceType) as any
|
||||
},
|
||||
{
|
||||
label: '经办人',
|
||||
value: row.operatorName || '—'
|
||||
},
|
||||
{
|
||||
label: '领用人',
|
||||
value: displayReceiver(row) === '-' ? '—' : displayReceiver(row)
|
||||
|
||||
@@ -292,13 +292,13 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="入库编号" prop="stockInNo">
|
||||
<el-input v-model="formData.stockInNo" placeholder="请输入入库编号" />
|
||||
<el-input v-model="formData.stockInNo" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入库日期" prop="stockInDate">
|
||||
<el-date-picker
|
||||
v-model="formData.stockInDate"
|
||||
type="date"
|
||||
placeholder="选择入库日期"
|
||||
placeholder="可选"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 100%"
|
||||
/>
|
||||
@@ -307,19 +307,19 @@
|
||||
<el-date-picker
|
||||
v-model="formData.expireDate"
|
||||
type="date"
|
||||
placeholder="选择过期日期"
|
||||
placeholder="可选"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货号" prop="catalogNo">
|
||||
<el-input v-model="formData.catalogNo" placeholder="请输入货号" />
|
||||
<el-input v-model="formData.catalogNo" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="批号" prop="batchNo">
|
||||
<el-input v-model="formData.batchNo" placeholder="请输入批号" />
|
||||
<el-input v-model="formData.batchNo" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="厂家" prop="manufacturer">
|
||||
<el-input v-model="formData.manufacturer" placeholder="请输入厂家" />
|
||||
<el-input v-model="formData.manufacturer" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="单位" prop="unit">
|
||||
<el-select
|
||||
@@ -348,7 +348,7 @@
|
||||
<AmountInput
|
||||
v-model="formData.unitPrice"
|
||||
:min="0"
|
||||
placeholder="请输入单价"
|
||||
placeholder="可选"
|
||||
@change="onEditPriceQtyChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -356,7 +356,7 @@
|
||||
<AmountInput
|
||||
v-model="formData.amount"
|
||||
:min="0"
|
||||
placeholder="自动计算:单价 × 数量"
|
||||
placeholder="可选,可自动计算:单价 × 数量"
|
||||
@change="formData.amountManual = true"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -402,6 +402,28 @@
|
||||
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
||||
>
|
||||
<div class="form-grid-3">
|
||||
<el-form-item label="经办人" prop="operator">
|
||||
<el-select
|
||||
v-model="stockInForm.operator"
|
||||
placeholder="请选择经办人"
|
||||
clearable
|
||||
filterable
|
||||
remote
|
||||
allow-create
|
||||
default-first-option
|
||||
reserve-keyword
|
||||
:loading="receiverUserLoading"
|
||||
:remote-method="searchReceiverUsers"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="u in receiverUserOptions"
|
||||
:key="u.id"
|
||||
:label="formatReceiverUserLabel(u)"
|
||||
:value="(u.nickName || '').trim()"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="物资" prop="materialKey">
|
||||
<el-select
|
||||
v-model="stockInForm.materialKey"
|
||||
@@ -461,13 +483,13 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="入库编号" prop="stockInNo">
|
||||
<el-input v-model="stockInForm.stockInNo" placeholder="请输入入库编号" />
|
||||
<el-input v-model="stockInForm.stockInNo" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入库日期" prop="stockInDate">
|
||||
<el-date-picker
|
||||
v-model="stockInForm.stockInDate"
|
||||
type="date"
|
||||
placeholder="选择入库日期"
|
||||
placeholder="可选"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 100%"
|
||||
/>
|
||||
@@ -476,19 +498,19 @@
|
||||
<el-date-picker
|
||||
v-model="stockInForm.expireDate"
|
||||
type="date"
|
||||
placeholder="选择过期日期"
|
||||
placeholder="可选"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货号" prop="catalogNo">
|
||||
<el-input v-model="stockInForm.catalogNo" placeholder="请输入货号" />
|
||||
<el-input v-model="stockInForm.catalogNo" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="批号" prop="batchNo">
|
||||
<el-input v-model="stockInForm.batchNo" placeholder="请输入批号" />
|
||||
<el-input v-model="stockInForm.batchNo" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="厂家" prop="manufacturer">
|
||||
<el-input v-model="stockInForm.manufacturer" placeholder="请输入厂家" />
|
||||
<el-input v-model="stockInForm.manufacturer" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="单位">
|
||||
<el-select
|
||||
@@ -519,7 +541,7 @@
|
||||
<el-form-item label="入库数量" prop="qty">
|
||||
<DecimalInput
|
||||
v-model="stockInForm.qty"
|
||||
:min="0.01"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
style="width: 100%"
|
||||
@change="onSingleStockInPriceQtyChange"
|
||||
@@ -529,7 +551,7 @@
|
||||
<AmountInput
|
||||
v-model="stockInForm.unitPrice"
|
||||
:min="0"
|
||||
placeholder="请输入单价"
|
||||
placeholder="可选"
|
||||
@change="onSingleStockInPriceQtyChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -537,7 +559,7 @@
|
||||
<AmountInput
|
||||
v-model="stockInForm.amount"
|
||||
:min="0"
|
||||
placeholder="自动计算:单价 × 数量"
|
||||
placeholder="可选,可自动计算:单价 × 数量"
|
||||
@change="stockInForm.amountManual = true"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -584,6 +606,28 @@
|
||||
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
||||
>
|
||||
<div class="form-grid-2 batch-stock-move-head">
|
||||
<el-form-item label="经办人" prop="operator">
|
||||
<el-select
|
||||
v-model="batchStockInForm.operator"
|
||||
placeholder="请选择经办人"
|
||||
clearable
|
||||
filterable
|
||||
remote
|
||||
allow-create
|
||||
default-first-option
|
||||
reserve-keyword
|
||||
:loading="receiverUserLoading"
|
||||
:remote-method="searchReceiverUsers"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="u in receiverUserOptions"
|
||||
:key="u.id"
|
||||
:label="formatReceiverUserLabel(u)"
|
||||
:value="(u.nickName || '').trim()"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="入库时间" prop="stockInTime">
|
||||
<el-date-picker
|
||||
v-model="batchStockInForm.stockInTime"
|
||||
@@ -665,7 +709,7 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="入库编号">
|
||||
<el-input v-model="row.stockInNo" size="small" placeholder="必填" />
|
||||
<el-input v-model="row.stockInNo" size="small" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入库日期">
|
||||
<el-date-picker
|
||||
@@ -673,7 +717,7 @@
|
||||
size="small"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="日期"
|
||||
placeholder="可选"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -683,24 +727,24 @@
|
||||
size="small"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
placeholder="必填"
|
||||
placeholder="可选"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货号">
|
||||
<el-input v-model="row.catalogNo" size="small" placeholder="必填" />
|
||||
<el-input v-model="row.catalogNo" size="small" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="批号">
|
||||
<el-input v-model="row.batchNo" size="small" placeholder="必填" />
|
||||
<el-input v-model="row.batchNo" size="small" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="厂家">
|
||||
<el-input v-model="row.manufacturer" size="small" placeholder="必填" />
|
||||
<el-input v-model="row.manufacturer" size="small" placeholder="可选" />
|
||||
</el-form-item>
|
||||
<el-form-item label="数量">
|
||||
<DecimalInput
|
||||
v-model="row.qty"
|
||||
size="small"
|
||||
:min="0.01"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
style="width: 100%"
|
||||
@change="() => onBatchInLinePriceQtyChange(row)"
|
||||
@@ -767,6 +811,28 @@
|
||||
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
||||
>
|
||||
<div class="form-grid-2 batch-stock-move-head">
|
||||
<el-form-item label="经办人" prop="operator">
|
||||
<el-select
|
||||
v-model="batchStockOutForm.operator"
|
||||
placeholder="请选择经办人"
|
||||
clearable
|
||||
filterable
|
||||
remote
|
||||
allow-create
|
||||
default-first-option
|
||||
reserve-keyword
|
||||
:loading="receiverUserLoading"
|
||||
:remote-method="searchReceiverUsers"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="u in receiverUserOptions"
|
||||
:key="u.id"
|
||||
:label="formatReceiverUserLabel(u)"
|
||||
:value="(u.nickName || '').trim()"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="出库时间" prop="stockOutTime">
|
||||
<el-date-picker
|
||||
v-model="batchStockOutForm.stockOutTime"
|
||||
@@ -959,6 +1025,28 @@
|
||||
:scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
|
||||
>
|
||||
<div class="form-grid-2 batch-stock-move-head">
|
||||
<el-form-item label="经办人" prop="operator">
|
||||
<el-select
|
||||
v-model="batchDiscardForm.operator"
|
||||
placeholder="请选择经办人"
|
||||
clearable
|
||||
filterable
|
||||
remote
|
||||
allow-create
|
||||
default-first-option
|
||||
reserve-keyword
|
||||
:loading="receiverUserLoading"
|
||||
:remote-method="searchReceiverUsers"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="u in receiverUserOptions"
|
||||
:key="u.id"
|
||||
:label="formatReceiverUserLabel(u)"
|
||||
:value="(u.nickName || '').trim()"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="废弃时间" prop="discardTime">
|
||||
<el-date-picker
|
||||
v-model="batchDiscardForm.discardTime"
|
||||
@@ -1143,6 +1231,9 @@
|
||||
<el-table-column label="领用人" min-width="90" align="center" header-align="center">
|
||||
<template #default="{ row }">{{ row.receiver || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="经办人" min-width="90" align="center" header-align="center">
|
||||
<template #default="{ row }">{{ row.operatorName || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="用途" min-width="120" align="center" header-align="center" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ row.purpose || row.remark || '—' }}</template>
|
||||
</el-table-column>
|
||||
@@ -1204,12 +1295,37 @@
|
||||
import { fetchMaterialUsageList, type MaterialUsage } from '@/api/material-usage'
|
||||
import { MATERIAL_DISCARD_REASONS } from '@/constants/material-discard'
|
||||
import { fetchAllPagedRecords } from '@/utils/fetch-paged-list'
|
||||
import { useUserStore } from '@/store/modules/user'
|
||||
import MaterialUsageTab from './MaterialUsageTab.vue'
|
||||
import MaterialStockCheckTab from './MaterialStockCheckTab.vue'
|
||||
|
||||
defineOptions({ name: 'CellStorageMaterial' })
|
||||
|
||||
const route = useRoute()
|
||||
const userStore = useUserStore()
|
||||
|
||||
function defaultOperatorName() {
|
||||
const info = userStore.info as Record<string, unknown>
|
||||
return String(info?.realName || info?.userName || info?.username || info?.nickName || '').trim()
|
||||
}
|
||||
|
||||
function ensureOperatorOption(name: string) {
|
||||
const v = name?.trim()
|
||||
if (!v) return
|
||||
if (!receiverUserOptions.value.some((u) => (u.nickName || '').trim() === v)) {
|
||||
receiverUserOptions.value = [
|
||||
{ id: `local-op-${v}`, nickName: v, userNo: '', phoneNo: '' } as Api.User.UserItem,
|
||||
...receiverUserOptions.value
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
function initOperatorField(target: { operator: string }) {
|
||||
const name = defaultOperatorName()
|
||||
target.operator = name
|
||||
ensureOperatorOption(name)
|
||||
void searchReceiverUsers('')
|
||||
}
|
||||
|
||||
const MATERIAL_TABS = [
|
||||
{ name: 'list', label: '物料列表' },
|
||||
@@ -1347,14 +1463,6 @@
|
||||
})
|
||||
|
||||
const formRules = {
|
||||
stockInNo: [{ required: true, message: '请输入入库编号', trigger: 'blur' }],
|
||||
stockInDate: [{ required: true, message: '请选择入库日期', trigger: 'change' }],
|
||||
expireDate: [{ required: true, message: '请选择过期日期', trigger: 'change' }],
|
||||
catalogNo: [{ required: true, message: '请输入货号', trigger: 'blur' }],
|
||||
batchNo: [{ required: true, message: '请输入批号', trigger: 'blur' }],
|
||||
manufacturer: [{ required: true, message: '请输入厂家', trigger: 'blur' }],
|
||||
unitPrice: [{ required: true, message: '请输入单价', trigger: 'change' }],
|
||||
amount: [{ required: true, message: '请输入金额', trigger: 'change' }],
|
||||
materialCode: [{ required: true, message: '请输入物料编码', trigger: 'blur' }],
|
||||
materialName: [{ required: true, message: '请输入物料名称', trigger: 'blur' }]
|
||||
}
|
||||
@@ -1380,6 +1488,7 @@
|
||||
amount: 0 as number | null,
|
||||
amountManual: false,
|
||||
qty: 1,
|
||||
operator: '',
|
||||
remark: ''
|
||||
})
|
||||
|
||||
@@ -1408,15 +1517,7 @@
|
||||
trigger: 'blur'
|
||||
}
|
||||
],
|
||||
stockInNo: [{ required: true, message: '请输入入库编号', trigger: 'blur' }],
|
||||
stockInDate: [{ required: true, message: '请选择入库日期', trigger: 'change' }],
|
||||
expireDate: [{ required: true, message: '请选择过期日期', trigger: 'change' }],
|
||||
catalogNo: [{ required: true, message: '请输入货号', trigger: 'blur' }],
|
||||
batchNo: [{ required: true, message: '请输入批号', trigger: 'blur' }],
|
||||
manufacturer: [{ required: true, message: '请输入厂家', trigger: 'blur' }],
|
||||
unitPrice: [{ required: true, message: '请输入单价', trigger: 'change' }],
|
||||
amount: [{ required: true, message: '请输入金额', trigger: 'change' }],
|
||||
qty: [{ required: true, message: '请输入入库数量', trigger: 'blur' }]
|
||||
operator: [{ required: true, message: '请选择经办人', trigger: 'change' }]
|
||||
}
|
||||
|
||||
function formatReceiverUserLabel(u: Api.User.UserItem) {
|
||||
@@ -1478,11 +1579,13 @@
|
||||
const batchStockInLines = ref<BatchStockInLine[]>([])
|
||||
const batchStockInForm = reactive({
|
||||
stockInTime: '',
|
||||
operator: '',
|
||||
remark: ''
|
||||
})
|
||||
|
||||
const batchStockInRules = {
|
||||
stockInTime: [{ required: true, message: '请选择入库时间', trigger: 'change' }]
|
||||
stockInTime: [{ required: true, message: '请选择入库时间', trigger: 'change' }],
|
||||
operator: [{ required: true, message: '请选择经办人', trigger: 'change' }]
|
||||
}
|
||||
|
||||
// 批量出库
|
||||
@@ -1503,6 +1606,7 @@
|
||||
const batchStockOutLines = ref<BatchStockOutLine[]>([])
|
||||
const batchStockOutForm = reactive({
|
||||
stockOutTime: '',
|
||||
operator: '',
|
||||
receiver: '',
|
||||
purpose: '',
|
||||
remark: ''
|
||||
@@ -1513,6 +1617,7 @@
|
||||
|
||||
const batchStockOutRules = {
|
||||
stockOutTime: [{ required: true, message: '请选择出库时间', trigger: 'change' }],
|
||||
operator: [{ required: true, message: '请选择经办人', trigger: 'change' }],
|
||||
receiver: [{ required: true, message: '请选择领用人', trigger: 'change' }]
|
||||
}
|
||||
|
||||
@@ -1534,12 +1639,14 @@
|
||||
const batchDiscardLines = ref<BatchDiscardLine[]>([])
|
||||
const batchDiscardForm = reactive({
|
||||
discardTime: '',
|
||||
operator: '',
|
||||
discardReason: '',
|
||||
remark: ''
|
||||
})
|
||||
|
||||
const batchDiscardRules = {
|
||||
discardTime: [{ required: true, message: '请选择废弃时间', trigger: 'change' }],
|
||||
operator: [{ required: true, message: '请选择经办人', trigger: 'change' }],
|
||||
discardReason: [{ required: true, message: '请选择废弃原因', trigger: 'change' }],
|
||||
remark: [
|
||||
{
|
||||
@@ -1906,6 +2013,7 @@
|
||||
stockInForm.amount = null
|
||||
stockInForm.amountManual = false
|
||||
stockInForm.qty = 1
|
||||
stockInForm.operator = defaultOperatorName()
|
||||
stockInForm.remark = ''
|
||||
}
|
||||
|
||||
@@ -1916,6 +2024,7 @@
|
||||
|
||||
function handleOpenStockIn() {
|
||||
resetStockInForm()
|
||||
initOperatorField(stockInForm)
|
||||
stockInVisible.value = true
|
||||
void searchMaterialOptions('')
|
||||
stockInFormRef.value?.clearValidate?.()
|
||||
@@ -1937,6 +2046,7 @@
|
||||
amount: Number(stockInForm.amount) || 0,
|
||||
qty: stockInForm.qty,
|
||||
stockInTime: formatNowDatetime(),
|
||||
operatorName: stockInForm.operator?.trim() || undefined,
|
||||
remark: stockInForm.remark?.trim() || undefined
|
||||
})
|
||||
ElMessage.success('入库成功')
|
||||
@@ -2081,6 +2191,7 @@
|
||||
batchDiscardForm.discardTime = formatNowDatetime()
|
||||
batchDiscardForm.discardReason = ''
|
||||
batchDiscardForm.remark = ''
|
||||
initOperatorField(batchDiscardForm)
|
||||
batchDiscardVisible.value = true
|
||||
void searchBatchOptions('')
|
||||
void searchUnitOptions('')
|
||||
@@ -2134,6 +2245,7 @@
|
||||
remark: l.remark?.trim() || undefined
|
||||
})),
|
||||
discardReason: batchDiscardForm.discardReason?.trim() || '',
|
||||
operatorName: batchDiscardForm.operator?.trim() || undefined,
|
||||
remark: batchDiscardForm.remark?.trim() || undefined,
|
||||
discardTime: batchDiscardForm.discardTime || undefined
|
||||
})
|
||||
@@ -2151,6 +2263,7 @@
|
||||
batchStockInLines.value = [newBatchStockInLine()]
|
||||
batchStockInForm.stockInTime = formatNowDatetime()
|
||||
batchStockInForm.remark = ''
|
||||
initOperatorField(batchStockInForm)
|
||||
batchStockInVisible.value = true
|
||||
void searchMaterialOptions('')
|
||||
batchStockInFormRef.value?.clearValidate?.()
|
||||
@@ -2167,30 +2280,6 @@
|
||||
ElMessage.warning('请选择物资')
|
||||
return
|
||||
}
|
||||
if (!line.stockInNo?.trim()) {
|
||||
ElMessage.warning('请填写入库编号')
|
||||
return
|
||||
}
|
||||
if (!line.stockInDate) {
|
||||
ElMessage.warning('请选择入库日期')
|
||||
return
|
||||
}
|
||||
if (!line.expireDate) {
|
||||
ElMessage.warning('请选择过期日期')
|
||||
return
|
||||
}
|
||||
if (!line.catalogNo?.trim() || !line.batchNo?.trim() || !line.manufacturer?.trim()) {
|
||||
ElMessage.warning('请填写货号、批号、厂家')
|
||||
return
|
||||
}
|
||||
if (line.unitPrice == null || line.amount == null) {
|
||||
ElMessage.warning('请填写单价和金额')
|
||||
return
|
||||
}
|
||||
if (!line.qty || line.qty <= 0) {
|
||||
ElMessage.warning('入库数量必须大于 0')
|
||||
return
|
||||
}
|
||||
}
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
@@ -2218,6 +2307,7 @@
|
||||
remark: l.remark?.trim() || undefined
|
||||
})),
|
||||
stockInTime: batchStockInForm.stockInTime || undefined,
|
||||
operatorName: batchStockInForm.operator?.trim() || undefined,
|
||||
remark: batchStockInForm.remark?.trim() || undefined
|
||||
})
|
||||
ElMessage.success(`批量入库成功,共 ${res.count ?? batchStockInLines.value.length} 项`)
|
||||
@@ -2236,6 +2326,7 @@
|
||||
batchStockOutForm.receiver = ''
|
||||
batchStockOutForm.purpose = ''
|
||||
batchStockOutForm.remark = ''
|
||||
initOperatorField(batchStockOutForm)
|
||||
batchStockOutVisible.value = true
|
||||
void searchReceiverUsers('')
|
||||
void searchBatchOptions('')
|
||||
@@ -2286,6 +2377,7 @@
|
||||
remark: l.remark?.trim() || undefined
|
||||
})),
|
||||
stockOutTime: batchStockOutForm.stockOutTime || undefined,
|
||||
operatorName: batchStockOutForm.operator?.trim() || undefined,
|
||||
receiver: batchStockOutForm.receiver?.trim() || undefined,
|
||||
purpose: batchStockOutForm.purpose?.trim() || undefined,
|
||||
remark: batchStockOutForm.remark?.trim() || undefined
|
||||
|
||||
@@ -34,13 +34,41 @@
|
||||
scroll-to-error
|
||||
class="protocol-form"
|
||||
>
|
||||
<!-- Tab 1: 基本信息 -->
|
||||
<div id="form-section-basic" class="form-tab-pane">
|
||||
<!-- Tab 1: 基本信息(新增时左侧一键导入、右侧基本信息) -->
|
||||
<div
|
||||
id="form-section-basic"
|
||||
class="form-tab-pane"
|
||||
:class="{ 'form-tab-pane--import-basic': !isEdit }"
|
||||
>
|
||||
<div v-if="!isEdit" class="section-card section-card--import">
|
||||
<div class="section-title">
|
||||
<div class="section-title-left"><h3>一键导入</h3></div>
|
||||
</div>
|
||||
<el-form-item label="标准信息">
|
||||
<el-input
|
||||
v-model="standardImportText"
|
||||
type="textarea"
|
||||
:rows="12"
|
||||
placeholder="请粘贴标准格式信息,点击「一键导入」填充各 Tab 字段"
|
||||
/>
|
||||
</el-form-item>
|
||||
<div class="import-actions">
|
||||
<el-button
|
||||
class="btn-main"
|
||||
type="primary"
|
||||
:loading="standardImportLoading"
|
||||
@click="handleStandardImport"
|
||||
>
|
||||
<el-icon><Upload /></el-icon>
|
||||
一键导入
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="section-card">
|
||||
<div class="section-title">
|
||||
<div class="section-title-left"><h3>基本信息</h3></div>
|
||||
</div>
|
||||
<div class="form-grid form-grid--col4">
|
||||
<div class="form-grid" :class="isEdit ? 'form-grid--col4' : 'form-grid--col2'">
|
||||
<el-form-item label="协议状态" prop="protocolStatus">
|
||||
<el-select
|
||||
v-model="formData.protocolStatus"
|
||||
@@ -673,13 +701,12 @@
|
||||
<div class="detail-body-inner">
|
||||
<div class="form-grid form-grid--col4">
|
||||
<el-form-item label="应缴费金额(元)">
|
||||
<el-input
|
||||
<AmountInput
|
||||
v-model="detail.dueAmount"
|
||||
type="number"
|
||||
step="any"
|
||||
:min="0"
|
||||
disabled
|
||||
style="width: 100%"
|
||||
:disabled="isPayDetailLocked(detail)"
|
||||
placeholder="请输入应缴费金额"
|
||||
@change="onPaymentDetailDueAmountChange(dIdx)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="转账方式">
|
||||
@@ -891,7 +918,8 @@
|
||||
Loading,
|
||||
Download,
|
||||
ArrowDown,
|
||||
ArrowRight
|
||||
ArrowRight,
|
||||
Upload
|
||||
} from '@element-plus/icons-vue'
|
||||
import {
|
||||
fetchCollectionProtocolDetail,
|
||||
@@ -906,6 +934,17 @@
|
||||
useIndexedAttachmentDropZone
|
||||
} from '@/composables/useAttachmentDropZone'
|
||||
import { formatDatetimeToMinute } from '@/utils/chinese-datetime-parse'
|
||||
import {
|
||||
matchExpressCompany,
|
||||
matchSampleTypeByExactName
|
||||
} from '@/utils/donation-standard-import-parse'
|
||||
import {
|
||||
parseProtocolStandardImportText,
|
||||
resolveTransferTypeCode,
|
||||
isBlankString,
|
||||
matchCellSampleType,
|
||||
type ProtocolStandardImportParsed
|
||||
} from '@/utils/protocol-standard-import-parse'
|
||||
import {
|
||||
fetchCustomerList,
|
||||
fetchUserList,
|
||||
@@ -914,6 +953,7 @@
|
||||
fetchItemUnitList,
|
||||
fetchCollectionRegionList,
|
||||
fetchHospitalList,
|
||||
fetchSearchCollectionHospitals,
|
||||
fetchSampleCodeList,
|
||||
fetchExpressCompanyList,
|
||||
fetchSiteList
|
||||
@@ -1165,6 +1205,8 @@
|
||||
const dialogFormLoading = ref(false)
|
||||
const dialogTitle = ref('新增协议单')
|
||||
const isEdit = ref(false)
|
||||
const standardImportText = ref('')
|
||||
const standardImportLoading = ref(false)
|
||||
const submitLoading = ref(false)
|
||||
const editingId = ref<string | null>(null)
|
||||
const formRef = ref()
|
||||
@@ -1302,6 +1344,7 @@
|
||||
expressCompanyOptions.value = []
|
||||
activeFormTab.value = 'basic'
|
||||
lastConfirmedPayMode.value = 'dj'
|
||||
standardImportText.value = ''
|
||||
lastConfirmedFqParams.value = {
|
||||
installmentCount: null,
|
||||
installmentIntervalMonths: null,
|
||||
@@ -1862,7 +1905,6 @@
|
||||
submitLoading.value = true
|
||||
try {
|
||||
syncFqPaymentDetailRowCount(fqPaymentContext(), formData.paymentDetails)
|
||||
syncPaymentDueAmounts()
|
||||
const protocolAttachmentUrls = formData.attachments
|
||||
.map((a) => a.fileUrl)
|
||||
.filter(Boolean)
|
||||
@@ -2246,6 +2288,527 @@
|
||||
ensureSitesInOptions(formData.samples)
|
||||
}
|
||||
|
||||
function formatNowDatetime(): string {
|
||||
const now = new Date()
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
return `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
|
||||
}
|
||||
|
||||
/** 一键导入前清空上次导入/手填的可覆盖字段(保留协议状态、登记日期、附件等) */
|
||||
function clearFormBeforeStandardImport() {
|
||||
customerId.value = null
|
||||
customerSnapshot.value = null
|
||||
customerOptions.value = []
|
||||
formData.customerId = ''
|
||||
formData.motherName = ''
|
||||
formData.motherPhone = ''
|
||||
formData.motherIdCard = ''
|
||||
formData.motherBirthYm = ''
|
||||
formData.motherEmail = ''
|
||||
formData.motherAddress = ''
|
||||
|
||||
formData.fatherName = ''
|
||||
formData.fatherPhone = ''
|
||||
formData.fatherIdCard = ''
|
||||
formData.newbornName = ''
|
||||
formData.newbornIdCard = ''
|
||||
formData.expectedDeliveryDate = ''
|
||||
|
||||
formData.newbornSex = ''
|
||||
formData.newbornWeightGram = null
|
||||
formData.apgar1min = null
|
||||
formData.apgar5min = null
|
||||
formData.newbornDeliveryTime = ''
|
||||
formData.deliveryMode = ''
|
||||
formData.birthOrder = null
|
||||
|
||||
formData.regionId = ''
|
||||
formData.hospitalId = ''
|
||||
formData.medicalStaff = ''
|
||||
formData.sampleCollectTime = ''
|
||||
formData.maternalBloodCollectTime = ''
|
||||
regionOptions.value = []
|
||||
hospitalOptions.value = []
|
||||
|
||||
collectorUserId.value = null
|
||||
collectorSnapshot.value = null
|
||||
collectorUserOptions.value = []
|
||||
formData.collectorUserId = ''
|
||||
|
||||
salesUserId.value = null
|
||||
salesSnapshot.value = null
|
||||
salesUserOptions.value = []
|
||||
formData.salesUserId = ''
|
||||
|
||||
formData.samples = []
|
||||
sampleCodeOptions.value = []
|
||||
siteOptions.value = []
|
||||
expressCompanyOptions.value = []
|
||||
|
||||
formData.payMode = 'dj'
|
||||
formData.contractAmount = null
|
||||
formData.lumpSumDeadline = ''
|
||||
formData.installmentCount = null
|
||||
formData.installmentIntervalMonths = null
|
||||
formData.installmentStartDate = ''
|
||||
formData.installmentAdvanceDays = DEFAULT_INSTALLMENT_ADVANCE_DAYS
|
||||
formData.installmentRatios = []
|
||||
formData.paymentDetails = []
|
||||
lastConfirmedPayMode.value = 'dj'
|
||||
lastConfirmedFqParams.value = {
|
||||
installmentCount: null,
|
||||
installmentIntervalMonths: null,
|
||||
installmentStartDate: '',
|
||||
installmentAdvanceDays: DEFAULT_INSTALLMENT_ADVANCE_DAYS,
|
||||
installmentRatios: [] as number[]
|
||||
}
|
||||
|
||||
formData.remark = ''
|
||||
}
|
||||
|
||||
async function applyMotherByName(name: string): Promise<'linked' | 'name-only' | 'skipped'> {
|
||||
const keyword = (name || '').trim()
|
||||
if (!keyword) return 'skipped'
|
||||
if (!isBlankString(formData.customerId)) return 'skipped'
|
||||
if (!isBlankString(formData.motherName)) return 'skipped'
|
||||
|
||||
try {
|
||||
const res = await fetchCustomerList({ page: 1, pageSize: 50, keyword })
|
||||
const list = res.list || []
|
||||
const match =
|
||||
list.find((c) => c.customerName === keyword) ||
|
||||
list.find((c) => (c.customerName || '').includes(keyword))
|
||||
if (match) {
|
||||
customerOptions.value = [match, ...list.filter((c) => c.id !== match.id)]
|
||||
onCustomerChange(match.id)
|
||||
return 'linked'
|
||||
}
|
||||
formData.motherName = keyword
|
||||
return 'name-only'
|
||||
} catch {
|
||||
formData.motherName = keyword
|
||||
return 'name-only'
|
||||
}
|
||||
}
|
||||
|
||||
async function applyHospitalByName(name: string): Promise<boolean> {
|
||||
const keyword = (name || '').trim()
|
||||
if (!keyword || !isBlankString(formData.hospitalId)) return false
|
||||
try {
|
||||
const res = await fetchSearchCollectionHospitals({ keyword, limit: 20 })
|
||||
const list = res.list || []
|
||||
const match =
|
||||
list.find((h) => h.hospitalName === keyword) ||
|
||||
list.find((h) => (h.hospitalName || '').includes(keyword)) ||
|
||||
list[0]
|
||||
if (!match) return false
|
||||
|
||||
const regionStub: Api.BizCollectionRegion.RegionItem = {
|
||||
id: match.regionId,
|
||||
regionName: match.regionName || match.regionId,
|
||||
hospitalNames: [],
|
||||
tenantNo: match.tenantNo || '',
|
||||
orderNum: 0,
|
||||
remark: '',
|
||||
createTime: '',
|
||||
updateTime: ''
|
||||
}
|
||||
if (!regionOptions.value.some((r) => r.id === match.regionId)) {
|
||||
regionOptions.value = [regionStub, ...regionOptions.value]
|
||||
}
|
||||
formData.regionId = match.regionId
|
||||
await loadHospitalsByRegion(match.regionId, keyword)
|
||||
if (!hospitalOptions.value.some((h) => h.id === match.id)) {
|
||||
hospitalOptions.value = [match, ...hospitalOptions.value]
|
||||
}
|
||||
formData.hospitalId = match.id
|
||||
return true
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
async function applySalesUserByName(name: string): Promise<boolean> {
|
||||
const keyword = (name || '').trim()
|
||||
if (!keyword) return false
|
||||
try {
|
||||
const res = await fetchUserList({
|
||||
page: 1,
|
||||
pageSize: 50,
|
||||
keyword,
|
||||
status: '1'
|
||||
})
|
||||
const list = res.list || []
|
||||
const match =
|
||||
list.find((u) => u.nickName === keyword) ||
|
||||
list.find((u) => (u.nickName || '').includes(keyword))
|
||||
if (!match) return false
|
||||
applyUserToCollector(match)
|
||||
applyUserToSales(match)
|
||||
return true
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
function applyUserToCollector(u: Api.User.UserItem) {
|
||||
collectorSnapshot.value = { ...u }
|
||||
collectorUserId.value = u.id
|
||||
formData.collectorUserId = u.id
|
||||
if (!collectorUserOptions.value.some((x) => x.id === u.id)) {
|
||||
collectorUserOptions.value = [u, ...collectorUserOptions.value]
|
||||
}
|
||||
}
|
||||
|
||||
function applyUserToSales(u: Api.User.UserItem) {
|
||||
salesSnapshot.value = { ...u }
|
||||
salesUserId.value = u.id
|
||||
formData.salesUserId = u.id
|
||||
if (!salesUserOptions.value.some((x) => x.id === u.id)) {
|
||||
salesUserOptions.value = [u, ...salesUserOptions.value]
|
||||
}
|
||||
}
|
||||
|
||||
async function resolveSampleCodeByCode(code: string) {
|
||||
const keyword = (code || '').trim()
|
||||
if (!keyword) return null
|
||||
const res = await fetchSampleCodeList({ page: 1, pageSize: 50, keyword })
|
||||
const list = (res.list || []) as Api.BizSampleCode.SampleCodeItem[]
|
||||
return (
|
||||
list.find((sc) => sc.sampleCode === keyword) ||
|
||||
list.find((sc) => String(sc.sampleCode || '').includes(keyword)) ||
|
||||
null
|
||||
)
|
||||
}
|
||||
|
||||
function applyParsedTransportToSample(
|
||||
sample: Record<string, any>,
|
||||
parsed: ProtocolStandardImportParsed,
|
||||
warnings: string[],
|
||||
filledLabels: string[]
|
||||
) {
|
||||
if (!parsed.transportType) return
|
||||
|
||||
const transport = { ...(sample.transport || createEmptyTransport()) }
|
||||
let transportFilled = false
|
||||
|
||||
if (isBlankString(transport.transportType)) {
|
||||
transport.transportType = parsed.transportType
|
||||
transportFilled = true
|
||||
}
|
||||
if (isBlankString(transport.destSiteId) && siteOptions.value.length) {
|
||||
const site = siteOptions.value[0]
|
||||
transport.destSiteId = site.id
|
||||
transportFilled = true
|
||||
}
|
||||
if (parsed.etaTime && isBlankString(transport.etaTime)) {
|
||||
transport.etaTime = parsed.etaTime
|
||||
transportFilled = true
|
||||
} else if (isBlankString(transport.etaTime)) {
|
||||
transport.etaTime = formatNowDatetime()
|
||||
transportFilled = true
|
||||
}
|
||||
if (parsed.transportType === 'kdys' && isBlankString(transport.expressCompanyId)) {
|
||||
const ec = matchExpressCompany(
|
||||
parsed.transportModeText || '顺丰快递',
|
||||
expressCompanyOptions.value
|
||||
)
|
||||
if (ec) {
|
||||
transport.expressCompanyId = ec.id
|
||||
if (!expressCompanyOptions.value.some((x) => x.id === ec.id)) {
|
||||
expressCompanyOptions.value = [ec, ...expressCompanyOptions.value]
|
||||
}
|
||||
transportFilled = true
|
||||
} else {
|
||||
warnings.push(`未找到快递公司「${parsed.transportModeText || ''}」`)
|
||||
}
|
||||
}
|
||||
if (parsed.transportType === 'ryxd' && parsed.carrierName && isBlankString(transport.carrierName)) {
|
||||
transport.carrierName = parsed.carrierName
|
||||
transportFilled = true
|
||||
}
|
||||
sample.transport = transport
|
||||
if (transportFilled) filledLabels.push('运输信息')
|
||||
}
|
||||
|
||||
async function applySampleHintsFromImport(
|
||||
parsed: ProtocolStandardImportParsed,
|
||||
warnings: string[],
|
||||
filledLabels: string[]
|
||||
) {
|
||||
let hints = parsed.sampleHints
|
||||
if (!hints.length) {
|
||||
const matched = matchCellSampleType(parsed.sampleTypeHeader, sampleTypeOptions.value)
|
||||
if (matched) {
|
||||
hints = [{ typeKey: 'hsc', typeName: matched.typeName }]
|
||||
}
|
||||
}
|
||||
|
||||
for (const hint of hints) {
|
||||
const matchedType = matchSampleTypeByExactName(hint.typeName, sampleTypeOptions.value)
|
||||
const sample = normalizeSampleRow({ sampleTypeId: '', sampleStatus: 'ycj' }, formData.samples.length)
|
||||
formData.samples.push(sample)
|
||||
|
||||
if (matchedType) {
|
||||
sample.sampleTypeId = matchedType.id
|
||||
sample.storageYears = matchedType.storageYears ?? null
|
||||
sample.originalPrice = matchedType.storagePrice ?? null
|
||||
sample.price = matchedType.storagePrice ?? null
|
||||
if (!sampleTypeOptions.value.some((x) => x.id === matchedType.id)) {
|
||||
sampleTypeOptions.value = [matchedType, ...sampleTypeOptions.value]
|
||||
}
|
||||
filledLabels.push(hint.typeName)
|
||||
} else {
|
||||
warnings.push(`无法匹配样本类型「${hint.typeName}」`)
|
||||
}
|
||||
|
||||
if (hint.sampleCode) {
|
||||
const sc = await resolveSampleCodeByCode(hint.sampleCode)
|
||||
if (sc) {
|
||||
sample.sampleCodeId = sc.id
|
||||
sample.sampleCode = sc.sampleCode
|
||||
if (!sampleCodeOptions.value.some((x) => x.id === sc.id)) {
|
||||
sampleCodeOptions.value = [sc, ...sampleCodeOptions.value]
|
||||
}
|
||||
filledLabels.push('样本编码')
|
||||
} else {
|
||||
warnings.push(`未找到样本编码「${hint.sampleCode}」`)
|
||||
}
|
||||
}
|
||||
|
||||
applyParsedTransportToSample(sample, parsed, warnings, filledLabels)
|
||||
}
|
||||
}
|
||||
|
||||
function syncFormSamplesAfterImport() {
|
||||
formData.samples = formData.samples.map((s, i) =>
|
||||
normalizeSampleRow(
|
||||
{
|
||||
...s,
|
||||
transport: s.transport ? { ...s.transport } : undefined
|
||||
},
|
||||
i
|
||||
)
|
||||
)
|
||||
hydrateSampleLookupOptions()
|
||||
}
|
||||
|
||||
function applyPaymentFromImport(parsed: ProtocolStandardImportParsed, warnings: string[]) {
|
||||
formData.payMode = parsed.payMode || 'dj'
|
||||
lastConfirmedPayMode.value = formData.payMode as PayMode
|
||||
|
||||
if (parsed.payMode === 'fq') {
|
||||
applyFqPaymentDefaults()
|
||||
}
|
||||
|
||||
if (parsed.contractAmount != null) {
|
||||
formData.contractAmount = parsed.contractAmount
|
||||
}
|
||||
|
||||
const transferTypeCode = resolveTransferTypeCode(
|
||||
parsed.transferTypeLabel || '',
|
||||
transferTypeOptions.value
|
||||
)
|
||||
if (parsed.transferTypeLabel && !transferTypeCode) {
|
||||
warnings.push(`无法匹配转账方式「${parsed.transferTypeLabel}」`)
|
||||
}
|
||||
|
||||
const now = new Date()
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
const defaultTime = `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())} ${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`
|
||||
|
||||
formData.paymentDetails = []
|
||||
const transfers = parsed.paymentTransfers.filter((t) => t.transferAmount > 0)
|
||||
|
||||
if (transfers.length) {
|
||||
transfers.forEach((t, i) => {
|
||||
formData.paymentDetails.push({
|
||||
transferType: transferTypeCode,
|
||||
dueAmount: t.transferAmount,
|
||||
transferAmount: t.transferAmount,
|
||||
transferTime: t.transferTime || defaultTime,
|
||||
payStatus: 'dfj',
|
||||
installmentDueDate: formData.payMode === 'dj' ? formData.lumpSumDeadline : '',
|
||||
_expanded: i === 0,
|
||||
attachments: []
|
||||
})
|
||||
})
|
||||
} else if (formData.payMode === 'dj' && formData.contractAmount != null) {
|
||||
addPaymentDetail()
|
||||
const detail = formData.paymentDetails[0]
|
||||
if (detail) {
|
||||
detail.transferType = transferTypeCode
|
||||
detail.dueAmount = formData.contractAmount
|
||||
detail.transferAmount = formData.contractAmount
|
||||
}
|
||||
}
|
||||
|
||||
initPaymentDetailExpandFlags(formData.paymentDetails)
|
||||
markPayDetailLocks(formData.paymentDetails)
|
||||
if (!transfers.length && !(formData.payMode === 'dj' && formData.contractAmount != null)) {
|
||||
syncPaymentDueAmounts()
|
||||
}
|
||||
|
||||
if (parsed.contractAmount != null && transfers.length) {
|
||||
const sum = transfers.reduce((acc, t) => acc + Number(t.transferAmount || 0), 0)
|
||||
if (Math.abs(sum - Number(parsed.contractAmount)) > 0.01) {
|
||||
warnings.push(
|
||||
`转账合计 ${sum} 与合同金额 ${parsed.contractAmount} 不一致,请核对缴费明细`
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function handleStandardImport() {
|
||||
const parsed = parseProtocolStandardImportText(standardImportText.value)
|
||||
if (!parsed) {
|
||||
ElMessage.warning('请粘贴有效的标准信息')
|
||||
return
|
||||
}
|
||||
|
||||
standardImportLoading.value = true
|
||||
const warnings: string[] = []
|
||||
const filledLabels: string[] = []
|
||||
|
||||
try {
|
||||
clearFormBeforeStandardImport()
|
||||
await ensureTransferTypeOptions()
|
||||
await remoteSearchSampleTypes('')
|
||||
|
||||
const tasks: Promise<void>[] = []
|
||||
|
||||
if (parsed.motherName) {
|
||||
tasks.push(
|
||||
applyMotherByName(parsed.motherName).then((result) => {
|
||||
if (result === 'linked') filledLabels.push('母亲信息(已关联客户)')
|
||||
else if (result === 'name-only') filledLabels.push('母亲姓名')
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
if (parsed.hospitalName) {
|
||||
tasks.push(
|
||||
applyHospitalByName(parsed.hospitalName).then((ok) => {
|
||||
if (ok) filledLabels.push('采集地区/采集医院')
|
||||
else if (isBlankString(formData.hospitalId)) {
|
||||
warnings.push(`未找到采集医院「${parsed.hospitalName}」`)
|
||||
}
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
if (parsed.salesUserName) {
|
||||
tasks.push(
|
||||
applySalesUserByName(parsed.salesUserName).then((ok) => {
|
||||
if (ok) filledLabels.push('采集专员/销售人员')
|
||||
else warnings.push(`未找到销售人员「${parsed.salesUserName}」`)
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
const needsTransport = !!parsed.transportType
|
||||
if (needsTransport) {
|
||||
tasks.push(remoteSearchSites('').then(() => undefined))
|
||||
if (parsed.transportType === 'kdys') {
|
||||
tasks.push(
|
||||
remoteSearchExpressCompanies(
|
||||
(parsed.transportModeText || '').replace(/快递$/, '') || '顺丰'
|
||||
).then(() => undefined)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
await Promise.all(tasks)
|
||||
|
||||
if (parsed.motherPhone) {
|
||||
formData.motherPhone = parsed.motherPhone
|
||||
filledLabels.push('孕妇电话')
|
||||
}
|
||||
if (parsed.newbornSex) {
|
||||
formData.newbornSex = parsed.newbornSex
|
||||
filledLabels.push('新生儿性别')
|
||||
}
|
||||
if (parsed.newbornWeightGram != null) {
|
||||
formData.newbornWeightGram = parsed.newbornWeightGram
|
||||
filledLabels.push('新生儿体重')
|
||||
}
|
||||
if (parsed.apgarScore != null) {
|
||||
formData.apgar1min = parsed.apgarScore
|
||||
filledLabels.push('新生儿评分')
|
||||
}
|
||||
if (parsed.newbornDeliveryTime) {
|
||||
formData.newbornDeliveryTime = parsed.newbornDeliveryTime
|
||||
filledLabels.push('新生儿分娩时间')
|
||||
}
|
||||
if (parsed.sampleCollectTime) {
|
||||
formData.sampleCollectTime = formatDatetimeToMinute(parsed.sampleCollectTime)
|
||||
filledLabels.push('样本采集时间')
|
||||
}
|
||||
if (parsed.maternalBloodExplicitEmpty) {
|
||||
formData.maternalBloodCollectTime = ''
|
||||
filledLabels.push('母血采集时间')
|
||||
} else if (parsed.maternalBloodCollectTime) {
|
||||
formData.maternalBloodCollectTime = formatDatetimeToMinute(parsed.maternalBloodCollectTime)
|
||||
filledLabels.push('母血采集时间')
|
||||
}
|
||||
if (parsed.deliveryMode) {
|
||||
formData.deliveryMode = parsed.deliveryMode
|
||||
filledLabels.push('分娩方式')
|
||||
}
|
||||
if (parsed.birthOrder != null) {
|
||||
formData.birthOrder = parsed.birthOrder
|
||||
filledLabels.push('胎次')
|
||||
}
|
||||
if (parsed.medicalStaff) {
|
||||
formData.medicalStaff = parsed.medicalStaff
|
||||
filledLabels.push('采集医护')
|
||||
}
|
||||
if (parsed.remark) {
|
||||
formData.remark = parsed.remark
|
||||
filledLabels.push('备注')
|
||||
}
|
||||
|
||||
await applySampleHintsFromImport(parsed, warnings, filledLabels)
|
||||
|
||||
if (formData.samples.length) {
|
||||
syncFormSamplesAfterImport()
|
||||
}
|
||||
|
||||
applyPaymentFromImport(parsed, warnings)
|
||||
|
||||
if (parsed.contractAmount != null) {
|
||||
filledLabels.push('合同金额')
|
||||
const sampleTotal = formData.samples.reduce(
|
||||
(sum, s) => sum + (Number(s.price) || 0),
|
||||
0
|
||||
)
|
||||
if (sampleTotal > 0 && Math.abs(sampleTotal - Number(parsed.contractAmount)) > 0.01) {
|
||||
warnings.push(
|
||||
`样本优惠价合计 ${sampleTotal} 与合同金额 ${parsed.contractAmount} 不一致,请核对样本价格`
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
if (parsed.transportModeText && !parsed.transportType) {
|
||||
warnings.push(`无法识别运输方式「${parsed.transportModeText}」`)
|
||||
}
|
||||
|
||||
const uniqueFilled = [...new Set(filledLabels)]
|
||||
if (uniqueFilled.length) {
|
||||
ElMessage.success(`已填充:${uniqueFilled.join('、')}`)
|
||||
} else if (!warnings.length) {
|
||||
ElMessage.info('没有可填充的字段')
|
||||
}
|
||||
if (warnings.length) {
|
||||
ElMessage.warning(warnings.join(';'))
|
||||
}
|
||||
} catch {
|
||||
ElMessage.error('导入失败,请检查标准信息格式')
|
||||
} finally {
|
||||
standardImportLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/* ====== 客户检索(母亲信息) ====== */
|
||||
function formatCustomerLabel(c: { customerName: string; phoneNo: string; idCardNo: string }) {
|
||||
const parts = [c.customerName || '']
|
||||
@@ -2554,6 +3117,20 @@
|
||||
handleFqParamsChange()
|
||||
}
|
||||
|
||||
/** 缴费明细应缴金额变更:分期模式下回写分期金额,保持与主表一致 */
|
||||
function onPaymentDetailDueAmountChange(dIdx: number) {
|
||||
if (formData.payMode !== 'fq') return
|
||||
const detail = formData.paymentDetails[dIdx]
|
||||
if (!detail || isPayDetailLocked(detail)) return
|
||||
const installmentNo = Number(detail.installmentNo)
|
||||
const ratioIdx = installmentNo >= 1 ? installmentNo - 1 : dIdx
|
||||
if (!formData.installmentRatios) formData.installmentRatios = []
|
||||
while (formData.installmentRatios.length <= ratioIdx) {
|
||||
formData.installmentRatios.push(0)
|
||||
}
|
||||
formData.installmentRatios[ratioIdx] = Number(detail.dueAmount) || 0
|
||||
}
|
||||
|
||||
const installmentAmountsError = computed(() => {
|
||||
const amounts = formData.installmentRatios || []
|
||||
if (!amounts.length || formData.contractAmount == null) return ''
|
||||
@@ -2867,6 +3444,29 @@
|
||||
&--green {
|
||||
background: #f0fdf4;
|
||||
}
|
||||
|
||||
&--import {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.import-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
padding: 0 0 8px;
|
||||
}
|
||||
|
||||
.form-tab-pane--import-basic {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
|
||||
gap: 16px;
|
||||
align-items: stretch;
|
||||
margin-bottom: 28px;
|
||||
|
||||
.section-card {
|
||||
margin-bottom: 0;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.section-title {
|
||||
@@ -3318,6 +3918,10 @@
|
||||
RESPONSIVE
|
||||
═══════════════════════════════════════════ */
|
||||
@media (max-width: 900px) {
|
||||
.form-tab-pane--import-basic {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.form-grid {
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
<el-dropdown-item v-if="hasPrimaryTaskActions(row)" command="view">
|
||||
<el-icon><View /></el-icon>查看
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item v-if="canDeleteTask(row)" command="delete" divided>
|
||||
<el-dropdown-item command="delete" divided>
|
||||
<el-icon><Delete /></el-icon>删除
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
@@ -763,17 +763,9 @@
|
||||
return base
|
||||
}
|
||||
|
||||
/** 待执行时可删除(仅工单管理视图) */
|
||||
function canDeleteTask(row: QcTask) {
|
||||
return listMode.value === 'workOrder' && row.taskStatus === 'dzx'
|
||||
}
|
||||
|
||||
/** 更多菜单是否展示 */
|
||||
function hasMoreTaskActions(row: QcTask) {
|
||||
if (hasPrimaryTaskActions(row)) {
|
||||
return true
|
||||
}
|
||||
return canDeleteTask(row)
|
||||
/** 更多菜单是否展示(删除始终可用,故始终展示) */
|
||||
function hasMoreTaskActions(_row: QcTask) {
|
||||
return true
|
||||
}
|
||||
|
||||
function handleDropdownCommand(command: string, row: QcTask) {
|
||||
|
||||
@@ -719,9 +719,11 @@
|
||||
import {
|
||||
parseDonationStandardImportText,
|
||||
matchCellSampleType,
|
||||
matchSampleTypeByExactName,
|
||||
matchExpressCompany,
|
||||
isBlankString,
|
||||
isEmptyNumber
|
||||
isEmptyNumber,
|
||||
type DonationStandardImportParsed
|
||||
} from '@/utils/donation-standard-import-parse'
|
||||
import {
|
||||
fetchCustomerList,
|
||||
@@ -1987,6 +1989,152 @@
|
||||
}
|
||||
}
|
||||
|
||||
/** 一键导入前清空上次导入/手填的可覆盖字段(保留捐赠状态、日期、附件等) */
|
||||
function clearFormBeforeStandardImport() {
|
||||
customerId.value = null
|
||||
customerSnapshot.value = null
|
||||
formData.customerId = ''
|
||||
formData.motherName = ''
|
||||
formData.motherPhone = ''
|
||||
formData.motherIdCard = ''
|
||||
formData.motherBirthYm = ''
|
||||
formData.motherEmail = ''
|
||||
formData.motherAddress = ''
|
||||
|
||||
formData.newbornSex = ''
|
||||
formData.newbornWeightGram = null
|
||||
formData.apgar1min = null
|
||||
formData.apgar5min = null
|
||||
formData.newbornDeliveryTime = ''
|
||||
formData.deliveryMode = ''
|
||||
formData.birthOrder = null
|
||||
|
||||
formData.regionId = ''
|
||||
formData.hospitalId = ''
|
||||
formData.medicalStaff = ''
|
||||
formData.sampleCollectTime = ''
|
||||
formData.maternalBloodCollectTime = ''
|
||||
|
||||
collectorUserId.value = null
|
||||
collectorSnapshot.value = null
|
||||
collectorUserOptions.value = []
|
||||
formData.collectorUserId = ''
|
||||
|
||||
salesUserId.value = null
|
||||
salesSnapshot.value = null
|
||||
salesUserOptions.value = []
|
||||
formData.salesUserId = ''
|
||||
|
||||
formData.samples = []
|
||||
sampleCodeOptions.value = []
|
||||
}
|
||||
|
||||
function applyParsedTransportToSample(
|
||||
sample: Record<string, any>,
|
||||
parsed: DonationStandardImportParsed,
|
||||
warnings: string[],
|
||||
filledLabels: string[]
|
||||
) {
|
||||
if (!parsed.transportType) return
|
||||
|
||||
const transport = { ...(sample.transport || createEmptyTransport()) }
|
||||
let transportFilled = false
|
||||
|
||||
if (isBlankString(transport.transportType)) {
|
||||
transport.transportType = parsed.transportType
|
||||
transportFilled = true
|
||||
}
|
||||
if (isBlankString(transport.destSiteId) && siteOptions.value.length) {
|
||||
const site = siteOptions.value[0]
|
||||
transport.destSiteId = site.id
|
||||
transport.destSiteName = site.siteName || ''
|
||||
transportFilled = true
|
||||
}
|
||||
if (isBlankString(transport.etaTime)) {
|
||||
transport.etaTime = formatNowDatetime()
|
||||
transportFilled = true
|
||||
}
|
||||
if (parsed.transportType === 'kdys' && isBlankString(transport.expressCompanyId)) {
|
||||
const ec = matchExpressCompany(
|
||||
parsed.transportModeText || '顺丰快递',
|
||||
expressCompanyOptions.value
|
||||
)
|
||||
if (ec) {
|
||||
transport.expressCompanyId = ec.id
|
||||
if (!expressCompanyOptions.value.some((x) => x.id === ec.id)) {
|
||||
expressCompanyOptions.value = [ec, ...expressCompanyOptions.value]
|
||||
}
|
||||
transportFilled = true
|
||||
} else {
|
||||
warnings.push(`未找到快递公司「${parsed.transportModeText || ''}」`)
|
||||
}
|
||||
}
|
||||
sample.transport = transport
|
||||
if (transportFilled) filledLabels.push('运输信息')
|
||||
}
|
||||
|
||||
async function applySampleHintsFromImport(
|
||||
parsed: DonationStandardImportParsed,
|
||||
warnings: string[],
|
||||
filledLabels: string[]
|
||||
) {
|
||||
for (const hint of parsed.sampleHints) {
|
||||
const matchedType = matchSampleTypeByExactName(hint.typeName, sampleTypeOptions.value)
|
||||
|
||||
let sample = matchedType
|
||||
? formData.samples.find((s) => s.sampleTypeId === matchedType.id)
|
||||
: undefined
|
||||
if (!sample) {
|
||||
sample = formData.samples.find((s) => isBlankString(s.sampleTypeId))
|
||||
}
|
||||
if (!sample) {
|
||||
sample = normalizeSampleRow({ sampleTypeId: '', sampleStatus: 'ycj' })
|
||||
formData.samples.push(sample)
|
||||
}
|
||||
|
||||
if (matchedType && isBlankString(sample.sampleTypeId)) {
|
||||
sample.sampleTypeId = matchedType.id
|
||||
sample.storageYears = matchedType.storageYears ?? null
|
||||
if (!sampleTypeOptions.value.some((x) => x.id === matchedType.id)) {
|
||||
sampleTypeOptions.value = [matchedType, ...sampleTypeOptions.value]
|
||||
}
|
||||
filledLabels.push(hint.typeName)
|
||||
} else if (!matchedType && isBlankString(sample.sampleTypeId)) {
|
||||
warnings.push(`无法匹配样本类型「${hint.typeName}」`)
|
||||
}
|
||||
|
||||
try {
|
||||
await assignDonationSampleCodeIfMissing(sample)
|
||||
if (String(sample.sampleCode || '').trim()) {
|
||||
filledLabels.push('样本编码')
|
||||
}
|
||||
} catch {
|
||||
warnings.push('样本编码自动生成失败')
|
||||
}
|
||||
|
||||
applyParsedTransportToSample(sample, parsed, warnings, filledLabels)
|
||||
}
|
||||
}
|
||||
|
||||
/** 导入后重建样本行引用,确保样本及运输列表列刷新(与编辑样本弹窗确定逻辑一致) */
|
||||
function syncFormSamplesAfterImport() {
|
||||
formData.samples = formData.samples.map((s) => {
|
||||
const row = normalizeSampleRow({
|
||||
...s,
|
||||
transport: s.transport ? { ...s.transport } : undefined
|
||||
})
|
||||
const destSiteId = String(row.transport?.destSiteId || '')
|
||||
if (destSiteId && isBlankString(row.transport?.destSiteName)) {
|
||||
const site = siteOptions.value.find((x) => x.id === destSiteId)
|
||||
if (site?.siteName && site.siteName !== site.id) {
|
||||
row.transport.destSiteName = site.siteName
|
||||
}
|
||||
}
|
||||
return row
|
||||
})
|
||||
hydrateSampleLookupOptions()
|
||||
}
|
||||
|
||||
async function handleStandardImport() {
|
||||
const parsed = parseDonationStandardImportText(standardImportText.value)
|
||||
if (!parsed) {
|
||||
@@ -1999,6 +2147,7 @@
|
||||
const filledLabels: string[] = []
|
||||
|
||||
try {
|
||||
clearFormBeforeStandardImport()
|
||||
await remoteSearchSampleTypes('')
|
||||
|
||||
const tasks: Promise<void>[] = []
|
||||
@@ -2032,14 +2181,16 @@
|
||||
)
|
||||
}
|
||||
|
||||
const needsTransport = !!parsed.transportExpressName
|
||||
const needsTransport = !!parsed.transportType
|
||||
if (needsTransport) {
|
||||
tasks.push(
|
||||
remoteSearchSites('').then(() => undefined),
|
||||
remoteSearchExpressCompanies(
|
||||
(parsed.transportExpressName || '').replace(/快递$/, '') || '顺丰'
|
||||
).then(() => undefined)
|
||||
)
|
||||
tasks.push(remoteSearchSites('').then(() => undefined))
|
||||
if (parsed.transportType === 'kdys') {
|
||||
tasks.push(
|
||||
remoteSearchExpressCompanies(
|
||||
(parsed.transportModeText || '').replace(/快递$/, '') || '顺丰'
|
||||
).then(() => undefined)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
await Promise.all(tasks)
|
||||
@@ -2087,78 +2238,62 @@
|
||||
filledLabels.push('采集医护')
|
||||
}
|
||||
|
||||
const matchedType = matchCellSampleType(parsed.sampleTypeHeader, sampleTypeOptions.value)
|
||||
const needsSampleRow = !!matchedType || needsTransport
|
||||
if (parsed.sampleHints.length > 0) {
|
||||
await applySampleHintsFromImport(parsed, warnings, filledLabels)
|
||||
} else {
|
||||
const matchedType = matchCellSampleType(parsed.sampleTypeHeader, sampleTypeOptions.value)
|
||||
const needsSampleRow = !!matchedType || needsTransport
|
||||
|
||||
if (needsSampleRow) {
|
||||
if (!formData.samples.length) {
|
||||
formData.samples = [normalizeSampleRow({ sampleTypeId: '', sampleStatus: 'ycj' })]
|
||||
}
|
||||
const sample = formData.samples[0]
|
||||
if (needsSampleRow) {
|
||||
if (!formData.samples.length) {
|
||||
formData.samples = [normalizeSampleRow({ sampleTypeId: '', sampleStatus: 'ycj' })]
|
||||
}
|
||||
const sample = formData.samples[0]
|
||||
|
||||
if (matchedType && isBlankString(sample.sampleTypeId)) {
|
||||
sample.sampleTypeId = matchedType.id
|
||||
sample.storageYears = matchedType.storageYears ?? null
|
||||
if (!sampleTypeOptions.value.some((x) => x.id === matchedType.id)) {
|
||||
sampleTypeOptions.value = [matchedType, ...sampleTypeOptions.value]
|
||||
}
|
||||
filledLabels.push('样本类型')
|
||||
} else if (parsed.sampleTypeHeader && !matchedType && isBlankString(sample.sampleTypeId)) {
|
||||
warnings.push(`无法匹配样本类型「${parsed.sampleTypeHeader}」`)
|
||||
}
|
||||
|
||||
if (needsTransport) {
|
||||
const transport = { ...(sample.transport || createEmptyTransport()) }
|
||||
let transportFilled = false
|
||||
if (isBlankString(transport.transportType)) {
|
||||
transport.transportType = 'kdys'
|
||||
transportFilled = true
|
||||
}
|
||||
if (isBlankString(transport.destSiteId) && siteOptions.value.length) {
|
||||
transport.destSiteId = siteOptions.value[0].id
|
||||
transportFilled = true
|
||||
}
|
||||
if (isBlankString(transport.etaTime)) {
|
||||
transport.etaTime = formatNowDatetime()
|
||||
transportFilled = true
|
||||
}
|
||||
if (isBlankString(transport.expressCompanyId)) {
|
||||
const ec = matchExpressCompany(
|
||||
parsed.transportExpressName || '顺丰快递',
|
||||
expressCompanyOptions.value
|
||||
)
|
||||
if (ec) {
|
||||
transport.expressCompanyId = ec.id
|
||||
if (!expressCompanyOptions.value.some((x) => x.id === ec.id)) {
|
||||
expressCompanyOptions.value = [ec, ...expressCompanyOptions.value]
|
||||
}
|
||||
transportFilled = true
|
||||
} else {
|
||||
warnings.push(`未找到快递公司「${parsed.transportExpressName}」`)
|
||||
if (matchedType && isBlankString(sample.sampleTypeId)) {
|
||||
sample.sampleTypeId = matchedType.id
|
||||
sample.storageYears = matchedType.storageYears ?? null
|
||||
if (!sampleTypeOptions.value.some((x) => x.id === matchedType.id)) {
|
||||
sampleTypeOptions.value = [matchedType, ...sampleTypeOptions.value]
|
||||
}
|
||||
filledLabels.push('样本类型')
|
||||
} else if (
|
||||
parsed.sampleTypeHeader &&
|
||||
!matchedType &&
|
||||
isBlankString(sample.sampleTypeId)
|
||||
) {
|
||||
warnings.push(`无法匹配样本类型「${parsed.sampleTypeHeader}」`)
|
||||
}
|
||||
sample.transport = transport
|
||||
if (transportFilled) filledLabels.push('运输信息')
|
||||
}
|
||||
|
||||
try {
|
||||
await assignDonationSampleCodeIfMissing(sample)
|
||||
if (String(sample.sampleCode || '').trim()) {
|
||||
filledLabels.push('样本编码')
|
||||
if (needsTransport) {
|
||||
applyParsedTransportToSample(sample, parsed, warnings, filledLabels)
|
||||
}
|
||||
} catch {
|
||||
warnings.push('样本编码自动生成失败')
|
||||
}
|
||||
|
||||
hydrateSampleLookupOptions()
|
||||
} else if (parsed.sampleTypeHeader) {
|
||||
const sample = formData.samples[0]
|
||||
const matched = matchCellSampleType(parsed.sampleTypeHeader, sampleTypeOptions.value)
|
||||
if (!matched && (!sample || isBlankString(sample.sampleTypeId))) {
|
||||
warnings.push(`无法匹配样本类型「${parsed.sampleTypeHeader}」`)
|
||||
try {
|
||||
await assignDonationSampleCodeIfMissing(sample)
|
||||
if (String(sample.sampleCode || '').trim()) {
|
||||
filledLabels.push('样本编码')
|
||||
}
|
||||
} catch {
|
||||
warnings.push('样本编码自动生成失败')
|
||||
}
|
||||
} else if (parsed.sampleTypeHeader) {
|
||||
const sample = formData.samples[0]
|
||||
const matched = matchCellSampleType(parsed.sampleTypeHeader, sampleTypeOptions.value)
|
||||
if (!matched && (!sample || isBlankString(sample.sampleTypeId))) {
|
||||
warnings.push(`无法匹配样本类型「${parsed.sampleTypeHeader}」`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (formData.samples.length) {
|
||||
syncFormSamplesAfterImport()
|
||||
}
|
||||
|
||||
if (parsed.transportModeText && !parsed.transportType) {
|
||||
warnings.push(`无法识别运输方式「${parsed.transportModeText}」`)
|
||||
}
|
||||
|
||||
const uniqueFilled = [...new Set(filledLabels)]
|
||||
if (uniqueFilled.length) {
|
||||
ElMessage.success(`已填充:${uniqueFilled.join('、')}`)
|
||||
|
||||
Reference in new issue
Block a user