diff --git a/api/materialManagement/MaterialRequsition.js b/api/materialManagement/MaterialRequsition.js index 11d473e..49b3c4d 100644 --- a/api/materialManagement/MaterialRequsition.js +++ b/api/materialManagement/MaterialRequsition.js @@ -55,4 +55,28 @@ export function FinisBatchingTask(params) { method: 'get', params }) +} +// 返程起点下拉 +export function getStartOptions(params) { + return request({ + url: '/mes/mm/materialinput/emptycarreturn_start', + method: 'get', + params + }) +} +// 返程终点下拉 +export function getEndOptions(params) { + return request({ + url: '/mes/mm/materialinput/emptycarreturn_end', + method: 'get', + params + }) +} +// 所有点位下拉 +export function getAllOptions(params) { + return request({ + url: '/mes/mm/MmFinishedwarehouse/finish_point', + method: 'get', + params + }) } \ No newline at end of file diff --git a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue index cb83fcc..7b6c11e 100644 --- a/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue +++ b/pages/materialManagement/MaterialRequisition/MaterialRequisition.vue @@ -94,13 +94,13 @@ - + - + @@ -124,7 +124,9 @@ getIngredientTask_son, getfabgopoints, go_workshop, - emergency_stop_agv + emergency_stop_agv, + getStartOptions, + getEndOptions } from '@/api/materialManagement/MaterialRequsition.js'; export default { data() { @@ -148,7 +150,10 @@ start_point: '', end_point: '', fab_go_points: [], - reqCode: '' + reqCode: '', + // 空车返程 + startOptions: [], + endOptions: [] }; }, watch: {}, @@ -167,6 +172,7 @@ }, mounted() { this.getInitList(); + this.getSelectOptions(); }, methods: { // todo 分页查询 @@ -194,6 +200,32 @@ } }); }, + getSelectOptions() { + getStartOptions().then(res => { + if (res.code === 200) { + let _list = []; + res.data.forEach(item => { + _list.push({ + value: item, + text: item + }) + }) + this.startOptions = _list; + } + }) + getEndOptions().then(res => { + if (res.code === 200) { + let _list = []; + res.data.forEach(item => { + _list.push({ + value: item, + text: item + }) + }) + this.endOptions = _list; + } + }) + }, sectionChange(index) { this.current = index; this.start_point = ''; @@ -234,6 +266,7 @@ //todo 确认起点 confirm_startpoint(point) { this.start_point = point; + this.get_fab_go_points(); }, //todo获取车间点 get_fab_go_points() { @@ -259,7 +292,7 @@ }); return; } - + const query = { start_point: this.start_point, end_point: this.end_point diff --git a/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue b/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue index 9d8dc78..ee9f569 100644 --- a/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue +++ b/pages/materialManagement/MaterialWarehousing/MaterialWarehousing.vue @@ -7,13 +7,13 @@ - + - + @@ -34,14 +34,17 @@