sov

pages/management/inscanerror.vue

@@ -15,6 +15,12 @@
 						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
+				<view class="search-item">
+					<label class="search-label">位置类型</label>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
+					</view>
+				</view>
 				<view class="search-item">
 					<label class="search-label">满箱码</label>
 					<view class="filter_input_wraper">
@@ -23,15 +29,15 @@
 						/>
 					</view>
 				</view>
-				<view class="search-item search-item-btns">
+				<!-- <view class="search-item search-item-btns">
 					<button class="confirm-button" @tap="toSearch">查询</button>
 					<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1}" :disabled="disabled" @tap="toSure">确认</button>
-				</view>
+				</view> -->
+			</view>
+			<view class="confirm-button-wrap">
+				<button class="confirm-button" @tap="toSearch">查询</button>
+				<button class="confirm-button" :class="{'confirm-button_disabled': !pkId || !index2 || !val1 || !index3}" :disabled="disabled" @tap="toSure">确认</button>
 			</view>
-			<!-- <view class="confirm-button-wrap">
-				<button class="confirm-button" @tap="toSearch()">查询</button>
-				<button class="confirm-button" :disabled="disabled" @tap="toSure()">确认</button>
-			</view> -->
 		</view>
 		<view class="grid-wrap">
 			<table class="grid-table">
@@ -48,9 +54,9 @@
 						<td>
 							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.position_code}"></view>
 						</td>
-						<td>{{e.cacheLine_code}}</td>
+						<td>{{e.cacheline_code}}</td>
 						<td>{{e.position_code}}</td>
-						<td>{{vehicle_code}}</td>
+						<td>{{e.vehicle_code}}</td>
 					</tr>
 				</tbody>
 			</table>
@@ -73,6 +79,8 @@
 				index1: 'A1',
 				options2: [],
 				index2: '',
+				options3: [{text: '对接位', value: '1'}, {text: '准备位', value: '2'}],
+				index3: '1',
 				val1: '',
 				dataList: [],
 				pkId: '',
@@ -95,6 +103,10 @@
 			selectChange2(e) {
 				this.index2 = e
 			},
+			/** 选择器3 */
+			selectChange3(e) {
+				this.index3 = e
+			},
 			toSearch () {
 			  this.dataList = []
 			  this.pkId = ''
@@ -126,6 +138,14 @@
 				this.disabled = false
 				return  
 			  }
+			  if (!this.index3) {
+				uni.showToast({
+					title: '请选择位置类型',
+					icon: 'none'
+				})
+				this.disabled = false
+				return  
+			  }
 			  if (!this.val1) {
 				uni.showToast({
 					title: '请扫满箱码',
@@ -135,7 +155,7 @@
 				return  
 			  }
 			  try {
-				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId) 
+				let res = await inOutExceptionInstConfirm(this.index2, this.val1, this.pkId, this.index3) 
 				this.disabled = false
 				this.toSearch()
 				uni.showToast({
@@ -152,3 +172,8 @@
 		}
 	}
 </script>
+
+<style lang="stylus" scoped>
+.grid-wrap	
+    height: calc(100% - 237px); /** 42+ 15*6+ 35*3 */
+</style>

utils/getData2.js

@@ -37,12 +37,13 @@ export const inOutExceptionInstQuery = (wcode) => request({
 	}
 })
 // 1.3确认
-export const inOutExceptionInstConfirm = (wcode, vcode, pcode) => request({
+export const inOutExceptionInstConfirm = (wcode, vcode, pcode, type) => request({
 	url:'api/cacheLineHand/inOutExceptionInstConfirm',
 	data: {
 		wcsdevice_code: wcode,
 		vehicle_code: vcode,
-		position_code: pcode
+		position_code: pcode,
+		type: type
 	}
 })