重置
搜索
@@ -178,6 +179,7 @@
v-loading="logLoading"
stripe
row-key="id"
+ @row-dblclick="handleLogView"
>
-
- {{ getChangeTypeLabel(row.changeType) }}
+
+ {{ getChangeTypeLabel(row) }}
@@ -205,6 +207,12 @@
+
+ {{ row.taskNo || '-' }}
+
+
+ {{ row.stepName || '-' }}
+
@@ -212,23 +220,27 @@
-
- {{ row.taskNo || '-' }}
-
-
- {{ row.stepName || '-' }}
-
- {{ row.receiver || '-' }}
+ {{ displayLogReceiver(row) }}
- {{ row.purpose || '-' }}
+ {{ displayLogPurpose(row) }}
+
+
+ {{ displayLogUseTime(row) }}
{{ row.createByName || row.createBy || '-' }}
+
+
+
+ 查看
+
+
+
@@ -1015,20 +1036,101 @@
const logTableData = ref
([])
const logLoading = ref(false)
const logPagination = reactive({ page: 1, pageSize: 10, total: 0 })
+ const logViewVisible = ref(false)
+ const logViewRow = ref(null)
// 变动类型/来源映射
- function getChangeTypeLabel(changeType: string) {
- if (changeType === 'in') return '入库'
- if (changeType === 'use') return '出库'
- return changeType || '-'
+ function isManualOutLogRow(row: { changeType?: string; sourceType?: string }) {
+ return row.sourceType === 'manual_out'
}
- function getChangeTypeTagType(changeType: string) {
- if (changeType === 'in') return 'success'
- if (changeType === 'use') return 'warning'
+ function isStepUseLogRow(row: { changeType?: string; sourceType?: string }) {
+ return row.changeType === 'use' && row.sourceType === 'step_save'
+ }
+
+ function getChangeTypeLabel(row: { changeType?: string; sourceType?: string }) {
+ if (row.changeType === 'in') return '入库'
+ if (isManualOutLogRow(row)) return '出库'
+ if (isStepUseLogRow(row)) return '生产扣减'
+ if (row.changeType === 'use') return '出库'
+ return row.changeType || '-'
+ }
+
+ function getChangeTypeTagType(row: { changeType?: string; sourceType?: string }) {
+ if (row.changeType === 'in') return 'success'
+ if (isManualOutLogRow(row)) return 'warning'
+ if (isStepUseLogRow(row)) return 'primary'
+ if (row.changeType === 'use') return 'warning'
return 'info'
}
+ function displayLogReceiver(row: any) {
+ if (!isManualOutLogRow(row)) return '-'
+ return (row.receiver || '').trim() || '-'
+ }
+
+ function displayLogPurpose(row: any) {
+ if (!isManualOutLogRow(row)) return '-'
+ return (row.purpose || '').trim() || '-'
+ }
+
+ function displayLogUseTime(row: any) {
+ if (!isManualOutLogRow(row)) return '-'
+ return (row.useTime || row.createTime || '').trim() || '-'
+ }
+
+ const logViewSections = computed(() => {
+ if (!logViewRow.value) return []
+ const row = logViewRow.value
+ return [
+ {
+ title: '变动信息',
+ fields: [
+ { label: '耗材编码', value: row.materialCode },
+ { label: '耗材名称', value: row.materialName },
+ {
+ label: '变动类型',
+ value: getChangeTypeLabel(row),
+ tagType: getChangeTypeTagType(row) as 'success' | 'warning' | 'primary' | 'info'
+ },
+ {
+ label: '变动数量',
+ value: row.changeQty < 0 ? String(row.changeQty) : `+${row.changeQty}`
+ },
+ { label: '变动前库存', value: String(row.stockBefore ?? 0) },
+ { label: '变动后库存', value: String(row.stockAfter ?? 0) },
+ { label: '工单号', value: row.taskNo || '-' },
+ { label: '步骤名称', value: row.stepName || '-' },
+ {
+ label: '来源类型',
+ value: getSourceLabel(row.sourceType),
+ tagType: getSourceTagType(row.sourceType) as 'success' | 'warning' | 'primary' | 'info'
+ },
+ {
+ label: '领用人',
+ value: displayLogReceiver(row) === '-' ? '—' : displayLogReceiver(row)
+ },
+ {
+ label: '用途',
+ value: displayLogPurpose(row) === '-' ? '—' : displayLogPurpose(row)
+ },
+ {
+ label: '领用时间',
+ value: displayLogUseTime(row) === '-' ? '—' : displayLogUseTime(row)
+ },
+ { label: '备注', value: row.remark || '—', span: true },
+ { label: '操作人', value: row.createByName || row.createBy || '-' },
+ { label: '变动时间', value: row.createTime || '—' }
+ ]
+ }
+ ]
+ })
+
+ function handleLogView(row: any) {
+ logViewRow.value = row
+ logViewVisible.value = true
+ }
+
function getSourceLabel(sourceType: string) {
if (sourceType === 'manual_in') return '手动入库'
if (sourceType === 'manual_out') return '手动出库'
@@ -1540,9 +1642,27 @@
watch(activeTab, (val) => {
if (val === 'logs') {
+ logPagination.page = 1
loadLogData()
}
})
+
+ watchDebounced(
+ logSearchForm,
+ () => {
+ if (activeTab.value !== 'logs') return
+ logPagination.page = 1
+ loadLogData()
+ },
+ { debounce: 300, deep: true }
+ )
+
+ watch(logDateRange, () => {
+ if (activeTab.value !== 'logs') return
+ logPagination.page = 1
+ loadLogData()
+ })
+
// 输入检索条件时自动搜索（防抖 300ms）
watchDebounced(
searchForm,
diff --git a/web-admin/src/views/production/reagent/index.vue b/web-admin/src/views/production/reagent/index.vue
index 24f0baeb..900fa922 100644
--- a/web-admin/src/views/production/reagent/index.vue
+++ b/web-admin/src/views/production/reagent/index.vue
@@ -219,8 +219,9 @@
-
-
+
+
+
@@ -231,12 +232,13 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
+ clearable
style="width: 100%"
/>