From 39e97266be7d33aa230ede2647e2f030c8e7d0ab Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期六, 13 九月 2025 10:48:18 +0800
Subject: [PATCH] 根据群里问题已经修改的部分

---
 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
index 03c91e1..cd18ea0 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_MaterialHandingEdit.html
@@ -524,8 +524,10 @@
         function set_ClearBill() {
             $("#HMaker").val(sessionStorage["HUserName"]);
             $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
-
             //$("#HSupID").val(sessionStorage["HUserName"]);
+            $("#HUseFlag").val('true');
+            $("#checkboxHUseFlag").prop("checked", true);
+            form.render('checkbox'); 
             FetchSupInfo();
             //$("#HCheckEmp").val(sessionStorage["HUserName"]);
             //$("#HCheckTime").val(Format(new Date(), "yyyy-MM-dd"));
@@ -558,12 +560,19 @@
         }
         //闈炵┖楠岃瘉
         function AllowLoadData(data) {
-            if ($("#HInBoxPackQty").val() < $("#HMinPackQty").val()) {
+            var checkValue = parseFloat($("#HInBoxPackQty").val()); 
+            var checkValue_1 = parseFloat($("#HMinPackQty").val()); 
+
+            if (isNaN(checkValue) || isNaN(checkValue_1)) {
+                layer.alert("鍖呰鏁板繀椤讳负鏁板瓧");
+                return false;
+            }
+
+            if (checkValue < checkValue_1) {
                 layer.alert("鏍囧噯鍖呰鏁颁笉鍏佽灏忎簬鏈�灏忓寘瑁呮暟");
                 return false;
             }
-            else
-                return true;
+            return true;
         }
 
         //淇濆瓨HMaker
@@ -752,6 +761,7 @@
         // 鐗╂枡鏍¢獙
         function get_MaterialCheck(param = 0) {
             var HMaterNumber = $("#HMaterNumber").val();
+            var HMaterID = $("#HMaterID").val();
             var user = sessionStorage["HUserName"];
             var OrganizationID = sessionStorage["OrganizationID"];
 
@@ -785,7 +795,7 @@
                         return;
                     }
                     if (responseData === 1) {
-                        layer.confirm('璇ョ墿鏂欏凡缁忚鏈緵搴斿晢鑾峰彇锛屾槸鍚︾户缁紵', {
+                        layer.confirm('璇ョ墿鏂欏凡缁忚鏈緵搴斿晢鑾峰彇锛屾槸鍚︾‘璁ゅ惎鐢ㄥ苟灏嗗巻鍙茬殑鍚敤缁欏彇娑堬紵', {
                             icon: 3,
                             title: '鎻愮ず'
                         }, function (index) {
@@ -794,7 +804,7 @@
                         });
                     } else if (responseData.code === "1") {
 
-                        $("#HMaterName").val(responseData.data[0]["HName"]);
+                        $("#HMaterName").val(responseData.data[0]["HSubjoin"] == null ? responseData.data[0]["HName"] : responseData.data[0]["HSubjoin"]);
                         $("#HModel").val(responseData.data[0]["HModel"]);
                         form.render('select');
                     } else {

--
Gitblit v1.9.1