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

zrg

2024-07-10 f1203f1f5bf65cab36515c6873e0fefba6acebe7

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html

@@ -33,25 +33,7 @@
                                        <span>更多</span>
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
        
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">工序代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
@@ -327,43 +309,11 @@

            //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法
            ////日期间隔下拉列表监听
            //form.on('select(HInitTimeCycle)', function (data) {
            //    var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
            //    //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
            //    if (HInitTimeCycle != -1) {
            //        $('#HBeginDate').prop('disabled', true);
            //        $('#HEndDate').prop('disabled', true);

            //        $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
            //        $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

            //        //执行查询方法
            //        get_FastQuery();
            //    } else {
            //        $('#HBeginDate').prop('disabled', false);
            //        $('#HEndDate').prop('disabled', false);
            //    }
            //});
        

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                ////初始化日期间隔、开始日期、结束日期
                //setSelect_HInitTimeCycle();
                ////若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //if (HInitTimeCycle != -1) {
                //    $('#HBeginDate').prop('disabled', true);
                //    $('#HEndDate').prop('disabled', true);
                //} else {
                //    $('#HBeginDate').prop('disabled', false);
                //    $('#HEndDate').prop('disabled', false);
                //}

                ////根据日期间隔设置开始时间与结束时间
                //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
             
                //初始化表格
                set_InitGrid();
                //查询
@@ -451,7 +401,7 @@

                
                if (obj.event == '工序代码') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 ''。如果等于，则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid   
                    var linterid = data.HItemID.toString();    //声明变量linterid ä¸º data.hmainid
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                        type: 2                         //表示弹出层的内容是一个 iframe
@@ -563,8 +513,7 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(number) {
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期

                var HOrgID = "";
                var HNumber = $("#HNumber").val();//工序代码
                var HName = $("#HName").val();//工序名称
@@ -640,12 +589,7 @@
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
         
                if (number == 1) {
                    HOrgID = sessionStorage["OrganizationID"];
                }
@@ -669,10 +613,7 @@

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                //var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
          
                $("#HNumber").val("");
                $("#HName").val("");
                $("#HOrgID").val(sessionStorage["OrganizationID"]);
@@ -693,21 +634,6 @@



            ////#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            //function setSelect_HInitTimeCycle() {
            //    var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
            //    var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"];

            //    var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';
            //    for (var i = 0; i < valueList.length; i++) {
            //        HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
            //    }
            //    $("#HInitTimeCycle").empty();
            //    $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
            //    form.render('select');
            //    $("#HInitTimeCycle").val("29");
            //}
            ////#endregion

            //#region æ–°å¢ž
            function set_AddNew() {