Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

zrg

2024-08-30 d9aa433581af4504e10da176bc3eecd7abf27707

 WebTM/views/¹«¹²Ò³Ãæ/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: "温馨提示" });
                                }
@@ -349,6 +361,7 @@
                            });
                        }
                    },
                    complete: function (XHR, TS) { XHR = null },//回收资源
                    error: function (err) {
                        playSound();
                        layer.msg("错误！" + err, {
@@ -385,9 +398,9 @@
                    });
                    return;
                }
                if (sHQty == "" || sHQty ==0) {
                if (sHQty == "" || sHQty <= 0 || sHQty > 100) {
                    playSound();
                    layer.msg("数量不允许小于0，请输入数量！", {
                    layer.msg("数量不允许小于0，大于100，请重新输入数量！", {
                        icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                    }, function () {
                        $("#HQty").select();
@@ -406,6 +419,8 @@
                            playSound_OK();
                            //清空数量
                            $("#HQty").val("");
                            $("#HQty").select();
                            $("#HQty").focus();
                            //显示表体明细
                            DisBillEntryList();
                        }
@@ -419,6 +434,7 @@
                            });
                        }
                    },
                    complete: function (XHR, TS) { XHR = null },//回收资源
                    error: function (err) {
                        playSound();
                        layer.msg("错误！" + err, {
@@ -441,7 +457,7 @@
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/GetBarCodeByMaterID_Temp_Json',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    async: true,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HInterID": HInterID, "HBillType": HBillType, "HMaterID": HMaterID },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -472,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 {
@@ -495,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 }//回收资源
                });
            }