From 82662b0e9ab839c72ec3734f18b691d5f037c0a3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 12 二月 2025 08:43:36 +0800
Subject: [PATCH] 外协订单不要松活信息 新增采购信息改为新增采购订单 角色查询增加查询条件,有效无效
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 12bc118..75d16de 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -27,6 +27,13 @@
top.Dialog.open({ URL: url, Title: "璁㈠崟鍥炶", Height: 400 });
}
+ function Liuyang(orderId) {
+ var url = "/Pages/business/OrderUpLoadLiuyang.aspx?Keyid=" + orderId;
+ top.Dialog.open({ URL: url, Title: "鐣欐牱", Height: 600, Width: 800 });
+ }
+
+
+
function CompledWork(orderId) {
var url = "/Pages/business/CompledWork.aspx?ids=" + orderId;
top.Dialog.open({ URL: url, Title: "瀹屽伐", Height: 300, Width: 680 });
@@ -380,12 +387,13 @@
<th width="55">
璁㈠崟绫诲埆
</th>
+ <th style="width:50px;">
+ 鍚堝悓搴忓彿
+ </th>
<th style="text-align: center;">
鍗颁欢鍚嶇О
</th>
- <th style="width:100px;">
- 鍚堝悓搴忓彿
- </th>
+
<th width="36">
鏁伴噺
</th>
@@ -440,6 +448,9 @@
<th width="26" menu_member_case_id="case_DeferPay" menu_member_case_name="寤舵湡">
寤舵湡
</th>
+ <th width="26" menu_member_case_id="case_Liuyang" menu_member_case_name="鐣欐牱">
+ 鐣欐牱
+ </th>
<th width="26" menu_member_case_id="case_OpenVisit" menu_member_case_name="鍥炶">
鍥炶
</th>
@@ -488,7 +499,7 @@
</td>
<td style="text-align: center;">
<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>
+ <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 22 ? (Eval("BuyerName").ToString().Substring(0, 22) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
<td>
@@ -497,15 +508,16 @@
<td style="text-align: center;">
<%#Eval("PrintType.PrintName")%>
</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 >15? (Eval("DocumentName").ToString().Substring(0,15)+".."):Eval("DocumentName").ToString() %></span>
- </td>
-
- <td style="text-align: center;">
+ <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 > 20 ? (Eval("Duiyinghetongbianhao").ToString().Substring(0, 20) + "..") : Eval("Duiyinghetongbianhao").ToString()%></a>
+ <%#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>
<%#Eval("OrderExtend.PrintNum")%>
@@ -573,6 +585,10 @@
<span style='display: ' class='hand_no' <%#true.Equals(Eval("IsDeferPay"))?"title='宸插欢鏈�'":"title=''"%>>
<%#true.Equals(Eval("IsDeferPay")) ? "鈭�" : ""%></span>
</td>
+ <td menu_member_case_id="case_Liuyang" menu_member_case_name="鐣欐牱">
+ <span class="hand_yes" <%#1.Equals(Eval("LiuyangStatus"))?"title='宸茬暀鏍�'":"title=''"%> onclick="Liuyang(<%#Eval("Keyid")%>);" >
+ <%#1.Equals(Eval("LiuyangStatus")) ? "鈭�" : "鐣欐牱"%></span>
+ </td>
<td class="td_hide" menu_member_case_id="case_OpenVisit" menu_member_case_name="鍥炶">
<%-- <span class="hand_yes" title="鍥炶" onclick="dialog.open({URL: '/Pages/business/BackVisitNoteEdit.aspx?id=<%#Eval("Keyid") %>&orderId=<%#Eval("SellerOrderId") %>&buyerName=<%#Eval("BuyerName") %>' , Title: '璁㈠崟鍥炶',Height:400});">鍥炶</span>--%>
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍥炶")?"hand_yes":"hand_no"%>" <%#true.Equals(Eval("IsVisit"))?"title='宸插洖璁�'":"title='鍥炶'"%> style='display: ' onclick='OpenVisit(<%#Eval("Keyid")%>,"<%#Eval("SellerOrderId")%>","<%#Eval("BuyerName")%>")'>
--
Gitblit v1.9.1