From a4eb09b0172c2ecd27cd3ab6279193b5e73bcaab Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <Jin980303>
Date: Thu, 15 Jan 2026 18:00:38 +0800
Subject: [PATCH] no message

---
 src/views/base/area/AreaList.vue              |  4 ++++
 src/views/base/area/components/AreaSelect.vue | 14 +++++++++++---
 src/views/base/point/PointList.vue            |  8 ++------
 src/views/base/point/components/PointForm.vue | 15 +++++----------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/views/base/area/AreaList.vue b/src/views/base/area/AreaList.vue
index ff17346..251e8d4 100644
--- a/src/views/base/area/AreaList.vue
+++ b/src/views/base/area/AreaList.vue
@@ -139,6 +139,10 @@
         width: 120,
         fixed: 'right',
       },
+      defSort: {
+        column: 'createTime',
+        order: 'asc',
+      },
       beforeFetch: async (params) => {
         // 创建新的查询参数对象，避免修改原始对象
         const newQueryParam = { ...queryParam };
diff --git a/src/views/base/area/components/AreaSelect.vue b/src/views/base/area/components/AreaSelect.vue
index e63981b..1fdd324 100644
--- a/src/views/base/area/components/AreaSelect.vue
+++ b/src/views/base/area/components/AreaSelect.vue
@@ -272,9 +272,17 @@ export default defineComponent({
      */
     const handleSearch = debounce(function (value: string) {
       searchKeyword.value = value;
-      pageNo.value = 1;
-      isHasData.value = true;
-
+      if (!value) {
+        // 搜索值为空时，重新加载全部数据
+        pageNo.value = 1;
+        isHasData.value = true;
+        queryData(1, '', false);
+      } else {
+        // 有搜索值时，执行搜索
+        pageNo.value = 1;
+        isHasData.value = true;
+        queryData(1, value, true);
+      }
       // 直接调用API进行搜索
       queryData(1, value, true);
     }, 300);
diff --git a/src/views/base/point/PointList.vue b/src/views/base/point/PointList.vue
index 4c149f1..fe089ac 100644
--- a/src/views/base/point/PointList.vue
+++ b/src/views/base/point/PointList.vue
@@ -7,12 +7,7 @@
           <a-col :lg="6">
             <a-form-item name="areaId">
               <template #label><span title="库区">库区</span></template>
-              <JSearchSelect
-                v-model:value="queryParam.areaId"
-                placeholder="请选择库区"
-                dict="base_area where iz_active=1 and del_flag=0 ,area_name,id"
-                allowClear
-              />
+              <AreaSelect v-model:value="queryParam.areaId"  />
             </a-form-item>
           </a-col>
           <a-col :lg="6">
@@ -108,6 +103,7 @@
   import JInput from '../../../components/Form/src/jeecg/components/JInput.vue';
   import SwitchStatus from '/@/views/base/SwitchStatus.vue';
   import { JDictSelectTag, JSearchSelect } from '@/components/Form';
+  import AreaSelect from '@/views/base/area/components/AreaSelect.vue';
 
   const fieldPickers = reactive({});
 
diff --git a/src/views/base/point/components/PointForm.vue b/src/views/base/point/components/PointForm.vue
index f3b4e6a..ab43241 100644
--- a/src/views/base/point/components/PointForm.vue
+++ b/src/views/base/point/components/PointForm.vue
@@ -6,13 +6,7 @@
           <a-row>
             <a-col :span="12">
               <a-form-item label="库区" v-bind="validateInfos.areaId" id="PointForm-areaId" name="areaId">
-                <JSearchSelect
-                  v-model:value="formData.areaId"
-                  placeholder="请选择库区"
-                  dict="base_area where iz_active=1 and del_flag=0,area_name,id"
-                  allowClear
-                  @change="onAreaChange"
-                />
+                <AreaSelect v-model:value="formData.areaId"  @change="onAreaChange" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -21,7 +15,7 @@
               </a-form-item>
             </a-col>
 
-            <a-col :span="12" v-if="formData.areaId!='1986328561044119554' && formData.areaId!='1986337742572707841'">
+            <a-col :span="12" v-if="formData.areaId!='1986328561044119554' && formData.areaId!='1986337742572707841' && formData.areaId!='2011686820969934849' && formData.areaId!='2011686935004672001' ">
               <a-form-item label="状态" v-bind="validateInfos.status" id="PointForm-status" name="status">
                 <JDictSelectTag
                   v-model:value="formData.status"
@@ -146,6 +140,7 @@
   import { JDictSelectTag, JSearchSelect } from '@/components/Form';
   import JSwitch from '@/components/Form/src/jeecg/components/JSwitch.vue';
   import { getTenantId } from '@/utils/auth';
+  import AreaSelect from '@/views/base/area/components/AreaSelect.vue';
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
@@ -212,8 +207,8 @@
 
   // 定义库区ID常量，提高可读性和可维护性
   const CP_MJ_AREA_IDS = new Set(['1988794761598668802', '1988795017837088770']);
-  //成品存储区、模具存储区、入库工作站、出库工作站
-  const CP_MJ_RK_CK_AREA_IDS = new Set(['1988794761598668802', '1988795017837088770', '1986328561044119554', '1986337742572707841']);
+  //成品存储区、模具存储区、入库工作站、出库工作站、模具入库工作站、模具出库工作站
+  const CP_MJ_RK_CK_AREA_IDS = new Set(['1988794761598668802', '1988795017837088770', '1986328561044119554', '1986337742572707841','2011686820969934849','2011686935004672001']);
 
   /**
    * 库区选择变化事件