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/OrderListBatchOperation.aspx | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
index d91c3a1..b3b2edd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -5,8 +5,14 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=5" type="text/javascript"></script>
<script type="text/javascript">
+
+ function kaipiaoConfirm(orderId) {
+ var url = "/Pages/business/kaipiaoConfirm.aspx?id=" + orderId;
+ top.Dialog.open({ URL: url, Title: "寮�绁ㄧ敵璇风‘璁�", Height: 300, Width: 580 });
+ }
+
//璁㈠崟璇勪环
function evaluationModel(orderid) {
dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
@@ -314,7 +320,9 @@
<a href="javascript:;" menu_member_case_id="case_ToBatchPayList" menu_member_case_name="鎵归噺鏀舵" onclick="ToBatchPayList();"><span class="icon_edit">鎵归噺鏀舵</span></a>
<div class="box_tool_line">
</div>
-
+ <a href="javascript:;" menu_member_case_id="case_ToBatchPrintAwbOrder" menu_member_case_name="鎵撳嵃閫佽揣鍗�" onclick="ToPrintAwbOrder()"><span class="icon_edit">鎵撳嵃閫佽揣鍗�</span></a>
+ <div class="clear">
+ </div>
</div>
</div>
</div>
@@ -416,13 +424,16 @@
orderType:<%#Eval("OrderTypeId")%>,
orderState:<%#Eval("OrderState")%>,
ordershowId:'<%#Eval("SellerOrderId")%>',
- pdName:'<%#Eval("DocumentName")%>',
+ pdName:'<%# (Eval("DocumentName") ?? "").ToString().Replace("\"", "") %>',
printName:'<%#Eval("PrintType.PrintName")%>',
printNum:<%#Eval("OrderExtend.PrintNum")%>,
deliverPrice:<%#Eval("SumPrice")%>,
sumPrice:<%#Eval("SumPrice")%>,
+ UnitPrice:'<%#Eval("UnitPrice") %>',
Kaipiaoshenqing:'<%#Eval("Kaipiaoshenqing")%>',
- PayState:<%#Eval("PayState")%>
+ PayState:<%#Eval("PayState")%>,
+ yssldw: '<%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>',
+ PrintSizeName:'<%#Eval("PrintSizeName")%>'
}" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
<td class="ItemIndex">
@@ -549,7 +560,14 @@
var ids = '';
var cks = $("input[name='ckId']:checked");
- if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ if (cks.length == 0)
+ {
+ alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+ return;
+ }
+ else
+ {
+ }
var isCan = true;
var Kaipiaoshenqing = 2;
@@ -598,16 +616,17 @@
return;
}
- var msg = ('纭寮�绁ㄧ敵璇峰悧?');
- top.Dialog.confirm(msg, function () {
- DoAcceptAll3(ids);
- });
+ kaipiaoConfirm(ids);
+ //var msg = ('纭寮�绁ㄧ敵璇峰悧?');
+ //top.Dialog.confirm(msg, function () {
+ // DoAcceptAll3(ids);
+ //});
}
}
/*
-鎵归噺澶勭悊寮�绁ㄧ敵璇�
-*/
+ 鎵归噺澶勭悊寮�绁ㄧ敵璇�
+ */
var DoAcceptAll3 = function (orderIds) {
window.submitUrl = "/Pages/business/OrderListBatchOperation.aspx"
CallServer({ Target: "deleteOrderAll3", ids: orderIds }, function (data, textStatus) {
--
Gitblit v1.9.1