From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 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..2cf2dc5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -89,9 +89,20 @@
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 if (yongtu == "閲囪喘浠樻") {
+ top.Dialog.open({ URL: "/Pages/financial/CaigouPayEdit.aspx?id=" + personId, Title: "閲囪喘浠樻", Width: 600, Height: 800 });
+ }
+ else if (yongtu == "鍏朵粬浠樻") {
+ top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.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 +124,26 @@
//鏌ョ湅瀹㈡埛璧勬枡
- 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 });
+ }
+
+ } else if (yongtu == "閲囪喘浠樻"){
+ top.Dialog.open({ URL: "/Pages/procurement/ProcurementListHTML.aspx?Keyid=" + 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 +198,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 +322,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 +362,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 +373,7 @@
<td>
- <a href='javascript:void(0)' title='浠樻' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>")'> 浠樻 </a>
+ <a href='javascript:void(0)' menu_member_case_id="case_fukuan" menu_member_case_name="浠樻" title='浠樻' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Fukuanyongtu")%>","<%#Eval("SupplierId")%>")'> 浠樻 </a>
</td>
--
Gitblit v1.9.1