From d074f2ad31f19304183debae05579bea706c5bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 17 Jul 2025 22:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=BB=84=E5=AE=B6?=
 =?UTF-8?q?=E6=98=8E=E9=A1=B9=E7=9B=AE=E4=B8=80=E7=9B=B4=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                |  4 ++++
 src/store/modules/user.ts                      | 10 +---------
 src/views/hjm/hjmCar/components/hjmCarEdit.vue |  2 +-
 src/views/hjm/hjmCar/components/search.vue     |  9 ++++++++-
 src/views/hjm/hjmCar/index.vue                 | 14 +++++++-------
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.env.production b/.env.production
index ba9f261..58c9db9 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,8 @@
 VITE_APP_NAME=后台管理系统
+#VITE_SOCKET_URL=wss://server.gxwebsoft.com
+#VITE_SERVER_URL=https://server.gxwebsoft.com/api
+#VITE_API_URL=https://cms-api.websoft.top/api
+
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
 VITE_API_URL=https://cms-api.websoft.top/api
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 4d15ca7..aee0ab0 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -10,7 +10,6 @@ import {getUserInfo} from '@/api/layout';
 import { initialization } from '@/api/layout';
 import {clone} from "@/api/system/menu";
 import { message } from 'ant-design-vue/es';
-import { Modal } from 'ant-design-vue';
 import {logout} from "@/utils/page-tab-util";
 // import { isExternalLink } from 'ele-admin-pro';
 const EXTRA_MENUS: any = [];
@@ -43,14 +42,7 @@ export const useUserStore = defineStore({
       // const company = await getTenantInfo().catch(() => void 0);
       const result = await getUserInfo().catch(() => {});
       if (!result) {
-        Modal.info({
-          title: '系统提示',
-          content: '网站已被关停，请登录控制台查看具体原因！',
-          okText: '重新登录',
-          onOk: () => {
-            logout(false, '/login');
-          }
-        });
+        logout(false, '/login');
         return {};
       }
       // 系统初始化
diff --git a/src/views/hjm/hjmCar/components/hjmCarEdit.vue b/src/views/hjm/hjmCar/components/hjmCarEdit.vue
index b221725..59800b2 100644
--- a/src/views/hjm/hjmCar/components/hjmCarEdit.vue
+++ b/src/views/hjm/hjmCar/components/hjmCarEdit.vue
@@ -307,7 +307,7 @@
           );
           if (find) {
             if (d.value == index) {
-              form.code = `${find.organizationCode}${d.organizationCode}`;
+              form.code = `${find.organizationCode}`;
               form.organizationParentId = find.organizationId;
               form.organizationId = d.organizationId;
               organizationId.value = find.organizationId;
diff --git a/src/views/hjm/hjmCar/components/search.vue b/src/views/hjm/hjmCar/components/search.vue
index 671117d..f8fab33 100644
--- a/src/views/hjm/hjmCar/components/search.vue
+++ b/src/views/hjm/hjmCar/components/search.vue
@@ -112,7 +112,14 @@
   };
 
   const reload = () => {
-    emit('search', where);
+    const isParent = props.organizationList.find(d => d.organizationId == where.organizationId);
+    if(isParent){
+      where.organizationParentId = isParent.organizationId;
+      where.organizationId = undefined;
+      emit('search', where);
+    }else {
+      emit('search', where);
+    }
   };
 
   // 批量删除
diff --git a/src/views/hjm/hjmCar/index.vue b/src/views/hjm/hjmCar/index.vue
index 06c01c4..e9b698b 100644
--- a/src/views/hjm/hjmCar/index.vue
+++ b/src/views/hjm/hjmCar/index.vue
@@ -154,13 +154,13 @@ const datasource: DatasourceFunction = ({
 
 // 表格列配置
 const columns = ref<ColumnItem[]>([
-  {
-    title: 'ID',
-    dataIndex: 'id',
-    key: 'id',
-    align: 'center',
-    width: 90,
-  },
+  // {
+  //   title: 'ID',
+  //   dataIndex: 'id',
+  //   key: 'id',
+  //   align: 'center',
+  //   width: 90,
+  // },
   {
     title: '车辆编号',
     dataIndex: 'code',