From 9d6ace1b7a7065750b677a814478b82931827ff9 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Fri, 28 Oct 2022 20:06:32 +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

---
 .../src/views/wms/sch/point/index.vue         | 28 +++++++++++--------
 .../src/views/wms/sch/region/index.vue        |  2 ++
 2 files changed, 19 insertions(+), 11 deletions(-)

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 4cde6c713..075c1ab05 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -27,7 +27,7 @@
               size="mini"
               placeholder="区域类型"
               class="filter-item"
-              @change="getPointStatusAndTypeList"
+              @change="getPointStatusAndTypeList(query.region_id, 1)"
             >
               <el-option
                 v-for="item in regionList"
@@ -198,7 +198,7 @@
               v-model="form.region_id"
               placeholder="请选择"
               style="width: 370px;"
-              @change="getPointStatusAndTypeList"
+              @change="getPointStatusAndTypeList(form.region_id, 2)"
             >
               <el-option
                 v-for="item in regionList"
@@ -360,7 +360,9 @@ export default {
       syncLoading: false,
       invtypelist: [],
       pointStatusList: [],
+      pointStatusDialogList: [],
       pointTypesList: [],
+      pointTypesDialogList: [],
       options: [],
       regionList: [],
       permission: {},
@@ -396,7 +398,7 @@ export default {
     },
     [CRUD.HOOK.afterToCU]() {
       if (this.form.region_id) {
-        this.getPointStatusAndTypeList(this.form.region_id)
+        this.getPointStatusAndTypeList(this.form.region_id, 2)
       }
     },
     hand(value) {
@@ -424,21 +426,25 @@ export default {
       }).catch(() => {
       })
     },
-    getPointStatusAndTypeList(id) {
+    getPointStatusAndTypeList(id, flag) {
       if (id) {
-        this.getPointStatusList(id)
-        this.getPointTypeList(id)
-        this.crud.toQuery()
+        this.getPointStatusList(id, flag)
+        this.getPointTypeList(id, flag)
       }
+      if (flag === 1) { this.crud.toQuery() }
     },
-    getPointStatusList(id) {
+    getPointStatusList(id, flag) {
       crudRegion.getPointStatusSelectById(id).then(res => {
-        this.pointStatusList = res
+        if (flag === 1) {
+          this.pointStatusList = res
+        } else {
+          this.pointStatusDialogList = res
+        }
       })
     },
-    getPointTypeList(id) {
+    getPointTypeList(id, flag) {
       crudRegion.getPointTypeSelectById(id).then(res => {
-        this.pointTypesList = res
+        if (flag === 1) { this.pointTypesList = res } else { this.pointTypesDialogList = res }
       })
     },
     changeUsed(data, flag) { // 更改启用状态
diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
index fec7834a9..569e6266b 100644
--- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -93,6 +93,8 @@ const defaultForm = {
   region_code: null,
   region_name: null,
   remark: null,
+  point_type_explain: null,
+  point_status_explain: null,
   create_id: null,
   create_name: null,
   create_time: null,