From a0d38325a97957b37dd755bf732b63f6f7e2a5ff Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 24 十二月 2024 08:40:48 +0800
Subject: [PATCH] 修改外协付款
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
index 708958f..67ef283 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -89,9 +89,13 @@
top.Dialog.open({ URL: "/Pages/business/InvoicingCuishou.aspx?id=" + personId, Title: "鍌", Width: 600, Height: 800 });
}
//澶栧崗浠樻
- function ViewShoukuan(personId) {
-
- top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.aspx?id=" + personId, Title: "澶栧崗浠樻", Width: 600, Height: 800 });
+ function ViewShoukuan(personId, yongtu, supplierId) {
+ if (yongtu == "澶栧崗鍔犲伐璐�" && supplierId.length > 10) {
+ top.Dialog.open({ URL: "/Pages/financial/NewWaixieExpenses.aspx?id=" + personId, Title: "澶栧崗浠樻", Width: 600, Height: 800 });
+ } else {
+ top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.aspx?id=" + personId, Title: "澶栧崗浠樻", Width: 600, Height: 800 });
+ }
+
}
@@ -113,13 +117,24 @@
//鏌ョ湅瀹㈡埛璧勬枡
- function Viewkaipiao(Keyid, SellerOrderId) {
- //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
- top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ function Viewkaipiao(Keyid, SellerOrderId, yongtu, supplierId) {
+
+ if (yongtu == "澶栧崗鍔犲伐璐�") {
+ if (supplierId.length > 10) {
+ top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ } else {
+ top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ }
+
+ }
+
}
//鏌ョ湅
- function onView(keyid) {
- top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅渚涘簲鍟�", Width: 950, Height: 650 });
+ function onView(keyid, yongtu) {
+ if (yongtu != "鍏朵粬浠樻" && yongtu != "澶栧崗鍔犲伐璐�") {
+ top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅渚涘簲鍟�", Width: 950, Height: 650 });
+ }
+
}
@@ -174,6 +189,16 @@
</td>
<td>
<input id='txtCreatorName' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
+ 浠樻鐢ㄩ�旓細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selFukuanyongtu' runat="server" >
+ <option value="">鍏ㄩ儴</option>
+ <option value="澶栧崗鍔犲伐璐�">澶栧崗鍔犲伐璐�</option>
+ <option value="鍏朵粬浠樻">鍏朵粬浠樻</option>
+ </select>
</td>
<td class="ali03">
鏄惁浠樻锛�
@@ -288,7 +313,7 @@
</td>
<td style="text-align: center;">
- <a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("SupplierName").ToString()%> 璧勬枡' class='a_under' onclick='onView("<%#Eval("SupplierId")%>")'><%#Eval("SupplierName") %></a>
+ <a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("SupplierName").ToString()%> 璧勬枡' class='a_under' onclick='onView("<%#Eval("SupplierId")%>","<%#Eval("Fukuanyongtu")%>")'><%#Eval("SupplierName") %></a>
@@ -328,7 +353,7 @@
<td>
- <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %> <%--<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>--%>
+ <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\",\""+Eval("SupplierId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %> <%--<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>--%>
</td>
@@ -339,7 +364,7 @@
<td>
- <a href='javascript:void(0)' title='浠樻' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>")'> 浠樻 </a>
+ <a href='javascript:void(0)' title='浠樻' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Fukuanyongtu")%>","<%#Eval("SupplierId")%>")'> 浠樻 </a>
</td>
--
Gitblit v1.9.1