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/设备管理/Sb_EquipDotCheckBill_PDA.html | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
index 6db322f..c2ba757 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBill_PDA.html"
@@ -307,10 +307,7 @@
<tbody id="ProImgByList">
</tbody>
</table>
- </div>
- <div>
- <button class="layui-btn" id="cameraBtn">璋冪敤鐩告満</button>
- </div>
+ </div>
</div>
</div>
</div>
@@ -859,10 +856,12 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- else {
- return true;
- }
+ if (sSubStr[i].HDotCheckResult != true) {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁撴灉淇℃伅涓哄嬀閫�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
}
+ return true;
}
else {
return true;
@@ -933,6 +932,9 @@
option.data = rowdata;
table.render(option);
}
+ else {
+ layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
}
})
}
--
Gitblit v1.9.1