From eeff5fca55deb0de745405871ff1ae52061bc98d Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 18 七月 2025 11:26:12 +0800
Subject: [PATCH] 优化打印蓝牙连接弹出框,增加监听打印回调解决全部打印只能打印一张问题

---
 pages/wareHouse/inventory/index.vue |  199 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 143 insertions(+), 56 deletions(-)

diff --git a/pages/wareHouse/inventory/index.vue b/pages/wareHouse/inventory/index.vue
index dbc6256..22e8c67 100644
--- a/pages/wareHouse/inventory/index.vue
+++ b/pages/wareHouse/inventory/index.vue
@@ -10,10 +10,10 @@
 						<text class="item-one">鐩樼偣鎶ュ憡鍙�</text>
 					</view>
 					<view class="packing-registration-param-item-right">
-						<text class="item-one item-two"
-							@click="seachPersonnelNo()">{{registerInfo.value1=='' ? "鐐瑰嚮閫夋嫨":registerInfo.value1}}</text>
+						<text class="item-one item-two" @click="seachPersonnelNo()">{{ registerInfo.value1 == '' ?
+							"鐐瑰嚮閫夋嫨" : registerInfo.value1 }}</text>
 						<u-icon name="arrow-right" color="#687792" size="28" @click="seachPersonnelNo()"
-							v-show="registerInfo.value1 ==''"></u-icon>
+							v-show="registerInfo.value1 == ''"></u-icon>
 					</view>
 				</view>
 				<view class="packing-registration-param-item param-extra">
@@ -21,7 +21,7 @@
 						<text class="item-one">浠撳簱</text>
 					</view>
 					<view class="packing-registration-param-item-right">
-						<text class="item-one item-two">{{registerInfo.value2}}</text>
+						<text class="item-one item-two">{{ registerInfo.value2 }}</text>
 					</view>
 				</view>
 				<view class="packing-registration-param-item param-extra">
@@ -30,9 +30,10 @@
 					</view>
 					<view class="packing-registration-param-item-right">
 						<view class="item-one item-two" @click="openPN()">
-							<text>{{registerInfo.value2=='' ? "鐐瑰嚮杈撳叆":registerInfo.value2}}</text>
+							<text>{{ registerInfo.value6 == '' ? "鐐瑰嚮杈撳叆" : registerInfo.value6 }}</text>
 						</view>
-						<u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value2==''"></u-icon>
+						<u-icon name="arrow-right" color="#687792" size="28"
+							v-show="registerInfo.value6 == ''"></u-icon>
 					</view>
 				</view>
 				<view class="packing-registration-param-item param-extra">
@@ -40,8 +41,10 @@
 						<text class="item-one">鎵规鍙�</text>
 					</view>
 					<view class="packing-registration-param-item-right" @click="openBatch()">
-						<text class="item-one item-two">{{registerInfo.value3=='' ? "鐐瑰嚮杈撳叆":registerInfo.value3}}</text>
-						<u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value3==''"></u-icon>
+						<text
+							class="item-one item-two">{{ registerInfo.value3 == '' ? "鐐瑰嚮杈撳叆" : registerInfo.value3 }}</text>
+						<u-icon name="arrow-right" color="#687792" size="28"
+							v-show="registerInfo.value3 == ''"></u-icon>
 					</view>
 				</view>
 				<view class="packing-registration-param-item param-extra">
@@ -50,9 +53,10 @@
 					</view>
 					<view class="packing-registration-param-item-right" @click="openLocation()">
 						<view class="item-one item-two">
-							<text>{{registerInfo.value4 == '' ? "鐐瑰嚮杈撳叆":registerInfo.value4}}</text>
+							<text>{{ registerInfo.value4 == '' ? "鐐瑰嚮杈撳叆" : registerInfo.value4 }}</text>
 						</view>
-						<u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value4==''"></u-icon>
+						<u-icon name="arrow-right" color="#687792" size="28"
+							v-show="registerInfo.value4 == ''"></u-icon>
 					</view>
 				</view>
 				<view class="packing-registration-param-item param-extra">
@@ -61,9 +65,10 @@
 					</view>
 					<view class="packing-registration-param-item-right" @click="openPhysicalInventory()">
 						<view class="item-one item-two">
-							<text>{{registerInfo.value5 == '' ? "鐐瑰嚮杈撳叆":registerInfo.value5}}</text>
+							<text>{{ registerInfo.value5 == '' ? "鐐瑰嚮杈撳叆" : registerInfo.value5 }}</text>
 						</view>
-						<u-icon name="arrow-right" color="#687792" size="28" v-show="registerInfo.value4==''"></u-icon>
+						<u-icon name="arrow-right" color="#687792" size="28"
+							v-show="registerInfo.value4 == ''"></u-icon>
 					</view>
 				</view>
 				<view class="packing-registration-param-item param-extra">
@@ -77,11 +82,42 @@
 			<scroll-view class="packing-registration-scroll-list" scroll-y="true">
 				<u-cell-group class="packing-registration-scroll-list-group" :border="false">
 					<!-- <div class="tip" style="text-align: center;" v-if="hasScanSnList.length==0">-璇锋壂鐮�-</div> -->
-					<view class="content" v-for="(x, index) in hasScanSnList" :key="index" :index="index">
-						<view class="row-list">
-							<view class="row-list-left">
-								<view class="num-icon" style="color: #fff;">{{index+1}}</view>
-								<view style="margin-left: 30rpx;">{{x}}</view>
+					<view class="content" v-for="(item, index) in hasScanSnList" :key="index" :index="index">
+						<view class="content-header">
+							<view class="content-header-title">{{ index + 1 }}</view>
+						</view>
+						<view class="content-body">
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-name">闆朵欢鍙凤細</view>
+								</view>
+								<view class="_content">
+									{{ item.value0 }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-name">鎵规鍙凤細</view>
+								</view>
+								<view class="_content">
+									{{ item.value1 }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-name">搴撲綅鍙凤細</view>
+								</view>
+								<view class="_content">
+									{{ item.value0 }}
+								</view>
+							</view>
+							<view class="row-list">
+								<view class="_label">
+									<view class="_label-name">鐩樼偣鏁伴噺锛�</view>
+								</view>
+								<view class="_content">
+									{{ item.value1 }}
+								</view>
 							</view>
 						</view>
 					</view>
@@ -93,7 +129,7 @@
 			<scan></scan>
 			<!-- 闆朵欢鍙� -->
 			<modalBg ref="openPN" :confirm="confirmPN">
-				<u-field v-model="registerInfo.value2" label="闆朵欢鍙凤細" placeholder="璇疯緭鍏�" :border-bottom="false">
+				<u-field v-model="registerInfo.value6" label="闆朵欢鍙凤細" placeholder="璇疯緭鍏�" :border-bottom="false">
 				</u-field>
 			</modalBg>
 			<!-- 鎵规鍙� -->
@@ -108,7 +144,8 @@
 			</modalBg>
 			<!-- 鐩樼偣鏁伴噺 -->
 			<modalBg ref="openPhysicalInventory" :confirm="confirmPhysicalInventory">
-				<u-field v-model="registerInfo.value5" label="鐩樼偣鏁伴噺锛�" placeholder="璇疯緭鍏�" :border-bottom="false">
+				<u-field v-model="registerInfo.value5" label="鐩樼偣鏁伴噺锛�" label-width="140" placeholder="璇疯緭鍏�"
+					:border-bottom="false">
 				</u-field>
 			</modalBg>
 		</view>
@@ -140,9 +177,34 @@
 					value2: '',
 					value3: '',
 					value4: '',
-					value5: ''
+					value5: '',
+					value6: ''
 				},
-				hasScanSnList: [],
+				hasScanSnList: [{
+						value0: '11111111111111111111111',
+						value1: '111',
+						value2: '111',
+						value3: '111',
+					},
+					{
+						value0: '111',
+						value1: '111',
+						value2: '111',
+						value3: '111',
+					},
+					{
+						value0: '111',
+						value1: '111',
+						value2: '111',
+						value3: '111',
+					},
+					{
+						value0: '111',
+						value1: '111',
+						value2: '111',
+						value3: '111',
+					},
+				],
 				delContent: null,
 				staffList: [],
 			};
@@ -173,12 +235,12 @@
 			},
 			// 寮规淇濆瓨
 			confirmPN() {
-				console.log('淇濆瓨', this.registerInfo.value2);
+				console.log('淇濆瓨', this.registerInfo.value6);
 				// 璇锋眰鎺ュ彛锛屾牴鎹伐鍗曞彿鏌ヨ鍏朵粬淇℃伅骞惰祴鍊�
 			},
 			//鎵规鍙�
 			openBatch() {
-				this.$refs.openBatch.openBatch();
+				this.$refs.openBatch.open();
 			},
 			// 寮规淇濆瓨
 			confirmBatch() {
@@ -206,7 +268,9 @@
 
 			setNo(val) {
 				console.log('11111', val)
-				this.registerInfo = val
+				this.registerInfo.value1 = val.value1
+				this.registerInfo.value2 = val.value2
+
 			},
 			//鐩樼偣鎶ュ憡鍙�
 			seachPersonnelNo() {
@@ -399,52 +463,75 @@
 		}
 
 		.content {
-			background-image: url('~@/static/custom/packing/row_bg.png');
-			background-size: 100% auto;
-			background-repeat: no-repeat;
-			height: 89rpx;
-			width: 691rpx;
 			font-size: 12px;
-			background-color: #FFFFFF;
+			background-color: #ffffff;
 			box-sizing: border-box;
 			border-radius: 10rpx;
-			margin: 0rpx 0rpx 20rpx;
-			padding: 0rpx 50rpx 0rpx 32rpx;
+			margin: 0rpx 0rpx 16rpx;
+			padding: 20rpx 8rpx;
 			box-shadow: none;
+			display: flex;
+			align-items: center;
 
-			.row-list {
-				height: 100%;
+			.content-header {
+				width: 40rpx;
+				height: 90rpx;
 				display: flex;
-				justify-content: space-between;
 				align-items: center;
-				padding-top: 0rpx !important;
 
-				.row-list-left {
+				.content-header-icon {
+					background-image: url("~@/static/custom/moveWareHouse/header_icon.png");
+					background-size: 100% auto;
+					background-repeat: no-repeat;
+					height: 28rpx;
+					width: 28rpx;
+				}
+
+				.content-header-title {
+					margin-left: 11rpx;
+					font-size: 26rpx;
+					font-weight: bold;
+					color: #626369;
+				}
+			}
+
+			.content-body {
+				flex: 1;
+				background-color: #ffffff;
+				border-radius: 10rpx;
+				padding: 0rpx 23rpx;
+
+				.row-list {
+					height: 60rpx;
 					display: flex;
-					color: #333333;
+					flex-direction: row;
+					padding: 0px;
+					align-items: center;
+				}
 
-					.num-icon {
-						background-image: url('~@/static/custom/packing/num-bg.png');
-						background-size: 100% auto;
-						background-repeat: no-repeat;
-						height: 38rpx;
-						width: 38rpx;
-						text-align: center;
-						line-height: 38rpx;
+				.row-list ._label {
+					display: flex;
+					flex: 0.8;
+					color: #909399;
+					align-items: center;
+
+					._label-name {
+						margin-left: 11rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #666666;
 					}
 				}
 
-				.row-list-right {
-					display: flex;
-					color: #428BF7;
+				.row-list ._content {
+					flex: 1.5;
+					text-align: right;
+					color: #909399;
+					font-size: 24rpx;
+				}
 
-					.del-icon {
-						background-image: url('~@/static/custom/packing/icon_dele.png');
-						background-size: 100% auto;
-						background-repeat: no-repeat;
-						height: 30rpx;
-						width: 28rpx;
-					}
+				.row-list .s1 {
+					color: #d35651;
 				}
 			}
 		}

--
Gitblit v1.9.3