diff --git a/pages/home/home.vue b/pages/home/home.vue
index 815c0cf..0a8a54a 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -21,7 +21,6 @@
 						</view>
 					</view>
 				</view>
-				<button type="primary" @tap="toTest">打印测试</button>
 			</view>
 		</view>
 		<view class="sec_menu_wraper" :class="show ? 'popshow' : 'pophide'">
@@ -84,11 +83,6 @@
 			  uni.redirectTo({
 			  	url: '/pages/login/login'
 			  })
-			},
-			toTest () {
-				uni.redirectTo({
-					url: '/pages/test'
-				})
 			}
 		}
 	}
diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue
index f52786c..10989b8 100644
--- a/pages/pick/pick-task.vue
+++ b/pages/pick/pick-task.vue
@@ -75,7 +75,7 @@
 						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
 					</view>
 				</view>
-				<!-- <view class="zd-row border-bottom">
+				<view class="zd-row border-bottom">
 					<view class="zd-col-10">
 						<span class="filter_label">是否机打印</span>
 					</view>
@@ -83,7 +83,7 @@
 						<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>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-10">
 						<span class="filter_label">返回至立库料箱</span>
@@ -124,7 +124,7 @@
 </template>
 
 <script>
-	// import {getCLodop} from "@/utils/CLodopfuncs.js"
+	import {getCLodop} from "@/utils/CLodopfuncs.js"
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import {queryPick, savePickTask} from '@/utils/getData2.js'
@@ -139,7 +139,7 @@
 				val2: '',
 				val3: '',
 				isChecked: true,
-				isChecked1: false,
+				isChecked1: true,
 				data: {},
 				disabled: false,
 				show: false
@@ -191,7 +191,7 @@
 				this.val2 = ''
 				this.val3 = ''
 				this.isChecked = true
-				this.isChecked1 = false
+				this.isChecked1 = true
 				this.disabled = false
 				this.show = false
 			},
@@ -209,14 +209,13 @@
 				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()
-				// }
-				this._savePickTask()
+				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
@@ -258,44 +257,24 @@
 				// 设置打印纸大小
 				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '50mm', '');
 				// LODOP.SET_PRINT_MODE("POS_BASEON_PAPER",true);
-				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '44mm', 0, 1);
-				LODOP.SET_PRINT_STYLE('FontSize', 10);
+				// LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '44mm', 0, 1);
+				LODOP.SET_PRINT_STYLE('FontSize', 13);
 				LODOP.SET_PRINT_STYLE('Bold', 1);
-				LODOP.ADD_PRINT_TEXT('5mm', '30mm', '32mm', '15mm', '物料信息卡');
-				let tableHtml = `
-								<div id="div1">
-									<style>table{border:none} td{border: 1px solid #000;height:18px;font-size: 10px;text-align: center}</style>
-									
-									<table border=0 cellSpacing=0 cellPadding=0  width="100%" bordercolor="#000000" style="border-collapse:collapse">
-										<tbody>
-											<tr>
-											    <td width="40%">用料单号</td>
-											    <td width="60%">${data.prd_ppbom_no}</td>
-											</tr>
-											<tr>
-											    <td width="40%">物料编码</td>
-											    <td width="60%">${data.material_code}</td>
-											</tr>
-											<tr>
-											    <td width="40%">物料名称</td>
-											    <td width="60%">${data.material_name}</td>
-											</tr>
-											<tr>
-											    <td width="40%">物料规格</td>
-											    <td width="60%">${data.material_spec}</td>
-											</tr>
-											<tr>
-											    <td width="40%">物料数量</td>
-											    <td width="60%">${data.assign_qty}</td>
-											</tr>
-											<tr>
-											    <td width="40%">料箱号</td>
-											    <td width="60%">${data.lxCode}</td>
-											</tr>
-										</tbody>
-									</table>
-								</div>`
-				LODOP.ADD_PRINT_TABLE("12mm",'5mm',"70mm","30mm",tableHtml);
+				LODOP.ADD_PRINT_TEXT('1mm', '27mm', '25mm', '5.5mm', '物料信息卡');
+				LODOP.SET_PRINT_STYLE('FontSize', 12);
+				LODOP.SET_PRINT_STYLE('Bold', 0);
+				LODOP.ADD_PRINT_TEXT('7.5mm', '10mm', '25mm', '5.5mm', '用料单号：');
+				LODOP.ADD_PRINT_TEXT('7.5mm', '35mm', '25mm', '5.5mm', data.prd_ppbom_no);
+				LODOP.ADD_PRINT_TEXT('13mm', '10mm', '25mm', '5.5mm', '物料编码：');
+				LODOP.ADD_PRINT_TEXT('13mm', '35mm', '25mm', '5.5mm', data.material_code);
+				LODOP.ADD_PRINT_TEXT('18.5mm', '10mm', '25mm', '5.5mm', '物料名称：');
+				LODOP.ADD_PRINT_TEXT('18.5mm', '35mm', '25mm', '5.5mm', data.material_name);
+				LODOP.ADD_PRINT_TEXT('24mm', '10mm', '25mm', '5.5mm', '物料规格：');
+				LODOP.ADD_PRINT_TEXT('24mm', '35mm', '25mm', '5.5mm', data.material_spec);
+				LODOP.ADD_PRINT_TEXT('29.5mm', '10mm', '25mm', '5.5mm', '物料数量：');
+				LODOP.ADD_PRINT_TEXT('29.5mm', '35mm', '25mm', '5.5mm', data.assign_qty);
+				LODOP.ADD_PRINT_TEXT('35mm', '10mm', '25mm', '5.5mm', '料箱号：');
+				LODOP.ADD_PRINT_TEXT('35mm', '35mm', '25mm', '5.5mm', data.lxCode);
 				LODOP.PRINT();
 				// LODOP.PREVIEW()
 				uni.showToast({
diff --git a/pages/test.vue b/pages/test.vue
index 09f68b8..818cfc5 100644
--- a/pages/test.vue
+++ b/pages/test.vue
@@ -84,27 +84,28 @@
 				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
 				// 更换为打印服务器ip 不需要加前缀
 				LODOP.PRINT_INIT(null, printUrl);
-				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
+				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
 				LODOP.SET_PRINTER_INDEX(-1);
 				// 设置打印纸大小
-				LODOP.SET_PRINT_PAGESIZE(1, '70mm', '35mm', '');
-				LODOP.SET_PRINT_STYLE(0, 'FontSize', 6);
-				LODOP.SET_PRINT_STYLE(0, 'Bold', 1);
-				LODOP.ADD_PRINT_TEXT('2mm', '27mm', '25mm', '4mm', '物料信息卡');
-				LODOP.SET_PRINT_STYLE(-1, 'FontSize', 5);
-				LODOP.SET_PRINT_STYLE(-1, 'Bold', 0);
-				LODOP.ADD_PRINT_TEXT('5mm', '10mm', '25mm', '4mm', '用料单号');
-				LODOP.ADD_PRINT_TEXT('5mm', '35mm', '25mm', '4mm', data.prd_ppbom_no);
-				LODOP.ADD_PRINT_TEXT('9mm', '10mm', '25mm', '4mm', '物料编码');
-				LODOP.ADD_PRINT_TEXT('9mm', '35mm', '25mm', '4mm', data.material_code);
-				LODOP.ADD_PRINT_TEXT('13mm', '10mm', '25mm', '4mm', '物料名称');
-				LODOP.ADD_PRINT_TEXT('13mm', '35mm', '25mm', '4mm', data.material_name);
-				LODOP.ADD_PRINT_TEXT('17mm', '10mm', '25mm', '4mm', '物料规格');
-				LODOP.ADD_PRINT_TEXT('17mm', '35mm', '25mm', '4mm', data.material_spec);
-				LODOP.ADD_PRINT_TEXT('21mm', '10mm', '25mm', '4mm', '物料数量');
-				LODOP.ADD_PRINT_TEXT('21mm', '35mm', '25mm', '4mm', data.assign_qty);
-				LODOP.ADD_PRINT_TEXT('25mm', '10mm', '25mm', '4mm', '料箱号');
-				LODOP.ADD_PRINT_TEXT('25mm', '35mm', '25mm', '4mm', data.lxCode);
+				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '50mm', '');
+				// LODOP.ADD_PRINT_RECT('0.5mm', '0.5mm', '75mm', '45mm', 0, 1);
+				LODOP.SET_PRINT_STYLE('FontSize', 13);
+				LODOP.SET_PRINT_STYLE('Bold', 1);
+				LODOP.ADD_PRINT_TEXT('1mm', '27mm', '25mm', '5.5mm', '物料信息卡');
+				LODOP.SET_PRINT_STYLE('FontSize', 12);
+				LODOP.SET_PRINT_STYLE('Bold', 0);
+				LODOP.ADD_PRINT_TEXT('7.5mm', '10mm', '25mm', '5.5mm', '用料单号：');
+				LODOP.ADD_PRINT_TEXT('7.5mm', '35mm', '25mm', '5.5mm', data.prd_ppbom_no);
+				LODOP.ADD_PRINT_TEXT('13mm', '10mm', '25mm', '5.5mm', '物料编码：');
+				LODOP.ADD_PRINT_TEXT('13mm', '35mm', '25mm', '5.5mm', data.material_code);
+				LODOP.ADD_PRINT_TEXT('18.5mm', '10mm', '25mm', '5.5mm', '物料名称：');
+				LODOP.ADD_PRINT_TEXT('18.5mm', '35mm', '25mm', '5.5mm', data.material_name);
+				LODOP.ADD_PRINT_TEXT('24mm', '10mm', '25mm', '5.5mm', '物料规格：');
+				LODOP.ADD_PRINT_TEXT('24mm', '35mm', '25mm', '5.5mm', data.material_spec);
+				LODOP.ADD_PRINT_TEXT('29.5mm', '10mm', '25mm', '5.5mm', '物料数量：');
+				LODOP.ADD_PRINT_TEXT('29.5mm', '35mm', '25mm', '5.5mm', data.assign_qty);
+				LODOP.ADD_PRINT_TEXT('35mm', '10mm', '25mm', '5.5mm', '料箱号：');
+				LODOP.ADD_PRINT_TEXT('35mm', '35mm', '25mm', '5.5mm', data.lxCode);
 				LODOP.PRINT();
 				// LODOP.PREVIEW()
 				uni.showToast({