From c18b82e49a1b02542be0b1188d2794ed730724a2 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Tue, 8 Apr 2025 13:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=BA=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/psmStoreType/index.ts     |  12 +-
 src/api/wms/psmStoreType/types.ts     |  61 ++++++---
 src/views/wms/psmStore/index.vue      | 140 ++++++++++++--------
 src/views/wms/psmStorePlace/index.vue | 130 +++++++++++-------
 src/views/wms/psmStoreType/index.vue  | 184 ++++++++++++++++----------
 5 files changed, 329 insertions(+), 198 deletions(-)

diff --git a/src/api/wms/psmStoreType/index.ts b/src/api/wms/psmStoreType/index.ts
index 4bd1d11..32b0f9d 100644
--- a/src/api/wms/psmStoreType/index.ts
+++ b/src/api/wms/psmStoreType/index.ts
@@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios';
 import { PsmStoreTypeVO, PsmStoreTypeForm, PsmStoreTypeQuery } from '@/api/wms/psmStoreType/types';
 
 /**
- * 查询成品仓库类型列表
+ * 查询成品库区列表
  * @param query
  * @returns {*}
  */
@@ -17,7 +17,7 @@ export const listPsmStoreType = (query?: PsmStoreTypeQuery): AxiosPromise<PsmSto
 };
 
 /**
- * 查询成品仓库类型详细
+ * 查询成品库区详细
  * @param storeTypeId
  */
 export const getPsmStoreType = (storeTypeId: string | number): AxiosPromise<PsmStoreTypeVO> => {
@@ -28,7 +28,7 @@ export const getPsmStoreType = (storeTypeId: string | number): AxiosPromise<PsmS
 };
 
 /**
- * 新增成品仓库类型
+ * 新增成品库区
  * @param data
  */
 export const addPsmStoreType = (data: PsmStoreTypeForm) => {
@@ -40,7 +40,7 @@ export const addPsmStoreType = (data: PsmStoreTypeForm) => {
 };
 
 /**
- * 修改成品仓库类型
+ * 修改成品库区
  * @param data
  */
 export const updatePsmStoreType = (data: PsmStoreTypeForm) => {
@@ -52,7 +52,7 @@ export const updatePsmStoreType = (data: PsmStoreTypeForm) => {
 };
 
 /**
- * 删除成品仓库类型
+ * 删除成品库区
  * @param storeTypeId
  */
 export const delPsmStoreType = (storeTypeId: string | number | Array<string | number>) => {
@@ -64,7 +64,7 @@ export const delPsmStoreType = (storeTypeId: string | number | Array<string | nu
 
 
 /**
- * 下拉框查询成品仓库类型列表
+ * 下拉框查询成品库区列表
  * @param query
  * @returns {*}
  */
diff --git a/src/api/wms/psmStoreType/types.ts b/src/api/wms/psmStoreType/types.ts
index 30c19de..f35f796 100644
--- a/src/api/wms/psmStoreType/types.ts
+++ b/src/api/wms/psmStoreType/types.ts
@@ -5,12 +5,32 @@ export interface PsmStoreTypeVO {
   storeTypeId: string | number;
 
   /**
-   * 仓库类型代码
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+  /**
+   * 库区代码
    */
   storeTypeCode: string;
 
   /**
-   * 仓库类型名称
+   * 库区名称
    */
   storeTypeName: string;
 
@@ -24,21 +44,21 @@ export interface PsmStoreTypeVO {
    */
   checkGradeName: string;
 
+  /**
+   * 所属仓库
+   */
+  storeId: string | number;
+
 }
 
 export interface PsmStoreTypeForm extends BaseEntity {
   /**
-   * 表主键
-   */
-  storeTypeId?: string | number;
-
-  /**
-   * 仓库类型代码
+   * 库区代码
    */
   storeTypeCode?: string;
-
+  storeTypeId: string | number;
   /**
-   * 仓库类型名称
+   * 库区名称
    */
   storeTypeName?: string;
 
@@ -52,22 +72,22 @@ export interface PsmStoreTypeForm extends BaseEntity {
    */
   checkGradeName?: string;
 
+  /**
+   * 所属仓库
+   */
+  storeId?: string | number;
+
 }
 
 export interface PsmStoreTypeQuery extends PageQuery {
 
   /**
-   * 表主键
-   */
-  storeTypeId?: string | number;
-
-  /**
-   * 仓库类型代码
+   * 库区代码
    */
   storeTypeCode?: string;
 
   /**
-   * 仓库类型名称
+   * 库区名称
    */
   storeTypeName?: string;
 
@@ -75,12 +95,17 @@ export interface PsmStoreTypeQuery extends PageQuery {
    * 存放品级编号
    */
   checkGradeCode?: string;
-
+  storeTypeId: string | number;
   /**
    * 存放品级名称
    */
   checkGradeName?: string;
 
+  /**
+   * 所属仓库
+   */
+  storeId?: string | number;
+
     /**
      * 日期范围参数
      */
diff --git a/src/views/wms/psmStore/index.vue b/src/views/wms/psmStore/index.vue
index 15b68b7..4de5a0a 100644
--- a/src/views/wms/psmStore/index.vue
+++ b/src/views/wms/psmStore/index.vue
@@ -1,25 +1,28 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+                :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="仓库名称" prop="storeName">
-              <el-input v-model="queryParams.storeName" placeholder="请输入仓库名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.storeName" placeholder="请输入仓库名称" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item label="仓库编码" prop="storeCode">
-              <el-input v-model="queryParams.storeCode" placeholder="请输入仓库编码" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.storeCode" placeholder="请输入仓库编码" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
-            <el-form-item label="仓库类型" prop="storeTypeId">
+<!--            <el-form-item label="仓库类型" prop="storeTypeId">
               <el-select v-model="queryParams.storeTypeId" placeholder="请选择仓库类型">
-            <el-option
-              v-for="item in storeTypeList"
-              :key="item.storeTypeId"
-              :label="item.storeTypeCode"
-              :value="item.storeTypeId"
-            />
-          </el-select>
-            </el-form-item>
+                <el-option
+                  v-for="item in storeTypeList"
+                  :key="item.storeTypeId"
+                  :label="item.storeTypeCode"
+                  :value="item.storeTypeId"
+                />
+              </el-select>
+            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -33,59 +36,82 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:psmStore:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:psmStore:add']">新增
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:psmStore:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                       v-hasPermi="['system:psmStore:edit']">修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:psmStore:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                       v-hasPermi="['system:psmStore:remove']">删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:psmStore:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+                       v-hasPermi="['system:psmStore:export']">导出
+            </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true"
+                         @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
       <el-table v-loading="loading" :data="psmStoreList" @selection-change="handleSelectionChange">
-        <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="storeName" v-if="columns[7].visible"/>
         <el-table-column label="仓库编码" align="center" prop="storeCode" v-if="columns[8].visible"/>
-        <el-table-column label="仓库类型" align="center" prop="storeTypeCode" v-if="columns[9].visible"/>
+<!--        <el-table-column label="仓库类型" align="center" prop="storeTypeCode" v-if="columns[9].visible"/>-->
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[2].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[3].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[4].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[5].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:psmStore:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['system:psmStore:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:psmStore:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['system:psmStore:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </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-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="psmStoreFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="仓库名称" prop="storeName">
-          <el-input v-model="form.storeName" placeholder="请输入仓库名称" />
+          <el-input v-model="form.storeName" placeholder="请输入仓库名称"/>
         </el-form-item>
         <el-form-item label="仓库编码" prop="storeCode">
-          <el-input v-model="form.storeCode" placeholder="请输入仓库编码" />
-        </el-form-item>
-        <el-form-item label="仓库类型" prop="storeTypeId">
-          <el-select v-model="form.storeTypeId" placeholder="请选择仓库类型">
-            <el-option
-              v-for="item in storeTypeList"
-              :key="item.storeTypeId"
-              :label="item.storeTypeCode"
-              :value="item.storeTypeId"
-            />
-          </el-select>
+          <el-input v-model="form.storeCode" placeholder="请输入仓库编码"/>
         </el-form-item>
+<!--        <el-form-item label="仓库类型" prop="storeTypeId">-->
+<!--          <el-select v-model="form.storeTypeId" placeholder="请选择仓库类型">-->
+<!--            <el-option-->
+<!--              v-for="item in storeTypeList"-->
+<!--              :key="item.storeTypeId"-->
+<!--              :label="item.storeTypeCode"-->
+<!--              :value="item.storeTypeId"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -98,10 +124,11 @@
 </template>
 
 <script setup name="PsmStore" lang="ts">
-import { listPsmStore, getPsmStore, delPsmStore, addPsmStore, updatePsmStore } from '@/api/wms/psmStore';
-import { PsmStoreVO, PsmStoreQuery, PsmStoreForm } from '@/api/wms/psmStore/types';
-import { getWmsPsmStoreTypeList } from '@/api/wms/psmStoreType';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import {listPsmStore, getPsmStore, delPsmStore, addPsmStore, updatePsmStore} from '@/api/wms/psmStore';
+import {PsmStoreVO, PsmStoreQuery, PsmStoreForm} from '@/api/wms/psmStore/types';
+import {getWmsPsmStoreTypeList} from '@/api/wms/psmStoreType';
+
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 
 const psmStoreList = ref<PsmStoreVO[]>([]);
 const buttonLoading = ref(false);
@@ -122,16 +149,16 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `表主键`, visible: true },
-        { key: 1, label: `租户号`, visible: true },
-        { key: 2, label: `创建人`, visible: true },
-        { key: 3, label: `创建时间`, visible: true },
-        { key: 4, label: `更新人`, visible: true },
-        { key: 5, label: `更新时间`, visible: true },
-        { key: 6, label: `创建部门`, visible: true },
-        { key: 7, label: `仓库名称`, visible: true },
-        { key: 8, label: `仓库编码`, visible: true },
-        { key: 9, label: `仓库类型`, visible: true },
+  {key: 0, label: `表主键`, visible: true},
+  {key: 1, label: `租户号`, visible: true},
+  {key: 2, label: `创建人`, visible: true},
+  {key: 3, label: `创建时间`, visible: true},
+  {key: 4, label: `更新人`, visible: true},
+  {key: 5, label: `更新时间`, visible: true},
+  {key: 6, label: `创建部门`, visible: true},
+  {key: 7, label: `仓库名称`, visible: true},
+  {key: 8, label: `仓库编码`, visible: true},
+  {key: 9, label: `仓库类型`, visible: true},
 ]);
 
 const initFormData: PsmStoreForm = {
@@ -149,26 +176,25 @@ const data = reactive<PageData<PsmStoreForm, PsmStoreQuery>>({
     storeName: undefined,
     storeCode: undefined,
     storeTypeId: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
     storeId: [
-      { required: true, message: "表主键不能为空", trigger: "blur" }
+      {required: true, message: "表主键不能为空", trigger: "blur"}
     ],
     storeName: [
-      { required: true, message: "仓库名称不能为空", trigger: "blur" }
+      {required: true, message: "仓库名称不能为空", trigger: "blur"}
     ],
     storeCode: [
-      { required: true, message: "仓库编码不能为空", trigger: "blur" }
+      {required: true, message: "仓库编码不能为空", trigger: "blur"}
     ],
     storeTypeId: [
-      { required: true, message: "仓库类型不能为空", trigger: "blur" }
+      {required: true, message: "仓库类型不能为空", trigger: "blur"}
     ]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 /** 查询成品仓库管理列表 */
 const getList = async () => {
@@ -238,9 +264,9 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.storeId) {
-        await updatePsmStore(form.value).finally(() =>  buttonLoading.value = false);
+        await updatePsmStore(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addPsmStore(form.value).finally(() =>  buttonLoading.value = false);
+        await addPsmStore(form.value).finally(() => buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
diff --git a/src/views/wms/psmStorePlace/index.vue b/src/views/wms/psmStorePlace/index.vue
index 4ff2fc3..8642b36 100644
--- a/src/views/wms/psmStorePlace/index.vue
+++ b/src/views/wms/psmStorePlace/index.vue
@@ -1,27 +1,31 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+                :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="库位编码" prop="storePlaceCode">
-              <el-input v-model="queryParams.storePlaceCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.storePlaceCode" placeholder="请输入库位编码" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item label="库位名称" prop="storePlaceName">
-              <el-input v-model="queryParams.storePlaceName" placeholder="请输入库位名称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.storePlaceName" placeholder="请输入库位名称" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item label="所属仓库" prop="storeId">
               <el-select v-model="queryParams.storeId" placeholder="请选择仓库">
-            <el-option
-              v-for="item in storeList"
-              :key="item.storeId"
-              :label="item.storeCode"
-              :value="item.storeId"
-            />
-          </el-select>
+                <el-option
+                  v-for="item in storeList"
+                  :key="item.storeId"
+                  :label="item.storeCode"
+                  :value="item.storeId"
+                />
+              </el-select>
             </el-form-item>
             <el-form-item label="sap库区代码" prop="sapCode">
-              <el-input v-model="queryParams.sapCode" placeholder="请输入sap库区代码" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.sapCode" placeholder="请输入sap库区代码" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -36,50 +40,74 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:psmStorePlace:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:psmStorePlace:add']">
+              新增
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:psmStorePlace:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                       v-hasPermi="['system:psmStorePlace:edit']">修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:psmStorePlace:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                       v-hasPermi="['system:psmStorePlace:remove']">删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:psmStorePlace:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+                       v-hasPermi="['system:psmStorePlace:export']">导出
+            </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true"
+                         @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
       <el-table v-loading="loading" :data="psmStorePlaceList" @selection-change="handleSelectionChange">
-        <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="storePlaceId" v-if="columns[0].visible"/> -->
         <el-table-column label="库位编码" align="center" prop="storePlaceCode" v-if="columns[7].visible"/>
         <el-table-column label="库位名称" align="center" prop="storePlaceName" v-if="columns[8].visible"/>
         <el-table-column label="所属仓库" align="center" prop="storeId" v-if="columns[9].visible"/>
         <el-table-column label="sap库区代码" align="center" prop="sapCode" v-if="columns[10].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[2].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[3].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[4].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[5].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:psmStorePlace:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['system:psmStorePlace:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:psmStorePlace:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['system:psmStorePlace:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </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-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="psmStorePlaceFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="库位编码" prop="storePlaceCode">
-          <el-input v-model="form.storePlaceCode" placeholder="请输入库位编码" />
+          <el-input v-model="form.storePlaceCode" placeholder="请输入库位编码"/>
         </el-form-item>
         <el-form-item label="库位名称" prop="storePlaceName">
-          <el-input v-model="form.storePlaceName" placeholder="请输入库位名称" />
+          <el-input v-model="form.storePlaceName" placeholder="请输入库位名称"/>
         </el-form-item>
         <el-form-item label="所属仓库" prop="storeId">
           <el-select v-model="form.storeId" placeholder="请选择仓库">
@@ -92,7 +120,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="sap库区代码" prop="sapCode">
-          <el-input v-model="form.sapCode" placeholder="请输入sap库区代码" />
+          <el-input v-model="form.sapCode" placeholder="请输入sap库区代码"/>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -106,10 +134,17 @@
 </template>
 
 <script setup name="PsmStorePlace" lang="ts">
-import { listPsmStorePlace, getPsmStorePlace, delPsmStorePlace, addPsmStorePlace, updatePsmStorePlace } from '@/api/wms/psmStorePlace';
-import { PsmStorePlaceVO, PsmStorePlaceQuery, PsmStorePlaceForm } from '@/api/wms/psmStorePlace/types';
-import { getWmsPsmStoreList } from '@/api/wms/psmStore';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+import {
+  listPsmStorePlace,
+  getPsmStorePlace,
+  delPsmStorePlace,
+  addPsmStorePlace,
+  updatePsmStorePlace
+} from '@/api/wms/psmStorePlace';
+import {PsmStorePlaceVO, PsmStorePlaceQuery, PsmStorePlaceForm} from '@/api/wms/psmStorePlace/types';
+import {getWmsPsmStoreList} from '@/api/wms/psmStore';
+
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 
 const psmStorePlaceList = ref<PsmStorePlaceVO[]>([]);
 const buttonLoading = ref(false);
@@ -130,17 +165,17 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `表主键`, visible: true },
-        { key: 1, label: `租户号`, visible: true },
-        { key: 2, label: `创建人`, visible: true },
-        { key: 3, label: `创建时间`, visible: true },
-        { key: 4, label: `更新人`, visible: true },
-        { key: 5, label: `更新时间`, visible: true },
-        { key: 6, label: `创建部门`, visible: true },
-        { key: 7, label: `库位编码`, visible: true },
-        { key: 8, label: `库位名称`, visible: true },
-        { key: 9, label: `所属仓库`, visible: true },
-        { key: 10, label: `sap库区代码`, visible: true },
+  {key: 0, label: `表主键`, visible: true},
+  {key: 1, label: `租户号`, visible: true},
+  {key: 2, label: `创建人`, visible: true},
+  {key: 3, label: `创建时间`, visible: true},
+  {key: 4, label: `更新人`, visible: true},
+  {key: 5, label: `更新时间`, visible: true},
+  {key: 6, label: `创建部门`, visible: true},
+  {key: 7, label: `库位编码`, visible: true},
+  {key: 8, label: `库位名称`, visible: true},
+  {key: 9, label: `所属仓库`, visible: true},
+  {key: 10, label: `sap库区代码`, visible: true},
 ]);
 
 const initFormData: PsmStorePlaceForm = {
@@ -160,29 +195,28 @@ const data = reactive<PageData<PsmStorePlaceForm, PsmStorePlaceQuery>>({
     storePlaceName: undefined,
     storeId: undefined,
     sapCode: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
     storePlaceId: [
-      { required: true, message: "表主键不能为空", trigger: "blur" }
+      {required: true, message: "表主键不能为空", trigger: "blur"}
     ],
     storePlaceCode: [
-      { required: true, message: "库位编码不能为空", trigger: "blur" }
+      {required: true, message: "库位编码不能为空", trigger: "blur"}
     ],
     storePlaceName: [
-      { required: true, message: "库位名称不能为空", trigger: "blur" }
+      {required: true, message: "库位名称不能为空", trigger: "blur"}
     ],
     storeId: [
-      { required: true, message: "所属仓库不能为空", trigger: "blur" }
+      {required: true, message: "所属仓库不能为空", trigger: "blur"}
     ],
     sapCode: [
-      { required: true, message: "sap库区代码不能为空", trigger: "blur" }
+      {required: true, message: "sap库区代码不能为空", trigger: "blur"}
     ]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 const getStoreList = async () => {
   let res = await getWmsPsmStoreList(null);
@@ -251,9 +285,9 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.storePlaceId) {
-        await updatePsmStorePlace(form.value).finally(() =>  buttonLoading.value = false);
+        await updatePsmStorePlace(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addPsmStorePlace(form.value).finally(() =>  buttonLoading.value = false);
+        await addPsmStorePlace(form.value).finally(() => buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
diff --git a/src/views/wms/psmStoreType/index.vue b/src/views/wms/psmStoreType/index.vue
index 758c376..ead3ea9 100644
--- a/src/views/wms/psmStoreType/index.vue
+++ b/src/views/wms/psmStoreType/index.vue
@@ -1,20 +1,30 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+                :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="仓库类型代码" prop="storeTypeCode">
-              <el-input v-model="queryParams.storeTypeCode" placeholder="请输入仓库类型代码" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="库区代码" prop="storeTypeCode">
+              <el-input v-model="queryParams.storeTypeCode" placeholder="请输入库区代码" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
-            <el-form-item label="仓库类型名称" prop="storeTypeName">
-              <el-input v-model="queryParams.storeTypeName" placeholder="请输入仓库类型名称" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="库区名称" prop="storeTypeName">
+              <el-input v-model="queryParams.storeTypeName" placeholder="请输入库区名称" clearable
+                        @keyup.enter="handleQuery"/>
             </el-form-item>
-            <el-form-item label="存放品级编号" prop="checkGradeCode">
-              <el-input v-model="queryParams.checkGradeCode" placeholder="请输入存放品级编号" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="存放品级名称" prop="checkGradeName">
-              <el-input v-model="queryParams.checkGradeName" placeholder="请输入存放品级名称" clearable @keyup.enter="handleQuery" />
+            <!--            <el-form-item label="存放品级编号" prop="checkGradeCode">-->
+            <!--              <el-input v-model="queryParams.checkGradeCode" placeholder="请输入存放品级编号" clearable-->
+            <!--                        @keyup.enter="handleQuery"/>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="存放品级名称" prop="checkGradeName">-->
+            <!--              <el-input v-model="queryParams.checkGradeName" placeholder="请输入存放品级名称" clearable-->
+            <!--                        @keyup.enter="handleQuery"/>-->
+            <!--            </el-form-item>-->
+            <el-form-item label="所属仓库" prop="storeId">
+              <el-select v-model="queryParams.storeId" placeholder="请选择所属仓库" clearable>
+                <el-option v-for="dict in storeList" :key="dict.storeId" :label="dict.storeName" :value="dict.storeId"/>
+              </el-select>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -29,60 +39,88 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:psmStoreType:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:psmStoreType:add']">新增
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:psmStoreType:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                       v-hasPermi="['wms:psmStoreType:edit']">修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:psmStoreType:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                       v-hasPermi="['wms:psmStoreType:remove']">删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:psmStoreType:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+                       v-hasPermi="['wms:psmStoreType:export']">导出
+            </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true"
+                         @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
       <el-table v-loading="loading" :data="psmStoreTypeList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <!-- <el-table-column label="表主键" align="center" prop="storeTypeId" v-if="columns[0].visible"/> -->
-        <el-table-column label="仓库类型代码" align="center" prop="storeTypeCode" v-if="columns[7].visible"/>
-        <el-table-column label="仓库类型名称" align="center" prop="storeTypeName" v-if="columns[8].visible"/>
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="表主键" align="center" prop="storeTypeId" v-if="columns[0].visible"/>
+        <el-table-column label="库区代码" align="center" prop="storeTypeCode" v-if="columns[7].visible"/>
+        <el-table-column label="库区名称" align="center" prop="storeTypeName" v-if="columns[8].visible"/>
         <el-table-column label="存放品级编号" align="center" prop="checkGradeCode" v-if="columns[9].visible"/>
         <el-table-column label="存放品级名称" align="center" prop="checkGradeName" v-if="columns[10].visible"/>
+        <el-table-column label="所属仓库" align="center" prop="storeName" v-if="columns[11].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[2].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[3].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[4].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[5].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:psmStoreType:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['wms:psmStoreType:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:psmStoreType:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['wms:psmStoreType:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </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-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="psmStoreTypeFormRef" :model="form" :rules="rules" label-width="80px">
-        <!-- <el-form-item label="表主键" prop="storeTypeId">
-          <el-input v-model="form.storeTypeId" placeholder="请输入表主键" />
-        </el-form-item> -->
-        <el-form-item label="仓库类型代码" prop="storeTypeCode">
-          <el-input v-model="form.storeTypeCode" placeholder="请输入仓库类型代码" />
+        <el-form-item label="所属仓库" prop="storeId">
+          <el-select v-model="form.storeId" placeholder="请选择所属仓库">
+            <el-option v-for="dict in storeList" :key="dict.storeId" :label="dict.storeName" :value="dict.storeId"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="仓库类型名称" prop="storeTypeName">
-          <el-input v-model="form.storeTypeName" placeholder="请输入仓库类型名称" />
+
+        <el-form-item label="库区代码" prop="storeTypeCode">
+          <el-input v-model="form.storeTypeCode" placeholder="请输入库区代码"/>
+        </el-form-item>
+        <el-form-item label="库区名称" prop="storeTypeName">
+          <el-input v-model="form.storeTypeName" placeholder="请输入库区名称"/>
         </el-form-item>
         <el-form-item label="存放品级编号" prop="checkGradeCode">
-          <el-input v-model="form.checkGradeCode" placeholder="请输入存放品级编号" />
+          <el-input v-model="form.checkGradeCode" placeholder="请输入存放品级编号"/>
         </el-form-item>
         <el-form-item label="存放品级名称" prop="checkGradeName">
-          <el-input v-model="form.checkGradeName" placeholder="请输入存放品级名称" />
+          <el-input v-model="form.checkGradeName" placeholder="请输入存放品级名称"/>
         </el-form-item>
+
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -95,10 +133,17 @@
 </template>
 
 <script setup name="PsmStoreType" lang="ts">
-import { listPsmStoreType, getPsmStoreType, delPsmStoreType, addPsmStoreType, updatePsmStoreType } from '@/api/wms/psmStoreType';
-import { PsmStoreTypeVO, PsmStoreTypeQuery, PsmStoreTypeForm } from '@/api/wms/psmStoreType/types';
+import {
+  listPsmStoreType,
+  getPsmStoreType,
+  delPsmStoreType,
+  addPsmStoreType,
+  updatePsmStoreType
+} from '@/api/wms/psmStoreType';
+import {PsmStoreTypeVO, PsmStoreTypeQuery, PsmStoreTypeForm} from '@/api/wms/psmStoreType/types';
+import {getWmsPsmStoreList} from "@/api/wms/psmStore";
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
 
 const psmStoreTypeList = ref<PsmStoreTypeVO[]>([]);
 const buttonLoading = ref(false);
@@ -119,61 +164,57 @@ const dialog = reactive<DialogOption>({
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `表主键`, visible: true },
-        { key: 1, label: `租户号`, visible: true },
-        { key: 2, label: `创建人`, visible: true },
-        { key: 3, label: `创建时间`, visible: true },
-        { key: 4, label: `更新人`, visible: true },
-        { key: 5, label: `更新时间`, visible: true },
-        { key: 6, label: `创建部门`, visible: true },
-        { key: 7, label: `仓库类型代码`, visible: true },
-        { key: 8, label: `仓库类型名称`, visible: true },
-        { key: 9, label: `存放品级编号`, visible: true },
-        { key: 10, label: `存放品级名称`, visible: true },
+  {key: 0, label: `表主键`, visible: false},
+  {key: 1, label: `租户号`, visible: true},
+  {key: 2, label: `创建人`, visible: false},
+  {key: 3, label: `创建时间`, visible: true},
+  {key: 4, label: `更新人`, visible: false},
+  {key: 5, label: `更新时间`, visible: true},
+  {key: 6, 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},
 ]);
 
 const initFormData: PsmStoreTypeForm = {
-  storeTypeId: undefined,
   storeTypeCode: undefined,
+  storeTypeId: undefined,
   storeTypeName: undefined,
   checkGradeCode: undefined,
-  checkGradeName: undefined
+  checkGradeName: undefined,
+  storeId: undefined
 }
 const data = reactive<PageData<PsmStoreTypeForm, PsmStoreTypeQuery>>({
   form: {...initFormData},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    storeTypeId: undefined,
     storeTypeCode: undefined,
     storeTypeName: undefined,
     checkGradeCode: undefined,
     checkGradeName: undefined,
-    params: {
-    }
+    storeId: undefined,
+    storeTypeId: undefined,
+    params: {}
   },
   rules: {
-    storeTypeId: [
-      { required: true, message: "表主键不能为空", trigger: "blur" }
-    ],
     storeTypeCode: [
-      { required: true, message: "仓库类型代码不能为空", trigger: "blur" }
+      {required: true, message: "库区代码不能为空", trigger: "blur"}
     ],
     storeTypeName: [
-      { required: true, message: "仓库类型名称不能为空", trigger: "blur" }
+      {required: true, message: "库区名称不能为空", trigger: "blur"}
     ],
-    checkGradeCode: [
-      { required: true, message: "存放品级编号不能为空", trigger: "blur" }
-    ],
-    checkGradeName: [
-      { required: true, message: "存放品级名称不能为空", trigger: "blur" }
+    storeId: [
+      {required: true, message: "所属仓库不能为空", trigger: "change"}
     ]
   }
 });
 
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
-/** 查询成品仓库类型列表 */
+/** 查询成品库区列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listPsmStoreType(queryParams.value);
@@ -181,7 +222,11 @@ const getList = async () => {
   total.value = res.total;
   loading.value = false;
 }
-
+let storeList = ref([]);
+const getStoreList = async () => {
+  let res = await getWmsPsmStoreList(null);
+  storeList.value = res.data;
+}
 /** 取消按钮 */
 const cancel = () => {
   reset();
@@ -217,7 +262,7 @@ const handleSelectionChange = (selection: PsmStoreTypeVO[]) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加成品仓库类型";
+  dialog.title = "添加成品库区";
 }
 
 /** 修改按钮操作 */
@@ -227,7 +272,7 @@ const handleUpdate = async (row?: PsmStoreTypeVO) => {
   const res = await getPsmStoreType(_storeTypeId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改成品仓库类型";
+  dialog.title = "修改成品库区";
 }
 
 /** 提交按钮 */
@@ -236,9 +281,9 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.storeTypeId) {
-        await updatePsmStoreType(form.value).finally(() =>  buttonLoading.value = false);
+        await updatePsmStoreType(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addPsmStoreType(form.value).finally(() =>  buttonLoading.value = false);
+        await addPsmStoreType(form.value).finally(() => buttonLoading.value = false);
       }
       proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
@@ -250,7 +295,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: PsmStoreTypeVO) => {
   const _storeTypeIds = row?.storeTypeId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除成品仓库类型编号为"' + _storeTypeIds + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除成品库区编号为"' + _storeTypeIds + '"的数据项？').finally(() => loading.value = false);
   await delPsmStoreType(_storeTypeIds);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
@@ -265,5 +310,6 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
+  getStoreList();
 });
 </script>