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

yangle

2022-09-22 503c357fe236c71b2982fdce16ff8882c5d65615

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

 WebTM/views/¹¤×ʹÜÀí/Í⹺ǽ²¼¹¤×Ê/Pay_PurchaseWallclothBillEdit.html

@@ -180,8 +180,10 @@
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">条码</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HBarcode" id="HBarcode"  class="layui-input" value="" style="float:left;">
                                            <div class="layui-input-inline"style="float:left;width:220px;">
                                                <!--<input type="text" name="HBarcode" id="HBarcode" class="layui-input" value="" style="float:left;">-->
                                                <input type="text" name="HBarCode" id="HBarCode" placeholder="请键入后回车" autocomplete="off" class="layui-input"style="float:left;width:150px;"><!--lay-verify="required"-->
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin" name="QueDin" id="QueDin" style="width: 60px; background-color: #1492ff;color:white">确定</button>
                                            </div>
                                        </div>
                                    </div>
@@ -299,7 +301,7 @@
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HUpDater").val(sessionStorage["HUserName"]);
                option.data = [{"HSelOrderNo": ""}];
                option.data = [];
                table.render(option);
            }
            else {
@@ -868,7 +870,32 @@
                }
            });


            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    GetMeesageByBarCode();
                }
            });
            //条形码确认
            form.on('submit(QueDin)', function (data) {
                GetMeesageByBarCode();
            });
            //扫描条形码方法
            function GetMeesageByBarCode() {
                var HBarCode = $('#HBarCode').val();
                if (!HBarCode) {
                    layer.msg("条形码不能为空！")
                    return;
                }
                var index = layer.load();
                var NewRow = { "HSelOrderNo": HBarCode };
                table.cache["mainTable"].push(NewRow);
                option.data = table.cache["mainTable"];
                table.render(option);
                layer.close(index);
                $('#HBarCode').val("");
                $("#HBarCode").focus();
            }
        });
        function GetHGroupID1(obj)  
        {

 WebTM/views/³µ¼ä¹ÜÀí/ίÍ⹤Ðò·¢³öµ¥/Cj_StationEntrustInBillList.html

@@ -177,10 +177,10 @@
                        , { field: '产品名称', title: '产品名称' }
                        , { field: '规格型号', title: '规格型号' }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '流水号', title: '流水号' }
                        , { field: '流水号', title: '流水号', sort: true }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序', title: '工序' }
                        , { field: '工序', title: '工序', sort: true }
                        , { field: '发出数量', title: '发出数量' }
                        , { field: '发出时间', title: '发出时间' }
                        , { field: '备注', title: '备注' }

 WebTM/views/³µ¼ä¹ÜÀí/ίÍ⹤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBillList.html

@@ -182,10 +182,10 @@
                        , { field: '不良数量', title: '不良数量' }
                        , { field: '报废数量', title: '报废数量' }
                        , { field: '计量单位', title: '计量单位' }
                        , { field: '流水号', title: '流水号' }
                        , { field: '流水号', title: '流水号', sort: true }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: '工序代码', title: '工序代码' }
                        , { field: '工序', title: '工序' }
                        , { field: '工序', title: '工序', sort: true }
                        , { field: '接收合格数量', title: '接收合格数量' }
                        , { field: '接收不合格数量', title: '接收不合格数量' }
                        , { field: '含税单价', title: '含税单价' }

 WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast.html

@@ -221,6 +221,8 @@
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                $('#HBarCode').val("");
                $("#HBarCode").focus();
            }

            //退出-关闭页面方法