username@email.com
2025-02-11 47ec10c0df7c8179ee5fb51f705d113d5f88b034
修改作业本送货单打印
3个文件已修改
118 ■■■■ 已修改文件
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx 96 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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'>
                            &nbsp;
                        </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'>
                            &nbsp;
                        </td>
                    </tr>
                    <tr>
                        <td class='left'colspan="3">
                            收货单位:(盖章)
                            收货人:  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;  联系电话:
                        </td>
                        <td class='left' colspan="3">
                            收货人:
                        </td>
                        <td class='left'colspan="3">
                            联系电话:
                        </td>
                        <td class='left' colspan="2">
                       
                    </tr>
                   <tr>
                          <td class='left'colspan="6">
                            送货时间:
                        </td>
                        <td class='left' colspan="3">
                          送货人: 
                        </td>
                    </tr>
                   <tr>
                          <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">
                           &nbsp;
                        </td>
                             </tr>
                         <tr>
                          <td class='left'colspan="8">
                             &nbsp;
                        </td>
                             </tr>
                         <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                             </tr>
                         <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                        <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                         <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </td>
                    </tr>
                         <tr>
                              <td class='left'colspan="8">
                             &nbsp;
                        </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>
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>";
            }
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();