打印功能修改

pages/pick/pick-task.vue

@@ -57,11 +57,11 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-10">
-						<span class="filter_label">出库至二楼料箱</span>
+						<span class="filter_label">返回至立库料箱</span>
 					</view>
 					<view class="zd-col-14">
 						<search-box
-						v-model="val2"
+						v-model="val3"
 						/>
 					</view>
 				</view>
@@ -76,11 +76,20 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-10">
-						<span class="filter_label">返回至立库料箱</span>
+						<span class="filter_label">是否机打印</span>
+					</view>
+					<view class="relative zd-col-14">
+						<switch :checked="isChecked1" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
+						<text @tap="setWStatus1" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10">
+						<span class="filter_label">出库至二楼料箱</span>
 					</view>
 					<view class="zd-col-14">
 						<search-box
-						v-model="val3"
+						v-model="val2"
 						/>
 					</view>
 				</view>
@@ -105,7 +114,7 @@
 			</view>
 			<view class="zd-row submit-bar">
 				<button class="zd-col-11 button-default" @tap.stop="show = false;disabled = false">关闭</button>
-				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_savePickTask">确定</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="toConfirm">确定</button>
 			</view>
 		</view>
 		<view v-if="show" class="msg_mask"></view>
@@ -128,6 +137,7 @@
 				val2: '',
 				val3: '',
 				isChecked: true,
+				isChecked1: true,
 				data: {},
 				disabled: false,
 				show: false
@@ -152,12 +162,16 @@
 			setWStatus () {
 				this.isChecked = !this.isChecked
 			},
+			setWStatus1 () {
+				this.isChecked1 = !this.isChecked1
+			},
 			clearUp () {
 				this.data = {}
 				this.val1 = ''
 				this.val2 = ''
 				this.val3 = ''
 				this.isChecked = true
+				this.isChecked1 = true
 				this.disabled = false
 				this.show = false
 			},
@@ -167,6 +181,15 @@
 				}
 				this.show = true
 			},
+			toConfirm () {
+				if (this.isChecked1) {
+					this.disabled = true
+					let data = Object.assign({}, this.data, {lxCode: this.val2})
+					this.toPrint(data)
+				} else {
+					this._savePickTask()
+				}
+			},
 			async _savePickTask () {
 				this.disabled = true
 				try {
@@ -177,8 +200,6 @@
 							title: res.msg,
 							icon: 'none'
 						})
-						let data = Object.assign({}, this.data, {lxCode: this.val2})
-						setTimeout(this.toPrint(data), 800)
 						this.clearUp()
 					} else {
 						this.disabled = false
@@ -197,8 +218,9 @@
 						icon: 'none',
 						duration: 5000
 					})
+					this.disabled = false
 				    return
-				  }
+				}
 				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
 				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
 				// 更换为打印服务器ip 不需要加前缀
@@ -252,6 +274,9 @@
 					title: '打印成功',
 					icon: 'none'
 				})
+				if (this.isChecked1) {
+					this._savePickTask()
+				}
 			}
 		}
 	}