username@email.com
2025-11-17 c204c099a226710bb6b6c4fe5cb9296fb93920cb
作业本送货

打印送货单 行距在加高50% 完成
有数据的,如果是0表头也不要 完成

作业本送货 合计变灰色,节约的加到已送上,已送加未送等于订单数 完成

选送货人和送货时间 送货人只能是司机 然后在打印单子上显示 完成
8个文件已修改
104 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx
@@ -141,25 +141,25 @@
                        <td style="text-align: center"  >
                         <span  <%#Eval("name").ToString().IndexOf("合计")>=0?"style=\"color: red;\"":"" %>  > <%#Eval("specification")%>  <%#Eval("name")%> </span>  
                        </td>
                        <td style="text-align: center">
                        <td   <%#Eval("name").ToString().IndexOf("合计")>=0?"style=\"color: grey;text-align: center;\"":"style=\"text-align: center;\"" %>  >
                         <%#Eval("nums")%>
                        </td>
                        <td style="text-align: center">
                        <td  <%#Eval("name").ToString().IndexOf("合计")>=0?"style=\"color: grey;text-align: center;\"":"style=\"text-align: center;\"" %> >
                           <%#Eval("fahuonums")%> 
                        </td>
                           <td style="text-align: center">
                           <td  <%#Eval("name").ToString().IndexOf("合计")>=0?"style=\"color: grey;text-align: center;\"":"style=\"text-align: center;\"" %> >
                           <%#Eval("weifahuonums")%> 
                        </td>
                         <td style="text-align: center">
                         <td  <%#Eval("name").ToString().IndexOf("合计")>=0?"style=\"color: grey;text-align: center;\"":"style=\"text-align: center;\"" %> >
                           <%#Eval("songhuonums")%> 
                        </td>
                         <td style="text-align: center">
                         <td  <%#Eval("name").ToString().IndexOf("合计")>=0?"style=\"color: grey;text-align: center;\"":"style=\"text-align: center;\"" %> >
                           <%#Eval("kucunnums")%> 
                        </td>
                         <td style="text-align: center">
                         <td  <%#Eval("name").ToString().IndexOf("合计")>=0?"style=\"color: grey;text-align: center;\"":"style=\"text-align: center;\"" %> >
                           <%#Eval("weisonghuonums")%> 
                        </td>
                         <td style="text-align: center">
                         <td  <%#Eval("name").ToString().IndexOf("合计")>=0?"style=\"color: grey;text-align: center;\"":"style=\"text-align: center;\"" %> >
                           <%#Eval("LessNumber")%> 
                        </td>
                    </tr>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx
@@ -42,12 +42,12 @@
        //删除
        function onDele(keyid) {
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?PlanOrderid=" + keyid, Title: "打印送货单", Width: 1000, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?PlanOrderid=" + keyid + "&selSonghuoren=" + $("#selSonghuoren").val() + "&txtBeginDate=" + $("#txtBeginDate").val(), Title: "打印送货单", Width: 1000, Height: 900 });
        }
        //删除
        function onDeledayin(keyid) {
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetailshuju.aspx?PlanOrderid=" + keyid, Title: "打印送货单", Width: 1000, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetailshuju.aspx?PlanOrderid=" + keyid + "&selSonghuoren=" + $("#selSonghuoren").val() + "&txtBeginDate=" + $("#txtBeginDate").val(), Title: "打印送货单", Width: 1000, Height: 900 });
        }
        
        //删除
@@ -62,7 +62,7 @@
                alertMsg("未选中任何学校");
                return;
            }
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?orderid=" + keyid, Title: "批量打印送货单", Width: 1000, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetail.aspx?orderid=" + keyid + "&selSonghuoren=" + $("#selSonghuoren").val() + "&txtBeginDate=" + $("#txtBeginDate").val(), Title: "批量打印送货单", Width: 1000, Height: 900 });
                
              
        }
@@ -82,7 +82,7 @@
                alertMsg("未选中任何学校");
                return;
            }
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetailshuju.aspx?orderid=" + keyid, Title: "批量打印送货单", Width: 1000, Height: 900 });
            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrintDetailshuju.aspx?orderid=" + keyid + "&selSonghuoren=" + $("#selSonghuoren").val() + "&txtBeginDate=" + $("#txtBeginDate").val(), Title: "批量打印送货单", Width: 1000, Height: 900 });
        }
@@ -136,14 +136,20 @@
                    <td>
                        <input id='txtxuexiao' runat="server" maxlength='50' />
                    </td>
                    <td class="ali03">
                          <asp:Button ID="btn_Submit" Text="查询" runat="server" OnClick="btn_Search_Click" />&nbsp;
                    </td>
                     </tr>
                       <tr>
                     
                      
                    <td colspan="4">
                        <asp:Button ID="btn_Submit" Text="查询" runat="server" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='批量空白送货单' onclick="onDeles('<%=orderid %>')" /> &nbsp;<input type="button" value='批量打印送货单' onclick="onDelesdayin('<%=orderid %>')" />
                    <td colspan="5">
                       <input type="button" value='批量空白送货单' onclick="onDeles('<%=orderid %>')" /> &nbsp;<input type="button" value='批量打印送货单' onclick="onDelesdayin('<%=orderid %>')" />
                         <input type="hidden" runat="server" id="hideOrderId" />
                        送货人: <select keepdefaultstyle='true' id='selSonghuoren' runat="server" >
                        </select>
                         送货时间:<input id="txtBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />
                    </td>
                </tr>
            </table>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.cs
@@ -21,6 +21,7 @@
        CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
        CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
        EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        public string orderid = "";
        //初始化
@@ -29,6 +30,7 @@
            bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
            bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
            _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
            bll_OA_StaffBLL = new OA_StaffBLL();
        }
        //页面加载
@@ -37,7 +39,11 @@
            
            if (!IsPostBack)
            {
                this.selSonghuoren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false).Where(x => x.SM_Post == "司机");
                this.selSonghuoren.DataTextField = "Name";
                this.selSonghuoren.DataValueField = "Name";
                this.selSonghuoren.DataBind();
                this.selSonghuoren.Items.Insert(0, new ListItem("全部", ""));
                BindList();
            }
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrint.aspx.designer.cs
@@ -78,6 +78,24 @@
        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
        /// <summary>
        /// selSonghuoren 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selSonghuoren;
        /// <summary>
        /// txtBeginDate 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginDate;
        /// <summary>
        /// RepClientList 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
@@ -111,7 +111,7 @@
                            &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
                        </td>
                        <td class='left'colspan="1">
                             送货人:
                             送货人:<%=selSonghuoren %>
                        </td>
                       
                    </tr>
@@ -123,7 +123,7 @@
                          
                        </td>
                        <td class='left' colspan="3">
                        送货时间:
                        送货时间: <%=txtBeginDate %>
                        </td>
                    </tr>
                         <tr>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx.cs
@@ -46,7 +46,8 @@
        public string biaotou = "";
        public string orderName = "";
        public int countss = 0;
        public string selSonghuoren = "";
        public string txtBeginDate = "";
        //初始化
        public DeliverWorkBookPrintDetail()
        {
@@ -97,8 +98,8 @@
        {
            //如果是批量打印
            string orderIdStr = Request["orderId"];
            selSonghuoren = Request["selSonghuoren"];
            txtBeginDate = Request["txtBeginDate"];
            //如果是只打印一张
            string PlanOrderidStr = Request["PlanOrderid"];
@@ -149,12 +150,12 @@
                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> ";
                    biaotou += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </td> ";
                    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>  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
                        biaotou += " </tr> <tr><td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td>  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
                    }
                    if (i % 8 == 0 && i != inquiryWorkBookModels.Count())
@@ -166,11 +167,11 @@
                    {
                        for (int j=0;j<8;j++)
                        {
                            biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"></td> ";
                            biaotou += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            i = i + 1;
                            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>  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
                                biaotou += " </tr><tr><td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td> <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td>  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
                                break;
                            }
                        }
@@ -180,7 +181,7 @@
                    i++;
                }
                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 += " <tr> <td  style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> 验收意见</td >  <td  style=\"text-align:left;border: 1px solid #999999;height: 40px;\"  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/business/DeliverWorkBookPrintDetailshuju.aspx
@@ -111,7 +111,7 @@
                            &nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
                        </td>
                        <td class='left'colspan="1">
                             送货人:
                             送货人:<%=selSonghuoren %>
                        </td>
                       
                    </tr>
@@ -123,7 +123,7 @@
                          
                        </td>
                        <td class='left' colspan="3">
                        送货时间:
                        送货时间:<%=txtBeginDate %>
                        </td>
                    </tr>
                         <tr>
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetailshuju.aspx.cs
@@ -45,6 +45,8 @@
        public int orderkeyid = 0;
        public string orderName = "";
        public int countss = 0;
        public string selSonghuoren = "";
        public string txtBeginDate = "";
        //初始化
        public DeliverWorkBookPrintDetailshuju()
@@ -96,7 +98,8 @@
        {
            //如果是批量打印
            string orderIdStr = Request["orderId"];
            selSonghuoren = Request["selSonghuoren"];
            txtBeginDate = Request["txtBeginDate"];
            //如果是只打印一张
            string PlanOrderidStr = Request["PlanOrderid"];
@@ -152,18 +155,18 @@
            {
                biaotou = "<table border=\"1\" cellpadding=\"0\" cellspacing=\"0\" style=\"border-collapse: collapse;width: 98%; \"><tr>";
                biaowei = "";
                var  cmsPlanOrderItems =    bll_CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreCmsPlanOrder.id).OrderBy(x => x.specification).ThenBy(x => x.name).ToList();
                var  cmsPlanOrderItems =    bll_CoreCmsPlanOrderItemBLL.GetModelsByOrderid(coreCmsPlanOrder.id).Where(x => x.nums > 0).OrderBy(x => x.specification).ThenBy(x => x.name).ToList();
                int i = 1;
                foreach (var cmsPlanOrderItem in cmsPlanOrderItems)
                {
                    biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"> " + cmsPlanOrderItem.specification + cmsPlanOrderItem.name + " </td> ";
                    biaotou += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> " + cmsPlanOrderItem.specification + cmsPlanOrderItem.name + " </td> ";
                    biaowei += " <td style=\"text-align:center;border: 1px solid #999999;\"> " + cmsPlanOrderItem.nums + " </td> ";
                    biaowei += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> " + cmsPlanOrderItem.nums + " </td> ";
                    if (i % 8 == 0)
                    {
                        biaotou += " </tr> <tr>"+ biaowei + "  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;\"></td>
                        biaotou += " </tr> <tr>"+ biaowei + "  </tr>";//<td style=\"text-align:center;border: 1px solid #999999;height: 40px;\"></td>
                        biaowei = "";
                    }
@@ -176,8 +179,8 @@
                    {
                        for (int j = 0; j < 8; j++)
                        {
                            biaotou += " <td style=\"text-align:center;border: 1px solid #999999;\"></td> ";
                            biaowei += " <td style=\"text-align:center;border: 1px solid #999999;\"></td> ";
                            biaotou += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            biaowei += " <td style=\"text-align:center;border: 1px solid #999999;height: 40px;\">&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</td> ";
                            i = i + 1;
                            if (i % 8 == 0)
                            {
@@ -191,7 +194,7 @@
                }
               
                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 += " <tr> <td  style=\"text-align:center;border: 1px solid #999999;height: 40px;\"> 验收意见</td >  <td  style=\"text-align:left;border: 1px solid #999999;height: 40px;\"  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>";