手持机功能修改

RuoYi-App-master/pages/out/ckMakeSureByTray.vue

@@ -1,5 +1,15 @@
 <template>
 	<view class="container">
+		<view class="input-group">
+		  <text class="input-label">仓库选择</text>
+		  <uni-data-select
+		      v-model="warehouseId"
+		      :localdata="warehouseOptions"
+		      placeholder="请选择仓库"
+		
+		      class="select-input"
+		  />
+		</view>
 		<view class="input-group">
 			<uni-easyinput
 				v-model="trayCode"
@@ -68,8 +78,13 @@
 		data() {
 			return {
 				trayCode: '',
+				warehouseId:null,
 				materialList: [],
-				loading: false
+				loading: false,
+				warehouseOptions:[
+				  { value: '01', text: '三联' },
+				  { value: '02', text: '二联' }
+				],
 			}
 		},
 		methods: {
@@ -123,6 +138,13 @@
 					})
 					return
 				}
+				if (!this.warehouseId) {
+					uni.showToast({
+						title: '请选择仓库',
+						icon: 'none'
+					})
+					return
+				}
 				
 				if (this.materialList.length === 0) {
 					uni.showToast({
@@ -134,7 +156,8 @@
 				
 				try {
 					const response=await ckMakeSure({
-						trayCode: this.trayCode
+						trayCode: this.trayCode,
+						warehouseId: this.warehouseId
 					  
 					})
                     if (response.code==200) {
@@ -145,6 +168,7 @@
 						// 清空数据
 						this.trayCode = ''
                         this.materialList = []
+						this.warehouseId = null
 					}else{
                         uni.showToast({
 						title: response.msg,

RuoYi-App-master/pages/out/ktpout.vue

@@ -56,6 +56,7 @@ export default {
 				const res = await getBasWarehouList({
 					   pageNum:1,
 						pageSize:100,
+						warehouseType:1
 						// typeData:['1','2']
 				})
 				if (res.code === 200) {