From b05a84f9178894b40a1d6a601b577403d7d93c46 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 09:09:20 +0800
Subject: [PATCH] 1.运费配置说明修改

---
 sub_pages/supplier/print/print-list.vue |  108 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/sub_pages/supplier/print/print-list.vue b/sub_pages/supplier/print/print-list.vue
index 253d446..fbb4ddb 100644
--- a/sub_pages/supplier/print/print-list.vue
+++ b/sub_pages/supplier/print/print-list.vue
@@ -69,7 +69,8 @@
 		</view>
 
 		<view class="print-container m-t-12">
-			<button class="btn" type="primary" @click="startSearch" :loading="isScanning"> 开始搜索 </button>
+			<button class="btn" type="primary" @click="startSearch" :loading="isScanning">
+				开始搜索({{buffs&&buffs.length || 0}}个) </button>
 			<button class="btn m-t-12" type="default" @click="breakPrint=true"> 中断打印 </button>
 			<view v-for="(device,index) of list" :key="device.deviceId" @click="bindViewTap(device)">
 				<view class="item">
@@ -154,12 +155,12 @@
 				var requrl = ''
 				// #ifdef PUB_SUPPLIER
 				// apitype = '/supplier'
-				if(options.source=='detail'){
+				if (options.source == 'detail') {
 					requrl = `/api/supplier/delivery/list/items/views`
-					
-				}else{
+
+				} else {
 					requrl = `/api/supplier/delivery/list/items/views/new`
-					
+
 				}
 				// #endif
 				// #ifndef PUB_SUPPLIER
@@ -168,35 +169,47 @@
 				//获取详情接口
 				var ids = []
 				for (var item of this.items) {
-					ids.push(item.id)
+					if (item.id)
+						ids.push(item.id)
 				}
-				this.$message.showLoading()
-				// const {
-				// 	code,
-				// 	data
-				// } = await this.$http.request('get', `/api${apitype}/delivery/list/items/view`, {
-				// 	params: {
-				// 		id: this.item.id,
-				// 		ids: ids
-				// 	}
-				// })
-				const {
-					code,
-					data
-				} = await this.$http.request('post', requrl, {
-					data: {
-						// id: this.item.id,
-						ids: ids
+				if (ids.length > 0) {
+
+
+					this.$message.showLoading()
+					// const {
+					// 	code,
+					// 	data
+					// } = await this.$http.request('get', `/api${apitype}/delivery/list/items/view`, {
+					// 	params: {
+					// 		id: this.item.id,
+					// 		ids: ids
+					// 	}
+					// })
+					const {
+						code,
+						data
+					} = await this.$http.request('post', requrl, {
+						data: {
+							// id: this.item.id,
+							ids: ids
+						}
+					})
+					this.$message.hideLoading()
+					if (code == 0 && data && data.length > 0) {
+						// this.item = {
+						// 	...this.item,
+						// 	...data
+						// }
+						var tarr = []
+						for (var t of data) {
+							if (t) {
+								tarr.push(t)
+							}
+						}
+						if (tarr.length > 0)
+							this.items = tarr || []
+						console.log('items len:', this.items.length)
 					}
-				})
-				this.$message.hideLoading()
-				if (code == 0 && data) {
-					// this.item = {
-					// 	...this.item,
-					// 	...data
-					// }
-					this.items = data || []
-					console.log('items len:', this.items.length)
 				}
 			} else {
 				this.$message.showToast('获取详情失败')
@@ -569,8 +582,8 @@
 							}
 						}
 						command.setText(30, 40, "TSS24.BF2", 1, 1, "" + (each.supplierName || '-'))
-						command.setText(200, 40, "TSS24.BF2", 1, 1, "" + (each.warehouseName || '待分配'))
-						var flowerCategory = each.flowerCategory
+						command.setText(200, 40, "TSS24.BF2", 2, 1, "" + (each.warehouseName || '待分配'))
+						var flowerCategory = each.flowerCategory || ''
 						if (flowerCategory) {
 							//只取二级分类
 							var tarr = flowerCategory.split("/")
@@ -578,23 +591,28 @@
 								flowerCategory = tarr[tarr.length - 1]
 							}
 						}
+						
 						command.setText(30, 80, "TSS24.BF2", 1, 1, "" + (flowerCategory || ''))
-						command.setText(200, 80, "TSS24.BF2", 1, 1, "库位:" + (each.warehouseLocationCode || ''))
+						// 盲写库位大小
+						// command.setText(200, 80, "TSS24.BF2", 1, 1, "库位:" + (each.warehouseLocationCode || ''))
+						command.setText(200, 80+10, "TSS24.BF2", 1, 1, "库位:" )
+						command.setText(270, 80, "TSS24.BF2", 2, 2,  (each.warehouseLocationCode || ''))
 
-						command.setText(30, 120, "TSS24.BF2", 1, 1, "等级:" + (each.flowerLevelStr || ''))
-						command.setText(200, 120, "TSS24.BF2", 1, 1, "" + (each.flowerColor || ''))
+						// command.setText(30, 120, "TSS24.BF2", 1, 1, "等级:" + (each.flowerLevelStr || ''))
+						command.setText(30, 120, "TSS24.BF2", 2, 2,  ""+ (each.flowerLevelStr || ''))
+						command.setText(200, 120+10, "TSS24.BF2", 1, 1, "" + (each.flowerColor || ''))
 						// 规格: 
-						command.setText(30, 160, "TSS24.BF2", 1, 1, "" + (each.flowerUnit || '-'))
+						command.setText(30, 160+20, "TSS24.BF2", 1, 1, "" + (each.flowerUnit || '-'))
 						// 成熟度: 
-						command.setText(200, 160, "TSS24.BF2", 1, 1, "" + (paramsmap['成熟度'] || '-'))
+						command.setText(200, 160+20, "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(30, 200+20, "TSS24.BF2", 1, 1, "" + (paramsmap['枝长'] || '-'))
+						command.setText(200, 200+20, "TSS24.BF2", 1, 1, that.$util.toDate(new Date()))
 
-						command.setText(60, 230, "TSS24.BF2", 1, 1, "————————————")
+						command.setText(60, 230+20, "TSS24.BF2", 1, 1, "————————————")
 
-						command.setText(30, 260, "TSS24.BF2", 1, 1, "花满芫")
-						command.setText(200, 260, "TSS24.BF2", 1, 1, `数目: ${i+1}/${each.num||1}`)
+						command.setText(30, 260+20, "TSS24.BF2", 1, 1, "花满芫")
+						command.setText(200, 260+20, "TSS24.BF2", 1, 1, `数目: ${i+1}/${each.num||1}`)
 
 						// command.setText(20, 40, "TSS24.BF2", 1, 1, "" + (that.item.warehouseName || '待分配'))
 						// // 库位: 
@@ -765,7 +783,7 @@
 									that.prepareSend(that.buffs[that.currentPrint - 1])
 
 
-								}, 500)
+								}, 800)
 
 							}
 

--
Gitblit v1.9.3