From d766d74d37d522bfb9c633e9afbe789ad0f1a6de Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 17 十二月 2025 15:10:26 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx |  133 ++++++++++++++++++++++++++++++-------------
 1 files changed, 92 insertions(+), 41 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx
index 9907d7c..d431338 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanDakaList.aspx
@@ -294,6 +294,16 @@
             window.open('/Pages/business/DeliverPlanFujianShow.aspx?Keyid=' + keyid + '&AttachmentType=' + AttachmentType, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
         }
 
+        function showProgress() {
+            document.getElementById('progressBar').style.display = 'block';
+
+
+            setTimeout(function () {
+                document.getElementById('progressBar').style.display = 'none';
+            }, 2000); // 10000姣绛変簬10绉�
+
+        }
+
         /*
 鎵撳嵃閫佽揣鍗�
 */
@@ -354,7 +364,7 @@
                     <td  >
                          <input id="txtCreatTimestart" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtCreatTimeend" type="text" runat="server" class='date w80px' maxlength='10' />
                          </td>
-                      <td class="ali03">
+                     <%-- <td class="ali03">
                         鎵撳崱绫诲瀷锛�
                     </td>
                     <td  >
@@ -364,7 +374,7 @@
                                <option value="2">涓嬬彮</option>
                                <option value="3">鑽夌</option>
                         </select>
-                    </td>
+                    </td>--%>
                       <td class="ali03">
                         杞﹁締锛�
                     </td>
@@ -379,18 +389,21 @@
                          <input id='txtCreater' runat="server" maxlength='50' />
                         
                     </td>
-                     </tr>
+                   <%--  </tr>
                 
-                      <tr>
+                      <tr>--%>
 
                          
                        
-                    <td colspan="8">
+                    <td <%--colspan="8"--%>>
                     
                            <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;<asp:Button ID="Button1" Text="瀵煎嚭" OnClientClick="showProgress();return true;" runat="server" OnClick="btn_Daochu_Click" />
+                        <div id="progressBar" style="display:none; position:fixed; top:50%; left:50%; transform:translate(-50%, -50%);border:1px solid black;height:50px;background-color:azure;">
+    姝e湪瀵煎嚭Excel鏂囦欢锛岃绋嶅��...
+</div>
                             
                     </td>
                 </tr>
@@ -406,7 +419,7 @@
                     <tr>
                           
                         <th width="25">
-                            椤哄簭
+                            缂栧彿
                         </th>
                           <th width="60">
                             杞﹁締
@@ -415,34 +428,54 @@
                             椹鹃┒鍛�
                         </th>
                           <th width="85">
-                            鎵撳崱鏃堕棿
+                            涓婄彮鎵撳崱鏃堕棿
                         </th>
-                         <th width="60">
-                            鎵撳崱绫诲瀷
-                        </th>
-                        <th  style="text-align: center;"width="200">
-                            鏈璐ф儏鍐�
-                        </th>
-                         <th  style="text-align: center;"width="200">
-                            杞﹀喌
-                        </th>
-                        <th style="text-align: center;"width="200">
-                            澶囨敞
-                        </th>
+                       
+                       
+                        
+                      
                          <th width="60">
                             閲岀▼(鍏噷)
                         </th>
                            <th width="60">
                             閲岀▼鍥剧墖
                         </th>
-                           <th width="60">
-                            瑁呰揣鍥剧墖
-                        </th>
+                         
                         <th width="60">
                             杞﹀喌鍥剧墖
                         </th>
+                            <th  style="text-align: center;"width="50">
+                            杞﹀喌
+                        </th>
+
+
+                          <th width="85">
+                            涓嬬彮鎵撳崱鏃堕棿
+                        </th>
+                       
+                       
                         
-                          
+                      
+                         <th width="60">
+                            閲岀▼(鍏噷)
+                        </th>
+                           <th width="60">
+                            閲岀▼鍥剧墖
+                        </th>
+                         
+                        
+
+
+
+                          <th width="60">
+                            瑁呰揣鍥剧墖
+                        </th>
+                         <th  style="text-align: center;"width="50">
+                            鏈璐ф儏鍐�
+                        </th>
+                           <th style="text-align: center;"width="50">
+                            澶囨敞
+                        </th> 
                       
                     </tr>
                 </thead>
@@ -464,34 +497,52 @@
                                 <td>
                                       <%#Eval("CreatTime", "{0:yyyy-MM-dd HH:mm:dd}")%>
                                 </td>
-                                 <td>
-                                    <%#Eval("ClockTypeName")%>  
-                                </td>
-                                <td>
-                                    <%#Eval("EmptyCause")%>  
-                                </td>
+                                 
+                               
                                 
-                                <td>
-                                    <%#Eval("CarCondition")%>   
-                                </td>
-                                <td>
-                                   <%#Eval("Remark")%>     
-                                </td>
+                              
+                               
                                   <td>
                                    <%#Eval("Mileage")%>     
                                 </td>
                                 <td>
-                                    <a   title='閲岀▼鍥剧墖' class='a_under' href="<%#Eval("MileageImg").ToString() %>" target="view_window"   > <%#Eval("MileageImgName")%>   </a> 
+                                    <a   title='閲岀▼鍥剧墖' class='a_under' href="<%#Eval("MileageImg") %>" target="view_window"   > <%#Eval("MileageImgName")%>   </a> 
                                 </td>
-                                <td>
-                                      <a href='javascript:void(0)' title='瑁呰揣鍥剧墖' class='a_under' onclick='onViewuplod("<%#Eval("Id")%>","4")'> <%#Eval("ZhuangcheImg")%>  </a> 
-                                </td>
+                               
                                 <td>
                                     <a href='javascript:void(0)' title='杞﹀喌鍥剧墖' class='a_under' onclick='onViewuplod("<%#Eval("Id")%>","5")'> <%#Eval("CarConditionImg")%>    </a> 
+                                     <a href='javascript:void(0)' title='杞﹀喌鍥剧墖' class='a_under' onclick='onViewuplod("<%#Eval("oA_DriverRecord.Id")%>","5")'> <%#Eval("oA_DriverRecord.CarConditionImg")%>    </a> 
+                                </td>
+                                   <td>
+                                    <%#Eval("CarCondition")%>    <%#Eval("oA_DriverRecord.CarCondition")%>   
+                                </td>
+
+
+                                 <td>
+                                      <%#Eval("oA_DriverRecord.CreatTimeName")%>
                                 </td>
                                  
+                               
                                 
-                                  
+                              
+                               
+                                  <td>
+                                   <%#Eval("oA_DriverRecord.Mileage")%>     
+                                </td>
+                                <td>
+                                    <a   title='閲岀▼鍥剧墖' class='a_under' href="<%#Eval("oA_DriverRecord.MileageImg") %>" target="view_window"   > <%#Eval("oA_DriverRecord.MileageImgName")%>   </a> 
+                                </td>
+
+                                 <td>
+                                      <a href='javascript:void(0)' title='瑁呰揣鍥剧墖' class='a_under' onclick='onViewuplod("<%#Eval("Id")%>","4")'> <%#Eval("ZhuangcheImg")%>  </a> 
+                                      <a href='javascript:void(0)' title='瑁呰揣鍥剧墖' class='a_under' onclick='onViewuplod("<%#Eval("oA_DriverRecord.Id")%>","4")'> <%#Eval("oA_DriverRecord.ZhuangcheImg")%>  </a> 
+                                </td>
+                                 <td>
+                                    <%#Eval("EmptyCause")%>   <%#Eval("oA_DriverRecord.EmptyCause")%>  
+                                </td>
+                                   <td>
+                                   <%#Eval("Remark")%>  <%#Eval("oA_DriverRecord.Remark")%>     
+                                </td>
                                  
                             </tr>
                         </itemtemplate>

--
Gitblit v1.9.1