zrg
2024-07-23 e40eee31a528e0a8d0003d169d14faabb40d3c26
上料防错列表增加过滤字段
2个文件已修改
172 ■■■■ 已修改文件
WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html 166 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·À´í/Sc_MaterToSourceStepBillList.html
@@ -45,11 +45,11 @@
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
        <label class="layui-form-label">订单跟踪号</label>
        <div class="layui-input-block">
            <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
        </div>
    </div>-->
                                    <label class="layui-form-label">订单跟踪号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
                                    </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>
@@ -62,9 +62,33 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <label class="layui-form-label">任务单号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
                                            <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">流转卡号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">生产资源</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HSourceName" id="HSourceName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">产品代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料批次</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
@@ -165,6 +189,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_LookDown"><i class="layui-icon layui-icon-export"></i>导出</button>
                            </div>
                        </script>
@@ -179,6 +204,7 @@
    <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../../layuiadmin/HideButton.js"></script>
    <script>
        //获取页面跳转参数  //单据编辑状态: 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
@@ -205,6 +231,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var ins;
            //#endregion
            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//不需要显示的字段 å¯æ‰©å±•
@@ -253,9 +280,13 @@
                    //退出
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //导出
                    case 'btn_LookDown': get_Export();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                };
            });
@@ -269,17 +300,21 @@
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                $("#WorkCenter").val("");//单据号
                $("#HICMOBillNo").val("");//任务单号
                $("#HProcExchBillNo").val("");//工序流转卡号
                $("#HSourceName").val("");//生产资源
                $("#HMaterNumber").val("");//产品代码
                $("#HBatchNo").val("");//物料批次
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColName").val("");
                $("#Comparator").val("");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColName1").val("");
                $("#Comparator1").val("");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColName2").val("");
                $("#Comparator2").val("");
                form.render('select');
            });
            //#endregion
@@ -326,15 +361,13 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display();
                get_FastQuery();
            }
            //初始化表格
            function set_InitGrid() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
@@ -397,15 +430,15 @@
                //单据号超链接
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于,则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚
                    layer.open({                //使用 layer的open打开弹出 å±‚
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '编辑'  //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../防错/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //设置 iframe çš„ URL,URL ä¸­åŒ…含了查询参数,来调用所需要的值
@@ -429,61 +462,12 @@
                    type: "GET",
                    data: { "sWhere": sWhere,"user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                        if (data1.count == 1) {
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 800
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            }
                            option.data = data1.data;
                            table.render(option);
                            layer.close(ajaxLoad);
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                            ins = table.render(option);
                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
@@ -611,13 +595,24 @@
                })
            }
            //#region å¯¼å‡ºExecel
            function get_Export() {
                var data = option.data
                table.exportFile(ins.config.id, data, "xls");
            }
            //#endregion
            // å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HDate = $("#HDate").val();//开始日期
                var HDate1 = $("#HDate1").val();//结束日期
                var HOrderProcNO = $("#HOrderProcNO").val();//订单跟踪号
                var WorkCenter = $("#WorkCenter").val();//单据号
                var HICMOBillNo = $("#HICMOBillNo").val();//任务单号
                var HProcExchBillNo = $("#HProcExchBillNo").val();//流转卡号
                var HSourceName = $("#HSourceName").val();//生产资源
                var HMaterNumber = $("#HMaterNumber").val();//产品代码
                var HBatchNo = $("#HBatchNo").val();//物料批次
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -698,9 +693,22 @@
                if (HDate1) {
                    sWhere += " and æ—¥æœŸ <= '" + HDate1 + "'";
                }
                if (WorkCenter) {
                    sWhere += " and å•据号 like '%" + WorkCenter + "%'";
                if (HICMOBillNo) {
                    sWhere += " and ä»»åŠ¡å•å· like '%" + HICMOBillNo + "%'";
                }
                if (HProcExchBillNo) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (HSourceName) {
                    sWhere += " and ç”Ÿäº§èµ„源 like '%" + HSourceName + "%'";
                }
                if (HMaterNumber) {
                    sWhere += " and äº§å“ä»£ç  like '%" + HMaterNumber + "%'";
                }
                if (HBatchNo) {
                    sWhere += " and ç‰©æ–™æ‰¹æ¬¡ like '%" + HBatchNo + "%'";
                }
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
@@ -719,7 +727,7 @@
                }
                $("#HInitTimeCycle").empty();           //使用jquery的empty方法清空HInitTimeCycle_ArrayList <select>元素的值
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //使用append方法构建之前HInitTimeCycle_ArrayList字符串 çš„内容传入HInitTimeCycle
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //使用append方法构建之前HInitTimeCycle_ArrayList字符串 çš„内容传入HInitTimeCycle
                form.render('select');       //调用 é‡æ–°æ¸²æŸ“select元素
                $("#HInitTimeCycle").val("29");   //使用jQuery的val()方法将下拉列表的选中值设置为"29   ï¼Œä¸”显示《近三時天》
@@ -734,8 +742,10 @@
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization); $("#ColName1").empty();
                $("#ColName1").append(Organization); $("#ColName2").empty();
                $("#ColName").append(Organization);
                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }
WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_QualityReportBillMonth.html
@@ -227,10 +227,10 @@
                            type: 'value',
                            name: '趋势率%',
                            min: 0,
                            max: 1,
                            interval: 0.1,
                            max: 100,
                            interval: 10,
                            axisLabel: {
                                formatter: '{value} '
                                formatter: '{value} ' + '%'
                            }
                        }
                    ],