From 623859790a3f074c103c792e5eaca33b199dbb91 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 06 八月 2024 15:14:41 +0800
Subject: [PATCH] update 花店端的一些细节功能、打印的、合伙人推广二维码的

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

diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index af0d710..e544fba 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -526,20 +526,28 @@
 					}
 					command.setText(30, 40, "TSS24.BF2", 1, 1, "" + (that.item.supplierName || '-'))
 					command.setText(200, 40, "TSS24.BF2", 1, 1, "" + (that.item.warehouseName || '待分配'))
-
-					command.setText(30, 80, "TSS24.BF2", 1, 1, "" + (that.item.flowerCategory || ''))
+					var flowerCategory = that.item.flowerCategory
+					if (flowerCategory) {
+						//只取二级分类
+						var tarr = flowerCategory.splite("/")
+						if (tarr.length >= 2) {
+							flowerCategory = tarr[tarr.length - 1]
+						}
+					}
+					command.setText(30, 80, "TSS24.BF2", 1, 1, "" + (flowerCategory || ''))
 					command.setText(200, 80, "TSS24.BF2", 1, 1, "库位:" + (that.item.warehouseLocationCode || ''))
 
 					command.setText(30, 120, "TSS24.BF2", 1, 1, "等级:" + (that.item.flowerLevelStr || ''))
 					command.setText(200, 120, "TSS24.BF2", 1, 1, "" + (that.item.flowerColor || ''))
-
-					command.setText(30, 160, "TSS24.BF2", 1, 1, "规格: " + (that.item.flowerUnit || '-'))
-					command.setText(200, 160, "TSS24.BF2", 1, 1, "成熟度: " + (paramsmap['成熟度'] || '-'))
-
-					command.setText(30, 200, "TSS24.BF2", 1, 1, "枝长: " + (paramsmap['枝长'] || '-'))
+					// 规格: 
+					command.setText(30, 160, "TSS24.BF2", 1, 1, "" + (that.item.flowerUnit || '-'))
+					// 成熟度: 
+					command.setText(200, 160, "TSS24.BF2", 1, 1, "" + (paramsmap['成熟度'] || '-'))
+					// 枝长: 
+					command.setText(30, 200, "TSS24.BF2", 1, 1, "" + (paramsmap['枝长'] || '-'))
 					command.setText(200, 200, "TSS24.BF2", 1, 1, that.$util.toDate(new Date()))
 
-					command.setText(100, 230, "TSS24.BF2", 1, 1, "————————————")
+					command.setText(60, 230, "TSS24.BF2", 1, 1, "————————————")
 
 					command.setText(30, 260, "TSS24.BF2", 1, 1, "花满芫")
 					command.setText(200, 260, "TSS24.BF2", 1, 1, `数目: ${i+1}/${that.item.num}`)
@@ -805,6 +813,7 @@
 					font-size: 28rpx;
 					color: #000000;
 					line-height: 40rpx;
+
 					.level {
 						font-weight: 400;
 						font-size: 28rpx;
@@ -841,6 +850,7 @@
 						font-size: 28rpx;
 						color: #000000;
 						line-height: 40rpx;
+
 						.level {
 							font-weight: 400;
 							font-size: 28rpx;

--
Gitblit v1.9.3