From 970533321e4271340078f11141e3cc4e1b83ad29 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Fri, 10 Apr 2026 18:01:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(storearea):=20=E4=BC=98=E5=8C=96=E5=BA=93?=
 =?UTF-8?q?=E5=8C=BA=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StoreAreaServiceImpl.java    |  2 ++
 .../src/views/example/storearea/index.vue     | 22 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/StoreAreaServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/StoreAreaServiceImpl.java
index 4ffcb76..34a9dc4 100644
--- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/StoreAreaServiceImpl.java
+++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/StoreAreaServiceImpl.java
@@ -139,6 +139,8 @@ public class StoreAreaServiceImpl extends ServiceImpl<StoreAreaMapper, StoreArea
             entity = new StoreAreaEntity();
         }
         BeanUtils.copyProperties(storeAreaForm, entity);
+        StoreHouseEntity info = storeHouseService.getInfo(String.valueOf(entity.getStoreHouseId()));
+        entity.setStoreType(info.getStoreType());
         this.saveOrUpdate(entity);
     }
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/storearea/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/storearea/index.vue
index 1a12157..bec36f5 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/storearea/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/storearea/index.vue
@@ -10,11 +10,11 @@
               </JnpfSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="仓库名称">
-              <el-input v-model="query.storeHouseName" placeholder="请输入" clearable></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="仓库名称">-->
+<!--              <el-input v-model="query.storeHouseName" placeholder="请输入" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="6">
             <el-form-item label="状态">
               <JnpfSelect v-model="query.enabledStatus" placeholder="请选择" clearable :options="enabledStatusOptions"
@@ -39,8 +39,11 @@
         </div>
         <JNPF-table v-loading="listLoading" :data="list">
           <el-table-column prop="storeHouseName" label="仓库名称" align="center"/>
-          <el-table-column prop="storeType" label="仓库类型" align="center"/>
-          <el-table-column prop="storeAreCd" label="库区编码" align="center"/>
+          <el-table-column prop="storeType" label="仓库类型" align="center">
+            <template slot-scope="scope">
+              {{ getCustomerLabel('storeType', scope.row.storeType) || scope.row.storeType }}
+            </template>
+          </el-table-column>          <el-table-column prop="storeAreCd" label="库区编码" align="center"/>
           <el-table-column prop="storeAreaName" label="库区名称" align="center"/>
           <el-table-column prop="enabledStatus" label="状态" align="center">
             <template slot-scope="scope">
@@ -70,8 +73,7 @@ import request from "@/utils/request";
 import { mapGetters } from "vuex";
 import JNPFForm from "./form";
 import jnpf from "@/utils/jnpf";
-import { getCustomerLabel } from "../customer/options";
-
+import { getCustomerLabel, customerOptions } from "../customer/options";
 export default {
   name: "storearea",
   components: {
@@ -106,6 +108,8 @@ export default {
         { fullName: "未启用", id: 2 },
       ],
       enabledStatusProps: { label: "fullName", value: "id" },
+      storeTypeOptions: customerOptions.storeType || [],
+      storeTypeProps: { label: "fullName", value: "id" },
     };
   },
   computed: {