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

yangle

2024-11-28 03cc5d52bcd95ebd6c06cc279a8c240097b74e7d

 WebTM/views/Ó¦ÊÕ¹ÜÀí/±¨±í·ÖÎö/Xs_SellOutCompareToProductReport.html

@@ -33,28 +33,22 @@
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!--<div class="layui-form layui-inline" style="position:relative;top:10px;">
                                    <label class="layui-form-label">日期</label>
                                    <div class="layui-form-item  layui-inline">
                                        <div class="layui-inline">
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
                                            </div>
                                        </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                    </div>
                                    <div class="layui-form-item  layui-inline">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">-</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
                                            </div>
                                        </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                    </div>
                                </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 ForFilteringSchemes" name="HBillNo" value="     " id="HBillNo">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" value="" id="HBillNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -145,32 +139,32 @@
                                    </div>

                                    <!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>-->
            <div class="layui-inline">
                <label class="layui-form-label">过滤</label>
                <div class="layui-input-block">
                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                    </select>
                </div>
            </div>
            <div class="layui-inline">
                <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
                    <option value="0" selected="selected"></option>
                    <option value="=">=</option>
                    <option value=">=">>=</option>
                    <option value=">">></option>
                    <option value="<="><=</option>
                    <option value="<"><</option>
                    <option value="<>"><></option>
                    <option value="7">包含</option>
                    <option value="8">左包含</option>
                    <option value="9">右包含</option>
                    <option value="10">不包含</option>
                </select>
            </div>
            <div class="layui-inline">
                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
            </div>
        </div>-->
                                </div>
                            </div>
                        </div>
@@ -313,21 +307,9 @@

            //初始化界面
            function set_ClearBill() {
                ////初始化时间
                //laydate.render({
                //    elem: '#HBeginDate',
                //    type: 'datetime',
                //    fullPanel: true
                //    , format: 'yyyy-MM-dd HH:mm'
                //    , value: HBeginDate_u
                //});
                //laydate.render({
                //    elem: '#HEndDate',
                //    type: 'datetime',
                //    fullPanel: true
                //    , format: 'yyyy-MM-dd HH:mm'
                //    , value: HEndDate_u
                //});
                //根据日期间隔设置开始时间与结束时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                //加载数据到网格
                get_FastQuery();
@@ -443,31 +425,19 @@

            //快速过滤
            function get_FastQuery() {
                //var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                //var HEndDate = $("#HEndDate").val();//结束日期
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();          //生产单号
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HProductName = $("#HProductName").val();//产品名称
                var HProductModel = $("#HProductModel").val();//产品规格

                //if (HBeginDate != "" && HEndDate != "") {
                //    sWhere += " and æ—¥æœŸ between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
                //} else {
                //    sWhere += " and æ—¥æœŸ between ''" + Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm") + "'' and ''" + Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm") + "'' ";
                //}

                //if (HProcExchBillNo != "") {
                //    sWhere += " and æµè½¬å¡å· =''" + HProcExchBillNo + "''";
                //    HBeginDate = HBeginDate_u;
                //    HEndDate = HEndDate_u;
                //}

                //if (HBeginDate) {
                //    sWhere += " and CONVERT(varchar(100),日期, 20) >= ''" + HBeginDate + "''";
                //}
                //if (HEndDate) {
                //    sWhere += " and CONVERT(varchar(100),日期, 20) <= ''" + HEndDate + "''";
                //}
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                }

                if (HBillNo != "") {
                    sWhere += " and ç”Ÿäº§å•å· like '%" + HBillNo + "%' ";
@@ -575,22 +545,8 @@

            //重置过滤条件
            function set_ClearQuery() {
                ////初始化时间
                //laydate.render({
                //    elem: '#HBeginDate',
                //    type: 'datetime',
                //    fullPanel: true
                //    , format: 'yyyy-MM-dd HH:mm'
                //    , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                //});
                //laydate.render({
                //    elem: '#HEndDate',
                //    type: 'datetime',
                //    fullPanel: true
                //    , format: 'yyyy-MM-dd HH:mm'
                //    , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
                //});
                
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
                $("#HBillNo").val("");
                $("#HMaterNumber").val("");
                $("#HProductName").val("");