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/PrintAwbOrder.aspx | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
index 9e6164f..ce627c1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
@@ -37,7 +37,7 @@
var fillOrder = function (orderObj) {
var i = -1;
var newtr = document.createElement('tr');
- var fillTarget = ['ordershowId', 'pdName', 'printName', 'printNum', 'UnitPrice', 'sumPrice'];
+ var fillTarget = ['ordershowId', 'pdName', 'PrintSizeName', 'yssldw', 'UnitPrice', 'sumPrice'];
while (++i < fillTarget.length) {
setOrderAttr(newtr, orderObj, fillTarget[i]);
}
@@ -74,11 +74,11 @@
otherInfo.NowTime = new Date().ToString('yyyy骞碝M鏈坉d鏃�');
SetJsonToDom(otherInfo, 'spn', 'innerHTML');
}
- $(function () {
+ //$(function () {
- LoadOrders();
- loadOtherInfo();
- });
+ // LoadOrders();
+ // loadOtherInfo();
+ //});
// window.printBeginCallBack = function () {
// printStyle = "<link href=\"../../Styles/ParticularWQJ.css\" rel=\"stylesheet\" type=\"text/css\" /><style>" + $("#style1").html() + "</style>";
@@ -104,18 +104,18 @@
<tbody>
<tr>
<td>
- 鏀惰揣鍗曚綅锛�<span id='spnBuyerName'>#</span>
+ 鏀惰揣鍗曚綅锛�<span id='spnBuyerName' runat="server" >#</span>
</td>
<td style='width: 150px;'>
- 　 鐢佃瘽锛�<span id='spnBuyerPhone'>#</span>
+ 　 鐢佃瘽锛�<span id='spnBuyerPhone' runat="server" >#</span>
</td>
</tr>
<tr>
<td>
- 鏀惰揣鍦板潃锛�<span id='spnBuyerAddress'>#</span>
+ 鏀惰揣鍦板潃锛�<span id='spnBuyerAddress' runat="server" >#</span>
</td>
<td>
- 閫佽揣鏃堕棿锛�<span id='spnNowTime'>#</span>
+ 閫佽揣鏃堕棿锛�<span id='spnNowTime' runat="server" >#</span>
</td>
</tr>
<tr>
@@ -145,7 +145,7 @@
鍗板埛鍝佸悕绉�
</th>
<th scope="col">
- 涓氬姟绫诲埆
+ 瑙勬牸
</th>
<th scope="col" style='width: 100px;'>
鏁伴噺
@@ -159,12 +159,36 @@
</tr>
</thead>
<tbody id='tb_orders'>
+ <asp:repeater id="rptData" runat="server">
+ <itemtemplate>
+ <tr>
+ <td>
+ <%#Eval("SellerOrderId")%>
+ </td>
+ <td>
+ <%#Eval("DocumentName")%>
+ </td>
+ <td>
+ <%#Eval("PrintSizeName")%>
+ </td>
+ <td>
+ <%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>
+ </td>
+ <td>
+ <%#Eval("UnitPrice", "{0:F}")%>
+ </td>
+ <td>
+ <%#Eval("sumPrice","{0:F}")%>
+ </td>
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
</tbody>
</table>
<table border="0" cellpadding="0" cellspacing="0" class="tbJE">
<tr>
<td align="right">
- 閲戦鍚堣(澶у啓)锛�<b><span id='spnSumPriceUpper'>#</span> </b>　　閲戦锛�<span id='spnSumPrice'>#</span>
+ 閲戦鍚堣(澶у啓)锛�<b><span id='spnSumPriceUpper' runat="server" >#</span> </b>　　閲戦锛�<span id='spnSumPrice' runat="server" >#</span>
</td>
</tr>
</table>
@@ -210,6 +234,7 @@
鏀惰揣浜�(绛惧瓧)锛�
</td>
<td>
+ 楠屾敹浜�(绛惧瓧)锛�
</td>
</tr>
</tbody>
--
Gitblit v1.9.1