From a06b18bc6c2f0b4b3e7ba856aace0fb4fbc47285 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Wed, 19 Oct 2022 14:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sch/service/impl/RegionServiceImpl.java   |  1 -
 .../src/views/wms/sch/point/index.vue         | 54 ++++++++++---------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
index 8c71485..9eb97f5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java
@@ -176,7 +176,6 @@ public class RegionServiceImpl implements RegionService {
             point_type.put("label", types[1]);
             point_type.put("value", types[0]);
             res.add(point_type);
-            res.add(point_type);
         }
         return res;
     }
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index 5b21a89..24365c3 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -19,6 +19,23 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="区域类型">
+            <el-select
+              v-model="query.region_id"
+              clearable
+              filterable
+              size="mini"
+              placeholder="区域类型"
+              class="filter-item"
+              @change="getPointStatusAndTypeList"
+            >
+              <el-option
+                v-for="item in regionList"
+                :label="item.region_name"
+                :value="item.region_id"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="点位类型">
             <el-select
               v-model="query.point_type"
@@ -29,31 +46,12 @@
               @change="hand"
             >
               <el-option
-                v-for="item in dict.sch_point_type"
+                v-for="item in pointTypesList"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
-
-          <el-form-item label="区域类型">
-            <el-select
-              v-model="query.region_id"
-              clearable
-              filterable
-              size="mini"
-              placeholder="区域类型"
-              class="filter-item"
-              @change="hand"
-            >
-              <el-option
-                v-for="item in reginoList"
-                :label="item.region_name"
-                :value="item.region_id"
-              />
-            </el-select>
-          </el-form-item>
-
           <el-form-item label="点位状态">
             <el-select
               v-model="query.point_status"
@@ -65,7 +63,7 @@
               @change="hand"
             >
               <el-option
-                v-for="item in dict.sch_point_status"
+                v-for="item in pointStatusList"
                 :label="item.label"
                 :value="item.value"
               />
@@ -131,7 +129,7 @@
               @change="getPointStatusAndTypeList"
             >
               <el-option
-                v-for="item in reginoList"
+                v-for="item in regionList"
                 :label="item.region_name"
                 :value="item.region_id"
               />
@@ -290,7 +288,7 @@ export default {
       pointStatusList: [],
       pointTypesList: [],
       options: [],
-      reginoList: [],
+      regionList: [],
       permission: {},
       rules: {
         point_code: [
@@ -314,7 +312,7 @@ export default {
   },
   created() {
     crudPoint.getRegion().then(res => {
-      this.reginoList = res
+      this.regionList = res
     })
   },
   methods: {
@@ -358,17 +356,21 @@ export default {
       })
     },
     getPointStatusAndTypeList(id) {
-      this.getPointStatusList(id)
-      this.getPointTypeList(id)
+      if (id) {
+        this.getPointStatusList(id)
+        this.getPointTypeList(id)
+      }
     },
     getPointStatusList(id) {
       crudRegion.getPointStatusSelectById(id).then(res => {
         this.pointStatusList = res
+        console.log(res)
       })
     },
     getPointTypeList(id) {
       crudRegion.getPointTypeSelectById(id).then(res => {
         this.pointTypesList = res
+        console.log(res)
       })
     }