From 3411199198e289fe53a027679cb0a078afe127b7 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 13 五月 2024 13:11:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index bdaab34..dba30b0 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -119,7 +119,7 @@
<label class="layui-form-label">缁翠慨璁板綍<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HMouldRepairWorkName" id="HMouldRepairWorkName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldRepairWorkID" id="HMouldRepairWorkID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldRepairWorkID" id="HMouldRepairWorkID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnHMouldRepairWork" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -752,7 +752,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
- HRepairCheckID: checkStatus.data[0].HItemID,
+ HRepairCheckID: checkStatus.data[0].hitemid,
HRepairCheckCode: checkStatus.data[0].缁翠慨楠屾敹椤圭洰浠ｇ爜,
HRepairCheckName: checkStatus.data[0].缁翠慨楠屾敹椤圭洰,
});
@@ -767,7 +767,7 @@
if (OptionData.length > 0) {
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- HRepairCheckID: OptionData[0].HItemID,
+ HRepairCheckID: OptionData[0].hitemid,
HRepairCheckCode: OptionData[0].缁翠慨楠屾敹椤圭洰浠ｇ爜,
HRepairCheckName: OptionData[0].缁翠慨楠屾敹椤圭洰,
});
@@ -863,8 +863,12 @@
layer.msg("鏃ユ湡涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
+ if ($("#HMouldRepairWorkID").val() == '0') {
+ layer.msg("缁翠慨璁板綍涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
//鍒ゆ柇鐗╂枡鏄庣粏椤�
- if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+ if (typeof (sSubStr) != "undefined" || sSubStr != "" || sSubStr != "[]") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
if (sSubStr[i].HRepairCheckID == "" || sSubStr[i].HDotCheckItemID == "") {
--
Gitblit v1.9.1