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/work/MyRequestList.aspx | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
index bc57ce2..4f7450e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -13,12 +13,12 @@
//娣诲姞
function addModel() {
- top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx", Title: "鏂板璇风ず", Width: 550, Height: 260 });
+ top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx", Title: "鏂板璇风ず", Width: 550, Height: 360 });
}
//淇敼
function onEdit(keyid) {
- top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx?keyid=" + keyid, Title: "淇敼璇风ず", Width: 550, Height: 260 });
+ top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx?keyid=" + keyid, Title: "淇敼璇风ず", Width: 550, Height: 360 });
}
//鍒犻櫎
@@ -85,7 +85,11 @@
<option value="11">瀹㈡埛鑱旇皧</option>
<option value="13">寮�绁ㄧ敵璇�</option>
<option value="14">澶栧崗浠樻鐢宠</option>
- <option value="15">浠樻鐢宠</option>
+ <option value="15">浠樻鐢宠</option>
+ <option value="16">閲囪喘浠樻鐢宠</option>
+ <option value="18">璁惧缁翠慨鐢宠</option>
+ <option value="19">缁翠慨浠樻鐢宠</option>
+ <option value="20">缃氭鐢宠瘔</option>
<option value="12">鍏朵粬</option>
</select>
</td>
@@ -149,16 +153,19 @@
<th width="70" style="text-align: center">
璇风ず绫诲埆
</th>
- <th style="text-align: center">
- 璇风ず涓婚
+ <th style="text-align: center">
+ 璇风ず鍐呭
</th>
- <th style="text-align: center">
+ <th width="70" style="text-align: center">
+ 鐢宠璐圭敤(鍏�)
+ </th>
+ <th width="70" style="text-align: center">
鏄惁鎵瑰
</th>
- <th style="text-align: center">
+ <th width="70" style="text-align: center">
鎵瑰缁撴灉
</th>
- <th style="text-align: center">
+ <th width="70" style="text-align: center">
鎿嶄綔
</th>
</tr>
@@ -166,7 +173,7 @@
<ItemTemplate>
<tr>
<td>
- <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14")?"AlreadyReply":""%>' />
+ <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14"|| Eval("PlanDataType").ToString()=="18"|| Eval("PlanDataType").ToString()=="19"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>' />
</td>
<td style="text-align: center">
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
@@ -178,7 +185,10 @@
<%#Eval("PlanDataTypeName")%>
</td>
<td style="text-align: center">
- <%#Eval("PlanTitle")%>
+ <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 50))) %>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanMoney", "{0:F2}")%>
</td>
<td style="text-align: center">
<%#Eval("PlanStatus").ToString()=="1"?"鏈壒澶�":"宸叉壒澶�"%>
@@ -188,8 +198,8 @@
</td>
<td class="Operate " style="text-align: center">
<span menu_member_case_id="case_PlanView" menu_member_case_name="鏌ョ湅" onclick="onView('<%#Eval("Keyid")%>')">鏌ョ湅</span>
- <span menu_member_case_id="case_PlanEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14" )?"AlreadyReply":""%>'>淇敼</span>
- <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14")?"AlreadyReply":""%>'>鍒犻櫎</span>
+ <span menu_member_case_id="case_PlanEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14" || Eval("PlanDataType").ToString()=="18"|| Eval("PlanDataType").ToString()=="19"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>'>淇敼</span>
+ <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14" || Eval("PlanDataType").ToString()=="18"|| Eval("PlanDataType").ToString()=="19"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>'>鍒犻櫎</span>
</td>
</tr>
</ItemTemplate>
--
Gitblit v1.9.1