From 099c199d96f2d92dfcda50e763528a3d161fd5cf Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 15 九月 2025 08:45:34 +0800
Subject: [PATCH] 设计人员查询的时候，也过滤设计提成里边的设计人员 增加结算状态。 批量结算按钮完成
---
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 381 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 372 insertions(+), 9 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index a89652b..54f4803 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -115,7 +115,7 @@
// html += '</p>';
// html += '<br/><div style=\'text-align:right;\' ><input type="button" class="button" value="鍙� 鐞�" onclick="DoAcceptAll(\'' + ids + '\')"/> <input type="button" class="button" value="鍙� 娑�" onclick="parent.dialog.close()"/></span></div>';
// dialog.open({ InnerHtml: html, Title: '鎵归噺纭鍙楃悊', Width: 400, Height: 100, Modal: false });
- var msg = !needPrice ? ('纭鎵归噺鍙楃悊鎵�閫�' + orderShowIds + '璁㈠崟?') : ('鍙楃悊鎵�閫夌嚎涓婅鍗曢渶瑕佹敮浠橈骏' + Float2(price) + '鏈嶅姟璐�,鏄惁纭鎵归噺鍙楃悊' + orderShowIds + '璁㈠崟锛�');
+ var msg = !needPrice ? ('纭鎵归噺鍙楃悊鎵�閫夎鍗�?') : ('鍙楃悊鎵�閫夌嚎涓婅鍗曢渶瑕佹敮浠橈骏' + Float2(price) + '鏈嶅姟璐�,鏄惁纭鎵归噺鍙楃悊璁㈠崟锛�');
top.Dialog.confirm(msg, function () {
DoAcceptAll(ids);
});
@@ -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) {
@@ -303,11 +335,16 @@
//姝ｆ暟姝ｅ垯琛ㄨ揪寮�
var reg1 = /^\d+(?=\.{0,1}\d+$|$)/;
+ if (sparam.dtypeId == 4 && sparam.orderState != '1' && sparam.orderState != '2') {
+ alertMsg('宸茬粡瀹夋帓鐢熶骇鐨勮鍗曚笉鑳芥挙閿�锛�'); txtTargetValue.focus(); return;
+ }
+
//鏈彈鐞�
if (sparam.orderState == '1') {
sparam.dtypeId = 4;
sparam.title = "鎾ゅ崟绠＄悊";
}
+
parent.parent.parent.parent.parent.parent['ToSubmit'] =
function (domobj) {
@@ -404,13 +441,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,7 +586,7 @@
document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value;
}
- $("#Duiyinghetongbianhao").hide();
+
}
else {
document.getElementById('tbFacing').style.display = '';
@@ -556,8 +596,326 @@
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();
}
+
+
+
+ if (sel.value == 29) {
+ $("#BlackAndWhite29").show();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ if (sel.value == 29) {
+ $("#BlackAndWhite29").show();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 6) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").show();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 15) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").show();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 14) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").show();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 27) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").show();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 21) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").show();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 7) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").show();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 38) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").show();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 20) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").show();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 16) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").show();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 22) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").show();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 39) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").show();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 23) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").show();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 25) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").show();
+ $("#Packet26").hide();
+ $("#Qita1111").hide();
+ }
+ else if (sel.value == 26) {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").show();
+ $("#Qita1111").hide();
+ }
+ else {
+ $("#BlackAndWhite29").hide();
+ $("#Book6").hide();
+ $("#PictureAlbumNew15").hide();
+ $("#DMInquiry14").hide();
+ $("#ReceiptDocument27").hide();
+ $("#Envelop21").hide();
+ $("#NewsPaper7").hide();
+ $("#Shijuan38").hide();
+ $("#Adhesive20").hide();
+ $("#Reticule16").hide();
+ $("#Note22").hide();
+ $("#GongWenZhi39").hide();
+ $("#Calendary23").hide();
+ $("#DeskCalendar25").hide();
+ $("#Packet26").hide();
+ $("#Qita1111").show();
+ }
+
+
+
}
@@ -592,6 +950,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 + "浣滀笟鏈�";
@@ -664,5 +1023,9 @@
if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
return false;
}
+
+ if (document.getElementById('selPrintTypes').value == "37") {
+ WorkBookCountNum();
+ }
return ValidateForm();
}
\ No newline at end of file
--
Gitblit v1.9.1