From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx |  113 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 87 insertions(+), 26 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index 48b42b0..50f23bd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -284,16 +284,37 @@
         }
 
 
+
+
+        //缁存姢
+        function onViewuplod(keyid) {
+            var l = (screen.availWidth - 500) / 2;
+            var t = (screen.availHeight - 300) / 2;
+            // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+            window.open('/Pages/business/DeliverPlanFujianShow.aspx?Keyid=' + keyid, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+        }
+
         /*
 鎵撳嵃閫佽揣鍗�
 */
         function ToPrintdelev() {
             var DeliveryTime = $("#txtDeliveryTime").val();
             var CarId = $("#selCarId").val();
-            var DriverId = $("#selDriverId").val();
+            var DriverId = "";
+            var CustormerName = $("#txtCustormerName").val();
+            var BusinessManager = $("#selBusinessManager").val();
+            var Paiche = $("#selPaiche").val();
+            
            // OpenWindowByUrl();
-            OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId, '', '');
+            OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager + '&Paiche=' + Paiche, '', '');
         }
+
+
+        //鏌ョ湅瀹㈡埛璧勬枡
+        function ViewTime(Keyid, DelayTime) {
+            top.Dialog.open({ URL: "/Pages/business/DeliverPlanTimeEdit.aspx?Keyid=" + Keyid + "&DelayTime=" + DelayTime, Title: "寤惰繜閫佽揣鏃堕棿", Width: 300, Height: 300 });
+        }
+
     </script>
     <style type="text/css">
         .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -336,14 +357,22 @@
                     </td> <td style="width:5%" >
                       
                     </td>
-                    <td style="width:15%">
+                    <td style="width:10%">
                         
                     </td> <td style="width:5%" >
                       
                     </td>
-                    <td style="width:15%">
+                    <td style="width:10%">
                         
                     </td>
+                     <td style="width:5%" >
+                      
+                    </td>
+                    <td style="width:10%">
+                        
+                    </td>
+                      
+
                      </tr>
                  <tr>
                       <td class="ali03">
@@ -367,11 +396,19 @@
                         <select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
                         </select>
                     </td>
-                     <td class="ali03"  >
-                        椹鹃┒鍛橈細
+                    
+
+                      <td class="ali03">
+                        瀹㈡埛鍗曚綅锛�
                     </td>
-                    <td   >
-                        <select keepdefaultstyle='true' id='selDriverId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+                    <td>
+                        <input id='txtCustormerName' runat="server" maxlength='50' />
+                    </td>
+                     <td class="ali03">
+                        涓氬姟缁忕悊锛�
+                    </td>
+                    <td>
+                        <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
                         </select>
                     </td>
                      </tr>
@@ -392,14 +429,23 @@
                         <select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
                         </select>
                     </td>--%>
-                       
+                       <td class="ali03"  >
+                        鏄惁娲捐溅锛�
+                    </td>
+                    <td   >
+                        <select keepdefaultstyle='true' id='selPaiche' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+                            <option value="">鍏ㄩ儴</option>
+                            <option value="1">鏄�</option>
+                            <option value="2">鍚�</option>
+                        </select>
+                    </td>
                     <td colspan="9">
                     
                            <asp:button id="btn_Search" text="鏌ヨ" runat="server"  padding="0px" OnClick="btn_Search_Click" />&nbsp;<input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
 
                           &nbsp; &nbsp; <input type="button" value='鏂板閫佽揣'  onclick='ToAddorder();'  /> &nbsp; &nbsp;
                               <input type="button" value='娲捐溅' onclick='ToAllAccept3();' /> &nbsp; &nbsp;
-                         <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept4();' /> 
+                       <%--  <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept4();' /> --%>
                          &nbsp;&nbsp;<input type="button" value='鎵撳嵃鍏ㄩ儴' onclick='ToPrintdelev();' />
                             
                     </td>
@@ -460,9 +506,9 @@
                         <th style="text-align: center;" width="70">
                             瑕佹眰鍒拌揪鏃堕棿
                         </th>
-                        <th style="text-align: center;"width="100">
+                       <%-- <th style="text-align: center;"width="100">
                             瀹為檯鍒拌揪鏃堕棿
-                        </th>
+                        </th>--%>
                         <th width="70">
                            涓氬姟缁忕悊
                         </th>
@@ -475,26 +521,34 @@
                         
                         
                         <th width="60">
-                            璐у崟鏁伴噺
+                            璁㈠崟鏁伴噺
                         </th>
-                         <th width="60">
+                       <%--  <th width="60">
                             杞﹁締
                         </th>
                          <th width="60">
                             椹鹃┒鍛�
-                        </th>
+                        </th>--%>
+                       <%-- <th width="200">
+                           闂鍙嶉 </th> 
+                           --%>
+                          
+                       
                         <th width="200">
                             娉ㄦ剰浜嬮」
                         </th>
-                        <th width="200">
+                       <%-- <th width="200">
                             宸ヤ綔鑰冭瘎
                         </th>
                         <th width="60">
                             绉讳氦鐘舵��
-                        </th>
+                        </th>--%>
                           <th width="60">
                             鎵撳嵃閫佽揣鍗�
                         </th>
+                        <%-- <th width="60">
+                            閫佽揣鍗曞浘鐗�
+                        </th>--%>
                     </tr>
                 </thead>
                 <tbody>
@@ -512,22 +566,23 @@
                                   </td>
                                 
                                 <td>
-                                    <a href='javascript:void(0)' title='鐐瑰嚮淇敼鎺掑簭' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>","<%#Eval("Sort")%>")'> <%#Eval("Sort")==null?"淇敼鎺掑簭":Eval("Sort")%>    </a>       
+                                   <%-- <a href='javascript:void(0)' title='鐐瑰嚮淇敼鎺掑簭' class='a_under' onclick='View("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>","<%#Eval("Sort")%>")'> <%#Eval("Sort")==null?"淇敼鎺掑簭":Eval("Sort")%>    </a>       --%>
+                                   <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
                                 </td>
                                   <td>
                                     <%#Eval("SellerOrderId")%>
                                 </td>
                                 <td>
-                                    <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
+                              <a href='javascript:void(0)' title='鐐瑰嚮淇敼閫佽揣鏃ユ湡' class='a_under' onclick='ViewTime("<%#Eval("Keyid")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>    </a>      
                                 </td>
-                                <td>
+                                <%--<td>
                                       <%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
-                                </td>
+                                </td>--%>
                                  <td>
                                     <%#Eval("BusinessManager")%>
                                 </td>
                                 <td>
-                                    <%#Eval("BuyerName")%>
+                                    <%#Eval("CompanyName")%>
                                 </td>
                                 
                                 <td>
@@ -536,24 +591,30 @@
                                 <td>
                                    <%#Eval("shuliang")%>  
                                 </td>
-                                <td>
+                                <%--<td>
                                     <%#Eval("CarName")%>
                                 </td>
                                 <td>
                                     <%#Eval("DriverName")%>
-                                </td>
+                                </td>--%>
+                                <%-- <td>
+                                    <%#Eval("wentifankui")%>
+                                </td>--%>
                                  <td>
                                  <a href='javascript:void(0)' title='鐐瑰嚮淇敼娉ㄦ剰浜嬮」' class='a_under' onclick='ViewZhuyishixiang("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("Zhuyishixiang").ToString()==""?"淇敼娉ㄦ剰浜嬮」":Eval("Zhuyishixiang")%>    </a>    
                                 </td>
-                                  <td>
+                                  <%--<td>
                                    <a href='javascript:void(0)' title='鐐瑰嚮淇敼宸ヤ綔鑰冭瘎' class='a_under' onclick='ViewGongzuokaoping("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")' ><%#Eval("Gongzuokaoping").ToString()==""?"淇敼宸ヤ綔鑰冭瘎":Eval("Gongzuokaoping")%>    </a>    
                                 </td>
                                 <td style="text-align: center;">
                                     <%#Eval("TransferName")==null || Eval("TransferName").ToString()==""?"鏈Щ浜�":Eval("TransferName")%>
-                                </td>
+                                </td>--%>
                                    <td>
                                  <a href='javascript:void(0)' title='鎵撳嵃閫佽揣鍗�' class='a_under' onclick='ToPrintDriverorder("<%#Eval("Keyid")%>")'>  鎵撳嵃  </a>    
                                 </td>
+                                 <%--<td>
+                                 <a href='javascript:void(0)' title='閫佽揣鍗曞浘鐗�' class='a_under' onclick='onViewuplod("<%#Eval("Keyid")%>")'>  閫佽揣鍗曞浘鐗�  </a>    
+                                </td>--%>
                             </tr>
                         </itemtemplate>
                     </asp:repeater>	

--
Gitblit v1.9.1