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/business/DeliverWorkBookList.aspx |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
index c427094..804394f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
@@ -10,7 +10,10 @@
         function onViewCarViolation(keyid) {
             top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠$悊", Width: 1000, Height: 660 });
         }
-
+        //鏌ョ湅瀹㈡埛璧勬枡
+        function View(personId) {
+            top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?keyid=" + personId, Title: "鏌ョ湅瀹㈡埛", Width: 900, Height: 580 });
+        }
         //淇濆吇
         function onViewCarMaintenance(keyid) {
             top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠$悊", Width: 1000, Height: 660 });
@@ -29,12 +32,25 @@
         function onViewCarInsurance(keyid) {
             top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookSonghuo.aspx?orderId=" + keyid, Title: "鏌ョ湅閫佽揣鎯呭喌", Width: 1500, Height: 900 });
         }
+        //淇濋櫓
+        function onViewfahuo(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookfahuoqingkuang.aspx?orderId=" + keyid, Title: "鏌ョ湅鍙戣揣鎯呭喌",  Width: 1500, Height: 900 });
+        }
+        
 
         //淇敼
         function onEdit(keyid) {
             top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 1500, Height: 900 });
         }
-
+        //鏂板鍙戣揣
+        function onViewXinzengsonghuo(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookFahuo.aspx?orderId=" + keyid, Title: "鏂板淇敼鍙戣揣", Width: 1500, Height: 900 });
+        }
+        //搴撳瓨鐩樼偣
+        function onViewKucunpandian(keyid) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPandian.aspx?orderId=" + keyid, Title: "搴撳瓨鐩樼偣", Width: 1500, Height: 900 });
+        }
+        
         //娣诲姞
         function addModel() {
             top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
@@ -42,7 +58,7 @@
 
         //鍒犻櫎
         function onDele(keyid) {
-            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrint.aspx?orderId=" + keyid, Title: "鎵撳嵃閫佽揣鍗�", Width: 600, Height: 900 });
+            top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPrint.aspx?orderId=" + keyid, Title: "鎵撳嵃閫佽揣鍗�", Width: 800, Height: 900 });
         }
 
         //鎵归噺鍒犻櫎
@@ -87,7 +103,7 @@
                     <td style="width: 215px">
                         <input id="txtBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
                     </td>
-                    <td class="ali03">
+                   <%-- <td class="ali03">
                         璁㈠崟缂栧彿锛�
                     </td>
                     <td>
@@ -98,6 +114,12 @@
                     </td>
                     <td>
                         <input id='txtSearchyjname' runat="server" maxlength='50' />
+                    </td>--%>
+                    <td class="ali03">
+                        瀹㈡埛鍚嶇О锛�
+                    </td>
+                    <td>
+                        <input id='txtBuyerName' runat="server" maxlength='100' />
                     </td>
                       <td class="ali03">
                         瀹㈡埛缁忕悊锛�
@@ -120,6 +142,9 @@
                     </td>
                     <td>
                         <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+                            <option value="">鍏ㄩ儴</option>
+                            <option value="0" selected="selected">鏈�佽揣</option>
+                            <option value="1">宸查�佽揣</option>
                         </select>
                     </td>
                     <td colspan="8">
@@ -139,6 +164,9 @@
                             </th>
                             <th style="text-align: center">
                                 璁㈠崟鍙�
+                            </th>
+                             <th style="text-align: center">
+                                瀹㈡埛鍚嶇О
                             </th>
                             <th style="text-align: center">
                                 鍗颁欢鍚嶇О
@@ -169,6 +197,11 @@
                         <td style="text-align: center">
                          <%#Eval("SellerOrderId")%>
                         </td>
+                           <td style="text-align: center;">
+                                 <div style="word-wrap: break-word; text-align:justify;">
+                                    <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 22 ? (Eval("BuyerName").ToString().Substring(0, 22) + "..") : Eval("BuyerName").ToString()%></a>
+                                        </div>
+                                </td>
                         <td style="text-align: center">
                            <%#Eval("DocumentName")%>
                         </td>
@@ -187,6 +220,11 @@
                             <span  onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅鏄庣粏</span>
                             <span   onclick="onDele('<%#Eval("Keyid")%>')">鎵撳嵃閫佽揣鍗�</span>
                              <span   onclick="onViewCarInsurance('<%#Eval("Keyid")%>')">鏌ョ湅閫佽揣鎯呭喌</span>
+
+                             <span  menu_member_case_id="case_Xinzengsonghuo" menu_member_case_name="鏂板淇敼鍙戣揣 "   onclick="onViewXinzengsonghuo('<%#Eval("Keyid")%>')">鏂板淇敼鍙戣揣 </span>
+                             <span   menu_member_case_id="case_Kucunpandian" menu_member_case_name="搴撳瓨鐩樼偣"  onclick="onViewKucunpandian('<%#Eval("Keyid")%>')">搴撳瓨鐩樼偣</span>
+                             <span   onclick="onViewfahuo('<%#Eval("Keyid")%>')">鏌ョ湅鍙戣揣鎯呭喌</span>
+                           
                         </td>
                     </tr>
                 </ItemTemplate>

--
Gitblit v1.9.1