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/js/business/Order.js | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 19aa827..1954352 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -276,6 +276,38 @@
}
}
+
+
+
+/*
+鎵归噺瀹屽伐
+*/
+function ToDeliverWork(operateFn, validateFn) {
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ cks.each(function (ii, vv) {
+ var ckVal = $(this).val();
+ var ckValJson = eval('(' + ckVal + ')');
+ // if (parseInt(ckValJson.orderType) < 1 && ckValJson.orderState == 1) {
+ // isCan = false;
+ // return false;
+ // }
+ if (ckValJson.orderState == 1 || ckValJson.orderState <= 0) {
+ isCan = false;
+ return false;
+ }
+ ids = ids + ',' + $(vv).attr("value_keyid");
+ });
+ if (isCan) {
+ dialog.open({ URL: "/Pages/business/DeliverWork.aspx?ids=" + ids, Title: '瀹屽伐', Height: 600, Width: 680 });
+ }
+ else {
+ alertMsg("鎵�閫夎鍗曟湭鍙楃悊锛屾垨宸插喕缁擄紝鎴栬�呭凡缁堟锛屾垨宸插畬鎴愶紝涓嶈兘鎿嶄綔瀹屽伐锛�");
+ }
+}
+
function SendToServer(sparam) {
CallServer(sparam, function (data, textStatus) {
@@ -404,13 +436,16 @@
}
else {
if (DeliveryOrderId == null || DeliveryOrderId == "" || DeliveryOrderId == "00000000-0000-0000-0000-000000000000") {
- var r = confirm("鏄惁瀹夋帓閫佽揣?");
- if (r == true) {
- OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=1' );
- }
- else {
- OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2' );
- }
+ var url = "/Pages/business/DeliverPlanShifou.aspx?ids=" + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId;
+ top.Dialog.open({ URL: url, Title: "閫佽揣鏃ユ湡", Height: 300, Width: 680 });
+
+ //var r = confirm("鏄惁瀹夋帓閫佽揣?");
+ //if (r == true) {
+ // OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=1' );
+ //}
+ //else {
+ // OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2' );
+ //}
} else {
OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2' );
}
@@ -546,6 +581,7 @@
document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value;
}
+
}
else {
document.getElementById('tbFacing').style.display = '';
@@ -555,6 +591,13 @@
document.getElementById('selVerifyWay321').style.display = '';
document.getElementById('selVerifyWay1234').style.display = '';
document.getElementById('selVerifyWay4321').style.display = '';
+
+ }
+
+ if (sel.value == 37 || sel.value == 38) {
+ $("#Duiyinghetongbianhao").hide();
+ } else {
+ $("#Duiyinghetongbianhao").show();
}
}
@@ -590,6 +633,7 @@
document.getElementById('selBusinessManagers').value = jobj.BusinessManagerId;
document.getElementById('txtContact').value = jobj.BusinessManagers;
document.getElementById('txtPhone').value = jobj.CompanyPhone;
+ document.getElementById('txtPrintPackDeliveryRequir').value = jobj.Note;
var aaaaaaaaaselPrintTypes = document.getElementById('selPrintTypes').value;
if (aaaaaaaaaselPrintTypes == "37") {
document.getElementById('txtDocumentName').value = jobj.CompanyName + "浣滀笟鏈�";
--
Gitblit v1.9.1