This commit is contained in:
张怡蓉
2025-11-03 10:00:29 +08:00
parent bec3d856e5
commit 6f0b7fa0a5
10 changed files with 78 additions and 34 deletions

View File

@@ -12,14 +12,14 @@
/>
</el-form-item>
<!-- 项目编号 -->
<el-form-item label="项目编号" prop="projectNo">
<el-input
v-model="queryParams.projectNo"
placeholder="请输入项目编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="项目编号" prop="projectNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.projectNo"-->
<!-- placeholder="请输入项目编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- 仓库名称 -->
<el-form-item label="仓库名称" prop="warehouseName">
<el-input
@@ -146,7 +146,7 @@
<!-- 仓库编号 -->
<el-table-column label="仓库编号" align="left" prop="warehouseNo" />
<!-- 项目编号 -->
<el-table-column label="项目编号" align="left" prop="projectNo" />
<!-- <el-table-column label="项目编号" align="left" prop="projectNo" />-->
<!-- 仓库名称 -->
<el-table-column label="仓库名称" align="left" prop="warehouseName" />
<!-- 仓库地址 -->
@@ -154,7 +154,7 @@
<!-- 备注 -->
<el-table-column label="备注" align="left" prop="cdesc" />
<!-- 仓库级别 -->
<el-table-column label="仓库级别" align="left" prop="warehouseKind" />
<!-- <el-table-column label="仓库级别" align="left" prop="warehouseKind" />-->
<!-- 仓库类型 -->
<el-table-column label="仓库类型" align="left" prop="warehouseType" >
<template slot-scope="scope">
@@ -210,9 +210,9 @@
<el-input v-model="form.warehouseNo" placeholder="请输入仓库编号" />
</el-form-item>
<!-- 项目编号 -->
<el-form-item label="项目编号" prop="projectNo">
<el-input v-model="form.projectNo" placeholder="请输入项目编号" />
</el-form-item>
<!-- <el-form-item label="项目编号" prop="projectNo">-->
<!-- <el-input v-model="form.projectNo" placeholder="请输入项目编号" />-->
<!-- </el-form-item>-->
<!-- 仓库名称 -->
<el-form-item label="仓库名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
@@ -226,14 +226,14 @@
<el-input v-model="form.cdesc" placeholder="请输入备注" />
</el-form-item>
<!-- 仓库级别 -->
<el-form-item label="仓库级别" prop="warehouseKind">
<el-input
v-model="form.warehouseKind"
placeholder="请输入仓库级别"
maxlength="2"
show-word-limit
/>
</el-form-item>
<!-- <el-form-item label="仓库级别" prop="warehouseKind">-->
<!-- <el-input-->
<!-- v-model="form.warehouseKind"-->
<!-- placeholder="请输入仓库级别"-->
<!-- maxlength="2"-->
<!-- show-word-limit-->
<!-- />-->
<!-- </el-form-item>-->
<!-- 仓库类型 -->
<el-form-item label="仓库类型" prop="warehouseType">
<el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
@@ -327,10 +327,10 @@ export default {
// 校验---仓库是否可用选项是否为空
{ required: true, message: "是否可用不能为空", trigger: "change" }
],
warehouseKind: [
// 校验---仓库级别长度限制
{ max: 2, message: "仓库级别不能超过2个字符", trigger: "blur" }
]
warehouseType: [
// 校验---仓库是否可用选项是否为空
{ required: true, message: "仓库类型不能为空", trigger: "blur" }
],
},
//修改【仓库管理】界面id文本框是否可交互

View File

@@ -334,6 +334,11 @@
<el-table-column type="selection" width="55" align="center" :selectable="stockSelectable" />
<el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="仓库" align="center" prop="warehouseId" >
<template slot-scope="scope">
<dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
</template>
</el-table-column>
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />

View File

@@ -60,6 +60,11 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="仓库" align="center" prop="warehouseId" >
<template slot-scope="scope">
<dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
</template>
</el-table-column>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="物料编码" align="center" prop="productId" />