From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/order/order.js | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index abe7000..90c1539 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -197,6 +197,7 @@
{field: 'payment$', title: '璐х墿鐗瑰緛', width: 160},
// {field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
+ {field: 'batch', title: '鎵规'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
// {field: 'unit', title: '鍗曚綅'},
@@ -271,6 +272,11 @@
layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
return false;
}
+
+ if (nList[xi].batch === ""){
+ layer.msg('鎵规涓嶈兘涓虹┖', {icon: 2});
+ return false;
+ }
}
for (let xi = 0; xi < nList.length; xi++) {
if (nList[xi].owner <= 0){
@@ -321,6 +327,7 @@
{field: 'specs', title: '瑙勬牸'},
{field: 'weight', title: '閲嶉噺', edit: true},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'batch', title: '鎵规(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'owner', title: '璐т富缂栧彿', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'payment', title: '璐х墿鐘舵��', style: 'color: blue;font-weight: bold', templet: '#payment'},
// {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
--
Gitblit v1.9.1