修改接口

pages/General/warehouse-box.vue

@@ -126,6 +126,22 @@
 						<uni-data-select v-model="index2" :localdata="options2"></uni-data-select>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">执行标准</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<uni-data-select v-model="index3" :localdata="options3"></uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-6">
+						<span class="filter_label">是否压容</span>
+					</view>
+					<view class="zd-col-18 filter_select">
+						<uni-data-select v-model="index4" :localdata="options4"></uni-data-select>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
@@ -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,

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',