From 5f9ea9822d4ea62177565d1d8dcab4921f4e07c8 Mon Sep 17 00:00:00 2001
From: 陈雯静 <1134865194@qq.com>
Date: 星期四, 11 四月 2024 16:25:36 +0800
Subject: [PATCH] 1

---
 WebTM/views/公共页面/Kf_ChaoBaoEditDlg.html |   80 ++++++++++++++++++++++++++++++++++------
 1 files changed, 68 insertions(+), 12 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..fda34fd 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>
@@ -151,12 +151,22 @@
                 console.log("playSound");
                 var audio = document.getElementById("cs");
                 audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
             }
             //鎴愬姛鎻愮ず闊�
             function playSound_OK() {
                 console.log("playSound_OK");
                 var audio = document.getElementById("cs2");
                 audio.play();
+                audio.onended = function () {
+                    // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                    audio.pause();
+                    audio.currentTime = 0;
+                };
             }
 
             //#region 鍒濆鍖栫晫闈�
@@ -178,6 +188,7 @@
                 listOption = {
                     elem: '#wl-table'
                     //, toolbar: '#toolbarDemo'
+                    , page: true
                     , totalRow: true
                     , height: 'full-50'
                     , cellMinWidth: 90
@@ -265,6 +276,7 @@
                                         layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                     }
                                 },
+                                complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                                 error: function (err) {
                                     layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 }
@@ -296,14 +308,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 +327,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 +353,23 @@
                         }
                         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();
+                            });
                         }
                     },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                     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 +390,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) {
+                if (sHQty == "" || sHQty <= 0 || sHQty > 100) {
                     playSound();
-                    layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛岃杈撳叆鏁伴噺锛�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    layer.msg("鏁伴噺涓嶅厑璁稿皬浜�0锛屽ぇ浜�100锛岃閲嶆柊杈撳叆鏁伴噺锛�", {
+                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HQty").select();
+                        $("#HQty").focus();
+                    });
                     return;
                 }
                 layer.load(3)
@@ -377,17 +419,30 @@
                             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();
+                            });
                         }
                     },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                     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");
@@ -402,7 +457,7 @@
                 $.ajax({
                     type: "GET",
                     url: GetWEBURL() + '/WEBSController/GetBarCodeByMaterID_Temp_Json',
-                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    async: true,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
                     data: { "HInterID": HInterID, "HBillType": HBillType, "HMaterID": HMaterID },
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -433,7 +488,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 {
@@ -456,7 +511,8 @@
                             //layer.msg(result.Message);
                             //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
-                    }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
                 });
             }
 

--
Gitblit v1.9.1