fix(MmInventory): 调整表单布局并添加制造工单号验证规则
调整入库单和出库单对话框的表单标签宽度,从100px改为120px 为制造工单号字段添加条件显示和验证规则,采购入库时不显示且非必填
This commit is contained in:
@@ -130,7 +130,7 @@
|
|||||||
|
|
||||||
<!-- 入库单dialog -->
|
<!-- 入库单dialog -->
|
||||||
<el-dialog :title="title" :lock-scroll="false" v-model="openStorage">
|
<el-dialog :title="title" :lock-scroll="false" v-model="openStorage">
|
||||||
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
|
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :lg="12">
|
<el-col :lg="12">
|
||||||
<el-form-item label="物料编码" prop="materialCode">
|
<el-form-item label="物料编码" prop="materialCode">
|
||||||
@@ -216,7 +216,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
<el-col :lg="12">
|
<el-col :lg="12" v-if="form.transactionType !== '采购入库'">
|
||||||
<el-form-item label="制造工单号" prop="workorder">
|
<el-form-item label="制造工单号" prop="workorder">
|
||||||
<el-input v-model="form.workorder" placeholder="请输入制造工单号" />
|
<el-input v-model="form.workorder" placeholder="请输入制造工单号" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -242,7 +242,7 @@
|
|||||||
</el-dialog>
|
</el-dialog>
|
||||||
<!-- 出库单dialog -->
|
<!-- 出库单dialog -->
|
||||||
<el-dialog :title="title" :lock-scroll="false" v-model="openOutStorage">
|
<el-dialog :title="title" :lock-scroll="false" v-model="openOutStorage">
|
||||||
<el-form ref="formRef" :model="form" :rules="rulesOut" label-width="100px">
|
<el-form ref="formRef" :model="form" :rules="rulesOut" label-width="120px">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<!-- <el-col :lg="12" v-if="opertype != 1">
|
<!-- <el-col :lg="12" v-if="opertype != 1">
|
||||||
<el-form-item label="主键ID" prop="id">
|
<el-form-item label="主键ID" prop="id">
|
||||||
@@ -809,7 +809,20 @@ const state = reactive({
|
|||||||
warehouseCode: [{ required: true, message: '仓库编码不能为空', trigger: 'blur' }],
|
warehouseCode: [{ required: true, message: '仓库编码不能为空', trigger: 'blur' }],
|
||||||
locationCode: [{ required: true, message: '库位编码不能为空', trigger: 'blur' }],
|
locationCode: [{ required: true, message: '库位编码不能为空', trigger: 'blur' }],
|
||||||
// inboundNo: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
|
// inboundNo: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
|
||||||
batchNo: [{ required: true, message: '原材料批次号不能为空', trigger: 'blur' }]
|
batchNo: [{ required: true, message: '原材料批次号不能为空', trigger: 'blur' }],
|
||||||
|
workorder: [
|
||||||
|
{
|
||||||
|
validator: (rule, value, callback) => {
|
||||||
|
// 采购入库不需要制造工单号,其他入库类型需要
|
||||||
|
if (form.value.transactionType && form.value.transactionType !== '采购入库' && !value) {
|
||||||
|
callback(new Error('制造工单号不能为空'))
|
||||||
|
} else {
|
||||||
|
callback()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
trigger: 'blur'
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
rulesOut: {
|
rulesOut: {
|
||||||
materialCode: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
|
materialCode: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
|
||||||
|
|||||||
Reference in New Issue
Block a user