From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单，你们给我做两种，做一张打印没得数量的，做一张打印有数量的。送货单格式就是32开，就哎就是A4排一半。你们打了测试，注意，美观。 把那个把它做出来，下一批就用这个自动打。 不是不是打印的要数量都是有数量，要没得数量都没得数量。就是点打印的时候就两个按钮嘛，一个是有数量打印，或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的，比如你那里再打你那个打印关闭的按钮，要把搞成两个打印嘛，就是打印空白送货单和打印送货单。 好点打印空白送货单的，就是现在这样子。点打印送货单，打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询，状态查询需要修改逻辑
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
index b068c46..b13c14e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
@@ -84,10 +84,7 @@
top.Dialog.open({ URL: "/Pages/business/WaixiefukuanweikaipiaoEdit.aspx?id=" + personId, Title: "纭鍙戠エ", Width: 400, Height: 600 });
}
- //鍌敹
- function ViewCuishou(personId) {
- top.Dialog.open({ URL: "/Pages/business/InvoicingCuishou.aspx?id=" + personId, Title: "鍌", Width: 600, Height: 800 });
- }
+
//鏀舵
function ViewShoukuan(personId, shenqingleixing) {
if (shenqingleixing == "璁㈠崟寮�绁�") {
@@ -108,20 +105,33 @@
}
- //鍥炴
+ //寮�绁ㄨ鏄庢煡鐪�
function ViewFukuan(personId) {
- top.Dialog.open({ URL: "/Pages/business/InvoicingHuikuan.aspx?id=" + personId, Title: "浠樻鐧昏", Width: 400, Height: 600 });
+ top.Dialog.open({ URL: "/Pages/business/Waixiefukuanweikaipiaoshuoming.aspx?keyid=" + personId + "&&chakan=chakan", Title: "寮�绁ㄨ鏄庢煡鐪�", Width: 600, Height: 400 });
}
-
+ //寮�绁ㄨ鏄�
+ function ViewCuishou(personId) {
+ top.Dialog.open({ URL: "/Pages/business/Waixiefukuanweikaipiaoshuoming.aspx?keyid=" + personId, Title: "寮�绁ㄨ鏄�", Width: 600, Height: 400 });
+ }
//鏌ョ湅瀹㈡埛璧勬枡
- 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, yongtu) {
- if (yongtu != "鍏朵粬浠樻") {
+ if (yongtu != "鍏朵粬浠樻" && yongtu != "澶栧崗鍔犲伐璐�") {
top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅渚涘簲鍟�", Width: 950, Height: 650 });
}
@@ -181,7 +191,16 @@
<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>
@@ -255,7 +274,9 @@
璁㈠崟
</th>
-
+ <th width="100">
+ 鎿嶄綔
+ </th>
</tr>
@@ -318,11 +339,18 @@
<td>
- <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<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>" %>
</td>
-
+
+
+ <td>
+
+ <a href='javascript:void(0)' menu_member_case_id="case_shuomingchakan" menu_member_case_name="鏌ョ湅璇存槑" title='鏌ョ湅璇存槑' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 鏌ョ湅璇存槑 </a>
+ <a href='javascript:void(0)' menu_member_case_id="case_kaipiaoshuoming" menu_member_case_name="寮�绁ㄨ鏄�" title='寮�绁ㄨ鏄�' class='a_under' onclick='ViewCuishou("<%#Eval("Keyid")%>")'> <%#Eval("Kaipiaoshuoming") %> </a>
+
+ </td>
--
Gitblit v1.9.1