需求修改

pages/manage/empty-tray-back.vue

@@ -13,7 +13,7 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row">
+				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
 						<span class="filter_label">载具号</span>
 					</view>
@@ -21,11 +21,20 @@
 						<link-scan ref="scanChild" @getScanlist="getScanlist"/>
 					</view>
 				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">目的地</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<uni-data-select v-model="index" :localdata="options"></uni-data-select>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_handheldCageFrame">送回确认</button>
+			<button class="zd-col-4 button-default button-primary_s" @tap="clearUp">清空</button>
+			<button class="zd-col-9 button-primary button-primary_s" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_handheldCageFrame">空笼框送回确认</button>
+			<button class="zd-col-9 button-primary button-primary_s" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldRack">空料架送回确认</button>
 		</view>
 	</view>
 </template>
@@ -34,7 +43,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import LinkScan from '@/components/LinkScan.vue'
-	import {handheldCageFrame} from '@/utils/getData2.js'
+	import {handheldCageFrame, handheldRack} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -46,6 +55,8 @@
 				title: '',
 				val1: '',
 				val2: '',
+				options: [{ value: '1', text: '货架' }, { value: '2', text: '内部' }, { value: '3', text: '外协' }],
+				index: '',
 				disabled: false
 			};
 		},
@@ -57,13 +68,30 @@
 				this.val2 = e.join()
 			},
 			async _handheldCageFrame () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handheldCageFrame(this.val1, this.val2, this.index)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _handheldRack () {
 				this.disabled = true
 				if (!this.val1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await handheldCageFrame(this.val1, this.val2)
+					let res = await handheldRack(this.val1, this.val2)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -76,6 +104,7 @@
 			clearUp () {
 				this.val1 = ''
 				this.val2 = ''
+				this.index = ''
 				this.$refs.scanChild.toDel()
 				this.disabled = false
 			}