From 641ddf669ad57fb544e13a6433aa5905551b3bba Mon Sep 17 00:00:00 2001
From: CB2-20200827ONU\Administrator <liaoxujun@qq.com>
Date: 星期三, 22 九月 2021 09:04:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project
---
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
index b970ba8..d5e8504 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingApply.aspx
@@ -17,7 +17,12 @@
function Viewkaipiao(Keyid, SellerOrderId) {
window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=" + Keyid + "&SellerOrderId=" + SellerOrderId , '', '');
}
-
+
+ function ViewRemark(str) {
+ var re = /<br>/g;
+ //str = str.replace(re, "\n");
+ alertMsg(str);
+ }
//鏌ョ湅瀹㈡埛璧勬枡
function View(personId) {
@@ -137,10 +142,8 @@
<tr>
<%-- <th width="25">
</th>--%>
- <th width="25">
- 缂栧彿
- </th>
- <th style="text-align: center;" width="70">
+ <th width="25">缂栧彿</th>
+ <th style="text-align: center;" width="70">
鐢宠寮�绁ㄦ椂闂�
</th>
<th style="text-align: center;" width="70">
@@ -159,8 +162,9 @@
<th width="60">
閲戦
</th>
-
-
+ <th width="50">
+ 澶囨敞
+ </th>
<th width="60">
寮�绁ㄧ姸鎬�
</th>
@@ -168,9 +172,6 @@
瀹㈡埛绛炬敹
</th>
-
-
-
</tr>
</thead>
<tbody>
@@ -203,13 +204,9 @@
</td>
<td style="text-align: center;">
<%#Eval("BusinessManager")%>
-
-
</td>
<td style="text-align: center;">
<%#Eval("SellerOrderId")%>
-
-
</td>
<td style="text-align: center;">
@@ -218,31 +215,24 @@
</div>
</td>
- <td>
-
+ <td>
<a href='javascript:void(0)' title=' <%#Eval("shuliang")%> ' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("SellerOrderId")%>")'> <%#Eval("shuliang")%> </a>
-
</td>
<td>
<%#Eval("jine", "{0:F}")%>
</td>
- <td>
-
+ <td>
+ <a href="javascript:void(0)" title="<%#Eval("remark").ToString().Replace("\r\n", "<br />")%>" class="a_under" onclick="ViewRemark('<%# Eval("remark").ToString().Replace("\r\n", "<br>")%>')"><%#Eval("remark").ToString().Length>0?"鐐瑰嚮鏌ョ湅":"" %> </a>
+
+ </td>
+ <td>
<%#Eval("KaipiaoshenqingName")%>
-
-
-
</td>
<td>
-
-
<a href='javascript:void(0)' title=' <%#Eval("KehuqianshouName")%> ' class='a_under' onclick='<%#Eval("Kehuqianshou").ToString()=="1"?"Viewkehu(\""+Eval("Keyid")+"\",\""+Eval("SellerOrderId")+"\")":"" %> '> <%#Eval("KehuqianshouName")%> </a>
-
-
-
</td>
--
Gitblit v1.9.1