From eb07d0be014b11568d4263b470d46b5cd427fe9b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 17 七月 2025 08:49:45 +0800
Subject: [PATCH] 送货费用

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx |   56 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 353778e..683e688 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -12,6 +12,12 @@
             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) {
             var url = "/Pages/business/ComplainanEdit.aspx?orderId=" + orderId;
             url += "&orderCode=" + orderCode;
@@ -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" />&nbsp;<input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
 
@@ -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="鎾ゅ崟">
                             鎾ゅ崟
@@ -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