From 3ddeb79b7e8da8971236609ab85d9a9328665e0b Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 07 二月 2022 14:09:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
index 849f6ca..3b5ce2e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -87,7 +87,7 @@
<div class="layui-btn-group">
<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" id="Exit" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -134,14 +134,14 @@
<div class="layui-inline">
<label class="layui-form-label">宸ュ簭搴忓彿</label>
<div class="layui-input-inline">
- <input type="text" name="HProcNo" id="HProcNo" lay-verify="number" autocomplete="off" class="layui-input" />
+ <input type="text" name="HProcNo" id="HProcNo" autocomplete="off" class="layui-input" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">杩斿伐宸ュ簭</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <select name="HProcID" id="HProcID" lay-verify="required" lay-search="">
+ <select name="HProcID" id="HProcID" lay-search="">
<option value="">閫夋嫨鎴栨悳绱㈤�夋嫨杩斿伐宸ュ簭</option>
</select>
</div>
@@ -168,7 +168,7 @@
<div class="layui-inline">
<label class="layui-form-label">浜у搧浠ｇ爜</label>
<div class="layui-input-inline">
- <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HMaterNumber" id="HMaterNumber" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -476,7 +476,7 @@
$('#HICMOBillNo').attr("disabled", true);
$('#HICMOInterID').attr("disabled", true);
$('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HMaterCode').attr("disabled", true);
+ $('#HMaterNumber').attr("disabled", true);
$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HMaterName').attr("disabled", true);
$('#HMaterSpec').attr("disabled", true);
@@ -507,7 +507,7 @@
var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
$("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
- $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
+ $("#HMaterNumber").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
$("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
$("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
@@ -546,7 +546,7 @@
$('#HICMOBillNo').attr("disabled", true);
$('#HICMOInterID').attr("disabled", true);
$('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HMaterCode').attr("disabled", true);
+ $('#HMaterNumber').attr("disabled", true);
$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HMaterName').attr("disabled", true);
$('#HMaterSpec').attr("disabled", true);
@@ -585,7 +585,7 @@
, "HPlanBeginDate": formatDate(data.杩斿伐鏃堕棿)
, "HMaterID": data.HMaterID
- , "HMaterCode": data.浜у搧浠ｇ爜
+ , "HMaterNumber": data.浜у搧浠ｇ爜
, "HMaterName": data.浜у搧鍚嶇О
, "HMaterSpec": data.瑙勬牸鍨嬪彿
@@ -724,7 +724,7 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
- window.parent.location.reload();
+ parent.location.reload();
});
@@ -750,7 +750,7 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterCode").val(checkStatus.data[0].HNumber);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
$("#HMaterID").val(checkStatus.data[0].HItemID);
$("#HMaterSpec").val(checkStatus.data[0].HModel);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -978,6 +978,10 @@
layer.msg("杩斿伐宸ュ簭鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (!(/(^[1-9]\d*$)/.test($("#HProcNo").val()))) {
+ layer.msg("杩斿伐宸ュ簭鍙峰彧鑳戒负姝ｆ暣鏁板瓧!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HProcID").val() == '' || $("#HProcID").val() == null) {
layer.msg("杩斿伐宸ュ簭涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
--
Gitblit v1.9.1