From 676970a6fec0a7c0aad2b098b15234fb8e56f358 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 30 Jun 2025 18:34:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue      |  6 ++++++
 pages/login/setup.vue    |  4 ++--
 pages/pick/pick-task.vue | 30 ++++++++++++++++--------------
 pages/test.vue           | 32 +++++++++++++++++---------------
 utils/mork2.js           | 10 +++++-----
 vuex/modules/user.js     |  4 ++--
 6 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 0a8a54a..2962fa7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -21,6 +21,7 @@
 						</view>
 					</view>
 				</view>
+				<!-- <button type="primary" @tap="toTest">打印测试</button> -->
 			</view>
 		</view>
 		<view class="sec_menu_wraper" :class="show ? 'popshow' : 'pophide'">
@@ -83,6 +84,11 @@
 			  uni.redirectTo({
 			  	url: '/pages/login/login'
 			  })
+			},
+			toTest () {
+				uni.redirectTo({
+					url: '/pages/test'
+				})
 			}
 		}
 	}
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index 97562c1..6a0773d 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -5,11 +5,11 @@
 			<view class="zd_wrapper">
 				<view class="setup-item">
 					<view class="setup-label">服务器地址</view>
-					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
+					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model.trim="addrip">
 				</view>
 				<view class="setup-item">
 					<view class="setup-label">打印地址</view>
-					<input type="text" class="setup-input" placeholder="请输入打印地址" v-model="printip">
+					<input type="text" class="setup-input" placeholder="请输入打印地址" v-model.trim="printip">
 				</view>
 				<!-- <view class="setup-item">
 					<view class="setup-label">刷新时间(s)</view>
diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue
index c9c1948..64e93d4 100644
--- a/pages/pick/pick-task.vue
+++ b/pages/pick/pick-task.vue
@@ -272,23 +272,25 @@
 				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', 13);
+				LODOP.SET_PRINT_STYLE("NO_LINE_WRAP", 1);
+				LODOP.SET_PRINT_STYLE('FontSize', 12);
 				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('FontSize', 7.7);
 				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.SET_PRINT_STYLEA(0, "TextNeatRow", true);
+				LODOP.ADD_PRINT_TEXT('7.5mm', '5mm', '25mm', '5.5mm', '用料单号：');
+				LODOP.ADD_PRINT_TEXT('7.5mm', '18mm', '60mm', '5.5mm', data.prd_ppbom_no);
+				LODOP.ADD_PRINT_TEXT('13mm', '5mm', '25mm', '5.5mm', '物料编码：');
+				LODOP.ADD_PRINT_TEXT('13mm', '18mm', '60mm', '5.5mm', data.material_code);
+				LODOP.ADD_PRINT_TEXT('18.5mm', '5mm', '25mm', '5.5mm', '物料名称：');
+				LODOP.ADD_PRINT_TEXT('18.5mm', '18mm', '80mm', '2mm', data.material_name);
+				LODOP.ADD_PRINT_TEXT('24mm', '5mm', '25mm', '5.5mm', '物料规格：');
+				LODOP.ADD_PRINT_TEXT('24mm', '18mm', '60mm', '5.5mm', data.material_spec);
+				LODOP.ADD_PRINT_TEXT('29.5mm', '5mm', '60mm', '5.5mm', '物料数量：');
+				LODOP.ADD_PRINT_TEXT('29.5mm', '18mm', '60mm', '5.5mm', data.assign_qty);
+				LODOP.ADD_PRINT_TEXT('35mm', '5mm', '25mm', '5.5mm', '料箱号：');
+				LODOP.ADD_PRINT_TEXT('35mm', '18mm', '60mm', '5.5mm', data.lxCode);
 				LODOP.PRINT();
 				// LODOP.PREVIEW()
 				uni.showToast({
diff --git a/pages/test.vue b/pages/test.vue
index 818cfc5..dcec3f2 100644
--- a/pages/test.vue
+++ b/pages/test.vue
@@ -51,7 +51,7 @@
 		data() {
 			return {
 				data: {},
-				val1: '1000'
+				val1: 'Z00001333'
 			};
 		},
 		onLoad (options) {
@@ -89,23 +89,25 @@
 				// 设置打印纸大小
 				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("NO_LINE_WRAP", 1);
+				LODOP.SET_PRINT_STYLE('FontSize', 12);
 				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('FontSize', 7.7);
 				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.SET_PRINT_STYLEA(0, "TextNeatRow", true);
+				LODOP.ADD_PRINT_TEXT('7.5mm', '5mm', '25mm', '5.5mm', '用料单号：');
+				LODOP.ADD_PRINT_TEXT('7.5mm', '18mm', '60mm', '5.5mm', data.prd_ppbom_no);
+				LODOP.ADD_PRINT_TEXT('13mm', '5mm', '25mm', '5.5mm', '物料编码：');
+				LODOP.ADD_PRINT_TEXT('13mm', '18mm', '60mm', '5.5mm', data.material_code);
+				LODOP.ADD_PRINT_TEXT('18.5mm', '5mm', '25mm', '5.5mm', '物料名称：');
+				LODOP.ADD_PRINT_TEXT('18.5mm', '18mm', '80mm', '2mm', data.material_name);
+				LODOP.ADD_PRINT_TEXT('24mm', '5mm', '25mm', '5.5mm', '物料规格：');
+				LODOP.ADD_PRINT_TEXT('24mm', '18mm', '60mm', '5.5mm', data.material_spec);
+				LODOP.ADD_PRINT_TEXT('29.5mm', '5mm', '60mm', '5.5mm', '物料数量：');
+				LODOP.ADD_PRINT_TEXT('29.5mm', '18mm', '60mm', '5.5mm', data.assign_qty);
+				LODOP.ADD_PRINT_TEXT('35mm', '5mm', '25mm', '5.5mm', '料箱号：');
+				LODOP.ADD_PRINT_TEXT('35mm', '18mm', '60mm', '5.5mm', data.lxCode);
 				LODOP.PRINT();
 				// LODOP.PREVIEW()
 				uni.showToast({
diff --git a/utils/mork2.js b/utils/mork2.js
index 280c2b3..23750ea 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -329,11 +329,11 @@ export const queryPick = () => {
 	'product_area': 'A2',
 	'stor_code': 'FStockId',
     "point_code": "001",
-    "material_code": "100001",
-    "material_name": "垃圾了付定金",
-	"material_spec": "垃圾了付定金",
-    "prd_ppbom_no": "20202020",
-    "assign_qty": 6,
+    "material_code": "04.05.04.01.01.00100S-07",
+    "material_name": "不锈钢棒（SUS303F）(化学成分Cu≤0.5%，Ni:8.2~8.5%)HV=300±30，Rm=820～900",
+	"material_spec": "LQF-02-07",
+    "prd_ppbom_no": "PPBOM25060",
+    "assign_qty": 80,
 	'qty': 35
 }
 	return res
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index 502d21b..be50da8 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -1,8 +1,8 @@
 import * as types from '../types'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.10.49:8099' : 'http://192.168.10.49:8099'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.218:8012' : 'http://192.168.18.218:8012'
 const acsUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.250:8012' : 'http://192.168.18.250:8012'
-const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.162:8010' : 'http://192.168.81.162:8010'
+const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.18.4:8000' : 'http://192.168.18.4:8000'
 const state = {
 	baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
 	acsUrl: uni.getStorageSync('acsUrl') || acsUrl,