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/MyBaoxiaoList.aspx | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx
index b6f046c..ca01edc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx
@@ -21,6 +21,11 @@
top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoAdd.aspx?keyid=" + keyid, Title: "淇敼鎶ラ攢", Width: 550, Height: 600 });
}
+ //鍐嶆鎻愪氦
+ function onZaiciEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoAdd.aspx?keyid=" + keyid + "&&zaici=zaici", Title: "鍐嶆鎻愪氦", Width: 550, Height: 600 });
+ }
+
//鍒犻櫎
function onDele(keyid) {
top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
@@ -84,14 +89,26 @@
</td>
<td class="ali03">
- 鎵瑰缁撴灉锛�
+ 瀹℃壒缁撴灉锛�
</td>
<td>
<select keepdefaultstyle="true" runat="server" id="selApprovalStatus">
<option value="-1">鍏ㄩ儴</option>
- <option value="0">鏈壒澶�</option>
+ <option value="3">鏈彁浜�</option>
+ <option value="0">鏈鎵�</option>
<option value="1">鎵瑰噯</option>
<option value="2">涓嶆壒鍑�</option>
+ </select>
+ </td>
+
+ <td class="ali03">
+ 浠樻鐘舵�侊細
+ </td>
+ <td>
+ <select keepdefaultstyle="true" runat="server" id="selEvaluationStatus">
+ <option value="-1">鍏ㄩ儴</option>
+ <option value="1">宸蹭粯娆�</option>
+ <option value="2">鏈粯娆�</option>
</select>
</td>
<td>
@@ -132,6 +149,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>
@@ -148,9 +168,12 @@
闄勪欢
</th>
<th width="150" style="text-align: center">
- 鎶ラ攢鐘舵��
+ 瀹℃壒鐘舵��
</th>
<th width="150" style="text-align: center">
+ 浠樻鐘舵��
+ </th>
+ <th width="200" style="text-align: center">
鎿嶄綔
</th>
</tr>
@@ -158,13 +181,16 @@
<ItemTemplate>
<tr>
<td>
- <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("Nengfoushanchu").ToString()=="1" )?"AlreadyReply":""%>' />
+ <input type="checkbox" value='<%#Eval("Keyid")%>' />
</td>
<td style="text-align: center">
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
</td>
<td style="text-align: center">
<%#Eval("PlanStartTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("EvaluationContent")%>
</td>
<td style="text-align: center">
<%#Eval("RewardContent")%>
@@ -184,10 +210,15 @@
<td style="text-align: center">
<%#Eval("ApprovalStatusName")%>
</td>
+ <td style="text-align: center">
+ <%#Eval("EvaluationStatusName")%>
+ </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("Nengfoushenpi").ToString()=="1")?"AlreadyReply":""%>'>淇敼</span>
<span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("Nengfoushanchu").ToString()=="1" )?"AlreadyReply":""%>'>鍒犻櫎</span>
+
+ <span menu_member_case_id="case_ZaiciEdit" menu_member_case_name="鍐嶆鎻愪氦" onclick="onZaiciEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()!="2")?"AlreadyReply":""%>'>鍐嶆鎻愪氦</span>
</td>
</tr>
</ItemTemplate>
@@ -196,7 +227,7 @@
</asp:Repeater>
<tr class="StatisticsMoney">
- <td colspan="5" class="ali03">
+ <td colspan="6" class="ali03">
鍚堣锛�
</td>
<td colspan="5" class="ali01">
--
Gitblit v1.9.1