MES-WEB-LayUI.git

parent: 34e55eb9 | 补丁 | 提交 | show whitespace

wtt

2024-09-05 71710fa23194118c8472e503e9136f33477ecb19

销售出库打印修改，采购订单查询bug修复

1个文件已添加

2个文件已修改

	WebTM/Vlog/webapi20240905.txt	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html	255 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/Vlog/webapi20240905.txt

New file
@@ -0,0 +1,23 @@
2024/9/5 10:23:53 æå°sql:exec h_p_Kf_SellOutBillList_PrintSellOutBill 13787793

2024/9/5 10:23:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/5 10:23:53 ReportDataSet:1

2024/9/5 10:25:44 æå°sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

2024/9/5 10:25:44 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/5 10:25:44 ReportDataSet:1

2024/9/5 10:28:34 æå°sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

2024/9/5 10:28:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/5 10:28:34 ReportDataSet:1

2024/9/5 10:28:47 æå°sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

2024/9/5 10:28:47 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2024/9/5 10:28:47 ReportDataSet:1

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillQuery.html

@@ -18,7 +18,14 @@
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style type="text/css">
        .layui-table-click {
            background: #ceedfa;
            color: black
        }
    </style>
</head>

<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
@@ -54,10 +61,10 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">åæ®å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
                                
                                <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>
@@ -68,12 +75,6 @@
                                </div>
                                <div class="layui-colla-content">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">åæ®å·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">ä¸å¡å</label>
                                            <div class="layui-input-block">
@@ -86,6 +87,13 @@
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">åæ®å·</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
                                            </div>
                                        </div>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
                                    </div>
                                    <div class="layui-inline">
                                        <div class="layui-row" style="margin-top:5px">
@@ -236,7 +244,6 @@
            var sWhere = "";
            var option = [];
            var optionSub = [];
            var Name = "Cg_POOrderBillWidth";
            var HModName = "Cg_POOrderBillQuery";
            var HModNameSub = "Cg_POOrderBillQuerySub";
            var HBillType = "1102";
@@ -404,44 +411,6 @@
            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery(table, option,2);
            });

            //è¡¨å¤´ä¿¡æ¯é¨é¨å¼¹çª
            form.on('submit(Department)', function () {
                //é¡µé¢å±-èªå®ä¹
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
                    title: 'ä¾åºååè¡¨',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../PublicPage/SupplierInformation.html', 'yes'],
                    btn: ['ç¡®å®', 'åæ¶']
                    , btn1: function (index, layero) {

                        //æé®ãæé®ä¸ãçåè°
                        var iframeWindow = window['layui-layer-iframe' + index]  //è·åå¼¹æ¡é¡µé¢
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('è¯·éæ©æ°æ®');
                        }
                        $("#HSupName").val(checkStatus.data[0].HName);
                        $("#HSupID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
                    }
                    , btn2: function (index, layero) {
                        //æé®ãæé®äºãçåè°
                        //return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //æ¥æé´éä¸æåè¡¨çå¬
@@ -642,7 +611,7 @@
                                }
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡'});
                            col.push({ type: 'radio', 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) {
@@ -725,7 +694,7 @@
                                }
                            }
                            //å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
                            col.push({ type: 'radio', 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) {
@@ -865,27 +834,6 @@
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
                }
            }

            //é¢è§
            function get_ViewReport() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: 'æå°æ¨¡çéæ©'
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: false //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
                }
            }

@@ -1157,8 +1105,8 @@
                                    var index = layer.getFrameIndex(window.name);
                                    //å³éå½åframe
                                    layer.close(index);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    $("#btnSearch").trigger('click');
                                    //ä¿®æ¹ä¸ºååå·æ°åè¡¨çé¢
                                    $("tr.layui-table-click").trigger("click");
                                });

                            } else {
@@ -1211,117 +1159,6 @@
            }
            //#endregion


            //è·ååå®½
            function getColumnsWidth() {
                var result = [];
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                //è·ååå®½
                $.ajax({
                    url: GetWEBURL() + '/Cg_POOrderBill/list',
                    async: false,
                    type: "Get",
                    dataType: "json",
                    data: { "colNum": colNum, "Name": Name },
                    success: function (data1) {
                        if (data1.code == 1) {
                            result = data1.data;
                        }
                        else if (data1.code == -1) {

                        }
                        else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });

                return result;
            }
            //ä¿ååå®½
            function set_SaveGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
                    if (colName != "" && colName != null) {
                        arr.push(colWidth == -1 ? 200 : colWidth);
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    type: "POST",
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": Name },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.alert(data1.Message, { icon: 1 });
                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                get_FastQuery(table, option);
            }
            //é»è®¤åå®½
            function set_DefaultGridColWidth() {
                var arr = [];
                // åæ°
                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
                for (var i = 0; i <= colNum; i++) {
                    var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
                    if (colName != "" && colName != null) {
                        arr.push(300);   //é»è®¤å®½åº¦200
                    }
                }
                arr.unshift(40); //é¦ä½è¿½å 
                $.ajax({
                    url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
                    async: false,
                    type: "POST",
                    dataType: "json",
                    data: { "myMap": JSON.stringify(arr), "Name": Name },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.alert(data1.Message, { icon: 1 });

                        } else {
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function (e) {
                        layer.alert(e.Message, { icon: 5 });
                    }
                });
                //è®¾ç½®èµå¼åå®½
                var colWidth = getColumnsWidth();
                if (colWidth == "" || colWidth == []) {

                }
                else {
                    $.each(columns, function (x, m) {
                        m["width"] = colWidth[x];
                    });
                }
                get_FastQuery(table, option);
            }


            //å¿«éè¿æ»¤
@@ -1658,7 +1495,7 @@
                        if (data1.data.length != 0) {

                            var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
                            console.log(titleData)

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < optionSub.cols[0].length - 1; i++) {
@@ -1739,49 +1576,27 @@

            //#region è¡ç¹å»äºä»¶
            table.on('row(mainTable)', function (obj) {
                //éä¸è¡æ¹åé¢è²
                //æ¾ç¤ºåè¡¨
                get_DisplaySub(obj.data);
                //éä¸è¡æ¹åé¢è²
                check_row(obj);
                //å¤ææ¯å¦å·²ç»è¢«éä¸
                if (obj.tr.find('.layui-form-radioed').length == 0) {
                    //è§¦ååéæ¡éä¸äºä»¶
                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
                }


            })
            //åè¡¨åé
            table.on('row(mainTableSub)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).eq(2).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).eq(2).attr({ "style": "background:" });//åæ¶å½åtré¢è²
                //å¤ææ¯å¦å·²ç»è¢«éä¸
                if (obj.tr.find('.layui-form-radioed').length == 0) {
                    //è§¦ååéæ¡éä¸äºä»¶
                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTableSub, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion

            //#region ç¹å»è¡éä¸é«äº®
            function check_row(obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //è®¾ç½®å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).first().attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
                    $(obj.tr.selector).first().attr({ "style": "background:" });//åæ¶å½åtré¢è²
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            }
            //#endregion

            //#region åå§æ¥æé´é ä¸æåè¡¨
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html

@@ -200,6 +200,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_BarCodeNote" id="get_BarCodeNote"><i class="layui-icon layui-icon-refresh-3"></i>æ¡ç æç»</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>ä¸æ¥</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>æå°</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print2" lay-event="btn-print2"><i class="layui-icon layui-icon-form"></i>æå°(ç»ç®å)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
@@ -354,6 +355,9 @@
                        break;
                    //æå°
                    case 'btn-print': get_PrintReport();
                        break;
                    //æå°ç»ç®å
                    case 'btn-print2': get_PrintReport2();
                        break;
                    //å¯¼åºexcel
                    case 'get_export':
@@ -1474,6 +1478,33 @@
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: false //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
                }
            }
            //#endregion

            //#region æå°ææç»ç®æ¸å
            function get_PrintReport2() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    if (data[0].ç¶æ != "å·²å®¡æ ¸") {
                        layer.alert("æå°å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 });
                        return;
                    }

                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: 'æå°æ¨¡çéæ©'
                        , shade: 0.6 //é®ç½©éæåº¦
                        , maxmin: false //åè®¸å¨å±æå°å
                        , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillListByID', 'yes']
                        , resize: false
                    })

New file
			@@ -0,0 +1,23 @@
			2024/9/5 10:23:53 æå°sql:exec h_p_Kf_SellOutBillList_PrintSellOutBill 13787793

			2024/9/5 10:23:53 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

			2024/9/5 10:23:53 ReportDataSet:1

			2024/9/5 10:25:44 æå°sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

			2024/9/5 10:25:44 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

			2024/9/5 10:25:44 ReportDataSet:1

			2024/9/5 10:28:34 æå°sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

			2024/9/5 10:28:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

			2024/9/5 10:28:34 ReportDataSet:1

			2024/9/5 10:28:47 æå°sql:select * from h_v_IF_SellOutBillList_EditInit where hmainid = 13787793

			2024/9/5 10:28:47 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

			2024/9/5 10:28:47 ReportDataSet:1

			@@ -18,7 +18,14 @@
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<style type="text/css">
			.layui-table-click {
			background: #ceedfa;
			color: black
			}
			</style>
			</head>

			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -54,10 +61,10 @@
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>

			<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>
			@@ -68,12 +75,6 @@
			</div>
			<div class="layui-colla-content">
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-block">
			@@ -86,6 +87,13 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
			</div>
			<div class="layui-inline">
			<div class="layui-row" style="margin-top:5px">
			@@ -236,7 +244,6 @@
			var sWhere = "";
			var option = [];
			var optionSub = [];
			var Name = "Cg_POOrderBillWidth";
			var HModName = "Cg_POOrderBillQuery";
			var HModNameSub = "Cg_POOrderBillQuerySub";
			var HBillType = "1102";
			@@ -404,44 +411,6 @@
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery(table, option,2);
			});

			//è¡¨å¤´ä¿¡æ¯é¨é¨å¼¹çª
			form.on('submit(Department)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä¾åºååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/SupplierInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSupName").val(checkStatus.data[0].HName);
			$("#HSupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});

			//æ¥æé´éä¸æåè¡¨çå¬
			@@ -642,7 +611,7 @@
			}
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡'});
			col.push({ type: 'radio', 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) {
			@@ -725,7 +694,7 @@
			}
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			col.push({ type: 'radio', 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) {
			@@ -865,27 +834,6 @@
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			}

			//é¢è§
			function get_ViewReport() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			layer.open({
			type: 2
			, area: ['50%', '50%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdInBill', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
			}
			}

			@@ -1157,8 +1105,8 @@
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			//ä¿®æ¹ä¸ºååå·æ°åè¡¨çé¢
			$("tr.layui-table-click").trigger("click");
			});

			} else {
			@@ -1211,117 +1159,6 @@
			}
			//#endregion


			//è·ååå®½
			function getColumnsWidth() {
			var result = [];
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			//è·ååå®½
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/list',
			async: false,
			type: "Get",
			dataType: "json",
			data: { "colNum": colNum, "Name": Name },
			success: function (data1) {
			if (data1.code == 1) {
			result = data1.data;
			}
			else if (data1.code == -1) {

			}
			else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});

			return result;
			}
			//ä¿ååå®½
			function set_SaveGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
			if (colName != "" && colName != null) {
			arr.push(colWidth == -1 ? 200 : colWidth);
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			type: "POST",
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": Name },
			success: function (data1) {
			if (data1.count == 1) {
			layer.alert(data1.Message, { icon: 1 });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			get_FastQuery(table, option);
			}
			//é»è®¤åå®½
			function set_DefaultGridColWidth() {
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			if (colName != "" && colName != null) {
			arr.push(300); //é»è®¤å®½åº¦200
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: false,
			type: "POST",
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": Name },
			success: function (data1) {
			if (data1.count == 1) {
			layer.alert(data1.Message, { icon: 1 });

			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			//è®¾ç½®èµå¼åå®½
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else {
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}
			get_FastQuery(table, option);
			}


			//å¿«éè¿æ»¤
			@@ -1658,7 +1495,7 @@
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			console.log(titleData)

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < optionSub.cols[0].length - 1; i++) {
			@@ -1739,49 +1576,27 @@

			//#region è¡ç¹å»äºä»¶
			table.on('row(mainTable)', function (obj) {
			//éä¸è¡æ¹åé¢è²
			//æ¾ç¤ºåè¡¨
			get_DisplaySub(obj.data);
			//éä¸è¡æ¹åé¢è²
			check_row(obj);
			//å¤ææ¯å¦å·²ç»è¢«éä¸
			if (obj.tr.find('.layui-form-radioed').length == 0) {
			//è§¦ååéæ¡éä¸äºä»¶
			obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
			}


			})
			//åè¡¨åé
			table.on('row(mainTableSub)', function (obj) {
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).eq(2).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).eq(2).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			//å¤ææ¯å¦å·²ç»è¢«éä¸
			if (obj.tr.find('.layui-form-radioed').length == 0) {
			//è§¦ååéæ¡éä¸äºä»¶
			obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTableSub, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			})
			//#endregion

			//#region ç¹å»è¡éä¸é«äº®
			function check_row(obj) {
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).first().attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).first().attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			}
			//#endregion

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29];

			@@ -200,6 +200,7 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_BarCodeNote" id="get_BarCodeNote"><i class="layui-icon layui-icon-refresh-3"></i>æ¡ç æç»</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>ä¸æ¥</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print2" lay-event="btn-print2"><i class="layui-icon layui-icon-form"></i>æå°(ç»ç®å)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			@@ -354,6 +355,9 @@
			break;
			//æå°
			case 'btn-print': get_PrintReport();
			break;
			//æå°ç»ç®å
			case 'btn-print2': get_PrintReport2();
			break;
			//å¯¼åºexcel
			case 'get_export':
			@@ -1474,6 +1478,33 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
			}
			}
			//#endregion

			//#region æå°ææç»ç®æ¸å
			function get_PrintReport2() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			if (data[0].ç¶æ != "å·²å®¡æ ¸") {
			layer.alert("æå°å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 });
			return;
			}

			layer.open({
			type: 2
			, area: ['50%', '50%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillListByID', 'yes']
			, resize: false
			})