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/RequestReplyList.aspx |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index 2cc5541..bf4e443 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -9,15 +9,15 @@
         //璇风ず鏄庣粏
         function onView(keyid, value_PlanTyle) {
             if (value_PlanTyle == "3") {
-                top.Dialog.open({ URL: "/Pages/work/MyRequestDetail.aspx?keyid=" + keyid, Title: "璇风ず鏄庣粏", Width: 620, Height: 360 });
+                top.Dialog.open({ URL: "/Pages/work/MyRequestDetail.aspx?keyid=" + keyid, Title: "璇风ず鏄庣粏", Width: 620, Height: 560 });
             } else {
-                top.Dialog.open({ URL: "/Pages/work/WorkPlanDetail.aspx?keyid=" + keyid, Title: "宸ヤ綔鏄庣粏", Width: 620, Height: 460 });
+                top.Dialog.open({ URL: "/Pages/work/WorkPlanDetail.aspx?keyid=" + keyid, Title: "宸ヤ綔鏄庣粏", Width: 620, Height: 560 });
              }
         }
 
         //鎵瑰璇风ず
         function onEdit(keyid) {
-            top.Dialog.open({ URL: "/Pages/work/RequestReplyAdd.aspx?keyid=" + keyid, Title: "鎵瑰璇风ず", Width: 620, Height: 360 });
+            top.Dialog.open({ URL: "/Pages/work/RequestReplyAdd.aspx?keyid=" + keyid, Title: "鎵瑰璇风ず", Width: 620, Height: 560 });
         }
 
         $(function () {
@@ -61,6 +61,9 @@
                              <option value="14">澶栧崗浠樻鐢宠</option>
                              <option value="15">浠樻鐢宠</option>
                              <option value="16">閲囪喘浠樻鐢宠</option>
+                             <option value="18">璁惧缁翠慨鐢宠</option>
+                            <option value="19">缁翠慨浠樻鐢宠</option>
+                             <option value="20">缃氭鐢宠瘔</option>
                             <option value="12">鍏朵粬</option>
                         </select>
                     </td>
@@ -116,16 +119,19 @@
                             <th width="70" style="text-align: center">
                                 璇风ず绫诲埆
                             </th>
-                            <th style="text-align: center">
-                                璇风ず涓婚
+                             <th    style="text-align: center">
+                                璇风ず鍐呭
                             </th>
-                            <th style="text-align: center">
+                             <th width="70" style="text-align: center">
+                                鐢宠璐圭敤(鍏�)
+                            </th>
+                            <th width="70" style="text-align: center">
                                 鏄惁鎵瑰
                             </th>
-                            <th style="text-align: center">
+                            <th width="70" style="text-align: center">
                                 鎵瑰缁撴灉
                             </th>
-                            <th style="text-align: center">
+                            <th  width="70" style="text-align: center">
                                 鎿嶄綔
                             </th>
                         </tr>
@@ -145,7 +151,11 @@
                             <%#Eval("PlanDataTypeName")%>
                         </td>
                         <td style="text-align: center">
-                            <%#Eval("PlanTitle")%>
+                            <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 50))) %>
+
+                        </td>
+                        <td style="text-align: center">
+                            <%#Eval("PlanMoney", "{0:F2}")%>
                         </td>
                         <td style="text-align: center">
                             <%#Eval("PlanStatus").ToString()=="1"?"鏈壒澶�":"宸叉壒澶�"%>
@@ -159,7 +169,26 @@
                         </td>
                     </tr>
                 </ItemTemplate>
+                 
                 <FooterTemplate>
+                    <tr class="StatisticsMoney">
+                    <td colspan="5" class="ali03">
+                        褰撳墠椤电粺璁★細
+                    </td>
+                    <td colspan="3" class="ali01">
+                       <%-- <span id="NowMoney" runat="server"  ></span>--%>
+                        <%=NowMoney %>
+                    </td>
+                </tr>
+                    <tr class="StatisticsMoney">
+                    <td colspan="5" class="ali03">
+                        鏌ヨ椤圭粺璁★細
+                    </td>
+                    <td colspan="3" class="ali01">
+                      <%--<span id="AllMoney" runat="server"  ></span>--%>
+                        <%=AllMoney %>
+                    </td>
+                </tr>
                     </table>
                 </FooterTemplate>
             </asp:Repeater>

--
Gitblit v1.9.1