Merge branch 'hella_online_20240906' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240906

src/pages/pointPutawayJob/index.vue

@@ -87,7 +87,7 @@
 				style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印上架指引单
 			</button>
 		</view>
-
+		<u-empty text="无打印数据" mode="list"  v-if="(tabIndex == 1  &&(!data1.inspectDTOList || data1.inspectDTOList && data1.inspectDTOList.length==0))||(tabIndex == 2&&isHaveOn && (!data.sublist || data.sublist && data.sublist.length==0))"></u-empty>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -138,17 +138,19 @@
 		},
 
 		methods: {
-			// #ifdef APP
 			// 打印
 			printImage() {
+				// #ifdef APP
 				if (this.tabIndex == 1) {
 					testModule.doHTMLPrint(this.newHtmlContent1)
 				} else {
 					testModule.doHTMLPrint(this.newHtmlContent)
 				}
+				// #endif
 			},
 			// 读取html文件
 			readFile(path, callback) {
+				// #ifdef APP
 				plus.io.resolveLocalFileSystemURL(path, function(entry) {
 					entry.file(function(file) {
 						var reader = new plus.io.FileReader();
@@ -162,8 +164,8 @@
 				}, function(e) {
 					console.log("获取图片资源失败：" + e.message);
 				});
+				// #endif
 			},
-			// #endif
 			formatDate(val) {
 				return dateFormat(val)
 			},
@@ -171,6 +173,7 @@
 			getPointPutawayJobHtml() {
 				this.$nextTick(async () => {
 					let str = ''
+					// #ifdef APP-PLUS
 					this.readFile(htmlFileUrl, (htmlContent) => {
 						this.newHtmlContent = htmlContent
 						this.data.sublist.forEach(item => {
@@ -200,13 +203,14 @@
 						this.newHtmlContent = this.newHtmlContent.replace(
 							"mainBody", str); //替换物品代码
 					});
-
+					// #endif
 				})
 			},
 			// 获取采购收货指引单html
 			getPurchaseReceiptJobHtml() {
 				this.$nextTick(async () => {
 					let str = ''
+					// #ifdef APP-PLUS
 					this.readFile(htmlFileUrl1, (htmlContent) => {
 						this.newHtmlContent1 = htmlContent
 						this.data1.inspectDTOList.forEach(item => {
@@ -270,9 +274,9 @@
 						})
 						this.newHtmlContent1 = this.newHtmlContent1.replace(
 							"mainBody", str); //替换物品代码
-						console.log(333,this.newHtmlContent1)
+						console.log(333, this.newHtmlContent1)
 					});
-
+					// #endif
 				})
 			},
 			getTableSubList() {
@@ -355,6 +359,7 @@
 						if (this.data1 && this.data1.inspectDTOList && this.data1.inspectDTOList.length == 0) {
 							this.tabIndex = 2
 						}
+						console.log(88,this.data1)
 						this.getTableInspectDTOList()
 					})
 					.catch(error => {
@@ -435,59 +440,59 @@
 		align-items: center;
 		justify-content: center;
 	}
+
 	.mb-kw {
-			border-bottom: 1px solid #dedede;
-			padding: 20rpx;
-			font-size: 30rpx;
-	
-		}
-	
-		.mb-kw view {
-			font-weight: bold;
-			font-size: 46rpx;
-			text-align: center;
-		}
+		border-bottom: 1px solid #dedede;
+		padding: 20rpx;
+		font-size: 30rpx;
+
+	}
+
+	.mb-kw view {
+		font-weight: bold;
+		font-size: 46rpx;
+		text-align: center;
+	}
 
 	.mb-bo {
-			display: flex;
-		}
-	
-		.mb-bo .mb-left {
-			flex: 1
-		}
-	
-		.mb-bo .mb-left .mb-text {
-			padding: 20rpx;
-		}
-	
-		.mb-bo .mb-left .mb-text:nth-child(1) {
-			border-bottom: 1px solid #dedede;
-		}
-	
-		.mb-bo .mb-left .mb-text view {
-			font-weight: bold;
-			font-size: 32rpx;
-			text-align: center;
-		}
-	
-		.mb-bo .mb-right {
-			padding: 20rpx;
-			width: 260rpx;
-			border-left: 1px solid #dedede;
-			display: flex;
-			align-items: center;
-		}
-	
-		.mb-bo .mb-right .mb-text {
-	
-			width: 100%;
-		}
-	
-		.mb-bo .mb-right .mb-text view {
-			font-weight: bold;
-			font-size: 40rpx;
-			text-align: center;
-			width: 100%;
-		}
+		display: flex;
+	}
+
+	.mb-bo .mb-left {
+		flex: 1
+	}
+
+	.mb-bo .mb-left .mb-text {
+		padding: 20rpx;
+	}
+
+	.mb-bo .mb-left .mb-text:nth-child(1) {
+		border-bottom: 1px solid #dedede;
+	}
+
+	.mb-bo .mb-left .mb-text view {
+		font-weight: bold;
+		font-size: 32rpx;
+		text-align: center;
+	}
 
-</style>
+	.mb-bo .mb-right {
+		padding: 20rpx;
+		width: 260rpx;
+		border-left: 1px solid #dedede;
+		display: flex;
+		align-items: center;
+	}
+
+	.mb-bo .mb-right .mb-text {
+
+		width: 100%;
+	}
+
+	.mb-bo .mb-right .mb-text view {
+		font-weight: bold;
+		font-size: 40rpx;
+		text-align: center;
+		width: 100%;
+	}
+</style>