From 2fee7b9b90c1acf7a17aef84ee22c2a31b801fe2 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 三月 2025 08:34:42 +0800
Subject: [PATCH] 送货管理 增加查询 业务经理 客户名称 完成 查询送货安排的历史 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index b4e8f50..0e15ff0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js?v=6" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=7" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
@@ -186,6 +186,19 @@
var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
top.Dialog.open({ URL: url, Title: "澶栧崗浠樻鐢宠", Height: 600, Width: 580 });
}
+
+
+
+
+ function showProgress() {
+ document.getElementById('progressBar').style.display = 'block';
+
+
+ setTimeout(function () {
+ document.getElementById('progressBar').style.display = 'none';
+ }, 5000); // 10000姣绛変簬10绉�
+
+ }
</script>
<style type="text/css">
.tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -331,6 +344,11 @@
<td> </td>
<td>
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+
+ <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;">
+ 姝ｅ湪瀵煎嚭Excel鏂囦欢锛岃绋嶅��...
+</div>
<input type="hidden" id='txtCommission' runat="server" />
</td>
</tr>
@@ -387,12 +405,13 @@
<th width="55">
璁㈠崟绫诲埆
</th>
- <th style="text-align: center;">
- 鍗颁欢鍚嶇О
- </th>
<th style="width:50px;">
鍚堝悓搴忓彿
</th>
+ <th style="text-align: center;">
+ 鍗颁欢鍚嶇О
+ </th>
+
<th width="36">
鏁伴噺
</th>
@@ -507,15 +526,16 @@
<td style="text-align: center;">
<%#Eval("PrintType.PrintName")%>
</td>
+ <td style="text-align: center;">
+ <div style="word-wrap: break-word; text-align:justify;">
+ <%#Eval("Duiyinghetongbianhao").ToString().Length > 10 ? (Eval("Duiyinghetongbianhao").ToString().Substring(0, 10)) : Eval("Duiyinghetongbianhao").ToString()%>
+ </div>
+ </td>
<td style="text-align: center; color:<%#(Eval("OrderExtend.ExigencyCaseId").ToString()=="-1" && int.Parse(Eval("OrderState").ToString()) <5 && int.Parse(Eval("OrderState").ToString()) > 0)?"red":""%>;">
<span title="<%#Eval("DocumentName")%>"><%#Eval("DocumentName").ToString().Length >22? (Eval("DocumentName").ToString().Substring(0,22)+".."):Eval("DocumentName").ToString() %></span>
</td>
- <td style="text-align: center;">
- <div style="word-wrap: break-word; text-align:justify;">
- <a href='javascript:void(0)' title='<%#Eval("Duiyinghetongbianhao").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("Duiyinghetongbianhao").ToString().Length > 5 ? (Eval("Duiyinghetongbianhao").ToString().Substring(0, 5)) : Eval("Duiyinghetongbianhao").ToString()%></a>
- </div>
- </td>
+
<td>
<%#Eval("OrderExtend.PrintNum")%>
--
Gitblit v1.9.1