From c1eb1c70cd305995d53ff873694c4fed68cbdafc Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Tue, 14 Apr 2026 10:49:38 +0800
Subject: [PATCH] =?UTF-8?q?refactor(storehouse):=20=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E7=9A=84=E5=AE=A2=E6=88=B7=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=BF=E6=8D=A2=E6=9C=AC=E5=9C=B0=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=B1=BB=E5=9E=8B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将仓库类型选项从本地定义改为从客户模块导入的共享数据，提高代码复用性和维护性
---
 jnpf-java-boot/jnpf-web/.vscode/settings.json        | 12 ++++++++++++
 .../jnpf-web/src/views/example/storehouse/form.vue   |  7 ++-----
 .../jnpf-web/src/views/example/storehouse/index.vue  |  8 ++------
 3 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 jnpf-java-boot/jnpf-web/.vscode/settings.json

diff --git a/jnpf-java-boot/jnpf-web/.vscode/settings.json b/jnpf-java-boot/jnpf-web/.vscode/settings.json
new file mode 100644
index 0000000..43c2f42
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+    // 已修改但未暂存的文件：亮橙色，加粗
+    "gitDecoration.modifiedResourceForeground": "#FFA500",
+    // 已暂存的文件：亮绿色
+    "gitDecoration.stageModifiedResourceForeground": "#7FFF00",
+    // 新增但未追踪的文件：亮青色
+    "gitDecoration.untrackedResourceForeground": "#00FFFF",
+    // 被删除的文件：红色，删除线效果
+    "gitDecoration.deletedResourceForeground": "#FF4444",
+    // 冲突文件：洋红色
+    "gitDecoration.conflictingResourceForeground": "#FF00FF"
+}
\ No newline at end of file
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/storehouse/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/storehouse/form.vue
index d015001..8d36a0e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/storehouse/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/storehouse/form.vue
@@ -42,6 +42,7 @@ NEW_FILE_CODE
 <script>
 import request from '@/utils/request'
 import { mapGetters } from 'vuex'
+import { customerOptions } from '../customer/options'
 
 export default {
   components: {},
@@ -95,11 +96,7 @@ export default {
         { fullName: "启用", id: 1 },
         { fullName: "未启用", id: 2 },
       ],
-      storeTypeOptions: [
-        { fullName: "原料库", id: 1 },
-        { fullName: "在制品库", id: 2 },
-        { fullName: "成品库", id: 3 },
-      ],
+      storeTypeOptions: customerOptions.storeType || [],
       storeTypeProps: { label: "fullName", value: "id" },
       enabledStatusProps: { label: "fullName", value: "id" },
     }
diff --git a/jnpf-java-boot/jnpf-web/src/views/example/storehouse/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/storehouse/index.vue
index c2e9c91..975f200 100644
--- a/jnpf-java-boot/jnpf-web/src/views/example/storehouse/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/example/storehouse/index.vue
@@ -69,7 +69,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: "storehouse",
@@ -104,11 +104,7 @@ export default {
         { fullName: "启用", id: 1 },
         { fullName: "未启用", id: 2 },
       ],
-      storeTypeOptions: [
-        { fullName: "原料库", id: 1 },
-        { fullName: "在制品库", id: 2 },
-        { fullName: "成品库", id: 3 },
-      ],
+      storeTypeOptions: customerOptions.storeType || [],
       storeTypeProps: { label: "fullName", value: "id" },
       enabledStatusProps: { label: "fullName", value: "id" },
     };