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/OrderList.aspx | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 353778e..ec0aa74 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,11 +5,17 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js?v=8" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=13" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
+ }
+
+
+ //鏂板闂鍙嶉
+ function ToAddorder() {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiAdd.aspx", Title: "闂鍙嶉", Width: 900, Height: 750 });
}
function OpenComplainan(orderId, orderCode, firmId) {
@@ -264,13 +270,7 @@
<td>
<input id='txtCustormerName' runat="server" maxlength='50' />
</td>
- <td class="ali03">
- 瀹㈡埛缁忕悊锛�
- </td>
- <td>
- <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
- </select>
- </td>
+
<td class="ali03">
涓氬姟缁忕悊锛�
</td>
@@ -278,11 +278,24 @@
<select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>
+ <td class="ali03">
+ 瀹屽伐鐘舵�侊細
+ </td>
+ <td>
+ <select id='selWorkStates' runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="true">宸插畬宸�</option>
+ <option value="false">鏈畬宸�</option>
+ </select>
+ </td>
<td class="ali03">
- 璁㈠崟鐘舵�侊細
+ 閫佽揣鐘舵�侊細
</td>
<td>
- <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ <select id='selDeleverStates' runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="true">宸查�佽揣</option>
+ <option value="false">鏈�佽揣</option>
</select>
</td>
</tr>
@@ -331,10 +344,14 @@
</td>
</tr>
<tr>
- <td class="ali03">
+ <td class="ali03">
+ 瀹㈡埛缁忕悊锛�
</td>
- <td>
+ <td>
+ <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
</td>
+
<td class="ali03"> </td>
<td> </td>
<td class="ali03"> </td>
@@ -342,6 +359,13 @@
<td class="ali03"> </td>
<td> </td>
<td> </td>
+ <td class="ali03" style="display:none;">
+ 璁㈠崟鐘舵�侊細
+ </td>
+ <td style="display:none;">
+ <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ </select>
+ </td>
<td>
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
@@ -365,9 +389,9 @@
<a href="javascript:;" class='delete' menu_member_case_id="case_deleteOrderList" menu_member_case_name="鎵归噺鍒犻櫎" onclick="ToBatch(BatchDelete,IsObjCanntDelete);"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>
<div class="box_tool_line">
</div>
- <a href="javascript:;" menu_member_case_id="case_ToAllAcceptList" menu_member_case_name="鎵归噺鍙楃悊" onclick="ToAllAccept();"><span class="icon_edit">鎵归噺鍙楃悊</span></a>
+ <%-- <a href="javascript:;" menu_member_case_id="case_ToAllAcceptList" menu_member_case_name="鎵归噺鍙楃悊" onclick="ToAllAccept();"><span class="icon_edit">鎵归噺鍙楃悊</span></a>
<div class="box_tool_line">
- </div>
+ </div>--%>
<a href="javascript:;" menu_member_case_id="case_ToCompledList" menu_member_case_name="鎵归噺瀹屽伐" onclick="ToCompled();"><span class="icon_edit">鎵归噺瀹屽伐</span></a>
<div class="box_tool_line">
</div>
@@ -378,6 +402,10 @@
<%-- <div class="box_tool_line">
</div>
<a href="javascript:;" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>--%>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" menu_member_case_id="case_adWentifankui" menu_member_case_name="鏂板闂鍙嶉" onclick="ToAddorder();"><span class="icon_edit">闂鍙嶉</span></a>
+
<div class="clear">
</div>
</div>
@@ -462,6 +490,9 @@
</th>
<th width="26" menu_member_case_id="case_DeliverWork" menu_member_case_name="閫佽揣">
閫佽揣
+ </th>
+ <th width="26">
+ 閫佽揣璐圭敤
</th>
<th width="26" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="鎾ゅ崟">
鎾ゅ崟
@@ -574,7 +605,7 @@
<%#true.Equals(Eval("IsPrint")) ? "鈭�" : "鎵撳嵃"%></span>
</td>
<td class="td_hide" menu_member_case_id="case_ToAccept" menu_member_case_name="鍙楃悊">
- <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍙楃悊")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ?"title='宸插彈鐞�'":"title='鍙楃悊'"%> onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)">
+ <span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍙楃悊")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ?"title='宸插彈鐞�'":"title='鍙楃悊'"%> <%--onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)"--%> >
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "鈭�" : "鍙楃悊"%></span>
</td>
<td >
@@ -598,6 +629,9 @@
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"閫佽揣")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣")?"title='宸查�佽揣'":"title='閫佽揣'"%> style='display: ' onclick='DeliverWork(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("OrderState")%>")'>
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : Eval("Shifoubiaohongsonghuo")%></span>
</td>
+ <td>
+ <%#Eval("SonghuoJine","{0:F}")%>
+ </td>
<td class="td_hide" menu_member_case_id="case_ShowDoDelay" menu_member_case_name="鎾ゅ崟">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鎾ゅ崟")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鎾ゅ崟")?"title='宸叉挙鍗�'":"title='鎾ゅ崟'"%> style='display: ' onclick="ShowDoDelay({dtypeId:4,defaultarget:'<%#Eval("TradingSingle.PayedMoney", "{0:F}")%>',orderid:<%#Eval("Keyid")%>,orderShowId:'<%#Eval("SellerOrderId")%>',receiver:'<%#Eval("BuyerId")%>',orderState:'<%#Eval("OrderState")%>',orderType:'<%#Eval("OrderTypeId")%>',title:'鎾ゅ崟绠＄悊' })">
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鎾ゅ崟") ? "鈭�" : "鎾ゅ崟"%></span>
--
Gitblit v1.9.1