|
|
|
@ -13,7 +13,7 @@
|
|
|
|
<!-- <el-form-item label="入库单号" prop="instockCode">
|
|
|
|
<!-- <el-form-item label="入库单号" prop="instockCode">
|
|
|
|
<el-input v-model="queryParams.instockCode" placeholder="请输入入库单号" clearable @keyup.enter="handleQuery" />
|
|
|
|
<el-input v-model="queryParams.instockCode" placeholder="请输入入库单号" clearable @keyup.enter="handleQuery" />
|
|
|
|
</el-form-item> -->
|
|
|
|
</el-form-item> -->
|
|
|
|
<el-form-item label="送货-物料表主键" prop="dnDId">
|
|
|
|
<!-- <el-form-item label="送货-物料表主键" prop="dnDId">
|
|
|
|
<el-input v-model="queryParams.dnDId" placeholder="请输入送货-物料表主键" clearable @keyup.enter="handleQuery" />
|
|
|
|
<el-input v-model="queryParams.dnDId" placeholder="请输入送货-物料表主键" clearable @keyup.enter="handleQuery" />
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="采购-物料表主键" prop="poDId">
|
|
|
|
<el-form-item label="采购-物料表主键" prop="poDId">
|
|
|
|
@ -39,7 +39,7 @@
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="是否有条码" prop="codeYesNo">
|
|
|
|
<el-form-item label="是否有条码" prop="codeYesNo">
|
|
|
|
<el-input v-model="queryParams.codeYesNo" placeholder="请输入是否有条码" clearable @keyup.enter="handleQuery" />
|
|
|
|
<el-input v-model="queryParams.codeYesNo" placeholder="请输入是否有条码" clearable @keyup.enter="handleQuery" />
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item> -->
|
|
|
|
<!-- <el-form-item label="物料大类" prop="materialCategoryId">
|
|
|
|
<!-- <el-form-item label="物料大类" prop="materialCategoryId">
|
|
|
|
<el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
|
|
|
|
<el-input v-model="queryParams.materialCategoryId" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />
|
|
|
|
</el-form-item>-->
|
|
|
|
</el-form-item>-->
|
|
|
|
@ -55,7 +55,7 @@
|
|
|
|
<el-card shadow="never">
|
|
|
|
<el-card shadow="never">
|
|
|
|
<template #header>
|
|
|
|
<template #header>
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<!-- <el-col :span="1.5">
|
|
|
|
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:instockDetail:add']">新增</el-button>
|
|
|
|
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:instockDetail:add']">新增</el-button>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
@ -63,7 +63,7 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:instockDetail:remove']">删除</el-button>
|
|
|
|
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:instockDetail:remove']">删除</el-button>
|
|
|
|
</el-col>
|
|
|
|
</el-col> -->
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:instockDetail:export']">导出</el-button>
|
|
|
|
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:instockDetail:export']">导出</el-button>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
@ -75,27 +75,28 @@
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
|
<!-- <el-table-column label="入库单子表主键" align="center" prop="instockDetailId" v-if="columns[0].visible"/>
|
|
|
|
<!-- <el-table-column label="入库单子表主键" align="center" prop="instockDetailId" v-if="columns[0].visible"/>
|
|
|
|
<el-table-column label="入库单 主键" align="center" prop="instockId" v-if="columns[1].visible"/> -->
|
|
|
|
<el-table-column label="入库单 主键" align="center" prop="instockId" v-if="columns[1].visible"/> -->
|
|
|
|
<!-- <el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[2].visible"/> -->
|
|
|
|
<el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[0].visible"/>
|
|
|
|
<!-- <el-table-column label="送货-物料表主键" align="center" prop="dnDId" v-if="columns[4].visible"/>
|
|
|
|
<!-- <el-table-column label="送货-物料表主键" align="center" prop="dnDId" v-if="columns[4].visible"/>
|
|
|
|
<el-table-column label="采购-物料表主键" align="center" prop="poDId" v-if="columns[5].visible"/> -->
|
|
|
|
<el-table-column label="采购-物料表主键" align="center" prop="poDId" v-if="columns[5].visible"/> -->
|
|
|
|
<!-- <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[6].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[7].visible"/>
|
|
|
|
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible"/>
|
|
|
|
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[8].visible"/>
|
|
|
|
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
|
|
|
|
<el-table-column label="入库数量" align="center" prop="instockQty" v-if="columns[9].visible"/>
|
|
|
|
<el-table-column label="入库数量" align="center" prop="instockQty" v-if="columns[3].visible"/>
|
|
|
|
<el-table-column label="已分包数量" align="center" prop="printedNum" />
|
|
|
|
|
|
|
|
<el-table-column label="物料规格" align="center" prop="materialSpe" v-if="columns[10].visible"/>
|
|
|
|
<el-table-column label="物料规格" align="center" prop="materialSpe" v-if="columns[4].visible"/>
|
|
|
|
<el-table-column label="计量单位名称" align="center" prop="unitName" v-if="columns[11].visible"/>
|
|
|
|
<el-table-column label="计量单位名称" align="center" prop="unitName" v-if="columns[5].visible"/>
|
|
|
|
<el-table-column label="是否有条码" align="center" prop="codeYesNo" v-if="columns[12].visible">
|
|
|
|
<!-- <el-table-column label="是否有条码" align="center" prop="codeYesNo" v-if="columns[12].visible">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<dict-tag :options="wms_barcode_if" :value="scope.row.codeYesNo"/>
|
|
|
|
<dict-tag :options="wms_barcode_if" :value="scope.row.codeYesNo"/>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[13].visible">
|
|
|
|
<el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[13].visible">
|
|
|
|
|
|
|
|
</el-table-column> -->
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="AGv状态" align="center" prop="agvStatus" v-if="columns[6].visible"/>
|
|
|
|
|
|
|
|
<el-table-column label="完成数量" align="center" prop="completeQty" v-if="columns[7].visible"/>
|
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
|
<template #default="scope">
|
|
|
|
<template #default="scope">
|
|
|
|
<el-tooltip content="修改" placement="top">
|
|
|
|
<!-- <el-tooltip content="修改" placement="top">
|
|
|
|
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:instockDetail:edit']"></el-button>
|
|
|
|
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:instockDetail:edit']"></el-button>
|
|
|
|
</el-tooltip>
|
|
|
|
</el-tooltip>
|
|
|
|
<el-tooltip content="删除" placement="top">
|
|
|
|
<el-tooltip content="删除" placement="top">
|
|
|
|
@ -103,13 +104,14 @@
|
|
|
|
</el-tooltip>
|
|
|
|
</el-tooltip>
|
|
|
|
<el-tooltip content="打印" placement="top">
|
|
|
|
<el-tooltip content="打印" placement="top">
|
|
|
|
<el-button link type="primary" icon="Check" @click="handlePrint(scope.row)"></el-button>
|
|
|
|
<el-button link type="primary" icon="Check" @click="handlePrint(scope.row)"></el-button>
|
|
|
|
</el-tooltip>
|
|
|
|
</el-tooltip> -->
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
|
|
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
|
|
|
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
|
|
|
|
<!-- 添加或修改入库单-物料对话框 -->
|
|
|
|
<!-- 添加或修改入库单-物料对话框 -->
|
|
|
|
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
|
|
|
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
|
|
|
|
<el-form ref="instockDetailFormRef" :model="form" :rules="rules" label-width="80px">
|
|
|
|
<el-form ref="instockDetailFormRef" :model="form" :rules="rules" label-width="80px">
|
|
|
|
@ -197,20 +199,14 @@ const printer = reactive<DialogOption>({
|
|
|
|
|
|
|
|
|
|
|
|
// 列显隐信息
|
|
|
|
// 列显隐信息
|
|
|
|
const columns = ref<FieldOption[]>([
|
|
|
|
const columns = ref<FieldOption[]>([
|
|
|
|
{ key: 0, label: `入库单子表主键`, visible: true },
|
|
|
|
{ key: 0, label: `入库单号`, visible: true },
|
|
|
|
{ key: 1, label: `入库单 主键`, visible: true },
|
|
|
|
{ key: 1, label: `物料编码`, visible: true },
|
|
|
|
{ key: 2, label: `入库单号`, visible: true },
|
|
|
|
{ key: 2, label: `物料名称`, visible: true },
|
|
|
|
{ key: 3, label: `创建时间`, visible: true },
|
|
|
|
{ key: 3, label: `入库数量`, visible: true },
|
|
|
|
{ key: 4, label: `送货-物料表主键`, visible: true },
|
|
|
|
{ key: 4, label: `物料规格`, visible: true },
|
|
|
|
{ key: 5, label: `采购-物料表主键`, visible: true },
|
|
|
|
{ key: 5, label: `计量单位名称`, visible: true },
|
|
|
|
{ key: 6, label: `物料id`, visible: true },
|
|
|
|
{ key: 6, label: `AGV状态`, visible: true },
|
|
|
|
{ key: 7, label: `物料编码`, visible: true },
|
|
|
|
{ key: 7, label:'完成数量',visible: true}
|
|
|
|
{ key: 8, label: `物料名称`, visible: true },
|
|
|
|
|
|
|
|
{ key: 9, label: `入库数量`, visible: true },
|
|
|
|
|
|
|
|
{ key: 10, label: `物料规格`, visible: true },
|
|
|
|
|
|
|
|
{ key: 11, label: `计量单位名称`, visible: true },
|
|
|
|
|
|
|
|
{ key: 12, label: `是否有条码`, visible: true },
|
|
|
|
|
|
|
|
{ key: 13, label: `物料大类`, visible: true },
|
|
|
|
|
|
|
|
]);
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
|
|
const initFormData: InstockDetailForm = {
|
|
|
|
const initFormData: InstockDetailForm = {
|
|
|
|
@ -226,7 +222,10 @@ const initFormData: InstockDetailForm = {
|
|
|
|
materialSpe: undefined,
|
|
|
|
materialSpe: undefined,
|
|
|
|
unitName: undefined,
|
|
|
|
unitName: undefined,
|
|
|
|
codeYesNo: undefined,
|
|
|
|
codeYesNo: undefined,
|
|
|
|
materialCategoryId: undefined
|
|
|
|
materialCategoryId: undefined,
|
|
|
|
|
|
|
|
isAgv: '0',
|
|
|
|
|
|
|
|
completeQty: undefined,
|
|
|
|
|
|
|
|
agvStatus: undefined,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const data = reactive<PageData<InstockDetailForm, InstockDetailQuery>>({
|
|
|
|
const data = reactive<PageData<InstockDetailForm, InstockDetailQuery>>({
|
|
|
|
form: {...initFormData},
|
|
|
|
form: {...initFormData},
|
|
|
|
@ -247,19 +246,22 @@ const data = reactive<PageData<InstockDetailForm, InstockDetailQuery>>({
|
|
|
|
codeYesNo: undefined,
|
|
|
|
codeYesNo: undefined,
|
|
|
|
materialCategoryId: undefined,
|
|
|
|
materialCategoryId: undefined,
|
|
|
|
materialCategoryName: undefined,//字段映射
|
|
|
|
materialCategoryName: undefined,//字段映射
|
|
|
|
|
|
|
|
isAgv: '0',
|
|
|
|
|
|
|
|
completeQty: undefined,
|
|
|
|
|
|
|
|
agvStatus: undefined,
|
|
|
|
params: {
|
|
|
|
params: {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
rules: {
|
|
|
|
rules: {
|
|
|
|
dnDId: [
|
|
|
|
// dnDId: [
|
|
|
|
{ required: true, message: "送货-物料表主键不能为空", trigger: "blur" }
|
|
|
|
// { required: true, message: "送货-物料表主键不能为空", trigger: "blur" }
|
|
|
|
],
|
|
|
|
// ],
|
|
|
|
poDId: [
|
|
|
|
// poDId: [
|
|
|
|
{ required: true, message: "采购-物料表主键不能为空", trigger: "blur" }
|
|
|
|
// { required: true, message: "采购-物料表主键不能为空", trigger: "blur" }
|
|
|
|
],
|
|
|
|
// ],
|
|
|
|
materialId: [
|
|
|
|
// materialId: [
|
|
|
|
{ required: true, message: "物料id不能为空", trigger: "blur" }
|
|
|
|
// { required: true, message: "物料id不能为空", trigger: "blur" }
|
|
|
|
],
|
|
|
|
// ],
|
|
|
|
// materialCode: [
|
|
|
|
// materialCode: [
|
|
|
|
// { required: true, message: "物料编码不能为空", trigger: "blur" }
|
|
|
|
// { required: true, message: "物料编码不能为空", trigger: "blur" }
|
|
|
|
// ],
|
|
|
|
// ],
|
|
|
|
@ -296,6 +298,7 @@ const getList = async () => {
|
|
|
|
total.value = res.total;
|
|
|
|
total.value = res.total;
|
|
|
|
loading.value = false;
|
|
|
|
loading.value = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/** 查询入库单大类下物料列表 */
|
|
|
|
/** 查询入库单大类下物料列表 */
|
|
|
|
const getMaterialList = async () => {
|
|
|
|
const getMaterialList = async () => {
|
|
|
|
const materialCategoryId = router.query.materialCategoryId
|
|
|
|
const materialCategoryId = router.query.materialCategoryId
|
|
|
|
@ -369,9 +372,9 @@ const handlePrint = async (row?: InstockDetailVO) => {
|
|
|
|
/** 提交按钮 */
|
|
|
|
/** 提交按钮 */
|
|
|
|
const submitForm = () => {
|
|
|
|
const submitForm = () => {
|
|
|
|
instockDetailFormRef.value?.validate(async (valid: boolean) => {
|
|
|
|
instockDetailFormRef.value?.validate(async (valid: boolean) => {
|
|
|
|
form.value.materialCategoryId = router.query.materialCategoryId;
|
|
|
|
// form.value.materialCategoryId = router.query.materialCategoryId;
|
|
|
|
form.value.instockId = router.query.instockId;
|
|
|
|
// form.value.instockId = router.query.instockId;
|
|
|
|
form.value.instockCode = router.query.instockCode;
|
|
|
|
// form.value.instockCode = router.query.instockCode;
|
|
|
|
if (valid) {
|
|
|
|
if (valid) {
|
|
|
|
buttonLoading.value = true;
|
|
|
|
buttonLoading.value = true;
|
|
|
|
if (form.value.instockDetailId) {
|
|
|
|
if (form.value.instockDetailId) {
|
|
|
|
@ -423,10 +426,9 @@ const getMaterialCategorySelect = async () => {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onMounted(() => {
|
|
|
|
onMounted(() => {
|
|
|
|
getMaterialList();
|
|
|
|
// getMaterialList();
|
|
|
|
const materialCategoryId = router.query.materialCategoryId
|
|
|
|
// const materialCategoryId = router.query.materialCategoryId
|
|
|
|
console.log(materialCategoryId)
|
|
|
|
|
|
|
|
getList();
|
|
|
|
getList();
|
|
|
|
getMaterialCategorySelect();
|
|
|
|
// getMaterialCategorySelect();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
</script>
|
|
|
|
</script>
|
|
|
|
|
