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" /> + + + + + - - - - - - - @@ -131,7 +129,7 @@ @change="getPointStatusAndTypeList" > @@ -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) }) }