From 1bfc8f9c7baad9be7fdb92742cf796f9fdb50df3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 22 九月 2021 09:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 169db99..72a858e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -214,6 +214,12 @@
</select>
</td>
<td class="ali03">
+ 鍗颁欢鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtSearchyjname' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
浠樻鏂瑰紡锛�
</td>
<td>
@@ -241,9 +247,20 @@
<asp:listitem value="0">涓瘎</asp:listitem>
<asp:listitem value="-1">宸瘎</asp:listitem>
</asp:dropdownlist>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
</td>
- <td>
+ <td>
</td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td> </td>
<td>
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
<input type="hidden" id='txtCommission' runat="server" />
@@ -304,6 +321,9 @@
</th>
<th width="36">
鏁伴噺
+ </th>
+ <th width="36">
+ 鍗曚綅
</th>
<th style="text-align: center;" width="50">
璁㈠崟鐘舵��
@@ -389,8 +409,8 @@
<%#Eval("SellerOrderId")%></a>--%>
</td>
<td style="text-align: center;">
- <div style="width: 140px; word-wrap: break-word; text-align:justify;">
- <a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("BuyerName").ToString()%> 璧勬枡' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 10 ? (Eval("BuyerName").ToString().Substring(0, 10) + "..") : Eval("BuyerName").ToString()%></a>
+ <div style="word-wrap: break-word; text-align:justify;">
+ <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 15 ? (Eval("BuyerName").ToString().Substring(0, 15) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
<td>
@@ -406,6 +426,9 @@
<%#Eval("OrderExtend.PrintNum")%>
</td>
<td>
+ <%#Eval("yssldw")%>
+ </td>
+ <td>
<%#Eval("OrderStateObj.Name")%>
</td>
<td>
--
Gitblit v1.9.1