+
* 规则：序列号与批号互斥且必填其一 (填写一个会自动清空另一个)
@@ -185,8 +194,8 @@
- 取消
-
+ 取消
+
{{ dialogStatus === 'create' ? '确认入库' : '保存修改' }}
@@ -213,25 +222,24 @@ const queryParams = reactive({ page: 1, pageSize: 15 })
// --- 1. 列定义 ---
const baseColumns = [
- { prop: 'material_name', label: '物料名称', minWidth: '150' },
- { prop: 'category', label: '类别', minWidth: '100' },
- { prop: 'spec_model', label: '规格型号', minWidth: '150' },
- { prop: 'unit', label: '单位', minWidth: '70' }
+ { prop: 'material_name', label: '物料名称', minWidth: '200' },
+ { prop: 'category', label: '类别', minWidth: '120' },
+ { prop: 'spec_model', label: '规格型号', minWidth: '200' },
+ { prop: 'unit', label: '单位', minWidth: '100' }
]
const stockColumns = [
- { prop: 'sku', label: '编码/SKU', minWidth: '140' },
- { prop: 'inbound_date', label: '入库日期', minWidth: '120' },
- // 组合展示列
- { prop: 'serial_batch', label: '序列号/批号', minWidth: '160' },
- { prop: 'stock_quantity', label: '库存数', minWidth: '90' },
- { prop: 'available_quantity', label: '可用数', minWidth: '90' },
- { prop: 'in_quantity', label: '入库量', minWidth: '90' },
- { prop: 'unit_price', label: '单价', minWidth: '110' },
- { prop: 'total_price', label: '总价', minWidth: '110' },
- { prop: 'status', label: '状态', minWidth: '90' },
- { prop: 'warehouse_location', label: '库位', minWidth: '100' },
- { prop: 'supplier_name', label: '供应商', minWidth: '150' }
+ { prop: 'sku', label: '编码/SKU', minWidth: '180' },
+ { prop: 'inbound_date', label: '入库日期', minWidth: '160' },
+ { prop: 'serial_batch', label: '序列号/批号', minWidth: '220' },
+ { prop: 'qty_stock', label: '库存数', minWidth: '120' },
+ { prop: 'qty_available', label: '可用数', minWidth: '120' },
+ { prop: 'qty_inbound', label: '入库量', minWidth: '120' },
+ { prop: 'price_unit', label: '单价', minWidth: '150' },
+ { prop: 'price_total', label: '总价', minWidth: '150' },
+ { prop: 'status', label: '状态', minWidth: '120' },
+ { prop: 'warehouse_loc', label: '库位', minWidth: '150' },
+ { prop: 'supplier_name', label: '供应商', minWidth: '200' }
]
const allColumns = [...baseColumns, ...stockColumns]
@@ -239,12 +247,12 @@ const allColumns = [...baseColumns, ...stockColumns]
// --- 2. 默认展示列 ---
const visibleColumnProps = ref([
'material_name', 'spec_model', 'inbound_date',
- 'serial_batch', 'stock_quantity', 'available_quantity', 'status'
+ 'serial_batch', 'qty_stock', 'qty_available', 'status'
])
// --- 3. 表单对象 ---
const form = reactive({
- id: undefined, // 编辑时使用
+ id: undefined,
material_name: '', category: '', spec_model: '', unit: '个',
material_type: '采购件', visibility_level: 0,
sku: '', in_date: '',
@@ -255,12 +263,11 @@ const form = reactive({
supplier_name: '', arrival_photo: '', remark: ''
})
-// --- 4. 校验逻辑 (互斥且必填其一) ---
+// --- 4. 校验逻辑 ---
const validateIdentity = (rule: any, value: any, callback: any) => {
if (!form.serial_number && !form.batch_number) {
callback(new Error('序列号和批号至少填写一项'))
} else {
- // 清除交叉报错
if (formRef.value) {
if (rule.field === 'serial_number' && form.batch_number) formRef.value.clearValidate('batch_number')
if (rule.field === 'batch_number' && form.serial_number) formRef.value.clearValidate('serial_number')
@@ -278,12 +285,8 @@ const rules = {
}
// --- 5. 监听逻辑 ---
-watch(() => form.serial_number, (val) => {
- if (val && form.batch_number) form.batch_number = ''
-})
-watch(() => form.batch_number, (val) => {
- if (val && form.serial_number) form.serial_number = ''
-})
+watch(() => form.serial_number, (val) => { if (val && form.batch_number) form.batch_number = '' })
+watch(() => form.batch_number, (val) => { if (val && form.serial_number) form.serial_number = '' })
watch(() => form.in_quantity, (newVal) => {
if (newVal !== undefined) {
@@ -297,16 +300,15 @@ watch(() => form.in_quantity, (newVal) => {
watch(() => form.unit_price, (newVal) => {
if (newVal !== undefined) {
- form.total_price = Number((newVal * form.in_quantity).toFixed(4))
+ form.total_price = Number((newVal * (form.in_quantity || 0)).toFixed(4))
}
})
// --- 6. 核心操作 ---
-
const fetchData = async () => {
loading.value = true
try {
- const res = await getBuyList(queryParams)
+ const res: any = await getBuyList(queryParams)
tableData.value = res.data.items || []
total.value = res.data.total || 0
} finally { loading.value = false }
@@ -319,33 +321,27 @@ const handleCreate = () => {
visible.value = true
}
-// 核心修改：手动映射后端数据到前端表单
const handleUpdate = (row: any) => {
dialogStatus.value = 'update'
-
- // 先重置表单防止残留
resetForm()
-
- // 1. 基础字段拷贝
- Object.assign(form, row)
-
- // 2. 修正字段映射 (后端Key -> 前端Form Key)
form.id = row.id
- form.in_quantity = Number(row.qty_inbound) || 1
- form.stock_quantity = Number(row.qty_inbound) || 1 // 这里假设库存没变，或者应由后端传回stock_quantity
- form.available_quantity = Number(row.qty_available) || 1
+ form.material_name = row.material_name
+ form.spec_model = row.spec_model
+ form.category = row.category
+ form.unit = row.unit
+ form.sku = row.sku
+ form.in_date = row.inbound_date
+ form.in_quantity = Number(row.qty_inbound) || 0
+ form.stock_quantity = Number(row.qty_stock) || 0
+ form.available_quantity = Number(row.qty_available) || 0
form.unit_price = Number(row.price_unit) || 0
+ form.total_price = Number(row.price_total) || 0
form.warehouse_location = row.warehouse_loc || ''
form.serial_number = row.serial_number || ''
form.batch_number = row.batch_number || ''
+ form.supplier_name = row.supplier_name || ''
form.status = row.status || '在库'
-
- // 3. 计算总价
- form.total_price = Number((form.in_quantity * form.unit_price).toFixed(2))
-
- // 4. 补充日期
- if (!form.in_date) form.in_date = dayjs().format('YYYY-MM-DD HH:mm:ss')
-
+ form.remark = row.remark || ''
visible.value = true
}
@@ -355,7 +351,7 @@ const handleDelete = async (row: any) => {
ElMessage.success('删除成功')
fetchData()
} catch (e: any) {
- ElMessage.error(e.message || '删除失败')
+ ElMessage.error('删除失败')
}
}
@@ -375,7 +371,7 @@ const submitForm = async () => {
visible.value = false
fetchData()
} catch (e: any) {
- ElMessage.error(e.message || '提交失败')
+ ElMessage.error('提交失败')
} finally { submitting.value = false }
}
})
@@ -399,17 +395,27 @@ const getStatusType = (status: string) => {
return status === '在库' ? 'success' : 'info'
}
-const formatMoney = (val: number) => {
- return val ? `¥ ${Number(val).toFixed(2)}` : '-'
+const formatMoney = (val: any) => {
+ const num = Number(val)
+ return isNaN(num) ? '-' : `¥ ${num.toFixed(2)}`
}
onMounted(() => fetchData())
\ No newline at end of file
diff --git a/inventory-web/src/views/stock/query.vue b/inventory-web/src/views/stock/query.vue
deleted file mode 100644
index 96c0baf..0000000
--- a/inventory-web/src/views/stock/query.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/inventory-web/src/views/stock/semi.vue b/inventory-web/src/views/stock/semi.vue
deleted file mode 100644
index 96c0baf..0000000
--- a/inventory-web/src/views/stock/semi.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file