修改bug

pages/SecondPhase/production/BakeProcess.vue

@@ -48,7 +48,7 @@
 		<view class="zd-row submitbar">
 			<button class="zd-col-4 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
 			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.enter-box')}}</button>
-			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.out-box')}}</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.out-box')}}</button>
 			<button class="zd-col-6 btn-submit btn-success" :disabled="disabled" @click="_inHotByPoint">定点入箱</button>
 		</view>
 		<view class="msg_wrapper" :class="active ? 'popshow' : 'pophide'" style="height: auto">
@@ -156,19 +156,18 @@
 			},
 			async handleConfirm(type) {
 				if ((!this.val1 || !this.val2 ||!this.val3 || !this.val4) && type === '1') {
-					this.disabled = false
 					return
 				}
-				if (!this.val1 && type === '2') {
+				if ((!this.val1 || !this.val2) && type === '2') {
 					return
 				}
 				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
 				if (isConfirmed) {
 					if (type === '1') {
-						this._ovenInAndOut1()
+						this._ovenInAndOut1(type)
 					}
 					if (type === '2') {
-						this._ovenInAndOut2()
+						this._ovenInAndOut2(type)
 					}
 				}
 			},
@@ -188,7 +187,7 @@
 			async _ovenInAndOut2 (type) {
 				this.disabled = true
 				try {
-					let res = await ovenInAndOut(this.val1, '','', '', type)
+					let res = await ovenInAndOut(this.val1, this.val2,'', '', type)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'