diff --git a/pages/General/warehouse-box.vue b/pages/General/warehouse-box.vue index 6363d81..6523cf5 100644 --- a/pages/General/warehouse-box.vue +++ b/pages/General/warehouse-box.vue @@ -126,6 +126,22 @@ + + + 执行标准 + + + + + + + + 是否压容 + + + + + @@ -162,7 +178,7 @@ import {getDate} from '@/utils/utils.js' const currentDate = getDate({format: true}) // import {queryGroupQuality, queryNowVehicle} from '@/utils/mork2.js' - import {queryGroupQuality, queryNowVehicle, confirmBox, printDelete, queryPcsn, queryDevice} from '@/utils/getData2.js' + import {queryGroupQuality, queryNowVehicle, confirmBox, printDelete, queryPcsn, queryDevice, queryExecution} from '@/utils/getData2.js' export default { components: { NavBar, @@ -180,6 +196,10 @@ index1: '', options2: [], index2: '', + options3: [], + index3: '', + options4: [{text:'压容', value: '0'}, {text:'非压容', value: '1'}], + index4: '', boxType: null, materialData: {}, suppData: {}, @@ -210,6 +230,7 @@ this._queryGroupQuality() this._queryPcsn() this._queryDevice() + this._queryExecution() }, onShow () { if (this.$store.getters.publicObj !== '') { @@ -303,6 +324,19 @@ this.options2 = [] } }, + /** 执行标准下拉框*/ + async _queryExecution () { + try { + let res = await queryExecution() + if (res && res.data) { + this.options3 = [...res.data] + } else { + this.options3 = [] + } + } catch (e) { + this.options3 = [] + } + }, toEmpty () { this.vehicleCode = '' this.date = currentDate @@ -321,7 +355,7 @@ return } try { - let res = await confirmBox(this.vehicleCode, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.suppData.supp_code, this.suppData.supp_name, this.pcsn, this.date, this.qty, this.index1, this.boxType, this.num, this.index2) + let res = await confirmBox(this.vehicleCode, this.materialData.material_id, this.materialData.material_code, this.materialData.material_name, this.suppData.supp_code, this.suppData.supp_name, this.pcsn, this.date, this.qty, this.index1, this.boxType, this.num, this.index2, this.index3, this.index4) if (res) { uni.showToast({ title: res.message, diff --git a/utils/getData2.js b/utils/getData2.js index 836cb8e..6a06925 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -69,7 +69,7 @@ export const queryNowVehicle = (code) => request({ }) // 确认组箱(入库组箱) -export const confirmBox = (scode, id, mcode, mname, spcode, spname, pcsn, time, qty, quality, type, num, dcode) => request({ +export const confirmBox = (scode, id, mcode, mname, spcode, spname, pcsn, time, qty, quality, type, num, dcode, estand, mtype) => request({ url:'api/pdaInGroupBox/confirmBox', data: { storagevehicle_code:scode, @@ -84,7 +84,9 @@ export const confirmBox = (scode, id, mcode, mname, spcode, spname, pcsn, time, quality_type: quality, box_type: type, bake_num: num, - device_code: dcode + device_code: dcode, + execution_stand: estand, + material_type: mtype } }) // 批次下拉框 @@ -97,6 +99,11 @@ export const queryDevice = () => request({ url:'api/pdaInGroupBox/queryDevice', data: {} }) +// 执行标准下拉框 +export const queryExecution = () => request({ + url:'api/pdaInGroupBox/queryExecution', + data: {} +}) // 确认组箱(组箱配送) export const deliveryBox = (code, id, bcode, info, qty, rows) => request({ url:'api/pdaInGroupBox/deliveryBox',