From 32ad806c4d6bc5aa7aac1948e6c686696a4bbeb0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 22 八月 2025 13:35:45 +0800
Subject: [PATCH] 20250822 已经安排生产的订单不允许撤单
---
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 5 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 683e688..e6714f9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js?v=8" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=11" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index c6a3a2c..964a53a 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -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) {
--
Gitblit v1.9.1