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

yusijie

2024-12-25 f65fe092c04cb3d18b7cb1cd511c19d408d59370

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMainList.html

@@ -55,6 +55,14 @@
                                        <input type="date" class="layui-input ForFilteringSchemes" 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; width: 185px;">
                                        <select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
@@ -153,8 +161,9 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>导入</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>

                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
@@ -227,9 +236,15 @@
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;  
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
@@ -287,6 +302,7 @@
                    }
                });
            })

            //#endregion

            //#region é‡ç½®æŒ‰é’®
@@ -347,7 +363,8 @@

                //初始化表格
                set_InitGrid();

                //获取项目号
                Get_HProject();
                //查询
                if (addSWhereByOpenType()) {                        //addSWhereByOpenType()方法判断是否其它页面打开本页面，若是则处理过滤条件，并返回true
                    get_FastQuery(2);
@@ -504,6 +521,7 @@
                var HBillNo = $("#HBillNo").val();  //单据号
                var HBeginDate = $("#HBeginDate").val();//总结人
                var HEndDate = $("#HEndDate").val();//单据状态
                var HProject = $("#HProject").val();

                //任意字段过滤
                var ColName = $("#ColName").val();//复选框
@@ -590,8 +608,11 @@
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }


                if (number==2) {
                    if (HProject!='0') {
                        sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }               
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -600,6 +621,7 @@
            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HBillNo").val("");
                $("#HProject").val("");
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
@@ -634,6 +656,30 @@
                $("#HInitTimeCycle").val("29");
            }
            //#endregion
            //#region èŽ·å–项目号
            function Get_HProject() {
                //获取项目号
                var HProjectList = '<option value="0" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_HProject",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HProjectList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HProject").append(HProjectList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region æ–°å¢ž
            function set_AddNew() {
@@ -648,8 +694,21 @@
                    // æŒ‰é’®1 çš„回调
                    end: function (index, layero, that) {
                        //刷新页面
                        get_FastQuery();
                        get_FastQuery(1);
                    }
                })
            }
            //#endregion


            //#region导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '产品工艺参数导入'
                    , shift: 0//弹出动画
                    , content: './Gy_MaterialTechParamBill_Excel.html?OperationType=dao&HSouceBillType='
                })
            }
            //#endregion
@@ -671,7 +730,7 @@
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            get_FastQuery();
                            get_FastQuery(1);
                        }
                    })
                } else {
@@ -679,6 +738,29 @@
                }
            }
            //#endregion

            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HInterID.toString();

                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '产品工艺参数清单-编辑'
                        , shift: 0//弹出动画
                        , content: '../../计划管理/工艺路线/Gy_MaterialTechParamBillMain.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }


            //#region åˆ é™¤
@@ -705,7 +787,7 @@
                                        //修改为功后刷新界面

                                    });
                                    get_FastQuery();
                                    get_FastQuery(1);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -726,7 +808,7 @@

            //#region åˆ·æ–°
            function get_Refresh() {
                get_FastQuery();
                get_FastQuery(1);
            }
            //#endregion

@@ -747,7 +829,7 @@
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery();
                                    get_FastQuery(1);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -777,7 +859,7 @@
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery();
                                    get_FastQuery(1);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -808,7 +890,7 @@

                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery();
                                    get_FastQuery(1);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -839,7 +921,7 @@

                                    layer.msg(result.Message, { icon: 1 });
                                    layer.close(wait);
                                    get_FastQuery();
                                    get_FastQuery(1);
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
@@ -1060,13 +1142,13 @@


                                //执行查询方法
                                get_FastQuery();
                                get_FastQuery(1);
                            } else {
                                $('#HBeginDate').prop('disabled', false);
                                $('#HEndDate').prop('disabled', false);
                            }
                            //执行查询方法
                            get_FastQuery()
                            get_FastQuery(1)
                            form.render("select");
                        } else {
                            //当前用户没有设置默认的过滤方案
@@ -1121,7 +1203,7 @@
                        }
                        , end: function () {
                            if (HIsClose_Manual != true) {
                                get_FastQuery();
                                get_FastQuery(1);
                                //显示当前的过滤方案
                                document.getElementById("HFilterScheme_Now").style.display = "block";
                                document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案：" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
@@ -1144,7 +1226,7 @@
                            , shift: 0//弹出动画
                            , content: '../../系统管理/过滤方案设置/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
                            , end: function () {
                                get_FastQuery()
                                get_FastQuery(1)
                                //显示当前的过滤方案
                                document.getElementById("HFilterScheme_Now").style.display = "block";
                                document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案：" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';