yangle
2023-10-31 8de00eb3bc38614f093af4694d2a2d04f50c514f
工序不良品采集
缺料分析 加在途数量
计划排产 按照整数去排
6个文件已修改
1551 ■■■■ 已修改文件
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html 177 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/订单状态分布/Sc_OrderStateDistribution.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_CollectionOfSingleProductDefects.html 1361 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeArrangement.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\GIT仓库\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>E:\智云mes\mes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/MaterialShorAnalysisReport.html
@@ -159,6 +159,7 @@
            columns.push({ field: 'FNUMBER', title: '物料编码' });
            columns.push({ field: 'HMaterName', title: '物料名称' });
            columns.push({ field: 'HMaterModel', title: '物料规格' });
            columns.push({ field: '在途数量', title: '在途数量' });
            columns.push({ field: 'CountHQty', title: '合计' });
            columns.push({ field: 'FBASEQTY', title: '即时库存数量' });
            //获取两个月期之间的相差
@@ -213,7 +214,7 @@
                                if (NumCount > parseFloat(item[dateNowTime])) {
                                    NumCount -= parseFloat(item[dateNowTime]);
                                } else {
                                    var num = 6;//即时库存与日期挨着  ä»Žå³æ—¶åº“存开始算
                                    var num = 7;//即时库存与日期挨着  ä»Žå³æ—¶åº“存开始算
                                    tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
                                    rq = tr.children()[num + 1 + i];
                                    rq.style.color = '#f66161';//然后变色
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatForm.html
@@ -226,7 +226,7 @@
        var sWhere = "";
        var option = [];
        var HModName = "JIT_DayPlanPlatForm";
        //#endregion
        //#region è¿›å…¥é¡µé¢å³åŠ è½½
@@ -238,7 +238,7 @@
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
         //行内鼠标离开事件
        //行内鼠标离开事件
        table.on('edit(mainTable)', function (obj) {
            var myDate = new Date();
            var yyyy = myDate.getFullYear();
@@ -253,7 +253,7 @@
                    return;
                }
                if (!isNaN(parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]))) {
                    dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')])  ;
                    dateHQty += parseInt(obj.data[Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd')]);
                }
            }
            for (var i = 1; i < dd; i++) {
@@ -289,7 +289,7 @@
                return layer.msg("排产数量大于订单数量!")
            }
            //修改数据
            obj.update({
@@ -351,7 +351,7 @@
                        var SumMonth = new Date(yyyy, MM, 0).getDate(); //动态两月之差
                        //获取开始日期的天数
                        var HBEGINDATE = myDate.getDate(); //获取当天日期天数
                        var columns=[]
                        var columns = []
                        var k = 0;//收集循环次数
                        for (var j = 0; j <= (30 - k); j++) {
@@ -406,7 +406,7 @@
                case 'set_ReadyAsc':
                    set_ReadyAsc();
                    break;
            }
        });
@@ -417,7 +417,7 @@
        //保存
        form.on('submit(btnSave)', function (data) {
           var HWorkShopID = $("#HWorkShopID").val();//生产车间
            var HWorkShopID = $("#HWorkShopID").val();//生产车间
            if (HWorkShopID == 0) {
                return layer.msg("生产车间不能为空!");
            } else if (table.cache["mainTable"].length == 0) {
@@ -555,7 +555,7 @@
            //隐藏勾选字段
            DisPlay_HideColumn();
        }
         //#endregion
        //#endregion
        //获取组织
        function Organ() {
@@ -586,153 +586,184 @@
            var oneday = 1000 * 60 * 60 * 24;
            columns.push({ type: 'checkbox', fixed: 'left' });
            columns.push({ type: 'numbers', title: '序号'});
            columns.push({ type: 'numbers', title: '序号' });
            columns.push({ field: '单据号', title: '单据号', hide: true });
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150});
            columns.push({ field: '销售订单号', title: '销售订单号', width: 150 });
            columns.push({ field: '生产订单号', title: '生产订单号', width: 150, style: 'background-color: #f9f9f9;' });
            columns.push({ field: '生产订单明细行号', title: '生产订单明细行号', width: 150 });
            columns.push({ field: '优先级', title: '优先级', width: 150, edit: 'text' });
            columns.push({ field: '生产组织', title: '生产组织', width:150 });
            columns.push({ field: '物料代码', title: '物料编码', width:150 });
            columns.push({ field: '物料名称', title: '物料名称', width:150 });
            columns.push({ field: '规格型号', title: '规格型号', width:150 });
            columns.push({ field: '销售订单数量', title: '销售订单数量', width:150 });//0
            columns.push({ field: '生产组织', title: '生产组织', width: 150 });
            columns.push({ field: '物料代码', title: '物料编码', width: 150 });
            columns.push({ field: '物料名称', title: '物料名称', width: 150 });
            columns.push({ field: '规格型号', title: '规格型号', width: 150 });
            columns.push({ field: '销售订单数量', title: '销售订单数量', width: 150 });//0
            columns.push({ field: '计划数量', title: '生产订单数量', width: 150 });//0
            columns.push({field: '日计划数量总量', title: '日计划数量总量', width: 150});//0
            columns.push({ field: '日计划数量总量', title: '日计划数量总量', width: 150 });//0
            columns.push({ field: '今日之前日计划数量', title: '今日之前日计划数量', width: 150 });//0
            columns.push({ field: '计划开始日期', title: '预计开工日期', width: 150, templet: "<div>{{d.计划开始日期 ==null ?'':layui.util.toDateString(d.计划开始日期, 'yyyy-MM-dd')}}</div>"});
            columns.push({ field: '计划开始日期', title: '预计开工日期', width: 150, templet: "<div>{{d.计划开始日期 ==null ?'':layui.util.toDateString(d.计划开始日期, 'yyyy-MM-dd')}}</div>" });
            columns.push({ field: '计划结束日期', title: '计划结束日期', width: 150, event: "HPlanEndDate" });
            columns.push({ field: '订单可排数量', title: '订单可排数量', width: 150});
            columns.push({ field: '订单可排数量', title: '订单可排数量', width: 150 });
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150, edit: 'text' });
            columns.push({ field: '昨日数量', title: '昨日数量'});
            columns.push({ field: '生产车间', title: '生产车间', width: 150});
            columns.push({ field: '昨日数量', title: '昨日数量' });
            columns.push({ field: '生产车间', title: '生产车间', width: 150 });
            columns.push({ field: '生产资源', title: '生产资源', width: 150, edit: 'text', event: "HSourceID" });
            columns.push({
                field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')]);
                }  })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')]);
                }  })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')]);
                } })//0
                }
            })//0
            columns.push({
                field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
                    return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')]);
                }  })//0
                }
            })//0
            columns.push({ field: 'T31', title: 'T31', width: 70 });//0
            columns.push({ field: '订单类型', title: '订单类型', width: 150 });
@@ -747,7 +778,7 @@
            columns.push({ field: '小时产能', title: '小时产能', width: 150 });
            columns.push({ field: '生产周期', title: '生产周期', width: 150 });
            columns.push({ field: '最迟开工日期', title: '最迟开工日期', width: 150, templet: "<div>{{d.最迟开工日期 =='' ?'':layui.util.toDateString(d.最迟开工日期, 'yyyy-MM-dd')}}</div>" });
            columns.push({ field: '最迟完工日期', title: '最迟完工日期', width: 150, templet: "<div>{{d.最迟完工日期 =='' ?'':layui.util.toDateString(d.最迟完工日期, 'yyyy-MM-dd')}}</div>"});
            columns.push({ field: '最迟完工日期', title: '最迟完工日期', width: 150, templet: "<div>{{d.最迟完工日期 =='' ?'':layui.util.toDateString(d.最迟完工日期, 'yyyy-MM-dd')}}</div>" });
            columns.push({ field: '源单主内码', title: '源单主内码', width: 150 });
            columns.push({ field: '源单子内码', title: '源单子内码', width: 150 });
            columns.push({ field: 'hmainid', title: '日计划工单主码', width: 150 });
@@ -755,12 +786,12 @@
            columns.push({ field: '计量单位', title: '计量单位', width: 150 });
            columns.push({ field: '拆单数量', title: '拆单数量', width: 150 });//0
            columns.push({ field: '未入库数量', title: '未入库数量', width: 150 });//0
            columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide:true });
            columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide:true });
            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
            columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
            columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
            columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide: true });
            columns.push({ field: '生产资源代码', title: '生产资源代码', width: 150, hide: true });
            columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
            columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
            columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
            columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
            columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
@@ -843,7 +874,7 @@
                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
                type: "GET",
                async: false,
                data: { "sWhere": HinterID_S.toString(),"num":1 },
                data: { "sWhere": HinterID_S.toString(), "num": 1 },
                success: function (data1) {
                    if (data1.count == 1) {
                        for (var i = 0; i < 31; i++) {
@@ -1064,7 +1095,7 @@
            //清空本地存储的数据
            localStorage.removeItem("JIT_DayPlanPlatForm_HWorkShop");
            var data = {
                HWorkShopID:  $("#HWorkShopID").val()
                HWorkShopID: $("#HWorkShopID").val()
                , HWorkShopIDName: $("#HWorkShopIDName").val()
            }
            //本地存储
@@ -1152,7 +1183,7 @@
                , area: ['90%', '90%']//大小
                , title: '齐套分析明细表'//标题
                , shift: 2//弹出动画
                , content: ['../../生产管理/齐套分析/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID+'&HMainICMOInterID=' + HMainICMOInterID+'&HICMOInterID=' + HICMOInterID, 'yes']
                , content: ['../../生产管理/齐套分析/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID + '&HMainICMOInterID=' + HMainICMOInterID + '&HICMOInterID=' + HICMOInterID, 'yes']
            })
        }
@@ -1238,7 +1269,7 @@
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        }
        //生产订单选单
        function get_btnICMOBill() {
@@ -1261,7 +1292,7 @@
                    var hmainid = [];
                    //var HEntryID = [];
                    for (var i = 0; i < checkStatus.data.length; i++) {
                        if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid)==-1) {
                        if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) {
                            hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
                        }
                    }
@@ -1348,7 +1379,7 @@
                        $('#HProgressBar').html('')
                        table.render(option);
                    } else {
                        //layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1427,7 +1458,7 @@
                data: { "sWhere": sql },
                success: function (data1) {
                    if (data1.count == 1) {
                    } else {
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
@@ -1712,7 +1743,7 @@
        }
        var TableData = [];
        function get_HFData(num,nums) {
        function get_HFData(num, nums) {
            if (num == 0) {
                TableData = option.data;
            } else {
@@ -1882,9 +1913,17 @@
                                        //}
                                    }
                                    else {
                                        if (sLeftQty > parseFloat(sWorkQty * ds[i]["剩余工时"])) {
                                            grd.data[iRow][grd.cols[0][j].field] = parseFloat(sWorkQty * ds[i]["剩余工时"]);
                                            sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["剩余工时"]));
                                        var dayWorkQty = sWorkQty * ds[i]["剩余工时"];
                                        var Numzu = dayWorkQty.toString().split(".");
                                        if (Numzu.length > 1) {
                                            dayWorkQty = parseInt(Numzu[0]) + 1;
                                        } else {
                                            dayWorkQty = parseInt(Numzu[0]);
                                        }
                                        if (sLeftQty > dayWorkQty) {
                                            grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
                                            sLeftQty = sLeftQty - dayWorkQty;
                                            //oSub = new ClsGridValues();
                                            //oSub.iRow = iRow;
                                            //oSub.iCol = j;
@@ -1895,7 +1934,7 @@
                                            //oClsGridValues.Add(oSub);
                                        }
                                        else {
                                            grd.data[iRow][grd.cols[0][j].field] = sLeftQty;
                                            grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
                                            //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
                                            sLeftQty = 0;
                                            //oSub = new ClsGridValues();
WebTM/views/Éú²ú¹ÜÀí/¶©µ¥×´Ì¬·Ö²¼/Sc_OrderStateDistribution.html
@@ -151,7 +151,7 @@
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-logout imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">停机</span>
                                                    <span class="imgtitle">ç»´ä¿®</span>
                                                </div>
                                            </div>
                                        </div>
@@ -302,7 +302,7 @@
                                html1 += '<p><span>状态:</span><span>' + LoadData1[i].状态 + '</span></p>';
                                html1 += '<p><span>运行时长:</span><span>' + LoadData1[i].状态 + '</span></p>';
                                html1 += '<p><span>维修时长:</span><span>' + LoadData1[i].计划数量 + '</span></p>';
                                html1 += '<p><span>稼动率:</span><span>' + LoadData1[i].HDatePlanQty + '</span></p>';
                                html1 += '<p><span>稼动率:</span><span>35%</span></p>';
                                html1 += '</dd>';
                                html1 += '</dl>';
                                html1 += '</div>';
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html
@@ -19,8 +19,8 @@
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">新增</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">不良品保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">报废保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave_BL" id="btnSave_BL">不良品保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave_BF" id="btnSave_BF">报废保存</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -36,7 +36,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">条形码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" id="HBarCode" style="width:500px;">
                                                <input type="text" class="layui-input" name="HBarCodeSN" lay-verify="HBarCodeSN" id="HBarCodeSN" style="width:500px;">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -59,7 +59,7 @@
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HBadReasonName" name="HBadReasonName" id="HBadReasonName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" lay-verify="HBadReasonID" name="HBadReasonID" id="HBadReasonID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBadReason" id="btnHBadReason" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
@@ -81,7 +81,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
                                                <input type="hidden" name="HPRDORGID" id="HPRDORGID" lay-verify="HPRDORGID">
                                                <input type="hidden" name="HBillNo_bak" id="HBillNo_bak" lay-verify="HBillNo_bak">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -96,7 +96,7 @@
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
@@ -119,7 +119,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">产品SN</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBarCodeSN" lay-verify="HBarCodeSN" id="HBarCodeSN" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" id="HBarCode" value="" style="background-color:#efefef4d;display: inline-block;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -129,7 +129,6 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value=""  style="background-color:#efefef4d;">
                                                <input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0" >
                                                <input type="hidden" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" id="HICMOEntryID" value="0" >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -137,7 +136,6 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
                                                <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
                                                <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -145,7 +143,7 @@
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" lay-verify="HGroupName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
@@ -157,7 +155,7 @@
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnUnit" id="btnUnit" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
@@ -407,8 +405,11 @@
                    //console.log(d.data);
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo").val(d.data[0].HBillNo);
                    $("#HBillNo_bak").val(d.data[0].HBillNo);
                }
            });
            //初始化界面
            set_ClearBill();
        } else if (OperationType == 2) {
            //禁用组织选项
            //$("#HOrgID").attr("disabled", true);
@@ -421,6 +422,7 @@
                success: function (d) {
                    $("#HInterID").val(d.data[0].HInterID);
                    $("#HBillNo").val(d.data[0].HBillNo);
                    $("#HBillNo_bak").val(d.data[0].HBillNo);
                }
            });
        }
@@ -431,296 +433,49 @@
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //选择产品代码按钮
        form.on('submit(btnSearchMater)', function () {
            get_checkSearchMater();
        //条形码回车方法
        $('#HBarCodeSN').on('keydown', function (event) {
            var HBarCode = $('#HBarCodeSN').val();
            if (event.keyCode == 13) {
                if (!HBarCode) {
                    layer.msg("条形码不能为空!")
                    return;
                }
                txtHBarCode_KeyDown(HBarCode);
            }
        });
        //选择工序按钮
        form.on('submit(btnSearchProc)', function () {
            get_checkSearchProc();
        //选择不良原因
        form.on('submit(btnHBadReason)', function () {
            btnHBadReason();
        });
        //选择计量单位按钮
        form.on('submit(btnUnit)', function () {
            get_checkUnit();
        //选择质检员
        form.on('submit(btnHEmp)', function () {
            btnHEmp();
        });
        //选择生产资源
        form.on('submit(btnHSource)', function () {
            btnHSource();
        });
        //选择生产班组按钮
        form.on('submit(btnGroup)', function () {
            get_checkGroup();
        form.on('submit(btnHGroup)', function () {
            btnHGroup();
        });
        //选择工作中心按钮
        form.on('submit(btnWorkCenter)', function () {
            get_checkWorkCenter();
        });
        //选择工艺路线大类按钮
        form.on('submit(btnRoutingGroup)', function () {
            get_checkRoutingGroup();
        });
        //审核
        form.on('submit(set_CheckBill)', function (data) {
            set_CheckBill(data);
        });
        //反审核
        form.on('submit(set_AbandonCheck)', function (data) {
            set_AbandonCheck(data);
        });
        //关闭
        form.on('submit(set_CloseBill)', function (data) {
            set_CloseBill(data);
        });
        //反关闭
        form.on('submit(set_CancelCloseBill)', function (data) {
            set_CancelCloseBill(data);
        });
        //是否默认工艺
        form.on('checkbox(checkboxHStandard)', function (data) {
            $("#HStandard").val(data.elem.checked);
        });
        //是否转工序
        form.on('checkbox(checkboxIsProNo)', function (data) {
            if (data.elem.checked) {
                $("#IsProNo").val("1");
            }
            else {
                $("#IsProNo").val("0");
            }
        });
        //#region å¤é€‰æ¡†
        //委外协助
        form.on('checkbox(HSupFlag)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.HSupFlag = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //下道流转工序
        form.on('checkbox(HNextProcFlag)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.HNextProcFlag = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //流转工序
        form.on('checkbox(HFlowProc)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.HFlowProc = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //标准定额
        form.on('checkbox(HStdFlag)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.HStdFlag = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //自动移转
        form.on('checkbox(HAutoTrunFlag)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.HAutoTrunFlag = data.elem.checked;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //#endregion
        //行选择处理(工序类型)
        form.on('select(HProcType)', function (data) {
            //获取下拉框选中的值
            var elem = data.othis.parents('tr');
            var dataindex = elem.attr("data-index");
            $.each(option.data, function (index, value) {
                if (value.LAY_TABLE_INDEX == dataindex) {
                    value.HProcType = data.value;//把选中下拉框id值赋值给表格缓存
                }
            });
        });
        //头工具栏事件
        table.on('toolbar(mainTable)', function (obj) {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            //新增行表格数据
            var NewRow = {
                "HProcNo": (table.cache["mainTable"].length + 1) * 10, "HProcID_S": 0, "HProcType": "主工序", "HCenterID_S": 0, "HCenterID_SName": ""
                , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
                , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "工序": ""
                , "HProcID": 0, "工作中心代码": "", "HCenterID": 0, "工作中心": "", "HSupID": 0
                , "供应商代码": "", "供应商": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
                , "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
                , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
                , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
                , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                , "HWHID": 0, "HWHName": "", "HRemark": ""
                , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
                , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
            };
            switch (obj.event) {
                case 'btn-AddLine':
                    table.cache["mainTable"].push(NewRow);
                    option.data = table.cache["mainTable"];
                    table.render(option);
                    for (var i = 1; i <= option.data.length; i++) {
                        $('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
                        //委外协助
                        if (option.data[i - 1].HSupFlag) {
                            $('#HSupFlag' + i + '').attr("checked", true);
                        }
                        //下道流转工序
                        if (option.data[i - 1].HNextProcFlag) {
                            $('#HNextProcFlag' + i + '').attr("checked", true);
                        }
                        //流转工序
                        if (option.data[i - 1].HFlowProc) {
                            $('#HFlowProc' + i + '').attr("checked", true);
                        }
                        //标准定额
                        if (option.data[i - 1].HStdFlag) {
                            $('#HStdFlag' + i + '').attr("checked", true);
                        }
                        //自动移转
                        if (option.data[i - 1].HAutoTrunFlag) {
                            $('#HAutoTrunFlag' + i + '').attr("checked", true);
                        }
                    }
                    form.render('select');
                    form.render('checkbox');
                    break;
                case 'btn-CopyLine':
                    var copydata = JSON.stringify(data);
                    if (data.length <= 0) {
                        layer.msg("请选择需要复制的一行!");
                    }
                    else if (data.length > 1) {
                        layer.msg("只能选择复制一行!");
                    }
                    else {
                        var copydata2 = copydata.substring(1, copydata.length);//去除首行字符'['
                        var copyrow = copydata2.substring(0, copydata2.length - 1);//去除末尾字符']'
                        table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                        option.data = table.cache["mainTable"];//将数据绑定到data上
                        table.render(option);//将数据渲染到表格上
                        for (var i = 1; i <= option.data.length; i++) {
                            $('#HProcType' + i + '').find("option[value='" + option.data[i - 1].HProcType + "']").attr("selected", true);
                            //委外协助
                            if (option.data[i - 1].HSupFlag) {
                                $('#HSupFlag' + i + '').attr("checked", true);
                            }
                            //下道流转工序
                            if (option.data[i - 1].HNextProcFlag) {
                                $('#HNextProcFlag' + i + '').attr("checked", true);
                            }
                            //流转工序
                            if (option.data[i - 1].HFlowProc) {
                                $('#HFlowProc' + i + '').attr("checked", true);
                            }
                            //标准定额
                            if (option.data[i - 1].HStdFlag) {
                                $('#HStdFlag' + i + '').attr("checked", true);
                            }
                            //自动移转
                            if (option.data[i - 1].HAutoTrunFlag) {
                                $('#HAutoTrunFlag' + i + '').attr("checked", true);
                            }
                        }
                        form.render('select');
                        form.render('checkbox');
                    }
                    break;
                //列设置
                case 'set_HideColumn':
                    get_HideColumn();
                    break;
                //上一行
                case 'btn_up':
                    btn_up(data);
                    break;
                //下一行
                case 'btn_under':
                    btn_under(data);
                    break;
                //刷新流水号
                case 'btn_Refresh':
                    btn_Refresh(data);
                    break;
            }
        });
        //行内事件
        table.on('tool(mainTable)', function (obj) {
            set_GridDelete(obj);   //行内删除
            set_GridCellCheck(obj); //行内快捷键筛选
        });
        //行内鼠标离开事件
        table.on('edit(mainTable)', function (obj) {
            if (obj.field == "HProcNo") {
                var num = 0;
                for (var i = 0; i < option.data.length; i++) {
                    if (obj.value == option.data[i]["HProcNo"]) {
                        num += 1;
                    }
                    if (num > 1) {
                        layer.msg("流水号:" + obj.value + "重复!");
                        return false;
                    }
                }
            }
        })
        $('#HName').on('keydown', function (event) {//工艺路线名称
            if (event.keyCode == 118) {
                layer.msg("工艺路线名称F7按钮")
            }
        });
        //保存提交
        form.on('submit(btnSave)', function (data) {//提交
        form.on('submit(btnSave_BL)', function (data) {//提交
            if (AllowLoadData(data)) {
                set_AddNew(data);
                set_AddNew(data,"不良");
            }
        });
        form.on('submit(btnSave_BF)', function (data) {//提交
            if (AllowLoadData(data)) {
                set_AddNew(data,"报废");
            }
        });
@@ -733,35 +488,98 @@
            }
        });
        //监听提交
        form.verify({
            numberOrEmpty: function (value, item) {
                // if (value != '') {
                if (!/^\d+$/.test(value)) {
                    return '不能为空或数字或者0';
                }
                //}
            }
        });
        //#endregion
        //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
        //初始化界面
        function set_ClearBill() {
            get_Display();
        }
        //产品选择页面
        function get_checkSearchMater() {
        //查询
        function get_Display() {
            var sWhere = " and ç¼–码='" + sessionStorage["Czybm"]+"'";
            var ajaxLoad = layer.load();
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/Cj_CollectionOfSingleProductDefectsUserList',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        $("#HDeptID").val(data1.data[0]["HDeptID"]);
                        $("#HDeptName").val(data1.data[0]["车间"]);
                        $("#HProName").val(data1.data[0]["工序"]);
                        $("#HSourceID").val(data1.data[0]["HSourceID"]);
                        $("#HSourceName").val(data1.data[0]["生产资源"]);
                        $("#HEmpID").val(data1.data[0]["HEmpID"]);
                        $("#HEmpName").val(data1.data[0]["质检员"]);
                        $("#HGroupID").val(data1.data[0]["HGroupID"]);
                        $("#HGroupName").val(data1.data[0]["生产班组"]);
                        layer.close(ajaxLoad);
                        //layer.alert("查询成功", { icon: 1 });
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //条码回车查询
        function txtHBarCode_KeyDown(HBarCode) {
            var index = layer.load();
            $.ajax({
                type: "GET",
                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
                async: true,
                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"]},
                dataType: "json",
                success: function (data1) {
                    if (data1.count == 1) {
                        layer.close(index);
                        $("#HICMOBillNo").val(data1.data[0]["生产订单"]);
                        $("#HICMOInterID").val(data1.data[0]["HICMOInterID"]);
                        $("#HProcExchBillNo").val(data1.data[0]["工序流转卡"]);
                        $("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
                        $("#HMaterNumber").val(data1.data[0]["物料编码"]);
                        $("#HMaterID").val(data1.data[0]["HMaterID"]);
                        $("#HMaterName").val(data1.data[0]["物料名称"]);
                        $("#HModel").val(data1.data[0]["规格型号"]);
                        $("#HBarCode").val(data1.data[0]["条码"]);
                    }
                    else {
                        layer.close(index);
                        layer.msg(data1.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                    $("#HBarCodeSN").val("");
                },
                error: function (err) {
                    layer.close(index);
                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                }
            });
        }
         //不良原因选择页面
        function btnHBadReason() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '物料表'//标题
                , title: '不良原因列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                , content: ['../../基础资料/生产基础资料/Gy_BadReason.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -770,31 +588,23 @@
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HMaterID").val(checkStatus.data[0].HItemID);//物料id
                    $("#HMaterName").val(checkStatus.data[0].HName);//物料名称
                    $("#HMaterNumber").val(checkStatus.data[0].HNumber);//物料代码
                    $("#HMaterModel").val(checkStatus.data[0].HModel);//规格型号
                    $("#HUnitID").val(checkStatus.data[0].HUnitID);//计量单位id
                    $("#HUnitName").val(checkStatus.data[0].HUnitName);//计量单位名称
                    if ($("#HName").val() == "") {
                        $("#HName").val(checkStatus.data[0].HNumber);
                    }
                    $("#HBadReasonID").val(checkStatus.data[0].HItemID);
                    $("#HBadReasonName").val(checkStatus.data[0].不良原因名称);
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //工序选择页面
        function get_checkSearchProc() {
         //质检员选择页面
        function btnHEmp() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '工序列表'//标题
                , title: '质检员列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_ProcList.html', 'yes']
                , content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -803,24 +613,23 @@
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HMainProcID").val(checkStatus.data[0].HItemID);//工序id
                    $("#HMainProcIDName").val(checkStatus.data[0].工序);//工序id
                    $("#HEmpID").val(checkStatus.data[0].HItemID);
                    $("#HEmpName").val(checkStatus.data[0].职员名称);
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //计量单位选择页面
        function get_checkUnit() {
        //生产资源选择页面
        function btnHSource() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '计量单位表'//标题
                , title: '生产资源列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_UnitList.html', 'yes']
                , content: ['../../基础资料/生产基础资料/Gy_Source.html', 'yes']
                , btn: ['确定', '取消']
                , btn1: function (index, layero) {//按钮【按钮一】的回调
                    var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -829,8 +638,8 @@
                        return layer.msg('请选择数据');
                    }
                    //获取数据
                    $("#HUnitID").val(checkStatus.data[0].HItemID);//计量单位id
                    $("#HUnitName").val(checkStatus.data[0].HName);//计量单位名称
                    $("#HSourceID").val(checkStatus.data[0].HItemID);
                    $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
@@ -839,7 +648,7 @@
        }
        //生产班组选择页面
        function get_checkGroup() {
        function btnHGroup() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
@@ -856,7 +665,7 @@
                    }
                    //获取数据
                    $("#HGroupID").val(checkStatus.data[0].HItemID);//班组id
                    $("#HGroupIDName").val(checkStatus.data[0].班组名称);//计量单位名称
                    $("#HGroupName").val(checkStatus.data[0].班组名称);//计量单位名称
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
@@ -864,57 +673,6 @@
            })
        }
        //工作中心选择页面
        function get_checkWorkCenter() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '工作中心表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_WorkCenterList.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('请选择数据');
                    }
                    //获取数据
                    $("#HMainCenterID").val(checkStatus.data[0].HItemID);//工作中心id
                    $("#HMainCenterIDName").val(checkStatus.data[0].工作中心);//计量单位名称
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //工艺路线大类选择页面
        function get_checkRoutingGroup() {
            layer.open({
                type: 2//弹窗类型
                , skin: 'layui-layer-rim' //加上边框
                , area: ['90%', '90%']//大小
                , title: '工艺路线大类列表'//标题
                , shift: 2//弹出动画
                , content: ['../../Baseset/基础资料/Gy_RoutingGroup.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('请选择数据');
                    }
                    //获取数据
                    $("#HRoutingGroupID").val(checkStatus.data[0].HItemID);//工艺路线大类id
                    $("#HRoutingGroupIDName").val(checkStatus.data[0].HName);//工艺路线大类名称
                    layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                }
                , btn2: function (index, layero) { }
            })
        }
        //获取参数
        function getUrlVars() {
            var vars = [], hash;
@@ -927,567 +685,18 @@
            return vars;
        }
        //行内删除
        function set_GridDelete(obj) {
            var data = obj.data;
            var rowIndex = $(obj.tr).attr("data-index");
            if (obj.event === 'del') {
                layer.confirm('真的删除行吗?', function (index) {
                    if (rowIndex === '0') {
                        layer.msg('首行无法删除!!!');
                    } else {
                        var oldData = table.cache["mainTable"];
                        oldData.splice(obj.tr.data('index'), 1)
                        option.data = oldData;//将数据绑定到data上
                        table.render(option);
                        layer.close(index);
                    }
                });
            }
        }
        //获取 è½¬å·¥åº ç³»ç»Ÿå‚æ•°
        function get_xt() {
            $.ajax({
                type: "get",
                url: GetWEBURL() + '/LEMS/MES_XT_List',
                async: false,
                data: { "sWhere": "" },
                success: function (result) {
                    if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                        if (result.data.Gy_RoutingBill_SaveAutoLastProc == "Y") {
                            $("#IsProNo").val("1");
                            $("input[name='checkboxIsProNo']").prop("checked", true);
                            form.render("checkbox");
                        } else {
                            $("#IsProNo").val("0");
                            $("input[name='checkboxIsProNo']").prop("checked", false);
                        }
                    }
                    layer.closeAll("loading");
                }
            })
        }
        //审核
        function set_CheckBill() {
            layer.confirm("确认要审核吗?", function (index) {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { icon: 1 });
                            layer.close(wait);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                        layer.close(wait);
                    }
                });
            })
        }
        //反审核
        function set_AbandonCheck() {
            layer.confirm("确认要反审核吗?", function (index) {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { icon: 1 });
                            layer.close(wait);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                        layer.close(wait);
                    }
                });
            })
        }
        //关闭
        function set_CloseBill() {
            layer.confirm("确认要关闭吗?", function (index) {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { icon: 1 });
                            layer.close(wait);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                        layer.close(wait);
                    }
                });
            })
        }
        //反关闭
        function set_CancelCloseBill() {
            layer.confirm("确认要反关闭吗?", function (index) {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
                    type: "GET",
                    data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            layer.msg(result.Message, { icon: 1 });
                            layer.close(wait);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                        layer.close(wait);
                    }
                });
            })
        }
        //行内删除快捷键
        function set_GridCellCheck(obj) {
            $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                if (event.key == "F7") {
                    //产线中心
                    if (obj.event == "CheckHCenterID_S") {
                        //打开维修项目小窗体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "产线中心列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_LineCenter.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "HCenterID_SName": checkStatus.data[0].HName
                                    , "HCenterID_S": checkStatus.data[0].HItemID
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    //工序
                    if (obj.event == "CheckHProcID") {
                        // å°çª—体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "工序列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/生产基础资料/Gy_Process.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length == 0) {
                                    return layer.msg("请至少选择一条数据!");
                                }
                                //获取工序代码
                                var ProcessNumber = [];
                                for (var i = 0; i < checkStatus.data.length; i++) {
                                    ProcessNumber.push("'" + checkStatus.data[i]["工序代码"] + "'");
                                }
                                //获取当前位置所在行数
                                var NowNum = 0;
                                for (var i = 0; i < option.data.length; i++) {
                                    if (obj.data["HProcNo"] == option.data[i]["HProcNo"]) {
                                        NowNum = i + 1;
                                    }
                                }
                                //查询工作中心的数据
                                var WorkCente = [];
                                var sWhere = "select  isnull(a.HItemID,'') HCenterID, isnull(a.HNumber,'') å·¥ä½œä¸­å¿ƒä»£ç , isnull(a.HName,'') å·¥ä½œä¸­å¿ƒåç§° ,p.HItemID HProcID,p.HName å·¥åºåç§°  from Gy_Process p left join Gy_WorkCenter a on p.HWorkCenterID=a.HItemID  where p.HNumber in (" + ProcessNumber.toString() + ") order by p.HNumber ";
                                $.ajax({
                                    type: "GET",
                                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //方法所在页面和方法名
                                    async: false,
                                    data: { "sWhere": sWhere },
                                    success: function (data) {
                                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                            WorkCente = data.data;
                                        }
                                        else {
                                            layer.msg(data.Message, { icon: 5 });
                                        }
                                        layer.closeAll("loading");
                                    },
                                    error: function (err) {
                                        layer.msg("错误:" + err, { icon: 5 });
                                    }
                                });
                                //判断选择的数据总数 æ˜¯å¦å¤§äºŽè¡¨æ ¼çŽ°æœ‰çš„æ•°æ®
                                if (ProcessNumber.length > option.data.length - (NowNum - 1)) {
                                    //获取表格剩余行数量
                                    var num = ProcessNumber.length - option.data.length + (NowNum - 1);
                                    //循环赋值  åœ¨å·²æœ‰çš„表格赋值
                                    var j = 0;
                                    for (var i = (NowNum - 1); i < option.data.length; i++) {
                                        option.data[i]["工序"] = WorkCente[j]["工序名称"];
                                        option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
                                        option.data[i]["工作中心"] = WorkCente[j]["工作中心名称"];
                                        option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
                                        option.data[i]["工作中心代码"] = WorkCente[j]["工作中心代码"];
                                        j++;
                                    }
                                    //在下方添加新的表格数据
                                    for (var i = 0; i < num; i++) {
                                        option.data.push({
                                            "HProcNo": (table.cache["mainTable"].length + i + 1) * 10, "HProcID_S": 0, "HProcType": "主工序", "HCenterID_S": 0, "HCenterID_SName": ""
                                            , "HWorkQty_S": 0, "HSubStdEmpQty_S": 0, "HMouldNo": "", "HChangeMould": 0, "HPackStd": ""
                                            , "HPack": "", "HPutArea": "", "HMyWorkDays": 0, "HMyFixWorkDays": 0, "工序": WorkCente[j]["工序名称"]
                                            , "HProcID": WorkCente[j]["HProcID"], "工作中心代码": WorkCente[j]["工作中心代码"], "HCenterID": WorkCente[j]["HCenterID"], "工作中心": WorkCente[j]["工作中心名称"], "HSupID": 0
                                            , "供应商代码": "", "供应商": "", "HSupFlag": false, "HTimeUnit": "", "HUnitTime": 0
                                            , "HWorkQty": 1, "HPassRate": 100, "HOverRate": 0, "HReadyTime": 0, "HQueueTime": 0
                                            , "HMoveTime": 0, "HNextProcFlag": false, "HFlowProc": false, "HSubStdEmpQty": 0, "HSubCanUseSourceQty": 0
                                            , "HFixPrice": 0, "HProcPrice": 0, "HBadPrice": 0, "HWasterPrice": 0, "HStdFlag": false
                                            , "HBeginDayQty": 0, "HBeginFixQty": 0, "HFixWorkDays": 0, "HTrunWorkDays": 0, "HReadyTimes": 0
                                            , "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
                                            , "HProcWorkNum": "", "HBadWHID": 0, "HBadWHName": "", "HWasterWHID": 0, "HWasterWHName": ""
                                            , "HWHID": 0, "HWHName": "", "HRemark": ""
                                            , "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
                                            , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
                                            , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
                                        })
                                        j++;
                                    }
                                } else {
                                    //循环赋值  åœ¨å·²æœ‰çš„表格赋值
                                    var j = 0;
                                    for (var i = (NowNum - 1); i < (NowNum - 1) + ProcessNumber.length; i++) {
                                        option.data[i]["工序"] = WorkCente[j]["工序名称"];
                                        option.data[i]["HProcID"] = WorkCente[j]["HProcID"];
                                        option.data[i]["工作中心"] = WorkCente[j]["工作中心名称"];
                                        option.data[i]["HCenterID"] = WorkCente[j]["HCenterID"];
                                        option.data[i]["工作中心代码"] = WorkCente[j]["工作中心代码"];
                                        j++;
                                    }
                                }
                                table.render(option);
                                //var HCenterID = 0;
                                //var HCenterNUmber = "";
                                //var HCenterName = "";
                                ////更新表格缓存的数据
                                //obj.update({
                                //    "工序": checkStatus.data[0].工序名称
                                //    , "HProcID": checkStatus.data[0].HItemID
                                //    , "工作中心": HCenterName
                                //    , "HCenterID": HCenterID
                                //    , "工作中心代码": HCenterNUmber
                                //})
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    //工作中心
                    if (obj.event == "CheckHCenterID") {
                        //打开人员表  å°çª—体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "工作中心列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../Baseset/基础资料/Gy_WorkCenterList.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "工作中心": checkStatus.data[0].工作中心
                                    , "HCenterID": checkStatus.data[0].HItemID
                                    , "工作中心代码": checkStatus.data[0].工作中心代码
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    //供应商
                    if (obj.event == "CheckHSupID") {
                        //打开人员表  å°çª—体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "供应商列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/采购基础资料/Gy_Supplier.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "供应商": checkStatus.data[0].供应商名称
                                    , "HSupID": checkStatus.data[0].HItemID
                                    , "供应商代码": checkStatus.data[0].供应商代码
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    //不良品仓
                    if (obj.event == "HBadWHID") {
                        //打开人员表  å°çª—体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/公用基础资料/Gy_Warehouse.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "HBadWHID": checkStatus.data[0].HItemID
                                    , "HBadWHName": checkStatus.data[0].仓库名称
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    //良品仓
                    if (obj.event == "HWHID") {
                        //打开人员表  å°çª—体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/公用基础资料/Gy_Warehouse.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "HWHID": checkStatus.data[0].HItemID
                                    , "HWHName": checkStatus.data[0].仓库名称
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    //报废品仓
                    if (obj.event == "HWasterWHID") {
                        //打开人员表  å°çª—体
                        layer.open({
                            type: 2
                            , skin: "layui-layer-rim" //加上边框
                            , title: "仓库列表"  //标题
                            , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                            , shift: 2 //弹出动画
                            , area: ["90%", "90%"] //窗体大小
                            , maxmin: true //设置最大最小按钮是否显示
                            , content: ["../../基础资料/公用基础资料/Gy_Warehouse.html", "yes"]
                            , btn: ["确定", "取消"]
                            , btn1: function (index, laero) {
                                //按钮一  çš„回调
                                var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据
                                if (checkStatus.data.length != 1) {
                                    return layer.msg("请选择一条数据");
                                }
                                //更新表格缓存的数据
                                obj.update({
                                    "HWasterWHID": checkStatus.data[0].HItemID
                                    , "HWasterWHName": checkStatus.data[0].仓库名称
                                })
                                layer.close(index);//关闭弹窗
                            }
                        })
                    }
                    //首件检验方案
                    if (obj.event == "HQCSchemeNumber_Fst") {
                        layer.open({
                            type: 2//弹窗类型
                            , skin: 'layui-layer-rim' //加上边框
                            , area: ['90%', '90%']//大小
                            , title: '检验方案列表'//标题
                            , shift: 2//弹出动画
                            , content: ['../../Baseset/基础资料/Gy_QCCheckProjectListView.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('请选择数据');
                                }
                                obj.update({
                                    "HQCSchemeID_Fst": checkStatus.data[0].HItemID
                                    , "HQCSchemeNumber_Fst": checkStatus.data[0].检验方案代码
                                    , "HQCSchemeName_Fst": checkStatus.data[0].方案名称
                                })
                                layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                            }
                            , btn2: function (index, layero) { }
                        })
                    }
                    //转序检验方案
                    if (obj.event == "HQCSchemeNumber_Proc") {
                        layer.open({
                            type: 2//弹窗类型
                            , skin: 'layui-layer-rim' //加上边框
                            , area: ['90%', '90%']//大小
                            , title: '检验方案列表'//标题
                            , shift: 2//弹出动画
                            , content: ['../../Baseset/基础资料/Gy_QCCheckProjectListView.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('请选择数据');
                                }
                                obj.update({
                                    "HQCSchemeID_Proc": checkStatus.data[0].HItemID
                                    , "HQCSchemeNumber_Proc": checkStatus.data[0].检验方案代码
                                    , "HQCSchemeName_Proc": checkStatus.data[0].方案名称
                                })
                                layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                            }
                            , btn2: function (index, layero) { }
                        })
                    }
                    //巡检检验方案
                    if (obj.event == "HQCSchemeNumber_Patrol") {
                        layer.open({
                            type: 2//弹窗类型
                            , skin: 'layui-layer-rim' //加上边框
                            , area: ['90%', '90%']//大小
                            , title: '检验方案列表'//标题
                            , shift: 2//弹出动画
                            , content: ['../../Baseset/基础资料/Gy_QCCheckProjectListView.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('请选择数据');
                                }
                                obj.update({
                                    "HQCSchemeID_Patrol": checkStatus.data[0].HItemID
                                    , "HQCSchemeNumber_Patrol": checkStatus.data[0].检验方案代码
                                    , "HQCSchemeName_Patrol": checkStatus.data[0].方案名称
                                })
                                layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                            }
                            , btn2: function (index, layero) { }
                        })
                    }
                    obj.event = "";
                    return false;
                }
            })
        }
        //保存HMaker
        function set_AddNew(data) {
        function set_AddNew(data, HResult) {
            var num = [];
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
                    num.push(table.cache["mainTable"][i])
                }
            }
            data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
            var sMainStr = JSON.stringify(data.field);
            var sSubStr = JSON.stringify(num);
            //var hentryid = linteridSub;//子表 æŽ’序id
            var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + HBillSubType;
            var sMainSub = sMainStr + ';' + HResult + ";" + sessionStorage["HUserName"] ;
            var index = layer.load();
            $.ajax({
                type: "POST",
                url: GetWEBURL() + "/Gy_RoutingBill/AddBill",
                //url:"http://localhost:12761/Gy_RoutingBill/AddBill",
                async: true,
                url: GetWEBURL() + "/Cj_SingleStation/ProcessBLSave",
                async: false,
                data: { "sMainSub": sMainSub },
                dataType: "json",
                success: function (data) {
@@ -1508,289 +717,23 @@
            });
        }
        function f_alert(sMsg) {
            layer.alert(sMsg, { icon: 5 });
        }
        //非空验证
        function AllowLoadData(data) {
            if ($("#HBillNo").val() == "") {
                layer.msg("单据号不能为空!");
            var HBarCode = $("#HBarCode").val();
            if (HBarCode == "") {
                layer.msg("产品SN不能为空!")
                return false;
            }
            if ($("#HName").val() == "") {
                layer.msg("工艺路线名称不能为空!");
            var HBadReasonID = $("#HBadReasonID").val();
            if (HBadReasonID == 0) {
                layer.msg("不良原因不能为空!")
                return false;
            }
            if ($("#HMaterNumber").val() == "") {
                layer.msg("产品代码没有选择!");
                return false;
            }
            if ($("#HMaterName").val() == "") {
                layer.msg("产品名称不能为空!");
                return false;
            }
            if ($("#HMaterModel").val() == "") {
                layer.msg("规格型号不能为空!");
                return false;
            }
            if ($("#HUnitName").val() == "") {
                layer.msg("计量单位没有选择");
                return false;
            }
            //if ($("#HMainProcIDName").val() == "") {
            //    layer.msg("工序没有选择");
            //    return false;
            //}
            //if ($("#HMainCenterIDName").val() == "") {
            //    layer.msg("工作中心没有选择");
            //    return false;
            //}
            //if ($("#HGroupIDName").val() == "") {
            //    layer.msg("生产班组没有选择");
            //    return false;
            //}
            var num = [];
            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i] != "") {
                    //流水号
                    if ($.inArray(option.data[i]["HProcNo"], num) == -1) {
                        num.push(option.data[i]["HProcNo"]);
                    } else {
                        layer.msg("第" + (i + 1) + "行,流水号:" + option.data[i]["HProcNo"] + "重复!");
                        return false;
                    }
                    //流水号不为空
                    if (option.data[i]["HProcNo"] == "") {
                        layer.msg("第" + (i + 1) + "行:流水号不能为空!");
                        return false;
                    }
                    //工序不为空
                    if (option.data[i]["HProcID"] == "0") {
                        layer.msg("第" + (i + 1) + "行:工序不能为空!");
                        return false;
                    }
                    //外协标记
                    if (option.data[i]["HSupFlag"]) {
                        if (option.data[i]["HSupID"] == "0") {
                            layer.msg("第" + (i + 1) + "行:供应商不能为空!");
                            return false;
                        }
                    }
                    //else {
                    //    if (option.data[i]["HCenterID"] == "0") {
                    //        layer.msg("第" + (i + 1) + "行:工作中心不能为空!");
                    //        return false;
                    //    }
                    //}
                    //良率 å¤§äºŽ0  å°äºŽç­‰äºŽ100
                    if (parseInt(option.data[i]["HPassRate"]) <= 0) {
                        layer.msg("第" + (i + 1) + "行:良率必须大于0!");
                        return false;
                    }
                    if (parseInt(option.data[i]["HPassRate"]) > 100) {
                        layer.msg("第" + (i + 1) + "行:良率必须小于等于100!");
                        return false;
                    }
                    //仓库重复
                    if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWasterWHID"] != 0) {
                        if (option.data[i]["HBadWHID"] == option.data[i]["HWasterWHID"]) {
                            layer.msg("第" + (i + 1) + "行:不良品仓和报废品仓重复!");
                            return false;
                        }
                    }
                    if (option.data[i]["HBadWHID"] != 0 && option.data[i]["HWHID"] != 0) {
                        if (option.data[i]["HBadWHID"] == option.data[i]["HWHID"]) {
                            layer.msg("第" + (i + 1) + "行:不良品仓和良品仓重复!");
                            return false;
                        }
                    }
                    if (option.data[i]["HWasterWHID"] != 0 && option.data[i]["HWHID"] != 0) {
                        if (option.data[i]["HWasterWHID"] == option.data[i]["HWHID"]) {
                            layer.msg("第" + (i + 1) + "行:报废品仓和良品仓重复!");
                            return false;
                        }
                    }
                }
            }
            return true;
        }
        //隐藏列设置
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
            for (var i = 0; i < urlLen.length - 4; i++) {
                contentUrl += "../";
            }
            colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
            contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
            layer.open({
                type: 2
                , skin: "layui-layer-rim" //加上边框
                , title: "隐藏列设置"  //标题
                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                , shift: 2 //弹出动画
                , area: ["50%", "90%"] //窗体大小
                , maxmin: true //设置最大最小按钮是否显示
                , content: [contentUrl, "yes"]
                , btn: ["确定", "取消"]
                , btn1: function (index, laero) {
                    //刷新表格数据
                    DisPlay_HideColumn();
                    //更新表格缓存的数据
                    layer.close(index);//关闭弹窗
                }
            })
        }
        //上一行
        function btn_up(data) {
            if (data.length != 1) {
                layer.msg("请选择一行数据!");
            } else if (option.data[0]["HProcNo"] == data[0]["HProcNo"]) {
                layer.msg("首行数据无法移动!");
            } else {
                var tables = [];
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HProcNo"] == data[0]["HProcNo"]) {
                        tables.push(option.data[i - 1]);
                        data[0].LAY_CHECKED = true;
                        option.data[i - 1] = data[0];
                        option.data[i] = tables[0];
                        table.render(option);
                        break;
                    }
                }
            }
        }
        //下一行
        function btn_under(data) {
            if (data.length != 1) {
                layer.msg("请选择一行数据!");
            } else if (option.data[option.data.length - 1]["HProcNo"] == data[0]["HProcNo"]) {
                layer.msg("末行数据无法移动!");
            } else {
                var tables = [];
                for (var i = 0; i < option.data.length; i++) {
                    if (option.data[i]["HProcNo"] == data[0]["HProcNo"]) {
                        tables.push(option.data[i + 1]);
                        data[0].LAY_CHECKED = true;
                        option.data[i + 1] = data[0];
                        option.data[i] = tables[0];
                        table.render(option);
                        break;
                    }
                }
            }
        }
        //刷新流水号
        function btn_Refresh(data) {
            for (var i = 0; i < option.data.length; i++) {
                option.data[i]["HProcNo"] = (i + 1) * 10;
            }
            table.render(option);
        }
        //显示列数据
        function DisPlay_HideColumn() {
            $.ajax({
                url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                type: "GET",
                data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                async: false,
                success: function (data1) {
                    if (data1.data.length != 0) {
                        var dataCol = [];//数据库查询出的列数据
                        var titleData = ["程序号", "本工序确认记录", "自动移转", "换单准备时间", "本道准备时间", "上道循环周期", "上道固定天数", "开工余量(固数)", "开工余量(天数)", "标准定额", "报废单价", "不合格单价", "工序工价", "班产定额", "可操作设备数", "标准人数", "流转工序", "下道流转工序", "固定生产天数", "生产周期", "暂放区", "周转箱", "周转箱标准", "换模时间", "转移时间", "排队时间", "准备时间", "产线人数", "产线产能", "产线中心", "良率", "加工数量", "运行时间", "时间单位", "图纸编号", "模具编号", "良品仓", "报废品仓", "不良品仓", "工序类型"];//不需要显示的字段 å¯æ‰©å±•
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }
                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
                            }
                        }
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                    } else {
                        table.render(option);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            })
        }
        //#endregion
    });
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeArrangement.html
@@ -115,7 +115,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AdutArrangement"><i class="layui-icon layuiiconform"></i>取消排缸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AdutArrangement"><i class="layui-icon layuiiconform"></i>取消排单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_print"><i class="layui-icon layuiiconform"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
@@ -123,7 +123,7 @@
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>排缸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Arrangement"><i class="layui-icon layuiiconform"></i>排单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2"><i class="layui-icon layuiiconform"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>