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

yusijie

2022-12-18 f7edef0ed54d8fa8894ac00ddace3828166d442b

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

 WebTM/views/PublicPage/HSourceReportHtml.html

@@ -199,10 +199,11 @@
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
                        layer.close(ajaxLoad);
                        for (var key in data1.list) {
                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        set_InitGrid(sWhere);
                        set_InitGrid(data1);
                    }, error: function (err) {
                        layer.alert(err.Message, { icon: 5 });
                    }
@@ -212,7 +213,7 @@
            //#endregion

            //#region  åˆå§‹åŒ–表格方法
            function set_InitGrid(sWhere) {
            function set_InitGrid(data1) {
                //填充表格头数组
                var data = resultTableHead;
                cols_arr[0] = [];
@@ -238,24 +239,22 @@
                }
                //填充表格数据
                table.render({
                    elem: '#layTable',
                    url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
                    //toolbar: '#toolbarDemo', //开启头部工具栏，并为其绑定左侧模板
                    title: '' + HSouceBillType + '',
                    cols: cols_arr,    //填充表格头数据,
                    id: 'layTable', //表格id
                    where: { sWhere: sWhere, HSouceBillType: HSouceBillType, HOrgID: linterid }, //扩展参数,可以传数据到后台
                    page: true,   //开启分页
                    totalRow: false, //开启合计
                    limit: 50,     //一页能够显示的最大数目
                    limits: [50, 500, 2000, 20000], //控制多少行一页（默认五条一页）
                    method: 'get',  //提交方式
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    height:600,
                    response: {
                        statusCode: 1 //重新规定成功的状态码为 1，table ç»„件默认为 0
                    },
                    done: function (res) {   //返回数据执行回调函数
                    id: 'layTable'
                    , elem: '#layTable'
                    //, toolbar: '#toolbarDemo'
                    , cols: [cols_arr[0]]
                    , data: data1.data == null ? [] : data1.data
                    , title: '' + HSouceBillType + ''
                    , page: true   //开启分页
                    , totalRow: false //开启合计
                    , cellMinWidth: 120
                    , height: 520
                    , limit: 50     //一页能够显示的最大数目
                    , limits: [50, 500, 5000, 20000]
                    , method: 'get'  //提交方式
                    , layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
                    , loading: false
                    , done: function (res, curr, count) {  //返回数据执行回调函数
                        layer.close(layer.index);    //返回数据关闭loading
                    }
                });

 WebTM/views/user/login.html

@@ -25,7 +25,7 @@
        <div class="layadmin-user-login-main" style="margin: -5.8% auto;">
            <div class="layadmin-user-login-box layadmin-user-login-header">
                <h2 style="color:white;">L-MES</h2>
                <p style="color: white;">智云迈思LMES管理系统</p>
                <p style="color: white;">安瑞LMES管理系统</p>
            </div>
            <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
                <div class="layui-form-item">

 WebTM/views/userfiles/images/1.jpg

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -99,7 +99,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">选单号<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
@@ -606,7 +606,7 @@
                            $("#HOrgID").append(Organization);
                            form.render('select');
                        }
                        $('#HOrgID').find("option[value=" + result.data[0].ID + "]").attr("selected", true);
                        $('#HOrgID').find("option[value=" + sessionStorage["OrganizationID"] + "]").attr("selected", true);
                        form.render('select') //再次渲染
                        layer.closeAll("loading");
                    }

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Add_Edit_Gy_WorkDay.html

@@ -313,7 +313,7 @@
                                , "HNightbreakEnd": data.HNightbreakEnd
                                , "HNoonbreakBegin2": data.HNoonbreakBegin2
                                , "HNoonbreakEnd2": data.HNoonbreakEnd2
                                , "HNightbreakEnd2": data.HNightbreakEnd2
                                , "HNightbreakBegin2": data.HNightbreakBegin2
                                , "HNightbreakEnd2": data.HNightbreakEnd2
                            });
                            layer.close(ajaxLoad);

 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ßάÐÞÅɹ¤µ¥/Sc_MouldRepairSendWorkBillEdit.html

@@ -586,7 +586,7 @@
                    , area: ['90%', '90%'] //大小
                    , title: '供应商表' //标题
                    , shift: 2 //弹出动画
                    , content: ['../../Baseset/基础资料/Gy_SupplierList.html', 'yes']
                    , content: ['../../基础资料/采购基础资料/Gy_Supplier.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮一 çš„回调
                        var iframeWindow = window['layui-layer-iframe' + index] //获取弹窗页面
@@ -597,7 +597,7 @@

                        //获取数据
                        $("#HSupID").val(checkStatus.data[0].HItemID);//供应商id
                        $("#HSupIDName").val(checkStatus.data[0].HName);//供应商名称
                        $("#HSupIDName").val(checkStatus.data[0].供应商名称);//供应商名称

                        //关闭页面
                        layer.close(index);
@@ -735,6 +735,7 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                            layer.close(index);
                            layer.msg("提交成功");
                        }

 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileBillResume.html

@@ -395,7 +395,7 @@
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + EndHCreateDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + EndHCreateDate + "'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBill.html

@@ -147,19 +147,25 @@
                                            </div>
                                        </div>
                                        <!--<div class="layui-col-xs4 layui-inline">
                            <label class="layui-form-label">当前工序</label>
                            <div class="layui-input-inline">
                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                <input type="hidden" name="HProcID" id="HProcID" value="0">
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                            </div>
                        </div>-->
        <label class="layui-form-label">当前工序</label>
        <div class="layui-input-inline">
            <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
            <input type="hidden" name="HProcID" id="HProcID" value="0">
            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
            </button>
        </div>
    </div>-->
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">流转卡数量</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">未出站数量</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;" id="NoOutboundHqty">
                                            </div>
                                        </div>
                                    </div>
@@ -990,6 +996,7 @@
                                "HProcID": data.HProcID
                                , "HCenterName": data.工作中心
                                , "HCenterID": data.HCenterID
                                , "NoOutboundHqty": (data.流转卡数量 - data.出站报废关联数量 - data.出站关联数量)
                            });
                            if (data.首道工序 == "是") {
                                FirstEndHProcNo = 1;

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html

@@ -68,13 +68,9 @@
                                    <div class="layui-row" style="margin-top:10px;">
                                        <!--其他条件-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label">物料代码</label>
                                            <div class="layui-input-inline">
                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            <label class="layui-form-label" style="width: 85px;">物料代码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -83,14 +79,6 @@
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">规格型号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HModel" id="HModel" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin: 10px 0 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">班组</label>
                                            <div class="layui-input-inline">
@@ -101,6 +89,8 @@
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin: 10px 0 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">唯一ID</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
@@ -220,10 +210,10 @@
                });
            });

            //物料
            form.on('submit(btnHMaterID)', function (data) {//选择仓位
                get_btnHMaterID();
            });
            ////物料
            //form.on('submit(btnHMaterID)', function (data) {
            //    get_btnHMaterID();
            //});

            //#endregion

@@ -232,7 +222,7 @@
            //初始化界面
            function set_ClearBill() {
                //初始化时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                //初始化表格
                set_InitGrid();
@@ -374,6 +364,7 @@
                $("#HProcExchBillNo").val("");
                $("#HName").val("");
                $("#HBillNo").val("");
                $("#HMaterNumber").val("");
                $("#F_BSV_WYID").val("");
                $("#HState").val("0")
                $("input[name='checkWRuku']").prop("checked", false);
@@ -402,7 +393,6 @@
                        }
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        $("#HModel").val(checkStatus.data[0].HModel);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                })