检验打印恢复最新版本

src/pages/pointPutawayJob/index.vue

@@ -35,9 +35,9 @@
 								<td>抽检数量</td>
 								<td>{{item.sampleQty}}</td>
 							</tr>
-							<!-- <tr v-if="!item.haveInspectionRequest">
+							<tr v-if="!item.haveInspectionRequest">
 								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
-							</tr> -->
+							</tr>
 						</tbody>
 					</table>
 				</view>
@@ -201,46 +201,7 @@
 					this.readFile(htmlFileUrl1, (htmlContent) => {
 						this.newHtmlContent1 = htmlContent
 						this.data1.inspectDTOList.forEach(item => {
-							// if(!item.haveInspectionRequest){
+							if(!item.haveInspectionRequest){
-							// 	str += `
-							// 			<div class="box" style="page-break-before:always;"><br />
-							// 				<div class="relative" > 
-							// 					<div class="q">Q</div>
-							// 					<table border='1'>
-							// 						<thead>
-							// 							<tr class='top1'>
-							// 								<th>物料代码:</th>
-							// 								<th colspan='3'>${item.itemCode}</th>
-							// 							</tr>
-							// 						</thead>
-							// 						<tbody>
-							// 							<tr>
-							// 								<td>物料名称</td>
-							// 								<td>${item.itemName}</td>
-							// 								<td>发货单号</td>
-							// 								<td>${this.data1.asnNumber}</td>
-							// 							</tr>
-							// 							<tr>
-							// 								<td>供应商</td>
-							// 								<td>${item.supplierCode}</td>
-							// 								<td>供应商批次</td>
-							// 								<td>${item.supplierBatch}</td>
-							// 							</tr>
-							// 							<tr>
-							// 								<td>到货数量</td>
-							// 								<td>${item.quantityQty}</td>
-							// 								<td>抽检数量</td>
-							// 								<td>${item.sampleQty}</td>
-							// 							</tr>
-							// 							<tr>
-							// 								<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
-							// 							</tr>
-							// 						</tbody>
-							// 					</table>
-							// 				</div>
-							// 			</div>
-							// 			`
-							// }else{
 								str += `
 										<div class="box" style="page-break-before:always;"><br />
 											<div class="relative" > 
@@ -271,12 +232,51 @@
 															<td>抽检数量</td>
 															<td>${item.sampleQty}</td>
 														</tr>
+														<tr>
+															<td  colspan='4' style="color:#ff0000;font-weight: bold;font-size: 15px;">未生成检验申请</td>
+														</tr>
 													</tbody>
 												</table>
 											</div>
 										</div>
 										`
-							// }
+							}else{
+								str += `
+										<div class="box" style="page-break-before:always;"><br />
+											<div class="relative" > 
+												<div class="q">Q</div>
+												<table border='1'>
+													<thead>
+														<tr class='top1'>
+															<th>物料代码:</th>
+															<th colspan='3'>${item.itemCode}</th>
+														</tr>
+													</thead>
+													<tbody>
+														<tr>
+															<td>物料名称</td>
+															<td>${item.itemName}</td>
+															<td>发货单号</td>
+															<td>${this.data1.asnNumber}</td>
+														</tr>
+														<tr>
+															<td>供应商</td>
+															<td>${item.supplierCode}</td>
+															<td>供应商批次</td>
+															<td>${item.supplierBatch}</td>
+														</tr>
+														<tr>
+															<td>到货数量</td>
+															<td>${item.quantityQty}</td>
+															<td>抽检数量</td>
+															<td>${item.sampleQty}</td>
+														</tr>
+													</tbody>
+												</table>
+											</div>
+										</div>
+										`
+							}
 							
 						})
 						this.newHtmlContent1 = this.newHtmlContent1.replace(
@@ -367,13 +367,13 @@
 					}
 					this.getTableInspectDTOList()
 				})
-				// .catch(error=>{
+				.catch(error=>{
-				// 	this.$refs.comMessage.showMessage(error, res => {
+					this.$refs.comMessage.showMessage(error, res => {
-				// 		if (res) {
+						if (res) {
 					
-				// 		}
+						}
-				// 	});
+					});
-				// })
+				})
 			}
 			
 			this.getPointPutawayJobHtml()