diff --git a/common/style/layout.styl b/common/style/layout.styl
index 7e74c34..c54d973 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -47,7 +47,7 @@ uni-button:after {
 }
 .filter_label {
 	display: block;
-	line-height: 80rpx;
+	line-height: 70rpx;
 	font-size: 28rpx;
 	color: #323232;
 	font-weight: bold;
@@ -61,23 +61,31 @@ uni-button:after {
 /** 筛选选择器样式 */
 .filter_picker .uni-input {
 	width: 100%;
-	line-height: 80rpx;
-	height: 80rpx;
+	line-height: 70rpx;
+	height: 70rpx;
 	font-size: 28rpx;
 	color: #606266;
 }
 /** 筛选下拉框带搜索过滤功能样式 */
 .filter_select .uni-select {
-	line-height: 80rpx !important;
-	height: 80rpx !important;
+	line-height: 70rpx !important;
+	height: 70rpx !important;
 	font-size: 28rpx !important;
 	color: #606266;
 	padding: 0 !important;
 	border: 0 !important;
 }
+.filter_select {
+	.uniui-bottom, .uniui-top, .uniui-clear {
+		font-size: 40rpx !important;
+	}
+	.uni-select__selector-empty, .uni-select__selector-item {
+		line-height: 60rpx !important;
+	}
+}
 .filter_input {
 	width: 100%;
-	height: 80rpx;
+	height: 70rpx;
 	line-height: 28rpx;
 	border: 0;
 	background-color: transparent;
@@ -87,7 +95,7 @@ uni-button:after {
 	overflow-wrap: break-word;
 }
 .filter_picker {
-	line-height: 80rpx;
+	line-height: 70rpx;
 	font-size: 28rpx;
 	color: #606266;
 }
@@ -97,7 +105,7 @@ uni-button:after {
 .filter_input_wraper {
 	/* flex: 1; */
 	width: calc(100% - 170rpx);
-	height: 80rpx;
+	height: 70rpx;
 	padding: 5rpx 0;
 	margin-left: 30rpx;
 	display: flex;
@@ -148,7 +156,7 @@ uni-button:after {
 	left: 0;
 	z-index: 120;
 	font-size: 26rpx;
-	line-height: 98rpx;
+	line-height: 68rpx;
 	color: #696969;
 	font-weight: bold;
 	text-align: center;
@@ -174,7 +182,7 @@ uni-button:after {
 }
 .slide_new table td {
 	font-size: 28rpx;
-	line-height: 98rpx;
+	line-height: 68rpx;
 	color: #323232;
 	text-align: center;
 	box-sizing: border-box;
@@ -287,7 +295,7 @@ uni-button:after {
 	place-items: center; /* 垂直和水平居中 */
 	font-size: 34rpx;
 	line-height: 34rpx;
-	height: 88rpx;
+	height: 68rpx;
 	color: #ff6a00;
 	text-align: center;
 	letter-spacing: 4rpx;
@@ -301,7 +309,7 @@ uni-button:after {
 	place-items: center; /* 垂直和水平居中 */
 	font-size: 34rpx;
 	line-height: 34rpx;
-	height: 88rpx;
+	height: 68rpx;
 	color: #fff;
 	text-align: center;
 	letter-spacing: 4rpx;
@@ -338,7 +346,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 }
 .more-button {
 	font-size: 34rpx;
-	line-height: 88rpx;
+	line-height: 68rpx;
 	color: #ff6a00;
 	text-align: center;
 	border-radius: 0;
@@ -355,7 +363,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	margin-top: 20rpx;
 	width: 100%;
 	font-size: 34rpx;
-	line-height: 88rpx;
+	line-height: 68rpx;
 	color: #000;
 	text-align: center;
 	background-color: #fff;
@@ -549,5 +557,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	right 32px
 }
 .mini-btn {
+	margin-left:0;
 	margin-right: 0;
+	font-size: 30rpx;
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+	line-height: 50rpx;
 }
\ No newline at end of file
diff --git a/components/LinkScan.vue b/components/LinkScan.vue
index 6cda7e8..3d3be0a 100644
--- a/components/LinkScan.vue
+++ b/components/LinkScan.vue
@@ -66,7 +66,7 @@
 @import '../common/style/mixin.styl';
 .search_wraper
 	position relative
-	_wh(100%, 80rpx)
+	_wh(100%, 70rpx)
 .pdr120
 	padding-right: 50%;
 .buttons_wraper
diff --git a/components/NavBar.vue b/components/NavBar.vue
index eeb59d1..2f124cc 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="zd-row jcflexstart header">
 		<view class="zd-col-4">
-			<uni-icons @tap="goBack" type="back" size="26" color="#fff"></uni-icons>
+			<uni-icons class="icon_back" @tap="goBack" type="back" color="#fff"></uni-icons>
 		</view>
 		<view class="zd-col-16 page_name">{{title}}</view>
 		<view v-if="searchActive" class="zd-col-4" style="text-align: right">
@@ -61,4 +61,6 @@
 	padding var(--status-bar-height) 20rpx 0 
 .page_name
 	_font(32rpx, 32rpx, #fff,700,center)
+.icon_back
+	font-size 40rpx !important
 </style>
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 1d118e5..8218177 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -11,9 +11,9 @@
 		@blur="handleBlur"
 		@confirm="handleSend">
 		<view class="zd-row buttons_wraper">
-			<uni-icons v-show="value !== '' && value !== null && value !== undefined" class="pdr10" type="clear" size="24" color="#666" @tap="toDel"></uni-icons>
-			<uni-icons type="scan" size="22" :color="focusState ? '#ff6a00' : '#4e6ef2'" @tap="focusState=true"></uni-icons>
-			<uni-icons type="camera" size="28" style="marginLeft: 30rpx;" @tap="toPhone"></uni-icons>
+			<uni-icons v-show="value !== '' && value !== null && value !== undefined" class="pdr10 icon_del" type="clear" color="#666" @tap="toDel"></uni-icons>
+			<!-- <uni-icons class="icon_scan" type="scan" :color="focusState ? '#ff6a00' : '#4e6ef2'" @tap="focusState=true"></uni-icons> -->
+			<uni-icons class="icon_camera" type="camera" :color="focusState ? '#ff6a00' : '#4e6ef2'" @tap="toPhone"></uni-icons>
 		</view>
 	</view>
 </template>
@@ -105,7 +105,7 @@
 @import '../common/style/mixin.styl';
 .search_wraper
 	position relative
-	_wh(100%, 80rpx)
+	_wh(100%, 70rpx)
 .pdr120
 	padding-right: 120rpx;
 .buttons_wraper
@@ -115,4 +115,8 @@
 	_wh(auto, 80rpx)
 .pdr10
 	padding-right 10rpx
+.icon_del
+	font-size 40rpx !important
+.icon_scan, .icon_camera
+	font-size 46rpx !important
 </style>
diff --git a/pages/General/distribution-box.vue b/pages/General/distribution-box.vue
index 6afe19b..0f1e067 100644
--- a/pages/General/distribution-box.vue
+++ b/pages/General/distribution-box.vue
@@ -19,7 +19,7 @@
 					<view class="zd-col-13">
 						<input type="text" v-model="deviceData.device_code" class="filter_input">
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="toJump('machine-order?title=机台工单维护')">查询</button>
+					<button class="mini-btn" type="primary" @tap="toJump('machine-order?title=机台工单维护')">查询</button>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
diff --git a/pages/General/machine-order.vue b/pages/General/machine-order.vue
index 57dc74d..28f1272 100644
--- a/pages/General/machine-order.vue
+++ b/pages/General/machine-order.vue
@@ -21,7 +21,7 @@
 					<view class="zd-col-14">
 						<input type="text" placeholder="输入物料关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="_queryBomInfo">查询</button>
+					<button class="mini-btn" type="primary" @tap="_queryBomInfo">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/pages/General/material.vue b/pages/General/material.vue
index 8a685ff..311804d 100644
--- a/pages/General/material.vue
+++ b/pages/General/material.vue
@@ -11,7 +11,7 @@
 					<view class="zd-col-14">
 						<input type="text" placeholder="输入物料关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="_queryMaterial">查询</button>
+					<button class="mini-btn" type="primary" @tap="_queryMaterial">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/pages/General/operation.vue b/pages/General/operation.vue
index 43c1291..85a205f 100644
--- a/pages/General/operation.vue
+++ b/pages/General/operation.vue
@@ -27,7 +27,7 @@
 					<view class="zd-col-14">
 						<input type="text" placeholder="载具号/起点/终点/任务号" class="filter_input" v-model="keyword" @focus="handleFocus">
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="_queryHistoryTask">查询</button>
+					<button class="mini-btn" type="primary" @tap="_queryHistoryTask">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/pages/General/ops-mgmt.vue b/pages/General/ops-mgmt.vue
index ee75cd4..88fecc2 100644
--- a/pages/General/ops-mgmt.vue
+++ b/pages/General/ops-mgmt.vue
@@ -11,7 +11,7 @@
 					<view class="zd-col-13">
 						<search-box v-model="keyword"/>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="_queryTask">查询</button>
+					<button class="mini-btn" type="primary" @tap="_queryTask">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/pages/General/pt-update.vue b/pages/General/pt-update.vue
index 7b505ac..16878b7 100644
--- a/pages/General/pt-update.vue
+++ b/pages/General/pt-update.vue
@@ -19,7 +19,7 @@
 					<view class="zd-col-13">
 						<search-box v-model="vehicleCode"/>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="_updatePointqueryPointInfo">查询</button>
+					<button class="mini-btn" type="primary" @tap="_updatePointqueryPointInfo">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/pages/General/supplier.vue b/pages/General/supplier.vue
index c71d908..15c5157 100644
--- a/pages/General/supplier.vue
+++ b/pages/General/supplier.vue
@@ -11,7 +11,7 @@
 					<view class="zd-col-14">
 						<input type="text" placeholder="输入供应商关键字" class="filter_input" v-model="keyword" @focus="handleFocus">
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="_querySupp">查询</button>
+					<button class="mini-btn" type="primary" @tap="_querySupp">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/pages/General/warehouse-box.vue b/pages/General/warehouse-box.vue
index 56cf754..c29de92 100644
--- a/pages/General/warehouse-box.vue
+++ b/pages/General/warehouse-box.vue
@@ -19,7 +19,7 @@
 					<view class="zd-col-13">
 						<search-box v-model="materialData.material_code"/>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="toJump('material?title=物料维护')">查询</button>
+					<button class="mini-btn" type="primary" @tap="toJump('material?title=物料维护')">查询</button>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
@@ -36,7 +36,7 @@
 					<view class="zd-col-13">
 						<search-box v-model="suppData.supp_code"/>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="toJump('supplier?title=供应商维护')">查询</button>
+					<button class="mini-btn" type="primary" @tap="toJump('supplier?title=供应商维护')">查询</button>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-6">
@@ -236,6 +236,10 @@
 			},
 			labelPrint () {
 				this.disabled1 = true
+				if (!this.vehicleCode || JSON.stringify(this.materialData) === '{}' || JSON.stringify(this.suppData) === '{}') {
+					this.disabled1 = false
+					return
+				}
 				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
 				this.toPrint(data)
 			},
@@ -259,24 +263,26 @@
 				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机
 				LODOP.SET_PRINTER_INDEX(-1);
 				// 设置打印纸大小
-				LODOP.SET_PRINT_PAGESIZE(1, '130mm', '67mm', '');
-				LODOP.ADD_PRINT_RECT('1mm', '3mm', '124mm', '61mm', 0, 1);
-				LODOP.SET_PRINT_STYLE('FontSize', 12);
+				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '');
+				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1);
+				LODOP.SET_PRINT_STYLE('FontSize', 8);
 				LODOP.SET_PRINT_STYLE('Bold', 1);
+				LODOP.SET_PRINT_STYLE('WordWrap', 0);
+				LODOP.SET_PRINT_STYLEA(0, 'FitContent', 1);
 				LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.material_code + '##' + data.supp_code);
-				LODOP.ADD_PRINT_TEXT('5mm', '35mm', '80mm', '15mm', '物料编码：' + data.material_code);
-				LODOP.ADD_PRINT_TEXT('12mm', '35mm', '80mm', '15mm', '物料名称：' + data.material_name);
-				LODOP.ADD_PRINT_TEXT('19mm', '35mm', '80mm', '15mm', '    规格：' + data.material_spec);
-				LODOP.ADD_PRINT_TEXT('26mm', '35mm', '80mm', '15mm', '    型号：' + data.material_model);
-				LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '  执行标准：' + data.execution_stand)
-				LODOP.ADD_PRINT_TEXT('34mm', '59mm', '80mm', '15mm', '有效期(天)：' + data.quality_time)
-				LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '      批次：' + data.pcsn)
-				LODOP.ADD_PRINT_TEXT('41mm', '59mm', '80mm', '15mm', '  生产日期：' + data.produce_time)
-				LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '供应商编码：' + data.supp_code)
-				LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '供应商名称：' + data.supp_name)
-				LODOP.ADD_PRINT_TEXT('55mm', '5mm', '80mm', '15mm', '  烘干次数：' + data.bake_num)
-				// LODOP.PRINT();
-				LODOP.PREVIEW()
+				LODOP.ADD_PRINT_TEXT('5mm', '34mm', '80mm', '15mm', '物料编码：' + data.material_code);
+				LODOP.ADD_PRINT_TEXT('12mm', '34mm', '160mm', '15mm', '物料名称：' + data.material_name);
+				LODOP.ADD_PRINT_TEXT('19mm', '34mm', '50mm', '15mm', '    规格：' + data.material_spec);
+				LODOP.ADD_PRINT_TEXT('26mm', '34mm', '50mm', '15mm', '    型号：' + data.material_model);
+				LODOP.ADD_PRINT_TEXT('34mm', '4mm', '50mm', '15mm', '  执行标准：' + data.execution_stand)
+				LODOP.ADD_PRINT_TEXT('34mm', '41mm', '50mm', '15mm', '有效期(天)：' + data.quality_time)
+				LODOP.ADD_PRINT_TEXT('41mm', '5mm', '40mm', '15mm', '供应商编码：' + data.supp_code)
+				LODOP.ADD_PRINT_TEXT('41mm', '41mm', '40mm', '15mm', '供应商名称：' + data.supp_name)
+				LODOP.ADD_PRINT_TEXT('48mm', '5mm', '50mm', '15mm', '批次：' + data.pcsn)
+				LODOP.ADD_PRINT_TEXT('48mm', '28mm', '60mm', '15mm', '生产日期：' + data.produce_time)
+				LODOP.ADD_PRINT_TEXT('48mm', '58mm', '40mm', '15mm', '烘干次数：' + data.bake_num)
+				LODOP.PRINT();
+				// LODOP.PREVIEW()
 				uni.showToast({
 					title: '打印成功',
 					icon: 'none'
diff --git a/pages/Material/dlx-out-store.vue b/pages/Material/dlx-out-store.vue
index 83aad2d..0f84246 100644
--- a/pages/Material/dlx-out-store.vue
+++ b/pages/Material/dlx-out-store.vue
@@ -21,7 +21,7 @@
 					<view class="zd-col-13">
 						<search-box v-model="keyword"/>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="_getIoDisDocumentInfo">查询</button>
+					<button class="mini-btn" type="primary" @tap="_getIoDisDocumentInfo">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/pages/Material/dlx-pan-store.vue b/pages/Material/dlx-pan-store.vue
index 82a5993..915f96a 100644
--- a/pages/Material/dlx-pan-store.vue
+++ b/pages/Material/dlx-pan-store.vue
@@ -11,7 +11,7 @@
 					<view class="zd-col-13">
 						<search-box v-model="keyword"/>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="_getCheckDocumentInfo">查询</button>
+					<button class="mini-btn" type="primary" @tap="_getCheckDocumentInfo">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/pages/Material/mater-save.vue b/pages/Material/mater-save.vue
index 721f179..1910531 100644
--- a/pages/Material/mater-save.vue
+++ b/pages/Material/mater-save.vue
@@ -20,7 +20,7 @@
 					<view class="zd-col-14">
 						<input type="text" placeholder="输入物料关键字" class="filter_input" v-model="val1">
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="searchList">查询</button>
+					<button class="mini-btn" type="primary" @tap="searchList">查询</button>
 				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
diff --git a/utils/mork2.js b/utils/mork2.js
index 0c1fecb..d74617c 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -56,8 +56,8 @@ export const queryMaterial = (code) => {
 		data: [
 			{
 				material_id: '1',
-				material_code: 'mater1',
-				material_name: 'material_name',
+				material_code: '441510009000470',
+				material_name: '木制包装容器及板材|木箱|1300|1|6|1376*676*730',
 				material_spec: 'material_spec',
 				material_model: 'material_model',
 				execution_stand: 'execution_stand',