fix: reset stock quantity color and enforce location validation for all inbound operations
This commit is contained in:
@ -229,17 +229,13 @@
|
||||
|
||||
<el-table-column v-if="columns.inventory.visible" prop="inventoryCount" label="库存数" min-width="100" align="center" sortable="custom">
|
||||
<template #default="{ row }">
|
||||
<span :style="{ fontWeight: 'bold', color: row.inventoryCount > 0 ? '#67C23A' : '#909399' }">
|
||||
{{ row.inventoryCount }}
|
||||
</span>
|
||||
<span>{{ row.inventoryCount }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column v-if="columns.available.visible" prop="availableCount" label="可用数" min-width="100" align="center" sortable="custom">
|
||||
<template #default="{ row }">
|
||||
<span :style="{ fontWeight: 'bold', color: row.availableCount > 0 ? '#409EFF' : '#909399' }">
|
||||
{{ row.availableCount }}
|
||||
</span>
|
||||
<span>{{ row.availableCount }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
@ -1180,6 +1180,7 @@ const rules = computed(() => {
|
||||
const baseRules = {
|
||||
base_id: [{required: true, message: '请选择物料', trigger: 'change'}],
|
||||
in_quantity: [{required: true, message: '请输入数量', trigger: 'blur'}],
|
||||
warehouse_location: [{required: true, message: '库位不能为空,请填写或选择', trigger: ['blur', 'change']}],
|
||||
serial_number: [{validator: validateIdentity, trigger: 'blur'}, {validator: validateUnique, trigger: 'blur'}],
|
||||
batch_number: [{validator: validateIdentity, trigger: 'blur'}, {validator: validateUnique, trigger: 'blur'}]
|
||||
}
|
||||
|
||||
@ -923,7 +923,8 @@ const validateUnique = (rule: any, value: string, callback: any) => {
|
||||
const rules = {
|
||||
base_id: [{ required: true, message: '必选', trigger: 'change' }],
|
||||
serial_number: [{ required: true, message: '必填', trigger: 'blur' }, { validator: validateUnique, trigger: 'blur' }],
|
||||
in_quantity: [{ required: true, message: '必填', trigger: 'blur' }]
|
||||
in_quantity: [{ required: true, message: '必填', trigger: 'blur' }],
|
||||
warehouse_location: [{required: true, message: '库位不能为空,请填写或选择', trigger: ['blur', 'change']}]
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1050,6 +1050,7 @@ const validateIdentity = (rule: any, value: any, callback: any) => {
|
||||
const rules = {
|
||||
base_id: [{required: true, message: '请选择物料', trigger: 'change'}],
|
||||
in_quantity: [{required: true, message: '请输入数量', trigger: 'blur'}],
|
||||
warehouse_location: [{required: true, message: '库位不能为空,请填写或选择', trigger: ['blur', 'change']}],
|
||||
serial_number: [{validator: validateIdentity, trigger: 'blur'}, {validator: validateUnique, trigger: 'blur'}],
|
||||
batch_number: [{validator: validateIdentity, trigger: 'blur'}, {validator: validateUnique, trigger: 'blur'}]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user