From 1ef306f163c7820815d7b55dd70e9f9038180861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 18 Jul 2025 12:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=A0=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/category/index.vue  | 59 +++++++++++---
 klp-ui/src/views/wms/product/index.vue   | 42 +++++-----
 klp-ui/src/views/wms/warehouse/index.vue | 99 +++++++++++++++---------
 3 files changed, 131 insertions(+), 69 deletions(-)

diff --git a/klp-ui/src/views/wms/category/index.vue b/klp-ui/src/views/wms/category/index.vue
index bd9add1f..14a76eea 100644
--- a/klp-ui/src/views/wms/category/index.vue
+++ b/klp-ui/src/views/wms/category/index.vue
@@ -1,6 +1,16 @@
 <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="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" prop="categoryType">
+        <el-select v-model="queryParams.categoryType" placeholder="请选择分类类型(base_material|surface_treatment|customer_req|spec_packaging)" clearable>
+          <el-option
+            v-for="dict in dict.type.category_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="分类编码" prop="categoryCode">
         <el-input
           v-model="queryParams.categoryCode"
@@ -26,12 +36,14 @@
         />
       </el-form-item>
       <el-form-item label="是否启用(0=否,1=是)" prop="isEnabled">
-        <el-input
-          v-model="queryParams.isEnabled"
-          placeholder="请输入是否启用(0=否,1=是)"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用(0=否,1=是)" clearable>
+          <el-option
+            v-for="dict in dict.type.common_swicth"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -88,12 +100,20 @@
     <el-table v-loading="loading" :data="categoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="分类主键ID" align="center" prop="categoryId" v-if="true"/>
-      <el-table-column label="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" align="center" prop="categoryType" />
+      <el-table-column label="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" align="center" prop="categoryType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.category_type" :value="scope.row.categoryType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="分类编码" align="center" prop="categoryCode" />
       <el-table-column label="分类名称" align="center" prop="categoryName" />
       <el-table-column label="分类描述" align="center" prop="categoryDesc" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否启用(0=否,1=是)" align="center" prop="isEnabled" />
+      <el-table-column label="是否启用(0=否,1=是)" align="center" prop="isEnabled">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.common_swicth" :value="scope.row.isEnabled"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -125,6 +145,16 @@
     <!-- 添加或修改通用分类对话框 -->
     <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="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" prop="categoryType">
+          <el-select v-model="form.categoryType" placeholder="请选择分类类型(base_material|surface_treatment|customer_req|spec_packaging)">
+            <el-option
+              v-for="dict in dict.type.category_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="分类编码" prop="categoryCode">
           <el-input v-model="form.categoryCode" placeholder="请输入分类编码" />
         </el-form-item>
@@ -138,7 +168,14 @@
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="是否启用(0=否,1=是)" prop="isEnabled">
-          <el-input v-model="form.isEnabled" placeholder="请输入是否启用(0=否,1=是)" />
+          <el-select v-model="form.isEnabled" placeholder="请选择是否启用(0=否,1=是)">
+            <el-option
+              v-for="dict in dict.type.common_swicth"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -154,6 +191,7 @@ import { listCategory, getCategory, delCategory, addCategory, updateCategory } f
 
 export default {
   name: "Category",
+  dicts: ['common_swicth', 'category_type'],
   data() {
     return {
       // 按钮loading
@@ -199,9 +237,6 @@ export default {
         categoryName: [
           { required: true, message: "分类名称不能为空", trigger: "blur" }
         ],
-        categoryDesc: [
-          { required: true, message: "分类描述不能为空", trigger: "blur" }
-        ],
       }
     };
   },
diff --git a/klp-ui/src/views/wms/product/index.vue b/klp-ui/src/views/wms/product/index.vue
index e17ccf7e..7b0478bb 100644
--- a/klp-ui/src/views/wms/product/index.vue
+++ b/klp-ui/src/views/wms/product/index.vue
@@ -284,27 +284,27 @@ export default {
         owner: [
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
-        baseMaterialId: [
-          { required: true, message: "基础材质分类ID不能为空", trigger: "blur" }
-        ],
-        surfaceTreatmentId: [
-          { required: true, message: "表面处理分类ID不能为空", trigger: "blur" }
-        ],
-        customerReqId: [
-          { required: true, message: "客户需求分类ID不能为空", trigger: "blur" }
-        ],
-        packagingId: [
-          { required: true, message: "包装分类ID不能为空", trigger: "blur" }
-        ],
-        thickness: [
-          { required: true, message: "厚度不能为空", trigger: "blur" }
-        ],
-        width: [
-          { required: true, message: "宽度不能为空", trigger: "blur" }
-        ],
-        innerDiameter: [
-          { required: true, message: "内径不能为空", trigger: "blur" }
-        ],
+        // baseMaterialId: [
+        //   { required: true, message: "基础材质分类ID不能为空", trigger: "blur" }
+        // ],
+        // surfaceTreatmentId: [
+        //   { required: true, message: "表面处理分类ID不能为空", trigger: "blur" }
+        // ],
+        // customerReqId: [
+        //   { required: true, message: "客户需求分类ID不能为空", trigger: "blur" }
+        // ],
+        // packagingId: [
+        //   { required: true, message: "包装分类ID不能为空", trigger: "blur" }
+        // ],
+        // thickness: [
+        //   { required: true, message: "厚度不能为空", trigger: "blur" }
+        // ],
+        // width: [
+        //   { required: true, message: "宽度不能为空", trigger: "blur" }
+        // ],
+        // innerDiameter: [
+        //   { required: true, message: "内径不能为空", trigger: "blur" }
+        // ],
       }
     };
   },
diff --git a/klp-ui/src/views/wms/warehouse/index.vue b/klp-ui/src/views/wms/warehouse/index.vue
index 9874cf99..b4737447 100644
--- a/klp-ui/src/views/wms/warehouse/index.vue
+++ b/klp-ui/src/views/wms/warehouse/index.vue
@@ -1,45 +1,53 @@
 <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="parentId">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="上级节点" prop="parentId">
         <el-input
           v-model="queryParams.parentId"
-          placeholder="请输入父节点ID"
+          placeholder="请选择上级节点"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库/库区编码" prop="warehouseCode">
+      <el-form-item label="仓库编码" prop="warehouseCode">
         <el-input
           v-model="queryParams.warehouseCode"
-          placeholder="请输入仓库/库区编码"
+          placeholder="请输入仓库编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仓库/库区名称" prop="warehouseName">
+      <el-form-item label="仓库名称" prop="warehouseName">
         <el-input
           v-model="queryParams.warehouseName"
-          placeholder="请输入仓库/库区名称"
+          placeholder="请输入仓库名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="同级排序号" prop="sortNo">
+      <el-form-item label="仓库类型" prop="warehouseType">
+        <el-select v-model="queryParams.warehouseType" placeholder="请选择仓库类型" clearable>
+          <el-option
+            v-for="dict in dict.type.warehouse_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排序号" prop="sortNo">
         <el-input
           v-model="queryParams.sortNo"
-          placeholder="请输入同级排序号"
+          placeholder="请输入排序号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否启用" prop="isEnabled">
-        <el-input
-          v-model="queryParams.isEnabled"
-          placeholder="请输入是否启用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="启用状态" prop="isEnabled">
+        <el-select v-model="queryParams.isEnabled" placeholder="请选择启用状态" clearable>
+          <el-option label="启用" :value="1" />
+          <el-option label="禁用" :value="0" />
+        </el-select>
       </el-form-item>
       <el-form-item>
 	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -78,12 +86,20 @@
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column label="父节点ID" prop="parentId" />
-      <el-table-column label="仓库/库区编码" align="center" prop="warehouseCode" />
-      <el-table-column label="仓库/库区名称" align="center" prop="warehouseName" />
-      <el-table-column label="类型：0=仓库，1=库区，2=库位，…" align="center" prop="warehouseType" />
-      <el-table-column label="同级排序号" align="center" prop="sortNo" />
-      <el-table-column label="是否启用" align="center" prop="isEnabled" />
+      <el-table-column label="上级节点" prop="parentId" />
+      <el-table-column label="仓库编码" align="center" prop="warehouseCode" />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+      <el-table-column label="仓库类型" align="center" prop="warehouseType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="排序号" align="center" prop="sortNo" />
+      <el-table-column label="启用状态" align="center" prop="isEnabled">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isEnabled == 1 ? '启用' : '禁用' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -92,21 +108,18 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['klp:warehouse:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['klp:warehouse:add']"
           >新增</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['klp:warehouse:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -114,21 +127,34 @@
 
     <!-- 添加或修改仓库/库区/库位自关联对话框 -->
     <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="parentId">
-          <treeselect v-model="form.parentId" :options="warehouseOptions" :normalizer="normalizer" placeholder="请选择父节点ID" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="上级节点" prop="parentId">
+          <treeselect v-model="form.parentId" :options="warehouseOptions" :normalizer="normalizer" placeholder="请选择上级节点" />
         </el-form-item>
-        <el-form-item label="仓库/库区编码" prop="warehouseCode">
-          <el-input v-model="form.warehouseCode" placeholder="请输入仓库/库区编码" />
+        <el-form-item label="仓库编码" prop="warehouseCode">
+          <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
         </el-form-item>
-        <el-form-item label="仓库/库区名称" prop="warehouseName">
-          <el-input v-model="form.warehouseName" placeholder="请输入仓库/库区名称" />
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
         </el-form-item>
-        <el-form-item label="同级排序号" prop="sortNo">
-          <el-input v-model="form.sortNo" placeholder="请输入同级排序号" />
+        <el-form-item label="仓库类型" prop="warehouseType">
+          <el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
+            <el-option
+              v-for="dict in dict.type.warehouse_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="是否启用" prop="isEnabled">
-          <el-input v-model="form.isEnabled" placeholder="请输入是否启用" />
+        <el-form-item label="排序号" prop="sortNo">
+          <el-input v-model="form.sortNo" placeholder="请输入排序号" />
+        </el-form-item>
+        <el-form-item label="启用状态" prop="isEnabled">
+          <el-select v-model="form.isEnabled" placeholder="请选择启用状态">
+            <el-option label="启用" :value="1" />
+            <el-option label="禁用" :value="0" />
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -149,6 +175,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Warehouse",
+  dicts: ['warehouse_type'],
   components: {
     Treeselect
   },