From 2c6f955ecb57ab18f2c211f4feef38b4cdece43c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 31 一月 2024 14:29:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/公共页面/Kf_ChaoBaoEditDlg.html |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 9 deletions(-)

diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
index d089338..3d6a03c 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_ChaoBaoEditDlg.html"
@@ -65,7 +65,7 @@
                             </div>
                             <div class="layui-col-xs10">
                                 <div class="layui-col-xs10">
-                                    <input type="text" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                    <input type="number" name="HQty" id="HQty" lay-verify="HQty" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
                                 </div>
                                 <div class="layui-col-xs2">
                                     <button type="button" lay-submit="" style="float: right " lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">娣诲姞</button>
@@ -296,14 +296,18 @@
             $('#HBarCode').on('keydown', function (event) {
                 if (event.keyCode == 13) {
                     GetBarCode();
+                    $("#HQty").select();
                     $("#HQty").focus();     //鑾峰彇鍏夋爣
+                    layer.closeAll("loading");
                 }
             });
 
             //鏉$爜鎸夐挳
             form.on('submit(HBarCode-BT)', function (data) {
                 GetBarCode();
+                $("#HQty").select();
                 $("#HQty").focus();     //鑾峰彇鍏夋爣
+                layer.closeAll("loading");
             });
 
             //鎵潯鐮�
@@ -311,7 +315,12 @@
                 var sBarCode = $('#HBarCode').val()
                 if (sBarCode == '') {
                     playSound();
-                    layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBarCode").select();
+                        $("#HBarCode").focus();
+                    });
                     return;
                 }
                 layer.load(3)
@@ -332,12 +341,22 @@
                         }
                         else {
                             playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
                         }
                     },
                     error: function (err) {
                         playSound();
-                        layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("閿欒锛�" + err, {
+                            icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
                     }
                 });
                 layer.closeAll("loading");
@@ -358,12 +377,22 @@
                 var sBarCode = $('#HBarCode').val()
                 if (sBarCode == '') {
                     playSound();
-                    layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鏉$爜涓虹┖锛岃鎵弿鏉$爜锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBarCode").select();
+                        $("#HBarCode").focus();
+                    });
                     return;
                 }
                 if (sHQty == "" || sHQty ==0) {
                     playSound();
-                    layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛岃杈撳叆鏁伴噺锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛岃杈撳叆鏁伴噺锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HQty").select();
+                        $("#HQty").focus();
+                    });
                     return;
                 }
                 layer.load(3)
@@ -377,17 +406,29 @@
                             playSound_OK();
                             //娓呯┖鏁伴噺
                             $("#HQty").val("");
+                            $("#HQty").select();
+                            $("#HQty").focus();
                             //鏄剧ず琛ㄤ綋鏄庣粏
                             DisBillEntryList();
                         }
                         else {
                             playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
                         }
                     },
                     error: function (err) {
                         playSound();
-                        layer.msg("閿欒锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.msg("閿欒锛�" + err, {
+                            icon: 5, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
                     }
                 });
                 layer.closeAll("loading");
@@ -433,7 +474,7 @@
                                             break;
                                         default:
 
-                                        if (data[i].name == '鏁伴噺' || data[i].name == '鏉$爜涓暟') {
+                                            if (data[i].name == '绫虫暟' || data[i].name == '浠舵暟') {
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', totalRow: true });
                                         }
                                         else {

--
Gitblit v1.9.1