From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/库存检验单/QC_Add_Edit_StockCheckBill.html | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
index ec5be7c..a1b5981 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_Add_Edit_StockCheckBill.html"
@@ -386,13 +386,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏍锋湰閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HSampleQty" id="HSampleQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏍锋湰鐮村潖鏁�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HSampleDamageQty" id="HSampleDamageQty" style="">
+ <input type="text" class="layui-input" name="HSampleDamageQty" value="0" id="HSampleDamageQty" style="">
</div>
</div>
</div>
@@ -435,7 +435,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎷掔粷鏁�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HRejectQty" id="HRejectQty" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
<!--<div class="layui-inline">
@@ -1406,16 +1406,20 @@
//淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
set_SaveValue($("#HEntryID").val());
- if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
- layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
- layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
+ //if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
+ // layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ //if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
+ // layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
if ($("#HFirstCheckEmp").val() == 0) {
layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HBatchNo").val() == "") {
+ layer.msg("鎵规鍙蜂笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
var sSubTable = table.cache['mainTable'];
@@ -1428,6 +1432,7 @@
if (sSubTable[i].HSampleSchemeID == '' || sSubTable[i].HSampleSchemeID == null) {
sSubTable[i].HSampleSchemeID = 0
}
+ sSubTable[i].HKeyInspect = sSubTable[i].HKeyInspect == true ? 1 : 0;
if (sSubTable[i].HSampleQty == '' || sSubTable[i].HSampleQty == null) {
sSubTable[i].HSampleQty = 0
}
@@ -1446,6 +1451,9 @@
if (sSubTable[i].HUnitID == '') {
sSubTable[i].HUnitID = 0
}
+ }
+ if (data.field.HICMOQty == "") {
+ data.field.HICMOQty = 0;
}
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -2382,10 +2390,10 @@
}
if (HQty > 0) {
document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
} else {
document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //鍒犻櫎閫夋嫨灞炴��
- $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //娣诲姞閫夋嫨灞炴��
+ $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //娣诲姞閫夋嫨灞炴��
}
form.render('radio');
}
@@ -2660,21 +2668,19 @@
$("#HDownLimit").val(0);
$("#HUpOffSet").val(0);
$("#HDownOffSet").val(0);
- $("#HSampleDamageQty").val("")
- $("#HSampleQty").val("")
- $("#HSampleQty2").val("")
+ $("#HSampleDamageQty").val("0")
+ $("#HSampleQty").val("0")
+ $("#HSampleQty2").val("0")
$("#HAcceptQty").val("0")
$("#HInspectionLevel").val("")
- $("#HRejectQty").val("")
+ $("#HRejectQty").val("0")
$("#HStrictness").val("")
- $("#HSampleUnRightQty").val("")
- $("#HSampleUnRightQty2").val("")
+ $("#HSampleUnRightQty").val("0")
+ $("#HSampleUnRightQty2").val("0")
$("#HAQL").val("")
$("#HSamplingType").val("")
- $("#HSampleQty").val("")
$("#HInspectResultToSee").val("")
$("#HInspectResultToSee2").val("")
- $("#HSampleUnRightQty").val("")
$("#HUnitID").val("0")
$("#HUnitName").val("")
$("#HInspectValB").val("0")
@@ -2836,10 +2842,8 @@
$("#HSampleUnRightQty2").val(maindata[nowindex].HSampleUnRightQty);
$("#HAQL").val(maindata[nowindex].HAQL);
$("#HSamplingType").val(maindata[nowindex].HSamplingType);
- $("#HSampleQty").val(maindata[nowindex].HSampleQty);
$("#HInspectResultToSee").val(maindata[nowindex].HInspectResultToSee);
$("#HInspectResultToSee2").val(maindata[nowindex].HInspectResultToSee2);
- $("#HSampleUnRightQty").val(maindata[nowindex].HSampleUnRightQty);
$("#HUnitID").val(maindata[nowindex].HUnitID);
$("#HUnitName").val(maindata[nowindex].HUnitName);
$("#HInspectValB").val(maindata[nowindex].HInspectValB);
--
Gitblit v1.9.1