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/DeliverWorkBookPrintDetail.aspx | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 75 insertions(+), 16 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
index 153387a..f63dcef 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPrintDetail.aspx
@@ -23,7 +23,7 @@
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
<embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
</object>
- <div id='div_tool' printparams='0,2100,2470,"A4"'>
+ <div id='div_tool' printparams='0,2100,2970,"A4"'>
</div>
<asp:Repeater runat="server" ID='rptOrder'>
@@ -40,15 +40,30 @@
#div_tool { text-align: center; }
</style>
<table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
<tr>
- <td colspan='9'>
+ <td colspan='8'>
<div class='dtitle'>
<%=orderName %></div>
</td>
</tr>
<tr>
- <td colspan='9'>
+ <td colspan='8'>
</td>
</tr>
@@ -57,7 +72,7 @@
瀛︽牎锛� <%#Eval("shipAddress")%>
</td>
- <td class='left' colspan="5">
+ <td class='left' colspan="4">
鍦板潃锛� <%#Eval("shouhuoAddress")%>
</td>
@@ -68,14 +83,14 @@
鑱旂郴浜猴細 <%#Eval("shipName")%>
</td>
- <td class='left'colspan="5">
+ <td class='left'colspan="4">
鑱旂郴鐢佃瘽锛� <%#Eval("shipMobile")%>
</td>
</tr>
<tr>
- <td colspan="9">
+ <td colspan="8">
<%=biaotou %>
</td>
@@ -84,32 +99,76 @@
<tr>
- <td colspan='9'>
+ <td colspan='8'>
</td>
</tr>
<tr>
<td class='left'colspan="3">
- 鏀惰揣鍗曚綅锛氾紙鐩栫珷锛�
+ 鏀惰揣浜猴細 鑱旂郴鐢佃瘽锛�
</td>
- <td class='left' colspan="3">
- 鏀惰揣浜猴細
+ <td class='left' colspan="4">
+
</td>
- <td class='left'colspan="3">
- 鑱旂郴鐢佃瘽锛�
+ <td class='left'colspan="1">
+ 閫佽揣浜猴細
</td>
</tr>
<tr>
- <td class='left'colspan="6">
- 閫佽揣鏃堕棿锛�
+ <td class='left'colspan="3">
+ 鏀惰揣鍗曚綅锛氾紙鐩栫珷锛�
+ </td>
+ <td class='left'colspan="2">
+
</td>
<td class='left' colspan="3">
- 閫佽揣浜猴細
+ 閫佽揣鏃堕棿锛�
</td>
</tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+ <tr>
+ <td class='left'colspan="8">
+
+ </td>
+ </tr>
+
</table>
- <%#(Container.ItemIndex != (countss-1))?"<div class=\"page-break\"></div>":"" %>
+ <%#(Container.ItemIndex != (countss-1)&& (Container.ItemIndex+1)%2==0)?"<div class=\"page-break\"></div>":"" %>
</ItemTemplate>
</asp:Repeater>
--
Gitblit v1.9.1