From 7bcbbbd0459f00ebc3aa7d4f249cb9231a6b5d40 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 31 十月 2025 12:25:17 +0800
Subject: [PATCH] 这个销售绩效查询这个列表中的，你把这个到期类型和到期时间合并，现在到期类型就不要了， 到期时间里面，日期的就显示。时间，他是和金额执行完毕的，就在到期时间里头， 就填上金额执行完毕那个合同金额也是就有金额的显示。金额没得金额的，就先据实结算。好，合同类型这个就不要了。

---
 CY_ECommercePlatform/CY.WebForm/js/business/Order.js |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 13e4417..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 + '\')"/>&nbsp;&nbsp;<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);
             });
@@ -335,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) {
@@ -1018,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