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 | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 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 cdd6be6..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
@@ -77,7 +77,7 @@
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;">
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;">
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheck" id="btnCheck" style="width: 40px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheck" id="btnCheck" style="width: 70px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;">鏍￠獙</i>
</button>
</div>
@@ -85,7 +85,7 @@
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <!--<input type="hidden" name="HSupID" id="HSupID" value="0">-->
+ <input type="hidden" name="HUserID" id="HUserID" value="0">
</div>
</div>
@@ -124,7 +124,8 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HSupID" id="HSupID" readonly>
+ <input type="text" class="layui-input" name="HSupNumber" id="HSupNumber" readonly>
+ <input type="text" class="layui-input" name="HSupID" id="HSupID" style="display:none;" >
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -523,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"));
@@ -557,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
@@ -707,7 +717,8 @@
$("#HMinPackQty").val(data[0]["鏈�灏忓寘瑁呮暟"]);
$("#HInBoxPackQty").val(data[0]["鏍囧噯鍖呰鏁�"]);
$("#HOutBoxPackQty").val(data[0]["HOutBoxPackQty"]);
- $("#HSupID").val(data[0]["渚涘簲鍟嗕唬鐮�"]);
+ $("#HSupID").val(data[0]["HSupID"]);
+ $("#HSupNumber").val(data[0]["渚涘簲鍟嗕唬鐮�"]);
$("#HSupName").val(data[0]["渚涘簲鍟嗗悕绉�"]);
$("#HMaker").val(data[0]["鍒涘缓浜�"]);
$("#HCheckEmp").val(data[0]["瀹℃牳浜�"]);
@@ -750,6 +761,7 @@
// 鐗╂枡鏍￠獙
function get_MaterialCheck(param = 0) {
var HMaterNumber = $("#HMaterNumber").val();
+ var HMaterID = $("#HMaterID").val();
var user = sessionStorage["HUserName"];
var OrganizationID = sessionStorage["OrganizationID"];
@@ -774,10 +786,16 @@
}
}
}
-
+ if (responseData === 2) {
+ layer.msg("鐗╂枡缁勭粐鍜岀櫥褰曠粍缁囦笉涓�鑷达紝璇锋鏌ワ紒");
+ $("#HMaterName").val("");
+ $("#HMaterNumber").val("");
+ $("#HModel").val("");
+ $("#HUSEORGID").val(OrganizationID);
+ return;
+ }
if (responseData === 1) {
- // 寮瑰嚭璇㈤棶妗�
- layer.confirm('璇ョ墿鏂欏凡缁忚鏈緵搴斿晢鑾峰彇锛屾槸鍚︾户缁紵', {
+ layer.confirm('璇ョ墿鏂欏凡缁忚鏈緵搴斿晢鑾峰彇锛屾槸鍚︾‘璁ゅ惎鐢ㄥ苟灏嗗巻鍙茬殑鍚敤缁欏彇娑堬紵', {
icon: 3,
title: '鎻愮ず'
}, function (index) {
@@ -785,25 +803,9 @@
get_MaterialCheck(1);
});
} 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"]);
- $("#HUSEORGID").val(responseData.data[0]["HUSEORGID"]);
- if ($("#HUSEORGID").val() != OrganizationID) {
- layer.confirm('鐗╂枡缁勭粐鍜屼娇鐢ㄧ粍缁囦笉涓�鑷达紝鏄惁缁х画锛�', {
- btn: ['纭畾', '鍙栨秷']
- }, function (index) {
- layer.close(index);
-
- }, function (index) {
-
- layer.close(index);
- $("#HMaterName").val("");
- $("#HMaterNumber").val("");
- $("#HModel").val("");
- $("#HUSEORGID").val(OrganizationID);
- });
- }
form.render('select');
} else {
layer.msg(responseData.Message || "鐗╂枡淇℃伅涓嶅瓨鍦�", { time: 5000 });
@@ -828,7 +830,8 @@
success: function (result) {
if (result.data.length > 0) {
$("#HSupName").val(result.data[0].渚涘簲鍟嗗悕绉�);
- $("#HSupID").val(result.data[0].渚涘簲鍟嗕唬鐮�);
+ $("#HSupNumber").val(result.data[0].渚涘簲鍟嗕唬鐮�);
+ $("#HSupID").val(result.data[0].HItemID);
} else {
layer.msg("渚涘簲鍟嗕俊鎭湭缁存姢", { time: 5000 });
}
--
Gitblit v1.9.1