refactor(wms): apportionQty是打印的包数,materialQty是每包的物料数量

- 将"条码数量"和"分包数量"的列名称对调
- 注释掉所有的验证规则
- 更新列的顺序和可见性
master
zangch@mesnac.com 4 months ago
parent d95b391dd3
commit 68740bdb96

@ -98,8 +98,8 @@
<!-- <el-table-column label="入库单子表主键" align="center" prop="instockPrintId" v-if="columns[0].visible"/> -->
<el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[0].visible"/>
<el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[1].visible"/>
<el-table-column label="条码数量" align="center" prop="materialQty" v-if="columns[2].visible"/>
<el-table-column label="分包数量" align="center" prop="apportionQty" v-if="columns[3].visible"/>
<el-table-column label="每包数量" align="center" prop="materialQty" v-if="columns[2].visible"/>
<el-table-column label="条码数量" align="center" prop="apportionQty" v-if="columns[3].visible"/>
<!-- <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[6].visible"/> -->
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[4].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[5].visible"/>
@ -264,42 +264,42 @@ const data = reactive<PageData<InstockPrintForm, InstockPrintQuery>>({
}
},
rules: {
instockPrintId: [
{ required: true, message: "入库单子表主键不能为空", trigger: "blur" }
],
instockCode: [
{ required: true, message: "入库单号不能为空", trigger: "blur" }
],
batchCode: [
{ required: true, message: "批次码不能为空", trigger: "blur" }
],
materialQty: [
{ required: true, message: "条码数量不能为空", trigger: "blur" }
],
apportionQty: [
{ required: true, message: "分包数量不能为空", trigger: "blur" }
],
materialId: [
{ required: true, message: "物料id不能为空", trigger: "blur" }
],
materialCode: [
{ required: true, message: "物料编码不能为空", trigger: "blur" }
],
materialName: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
],
materialSpe: [
{ required: true, message: "物料规格不能为空", trigger: "blur" }
],
unitName: [
{ required: true, message: "计量单位名称不能为空", trigger: "blur" }
],
codeYesNo: [
{ required: true, message: "是否有条码不能为空", trigger: "blur" }
],
materialCategoryId: [
{ required: true, message: "物料大类不能为空", trigger: "blur" }
]
// instockPrintId: [
// { required: true, message: "", trigger: "blur" }
// ],
// instockCode: [
// { required: true, message: "", trigger: "blur" }
// ],
// batchCode: [
// { required: true, message: "", trigger: "blur" }
// ],
// materialQty: [
// { required: true, message: "", trigger: "blur" }
// ],
// apportionQty: [
// { required: true, message: "", trigger: "blur" }
// ],
// materialId: [
// { required: true, message: "id", trigger: "blur" }
// ],
// materialCode: [
// { required: true, message: "", trigger: "blur" }
// ],
// materialName: [
// { required: true, message: "", trigger: "blur" }
// ],
// materialSpe: [
// { required: true, message: "", trigger: "blur" }
// ],
// unitName: [
// { required: true, message: "", trigger: "blur" }
// ],
// codeYesNo: [
// { required: true, message: "", trigger: "blur" }
// ],
// materialCategoryId: [
// { required: true, message: "", trigger: "blur" }
// ]
}
});
@ -333,8 +333,8 @@ const columns = ref<FieldOption[]>([
// { key: 0, label: ``, visible: true },
{ key: 0, label: `入库单号`, visible: true },
{ key: 1, label: `批次码`, visible: true },
{ key: 2, label: `条码数量`, visible: true },
{ key: 3, label: `分包数量`, visible: true },
{ key: 2, label: `每包数量`, visible: true },
{ key: 3, label: `条码数量`, visible: true },
// { key: 6, label: ``, visible: false },
{ key: 4, label: `物料编码`, visible: true },
{ key: 5, label: `物料名称`, visible: true },

Loading…
Cancel
Save