Skip to content

W
warehousing-admin
Commit 46e23a8d by 杨子
Options

refactor(仓库管理): 优化仓库相关功能界面和逻辑 

- 移除仓库、货架、物资分类等界面中不必要的字段和搜索条件
- 调整入库单界面，增加状态显示和调整按钮条件判断
- 重构出库单界面，简化查询条件和表单字段
- 优化物资管理界面，移除冗余字段和调整供应商选择逻辑
- 增加库存选择对话框组件，支持出库时选择库存
- 调整axios请求超时时间为300秒
- 统一界面字段命名和显示方式
parent c6689a87
Showing with 309 additions and 143 deletions
src/components/InventorySelectDialog.vue 0 → 100644
<template>
<el-dialog :title="title" v-model="dialogVisible" width="1200px" append-to-body>
<el-form :model="queryParams" ref="queryRef" :inline="true" label-width="80px">
<el-form-item label="物资编码" prop="materialCode">
<el-input v-model="queryParams.materialCode" placeholder="请输入物资编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物资名称" prop="materialName">
<el-input v-model="queryParams.materialName" placeholder="请输入物资名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="货架" prop="locationId">
<el-input v-model="queryParams.locationName" placeholder="请选择货架" readonly clearable>
<template #append>
<el-button type="primary" @click="openLocationSelect">选择货架</el-button>
</template>
</el-input>
</el-form-item>
<el-form-item label="批次号" prop="batchNo">
<el-input v-model="queryParams.batchNo" placeholder="请输入批次号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="inventoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物资编码" align="center" prop="materialCode" />
<el-table-column label="物资名称" align="center" prop="materialName" />
<el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="物资ID" align="center" prop="materialId" />
<!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" /> -->
<!-- <el-table-column label="库区ID" align="center" prop="areaId" /> -->
<el-table-column label="货架ID" align="center" prop="locationId" />
<el-table-column label="批次号" align="center" prop="batchNo" width="180" />
<el-table-column label="生产日期" align="center" prop="productionDate" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" align="center" prop="expirationDate" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.expirationDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column label="可用数量" align="center" prop="availableQuantity" />
<el-table-column label="锁定数量" align="center" prop="lockedQuantity" />
<el-table-column label="单位成本" align="center" prop="unitCost" />
<el-table-column label="总成本" align="center" prop="totalCost" />
<!-- <el-table-column label="质量状态" align="center" prop="qualityStatus" /> -->
<el-table-column label="库存状态" align="center" prop="inventoryStatus">
<template #default="scope">
<dict-tag :options="inventory_status" :value="scope.row.inventoryStatus" />
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="handleQuery" />
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="handleConfirm">确 定</el-button>
<el-button @click="handleCancel">取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 货架选择对话框组件 -->
<LocationSelectDialog ref="locationSelectDialogRef" v-model:visible="locationDialogVisible" title="选择货架"
@confirm="handleLocationConfirm" />
</template>
<script setup name="InventorySelectDialog">
import { ref, computed, onMounted } from 'vue'
import { listWmsInventory } from '@/api/ware/wmsInventory'
import { parseTime } from '@/utils/ruoyi'
import { ElMessage } from 'element-plus'
import LocationSelectDialog from './LocationSelectDialog.vue'
const { proxy } = getCurrentInstance()
const {sys_yes_no, inventory_status} = proxy.useDict('sys_yes_no', 'inventory_status')
const props = defineProps({
visible: {
type: Boolean,
default: false
},
title: {
type: String,
default: '选择库存'
},
warehouseId: {
type: String,
default: null
}
})
const emit = defineEmits(['update:visible', 'confirm', 'cancel'])
const dialogVisible = computed({
get() {
return props.visible
},
set(value) {
emit('update:visible', value)
}
})
// 查询参数
const queryParams = ref({
pageNum: 1,
pageSize: 10,
materialCode: null,
materialName: null,
warehouseId: props.warehouseId,
locationId: null,
batchNo: null,
specification: null,
unit: null,
})
// 库存列表
const inventoryList = ref([])
// 加载状态
const loading = ref(false)
// 总条数
const total = ref(0)
// 选中的库存
const selectedInventory = ref([])
// 搜索按钮操作
function handleQuery() {
loading.value = true
listWmsInventory(queryParams.value).then(response => {
inventoryList.value = response.rows
total.value = response.total
loading.value = false
})
}
// 重置按钮操作
function handleReset() {
queryParams.value = {
pageNum: 1,
pageSize: 10,
materialCode: null,
materialName: null,
warehouseId: props.warehouseId,
locationId: null,
batchNo: null,
specification: null,
unit: null,
}
handleQuery()
}
// 重置按钮别名
const resetQuery = handleReset
// 处理选择变更
function handleSelectionChange(selection) {
selectedInventory.value = selection
}
// 确认按钮操作
function handleConfirm() {
if (selectedInventory.value.length === 0) {
ElMessage.warning('请至少选择一个库存')
return
}
emit('confirm', selectedInventory.value)
handleCancel()
}
// 取消按钮操作
function handleCancel() {
selectedInventory.value = []
emit('cancel')
dialogVisible.value = false
}
// 货架选择对话框状态
const locationDialogVisible = ref(false)
// 货架选择对话框实例引用
const locationSelectDialogRef = ref(null)
// 打开货架选择对话框
function openLocationSelect() {
locationDialogVisible.value = true
locationSelectDialogRef.value?.handleQuery()
}
// 处理货架选择确认
function handleLocationConfirm(selectedLocations) {
if (selectedLocations.length === 0) {
ElMessage.warning('请至少选择一个货架')
return
}
// 只使用第一个选择的货架
queryParams.value.locationId = selectedLocations[0].locationId
queryParams.value.locationName = selectedLocations[0].locationName
locationDialogVisible.value = false
}
defineExpose({
handleQuery,
handleReset,
})
</script>
src/components/WarehouseSelectDialog.vue
......@@ -17,14 +17,6 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库类型" prop="warehouseType">
<el-input
v-model="queryParams.warehouseType"
placeholder="请输入仓库类型"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
......
src/utils/request.js
......@@ -17,7 +17,7 @@ const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: import.meta.env.VITE_APP_BASE_API,
// 超时
timeout: 10000
timeout: 300000
})
// request拦截器
......
src/views/ware/wmsInboundOrder/components/AdjustInventoryDialog.vue
......@@ -8,7 +8,7 @@
<el-table :data="adjustInventoryDetailList" border style="width: 100%" height="600px">
<el-table-column prop="wmsMaterial.materialName" label="物资名称" width="200" fixed="left" />
<el-table-column prop="batchNo" label="批次号" width="150" />
<el-table-column prop="actualQuantity" label="数量" width="120">
<el-table-column prop="actualQuantity" label="实际数量" width="120">
<template #default="scope">
<el-input
v-if="scope.row.isEditing"
......
src/views/ware/wmsInboundOrder/components/InventoryDialog.vue
<template>
<el-dialog
title="入库操作"
v-model="dialogVisible"
width="1200px"
append-to-body
>
<el-dialog title="入库操作" v-model="dialogVisible" width="1200px" append-to-body>
<el-form :model="inventoryQueryParams" ref="inventoryQueryRef" :inline="true" label-width="120px">
<el-form-item label="批次号" prop="batchNo">
<el-input
v-model="inventoryQueryParams.batchNo"
placeholder="请输入或扫描批次号"
clearable
@keyup.enter="handleInventoryQuery"
@input="handleBatchNoInput"
/>
<el-input v-model="inventoryQueryParams.batchNo" placeholder="请输入或扫描批次号" clearable
@keyup.enter="handleInventoryQuery" @input="handleBatchNoInput" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleInventoryQuery">搜索</el-button>
......@@ -24,7 +14,13 @@
<el-table :data="inventoryDetailList" border style="width: 100%; margin-top: 20px;" height="600px">
<el-table-column prop="wmsMaterial.materialName" label="物资名称" width="200" />
<el-table-column prop="batchNo" label="批次号" width="150" />
<el-table-column prop="actualQuantity" label="数量" width="100" />
<el-table-column prop="planQuantity" label="计划数量" width="100" />
<el-table-column prop="actualQuantity" label="实际数量" width="100">
<template #default="scope">
<el-input v-model.number="scope.row.actualQuantity" placeholder="请输入实际数量" size="small"
@change="calculateAmount(scope.row)" type="number" :precision="3" :step="0.001" />
</template>
</el-table-column>
<el-table-column prop="unitPrice" label="单价" width="100" />
<el-table-column label="金额" width="100">
<template #default="scope">
......@@ -33,22 +29,22 @@
</el-table-column>
<el-table-column prop="wmsLocation.locationName" label="货架" width="100" />
<el-table-column prop="storageLocation" label="PTL标签" width="180">
<template #default="scope">
<el-input v-model="scope.row.storageLocation" placeholder="请选择PTL标签" size="small" readonly />
<el-button slot="append" type="primary" size="small" @click="openPtlTagSelect(scope.$index)">选择</el-button>
</template>
</el-table-column>
<el-table-column prop="rfidTagIds" label="RFID标签" width="180">
<template #default="scope">
<el-input v-model="scope.row.rfidTagIds" placeholder="请选择RFID标签" size="small" readonly />
<el-button slot="append" type="primary" size="small" @click="openRfidTagSelect(scope.$index)">选择</el-button>
</template>
</el-table-column>
<el-table-column prop="wmsInboundOrderItemId" label="操作" width="100" fixed="right">
<template #default="scope">
<el-button type="primary" size="small" @click="handleExportQrcode(scope.row)">打印二维码</el-button>
</template>
</el-table-column>
<template #default="scope">
<el-input v-model="scope.row.storageLocation" placeholder="请选择PTL标签" size="small" readonly />
<el-button slot="append" type="primary" size="small" @click="openPtlTagSelect(scope.$index)">选择</el-button>
</template>
</el-table-column>
<el-table-column prop="rfidTagIds" label="RFID标签" width="180">
<template #default="scope">
<el-input v-model="scope.row.rfidTagIds" placeholder="请选择RFID标签" size="small" readonly />
<el-button slot="append" type="primary" size="small" @click="openRfidTagSelect(scope.$index)">选择</el-button>
</template>
</el-table-column>
<el-table-column prop="wmsInboundOrderItemId" label="操作" width="100" fixed="right">
<template #default="scope">
<el-button type="primary" size="small" @click="handleExportQrcode(scope.row)">打印二维码</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
......@@ -67,12 +63,8 @@
@confirm="handlePtlTagConfirm" />
<!-- 二维码打印对话框组件 -->
<QrcodePrintDialog
ref="qrcodePrintDialogRef"
v-model:visible="qrcodePrintDialogVisible"
:qrcode-value="currentQrcodeValue"
@print="handleQrcodePrint"
/>
<QrcodePrintDialog ref="qrcodePrintDialogRef" v-model:visible="qrcodePrintDialogVisible"
:qrcode-value="currentQrcodeValue" @print="handleQrcodePrint" />
</el-dialog>
</template>
......@@ -116,6 +108,8 @@ const inventoryQueryParams = ref({
// 入库明细列表
const inventoryDetailList = ref([])
const inboundOrder = ref(null)
// RFID标签选择对话框状态
const rfidTagDialogVisible = ref(false)
const rfidTagSelectDialogRef = ref(null)
......@@ -138,23 +132,24 @@ function handleBatchNoInput() {
}
}
// 计算金额（数量 * 单价）
function calculateAmount(row) {
if (row && row.actualQuantity !== undefined && row.unitPrice !== undefined) {
// 确保数量和单价都是数字
const quantity = parseFloat(row.actualQuantity) || 0;
const unitPrice = parseFloat(row.unitPrice) || 0;
// 计算金额，保留2位小数
row.amount = parseFloat((quantity * unitPrice).toFixed(2));
}
}
// 入库明细查询
function handleInventoryQuery() {
if (!inventoryQueryParams.value.batchNo) {
proxy.$message.warning('请输入批次号')
return
}
listWmsInboundOrderItem({ batchNo: inventoryQueryParams.value.batchNo, orderId: props.currentOrder.orderId }).then(response => {
if(response.rows.length){
const currentOrder = response.rows[0];
if(currentOrder.putawayStatus === '1'){
proxy.$message.warning('该批次号已上架，不能重复上架')
}else{
inventoryDetailList.value = [currentOrder];
}
}else{
proxy.$message.warning('未查询到相关入库明细')
listWmsInboundOrderItem({ batchNo: inventoryQueryParams.value.batchNo, orderId: inboundOrder.value.orderId, putawayStatus: '0' }).then(response => {
if (response.rows.length) {
inventoryDetailList.value = response.rows;
} else {
proxy.$message.warning('未查询到相关入库明细或已全部入库')
}
}).catch(error => {
proxy.$message.error('查询入库明细失败：' + error.message)
......@@ -176,6 +171,11 @@ function confirmInventory() {
return
}
// 确认前重新计算所有行的金额，确保数据准确性
inventoryDetailList.value.forEach(item => {
calculateAmount(item);
});
proxy.$messageBox.confirm('确定要执行入库操作吗？', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -238,4 +238,13 @@ function handleExportQrcode(row) {
function handleQrcodePrint() {
proxy.$message.success('二维码打印成功')
}
function openDialog(currentInboundOrder) {
inboundOrder.value = currentInboundOrder
handleInventoryQuery()
}
defineExpose({
openDialog
})
</script>
src/views/ware/wmsInboundOrder/index.vue
......@@ -34,7 +34,11 @@
<el-table-column label="关联单号" align="center" prop="relatedOrderNo" />
<el-table-column label="总数量" align="center" prop="totalQuantity" />
<el-table-column label="总金额" align="center" prop="totalAmount" />
<!-- <el-table-column label="单据状态" align="center" prop="orderStatus" /> -->
<el-table-column label="状态" align="center" prop="orderStatus">
<template #default="scope">
<dict-tag :options="in_order_status" :value="scope.row.orderStatus" />
</template>
</el-table-column>
<el-table-column label="入库人" align="center" prop="applicantUserName" />
<el-table-column label="入库时间" align="center" prop="applyTime" width="180">
<template #default="scope">
......@@ -76,7 +80,7 @@
v-hasPermi="['ware:wmsInboundOrder:print']">打印入库单</el-button>
<el-button link type="primary" icon="Check" @click="handleInventory(scope.row)"
v-hasPermi="['ware:wmsInboundOrder:inventory']">入库</el-button>
<el-button v-if="scope.row.orderStatus !== '0'" link type="primary" icon="SetUp" @click="handleAdjustInventory(scope.row)"
<el-button v-if="showAdjustBtn(scope.row)" link type="primary" icon="SetUp" @click="handleAdjustInventory(scope.row)"
v-hasPermi="['ware:wmsInboundOrder:adjust']">调整入库明细信息</el-button>
</template>
</el-table-column>
......@@ -154,7 +158,7 @@
<el-col :span="8">
<el-form-item label="入库时间" prop="applyTime">
<el-date-picker clearable v-model="form.applyTime" type="date" value-format="YYYY-MM-DD"
placeholder="请选择申请时间" disabled >
placeholder="请选择申请时间">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -217,7 +221,7 @@
<el-divider>入库单明细</el-divider>
<el-row :gutter="20" style="margin-bottom: 10px;">
<el-col :span="24" style="text-align: right;">
<el-button v-if="title !== '修改入库单'" type="primary" size="small" icon="Plus" @click="addDetail">添加明细</el-button>
<el-button type="primary" size="small" icon="Plus" @click="addDetail">添加明细</el-button>
</el-col>
</el-row>
<el-table :data="form.items" border style="width: 100%">
......@@ -238,19 +242,6 @@
/>
</template>
</el-table-column>
<el-table-column prop="actualQuantity" label="实际数量" width="100">
<template #default="scope">
<el-input
v-model.number="scope.row.actualQuantity"
placeholder="请输入实际数量"
size="small"
@change="calculateAmount(scope.row)"
type="number"
:precision="3"
:step="0.001"
/>
</template>
</el-table-column>
<el-table-column prop="unit" label="单位" width="80">
<template #default="scope">
<el-input v-model="scope.row.unit" placeholder="请输入单位" size="small" disabled />
......@@ -370,6 +361,7 @@
<!-- 入库对话框 -->
<InventoryDialog
ref="inventoryDialogRef"
v-model:visible="inventoryDialogVisible"
:current-order="currentInventoryOrder"
@inventory-success="getList"
......@@ -395,11 +387,12 @@ import LocationCascaderSelect from "@/components/LocationCascaderSelect.vue"
import InventoryDialog from "./components/InventoryDialog.vue"
import AdjustInventoryDialog from "./components/AdjustInventoryDialog.vue"
import useUserStore from '@/store/modules/user'
import { dayjs } from "element-plus"
const { proxy } = getCurrentInstance()
const { inbound_type } = proxy.useDict('inbound_type')
const { inbound_type, in_order_status } = proxy.useDict('inbound_type', 'in_order_status')
const wmsInboundOrderList = ref([])
const open = ref(false)
......@@ -440,6 +433,8 @@ const ptlTagSelectDialogRef = ref(null)
const qrcodePrintDialogVisible = ref(false)
// 二维码打印对话框实例引用
const qrcodePrintDialogRef = ref(null)
// 入库对话框实例引用
const inventoryDialogRef = ref(null)
// 入库对话框状态
const inventoryDialogVisible = ref(false)
......@@ -502,10 +497,9 @@ const { queryParams, form, rules } = toRefs(data)
function handleInventory(row) {
currentInventoryOrder.value = row
inventoryDialogVisible.value = true
inventoryDialogRef.value?.openDialog(currentInventoryOrder.value)
}
// 调整已入库信息相关方法
// 打开调整入库信息对话框
function handleAdjustInventory(row) {
......@@ -1012,5 +1006,10 @@ function handleExportQrcode(row) {
qrcodePrintDialogVisible.value = true
}
function showAdjustBtn(row) {
// 当订单状态不是'0'且入库时间（applyTime）小于等于7天时显示调整按钮
return row.orderStatus !== '0' && dayjs(row.applyTime).isSameOrAfter(dayjs().subtract(7, 'day'))
}
getList()
</script>
\ No newline at end of file
src/views/ware/wmsLocation/index.vue
......@@ -17,22 +17,6 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="所属库区ID" prop="areaId">
<el-input
v-model="queryParams.areaId"
placeholder="请输入所属库区ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="RFID天线ID" prop="rfidAntennaId">
<el-input
v-model="queryParams.rfidAntennaId"
placeholder="请输入RFID天线ID"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
......@@ -87,9 +71,9 @@
<el-table-column label="货架名称" align="center" prop="locationName" />
<el-table-column label="所属库区" align="center" prop="areaId" />
<el-table-column label="货架类型" align="center" prop="locationType" />
<el-table-column label="X坐标" align="center" prop="xCoordinate" />
<!-- <el-table-column label="X坐标" align="center" prop="xCoordinate" />
<el-table-column label="Y坐标" align="center" prop="yCoordinate" />
<el-table-column label="Z坐标" align="center" prop="zCoordinate" />
<el-table-column label="Z坐标" align="center" prop="zCoordinate" /> -->
<el-table-column label="最大容量" align="center" prop="maxCapacity" />
<el-table-column label="当前容量" align="center" prop="currentCapacity" />
<el-table-column label="承重限制" align="center" prop="weightLimit" />
......@@ -146,7 +130,7 @@
</el-col>
</el-row>
</el-form-item>
<el-form-item label="X坐标" prop="xCoordinate">
<!-- <el-form-item label="X坐标" prop="xCoordinate">
<el-input v-model="form.xCoordinate" placeholder="请输入X坐标" />
</el-form-item>
<el-form-item label="Y坐标" prop="yCoordinate">
......@@ -154,7 +138,7 @@
</el-form-item>
<el-form-item label="Z坐标" prop="zCoordinate">
<el-input v-model="form.zCoordinate" placeholder="请输入Z坐标" />
</el-form-item>
</el-form-item> -->
<el-form-item label="最大容量" prop="maxCapacity">
<el-input v-model="form.maxCapacity" placeholder="请输入最大容量" />
</el-form-item>
......
src/views/ware/wmsMaterialCategory/index.vue
......@@ -62,7 +62,7 @@
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="属性模板" align="center" prop="attributeTemplate" />
<!-- <el-table-column label="属性模板" align="center" prop="attributeTemplate" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['ware:wmsMaterialCategory:edit']">修改</el-button>
......@@ -81,7 +81,7 @@
<el-form-item label="分类名称" prop="categoryName">
<el-input v-model="form.categoryName" placeholder="请输入分类名称" />
</el-form-item>
<el-form-item label="父分类ID" prop="parentId">
<el-form-item label="上级分类" prop="parentId">
<el-tree-select
v-model="form.parentId"
:data="wmsMaterialCategoryOptions"
......@@ -97,9 +97,9 @@
<el-form-item label="排序" prop="sortOrder">
<el-input v-model="form.sortOrder" placeholder="请输入显示顺序" />
</el-form-item>
<el-form-item label="属性模板" prop="attributeTemplate">
<!-- <el-form-item label="属性模板" prop="attributeTemplate">
<el-input v-model="form.attributeTemplate" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form-item> -->
</el-form>
<template #footer>
<div class="dialog-footer">
......
src/views/ware/wmsWarehouse/index.vue
......@@ -17,38 +17,6 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库面积" prop="area">
<el-input
v-model="queryParams.area"
placeholder="请输入仓库面积"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库容量" prop="capacity">
<el-input
v-model="queryParams.capacity"
placeholder="请输入仓库容量"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="仓货架置" prop="location">
<el-input
v-model="queryParams.location"
placeholder="请输入仓货架置"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库管理员" prop="managerId">
<el-input
v-model="queryParams.managerId"
placeholder="请输入仓库管理员"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
......@@ -105,8 +73,8 @@
<el-table-column label="仓库类型" align="center" prop="warehouseType" />
<el-table-column label="仓库面积" align="center" prop="area" />
<el-table-column label="仓库容量" align="center" prop="capacity" />
<el-table-column label="仓货架置" align="center" prop="location" />
<el-table-column label="仓库管理员" align="center" prop="managerId" />
<el-table-column label="仓货位置" align="center" prop="location" />
<!-- <el-table-column label="仓库管理员" align="center" prop="managerId" /> -->
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
......@@ -144,12 +112,12 @@
<el-form-item label="仓库容量" prop="capacity">
<el-input v-model="form.capacity" placeholder="请输入仓库容量" />
</el-form-item>
<el-form-item label="仓货架置" prop="location">
<el-input v-model="form.location" placeholder="请输入仓货架置" />
<el-form-item label="仓货位置" prop="location">
<el-input v-model="form.location" placeholder="请输入仓货位置" />
</el-form-item>
<el-form-item label="仓库管理员" prop="managerId">
<!-- <el-form-item label="仓库管理员" prop="managerId">
<el-input v-model="form.managerId" placeholder="请输入仓库管理员" />
</el-form-item>
</el-form-item> -->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment