YL
2022-01-19 a92c6b71bdb19a677e2aafed0b58b248ad9bc761
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
2个文件已添加
13个文件已修改
1583 ■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_LineCenter.html 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_Mobile.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillList.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 634 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EqpMaintenanceBillList_PDA.html 485 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/设备管理/Sb_EqpMaintenanceBillList_PDAEdit.html 245 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_StationInBillList.html 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -86,6 +86,7 @@
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
@@ -821,6 +822,7 @@
    <Content Include="views\设备管理\Sb_EqpConkBookBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDAEdit.html" />
    <Content Include="views\设备管理\Sb_EqpRepairCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDocCheckItemBillList_PDAEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillEdit.html" />
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_LineCenter.html
New file
@@ -0,0 +1,102 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>产线中心列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-card">
            <!--<div class="layui-card-header"></div>-->
            <div class="layui-card-body" style="padding: 15px;">
                <form class="layui-form" action="" lay-filter="component-form-group">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
                            <div class="layui-input-inline">
                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                            </div>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
            form.on('submit(HQuery)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            form.on('submit(FH)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
                 , data = checkStatus.data;
                parent.GetHReasonValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());
            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                , { field: 'HItemID', width: 150, title: '产线中心ID', hide: true }
                , { field: 'HNumber', width: 150, title: '产线中心代码' }
                , { field: 'HName', width: 150, title: '产线中心名称', sort: true }
              ]]
              , page: true
            });
            ///加载显示数据
            function RoadQuery(Where) {
                var Value = Where;
                if (Value == null) {
                    Value = '';
                }
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/Gy_LineCenter_Json",
                    async: true,
                    data: { "BadReason": Value },
                    //data: { "Value": Value },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {
                            data: ajaxReturnData
                            , height: 'full-10'
                            , loading: false
                            , done: function (index, res) {
                            }
                        });
                    },
                    error: function (result) {
                        console.log(result);
                        //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                    }
                });
            };
        });
    </script>
</body>
</html>
WebTM/views/index_Mobile.html
@@ -417,9 +417,9 @@
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                          <a lay-href="设备管理/Sb_EqpMaintenanceBillList_PDA.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              è®¾å¤‡ç»´ä¿®è®°å½•单null
                              è®¾å¤‡ç»´ä¿®è®°å½•单
                          </a>
                      </dd>
                  </dl>
WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ßάÐÞÅɹ¤µ¥/Sc_MouldRepairSendWorkBillEdit.html
@@ -328,12 +328,12 @@
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号', totalRow: true }
                    , { field: '子维修项目', title: '维修项目', edit: 'text', event: "HRepairID"}
                    , { field: 'HRepairID', title: '维修项目id', hide: true}
                    , { field: '子维修项目', title: '维修项目', edit: 'text', event: "HRepairID" }
                    , { field: 'HRepairID', title: '维修项目id', hide: true }
                    , { field: '子维修项目代码', title: '维修项目代码' }
                    , { field: 'HRepairExplanation', title: '维修要求', edit: 'text' }
                    , { field: '子负责人代码', title: '负责人代码', edit: 'text', event: "HManagerID"}//, hide: true
                    , { field: 'HManagerID', title: 'id', width: 115, hide: true}//, hide: true
                    , { field: '子负责人代码', title: '负责人代码', edit: 'text', event: "HManagerID" }//, hide: true
                    , { field: 'HManagerID', title: 'id', width: 115, hide: true }//, hide: true
                    , { field: '子负责人', title: '负责人', width: 115 }
                    , { field: 'HMoney', title: '维修费用', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
@@ -341,7 +341,7 @@
                ]]
            };
            //初始表格数据
            var rowdata = [{ "子维修项目":"","HRepairID": 0, "子维修项目代码": "", "HRepairExplanation": "", "子负责人代码": "", "HManagerID": 0, "子负责人": "", "HMoney": 0, "HRemark": "" }];
            var rowdata = [{ "子维修项目": "", "HRepairID": 0, "子维修项目代码": "", "HRepairExplanation": "", "子负责人代码": "", "HManagerID": 0, "子负责人": "", "HMoney": 0, "HRemark": "" }];
            option.data = rowdata;
            table.render(option);
@@ -398,7 +398,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = { "子维修项目": "","HRepairID": 0, "子维修项目代码": "", "HRepairExplanation": "", "子负责人代码": "", "HManagerID": 0, "子负责人": "", "HMoney": 0, "HRemark": "" };
                var NewRow = { "子维修项目": "", "HRepairID": 0, "子维修项目代码": "", "HRepairExplanation": "", "子负责人代码": "", "HManagerID": 0, "子负责人": "", "HMoney": 0, "HRemark": "" };
                switch (obj.event) {
                    case 'btn-AddLine':
                        table.cache["mainTable"].push(NewRow);
@@ -716,7 +716,7 @@
                        obj.event = "";
                        return false;
                    }
                })
            }
            //保存数据
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdBackBillList.html
@@ -154,6 +154,10 @@
                        , { field: '单据号', title: '单据号', width: 195 }
                        , { field: '单据类型', title: '单据类型', width: 110 }
                        , { field: '物料代码', title: '物料代码', width: 110 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '仓库代码', title: '仓库代码', width: 125 }
                        , { field: '仓库', title: '仓库', width: 125 }
@@ -166,10 +170,6 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门', title: '部门', width: 125 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: '摘要', title: '摘要', width: 125 }
                        , { field: '表头备注', title: '表头备注', width: 125 }
                        //, { field: '内部单据号', title: '内部单据号', width: 115 }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdOutBillEdit.html
@@ -238,6 +238,25 @@
            
            //#endregion
            //判断用户是否有查询权限
            //$.ajax({
            //    url: GetWEBURL() + "/Sc_MouldProdOutBill/QueryUserRight",
            //    type: "GET",
            //    data: { "UserName": sessionStorage["HUserName"] },
            //    success: function (result) {
            //        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
            //            });
            //        } else {
            //            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
            //        }
            //    }, error: function () {
            //        layer.alert("发生错误!", { icon: 5 });
            //    }
            //});
            //
            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化表单插件
            set_InitFrom();
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdOutBillList.html
@@ -155,6 +155,10 @@
                        , { field: '单据号', title: '单据号', width: 195 }
                        , { field: '单据类型', title: '单据类型', width: 110 }
                        , { field: '物料代码', title: '物料代码', width: 110 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '仓库代码', title: '仓库代码', width: 125 }
                        , { field: '仓库', title: '仓库', width: 125 }
@@ -167,10 +171,6 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门', title: '部门', width: 125 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: '摘要', title: '摘要', width: 125 }
                        , { field: '表头备注', title: '表头备注', width: 125 }
                        , { field: '内部单据号', title: '内部单据号', width: 115 }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapOutBillList.html
@@ -217,7 +217,10 @@
                        , { field: '单据号', title: '单据号', width: 160 }
                        , { field: '单据类型', title: '单据类型', width: 160 }
                        , { field: '物料代码', title: '物料代码', width: 110 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
                        , { field: '负责人代码', title: '负责人代码', width: 200 }
                        , { field: '负责人名称', title: '负责人名称', width: 200 }
@@ -230,10 +233,6 @@
                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
                        , { field: '部门代码', title: '部门代码', width: 115 }
                        , { field: '部门名称', title: '部门名称', width: 200 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: '摘要', title: '摘要', width: 200 }
                        , { field: '内部单据号', title: '内部单据号', width: 115 }
                        , { field: '备注', title: '备注', width: 200 }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldOtherInBillList.html
@@ -153,6 +153,10 @@
                        , { field: '日期', title: '日期', width: 125, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 195 }
                        , { field: '单据类型', title: '单据类型', width: 110 }
                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true }
                        , { field: '往来类型名称', title: '往来类型', width: 200 }
                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
                        , { field: '往来单位', title: '往来单位', width: 200 }
                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
                        , { field: '仓库代码', title: '仓库代码', width: 125 }
                        , { field: '仓库', title: '仓库', width: 125 }
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -9,6 +9,11 @@
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .main-btn { /*头部主按钮*/
            padding: 0 2px; /*调整按钮左右空隙大小*/
@@ -19,12 +24,28 @@
        .btn-title {
            font-size: 16px;
        }
        /*.table-select {
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
            overflow: visible !important;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }*/
        }
        .layui-form-item .layui-inline {
            margin-top: 5px;
            margin-bottom: 5px;
            margin-right: 0px;
        }
        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
@@ -75,6 +96,12 @@
                                                <input type="text" class="layui-input" lay-verify="HName" name="HName" id="HName">
                                            </div>
                                        </div>
                                        <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" lay-verify="HPicNumVer" name="HPicNumVer" id="HPicNumVer">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -87,18 +114,24 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">产品名称</label>
                                            <label class="layui-form-label" style="width: 75px;">产品名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" style="background-color:#efefef4d;width:90%" readonly>
                                                <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
                                            </div>
                                        </div>
                                        <!--<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="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">规格型号</label>
                                            <div class="layui-input-block" style="margin-left: 105px;">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" readonly>
                                            </div>
                                        </div>-->
                                        </div>
                                        <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="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -114,7 +147,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工艺路线大类</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" class="layui-input" lay-verify="HRoutingGroupID" name="HRoutingGroupID" id="HRoutingGroupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="text" class="layui-input" lay-verify="HRoutingGroupIDName" name="HRoutingGroupIDName" id="HRoutingGroupIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnRoutingGroup" id="btnRoutingGroup" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -123,11 +156,17 @@
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">时间单位</label>
                                            <div class="layui-input-block" style="margin-left: 120px;width: 182px;">
                                            <div class="layui-input-block" style="margin-left: 120px;width: 172px;">
                                                <select name="HMainTimeUnit" lay-verify="HMainTimeUnit" id="HMainTimeUnit">
                                                    <option value="小时">小时</option>
                                                    <option value="天">天</option>
                                                </select>
                                            </div>
                                        </div>
                                        <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="HMaterTexture" lay-verify="HMaterTexture" id="HMaterTexture" value="" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                    </div>
@@ -162,6 +201,12 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">成品编号</label>
                                            <div class="layui-input-block" style="margin-left: 100px;">
                                                <input type="text" class="layui-input" name="HProductNum" lay-verify="HProductNum" id="HProductNum" value="" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -181,6 +226,12 @@
                                            <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="HMainPrice" id="HMainPrice" lay-verify="HMainPrice" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">版本</label>
                                            <div class="layui-input-block" style="margin-left: 105px;">
                                                <input type="text" class="layui-input" name="HVerNum" lay-verify="HVerNum" id="HVerNum" value="" onmouseover="this.title=this.value">
                                            </div>
                                        </div>
                                    </div>
@@ -311,6 +362,7 @@
                            </div>
                        </div>
                    </div>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
@@ -327,17 +379,50 @@
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
    </script>
    <script type="text/html" id="HSupColor">
        {{#  if(d.HSupFlag === "true"){ }}
        <span style="color: white;background-color:#5FB878;">{{ d.HSupFlag }}</span>
        {{#  } else { }}
        <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
        {{#  } }}
    <!--行下拉选择(工序类型)-->
    <script type="text/html" id="HProcType">
        <select name="HProcType" lay-filter="HProcType" id="HProcType{{d.LAY_TABLE_INDEX+1}}">
            <option value="主工序">主工序</option>
            <option value="辅助工序">辅助工序</option>
        </select>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <!--复选框 å§”外协助-->
    <script type="text/html" id="HSupFlag">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HSupFlag" lay-filter="HSupFlag" id="HSupFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>
    <!--复选框 ä¸‹é“流转工序-->
    <script type="text/html" id="HNextProcFlag">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HNextProcFlag" lay-filter="HNextProcFlag" id="HNextProcFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>
    <!--复选框 æµè½¬å·¥åº-->
    <script type="text/html" id="HFlowProc">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HFlowProc" lay-filter="HFlowProc" id="HFlowProc{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>
    <!--复选框 æ ‡å‡†å®šé¢-->
    <script type="text/html" id="HStdFlag">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HStdFlag" lay-filter="HStdFlag" id="HStdFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>
    <!--复选框 è‡ªåŠ¨ç§»è½¬-->
    <script type="text/html" id="HAutoTrunFlag">
        <div class="layui-input-block" style="margin-left: 20px;">
            <input type="checkbox" name="HAutoTrunFlag" lay-filter="HAutoTrunFlag" id="HAutoTrunFlag{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
        </div>
    </script>
    <script>
        layui.config({
@@ -361,7 +446,17 @@
            //初始表格数据
            var rowdata = [{
                "HProcNo": "", "HProcID": "0", "HSupID": "0", "HSupFlag": "false", "HWorkQty": 0, "HPassRate": 0, "HRemark": ""
                "HProcNo": "", "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": 0, "HPassRate": 0, "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": ""
            }];
            //#endregion
@@ -386,6 +481,8 @@
            //判断是否新增
            if (linterid == null || linterid == 0) {
                linteridSub = -1;
                OperationType = 1;
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
@@ -408,28 +505,83 @@
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , limit: 500 //每页默认显示的数量
                , cellMinWidth: 90
                , cellMinWidth: 120
                , height: 400
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号', totalRow: true }
                    , { field: 'HProcNo', title: '流水号', edit: 'text' }
                    , { field: '工序', title: '工序', edit: 'text' }
                    , { field: 'HProcID', title: '工序ID' }//, hide: true
                    , { field: '工作中心代码', title: '工作中心代码', edit: 'text', width: 115 }
                    , { field: '工作中心', title: '工作中心', edit: 'text' }
                    , { field: 'HSupID', title: '供应商ID' }
                    , { field: '供应商代码', title: '供应商代码', edit: 'text', width: 110 }
                    , { field: '供应商', title: '供应商', edit: 'text' }
                    , { field: 'HSupFlag', title: '外协标记', templet: '#HSupColor', event: "HSupFlagEvent" }
                    , { field: 'HWorkQty', title: '加工数量', edit: 'text' }
                    , { field: 'HPassRate', title: '良率', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { field: 'HProcID_S', title: '工段', edit: 'text' }
                    , { field: 'HProcType', title: '工序类型', templet: '#HProcType' }//选择
                    , { field: 'HCenterID_SName', title: '产线中心', edit: 'text', event: "CheckHCenterID_S" }//f7
                    , { field: 'HCenterID_S', title: '产线中心id', hide: true }//hide: true
                    , { field: 'HWorkQty_S', title: '产线产能', edit: 'text' }
                    , { field: 'HSubStdEmpQty_S', title: '产线人数', edit: 'text' }
                    , { field: 'HMouldNo', title: '模具编号', edit: 'text' }
                    , { field: 'HChangeMould', title: '换模时间', edit: 'text' }
                    , { field: 'HPackStd', title: '周转箱标准', edit: 'text' }
                    , { field: 'HPack', title: '周转箱', edit: 'text' }
                    , { field: 'HPutArea', title: '暂放区', edit: 'text' }
                    , { field: 'HMyWorkDays', title: '生产周期', edit: 'text' }
                    , { field: 'HMyFixWorkDays', title: '固定生产天数', edit: 'text' }
                    , { field: '工序', title: '工序', edit: 'text', event: "CheckHProcID" }//f7
                    , { field: 'HProcID', title: '工序ID', hide: true }//, hide: true
                    , { field: '工作中心代码', title: '工作中心代码' }//不填
                    , { field: 'HCenterID', title: '工作中心id', hide: true }//, hide: true
                    , { field: '工作中心', title: '工作中心', edit: 'text', event: "CheckHCenterID" }//f7
                    , { field: 'HSupID', title: '供应商ID', hide: true }
                    , { field: '供应商代码', title: '供应商代码' }
                    , { field: '供应商', title: '供应商', edit: 'text', width: 110, event: "CheckHSupID" }//f7
                    , { field: 'HSupFlag', title: '外协标记', templet: "#HSupFlag" }//checkbox
                    , { field: 'HTimeUnit', title: '时间单位', edit: 'text' }
                    , { field: 'HUnitTime', title: '运行时间', edit: 'text' }
                    , { field: 'HWorkQty', title: '加工数量', edit: 'text' }//默认
                    , { field: 'HPassRate', title: '良率', edit: 'text' }//默认
                    , { field: 'HOverRate', title: '超额比例', edit: 'text' }
                    , { field: 'HReadyTime', title: '准备时间', edit: 'text' }
                    , { field: 'HQueueTime', title: '排队时间', edit: 'text' }
                    , { field: 'HMoveTime', title: '转移时间', edit: 'text' }
                    , { field: 'HNextProcFlag', title: '下道流转工序', templet: "#HNextProcFlag" }//chenbox
                    , { field: 'HFlowProc', title: '流转工序', templet: "#HFlowProc" }//chenbox
                    , { field: 'HSubStdEmpQty', title: '标准人数', edit: 'text' }
                    , { field: 'HSubCanUseSourceQty', title: '可操作设备数', edit: 'text' }
                    , { field: 'HFixPrice', title: '班产定额', edit: 'text' }//默认
                    , { field: 'HProcPrice', title: '工序工价', edit: 'text' }//默认
                    , { field: 'HBadPrice', title: '不合格单价', edit: 'text' }//默认
                    , { field: 'HWasterPrice', title: '报废单价', edit: 'text' }//默认
                    , { field: 'HStdFlag', title: '标准定额', templet: "#HStdFlag" }//chenbox
                    , { field: 'HBeginDayQty', title: '开工余量(天数)', edit: 'text' }
                    , { field: 'HBeginFixQty', title: '开工余量(固数)', edit: 'text' }
                    , { field: 'HFixWorkDays', title: '上道固定天数', edit: 'text' }
                    , { field: 'HTrunWorkDays', title: '上道循环周期', edit: 'text' }
                    , { field: 'HReadyTimes', title: '本道准备时间', edit: 'text' }
                    , { field: 'HICMOReadyTimes', title: '换单准备时间', edit: 'text' }
                    , { field: 'HAutoTrunFlag', title: '自动移转', templet: "#HAutoTrunFlag" }//chenbox
                    , { field: 'HTechnologyParameter', title: '工艺参数', edit: 'text' }
                    , { field: 'HPicNum', title: '图纸编号', edit: 'text' }
                    , { field: 'HProcCheckNote', title: '本工序确认记录', edit: 'text' }
                    , { field: 'HProcWorkNum', title: '程序号', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
                //, done: function (res, curr, count) {
                //    $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');
                //    option.data = res.data;
                //    //去掉下拉框失焦事件否则在下拉框里输入值
                //    $('.layui-form-select').find('input').unbind("blur");
                //    //表格重载回显下拉框里的数据
                //    $('tr').each(function (e) {
                //        var $cr = $(this);
                //        var dataIndex = $cr.attr("data-index");
                //        $.each(option.data, function (index, value) {
                //            //alert(value)
                //            if (value.LAY_TNDEX == dataIndex) {
                //                $cr.find('input').val(value.HProcType);
                //            }
                //        });
                //    });
                //}
            };
            }
            //初始加载表格
            option.data = rowdata;
            table.render(option);
@@ -468,15 +620,86 @@
                get_checkRoutingGroup();
            });
            //是否默认工艺
            form.on('checkbox(checkboxHStandard)', function (data) {
                $("#HStandard").val(data.elem.checked);
            });
            //是否启用
            //form.on('checkbox(checkboxHUseFlag)', function (data) {
            //    $("#HUseFlag").val(data.elem.checked);
            //});
            //#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) {
@@ -484,15 +707,51 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    //"HProcNo": "", "工序": "", "HProcID": "0", "工作中心代码": "", "工作中心": "", "HSupID": "0", "供应商代码": ""
                    //, "供应商": "", "HSupFlag": "false", "HWorkQty": "", "HPassRate": "", "HRemark": ""
                    "HProcNo": "", "HProcID": "0", "HSupID": "0", "HSupFlag": "false", "HWorkQty": 0, "HPassRate": 0, "HRemark": ""
                    "HProcNo": "", "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": 0, "HPassRate": 0, "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": ""
                };
                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++) {
                            console.log(option.data[i - 1].HSupFlag)
                            $('#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);
@@ -508,7 +767,31 @@
                            table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.render(option);//将数据渲染到表格上
                            //layer.alert(copyrow);
                            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;
                }
@@ -516,37 +799,9 @@
            //行内事件
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗?', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除!!!');
                        } else {
                            obj.del();
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            layer.close(index);
                        }
                    });
                }
                //单击改变外协标记值
                if (obj.event === 'HSupFlagEvent') {
                    var flag = obj.data.HSupFlag;
                    if (flag === "false") {
                        flag = "true";
                    }
                    else if (flag === "true") {
                        flag = "false";
                    }
                    else {
                        flag = "true";
                    }
                    obj.update({
                        HSupFlag: flag
                    });
                }
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
            });
            $('#HName').on('keydown', function (event) {//工艺路线名称
@@ -557,9 +812,9 @@
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                }
                //if (AllowLoadData(data)) {
                set_AddNew(data);
                //}
            });
            //选择不良原因
@@ -673,7 +928,8 @@
                //window.close();//关闭当前页
            })
            form.on('submit(Saver)', function (data) {//保存
            form.on('submit(Saver)', function (data) { //保存
                //debugger;
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -718,6 +974,8 @@
            });
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰çš„æ–¹æ³•
@@ -742,6 +1000,7 @@
                        $("#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);//规格型号
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
@@ -852,14 +1111,14 @@
                    , btn2: function (index, layero) { }
                })
            }
            //工艺路线大类选择页面
            function get_checkRoutingGroup() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工作中心表'//标题
                    , title: '工艺路线大类列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../Baseset/基础资料/Gy_RoutingGroup.html', 'yes']
                    , btn: ['确定', '取消']
@@ -888,6 +1147,158 @@
                    vars[hash[0]] = hash[1];
                }
                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) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除!!!');
                        } else {
                            obj.del();
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            layer.close(index);
                        }
                    });
                }
            }
            //行内删除快捷键
            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: ["../../Baseset/基础资料/Gy_ProcList.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].工序
                                        , "HProcID": checkStatus.data[0].HItemID
                                    })
                                    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: ["../../Baseset/基础资料/Gy_SupplierList.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].HName
                                        , "HSupID": checkStatus.data[0].HItemID
                                        , "供应商代码": checkStatus.data[0].HNumber
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                            })
                        }
                        obj.event = "";
                        return false;
                    }
                })
            }
            //编辑 é¡µé¢èµ‹å€¼
@@ -919,8 +1330,8 @@
                            , "HUnitName": d.data[0].计量单位
                            , "HUnitID": d.data[0].hunitid
                            , "HMainTimeUnit": d.data[0].运行时间单位
                            , "HMainProcIDName": d.data[0].工序
                            , "HMainProcID": d.data[0].hprocid
                            , "HMainProcIDName": d.data[0].工序名称
                            , "HMainProcID": d.data[0].HMainProcID
                            , "HMainCenterIDName": d.data[0].工作
                            , "HMainCenterID": d.data[0].HMainCenterID
                            , "HGroupIDName": d.data[0].班组
@@ -933,29 +1344,70 @@
                            , "HDelSourceRate": d.data[0].减资源减量
                            , "HRemark": d.data[0].表头备注
                            , "HStandard": d.data[0].默认工艺 == 1 ? true : false
                            , "HMaterModel": d.data[0].规格型号
                            , "HPicNumVer": d.data[0].图号版本
                            , "HPicNumAssemble": d.data[0].总装图号
                            , "HMaterTexture": d.data[0].材质
                            , "HProductNum": d.data[0].成品编号
                            , "HVerNum": d.data[0].版本
                        });
                        //子表  èµ‹å€¼
                        var rowdata = [{
                            "HProcNo": d.data[0].工序号, "HProcID": d.data[0].hprocid, "HSupID": d.data[0].HSupID, "HSupFlag": d.data[0].委外标记 == 1 ? true : false, "HWorkQty": d.data[0].加工数量, "HPassRate": d.data[0].良率, "HRemark": d.data[0].表体备注
                            "HProcNo": d.data[0].工序号, "HProcID_S": d.data[0].工段, "HProcType": d.data[0].工序类型, "HCenterID_S": d.data[0].HCenterID_S, "HCenterID_SName": d.data[0].产线中心
                            , "HWorkQty_S": d.data[0].产线产能, "HSubStdEmpQty_S": d.data[0].产线人数, "HMouldNo": d.data[0].模具编号, "HChangeMould": d.data[0].换模时间, "HPackStd": d.data[0].周转箱标准
                            , "HPack": d.data[0].周转箱, "HPutArea": d.data[0].暂放区, "HMyWorkDays": d.data[0].生产周期, "HMyFixWorkDays": d.data[0].固定生产天数, "工序": d.data[0].工序
                            , "HProcID": d.data[0].hprocid, "工作中心代码": d.data[0].工作中心代码, "HCenterID": d.data[0].HCenterID, "工作中心": d.data[0].工作中心名称, "HSupID": d.data[0].HSupID
                            , "供应商代码": d.data[0].供应商代码, "供应商": d.data[0].供应商, "HSupFlag": d.data[0].委外标记 == 0 ? false : true, "HTimeUnit": d.data[0].时间单位, "HUnitTime": d.data[0].运行时间
                            , "HWorkQty": d.data[0].加工数量, "HPassRate": d.data[0].良率, "HOverRate": d.data[0].超额比例, "HReadyTime": d.data[0].准备时间, "HQueueTime": d.data[0].排队时间
                            , "HMoveTime": d.data[0].转移时间, "HNextProcFlag": d.data[0].HNextProcFlag == 0 ? false : true, "HFlowProc": d.data[0].流转工序 == 0 ? false : true, "HSubStdEmpQty": d.data[0].标准人数, "HSubCanUseSourceQty": d.data[0].可操作设备数
                            , "HFixPrice": d.data[0].班产定额, "HProcPrice": d.data[0].加工单价, "HBadPrice": d.data[0].不合格单价, "HWasterPrice": d.data[0].报废单价, "HStdFlag": d.data[0].标准定额
                            , "HBeginDayQty": d.data[0].开工余量天数, "HBeginFixQty": d.data[0].开工余量固数, "HFixWorkDays": d.data[0].上道固定天数, "HTrunWorkDays": d.data[0].上道循环周期, "HReadyTimes": d.data[0].本道准备时间
                            , "HICMOReadyTimes": d.data[0].换单准备时间, "HAutoTrunFlag": d.data[0].自动移转, "HTechnologyParameter": d.data[0].工艺参数, "HPicNum": d.data[0].图纸编号, "HProcCheckNote": d.data[0].本工序确认记录
                            , "HProcWorkNum": d.data[0].程序号
                        }];
                        option.data = rowdata;
                        table.render(option);
                        if (d.data[0].委外标记) {
                            $('#HSupFlag1').attr("checked", true);
                        }
                        if (d.data[0].HNextProcFlag) {
                            $('#HNextProcFlag1').attr("checked", true);
                        }
                        if (d.data[0].流转工序) {
                            $('#HFlowProc1').attr("checked", true);
                        }
                        if (d.data[0].标准定额) {
                            $('#HStdFlag1').attr("checked", true);
                        }
                        if (d.data[0].自动移转) {
                            $('#HAutoTrunFlag1').attr("checked", true);
                        }
                        form.render('checkbox');
                        $('#HProcType1').find("option[value='" + d.data[0].工序类型+ "']").attr("selected", true);
                        form.render('select');
                    }
                })
            }
            //保存HMaker
            function set_AddNew(data) {
                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(table.cache['mainTable']);
                var sSubStr = JSON.stringify(num);
                var hentryid = linteridSub;//子表 æŽ’序id
                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Gy_RoutingBill/AddBill",
@@ -994,7 +1446,11 @@
            }
            //非空验证
            function AllowLoadData(data) {
                if ($("#HMaterNumber").val() == "") {
                    layer.msg("产品代码没有选择");
                    return false;
                }
                if ($("#HUnitName").val() == "") {
                    layer.msg("计量单位没有选择");
                    return false;
@@ -1015,7 +1471,7 @@
                    layer.msg("请勾选默认工艺");
                    return false;
                }
                return true;
                //if ($("#HBillNo").val() == '') {
                //    layer.msg("错误的单据号", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -277,6 +277,10 @@
                    , title: '工艺路线-新增'
                    , shift: 0//弹出动画
                    , content: '../工艺路线/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=&linteridSub=-1'
                    , end: function () {
                        //刷新页面,
                        location.reload();
                    }
                })
            }
            //#endregion
@@ -296,6 +300,10 @@
                        , title: '工艺路线-编辑'
                        , shift: 0//弹出动画
                        , content: '../工艺路线/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&linteridSub=' + linteridSub
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
WebTM/views/É豸¹ÜÀí/Sb_EqpMaintenanceBillList_PDA.html
@@ -79,22 +79,23 @@
        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
                    <div class="maintitle">设备点检记录单</div>
                    <div class="layui-form-item" style="padding-top: 10px;">
                        <div class="layui-row">
                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>设备条码</label>
                            <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                    </div>
                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                    <div class="maintitle">设备保养记录单</div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                        <ul class="layui-tab-title">
                            <li class="layui-this">基本信息</li>
                            <li>其他信息</li>
                            <li>明细信息</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>设备条码</label>
                                        <div class="layui-input-block" style="margin-left: 100px;width:46%;">
                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="请键入后回车" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -157,7 +158,7 @@
                                            <div class="layui-input-block">
                                                <input type="text" name="HRepair" id="HRepair" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HDotCheckItemList" style="width:40px;">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HRepairList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
@@ -168,6 +169,18 @@
                                                <textarea name="HRepairExplanation" id="HRepairExplanation" placeholder="请输入内容" class="layui-textarea"></textarea>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">故障登记单</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -197,14 +210,6 @@
                                            <label class="layui-form-label" style="width: 75px;">设备型号:</label>
                                            <div class="layui-input-block" style="margin-left: 85px;">
                                                <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;">数量:</label>
                                            <div class="layui-input-block" style="margin-left: 85px;">
                                                <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -268,9 +273,23 @@
                                    </div>
                                </div>
                            </div>
                            <div class="layui-tab-item">
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增行</button>
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                    </div>
                                </script>
                                <script type="text/html" id="xuhao">
                                    {{d.LAY_TABLE_INDEX+1}}
                                </script>
                                <script type="text/html" id="barDemo">
                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
                                </script>
                            </div>
                        </div>
                    </div>
                    <div class="layer-footer" style="text-align: center;">
                        <button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">提交</button>
@@ -301,7 +320,7 @@
                ,laydate = layui.laydate
                , element = layui.element;
            //日期时间选择器
            //#region æ—¥æœŸæ—¶é—´é€‰æ‹©å™¨
            laydate.render({
                elem: '#HRepairBeginDate'
                , type: 'datetime'
@@ -330,10 +349,43 @@
                elem: '#HDeleteDate'
                , type: 'datetime'
            });
            //初始化表格
            set_InitGrid();
            //获取最大单据号
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '3910' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val("0");
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });
            //#endregion
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": ""};
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
                        break;
                    case 'btn-Edit': btnEditLine(obj);
                        break;
                }
            });
            //行内事件
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
            });
            //进入页面默认光标在条形码上
            $("#HBarCode").focus();
            //初始基本信息赋值
            $("#HRepairBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //点检开始时间
            $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //点检结束时间
@@ -350,17 +402,7 @@
            //模治具条码是否扫描标记
            var HProcExchBillNoFlag = false;
            //获取最大单据号
            $.ajax({
                url: GetWEBURL() + "/Web/GetMAXNum",
                type: "GET",
                data: { "HBillType": '3910' },
                success: function (d) {
                    //console.log(d.data);
                    $("#HInterID").val("0");
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });
            //条形码回车方法
@@ -418,41 +460,35 @@
                //var tableData = data.field;
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var oMain = JSON.stringify(data.field);
                //var oMain = data.field;
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
                    async: true,
                    data: { "msg": oMain },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) {
                            //layer.confirm(data.Message, {
                            //    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                            //    btn2: function () {
                            //        //parent.layui.admin.events.closeThisTabs();关闭页签
                            //        //window.close();//关闭页面,浏览器有效,PDA无效
                            //        parent.location.href = "../../../views/index.html"
                            //    }//关闭
                            //}, function () { window.location.reload(); });//新增
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = oMain + ';' + sSubStr;
                if (AllowLoadData(sSubStr)) {
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) {
                                layer.msg("提交成功");
                                $('#Saver').removeClass("buttom_box_little");
                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.close(index);
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
                        error: function (err) {
                            layer.close(index);
                            layer.msg("提交成功");
                            $('#Saver').removeClass("buttom_box_little");
                            $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        else {
                            layer.close(index);
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.close(index);
                        layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                    });
                }
            });
            //新增
            form.on('submit(Add)', function (data) {
                $('#Saver').addClass("buttom_box_little");
@@ -463,7 +499,8 @@
                // æ¸…空表单 ï¼ˆâ€œformData”是表单的id)
                $("#formData")[0].reset();
                layui.form.render();
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                table.render(option);
                $("#HBarCode").focus();
                //获取最大单据号
@@ -483,6 +520,7 @@
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //创建日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //创建人
            })
            //部门弹窗
            form.on('submit(Department)', function () {
                //页面层-自定义
@@ -494,89 +532,328 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../Baseset/基础资料/Gy_DepartmentList.html', 'yes'],
                    cancel: function (index, layero) {
                    content: ['../../views/PublicPage/DeptInformation.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('请选择数据');
                        }
                        $("#HDeptName").val(checkStatus.data[0].HName);
                        $("#HDeptID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //维修人弹窗
            form.on('submit(HEmp)', function () {
                IsSet = 0;  //维修人0,负责人1
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '维修人列表',
                    title: '人员列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes'],
                    cancel: function (index, layero) {
                    content: ['../PublicPage/UserInformation.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('请选择数据');
                        }
                        $("#HEmpName").val(checkStatus.data[0].HName);
                        $("#HEmpID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //点检项目弹窗
            form.on('submit(HDotCheckItemList)', function () {
                //页面层-自定义
            //维修项目弹窗
            form.on('submit(HRepairList)', function () {
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '点检项目列表',
                    title: '维修项目列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../Baseset/基础资料/Gy_CheckItemList.html', 'yes'],
                    cancel: function (index, layero) {
                    content: ['../PublicPage/RepairItemInformation.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('请选择数据');
                        }
                        $("#HRepair").val(checkStatus.data[0].HName);
                        $("#HRepairID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //负责人弹窗
            form.on('submit(HManager)', function () {
                IsSet = 1;  //维修人0,负责人1
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '负责人列表',
                    title: '人员列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../Baseset/基础资料/Gy_EmployeeList.html?Type=HWorker', 'yes'],
                    cancel: function (index, layero) {
                    content: ['../PublicPage/UserInformation.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('请选择数据');
                        }
                        $("#HManagerName").val(checkStatus.data[0].HName);
                        $("#HManagerID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //表头信息选择单据弹窗
            form.on('submit(XDHList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '设备维修登记单',
                    shift: 2,
                    area: ['90%', '90%'],
                    content: ['../设备管理/Sb_EqpConkBookBillList.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('请选择单据数据');
                        }
                        $("#HMainSourceBillNo").val(checkStatus.data[0].单据号);
                        $("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
                        $("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                        //layer.full(index);
                    }
                });
            });
            //以下为此页面所有方法
            //初始化表格
            function set_InitGrid() {
                //表头
                columns = [
                    { type: 'checkbox', fixed: 'left' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HRepairID', title: 'HRepairID', edit: 'text', event: "", hide: true }
                    , { field: 'HRepairCode', title: '维修项目代码', edit: 'text', event: "", event: "HRepairCode" }
                    , { field: 'HRepairName', title: '维修项目', edit: 'text', event: "" }
                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
                    , { field: 'HManagerCode', title: '负责人代码', edit: 'text', event: "HManagerCode" }
                    , { field: 'HManagerName', title: '负责人', edit: 'text' }
                    , { field: 'HRepairExplanation', title: '维修要求', edit: 'text' }
                    , { field: 'HRemark', title: '备注', event: "", edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ];
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: 10
                    , height: 'full-50'
                    , cols: [columns]
                    , limits: [50, 500, 1000, 5000]
                    , done: function (res, curr, count) {
                    }
                };
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" }];
                table.render(option);
            }
            //增加一行
            function btnAddLine(NewRow) {
                var tableBak = table.cache["mainTable"]; //获取之前编辑过的表格数据
                buttonArr = [];//清空数组
                for (var i = 0; i < tableBak.length; i++) {
                    buttonArr.push(tableBak[i]);  //将之前的数据存储
                }
                buttonArr.push(NewRow);  //在尾部加一行
                table.reload("mainTable", {
                    data: buttonArr    //将数据重新载入表格
                })
            }
            //编辑一行
            function btnEditLine() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '编辑PDA设备维修'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../设备管理/Sb_EqpMaintenanceBillList_PDAEdit.html?OperationType=3&linterid=&HSouceBillType='
                        , resize: false
                        , btn: ['确定', '取消']
                        , yes: function (index, layero) {
                            //按钮【按钮一】的回调
                            var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                            var HRepairID = parent.layer.getChildFrame('#HRepairID').val();
                            var HRepairCode = parent.layer.getChildFrame('#HRepairCode').val();
                            var HRepairName = parent.layer.getChildFrame('#HRepairName').val();
                            var HManagerID = parent.layer.getChildFrame('#HManagerID').val();
                            var HManagerCode = parent.layer.getChildFrame('#HManagerCode').val();
                            var HManagerName = parent.layer.getChildFrame('#HManagerName').val();
                            var HRepairExplanation = parent.layer.getChildFrame('#HRepairExplanation').val();
                            if (HRepairID == "") {
                                return layer.msg('请选择维修项目');
                            }
                            if (HManagerID == "") {
                                return layer.msg('请选择负责人');
                            }
                            buttonArr = [];//清空数组
                            var checkrow = {
                                "HRepairID": HRepairID, "HRepairCode": HRepairCode, "HRepairName": HRepairName,
                                "HManagerID": HManagerID, "HManagerCode": HManagerCode, "HManagerName": HManagerName,
                                "HRepairExplanation": HRepairExplanation
                            };
                            buttonArr.push(checkrow);  //将之前的数据存储
                            table.reload("mainTable", {
                                data: buttonArr    //将数据重新载入表格
                            })
                            layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                        }
                        , end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            // è¡¨æ ¼è¡Œå†…事件删除
            function set_GridDelete(obj) {
                var data = obj.data;
                var rowIndex = $(obj.tr).attr("data-index");
                if (obj.event === 'del') {
                    layer.confirm('真的删除行么', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                            layer.msg('首行无法删除!!!');
                        } else {
                            //obj.del();
                            //layer.close(index);
                            var oldData = table.cache["mainTable"];
                            oldData.splice(obj.tr.data('index'), 1);
                            table.reload('mainTable', { data: oldData });
                            layer.close(index);
                        }
                    });
                }
            }
            //非空验证
            function AllowLoadData(sSubStr) {
                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                    layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                    sSubStr = JSON.parse(sSubStr);
                    for (var i = 0; i < sSubStr.length; i++) {
                        if (sSubStr[i].HManagerCode == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,负责人代码信息为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        if (sSubStr[i].HRepairCode == "") {
                            layer.msg("明细记录第" + (i + 1) + "行,维修项目代码信息为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return false;
                        }
                        else {
                            return true;
                        }
                    }
                }
            }
            //以上为layui模块
        });
        //返回部门
        function GetHDeptNameValue(obj) {
            $("#HDeptName").val(obj[0].HName);
            $("#HDeptID").val(obj[0].HItemID);
        }
        //返回维修人、负责人
        function GetHWorkerValue(obj) {
            if (IsSet == 0) {
                $("#HEmpName").val(obj[0].HName);
                $("#HEmpID").val(obj[0].HItemID);
            }
            if (IsSet == 1) {
                $("#HManagerName").val(obj[0].HName);
                $("#HManagerID").val(obj[0].HItemID);
            }
        }
        //返回维修项目
        function GetHCheckNameValue(obj) {
            $("#HRepair").val(obj[0].HName);
            $("#HRepairID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>
WebTM/views/É豸¹ÜÀí/Sb_EqpMaintenanceBillList_PDAEdit.html
New file
@@ -0,0 +1,245 @@
<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>编辑PDA设备维修记录</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <!--引用layui样式文件-->
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <!--引用layui js文件-->
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <!--自定义样式-->
    <style>
        .maintitle {
            background-color: #1492ff;
            color: #fff;
            padding: 5px 10px;
            border: none;
            border-radius: 4px;
        }
        .title {
            border-left: 4px solid #1492ff;
            padding-left: 6px;
            margin: 20px 10px 4px;
            font-size: 16px;
            color: #333;
        }
        .buttom_box_little {
            width: 60px;
            height: 36px;
            color: #fff;
            background-color: #1492ff;
            border-radius: 4px;
            border: none;
            margin: 10px;
        }
        .layui-input {
            width: 93%;
        }
        .layui-inline, img {
            display: block;
            vertical-align: middle
        }
        .layui-input, .layui-textarea {
            display: inline-block;
            width: 100%;
            padding-left: 10px;
        }
        .laydate-time-list ol {
            overflow-x: hidden !important;
            overflow-y: auto !important;
        }
        .layui-form-label {
            padding: 9px 5px;
            width: 85px;
        }
        .layui-input-block {
            margin-left: 85px;
            min-height: 36px;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
                    <div class="maintitle">编辑PDA设备维修记录</div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">维修项目:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
                                                <input type="hidden" name="HRepairCode" id="HRepairCode" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HRepairList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">负责人:</label>
                                            <div class="layui-input-block">
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
                                                <input type="hidden" name="HManagerCode" id="HManagerCode" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">维修要求:</label>
                                            <div class="layui-input-inline">
                                                <textarea placeholder="请输入维修要求" class="layui-textarea" name="HRepairExplanation" id="HRepairExplanation"></textarea>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../layuiadmin/PubCustom.js"></script>
    <script>
        //获取参数
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
        }
        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
            //查询条件
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //表头信息维修项目
            form.on('submit(HRepairList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '维修项目列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../PublicPage/RepairItemInformation.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('请选择数据');
                        }
                        $("#HRepairName").val(checkStatus.data[0].HName);
                        $("#HRepairID").val(checkStatus.data[0].HItemID);
                        $("#HRepairCode").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                });
            });
            //表头信息责任人
            form.on('submit(HManagerList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '责任人列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../PublicPage/UserInformation.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('请选择数据');
                        }
                        $("#HManagerName").val(checkStatus.data[0].HName);
                        $("#HManagerID").val(checkStatus.data[0].HItemID);
                        $("#HManagerCode").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    }
                });
            });
            //#endregion
        });
    </script>
</body>
</html>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_StationInBillList.html
@@ -35,6 +35,12 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">工序名</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HName" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">流转卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" id="HProcExchBillNo" style="width:190px;">
@@ -164,6 +170,7 @@
                    , { field: '流转卡号', title: '流转卡号', width: 160 }
                    , { field: '进出站所用时间', title: '进出站所用时间', width: 160 }
                    , { field: '工时', title: '工时', width: 160 }
                    , { field: '工序名', title: '工序名', width: 160 }
                    , { field: '不良数量', title: '不良数量', width: 160 }
                    , { field: '报废数量', title: '报废数量', width: 160 }
                    , { field: '进站数量', title: '进站数量', width: 160 }
@@ -307,20 +314,21 @@
                        type: "GET",
                        url: GetWEBURL() + "/Sc_PackUnionBill/Sc_StationInBillSetExcel",
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    window.location.reload();
                                });
                            window.location.reload();
                            //if (result.count == 1) {
                            //    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                            //        // å¾—到frame索引
                            //        var index = layer.getFrameIndex(window.name);
                            //        //关闭当前frame
                            //        layer.close(index);
                            //        //修改为功后刷新界面
                            //        window.location.reload();
                            //    });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                            layer.close(wait);
                            //} else {
                            //    layer.alert(result.code + result.Message, { icon: 5 });
                            //}
                            //layer.close(wait);
                        }, error: function () {
                            layer.close(wait);
                            layer.alert("接口请求失败!", { icon: 5 });
@@ -449,6 +457,7 @@
                var HEndDate = $("#HEndDate").val();//结束日期
                var HICMOBillNo = $("#HICMOBillNo").val(); //单据号
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HName = $("#HName").val();
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),进站时间, 23) >= '" + HBeginDate + "'";
@@ -462,6 +471,9 @@
                if (HProcExchBillNo) {
                    sWhere += " and æµè½¬å¡å· like '%" + HProcExchBillNo + "%'";
                }
                if (HName) {
                    sWhere += " and å·¥åºå like '%" + HName + "%'";
                }
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = " where 1 = 1 ";
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html
@@ -913,7 +913,10 @@
            
            
            if (HPPQty == "")
            {
                HPPQty = 0;
            }