代码更新

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) { // 更改启用状态

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,