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/BaoxiaoReplyList.aspx | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
index 39581ab..01475ec 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
@@ -39,14 +39,15 @@
}
)
if (deleteKeyIds == "") {
- top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ top.Dialog.alert("璇烽�夋嫨瑕佹壒澶嶇殑璁板綍", function () {
});
return;
}
else {
deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
- top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
- window.location = "/Pages/work/BaoxiaoReplyList.aspx?deleteKeyIds=" + deleteKeyIds;
+ top.Dialog.confirm("纭畾瑕佹壒澶嶆墍閫夎褰曞悧锛�", function () {
+ /* window.location = "/Pages/work/BaoxiaoReplyList.aspx?deleteKeyIds=" + deleteKeyIds;*/
+ top.Dialog.open({ URL: "/Pages/work/BaoxiaoPiliangReply.aspx?keyids=" + deleteKeyIds, Title: "鎵瑰鎶ラ攢", Width: 800, Height: 600 });
});
}
}
@@ -90,12 +91,12 @@
</td>
<td class="ali03">
- 鎵瑰缁撴灉锛�
+ 瀹℃壒缁撴灉锛�
</td>
<td>
<select keepdefaultstyle="true" runat="server" id="selApprovalStatus">
<option value="-1">鍏ㄩ儴</option>
- <option value="0">鏈壒澶�</option>
+ <option value="0">鏈鎵�</option>
<option value="1">鎵瑰噯</option>
<option value="2">涓嶆壒鍑�</option>
</select>
@@ -113,8 +114,8 @@
<div class="padding_top5 padding_left10">
<%-- <a href="javascript:;" onclick="addModel()" class="aaddModel" menu_member_case_id="case_addModel" menu_member_case_name="鏂板鎶ラ攢"><span class="icon_add">鏂板鎶ラ攢</span></a>
<div class="box_tool_line">
- </div>
- <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%>
+ </div>--%>
+ <a href="javascript:;" onclick="onAllDelete()" class="<%=(piliangpifu!="1"?"AlreadyReply":"")%>" ><span class="">鎵归噺鎵瑰</span></a>
<div class="clear">
</div>
</div>
@@ -138,6 +139,9 @@
<th width="130" style="text-align: center">
鐢宠鏃ユ湡
</th>
+ <th width="130" style="text-align: center">
+ 鎶ラ攢鍗曞彿
+ </th>
<th width="70" style="text-align: center">
閮ㄩ棬
</th>
@@ -147,7 +151,7 @@
<th width="70" style="text-align: center">
绉戠洰
</th>
- <th style="text-align: center">
+ <th width="250" style="text-align: center;">
鎽樿
</th>
<th width="70" style="text-align: center">
@@ -160,7 +164,7 @@
闄勪欢
</th>
<th width="150" style="text-align: center">
- 鎶ラ攢鐘舵��
+ 瀹℃壒鐘舵��
</th>
<th width="250" style="text-align: center">
鎿嶄綔
@@ -179,6 +183,9 @@
<%#Eval("PlanStartTime", "{0:yyyy-MM-dd}")%>
</td>
<td style="text-align: center">
+ <%#Eval("EvaluationContent")%>
+ </td>
+ <td style="text-align: center">
<%#Eval("DepartName")%>
</td>
<td style="text-align: center">
@@ -188,7 +195,7 @@
<%#Eval("RewardContent")%>
</td>
<td style="text-align: center">
- <%#Eval("PlanContent")%>
+ <%#(Eval("PlanContent")!=null && Eval("PlanContent").ToString().Length>50)?Eval("PlanContent").ToString().Substring(0,50):Eval("PlanContent") %>
</td>
<td style="text-align: center">
<%#Eval("PlanMoney", "{0:F2}")%>
@@ -214,13 +221,21 @@
</asp:Repeater>
<tr class="StatisticsMoney">
- <td colspan="7" class="ali03">
- 鍚堣锛�
+ <td colspan="8" class="ali03">
+ 褰撳墠椤电粺璁★細
</td>
<td colspan="5" class="ali01">
<span id="NowMoney" runat="server" ></span>
</td>
</tr>
+ <tr class="StatisticsMoney">
+ <td colspan="8" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td colspan="5" class="ali01">
+ <span id="AllMoney" runat="server"></span>
+ </td>
+ </tr>
</table>
<div id="page">
<uc:UCPager ID="UCPager1" runat="server" />
--
Gitblit v1.9.1