From eef6744d7f207f9adb9b6d0aed537c6110299510 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 04 八月 2024 16:39:27 +0800
Subject: [PATCH] update供应商问题

---
 sub_pages/supplier/print/print-list.vue |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index 37e68f7..ff8b30a 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -43,11 +43,11 @@
 					<view class="delivery-form">
 						<view class="form-item">
 							<view class="label">仓库名称</view>
-							<view class="value red">{{item.warehouseName}}</view>
+							<view class="value red">{{item.warehouseName||'待分配'}}</view>
 						</view>
 						<view class="form-item">
 							<view class="label">库位名称</view>
-							<view class="value red">{{item.warehouseLocationCode}}</view>
+							<view class="value red">{{item.warehouseLocationCode||'待分配'}}</view>
 						</view>
 
 					</view>
@@ -325,6 +325,12 @@
 			 * 链接到某一个蓝牙设备上
 			 */
 			bindViewTap: function(device) {
+
+				if (this.isLabelSend) {
+					this.$message.showToast('正在打印中')
+					return
+				}
+
 				var that = this
 				wx.stopBluetoothDevicesDiscovery({ //关闭发现蓝牙设备
 					success: function(res) {
@@ -504,11 +510,11 @@
 					// command.setQR(40, 120, "L", 5, "A", "www.smarnet.cc佳博智汇")
 					// command.setText(60, 20, "TSS24.BF2", 1, 1, "单号:" + (that.item.orderNo || '-'))
 					// 仓库:
-					if (that.item.warehouseName)
-						command.setText(20, 20, "TSS24.BF2", 1, 1, "" + that.item.warehouseName)
+					// if (that.item.warehouseName)
+					command.setText(20, 20, "TSS24.BF2", 1, 1, "" + (that.item.warehouseName || '待分配'))
 					// 库位: 
-					if (that.item.warehouseLocationCode)
-						command.setText(200, 20, "TSS24.BF2", 1, 1, "" + that.item.warehouseLocationCode)
+					// if (that.item.warehouseLocationCode)
+					command.setText(200, 20, "TSS24.BF2", 1, 1, "" + (that.item.warehouseLocationCode || '待分配'))
 
 					// command.setText(170, 50, "TSS24.BF2", 1, 1, "小程序测试")
 					// command.setText(170, 90, "TSS24.BF2", 1, 1, "测试数字12345678")
@@ -519,17 +525,16 @@
 					command.setText(20, 60, "TSS24.BF2", 1, 1, "" + (that.item.supplierName || '-'))
 					// 商品名称: 
 					command.setText(20, 100, "TSS24.BF2", 1, 1, "" + (that.item.flowerName || '-'))
-					command.setText(20)
 					// 颜色: 
-					command.setText(200, 140, "TSS24.BF2", 1, 1, "" + (that.item.flowerColor || '-'))
+					command.setText(200, 100, "TSS24.BF2", 1, 1, "" + (that.item.flowerColor || '-'))
 					// command.setText(10, 220, "TSS24.BF2", 1, 1, "价格: ¥ " + (that.item.price || '-'))
-					command.setText(20, 180, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
-					command.setText(200, 180, "TSS24.BF2", 1, 1, `数目: ${i+1}/${that.item.num}`)
+					command.setText(20, 140, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
+					command.setText(200, 140, "TSS24.BF2", 1, 1, `数目: ${i+1}/${that.item.num}`)
 					// command.setText(10, 300, "TSS24.BF2", 1, 1, "花满芫")
-					command.setText(100, 220, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
+					command.setText(100, 180, "TSS24.BF2", 1, 1, that.$util.toDateMin(new Date()))
 					if (that.item.params) {
 						var addnum = 0
-						var hlen = 220
+						var hlen = 180
 						for (var p of that.item.params) {
 							if (p.name !== '枝长' && p.name !== '成熟度') {
 								continue
@@ -636,7 +641,7 @@
 							wx.showToast({
 								title: '已打印第' + currentPrint + '张',
 							})
-							if (currentPrint == buffs.length) {
+							if (currentPrint == that.buffs.length) {
 
 								that.looptime = 0
 								that.lastData = 0

--
Gitblit v1.9.3