From 47ec10c0df7c8179ee5fb51f705d113d5f88b034 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 11 二月 2025 14:12:10 +0800
Subject: [PATCH] 修改作业本送货单打印
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx | 88 ++++++++++++++++++++++++++++++++++++-------
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs | 4 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs | 18 ++++----
3 files changed, 84 insertions(+), 26 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
index 153387a..2e63406 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
@@ -23,7 +23,7 @@
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
<embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
</object>
- <div id='div_tool' printparams='0,2100,2470,"A4"'>
+ <div id='div_tool' printparams='0,2100,2970,"A4"'>
</div>
<asp:Repeater runat="server" ID='rptOrder'>
@@ -41,14 +41,14 @@
</style>
<table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
<tr>
- <td colspan='9'>
+ <td colspan='8'>
<div class='dtitle'>
<%=orderName %></div>
</td>
</tr>
<tr>
- <td colspan='9'>
+ <td colspan='8'>
</td>
</tr>
@@ -57,7 +57,7 @@
瀛︽牎锛� <%#Eval("shipAddress")%>
</td>
- <td class='left' colspan="5">
+ <td class='left' colspan="4">
鍦板潃锛� <%#Eval("shouhuoAddress")%>
</td>
@@ -68,14 +68,14 @@
鑱旂郴浜猴細 <%#Eval("shipName")%>
</td>
- <td class='left'colspan="5">
+ <td class='left'colspan="4">
鑱旂郴鐢佃瘽锛� <%#Eval("shipMobile")%>
</td>
</tr>
<tr>
- <td colspan="9">
+ <td colspan="8">
<%=biaotou %>
</td>
@@ -84,32 +84,90 @@
<tr>
- <td colspan='9'>
+ <td colspan='8'>
</td>
</tr>
<tr>
<td class='left'colspan="3">
- 鏀惰揣鍗曚綅锛氾紙鐩栫珷锛�
+ 鏀惰揣浜猴細 鑱旂郴鐢佃瘽锛�
</td>
- <td class='left' colspan="3">
- 鏀惰揣浜猴細
+ <td class='left' colspan="2">
+
</td>
<td class='left'colspan="3">
- 鑱旂郴鐢佃瘽锛�
+ 閫佽揣浜猴細
</td>
</tr>
<tr>
- <td class='left'colspan="6">
- 閫佽揣鏃堕棿锛�
+ <td class='left'colspan="3">
+ 鏀惰揣鍗曚綅锛氾紙鐩栫珷锛�
+ </td>
+ <td class='left'colspan="2">
+
</td>
<td class='left' colspan="3">
- 閫佽揣浜猴細
+ 閫佽揣鏃堕棿锛�
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
</td>
</tr>
</table>
- <%#(Container.ItemIndex != (countss-1))?"<div class=\"page-break\"></div>":"" %>
+ <%#(Container.ItemIndex != (countss-1)&& (Container.ItemIndex+1)%2==0)?"<div class=\"page-break\"></div>":"" %>
</ItemTemplate>
</asp:Repeater>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
index c1fe649..122dfac 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
@@ -146,31 +146,31 @@
{
int i = 1;
- biaotou = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border: 0; \"><tr>";
+ biaotou = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 98%; \"><tr>";
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </td> ";
- if (i%9==0)
+ if (i%8==0)
{
- biaotou += " </tr> <tr><td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> </tr>";
+ biaotou += " </tr> <tr><td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
}
- if (i % 9 == 0 && i != inquiryWorkBookModels.Count())
+ if (i % 8 == 0 && i != inquiryWorkBookModels.Count())
{
biaotou += " <tr>";
}
- if (i == inquiryWorkBookModels.Count()&& i % 9 != 0)
+ if (i == inquiryWorkBookModels.Count()&& i % 8 != 0)
{
- for (int j=0;j<9;j++)
+ for (int j=0;j<8;j++)
{
biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"></td> ";
i = i + 1;
- if (i % 9 == 0)
+ if (i % 8 == 0)
{
- biaotou += " </tr><tr><td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> </tr>";
+ biaotou += " </tr><tr><td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> <td style=\"text-align:center;border: 1px solid #999999;\"></td> </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
break;
}
}
@@ -180,7 +180,7 @@
i++;
}
- biaotou += " <tr> <td style=\"text-align:center;border: 1px solid #999999;\"> 楠屾敹鎰忚</td > <td style=\"text-align:left;border: 1px solid #999999;\" colspan=\"8\"> 浜у搧璐ㄩ噺锛�<input type=\"checkbox\" />闈炲父婊℃剰 <input type=\"checkbox\" />婊℃剰<input type=\"checkbox\" />涓�鑸�<input type=\"checkbox\" />涓嶆弧鎰�<br/> 閰嶉�佹湇鍔★細<input type=\"checkbox\" />闈炲父婊℃剰 <input type=\"checkbox\" />婊℃剰<input type=\"checkbox\" />涓�鑸�<input type=\"checkbox\" />涓嶆弧鎰�<br/>澶囨敞鎰忚锛�<br/></td></tr>";
+ biaotou += " <tr> <td style=\"text-align:center;border: 1px solid #999999;\"> 楠屾敹鎰忚</td > <td style=\"text-align:left;border: 1px solid #999999;\" colspan=\"7\"> 浜у搧璐ㄩ噺锛�<input type=\"checkbox\" />闈炲父婊℃剰 <input type=\"checkbox\" />婊℃剰<input type=\"checkbox\" />涓�鑸�<input type=\"checkbox\" />涓嶆弧鎰�<br/> 閰嶉�佹湇鍔★細<input type=\"checkbox\" />闈炲父婊℃剰 <input type=\"checkbox\" />婊℃剰<input type=\"checkbox\" />涓�鑸�<input type=\"checkbox\" />涓嶆弧鎰�<br/>澶囨敞鎰忚锛�<br/></td></tr>";
biaotou += "</table>";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
index 72b84b7..5051c20 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
@@ -77,7 +77,7 @@
this.selDepartmentId.DataValueField = "Keyid";
this.selDepartmentId.DataBind();
- this.selRole.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId);
+ this.selRole.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId).Where(x=>x.IsUsed == true);
this.selRole.DataTextField = "RoleName";
this.selRole.DataValueField = "Keyid";
this.DataBind();
@@ -152,7 +152,7 @@
this.selDepartmentId.DataValueField = "Keyid";
this.selDepartmentId.DataBind();
- this.selRole.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId);
+ this.selRole.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId).Where(x => x.IsUsed == true); ;
this.selRole.DataTextField = "RoleName";
this.selRole.DataValueField = "Keyid";
this.DataBind();
--
Gitblit v1.9.1