From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单,你们给我做两种,做一张打印没得数量的,做一张打印有数量的。送货单格式就是32开,就哎就是A4排一半。你们打了测试,注意,美观。 把那个把它做出来,下一批就用这个自动打。 不是不是打印的要数量都是有数量,要没得数量都没得数量。就是点打印的时候就两个按钮嘛,一个是有数量打印,或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的,比如你那里再打你那个打印关闭的按钮,要把搞成两个打印嘛,就是打印空白送货单和打印送货单。 好点打印空白送货单的,就是现在这样子。点打印送货单,打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询,状态查询需要修改逻辑

---
 CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
index a2f0fd6..fb6a1fd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
@@ -39,14 +39,15 @@
                 }
             )
             if (deleteKeyIds == "") {
-                top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+                top.Dialog.alert("璇烽�夋嫨瑕佷粯娆剧殑璁板綍", function () {
                 });
                 return;
             }
             else {
                 deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
-                top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
-                    window.location = "/Pages/work/BaoxiaoFukuanList.aspx?deleteKeyIds=" + deleteKeyIds;
+                top.Dialog.confirm("纭畾瑕佷粯娆炬墍閫夎褰曞悧锛�", function () {
+                    /*  window.location = "/Pages/work/BaoxiaoFukuanList.aspx?deleteKeyIds=" + deleteKeyIds;*/
+                    top.Dialog.open({ URL: "/Pages/financial/BaoxiaoFukuanPiliang.aspx?keyids=" + deleteKeyIds, Title: "鎵归噺鎶ラ攢浠樻", Width: 800, Height: 600 });
                 });
             }
         }
@@ -90,7 +91,7 @@
                     </td>
                    
                     <td class="ali03">
-                        鎶ラ攢鐘舵�侊細
+                        浠樻鐘舵�侊細
                     </td>
                     <td>
                         <select keepdefaultstyle="true" runat="server" id="selEvaluationStatus">
@@ -101,6 +102,8 @@
                     </td>
                     <td>
                         <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />
+
+                        <asp:Button ID="Button1" Text="瀵煎嚭" runat="server" OnClick="btn_Daochu_Click" />
                     </td>
                 </tr>
             </table>
@@ -112,8 +115,8 @@
                         <div class="padding_top5 padding_left10">
                              <%-- <a href="javascript:;" onclick="addModel()" class="aaddModel" menu_member_case_id="case_addModel" menu_member_case_name="鏂板鎶ラ攢"><span class="icon_add">鏂板鎶ラ攢</span></a>
                           <div class="box_tool_line">
-                            </div>
-                            <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%>
+                            </div>--%>
+                            <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺浠樻"><span class="">鎵归噺浠樻</span></a>
                             <div class="clear">
                             </div>
                         </div>
@@ -137,6 +140,9 @@
                             <th width="130" style="text-align: center">
                                 鐢宠鏃ユ湡
                             </th>
+                             <th width="130" style="text-align: center">
+                                鎶ラ攢鍗曞彿
+                            </th>
                              <th width="70" style="text-align: center">
                                 閮ㄩ棬
                             </th>
@@ -146,7 +152,7 @@
                             <th width="70" style="text-align: center">
                                 绉戠洰
                             </th>
-                            <th style="text-align: center">
+                            <th width="250"  style="text-align: center">
                                 鎽樿
                             </th>
                             <th width="70" style="text-align: center">
@@ -159,7 +165,7 @@
                                 闄勪欢
                             </th>
                             <th width="150"  style="text-align: center">
-                                鎶ラ攢鐘舵��
+                                浠樻鐘舵��
                             </th>
                             <th width="250"  style="text-align: center">
                                 鎿嶄綔
@@ -178,6 +184,9 @@
                             <%#Eval("PlanStartTime", "{0:yyyy-MM-dd}")%>
                         </td>
                          <td style="text-align: center">
+                            <%#Eval("EvaluationContent")%> 
+                        </td>
+                         <td style="text-align: center">
                             <%#Eval("DepartName")%> 
                         </td>
                          <td style="text-align: center">
@@ -187,7 +196,7 @@
                             <%#Eval("RewardContent")%> 
                         </td>
                         <td style="text-align: center">
-                            <%#Eval("PlanContent")%>
+                           <%#(Eval("PlanContent")!=null && Eval("PlanContent").ToString().Length>50)?Eval("PlanContent").ToString().Substring(0,50):Eval("PlanContent") %>
                         </td>
                         <td style="text-align: center">
                             <%#Eval("PlanMoney", "{0:F2}")%>   
@@ -213,7 +222,7 @@
                 
             </asp:Repeater>
              <tr class="StatisticsMoney">
-                    <td colspan="7" class="ali03">
+                    <td colspan="8" class="ali03">
                         鍚堣锛�
                     </td>
                     <td colspan="5" class="ali01">

--
Gitblit v1.9.1