diff --git a/pages/SecondPhase/EmptyVehicleInStore.vue b/pages/SecondPhase/EmptyVehicleInStore.vue index c05be5f..2e2e97b 100644 --- a/pages/SecondPhase/EmptyVehicleInStore.vue +++ b/pages/SecondPhase/EmptyVehicleInStore.vue @@ -26,11 +26,17 @@ + + {{$t('filter.layers')}} + + + + - + @@ -39,7 +45,7 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import { confirmAction } from '@/utils/utils.js' - import {twoPdaVehicleIn} from '@/utils/getData3.js' + import {dictDetailpdaPost, twoPdaVehicleIn} from '@/utils/getData3.js' export default { components: { NavBar, @@ -51,6 +57,8 @@ val1: '', options: [{value: '1', text: this.$t('select.coaster')}, {value: '2', text: this.$t('select.large-tray')}], index: '', + options2: [], + index2: '', val2: '', disabled: false }; @@ -58,12 +66,23 @@ onLoad (options) { this.title = options.title }, + created () { + this._dictDetailpdaPost() + }, methods: { + /** 生产区域下拉框查询 */ + async _dictDetailpdaPost () { + let res = await dictDetailpdaPost() + this.options2 = [...res.data] + }, selectChange (e) { this.index = e }, + selectChange2 (e) { + this.index2 = e + }, async handleConfirm() { - if (!this.val1 || !this.val2 || !this.index) { + if (!this.val1 || !this.val2 || !this.index || !this.index2) { return } const isConfirmed = await confirmAction(this.$t('toast.prompt'), this.$t('toast.sure-perform-operation')) @@ -74,7 +93,7 @@ async _twoPdaVehicleIn () { this.disabled = true try { - let res = await twoPdaVehicleIn(this.val1, this.index, this.val2) + let res = await twoPdaVehicleIn(this.val1, this.index, this.val2, this.index2) uni.showToast({ title: res.message, icon: 'none' @@ -88,6 +107,7 @@ clearUp () { this.val1 = '' this.index = '' + this.index2 = '' this.val2 = '' } } diff --git a/utils/getData3.js b/utils/getData3.js index 97d1d8b..84fc3ec 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -8,14 +8,21 @@ import request from './request.js' * 二期空载具入库 */ // 1.1空载具入库-【入库按钮】 -export const twoPdaVehicleIn = (code, type, pcode) => request({ +export const twoPdaVehicleIn = (code, type, pcode, layer) => request({ url:'api/twoPda/vehicle/vehicleIn', data: { vehicle_code: code, vehicle_type: type, - point_code: pcode + point_code: pcode, + layer: layer } }) +// 字典获取 +export const dictDetailpdaPost = (no, code) => request({ + url:'api/dict/dictDetail/pdaPost', + data: {} +}) + /** * 二期空木箱入库 */