MES-WEB-LayUI.git

parent: 6168cbea | 补丁 | 提交 | ignore whitespace

zzr99

2022-01-12 532c308f65bd89ee88df06d6565ff85c0418470c

标准工时导出

4个文件已修改

	WebTM/views/基础资料/基础资料/InventoryAnalysis.html	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html	130 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/Sc_StationInBillList.html	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/InventoryAnalysis.html

@@ -591,7 +591,7 @@
                            option1.data = data1.list[0];
                            table1.render(option1);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
@@ -612,7 +612,7 @@
                            option2.data = data1.list[0];
                            table2.render(option2);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
@@ -633,7 +633,7 @@
                            option3.data = data1.list[0];
                            table3.render(option3);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
@@ -654,7 +654,7 @@
                            option4.data = data1.list[0];
                            table4.render(option4);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
@@ -675,7 +675,7 @@
                            option5.data = data1.list[0];
                            table5.render(option5);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
@@ -696,7 +696,7 @@
                            option6.data = data1.list[0];
                            table6.render(option6);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
@@ -717,7 +717,7 @@
                            option7.data = data1.list[0];
                            table7.render(option7);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
@@ -768,6 +768,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].æ¡ç .toString();
                    var HItemID = data[0].HItemID.toString();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOut", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
@@ -801,6 +802,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].æ¡ç .toString();
                    var HItemID = data[0].HItemID.toString();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOutBack", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
@@ -834,6 +836,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].æ¡ç .toString();
                    var HItemID = data[0].HItemID.toString();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeOtherIn", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
@@ -867,6 +870,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].æ¡ç .toString();
                    var HItemID = data[0].HItemID.toString();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeScrapOut", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
@@ -900,6 +904,7 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].æ¡ç .toString();
                    var HItemID = data[0].HItemID.toString();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdBack", //æ¹æ³æå¨é¡µé¢åæ¹æ³å

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldRepairOutBillEdit.html

@@ -354,6 +354,7 @@
            });
            //è¡åäºä»¶
            table.on('tool(mainTable)', function (obj) {
                alert(1);
                set_GridDelete(obj);   //è¡åå é¤
                set_GridCellCheck(obj); //è¡åå¿«æ·é®çé
            });

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú°ü×°µ¥/Sc_PackUnionBill.html

@@ -40,15 +40,15 @@
                                    </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="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                        <input type="date" class="layui-input" id="HDate" style="width:190px;">
                                    </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="date" class="layui-input" id="HEndDate" style="width:190px;">
                                        <input type="text" class="layui-input" id="HDepartName" style="width:190px;">
                                    </div>
                                </div>

@@ -57,12 +57,6 @@
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">é¨é¨åç§°</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" id="HDepartName" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æä»£ç </label>
                                        <div class="layui-input-block">
@@ -73,12 +67,6 @@
                                        <label class="layui-form-label">ç©æåç§°</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" id="HMaterName" 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" id="HMaterModel" style="width:190px;">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -184,61 +172,55 @@
            });
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                var columns = [
                    { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
                    , { field: 'hmainid', title: 'åæ®ID', hide: true }
                    , { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'åæ®å·', title: 'åæ®å·', width: 160 }

                    , { field: 'ç®±å·æ¡å½¢ç ', title: 'ç®±å·æ¡å½¢ç ', width: 160 }
                    , { field: 'åé', title: 'åé', width: 160 }
                    , { field: 'æ¯é', title: 'æ¯é', width: 160 }
                    , { field: 'ç®é', title: 'ç®é', width: 160 }

                    , { field: 'HProdOrgID', title: 'HProdOrgID', width: 200, hide: true }
                    , { field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 160 }
                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                    , { field: 'é¨é¨', title: 'é¨é¨', width: 160 }
                    , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
                    , { field: 'æä½å', title: 'æä½å', width: 160 }
                    , { field: 'å®¢æ·æ ç¾å·', title: 'å®¢æ·æ ç¾å·', width: 160 }

                    , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                    , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
                    , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 200 }
                    , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
                    , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200 }
                    , { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°', width: 200 }
                    , { field: 'æ°é', title: 'æ°é', width: 115 }

                    , { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
                    , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100 }
                    , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100 }
                    , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'å³éäºº', title: 'å³éäºº', width: 100 }
                    , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100 }
                    , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }

                ];
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: 10
                    , height: 'full-50'
                    , cols: [columns]
                    , limits: [50, 500, 1000, 5000]
                    , done: function (res, curr, count) {
                    , page: true
                    , cellMinWidth: 90
                    , limits: [10, 500, 1000, 5000, 10000]
                    , limit: 50
                    , cols: [[
                        { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
                        , { field: 'hmainid', title: 'åæ®ID', hide: true }
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 160 }

                        , { field: 'ç®±å·æ¡å½¢ç ', title: 'ç®±å·æ¡å½¢ç ', width: 160 }
                        , { field: 'åé', title: 'åé', width: 160 }
                        , { field: 'æ¯é', title: 'æ¯é', width: 160 }
                        , { field: 'ç®é', title: 'ç®é', width: 160 }

                        , { field: 'HProdOrgID', title: 'HProdOrgID', width: 200, hide: true }
                        , { field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 160 }
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: 'é¨é¨', title: 'é¨é¨', width: 160 }
                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
                        , { field: 'æä½å', title: 'æä½å', width: 160 }
                        , { field: 'å®¢æ·æ ç¾å·', title: 'å®¢æ·æ ç¾å·', width: 160 }

                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
                        , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
                        , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 200 }
                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
                        , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200 }
                        , { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°', width: 200 }
                        , { field: 'æ°é', title: 'æ°é', width: 115 }

                        , { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
                        , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100 }
                        , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100 }
                        , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'å³éäºº', title: 'å³éäºº', width: 100 }
                        , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100 }
                        , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }

                    ]]
                    }
                };
            }
            //å è½½ç½æ ¼
            function get_Display(sWhere) {
@@ -474,20 +456,15 @@
            }
            //å¿«éè¿æ»¤
            function get_FastQuery(table, option) {
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
                var HDate = $("#HDate").val();//å¼å§æ¥æ
                var HBillNo = $("#HBillNo").val(); //åæ®å·
                var HDepartName = $("#HDepartName").val();
                var HMaterNumber = $("#HMaterNumber").val();
                var HMaterName = $("#HMaterName").val();
                var HMaterModel = $("#HMaterModel").val();
                var HMakerMan = $("#HMakerMan").val();
                
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
                }
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
@@ -501,9 +478,6 @@
                if (HMaterName) {
                    sWhere += " and ç©æåç§° like '%" + HMaterName + "%'";
                }
                if (HMaterModel) {
                    sWhere += " and è§æ ¼åå· like '%" + HMaterModel + "%'";
                }
                if (HMakerMan) {
                    sWhere += " and å¶åäºº like '%" + HMakerMan + "%'";
                }
@@ -514,13 +488,11 @@
            }
            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBillNo").val("");
                $("#HDepartName").val("");
                $("#HMaterNumber").val("");
                $("#HMaterName").val("");
                $("#HMaterModel").val("");
                $("#HMakerMan").val("");
                sWhere = " where 1 = 1 ";
                get_Display(sWhere);

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_StationInBillList.html

@@ -70,6 +70,7 @@
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="SetExcel"><i class="layui-icon layui-icon-return"></i>Excelè¡¨æ ¼å¯¼åº</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
                            </div>
                        </script>
@@ -139,7 +140,8 @@
                    //ä¼åçº§
                    case 'btn-yxj': set_Yxj();
                        break;
                    case 'btn-back': set_Back();
                    //Excelè¡¨æ ¼å¯¼åº
                    case 'SetExcel': SetExcel();
                        break;
                };
            });
@@ -170,9 +172,7 @@
                    , { field: 'è¿ç«æ¶é´', title: 'è¿ç«æ¶é´', width: 160 }
                    , { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
                    , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
                    , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100 }
                    , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
                   
                    
                ];
                option = {
                    elem: '#mainTable'
@@ -299,6 +299,36 @@
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
                }
            }
            //Excelè¡¨æ ¼å¯¼åº
            function SetExcel() {
                layer.confirm("ç¡®å®å¯¼åºæææ°æ®å", { title: "å¯¼åºç¡®è®¤" }, function (index) {
                    var wait = layer.load();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel",
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾å°frameç´¢å¼
                                    var index = layer.getFrameIndex(window.name);
                                    //å³éå½åframe
                                    layer.close(index);
                                    //ä¿®æ¹ä¸ºååå·æ°çé¢
                                    window.location.reload();
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                            layer.close(wait);
                        }, error: function () {
                            layer.close(wait);
                            layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
                        }
                    });
                })
            }

            //é¢è§
            function get_ViewReport() {
                var checkStatus = table.checkStatus('mainTable')

			@@ -591,7 +591,7 @@
			option1.data = data1.list[0];
			table1.render(option1);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			@@ -612,7 +612,7 @@
			option2.data = data1.list[0];
			table2.render(option2);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			@@ -633,7 +633,7 @@
			option3.data = data1.list[0];
			table3.render(option3);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			@@ -654,7 +654,7 @@
			option4.data = data1.list[0];
			table4.render(option4);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			@@ -675,7 +675,7 @@
			option5.data = data1.list[0];
			table5.render(option5);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			@@ -696,7 +696,7 @@
			option6.data = data1.list[0];
			table6.render(option6);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			@@ -717,7 +717,7 @@
			option7.data = data1.list[0];
			table7.render(option7);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			@@ -768,6 +768,7 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].æ¡ç .toString();
			var HItemID = data[0].HItemID.toString();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOut", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			@@ -801,6 +802,7 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].æ¡ç .toString();
			var HItemID = data[0].HItemID.toString();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdOutBack", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			@@ -834,6 +836,7 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].æ¡ç .toString();
			var HItemID = data[0].HItemID.toString();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeOtherIn", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			@@ -867,6 +870,7 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].æ¡ç .toString();
			var HItemID = data[0].HItemID.toString();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeScrapOut", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			@@ -900,6 +904,7 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].æ¡ç .toString();
			var HItemID = data[0].HItemID.toString();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Gy_StockCheckItemBill/MakeProdBack", //æ¹æ³æå¨é¡µé¢åæ¹æ³å

			@@ -354,6 +354,7 @@
			});
			//è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			alert(1);
			set_GridDelete(obj); //è¡åå é¤
			set_GridCellCheck(obj); //è¡åå¿«æ·é®çé
			});

			@@ -40,15 +40,15 @@
			</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="date" class="layui-input" id="HBeginDate" style="width:190px;">
			<input type="date" class="layui-input" id="HDate" style="width:190px;">
			</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="date" class="layui-input" id="HEndDate" style="width:190px;">
			<input type="text" class="layui-input" id="HDepartName" style="width:190px;">
			</div>
			</div>

			@@ -57,12 +57,6 @@
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content">
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="HDepartName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-block">
			@@ -73,12 +67,6 @@
			<label class="layui-form-label">ç©æåç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="HMaterName" 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" id="HMaterModel" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			@@ -184,61 +172,55 @@
			});
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			var columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }

			, { field: 'ç®±å·æ¡å½¢ç ', title: 'ç®±å·æ¡å½¢ç ', width: 160 }
			, { field: 'åé', title: 'åé', width: 160 }
			, { field: 'æ¯é', title: 'æ¯é', width: 160 }
			, { field: 'ç®é', title: 'ç®é', width: 160 }

			, { field: 'HProdOrgID', title: 'HProdOrgID', width: 200, hide: true }
			, { field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 160 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 160 }
			, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
			, { field: 'æä½å', title: 'æä½å', width: 160 }
			, { field: 'å®¢æ·æ ç¾å·', title: 'å®¢æ·æ ç¾å·', width: 160 }

			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 200 }
			, { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200 }
			, { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°', width: 200 }
			, { field: 'æ°é', title: 'æ°é', width: 115 }

			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 100 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }

			];
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, cellMinWidth: 120
			, totalRow: true
			, limit: 10
			, height: 'full-50'
			, cols: [columns]
			, limits: [50, 500, 1000, 5000]
			, done: function (res, curr, count) {
			, page: true
			, cellMinWidth: 90
			, limits: [10, 500, 1000, 5000, 10000]
			, limit: 50
			, cols: [[
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }

			, { field: 'ç®±å·æ¡å½¢ç ', title: 'ç®±å·æ¡å½¢ç ', width: 160 }
			, { field: 'åé', title: 'åé', width: 160 }
			, { field: 'æ¯é', title: 'æ¯é', width: 160 }
			, { field: 'ç®é', title: 'ç®é', width: 160 }

			, { field: 'HProdOrgID', title: 'HProdOrgID', width: 200, hide: true }
			, { field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 160 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 160 }
			, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
			, { field: 'æä½å', title: 'æä½å', width: 160 }
			, { field: 'å®¢æ·æ ç¾å·', title: 'å®¢æ·æ ç¾å·', width: 160 }

			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 200 }
			, { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200 }
			, { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°', width: 200 }
			, { field: 'æ°é', title: 'æ°é', width: 115 }

			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 100 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd')}}</div>" }

			]]
			}
			};
			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			@@ -474,20 +456,15 @@
			}
			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HDate = $("#HDate").val();//å¼å§æ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HDepartName = $("#HDepartName").val();
			var HMaterNumber = $("#HMaterNumber").val();
			var HMaterName = $("#HMaterName").val();
			var HMaterModel = $("#HMaterModel").val();
			var HMakerMan = $("#HMakerMan").val();

			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";
			}
			if (HEndDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HEndDate + "'";
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			@@ -501,9 +478,6 @@
			if (HMaterName) {
			sWhere += " and ç©æåç§° like '%" + HMaterName + "%'";
			}
			if (HMaterModel) {
			sWhere += " and è§æ ¼åå· like '%" + HMaterModel + "%'";
			}
			if (HMakerMan) {
			sWhere += " and å¶åäºº like '%" + HMakerMan + "%'";
			}
			@@ -514,13 +488,11 @@
			}
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HBillNo").val("");
			$("#HDepartName").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			$("#HMaterModel").val("");
			$("#HMakerMan").val("");
			sWhere = " where 1 = 1 ";
			get_Display(sWhere);

			@@ -70,6 +70,7 @@
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="SetExcel"><i class="layui-icon layui-icon-return"></i>Excelè¡¨æ ¼å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			</div>
			</script>
			@@ -139,7 +140,8 @@
			//ä¼åçº§
			case 'btn-yxj': set_Yxj();
			break;
			case 'btn-back': set_Back();
			//Excelè¡¨æ ¼å¯¼åº
			case 'SetExcel': SetExcel();
			break;
			};
			});
			@@ -170,9 +172,7 @@
			, { field: 'è¿ç«æ¶é´', title: 'è¿ç«æ¶é´', width: 160 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 120, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd')}}</div>" }


			];
			option = {
			elem: '#mainTable'
			@@ -299,6 +299,36 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			}
			//Excelè¡¨æ ¼å¯¼åº
			function SetExcel() {
			layer.confirm("ç¡®å®å¯¼åºæææ°æ®å", { title: "å¯¼åºç¡®è®¤" }, function (index) {
			var wait = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel",
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			window.location.reload();
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			})
			}

			//é¢è§
			function get_ViewReport() {
			var checkStatus = table.checkStatus('mainTable')