From bc70e7de7925b0a1b34ebb170d6c4b590520ac12 Mon Sep 17 00:00:00 2001
From: hwh2023 <598694955@qq.com>
Date: Wed, 22 Nov 2023 21:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E4=BF=AE=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RepairReportStudent/dealIndex.cshtml      | 32 ++++++++++---------
 .../RepairReportTeacher/dealIndex.cshtml      | 26 +++++++--------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml
index 652d4f68c..c7bd0a918 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportStudent/dealIndex.cshtml	
@@ -46,13 +46,13 @@
             tableHtml = '';
 
         //数据处理
-        tableHtml += '<table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" style="border-width: initial; border-style: none; border-bottom-color: initial;line-height:30px;">';
+        tableHtml += '<table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" style="border-width: initial; border-style: none; border-bottom-color: initial;line-height:30px;margin:50px;">';
         tableHtml += '	<tbody>';
         tableHtml += '		<tr>';
         tableHtml += '			<td colspan="4" valign="top" style="width:484.2pt;border:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
         tableHtml += '					<b>';
-        tableHtml += '						<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">' + title + '</span>';
+        tableHtml += '						<span style="font-size:14.0pt;font-family:宋体;mso-bidi-font-family:宋体">' + (title ? title:"")+ '</span>';
         tableHtml += '					</b>';
         tableHtml += '				</p>';
         tableHtml += '			</td>';
@@ -65,7 +65,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.OrderNumber;
+        tableHtml += (data.OrderNumber ? data.OrderNumber : "");
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
@@ -74,7 +74,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.CreateTime;
+        tableHtml += (data.CreateTime ? data.CreateTime:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -85,7 +85,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.CreatorName;
+        tableHtml += (data.CreatorName ? data.CreateTime:"");
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
@@ -94,7 +94,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.StuNo;
+        tableHtml += (data.StuNo ? data.StuNo:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -105,7 +105,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.DeptNo;
+        tableHtml += (data.DeptNo ? data.DeptNo:"");
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
@@ -114,7 +114,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.MajorNo;
+        tableHtml += (data.MajorNo ? data.MajorNo:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -125,7 +125,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.TeachClassNo;
+        tableHtml += (data.TeachClassNo ? data.TeachClassNo:"");
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
@@ -134,7 +134,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.Contact;
+        tableHtml += (data.Contact ? data.Contact:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -145,7 +145,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.Address;
+        tableHtml += (data.Address ? data.Address:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -156,7 +156,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.ServiceType;
+        tableHtml += (data.ServiceType ? data.ServiceType:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr style="mso-yfti-irow:6;height:96.6pt">';
@@ -167,7 +167,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt;height:96.6pt">';
-        tableHtml += data.Remark;
+        tableHtml += (data.Remark ? data.Remark:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr style="mso-yfti-irow:7;height:92.5pt">';
@@ -178,7 +178,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt;height:92.5pt">';
-        tableHtml += data.LeaveMsg;
+        tableHtml += (data.LeaveMsg ? data.LeaveMsg:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -231,6 +231,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += (data.IsPay == 1 ? "是" : "否");
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal">';
@@ -239,6 +240,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;    padding:0cm 5.4pt 0cm 5.4pt">';
+        tableHtml += (data.Amount ? data.Amount : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:67.0pt">';
@@ -270,7 +272,7 @@
         LODOP.SET_PRINT_MODE("PRINT_DUPLEX", 2);
         LODOP.SET_PRINT_MODE("PRINT_DEFAULTSOURCE", 7);
 
-        LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', strFormHtml);
+        LODOP.ADD_PRINT_HTM("25mm", 0, '100%', '100%', strFormHtml);
         LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 270);
         if (flag == "preview") {
             //打印预览
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml
index a184c0e07..aa26ecc09 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/RepairReportTeacher/dealIndex.cshtml	
@@ -52,7 +52,7 @@
             tableHtml = '';
        
         //数据处理
-        tableHtml += '<table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" style="border-width: initial; border-style: none; border-bottom-color: initial;line-height:30px;">';
+        tableHtml += '<table class="MsoTableGrid" border="1" cellspacing="0" cellpadding="0" style="border-width: initial; border-style: none; border-bottom-color: initial;line-height:30px;margin:50px;">';
         tableHtml += '	<tbody>';
         tableHtml += '		<tr>';
         tableHtml += '			<td colspan="4" valign="top" style="width:484.2pt;border:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
@@ -71,7 +71,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.OrderNumber;
+        tableHtml += (data.OrderNumber ? data.OrderNumber:"");
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
@@ -80,7 +80,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.CreateTime;
+        tableHtml += (data.CreateTime ? data.CreateTime:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -91,7 +91,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.CreatorName;
+        tableHtml += (data.CreatorName ? data.CreatorName:"");
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
@@ -100,7 +100,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.TeachNo;
+        tableHtml += (data.TeachNo ? data.TeachNo:"");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -111,7 +111,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.DeptName;
+        tableHtml += (data.DeptName ? data.DeptName : "");
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
         tableHtml += '				<p class="MsoNormal" align="center" style="text-align:center">';
@@ -120,7 +120,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.Contact;
+        tableHtml += (data.Contact ? data.Contact : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -131,7 +131,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.Address;
+        tableHtml +=  (data.Address ? data.Address : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -142,7 +142,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.ServiceType;
+        tableHtml += (data.ServiceType ? data.ServiceType : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr style="mso-yfti-irow:6;height:96.6pt">';
@@ -153,7 +153,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt;height:96.6pt">';
-        tableHtml += data.Remark;
+        tableHtml += (data.Remark ? data.Remark : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr style="mso-yfti-irow:7;height:92.5pt">';
@@ -164,7 +164,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td colspan="3" valign="top" style="width:363.15pt;border-top:none;border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;padding:0cm 5.4pt 0cm 5.4pt;height:92.5pt">';
-        tableHtml += data.LeaveMsg;
+        tableHtml += (data.LeaveMsg ? data.LeaveMsg : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr>';
@@ -226,7 +226,7 @@
         tableHtml += '				</p>';
         tableHtml += '			</td>';
         tableHtml += '			<td valign="top" style="border-top:none;border-left:  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;    padding:0cm 5.4pt 0cm 5.4pt">';
-        tableHtml += data.Amount;
+        tableHtml += (data.Amount ? data.Amount : "");
         tableHtml += '			</td>';
         tableHtml += '		</tr>';
         tableHtml += '		<tr style="mso-yfti-irow:13;mso-yfti-lastrow:yes;height:67.0pt">';
@@ -307,7 +307,7 @@
         LODOP.SET_PRINT_MODE("PRINT_DUPLEX", 2);
         LODOP.SET_PRINT_MODE("PRINT_DEFAULTSOURCE", 7);
 
-        LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', strFormHtml);
+        LODOP.ADD_PRINT_HTM("25mm", 0, '100%', '100%', strFormHtml);
         LODOP.SET_PRINT_STYLEA(0, "AngleOfPageInside", 270);
         if (flag == "preview") {
             //打印预览