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 cfbce62..4faca3d 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)"
>
-
+
-
+
-
+
-
+
启用
禁用
锁定
@@ -198,7 +198,7 @@
v-model="form.region_id"
placeholder="请选择"
style="width: 370px;"
- @change="getPointStatusAndTypeList"
+ @change="getPointStatusAndTypeList(form.region_id, 2)"
>
-
+
-
+
@@ -253,7 +253,7 @@
style="width: 370px;"
>
@@ -295,7 +295,7 @@
-
+
{{ scope.row.is_used=='1' ? '是' : '否' }}
@@ -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 6ddce55..f98d1a2 100644
--- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -92,6 +92,8 @@ const defaultForm = {
region_id: null,
region_code: null,
region_name: null,
+ point_type_explain: null,
+ point_status_explain: null,
remark: null,
create_id: null,
create_name: null,