采集协议单审核
-查看与管理采集协议单审核数据。
+采集协议单管理
+查看与管理采集协议单及审核数据。
-
+
@@ -1194,6 +1194,7 @@
type CollectionProtocolRow
} from '@/api/collection-protocol'
import { fetchUploadAttachment } from '@/api/business'
+ import { downloadAttachmentFile } from '@/utils/download-attachment'
import {
fetchCustomerList,
fetchUserList,
@@ -2056,7 +2057,7 @@
if (!isEdit.value && formData.protocolNoId) {
const picked = protocolNoOptions.value.find((x) => x.id === formData.protocolNoId)
if (picked?.usedInProtocol) {
- ElMessage.warning(`协议号「${formData.protocolNo}」已存在协议单，请更换其他协议号`)
+ ElMessage.warning(`协议号「${formData.protocolNo}」已被占用，请更换其他协议号`)
return
}
}
@@ -2066,7 +2067,7 @@
const sc = sampleCodeOptions.value.find((x) => x.id === sampleRow.sampleCodeId)
if (sc?.usedInProtocol) {
ElMessage.warning(
- `样本编码「${sampleRow.sampleCode || sc.sampleCode}」已被其他协议单使用，请更换`
+ `样本编码「${sampleRow.sampleCode || sc.sampleCode}」已被占用，请更换`
)
return
}
@@ -2660,7 +2661,7 @@
/* ====== 协议号下拉检索 ====== */
function protocolNoOptionLabel(p: Api.BizCollectionProtocolNo.ProtocolNoItem) {
- if (p.usedInProtocol) return `${p.protocolNo}（已建单）`
+ if (p.usedInProtocol) return `${p.protocolNo}（已占用）`
if (p.issued) return `${p.protocolNo}（已下发）`
return p.protocolNo
}
@@ -2706,7 +2707,7 @@
/* ====== 样本编码选择 ====== */
function sampleCodeOptionLabel(sc: Api.BizSampleCode.SampleCodeItem) {
- if (sc.usedInProtocol) return `${sc.sampleCode}（已建单）`
+ if (sc.usedInProtocol) return `${sc.sampleCode}（已占用）`
if (sc.issued) return `${sc.sampleCode}（已下发）`
return sc.sampleCode
}
@@ -2894,15 +2895,7 @@
}
function handleDownloadAttachment(file: any) {
- const url = fullFileUrl(file.fileUrl)
- if (!url) return
- const a = document.createElement('a')
- a.href = url
- a.download = file.fileName || ''
- a.target = '_blank'
- document.body.appendChild(a)
- a.click()
- document.body.removeChild(a)
+ downloadAttachmentFile(file, { fullFileUrl })
}
/* ====== 弹窗打开时自动初始化 ====== */
@@ -2998,10 +2991,6 @@
&--green {
background: #f0fdf4;
}
-
- &--gray {
- background: #f8fafc;
- }
}
.section-title {
diff --git a/web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue b/web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue
index 05fd0780..19a61fe2 100644
--- a/web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue
+++ b/web-admin/src/views/cell-storage/protocol/ProtocolStatusChangeDialog.vue
@@ -173,7 +173,7 @@
if (props.actionType === 'toResearch') {
try {
await ElMessageBox.confirm(
- '确定将该协议转为科研捐赠吗？转科研后将创建新的科研捐赠记录。',
+ '确定将该协议转为科研捐赠吗？将创建新的科研捐赠记录，初始协议号与样本编码与源单一致。',
'转科研确认',
{ confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
)
diff --git a/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue b/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue
index 7481f318..601b6e2d 100644
--- a/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue
+++ b/web-admin/src/views/cell-storage/protocol/ProtocolViewDialog.vue
@@ -291,7 +291,7 @@
-
缴费信息
+
缴费信息
@@ -664,6 +664,7 @@
fetchHospitalList,
fetchUserList
} from '@/api/admin'
+ import { downloadAttachmentFile } from '@/utils/download-attachment'
const props = withDefaults(
defineProps<{
@@ -1343,15 +1344,7 @@
}
function downloadFile(file: Record) {
- const url = fullFileUrl(file.fileUrl)
- if (!url) return
- const a = document.createElement('a')
- a.href = url
- a.download = file.fileName || ''
- a.target = '_blank'
- document.body.appendChild(a)
- a.click()
- document.body.removeChild(a)
+ downloadAttachmentFile(file, { fullFileUrl })
}
async function loadLookups(data: Record) {
@@ -1606,10 +1599,6 @@
&--green {
background: #f0fdf4;
}
-
- &--gray {
- background: #f8fafc;
- }
}
.section-title {
diff --git a/web-admin/src/views/cell-storage/protocol/index.vue b/web-admin/src/views/cell-storage/protocol/index.vue
index 77f0db59..cd4a8d5b 100644
--- a/web-admin/src/views/cell-storage/protocol/index.vue
+++ b/web-admin/src/views/cell-storage/protocol/index.vue
@@ -1,10 +1,10 @@
-
+
-
diff --git a/web-admin/src/views/cell-storage/refund-confirm/index.vue b/web-admin/src/views/cell-storage/refund-confirm/index.vue
index 2e43e939..db710c43 100644
--- a/web-admin/src/views/cell-storage/refund-confirm/index.vue
+++ b/web-admin/src/views/cell-storage/refund-confirm/index.vue
@@ -259,6 +259,7 @@
type FinanceAttachmentItem
} from '@/components/business/protocol-finance-confirm-fields/finance-attachments'
import { maskIdCard } from '@/utils/mask-sensitive'
+ import { downloadAttachmentFile } from '@/utils/download-attachment'
import {
formatPaymentAmount,
formatPaymentDueDate,
@@ -321,14 +322,7 @@
}
function handleAttachmentDownload(file: Record) {
- const url = String(file.fileUrl || '')
- if (!url) return
- const a = document.createElement('a')
- a.href = fullFileUrl(url)
- a.download = String(file.fileName || 'download')
- a.target = '_blank'
- a.rel = 'noopener'
- a.click()
+ downloadAttachmentFile(file, { fullFileUrl })
}
async function loadData() {
diff --git a/web-admin/src/views/pilot-service/cell-product-price/index.vue b/web-admin/src/views/pilot-service/cell-product-price/index.vue
index 0b05e84a..fc5f9626 100644
--- a/web-admin/src/views/pilot-service/cell-product-price/index.vue
+++ b/web-admin/src/views/pilot-service/cell-product-price/index.vue
@@ -425,10 +425,16 @@
// --- Delete ---
async function handleDelete(row: any) {
- await ElMessageBox.confirm('确定要删除该价格记录吗？', '提示', { type: 'warning' })
- await fetchDeleteCellProductPrice(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该价格记录吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteCellProductPrice(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
// --- Batch delete ---
diff --git a/web-admin/src/views/pilot-service/cell-product-spec/index.vue b/web-admin/src/views/pilot-service/cell-product-spec/index.vue
index 1e9fd0e0..5acae4db 100644
--- a/web-admin/src/views/pilot-service/cell-product-spec/index.vue
+++ b/web-admin/src/views/pilot-service/cell-product-spec/index.vue
@@ -293,10 +293,16 @@
}
async function handleDelete(row: Api.CellProductSpec.CellProductSpecItem) {
- await ElMessageBox.confirm('确定要删除该规格吗？', '提示', { type: 'warning' })
- await fetchDeleteCellProductSpec(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该规格吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteCellProductSpec(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
async function handleBatchDelete() {
diff --git a/web-admin/src/views/pilot-service/cell-product-type/index.vue b/web-admin/src/views/pilot-service/cell-product-type/index.vue
index f267d57b..0793231d 100644
--- a/web-admin/src/views/pilot-service/cell-product-type/index.vue
+++ b/web-admin/src/views/pilot-service/cell-product-type/index.vue
@@ -293,10 +293,16 @@
}
async function handleDelete(row: Api.CellProductType.CellProductTypeItem) {
- await ElMessageBox.confirm('确定要删除该类型吗？', '提示', { type: 'warning' })
- await fetchDeleteCellProductType(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该类型吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteCellProductType(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
async function handleBatchDelete() {
diff --git a/web-admin/src/views/pilot-service/channel/ChannelViewDialog.vue b/web-admin/src/views/pilot-service/channel/ChannelViewDialog.vue
index 04e8b3af..cda6bff0 100644
--- a/web-admin/src/views/pilot-service/channel/ChannelViewDialog.vue
+++ b/web-admin/src/views/pilot-service/channel/ChannelViewDialog.vue
@@ -157,7 +157,7 @@
-
采集协议单
-查看与管理采集协议单主数据。
+采集协议单录入
+录入与管理采集协议单主数据。
+
协议信息
{
- const urls = String(channel.value?.protocolAttachments || '').trim()
+ const row = channel.value
+ if (!row) return []
+ if (Array.isArray(row.attachmentFiles) && row.attachmentFiles.length) {
+ return row.attachmentFiles as Array>
+ }
+ const urls = String(row.protocolAttachments || '').trim()
if (!urls) return []
return urls
.split(',')
@@ -414,15 +420,7 @@
}
function downloadFile(file: Record) {
- const url = fullFileUrl(file.fileUrl)
- if (!url) return
- const a = document.createElement('a')
- a.href = url
- a.download = file.fileName || ''
- a.target = '_blank'
- document.body.appendChild(a)
- a.click()
- document.body.removeChild(a)
+ downloadAttachmentFile(file, { fullFileUrl })
}
async function loadSubTables() {
@@ -586,10 +584,6 @@
&--green {
background: #f0fdf4;
}
-
- &--gray {
- background: #f8fafc;
- }
}
.section-title {
diff --git a/web-admin/src/views/pilot-service/channel/index.vue b/web-admin/src/views/pilot-service/channel/index.vue
index 66b2a71d..89528d7b 100644
--- a/web-admin/src/views/pilot-service/channel/index.vue
+++ b/web-admin/src/views/pilot-service/channel/index.vue
@@ -314,13 +314,28 @@
新增
-
+
编辑
- 删除
+
+ 删除
+
{{ row.companyName || '未命名' }}
@@ -366,13 +381,28 @@
新增
-
+
编辑
- 删除
+
+ 删除
+
+
+
+
+
+
{{ row.mailAddress || '未命名' }}
@@ -524,7 +554,12 @@
新增协议
-
+
@@ -632,6 +677,8 @@
class="list-body list-wrap protocol-price-list-wrap"
>
-
-
+
@@ -861,23 +914,22 @@
append-to-body
:close-on-click-modal="false"
>
-
-
-
-
-
-
+
-
-
@@ -988,6 +1046,7 @@
import ChannelViewDialog from './ChannelViewDialog.vue'
import { withFullscreenLoading, fullscreenLoadingText } from '@/utils/fullscreen-loading'
import { fetchUploadAttachment } from '@/api/business'
+ import { downloadAttachmentFile } from '@/utils/download-attachment'
import {
fetchChannelList,
fetchCreateChannel,
@@ -1119,6 +1178,25 @@
}>
}
+ function resolveChannelAttachments(row: any) {
+ if (Array.isArray(row?.attachmentFiles) && row.attachmentFiles.length) {
+ return row.attachmentFiles.map((a: any, i: number) => ({
+ id: a.id || `att_${i}`,
+ fileName: a.fileName || '',
+ fileUrl: a.fileUrl || '',
+ fileSize: a.fileSize ?? 0,
+ fileType: a.fileType || ''
+ }))
+ }
+ if (Array.isArray(row?.attachments) && row.attachments.length) {
+ return row.attachments.map((a: any) => ({ ...a }))
+ }
+ if (Array.isArray(row?.attachmentList) && row.attachmentList.length) {
+ return row.attachmentList.map((a: any) => ({ ...a }))
+ }
+ return protocolUrlsToAttachments(String(row?.protocolAttachments || ''))
+ }
+
const agreementTypeTagMap: Record = {
kyxy: { label: '框架协议', type: 'primary' },
zsxy: { label: '中试协议', type: 'success' },
@@ -1248,6 +1326,11 @@
const agreementFormStatus = ref('dsx')
const agreementSubmitLoading = ref(false)
const agreementActivateLoading = ref(false)
+ const agreementOperatingId = ref(null)
+ const agreementOperatingAction = ref<'activate' | 'void' | 'delete' | null>(null)
+ const deletingInvoiceId = ref(null)
+ const deletingMailId = ref(null)
+ const priceConfirmLoading = ref(false)
const agreementFormRef = ref()
const agreementFormData = reactive({
agreementType: '' as string,
@@ -1278,6 +1361,48 @@
const priceSelectorTitle = ref('从价格体系添加')
const priceSelectorKeyword = ref('')
const priceSelectorLoading = ref(false)
+ const deletingAgreementPriceId = ref(null)
+ const deletingAgreementPriceAgreementId = ref(null)
+
+ function isAgreementPriceTableLoading(agreementId: string) {
+ return (
+ deletingAgreementPriceAgreementId.value === agreementId &&
+ deletingAgreementPriceId.value != null
+ )
+ }
+
+ function removeAgreementPriceFromMap(agreementId: string, priceId: string) {
+ const list = agreementPricesMap.value[agreementId] || []
+ agreementPricesMap.value = {
+ ...agreementPricesMap.value,
+ [agreementId]: list.filter((item) => item.id !== priceId)
+ }
+ }
+
+ /** 协议项目信息唯一键：项目编码 + 细胞类型 + 规格 */
+ function buildAgreementPriceItemKey(item: Record) {
+ const code = String(item.projectCode || item.projectName || '')
+ .trim()
+ .toLowerCase()
+ const cellType = String(item.cellTypeCode || item.cellTypeName || '')
+ .trim()
+ .toLowerCase()
+ const spec = String(item.specText || '')
+ .trim()
+ .toLowerCase()
+ return `${code}|${cellType}|${spec}`
+ }
+
+ function getAgreementPriceKeySet(agreementId: string | null) {
+ if (!agreementId) return new Set()
+ const list = agreementPricesMap.value[agreementId] || []
+ return new Set(list.map((item: any) => buildAgreementPriceItemKey(item)))
+ }
+
+ function priceSelectorRowSelectable(row: any) {
+ if (!currentAgreementId.value) return true
+ return !getAgreementPriceKeySet(currentAgreementId.value).has(buildAgreementPriceItemKey(row))
+ }
const filteredPriceSelectorList = computed(() => {
const kw = priceSelectorKeyword.value.trim().toLowerCase()
@@ -1380,13 +1505,7 @@
formData.contactName = row.contactName || ''
formData.contactPhone = row.contactPhone || ''
formData.contactEmail = row.contactEmail || ''
- if (Array.isArray(row.attachments) && row.attachments.length) {
- formData.attachments = row.attachments.map((a: any) => ({ ...a }))
- } else if (Array.isArray(row.attachmentList) && row.attachmentList.length) {
- formData.attachments = row.attachmentList.map((a: any) => ({ ...a }))
- } else {
- formData.attachments = protocolUrlsToAttachments(String(row.protocolAttachments || ''))
- }
+ formData.attachments = resolveChannelAttachments(row)
formData.remark = row.remark || ''
activeTab.value = 'basic'
dialogVisible.value = true
@@ -1468,10 +1587,16 @@
// 主表删除
// ---------------------------------------------------------------------------
async function handleDelete(row: any) {
- await ElMessageBox.confirm('确定要删除该渠道吗？关联的子表数据也将清除。', '提示', { type: 'warning' })
- await fetchDeleteChannel(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该渠道吗？关联的子表数据也将清除。', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteChannel(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
async function handleBatchDelete() {
@@ -1580,15 +1705,25 @@
}
async function handleDeleteInvoice(row: any) {
- await ElMessageBox.confirm('确定删除该开票信息吗？', '提示', { type: 'warning' })
- if (editingId.value) {
+ try {
+ await ElMessageBox.confirm('确定删除该开票信息吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ if (!editingId.value) {
+ const idx = invoiceList.value.findIndex((r: any) => r.id === row.id)
+ if (idx !== -1) invoiceList.value.splice(idx, 1)
+ return
+ }
+ deletingInvoiceId.value = row.id
+ try {
await fetchDeleteChannelInvoice(row.id)
ElMessage.success('删除成功')
await loadSubTables(editingId.value)
- } else {
- // 本地模式：从本地数组中移除
- const idx = invoiceList.value.findIndex((r: any) => r.id === row.id)
- if (idx !== -1) invoiceList.value.splice(idx, 1)
+ } catch {
+ /* 全局已提示 */
+ } finally {
+ deletingInvoiceId.value = null
}
}
@@ -1663,14 +1798,25 @@
}
async function handleDeleteMail(row: any) {
- await ElMessageBox.confirm('确定删除该邮寄地址吗？', '提示', { type: 'warning' })
- if (editingId.value) {
+ try {
+ await ElMessageBox.confirm('确定删除该邮寄地址吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ if (!editingId.value) {
+ const idx = mailList.value.findIndex((r: any) => r.id === row.id)
+ if (idx !== -1) mailList.value.splice(idx, 1)
+ return
+ }
+ deletingMailId.value = row.id
+ try {
await fetchDeleteChannelMailAddress(row.id)
ElMessage.success('删除成功')
await loadSubTables(editingId.value)
- } else {
- const idx = mailList.value.findIndex((r: any) => r.id === row.id)
- if (idx !== -1) mailList.value.splice(idx, 1)
+ } catch {
+ /* 全局已提示 */
+ } finally {
+ deletingMailId.value = null
}
}
@@ -1786,17 +1932,43 @@
}
async function handleDeleteAgreement(row: any) {
- await ElMessageBox.confirm('确定删除该协议吗？', '提示', { type: 'warning' })
- await fetchDeleteChannelAgreement(row.id)
- ElMessage.success('删除成功')
- await loadAgreementsForDialog(agreementChannelId.value!)
+ try {
+ await ElMessageBox.confirm('确定删除该协议吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ agreementOperatingId.value = row.id
+ agreementOperatingAction.value = 'delete'
+ try {
+ await fetchDeleteChannelAgreement(row.id)
+ ElMessage.success('删除成功')
+ await loadAgreementsForDialog(agreementChannelId.value!)
+ } catch {
+ /* 全局已提示 */
+ } finally {
+ agreementOperatingId.value = null
+ agreementOperatingAction.value = null
+ }
}
async function handleActivateAgreement(row: any) {
- await ElMessageBox.confirm('确定将该协议设为生效中吗？', '协议生效', { type: 'info' })
- await fetchActivateChannelAgreement(row.id)
- ElMessage.success('生效成功')
- await loadAgreementsForDialog(agreementChannelId.value!)
+ try {
+ await ElMessageBox.confirm('确定将该协议设为生效中吗？', '协议生效', { type: 'info' })
+ } catch {
+ return
+ }
+ agreementOperatingId.value = row.id
+ agreementOperatingAction.value = 'activate'
+ try {
+ await fetchActivateChannelAgreement(row.id)
+ ElMessage.success('生效成功')
+ await loadAgreementsForDialog(agreementChannelId.value!)
+ } catch {
+ /* 全局已提示 */
+ } finally {
+ agreementOperatingId.value = null
+ agreementOperatingAction.value = null
+ }
}
async function handleActivateAgreementFromForm() {
@@ -1825,10 +1997,23 @@
}
async function handleVoidAgreement(row: any) {
- await ElMessageBox.confirm('确定作废该协议吗？作废后不可恢复。', '提示', { type: 'warning' })
- await fetchVoidChannelAgreement(row.id)
- ElMessage.success('操作成功')
- await loadAgreementsForDialog(agreementChannelId.value!)
+ try {
+ await ElMessageBox.confirm('确定作废该协议吗？作废后不可恢复。', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ agreementOperatingId.value = row.id
+ agreementOperatingAction.value = 'void'
+ try {
+ await fetchVoidChannelAgreement(row.id)
+ ElMessage.success('操作成功')
+ await loadAgreementsForDialog(agreementChannelId.value!)
+ } catch {
+ /* 全局已提示 */
+ } finally {
+ agreementOperatingId.value = null
+ agreementOperatingAction.value = null
+ }
}
// ===========================================================================
@@ -1867,10 +2052,25 @@
}
async function handleDeletePriceInline(priceRow: any, agreement: any) {
- await ElMessageBox.confirm('确定删除该价格明细吗？', '提示', { type: 'warning' })
- await fetchDeleteChannelAgreementPrice(priceRow.id)
- ElMessage.success('删除成功')
- await refreshAgreementPrices(agreement.id)
+ try {
+ await ElMessageBox.confirm('确定删除该价格明细吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ const agreementId = agreement.id
+ const priceId = priceRow.id
+ deletingAgreementPriceId.value = priceId
+ deletingAgreementPriceAgreementId.value = agreementId
+ try {
+ await fetchDeleteChannelAgreementPrice(priceId)
+ removeAgreementPriceFromMap(agreementId, priceId)
+ ElMessage.success('删除成功')
+ } catch {
+ /* 全局已提示 */
+ } finally {
+ deletingAgreementPriceId.value = null
+ deletingAgreementPriceAgreementId.value = null
+ }
}
function handleAddPriceCommand(command: string) {
@@ -1881,7 +2081,6 @@
} else if (command === 'fromProjectSystem') {
priceSelectorMode.value = 'project'
priceSelectorTitle.value = '从项目价格体系添加'
- selectedProjectSystemId.value = ''
openProjectPriceSelector()
}
}
@@ -1918,6 +2117,11 @@
try {
const res = await fetchProjectSystemList({ page: 1, pageSize: 100 })
projectSystemList.value = (res as any)?.list || []
+ const first = projectSystemList.value[0]
+ if (first?.id) {
+ selectedProjectSystemId.value = first.id
+ await handleProjectSystemChange(first.id)
+ }
} catch {
projectSystemList.value = []
}
@@ -1953,37 +2157,85 @@
async function handleConfirmPriceSelector() {
if (!currentAgreementId.value) return
- const existingList = agreementPricesMap.value[currentAgreementId.value] || []
- const existingIds = new Set(existingList.map((item: any) => String(item.sourcePriceId || '')).filter(Boolean))
+ const existingKeys = getAgreementPriceKeySet(currentAgreementId.value)
+ const batchKeys = new Set()
+ const toAdd: any[] = []
+ let skippedCount = 0
+
for (const row of priceSelectorSelected.value) {
- if (existingIds.has(row.id)) continue
- try {
- await fetchCreateChannelAgreementPrice(currentAgreementId.value, {
- projectName: row.projectName || '',
- projectCode: row.projectCode || '',
- cellTypeCode: row.cellTypeCode || undefined,
- cellTypeName: row.cellTypeName || '',
- specText: row.specText || '',
- originalPrice: row.unitPrice ?? null,
- agreementPrice: null,
- remark: row.remark || undefined
- })
- } catch {
- /* */
+ const key = buildAgreementPriceItemKey(row)
+ if (existingKeys.has(key) || batchKeys.has(key)) {
+ skippedCount += 1
+ continue
}
+ batchKeys.add(key)
+ toAdd.push(row)
}
- priceSelectorVisible.value = false
- if (currentAgreementId.value) {
- await refreshAgreementPrices(currentAgreementId.value)
+
+ if (!toAdd.length) {
+ ElMessage.warning(
+ skippedCount > 0 ? '所选项目均已存在，不可重复添加' : '请选择要添加的项目'
+ )
+ return
+ }
+
+ priceConfirmLoading.value = true
+ let successCount = 0
+ try {
+ for (const row of toAdd) {
+ try {
+ await fetchCreateChannelAgreementPrice(currentAgreementId.value, {
+ projectName: row.projectName || '',
+ projectCode: row.projectCode || '',
+ cellTypeCode: row.cellTypeCode || undefined,
+ cellTypeName: row.cellTypeName || '',
+ specText: row.specText || '',
+ originalPrice: row.unitPrice ?? null,
+ agreementPrice: null,
+ remark: row.remark || undefined
+ })
+ successCount += 1
+ } catch {
+ /* */
+ }
+ }
+
+ if (successCount > 0) {
+ ElMessage.success(`成功添加 ${successCount} 条项目`)
+ }
+ if (skippedCount > 0) {
+ ElMessage.warning(`已跳过 ${skippedCount} 条重复项目`)
+ }
+ priceSelectorVisible.value = false
+ if (currentAgreementId.value) {
+ await refreshAgreementPrices(currentAgreementId.value)
+ }
+ } finally {
+ priceConfirmLoading.value = false
}
}
async function handleDeletePrice(row: any) {
- await ElMessageBox.confirm('确定删除该价格明细吗？', '提示', { type: 'warning' })
- await fetchDeleteChannelAgreementPrice(row.id)
- ElMessage.success('删除成功')
- if (currentAgreementId.value) {
- await refreshAgreementPrices(currentAgreementId.value)
+ try {
+ await ElMessageBox.confirm('确定删除该价格明细吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ const agreementId = currentAgreementId.value
+ if (!agreementId) return
+ const priceId = row.id
+ deletingAgreementPriceId.value = priceId
+ deletingAgreementPriceAgreementId.value = agreementId
+ try {
+ await fetchDeleteChannelAgreementPrice(priceId)
+ removeAgreementPriceFromMap(agreementId, priceId)
+ priceList.value = priceList.value.filter((item) => item.id !== priceId)
+ ElMessage.success('删除成功')
+ } catch {
+ /* 全局已提示 */
+ } finally {
+ deletingAgreementPriceId.value = null
+ deletingAgreementPriceAgreementId.value = null
}
}
@@ -2083,15 +2335,7 @@
}
function handleDownloadAttachment(file: any) {
- const url = fullFileUrl(file.fileUrl)
- if (!url) return
- const a = document.createElement('a')
- a.href = url
- a.download = file.fileName || ''
- a.target = '_blank'
- document.body.appendChild(a)
- a.click()
- document.body.removeChild(a)
+ downloadAttachmentFile(file, { fullFileUrl })
}
// ---------------------------------------------------------------------------
@@ -2648,6 +2892,24 @@
}
}
+ .price-selector-system-row {
+ align-items: center;
+
+ .price-selector-system-label {
+ flex-shrink: 0;
+ font-size: 14px;
+ font-weight: 500;
+ color: var(--mint-text, #334155);
+ line-height: 36px;
+ white-space: nowrap;
+ }
+
+ .price-selector-system-select {
+ width: 280px;
+ flex-shrink: 0;
+ }
+ }
+
@media (max-width: 900px) {
.form-grid {
grid-template-columns: repeat(2, 1fr);
diff --git a/web-admin/src/views/pilot-service/checkup-institution/CheckupPackagePanel.vue b/web-admin/src/views/pilot-service/checkup-institution/CheckupPackagePanel.vue
index 0df6aa29..c767a8ae 100644
--- a/web-admin/src/views/pilot-service/checkup-institution/CheckupPackagePanel.vue
+++ b/web-admin/src/views/pilot-service/checkup-institution/CheckupPackagePanel.vue
@@ -227,6 +227,7 @@
fetchDeleteCheckupInstitutionPackage,
fetchCheckupInstitutionProjects
} from '@/api/admin'
+ import { withFullscreenLoading, fullscreenLoadingText } from '@/utils/fullscreen-loading'
const props = defineProps<{
institutionId: string
@@ -374,10 +375,16 @@
}
async function handleDelete(row: any) {
- await ElMessageBox.confirm(`确定删除套餐「${row.packageName}」？`, '提示', { type: 'warning' })
- await fetchDeleteCheckupInstitutionPackage(row.id)
- ElMessage.success('已删除')
- await loadPackages()
+ try {
+ await ElMessageBox.confirm(`确定删除套餐「${row.packageName}」？`, '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteCheckupInstitutionPackage(row.id)
+ ElMessage.success('已删除')
+ await loadPackages()
+ }, fullscreenLoadingText.delete)
}
async function openProjectSelector() {
diff --git a/web-admin/src/views/pilot-service/checkup-institution/index.vue b/web-admin/src/views/pilot-service/checkup-institution/index.vue
index a7f94bf4..78cf7c86 100644
--- a/web-admin/src/views/pilot-service/checkup-institution/index.vue
+++ b/web-admin/src/views/pilot-service/checkup-institution/index.vue
@@ -332,6 +332,7 @@
fetchUpdateCheckupInstitutionProject,
fetchDeleteCheckupInstitutionProject
} from '@/api/admin'
+ import { withFullscreenLoading, fullscreenLoadingText } from '@/utils/fullscreen-loading'
defineOptions({ name: 'PilotCheckupInstitution' })
@@ -555,12 +556,18 @@
}
async function handleDelete(row: any) {
- await ElMessageBox.confirm(`确定删除「${row.institutionName}」？其下属项目价格将一并删除。`, '提示', {
- type: 'warning'
- })
- await fetchDeleteCheckupInstitution(row.id)
- ElMessage.success('已删除')
- loadData()
+ try {
+ await ElMessageBox.confirm(`确定删除「${row.institutionName}」？其下属项目价格将一并删除。`, '提示', {
+ type: 'warning'
+ })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteCheckupInstitution(row.id)
+ ElMessage.success('已删除')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
// ---------------------------------------------------------------------------
@@ -693,10 +700,16 @@
}
async function handleDeleteItem(row: any) {
- await ElMessageBox.confirm(`确定删除「${row.projectName}」？`, '提示', { type: 'warning' })
- await fetchDeleteCheckupInstitutionProject(row.id)
- ElMessage.success('已删除')
- loadItems()
+ try {
+ await ElMessageBox.confirm(`确定删除「${row.projectName}」？`, '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteCheckupInstitutionProject(row.id)
+ ElMessage.success('已删除')
+ await loadItems()
+ }, fullscreenLoadingText.delete)
}
onMounted(() => loadData())
diff --git a/web-admin/src/views/pilot-service/project-price-system/index.vue b/web-admin/src/views/pilot-service/project-price-system/index.vue
index 41a5bd98..220ac975 100644
--- a/web-admin/src/views/pilot-service/project-price-system/index.vue
+++ b/web-admin/src/views/pilot-service/project-price-system/index.vue
@@ -523,10 +523,16 @@
// --- Delete ---
async function handleDelete(row: any) {
- await ElMessageBox.confirm('确定要删除该体系吗？删除后关联的价格明细也将清除。', '提示', { type: 'warning' })
- await fetchDeleteProjectSystem(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该体系吗？删除后关联的价格明细也将清除。', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteProjectSystem(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
// --- Batch delete ---
diff --git a/web-admin/src/views/production/consumable-pack/index.vue b/web-admin/src/views/production/consumable-pack/index.vue
index 309593fb..87c0f181 100644
--- a/web-admin/src/views/production/consumable-pack/index.vue
+++ b/web-admin/src/views/production/consumable-pack/index.vue
@@ -61,6 +61,7 @@
stripe
row-key="id"
@selection-change="handleSelectionChange"
+ @row-dblclick="handleView"
>
+
+
+
编辑
删除
@@ -145,11 +149,90 @@
+
+
-
-
-
-
+
+ 选择项目价格体系
+
+
+
+
+
+
+
+
+ 基本信息
+
+
+
+ 编号
+ {{ viewDetail.packCode || '—' }}
+
+
+ 名称
+ {{ viewDetail.packName || '—' }}
+
+
+ 使用场景
+ {{ viewDetail.usageScene || '—' }}
+
+
+ 类型
+ {{ packTypeLabel(viewDetail.packType) }}
+
+
+ 状态
+
+
+ {{ viewDetail.status === 1 ? '启用' : '停用' }}
+
+
+
+
+ 备注
+ {{ viewDetail.remark || '—' }}
+
+
+
+
+
+
+ 耗材明细
+ 基本信息
-
+
@@ -201,16 +284,33 @@
添加耗材
-
+
+
-
+
+
+
-
@@ -244,29 +344,42 @@
destroy-on-close
:close-on-click-modal="false"
>
-
+
取消
-
- 确定
+
+ 确定添加
@@ -275,7 +388,7 @@
diff --git a/web-admin/src/views/production/output-type/index.vue b/web-admin/src/views/production/output-type/index.vue
index 48823b6d..212e6817 100644
--- a/web-admin/src/views/production/output-type/index.vue
+++ b/web-admin/src/views/production/output-type/index.vue
@@ -288,10 +288,16 @@
}
async function handleDelete(row: any) {
- await ElMessageBox.confirm('确定要删除该类型吗？', '提示', { type: 'warning' })
- await fetchDeleteOutputType(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该类型吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteOutputType(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
async function handleBatchDelete() {
diff --git a/web-admin/src/views/production/process-category/index.vue b/web-admin/src/views/production/process-category/index.vue
index 46321f96..61cace01 100644
--- a/web-admin/src/views/production/process-category/index.vue
+++ b/web-admin/src/views/production/process-category/index.vue
@@ -288,10 +288,16 @@
}
async function handleDelete(row: any) {
- await ElMessageBox.confirm('确定要删除该分类吗？', '提示', { type: 'warning' })
- await fetchDeleteProcessCategory(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该分类吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteProcessCategory(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
async function handleBatchDelete() {
diff --git a/web-admin/src/views/production/process/index.vue b/web-admin/src/views/production/process/index.vue
index b52f577a..9d7c7061 100644
--- a/web-admin/src/views/production/process/index.vue
+++ b/web-admin/src/views/production/process/index.vue
@@ -148,25 +148,40 @@
-
-
-
-
-
+
+
+
-
-
+
-
+
+
+
+ {{ tab.label }}
+
+
+
-
-
+
@@ -192,8 +207,9 @@
-
-
+ 预估耗时（min）
+
+
-
+
+
+
+ 基本信息
+
@@ -370,35 +474,48 @@
-
+
取消
-
- 确定
+
+ 确定添加
@@ -407,34 +524,96 @@
+
+
+
+
+ 取消
+
+ 确定添加
+
+
+
+
+
+
-
+
+
+
- 取消
-
- 确定
+ 取消
+
+ 确定导入
@@ -455,8 +634,10 @@
fetchAllReagents,
fetchAllConsumables,
fetchAllOutputTypes,
- fetchAllConsumablePacks
+ fetchAllConsumablePacks,
+ fetchConsumablePackDetail
} from '@/api/production'
+ import { withFullscreenLoading, fullscreenLoadingText } from '@/utils/fullscreen-loading'
defineOptions({ name: 'ProductionProcess' })
@@ -474,7 +655,23 @@
const submitLoading = ref(false)
const formRef = ref()
const editingId = ref(null)
- const activeTab = ref('basic')
+ const activeFormTab = ref('basic')
+
+ const formTabs = [
+ { key: 'basic', label: '基本信息' },
+ { key: 'reagents', label: '试剂关联' },
+ { key: 'consumables', label: '耗材关联' },
+ { key: 'outputs', label: '产出物' },
+ { key: 'data-collections', label: '数据采集' }
+ ] as const
+
+ function scrollToSection(key: string) {
+ activeFormTab.value = key
+ const el = document.getElementById(`form-section-${key}`)
+ if (el) {
+ el.scrollIntoView({ behavior: 'smooth', block: 'start' })
+ }
+ }
// 下拉选项
const categoryOptions = ref([])
@@ -514,21 +711,27 @@
const reagentList = ref([])
const consumableList = ref([])
const outputList = ref([])
-
+ const dataCollectionList = ref([])
// 选择试剂弹窗
const selectReagentVisible = ref(false)
const filteredReagentList = ref([])
const reagentKeyword = ref('')
- const selectedReagent = ref(null)
+ const selectedReagents = ref([])
+ const reagentSelectTableRef = ref()
// 选择耗材弹窗
const selectConsumableVisible = ref(false)
const filteredConsumableList = ref([])
const consumableKeyword = ref('')
- const selectedConsumable = ref(null)
+ const selectedConsumables = ref([])
+ const consumableSelectTableRef = ref()
// 耗材包导入
- const selectedPackId = ref(undefined)
+ const importPackVisible = ref(false)
+ const importPackLoading = ref(false)
+ const packKeyword = ref('')
+ const filteredPackList = ref([])
+ const selectedPackId = ref(null)
const handleSelectionChange = (rows: any[]) => {
selectedRows.value = rows
@@ -594,9 +797,82 @@
reagentList.value = []
consumableList.value = []
outputList.value = []
+ dataCollectionList.value = []
editingId.value = null
- activeTab.value = 'basic'
- selectedPackId.value = undefined
+ activeFormTab.value = 'basic'
+ selectedPackId.value = null
+ packKeyword.value = ''
+ }
+
+ function isReagentDuplicate(reagentId: string, reagentCode: string) {
+ return reagentList.value.some(
+ (item) =>
+ (reagentId && (item.reagentId === reagentId || item.id === reagentId)) ||
+ (reagentCode && item.reagentCode === reagentCode)
+ )
+ }
+
+ function isConsumableDuplicate(consumableId: string, consumableCode: string) {
+ return consumableList.value.some(
+ (item) =>
+ (consumableId && (item.consumableId === consumableId || item.id === consumableId)) ||
+ (consumableCode && item.consumableCode === consumableCode)
+ )
+ }
+
+ /** 详情接口 sopIds 为逗号分隔字符串，多选需转为数组 */
+ function parseSopIds(value: string | string[] | null | undefined): string[] {
+ if (!value) return []
+ if (Array.isArray(value)) return value.filter(Boolean)
+ return String(value)
+ .split(',')
+ .map((s) => s.trim())
+ .filter(Boolean)
+ }
+
+ function serializeSopIds(ids: string[]): string | undefined {
+ const list = (ids || []).filter(Boolean)
+ return list.length ? list.join(',') : undefined
+ }
+
+ /** 接口 isKeyMaterial / isRequired 为 "0" | "1" 字符串 */
+ function toApiFlag(val: boolean | number | string | undefined): string {
+ if (val === true || val === 1 || val === '1') return '1'
+ return '0'
+ }
+
+ function fromApiFlag(val: boolean | number | string | undefined): boolean {
+ return val === true || val === 1 || val === '1'
+ }
+
+ function appendReagentFromMaster(r: any) {
+ if (isReagentDuplicate(r.id, r.reagentCode)) return false
+ reagentList.value.push({
+ reagentId: r.id,
+ reagentCode: r.reagentCode || '',
+ reagentName: r.reagentName || '',
+ spec: r.spec || '',
+ standardUsage: '',
+ unit: r.unit || '',
+ remark: '',
+ isKeyMaterial: false
+ })
+ return true
+ }
+
+ function appendConsumableFromMaster(c: any, preset?: { standardUsage?: string; remark?: string }) {
+ if (isConsumableDuplicate(c.id || c.consumableId, c.consumableCode)) return false
+ consumableList.value.push({
+ consumableId: c.consumableId || c.id,
+ consumableCode: c.consumableCode || '',
+ consumableName: c.consumableName || '',
+ specModel: c.specModel || '',
+ standardUsage: preset?.standardUsage ?? c.standardUsage ?? '',
+ unit: c.unit || '',
+ isRequired: false,
+ remark: preset?.remark ?? c.remark ?? ''
+ })
+ return true
}
async function handleAdd() {
@@ -622,11 +898,26 @@
formData.description = detail.description || ''
formData.equipmentName = detail.equipmentName || ''
formData.estimatedDuration = detail.estimatedDuration || ''
- formData.sopIds = detail.sopIds || []
+ formData.sopIds = parseSopIds(detail.sopIds)
formData.remark = detail.remark || ''
- reagentList.value = (detail.reagents || []).map((r: any) => ({ ...r }))
- consumableList.value = (detail.consumables || []).map((c: any) => ({ ...c }))
- outputList.value = (detail.outputs || []).map((o: any) => ({ ...o }))
+ reagentList.value = (detail.reagents || []).map((r: any) => ({
+ ...r,
+ remark: r.remark ?? '',
+ isKeyMaterial: fromApiFlag(r.isKeyMaterial)
+ }))
+ consumableList.value = (detail.consumables || []).map((c: any) => ({
+ ...c,
+ remark: c.remark ?? '',
+ isRequired: fromApiFlag(c.isRequired)
+ }))
+ outputList.value = (detail.outputs || []).map((o: any) => ({
+ ...o,
+ remark: o.remark ?? ''
+ }))
+ dataCollectionList.value = (detail.dataCollections || []).map((d: any) => ({
+ ...d,
+ remark: d.remark ?? ''
+ }))
} catch {
ElMessage.error('加载详情失败')
}
@@ -645,7 +936,7 @@
description: formData.description?.trim() || undefined,
equipmentName: formData.equipmentName?.trim() || undefined,
estimatedDuration: formData.estimatedDuration?.trim() || undefined,
- sopIds: formData.sopIds,
+ sopIds: serializeSopIds(formData.sopIds),
remark: formData.remark?.trim() || undefined,
reagents: reagentList.value.map((r) => ({
reagentId: r.reagentId || r.id,
@@ -654,7 +945,8 @@
spec: r.spec,
standardUsage: r.standardUsage,
unit: r.unit,
- isKeyMaterial: r.isKeyMaterial || false
+ isKeyMaterial: toApiFlag(r.isKeyMaterial),
+ remark: r.remark || ''
})),
consumables: consumableList.value.map((c) => ({
consumableId: c.consumableId || c.id,
@@ -662,13 +954,21 @@
consumableName: c.consumableName,
specModel: c.specModel,
standardUsage: c.standardUsage,
- isRequired: c.isRequired || false,
+ unit: c.unit || undefined,
+ isRequired: toApiFlag(c.isRequired),
remark: c.remark || ''
})),
outputs: outputList.value.map((o) => ({
outputTypeId: o.outputTypeId,
outputName: o.outputName,
- outputBarcode: o.outputBarcode
+ outputBarcode: o.outputBarcode,
+ remark: o.remark || ''
+ })),
+ dataCollections: dataCollectionList.value.map((d) => ({
+ collectionName: d.collectionName,
+ unit: d.unit || undefined,
+ orderNum: d.orderNum ?? 0,
+ remark: d.remark || ''
}))
}
if (isEdit.value && editingId.value) {
@@ -687,30 +987,43 @@
}
async function handleDelete(row: any) {
- await ElMessageBox.confirm('确定要删除该工艺吗？', '提示', { type: 'warning' })
- await fetchDeleteProcess(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该工艺吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteProcess(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
async function handleBatchDelete() {
const ids = selectedRows.value.map((r) => r.id)
if (!ids.length) return
- await ElMessageBox.confirm(`确定删除选中的 ${ids.length} 个工艺吗？`, '提示', { type: 'warning' })
- for (const id of ids) {
- await fetchDeleteProcess(id)
+ try {
+ await ElMessageBox.confirm(`确定删除选中的 ${ids.length} 个工艺吗？`, '提示', { type: 'warning' })
+ } catch {
+ return
}
- ElMessage.success('批量删除成功')
- selectedRows.value = []
- await loadData()
+ await withFullscreenLoading(async () => {
+ for (const id of ids) {
+ await fetchDeleteProcess(id)
+ }
+ ElMessage.success('批量删除成功')
+ selectedRows.value = []
+ await loadData()
+ }, fullscreenLoadingText.batchDelete)
}
// =============== 试剂弹窗 ===============
function openAddReagentDialog() {
- selectedReagent.value = null
+ selectedReagents.value = []
reagentKeyword.value = ''
filteredReagentList.value = [...allReagentOptions.value]
selectReagentVisible.value = true
+ nextTick(() => reagentSelectTableRef.value?.clearSelection?.())
}
function filterReagents() {
@@ -726,38 +1039,35 @@
)
}
- function handleReagentSelect(row: any) {
- selectedReagent.value = row
+ function handleReagentSelectionChange(rows: any[]) {
+ selectedReagents.value = rows
}
function confirmAddReagent() {
- if (!selectedReagent.value) return
- const r = selectedReagent.value
- const exists = reagentList.value.some(
- (item) => item.reagentId === r.id || item.reagentCode === r.reagentCode
- )
- if (exists) {
- ElMessage.warning('该试剂已在列表中')
- return
+ if (!selectedReagents.value.length) return
+ let added = 0
+ let skipped = 0
+ for (const r of selectedReagents.value) {
+ if (appendReagentFromMaster(r)) added++
+ else skipped++
+ }
+ if (added > 0) {
+ const msg =
+ skipped > 0 ? `已添加 ${added} 项试剂，跳过 ${skipped} 项重复` : `已添加 ${added} 项试剂`
+ ElMessage.success(msg)
+ } else {
+ ElMessage.warning('所选试剂均已在列表中')
}
- reagentList.value.push({
- reagentId: r.id,
- reagentCode: r.reagentCode || '',
- reagentName: r.reagentName || '',
- spec: r.spec || '',
- standardUsage: '',
- unit: r.unit || '',
- isKeyMaterial: false
- })
selectReagentVisible.value = false
}
// =============== 耗材弹窗 ===============
function openAddConsumableDialog() {
- selectedConsumable.value = null
+ selectedConsumables.value = []
consumableKeyword.value = ''
filteredConsumableList.value = [...allConsumableOptions.value]
selectConsumableVisible.value = true
+ nextTick(() => consumableSelectTableRef.value?.clearSelection?.())
}
function filterConsumables() {
@@ -773,65 +1083,94 @@
)
}
- function handleConsumableRowSelect(row: any) {
- selectedConsumable.value = row
+ function handleConsumableSelectionChange(rows: any[]) {
+ selectedConsumables.value = rows
}
function confirmAddConsumable() {
- if (!selectedConsumable.value) return
- const c = selectedConsumable.value
- const exists = consumableList.value.some(
- (item) => item.consumableId === c.id || item.consumableCode === c.consumableCode
- )
- if (exists) {
- ElMessage.warning('该耗材已在列表中')
- return
+ if (!selectedConsumables.value.length) return
+ let added = 0
+ let skipped = 0
+ for (const c of selectedConsumables.value) {
+ if (appendConsumableFromMaster(c)) added++
+ else skipped++
+ }
+ if (added > 0) {
+ const msg =
+ skipped > 0 ? `已添加 ${added} 项耗材，跳过 ${skipped} 项重复` : `已添加 ${added} 项耗材`
+ ElMessage.success(msg)
+ } else {
+ ElMessage.warning('所选耗材均已在列表中')
}
- consumableList.value.push({
- consumableId: c.id,
- consumableCode: c.consumableCode || '',
- consumableName: c.consumableName || '',
- specModel: c.specModel || '',
- standardUsage: '',
- isRequired: false,
- remark: ''
- })
selectConsumableVisible.value = false
}
// =============== 从耗材包导入 ===============
- async function handleImportPack(packId: string | undefined) {
- if (!packId) return
- // 在 packOptions 中找到对应的包，然后查看它的 items
- // 由于 packOptions 来自 fetchAllConsumablePacks，可能不含 items
- // 需要用 fetchConsumablePackDetail 加载详情
+ function openImportPackDialog() {
+ selectedPackId.value = null
+ packKeyword.value = ''
+ filteredPackList.value = [...packOptions.value]
+ importPackVisible.value = true
+ }
+
+ function filterPacks() {
+ const kw = packKeyword.value.trim().toLowerCase()
+ if (!kw) {
+ filteredPackList.value = [...packOptions.value]
+ return
+ }
+ filteredPackList.value = packOptions.value.filter((p) =>
+ (p.packName || '').toLowerCase().includes(kw)
+ )
+ }
+
+ function handlePackRowClick(row: any) {
+ if (row?.id) selectedPackId.value = row.id
+ }
+
+ async function confirmImportPack() {
+ if (!selectedPackId.value) return
+ importPackLoading.value = true
+ try {
+ await handleImportPack(selectedPackId.value)
+ importPackVisible.value = false
+ } finally {
+ importPackLoading.value = false
+ }
+ }
+
+ async function handleImportPack(packId: string) {
try {
- const { fetchConsumablePackDetail } = await import('@/api/production')
const detail = await fetchConsumablePackDetail(packId)
const packItems = detail.items || []
let added = 0
+ let skipped = 0
for (const item of packItems) {
- const exists = consumableList.value.some(
- (c) => c.consumableId === item.consumableId || c.consumableCode === item.consumableCode
- )
- if (!exists) {
- consumableList.value.push({
- consumableId: item.consumableId,
- consumableCode: item.consumableCode || '',
- consumableName: item.consumableName || '',
- specModel: item.specModel || '',
+ if (
+ appendConsumableFromMaster(item, {
standardUsage: item.standardUsage || '',
- isRequired: false,
- remark: ''
+ remark: item.remark || ''
})
+ ) {
added++
+ } else {
+ skipped++
}
}
- ElMessage.success(`导入成功，新增 ${added} 项耗材`)
+ if (added > 0) {
+ const msg =
+ skipped > 0
+ ? `导入成功，新增 ${added} 项耗材，跳过 ${skipped} 项重复`
+ : `导入成功，新增 ${added} 项耗材`
+ ElMessage.success(msg)
+ } else if (packItems.length === 0) {
+ ElMessage.warning('该耗材包暂无明细')
+ } else {
+ ElMessage.warning('耗材包中的耗材均已在列表中')
+ }
} catch {
ElMessage.error('导入耗材包失败')
}
- selectedPackId.value = undefined
}
// =============== 产出物 ===============
@@ -839,7 +1178,17 @@
outputList.value.push({
outputTypeId: '',
outputName: '',
- outputBarcode: ''
+ outputBarcode: '',
+ remark: ''
+ })
+ }
+
+ function addDataCollectionRow() {
+ dataCollectionList.value.push({
+ collectionName: '',
+ unit: '',
+ orderNum: dataCollectionList.value.length + 1,
+ remark: ''
})
}
@@ -856,36 +1205,196 @@
diff --git a/web-admin/src/views/production/reagent/index.vue b/web-admin/src/views/production/reagent/index.vue
index 663fde71..136a5bc6 100644
--- a/web-admin/src/views/production/reagent/index.vue
+++ b/web-admin/src/views/production/reagent/index.vue
@@ -343,10 +343,16 @@
}
async function handleDelete(row: any) {
- await ElMessageBox.confirm('确定要删除该试剂吗？', '提示', { type: 'warning' })
- await fetchDeleteReagent(row.id)
- ElMessage.success('删除成功')
- await loadData()
+ try {
+ await ElMessageBox.confirm('确定要删除该试剂吗？', '提示', { type: 'warning' })
+ } catch {
+ return
+ }
+ await withFullscreenLoading(async () => {
+ await fetchDeleteReagent(row.id)
+ ElMessage.success('删除成功')
+ await loadData()
+ }, fullscreenLoadingText.delete)
}
async function handleBatchDelete() {
diff --git a/web-admin/src/views/production/sop/index.vue b/web-admin/src/views/production/sop/index.vue
index b4da670d..5b4e2cf0 100644
--- a/web-admin/src/views/production/sop/index.vue
+++ b/web-admin/src/views/production/sop/index.vue
@@ -129,29 +129,75 @@
-
-
+
+
+
-
+
+
删除
@@ -256,43 +291,45 @@
-
-
+
+
+
+
+
+
+
+ 试剂关联
+
+
+
-
+
-
@@ -310,20 +347,27 @@
-
-
+
+
+
+
+
+ 耗材关联
+
+
+
+ 从耗材包导入
+
+
+
+
+
+
+
-
+
-
-
+
+
+
@@ -350,9 +399,64 @@
+
+
+
+
+
+ 产出物
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+ 数据采集
-
-
-
-
-
- {{ op.label }}
-
-
-
-
-
- 转为细胞存储后将创建新的细胞存储协议，需补填缴费信息。
-
-
-
+
import type { FormInstance, FormRules } from 'element-plus'
+ import { ElMessage, ElMessageBox } from 'element-plus'
import { Check, Close } from '@element-plus/icons-vue'
- import { fetchDonationStatusChange } from '@/api/research-donation'
+ import { fetchDonationStatusChange, fetchConvertToStorage } from '@/api/research-donation'
import { withFullscreenLoading, fullscreenLoadingText } from '@/utils/fullscreen-loading'
- type OperationType = 'activate' | 'expire' | 'void' | 'zckc'
+ export type DonationStatusChangeAction = 'activate' | 'expire' | 'void' | 'toStorage'
+ export type DonationStatusChangeTarget = {
+ id: string
+ donationNo?: string
+ }
defineOptions({ name: 'DonationStatusChangeDialog' })
const props = defineProps<{
modelValue: boolean
- donationId: string | null
- listRow?: Record | null
+ actionType: DonationStatusChangeAction
+ targets: DonationStatusChangeTarget[]
}>()
const emit = defineEmits<{
(e: 'update:modelValue', val: boolean): void
- (e: 'saved'): void
+ (e: 'submitted'): void
}>()
- const OPERATION_CONFIG: Record<
- OperationType,
+ const ACTION_CONFIG: Record<
+ DonationStatusChangeAction,
{
label: string
timeLabel: string
- targetStatus: string
+ descLabel: string
+ status: string
+ timeKey: string
+ descKey: string
}
> = {
activate: {
- label: '生效',
- timeLabel: '生效时间',
- targetStatus: 'sxz'
+ label: '协议生效',
+ timeLabel: '协议生效时间',
+ descLabel: '协议生效描述',
+ status: 'sxz',
+ timeKey: 'effectiveTime',
+ descKey: 'effectiveDesc'
},
expire: {
- label: '过期',
- timeLabel: '过期时间',
- targetStatus: 'ygq'
+ label: '协议过期',
+ timeLabel: '协议过期时间',
+ descLabel: '协议过期描述',
+ status: 'ygq',
+ timeKey: 'expireTime',
+ descKey: 'expireDesc'
},
void: {
- label: '作废',
- timeLabel: '作废时间',
- targetStatus: 'yzf'
+ label: '协议作废',
+ timeLabel: '协议作废时间',
+ descLabel: '协议作废描述',
+ status: 'yzf',
+ timeKey: 'voidTime',
+ descKey: 'voidDesc'
},
- zckc: {
+ toStorage: {
label: '转细胞存储',
- timeLabel: '转换时间',
- targetStatus: 'zckc'
+ timeLabel: '转细胞存储时间',
+ descLabel: '转细胞存储描述',
+ status: 'zckc',
+ timeKey: 'convertTime',
+ descKey: 'convertDesc'
}
}
- const currentStatus = computed(() => String(props.listRow?.donationStatus || ''))
+ const config = computed(() => ACTION_CONFIG[props.actionType])
+ const actionLabel = computed(() => config.value.label)
+ const timeLabel = computed(() => config.value.timeLabel)
+ const descLabel = computed(() => config.value.descLabel)
- const availableOperations = computed(() => {
- const ops: Array<{ value: OperationType; label: string }> = []
- const s = currentStatus.value
-
- if (s === 'dsx') {
- ops.push({ value: 'activate', label: '生效' })
- ops.push({ value: 'void', label: '作废' })
- } else if (s === 'sxz') {
- ops.push({ value: 'expire', label: '过期' })
- ops.push({ value: 'void', label: '作废' })
- ops.push({ value: 'zckc', label: '转细胞存储' })
- }
-
- return ops
+ const dialogTitle = computed(() => {
+ const label = config.value.label
+ return props.targets.length > 1 ? `批量${label}（${props.targets.length} 条）` : label
})
const formRef = ref()
const submitting = ref(false)
const form = reactive({
- operationType: '' as OperationType | '',
changeTime: '',
changeDesc: ''
})
const rules: FormRules = {
- operationType: [{ required: true, message: '请选择变更操作', trigger: 'change' }],
changeTime: [{ required: true, message: '请选择时间', trigger: 'change' }]
}
- const config = computed(() => {
- if (!form.operationType) return null
- return OPERATION_CONFIG[form.operationType]
- })
-
- const timeLabel = computed(() => config.value?.timeLabel || '时间')
-
- const dialogTitle = computed(() => '捐赠协议单 — 状态变更')
-
- function handleOperationChange() {
- form.changeTime = ''
- form.changeDesc = ''
- }
-
function resetForm() {
- form.operationType = ''
form.changeTime = ''
form.changeDesc = ''
formRef.value?.clearValidate()
@@ -184,12 +162,60 @@
async function handleSubmit() {
const valid = await formRef.value?.validate().catch(() => false)
- if (!valid || !props.donationId || !form.operationType) return
+ if (!valid || !props.targets.length) return
+
+ const cfg = config.value
+ const rows = [...props.targets]
+ const isBatch = rows.length > 1
+
+ // 转细胞存储：确认 + 调用专用接口
+ if (props.actionType === 'toStorage') {
+ try {
+ await ElMessageBox.confirm(
+ '确定将该捐赠协议转为细胞存储吗？将创建新的细胞存储协议，初始协议号与样本编码与源单一致。',
+ '转细胞存储确认',
+ { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
+ )
+ } catch {
+ return
+ }
+ submitting.value = true
+ try {
+ await withFullscreenLoading(
+ async () => {
+ let ok = 0
+ const failed: string[] = []
+ for (const row of rows) {
+ try {
+ await fetchConvertToStorage(String(row.id))
+ ok += 1
+ } catch {
+ failed.push(row.donationNo || String(row.id))
+ }
+ }
+ if (isBatch) {
+ if (failed.length) {
+ ElMessage.warning(`${cfg.label}成功 ${ok} 条，失败 ${failed.length} 条`)
+ } else {
+ ElMessage.success(`批量${cfg.label}成功，共 ${ok} 条`)
+ }
+ }
+ if (ok > 0) {
+ emit('update:modelValue', false)
+ emit('submitted')
+ }
+ },
+ isBatch ? fullscreenLoadingText.batchAudit : fullscreenLoadingText.save
+ )
+ } finally {
+ submitting.value = false
+ }
+ return
+ }
- const cfg = OPERATION_CONFIG[form.operationType]
const payload = {
- donationStatus: cfg.targetStatus,
- time: form.changeTime,
+ newStatus: cfg.status,
+ timeVal: form.changeTime,
desc: form.changeDesc.trim() || undefined
}
@@ -197,11 +223,29 @@
try {
await withFullscreenLoading(
async () => {
- await fetchDonationStatusChange(props.donationId!, payload)
- emit('update:modelValue', false)
- emit('saved')
+ let ok = 0
+ const failed: string[] = []
+ for (const row of rows) {
+ try {
+ await fetchDonationStatusChange(String(row.id), payload)
+ ok += 1
+ } catch {
+ failed.push(row.donationNo || String(row.id))
+ }
+ }
+ if (isBatch) {
+ if (failed.length) {
+ ElMessage.warning(`${cfg.label}成功 ${ok} 条，失败 ${failed.length} 条`)
+ } else {
+ ElMessage.success(`批量${cfg.label}成功，共 ${ok} 条`)
+ }
+ }
+ if (ok > 0) {
+ emit('update:modelValue', false)
+ emit('submitted')
+ }
},
- fullscreenLoadingText.save
+ isBatch ? fullscreenLoadingText.batchAudit : fullscreenLoadingText.save
)
} finally {
submitting.value = false
@@ -221,8 +265,4 @@
font-weight: 600;
}
}
-
- .convert-alert {
- margin-bottom: 16px;
- }
diff --git a/web-admin/src/views/research-donation/list/DonationViewDialog.vue b/web-admin/src/views/research-donation/list/DonationViewDialog.vue
index d0704b85..a62a2367 100644
--- a/web-admin/src/views/research-donation/list/DonationViewDialog.vue
+++ b/web-admin/src/views/research-donation/list/DonationViewDialog.vue
@@ -1,4 +1,4 @@
-
+
@@ -25,7 +24,7 @@
-
-
-
+
+
+
diff --git a/web-admin/src/views/research-donation/list/DonationStatusChangeDialog.vue b/web-admin/src/views/research-donation/list/DonationStatusChangeDialog.vue
index 16540822..0ea2ae52 100644
--- a/web-admin/src/views/research-donation/list/DonationStatusChangeDialog.vue
+++ b/web-admin/src/views/research-donation/list/DonationStatusChangeDialog.vue
@@ -8,12 +8,16 @@
align-center
destroy-on-close
:close-on-click-modal="false"
- style="backdrop-filter: none"
@update:model-value="emit('update:modelValue', $event)"
@closed="resetForm"
>
-
+
-
+
+
+
+ 支持图片、视频、PDF、Word、Excel等文件，单文件不超过 20MB
+
+
+
-
+
+
+ ![]()
+
+
+
+
支持上传多个附件文件。
+ ![预览]()
+
+
+
+
+
+
+
+
附件
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+ - 捐赠编号：{{ listRow?.donationNo || '—' }} +
+ 将对已选 + {{ targets.length }} 条捐赠协议单执行{{ actionLabel }}操作，每条各记一次变更。 +
++ 捐赠编号：{{ targets[0].donationNo || '—' }}
@@ -35,9 +34,11 @@
@@ -54,178 +55,212 @@
状态
-
- {{ donationStatusLabel(String(donation?.donationStatus || '')) }}
-
+
+ {{ donationStatusLabel(String(donation?.donationStatus || '')) }}
@@ -46,7 +47,7 @@
捐赠日期
- {{ dash(donation?.donationDate) }}
+ {{ formatYmd(donation?.donationDate) }}
基本信息
-
+
+
+
+
+
-
- 捐赠编号
- {{ dash(donation?.donationNo) }}
-
-
- 捐赠日期
- {{ dash(donation?.donationDate) }}
-
-
- 状态
-
-
- {{ donationStatusLabel(String(donation?.donationStatus || '')) }}
-
-
-
-
- 来源类型
- {{ sourceTypeLabel(String(donation?.sourceType || '')) }}
-
-
+ 创建时间
- {{ dash(donation?.createTime) }}
- 捐赠编号
{{ dash(donation?.donationNo) }}
状态
{{ donationStatusLabel(String(donation?.donationStatus || '')) }}
捐赠日期
{{ formatYmd(donation?.donationDate) }}
来源类型
{{
+ sourceTypeLabel(String(donation?.sourceType || ''))
+ }}
采集专员
{{ collectorDisplay }}
创建时间
{{ dash(donation?.createTime) }}
状态变更记录
-
+
-
+
-
+
-
+
-
- 生效时间
- {{ dash(donation.effectiveTime) }}
-
-
+ 生效描述
- {{ dash(donation.effectiveDesc) }}
- 生效时间
{{ dash(donation.effectiveTime) }}
生效描述
{{
+ dash(donation.effectiveDesc)
+ }}
-
- 过期时间
- {{ dash(donation.expireTime) }}
-
-
+ 过期描述
- {{ dash(donation.expireDesc) }}
- 过期时间
{{ dash(donation.expireTime) }}
过期描述
{{
+ dash(donation.expireDesc)
+ }}
-
- 作废时间
- {{ dash(donation.voidTime) }}
-
-
+ 作废描述
- {{ dash(donation.voidDesc) }}
- 作废时间
{{ dash(donation.voidTime) }}
作废描述
{{
+ dash(donation.voidDesc)
+ }}
-
- 转细胞存储时间
- {{ dash(donation.convertTime) }}
-
-
+ 转细胞存储描述
- {{ dash(donation.convertDesc) }}
- 转细胞存储时间
{{ dash(donation.convertTime) }}
转细胞存储描述
{{
+ dash(donation.convertDesc)
+ }}
-
-
+
-
+ 备注
- {{ dash(donation?.remark) }}
-
+
备注
{{ dash(donation?.remark) }}
-
+
@@ -235,47 +270,46 @@
-
+
当事人信息
客户信息
-
+
母亲信息
母亲信息
-
-
-
- 母亲姓名
- {{ dash(party?.motherName) }}
-
-
- 联系电话
- {{ dash(party?.motherPhone) }}
-
-
- 身份证号
- {{ dash(party?.motherIdCard) }}
-
-
- 出生年月
- {{ dash(party?.motherBirthYm) }}
-
-
- 民族
- {{ dash(party?.motherEthnic) }}
-
-
+
+
+
+
+
+ 地址
- {{ dash(party?.motherAddress) }}
+ 关联客户
{{
+ party?.customerId ? dash(party?.motherName) : '—'
+ }}
母亲姓名
{{ dash(party?.motherName) }}
母亲联系电话
{{ dash(party?.motherPhone) }}
母亲身份证号
{{ dash(party?.motherIdCard) }}
母亲出生年月
{{ formatYm(party?.motherBirthYm) }}
母亲民族
{{ dash(party?.motherEthnic) }}
母亲家庭住址
{{
+ dash(party?.motherAddress)
+ }}
-
+
父亲信息
父亲信息
-
+
+
-
- 父亲姓名
- {{ dash(party?.fatherName) }}
-
-
- 联系电话
- {{ dash(party?.fatherPhone) }}
-
-
+ 身份证号
- {{ dash(party?.fatherIdCard) }}
- 父亲姓名
{{ dash(party?.fatherName) }}
父亲电话
{{ dash(party?.fatherPhone) }}
父亲身份证号
{{ dash(party?.fatherIdCard) }}
-
+
新生儿信息
新生儿信息
-
+
+
+
+
+
+
+
+
-
- 新生儿姓名
- {{ dash(party?.newbornName) }}
-
-
- 身份证号
- {{ dash(party?.newbornIdCard) }}
-
-
- 出生时间
- {{ dash(party?.newbornDeliveryTime) }}
-
-
- 性别
- {{ newbornSexLabel(String(party?.newbornSex || '')) }}
-
-
- 分娩方式
- {{ deliveryModeLabel(String(party?.deliveryMode || '')) }}
-
-
- 胎次
- {{ dash(party?.birthOrder) }}
-
-
- 出生体重(g)
- {{ dash(party?.newbornWeightGram) }}
-
-
- Apgar 1分钟
- {{ dash(party?.apgar1min) }}
-
-
+ Apgar 5分钟
- {{ dash(party?.apgar5min) }}
- 新生儿姓名
{{ dash(party?.newbornName) }}
新生儿身份证
{{ dash(party?.newbornIdCard) }}
新生儿分娩时间
{{ dash(party?.newbornDeliveryTime) }}
新生儿性别
{{
+ newbornSexLabel(String(party?.newbornSex || ''))
+ }}
分娩方式
{{
+ deliveryModeLabel(String(party?.deliveryMode || ''))
+ }}
胎次
{{ dash(party?.birthOrder) }}
新生儿体重(克)
{{ dash(party?.newbornWeightGram) }}
新生儿评分1分钟
{{ dash(party?.apgar1min) }}
新生儿评分5分钟
{{ dash(party?.apgar5min) }}
采集信息
-
+
+
+
+
+
-
- 区域
- {{ dash(collection?.regionName || collection?.regionId) }}
-
-
- 医院
- {{ dash(collection?.hospitalName || collection?.hospitalId) }}
-
-
- 医护人员
- {{ dash(collection?.medicalStaff) }}
-
-
- 业务员
- {{ dash(collection?.salesUserName || collection?.salesUserId) }}
-
-
- 样本采集时间
- {{ dash(collection?.sampleCollectTime) }}
-
-
+ 母血采集时间
- {{ dash(collection?.maternalBloodCollectTime) }}
- 采集地区
{{ regionDisplay }}
采集医院
{{ hospitalDisplay }}
采集医护
{{ dash(collection?.medicalStaff) }}
销售人员
{{ salesDisplay }}
样本采集时间
{{ dash(collection?.sampleCollectTime) }}
母血采集时间
{{ dash(collection?.maternalBloodCollectTime) }}
-
+
样本信息
样本及运输信息
-
+
-
-
{{ sIdx + 1 }}
- {{ dash(row.sampleTypeName || row.sampleTypeId) }}
+ {{ sampleTypeName(row.sampleTypeId) }}
+
+ {{ sampleStatusLabel(String(row.sampleStatus || '')) }}
+
@@ -287,7 +321,9 @@
采集量
- {{ dash(row.collectAmount) }} {{ dash(row.unitName || row.unitId) }}
+ {{ dash(row.collectAmount) }} {{ unitName(row.unitId) }}
存储年限(年)
@@ -299,33 +335,31 @@
+
@@ -339,46 +373,36 @@
-
运输信息
-
运输方式
- {{ transportTypeLabel(String(row.transportType || '')) }}
+ 运输类型
+ {{
+ transportTypeLabel(String(row.transport?.transportType || ''))
+ }}
-
快递公司
- {{ dash(row.expressCompanyName || row.expressCompanyId) }}
+ 目的站点
+ {{
+ siteName(String(row.transport?.destSiteId || ''))
+ }}
-
- 运单号
- {{ dash(row.waybillNo) }}
+ 预计到达
+ {{ dash(row.transport?.etaTime) }}
-
- 运费(元)
- {{ row.expressFee ? `¥${row.expressFee}` : '—' }}
-
-
- 承运人姓名
- {{ dash(row.carrierName) }}
-
-
承运人电话
- {{ dash(row.carrierPhone) }}
+
+
快递/携带
+ {{ sampleTransportExtra(row.transport) }}
附件
+
-
-
+
- {{ dash(row.auditorUserName || row.auditorUserId) }}
+ {{ auditorDisplay(row) }}
@@ -446,15 +470,44 @@
+
+
+
diff --git a/web-admin/src/views/research-donation/list/index.vue b/web-admin/src/views/research-donation/list/index.vue
index b7896a1c..fb838548 100644
--- a/web-admin/src/views/research-donation/list/index.vue
+++ b/web-admin/src/views/research-donation/list/index.vue
@@ -18,7 +18,7 @@
-
+
+ {{
+ donationStatusLabel(String(row.donationStatus || ''))
+ }}
+
-
-
- {{ donationStatusLabel(String(row.donationStatus || '')) }}
-
-
-
+ />
{{
- sourceTypeLabel(String(row.sourceType || ''))
+ newbornSexLabel(String(row.newbornSex || ''))
}}
+
+ {{
+ deliveryModeLabel(String(row.deliveryMode || ''))
+ }}
+
+
审核记录
+ ![预览]()
+
+
+
+
+