完善库存页面

klp-ui/src/views/wms/productBom/index.vue

@@ -1,20 +1,12 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="产品ID" prop="productId">
+      <el-form-item label="产品" prop="productId">
         <ProductSelect v-model="queryParams.productId" placeholder="请选择产品" />
       </el-form-item>
-      <el-form-item label="原材料ID" prop="rawMaterialId">
+      <el-form-item label="原材料" prop="rawMaterialId">
         <RawMaterialSelect v-model="queryParams.rawMaterialId" placeholder="请选择原材料" />
       </el-form-item>
-      <el-form-item label="每个产品所需原材料数量" prop="quantity">
-        <el-input
-          v-model="queryParams.quantity"
-          placeholder="请输入每个产品所需原材料数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="单位" prop="unit">
         <el-input
           v-model="queryParams.unit"
@@ -75,7 +67,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="产品" align="center" prop="productName" />
       <el-table-column label="原材料" align="center" prop="rawMaterialName" />
-      <el-table-column label="每个产品所需原材料数量" align="center" prop="quantity" />
+      <el-table-column label="原材料数量" align="center" prop="quantity" />
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -106,14 +98,14 @@
 
     <!-- 添加或修改产品BOM（产品-原材料清单）对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="产品" prop="productId">
           <ProductSelect v-model="form.productId" placeholder="请选择产品" />
         </el-form-item>
         <el-form-item label="原材料" prop="rawMaterialId">
           <RawMaterialSelect v-model="form.rawMaterialId" placeholder="请选择原材料" />
         </el-form-item>
-        <el-form-item label="每个产品所需原材料数量" prop="quantity">
+        <el-form-item label="原材料数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入每个产品所需原材料数量" />
         </el-form-item>
         <el-form-item label="单位" prop="unit">

klp-ui/src/views/wms/stock/index.vue

@@ -1,14 +1,26 @@
 <template>
-  <div class="app-container">
+  <div class="app-container stock-layout">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-row gutter="0">
-      <el-form-item label="仓库/库区/库位ID" prop="warehouseId">
+      <!-- 左侧树结构 -->
-        <warehouse-select
+      <el-col :span="5" class="stock-tree-col">
-          v-model="queryParams.warehouseId"
+        <el-card shadow="never" class="stock-tree-card">
-          placeholder="请选择仓库/库区/库位"
+          <div slot="header" class="stock-tree-title">仓库结构</div>
-          style="width: 100%;"
+          <el-tree
-          clearable
+            :data="warehouseTreeData"
+            :props="treeProps"
+            node-key="warehouseId"
+            highlight-current
+            @node-click="handleTreeSelect"
+            :expand-on-click-node="false"
+            :default-expand-all="true"
+            class="stock-tree"
           />
-      </el-form-item>
+        </el-card>
+      </el-col>
+      <!-- 右侧内容 -->
+      <el-col :span="19" class="stock-main-col">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <!-- 移除仓库筛选项 -->
           <el-form-item label="物品类型" prop="itemType">
             <el-select v-model="queryParams.itemType" placeholder="请选择物品类型" clearable>
               <el-option
@@ -19,7 +31,7 @@
               />
             </el-select>
           </el-form-item>
-      <el-form-item label="物品ID" prop="itemId">
+          <el-form-item label="物料" prop="itemId">
             <raw-material-select
               v-if="queryParams.itemType === 'rawMaterial'"
               v-model="queryParams.itemId"
@@ -42,14 +54,6 @@
               style="width: 100%;"
             />
           </el-form-item>
-      <el-form-item label="库存数量" prop="quantity">
-        <el-input
-          v-model="queryParams.quantity"
-          placeholder="请输入库存数量"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
           <el-form-item label="单位" prop="unit">
             <el-input
               v-model="queryParams.unit"
@@ -58,14 +62,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-      <el-form-item label="批次号" prop="batchNo">
-        <el-input
-          v-model="queryParams.batchNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -121,13 +117,13 @@
         <el-table v-loading="loading" :data="stockList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="主键ID" align="center" prop="stockId" v-if="true"/>
-      <el-table-column label="仓库/库区/库位ID" align="center" prop="warehouseId" />
           <el-table-column label="物品类型" align="center" prop="itemType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType"/>
             </template>
           </el-table-column>
-      <el-table-column label="物品ID" align="center" prop="itemId" />
+          <el-table-column label="物品" align="center" prop="itemName" />
+          <el-table-column label="物品编号" align="center" prop="itemCode" />
           <el-table-column label="库存数量" align="center" prop="quantity" />
           <el-table-column label="单位" align="center" prop="unit" />
           <el-table-column label="批次号" align="center" prop="batchNo" />
@@ -160,7 +156,7 @@
           @pagination="getList"
         />
 
-    <!-- 添加或修改库存：原材料/产品与库区/库位的存放关系对话框 -->
+        <!-- 添加或修改库存对话框（保持不变） -->
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="仓库/库区/库位ID" prop="warehouseId">
@@ -222,14 +218,17 @@
             <el-button @click="cancel">取 消</el-button>
           </div>
         </el-dialog>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
 import { listStock, getStock, delStock, addStock, updateStock } from "@/api/wms/stock";
-import WarehouseSelect from "@/components/WarehouseSelect";
+import { listWarehouse } from "@/api/wms/warehouse";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import ProductSelect from "@/components/KLPService/ProductSelect";
+import WarehouseSelect from "@/components/WarehouseSelect";
 
 export default {
   name: "Stock",
@@ -294,10 +293,18 @@ export default {
         batchNo: [
           { required: true, message: "批次号不能为空", trigger: "blur" }
         ],
-      }
+      },
+      // 仓库树数据
+      warehouseTreeData: [],
+      treeProps: {
+        children: 'children',
+        label: 'warehouseName',
+        isLeaf: () => false
+      },
     };
   },
   created() {
+    this.getWarehouseTree();
     this.getList();
   },
   methods: {
@@ -310,6 +317,27 @@ export default {
         this.loading = false;
       });
     },
+    // 获取仓库树数据
+    getWarehouseTree() {
+      listWarehouse().then(response => {
+        this.warehouseTreeData = this.handleTree(response.data, 'warehouseId', 'parentId');
+      });
+    },
+    // 处理树结构
+    handleTree(data, id, parentId) {
+      const cloneData = JSON.parse(JSON.stringify(data));
+      return cloneData.filter(father => {
+        const branchArr = cloneData.filter(child => father[id] === child[parentId]);
+        if (branchArr.length > 0) father.children = branchArr;
+        return father[parentId] === 0 || father[parentId] === null;
+      });
+    },
+    // 树节点点击
+    handleTreeSelect(node) {
+      this.queryParams.warehouseId = node.warehouseId;
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -417,3 +445,37 @@ export default {
   }
 };
 </script>
+
+<style scoped>
+.stock-layout {
+  height: 100%;
+  display: flex;
+  flex-direction: row;
+}
+.stock-tree-col {
+  min-width: 220px;
+  max-width: 300px;
+  background: #fff;
+  border-right: 1px solid #f0f0f0;
+  height: 100%;
+  padding-right: 0;
+}
+.stock-tree-card {
+  height: 100%;
+  border: none;
+  box-shadow: none;
+}
+.stock-tree-title {
+  font-weight: bold;
+  font-size: 16px;
+  padding: 8px 0;
+}
+.stock-tree {
+  min-height: 500px;
+  max-height: 80vh;
+  overflow-y: auto;
+}
+.stock-main-col {
+  padding-left: 24px;
+}
+</style>

klp-ui/src/views/wms/stockIo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="出入库单号" prop="stockIoCode" style="min-width:200px;max-width:220px;">
+      <el-form-item label="单号" prop="stockIoCode">
         <el-input
           v-model="queryParams.stockIoCode"
           placeholder="请输入出入库单号"