yusijie
2023-12-25 ff810ace4d5a7b9a9ce903715a5510a99548ef06
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
17个文件已修改
5257 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 3361 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_BankList.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_CustomerList.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_DepartmentList.html 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_SellStyle.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_SettleStyle.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_UnitList.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Baseset/基础资料/Gy_WarehouseList.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/BadQueryReport.html 341 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/Cj_ProcessItemStationPlatform.html 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/单品过站/RetrospectiveQueryReport.html 507 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html 804 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>F:\GIT仓库\ZYMESWEBUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,9 +3,9 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_BankList.html
@@ -10,11 +10,10 @@
    <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-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
@@ -25,6 +24,8 @@
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
@@ -50,13 +51,22 @@
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
                , form = layui.form
                , layer = layui.layer
                , $ = layui.$;
            form.on('submit(HQuery)', function () {
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            //回车触发过滤
            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    RoadQuery($('#Value').val());
                }
            });
            form.on('submit(FH)', function () {
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_CustomerList.html
@@ -10,11 +10,10 @@
    <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-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
@@ -25,6 +24,8 @@
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
@@ -49,13 +50,22 @@
        var Type = params[params[0]];
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
                , form = layui.form
                , layer = layui.layer
                , $ = layui.$;
            form.on('submit(HQuery)', function () {//选择客户
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            //回车触发过滤
            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    RoadQuery($('#Value').val());
                }
            });
            form.on('submit(FH)', function () {//选择客户
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_DepartmentList.html
@@ -10,11 +10,10 @@
    <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-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
@@ -25,11 +24,12 @@
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable" lay-filter="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>
@@ -37,13 +37,22 @@
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
                , form = layui.form
                , layer = layui.layer
                , $ = layui.$;
            form.on('submit(HQuery)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            //回车触发过滤
            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    RoadQuery($('#Value').val());
                }
            });
            form.on('submit(FH)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_EmployeeList.html
@@ -10,11 +10,10 @@
    <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-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
@@ -25,6 +24,8 @@
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
@@ -50,13 +51,22 @@
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
                , form = layui.form
                , layer = layui.layer
                , $ = layui.$;
            form.on('submit(HQuery)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val(), 0);
            });
            //回车触发过滤
            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    RoadQuery($('#Value').val());
                }
            });
            form.on('submit(FH)', function () {//选择仓库
                var index = parent.layer.getFrameIndex(window.name);
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_SellStyle.html
@@ -10,11 +10,10 @@
    <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-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
@@ -25,6 +24,8 @@
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
@@ -37,13 +38,22 @@
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
                , form = layui.form
                , layer = layui.layer
                , $ = layui.$;
            form.on('submit(HQuery)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            //回车触发过滤
            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    RoadQuery($('#Value').val());
                }
            });
            form.on('submit(FH)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_SettleStyle.html
@@ -10,11 +10,10 @@
    <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-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
@@ -25,6 +24,8 @@
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
@@ -37,13 +38,22 @@
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
                , form = layui.form
                , layer = layui.layer
                , $ = layui.$;
            form.on('submit(HQuery)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            //回车触发过滤
            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    RoadQuery($('#Value').val());
                }
            });
            form.on('submit(FH)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_UnitList.html
@@ -10,11 +10,10 @@
    <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-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
@@ -25,6 +24,8 @@
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
@@ -37,13 +38,22 @@
    <script>
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
                , form = layui.form
                , layer = layui.layer
                , $ = layui.$;
            form.on('submit(HQuery)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            //回车触发过滤
            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    RoadQuery($('#Value').val());
                }
            });
            form.on('submit(FH)', function () {//选择单位
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/Baseset/»ù´¡×ÊÁÏ/Gy_WarehouseList.html
@@ -10,11 +10,10 @@
    <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-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label">过滤列</label>
@@ -25,6 +24,8 @@
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                        </div>
                    </div>
                    <!--子表1-->
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
@@ -52,12 +53,21 @@
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
                , form = layui.form
                , layer = layui.layer;
                , layer = layui.layer
                , $ = layui.$;
            form.on('submit(HQuery)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                RoadQuery($('#Value').val());
            });
            //回车触发过滤
            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    RoadQuery($('#Value').val());
                }
            });
            form.on('submit(FH)', function () {//选择仓库
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                var checkStatus = table.checkStatus('mainTable')
WebTM/views/index.html
@@ -606,8 +606,8 @@
                                        <dd><a lay-href="车间管理/单品过站/Cj_ProcessItemBGA.html">工序单品返修台</a></dd>
                                        <!--<dd><a lay-href="车间管理/单品过站/Cj_ProcessItemBGA_PJGH.html">工序单品返修台(配件更换)</a></dd>-->
                                        <dd><a lay-href="车间管理/单品过站/Sc_SourceLineRepairBillList.html">返修记录列表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/RetrospectiveQueryReport.html">合格追溯查询报表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/BadQueryReport.html">不良追溯查询报表</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/RetrospectiveQueryReport.html">质量追溯查询</a></dd>
                                        <dd><a lay-href="车间管理/单品过站/BadQueryReport.html">逆向追溯查询报表</a></dd>
                                    </dl>
                                </dd>
                            </dl>
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/BadQueryReport.html
@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>不良追溯查询报表</title>
    <title>逆向追溯查询报表</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
@@ -26,21 +26,27 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产订单号</label>
                                    <label class="layui-form-label">物料编码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" value="">
                                        <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" value="">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 76px;">产品条码</label>
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBardCode" id="HBardCode" value="">
                                        <input type="text" class="layui-input" name="HMaterName" id="HMaterName" value="" style="background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">流转卡号</label>
                                    <label class="layui-form-label" style="width: 76px;">规格型号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" value="">
                                        <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" value="" style="background-color: #efefef4d;" readonly>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">批次号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBatchNo" id="HBatchNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -81,10 +87,41 @@
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                        <div class="layui-tab layui-tab-card">
                            <ul class="layui-tab-title">
                                <li class="layui-this">流转卡清单</li>
                                <li>产品码绑定清单</li>
                                <li>出入库记录</li>
                                <!--<li>相关库存清单</li>-->
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <!--流转卡清单-->
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--产品码绑定清单-->
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--出入库记录-->
                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--相关库存清单-->
                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo5">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn5"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
@@ -112,8 +149,14 @@
            , laydate = layui.laydate
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var HModName = "BadQueryReport";
        var option1 = [];
        var option2 = [];
        var option3 = [];
        var option4 = [];
        var option5 = [];
        var option6 = [];
        var option7 = [];
        var HModName = "RetrospectiveQueryReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•
        //#endregion
@@ -130,7 +173,7 @@
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        // å¤´å·¥å…·æ äº‹ä»¶
        table.on('toolbar(mainTable)', function (obj) {
        table.on('toolbar(mainTable1)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
@@ -152,15 +195,15 @@
            //查询
            get_FastQuery();
        }
        // æŸ¥è¯¢
        function get_Display(sWhere) {
        // æµè½¬å¡æ¸…单
        function get_Display1(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BadQueryReport',
                url: GetWEBURL() + '/Cj_SingleStation/Sc_ProcessExchangeBillMainList',
                type: "GET",
                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                async: false,
                data: { "HMaterNumber": $("#HMaterNumber").val(), "HBatchNo": $("#HBatchNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
@@ -189,9 +232,9 @@
                        }
                        //动态显示列名
                        option = {
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo'
                        option1 = {
                            elem: '#mainTable1'
                            , toolbar: '#toolbarDemo1'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
@@ -204,7 +247,12 @@
                                soulTable.render(this);
                            }
                        }
                        table.render(option);
                        table.render(option1);
                        if ($("#HBardCode").val() != "" && data1.data.length != 0) {
                            $("#HICMOBillNo").val(data1.data[0]["生产订单号"]);
                            $("#HProcExchBillNo").val(data1.data[0]["流转卡"]);
                        }
                        //刷新表格数据
                        DisPlay_HideColumn();
@@ -225,8 +273,203 @@
            });
        }
        // äº§å“ç ç»‘定清单
        function get_Display2(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/HBardcodeList',
                type: "GET",
                async: false,
                data: { "HMaterNumber": $("#HMaterNumber").val(), "HBatchNo": $("#HBatchNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }
                        //动态显示列名
                        option2 = {
                            elem: '#mainTable2'
                            , toolbar: '#toolbarDemo1'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option2);
                        if ($("#HBardCode").val() != "" && data1.data.length != 0) {
                            $("#HICMOBillNo").val(data1.data[0]["生产订单号"]);
                            $("#HProcExchBillNo").val(data1.data[0]["流转卡"]);
                        }
                        //刷新表格数据
                        DisPlay_HideColumn();
                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //出入库记录
        function get_Display3(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BardCodeOutInList',
                type: "GET",
                async: false,
                data: { "HMaterNumber": $("#HMaterNumber").val(), "HBatchNo": $("#HBatchNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }
                        //动态显示列名
                        option3 = {
                            elem: '#mainTable3'
                            , toolbar: '#toolbarDemo3'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option3);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //相关库存清单
        function get_Display4(sWhere) {
            var sWhere = " and HMaterSN='" + HBardcode + "'";
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/Sc_SourceLineRepairBillSub_MaterList',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        //动态显示列名
                        option4 = {
                            elem: '#mainTable4'
                            , toolbar: '#toolbarDemo4'
                            , cols: [[
                                { type: 'checkbox', fixed: 'left' }
                                , { type: 'numbers', title: '序号' }
                                , { field: 'HICMOBillNo', title: '生产订单' }
                                , { field: 'HDate', title: '日期' }
                                , { field: 'HMaterNumber', title: '配件物料编码' }
                                , { field: 'HMaterName', title: '配件物料名称' }
                                , { field: 'HBarCode', title: '配件SN码' }
                                , { field: 'HMaterSN', title: '产品SN码' }
                            ]]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option4);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        // å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
@@ -253,7 +496,13 @@
                com = " and (" + ColName + " " + com + ")";
            }
            get_Display(sWhere);
            sWhere += com;
            get_Display1(sWhere);//流转卡清单
            get_Display2(sWhere);//产品码绑定清单
            get_Display3(sWhere);//出入库记录
            //get_Display4(HBardCode);//相关库存清单
            sWhere = "";//调用接口后清空sWhere缓存
        }
@@ -261,8 +510,8 @@
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            for (var i = 1; i < option1.cols[0].length - 1; i++) {
                colName += option1.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
@@ -307,50 +556,50 @@
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                        for (var i = 0; i < option1.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                                option1.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                                option1.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                option1.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                option1.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //    option1.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //    option1.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            if (dataCols[1] == 0 && $.inArray(option1.cols[0][i + 1]["title"], titleData) == -1) {
                                option1.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    option1.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    option1.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    option1.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }
                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                        for (var i = 1; i < option1.cols[0].length - 1; i++) {
                            if (option1.cols[0][i]["fixed"] != null) {
                                option1.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
@@ -359,15 +608,15 @@
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                if ($.inArray(option1.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                                option1.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                        table.render(option1);
                    } else {
                        table.render(option);
                        table.render(option1);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
@@ -378,9 +627,9 @@
        // åˆ—明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
            for (var i = 1; i < option1.cols[0].length; i++) {
                if (option1.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option1.cols[0][i].field + '">' + option1.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html
@@ -475,7 +475,7 @@
        // ç”Ÿæˆå•据号
        function createBillNo() {
            var sql = "select * from Sc_StationOutBillMain  where HProcExchBillNo='" + $("#HProcExchBillNo").val() + "' and HProcID=" + $("#HProcID").val()
            var sql = "select * from Sc_StationOutBillMain  where HProcExchBillNo='" + $("#HProcExchBillNo").val() + "' and HProcID=" + $("#HProcID").val() +" order by HDate desc"
            $.ajax({
                url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList",
                async: false,
@@ -690,6 +690,7 @@
        
        //条码回车查询
        function txtHBarCode_KeyDown(HBarCode) {
            var HProcExchBillNo = $("#HProcExchBillNo").val();
            var indexs = layer.load();
            $.ajax({
@@ -713,8 +714,10 @@
                                if (data1.count == 1) {
                                    layer.close(index);
                                    $("#HBarCode_P").val(HBarCode);
                                    //保存数据
                                    set_AddAssemblyBill();
                                    if (AllowLoadData()) {
                                        //保存数据
                                        set_AddAssemblyBill();
                                    }
                                }
                                else {
                                    layer.close(index);
@@ -846,11 +849,12 @@
                        table.render(option)
                        for (var i = 0; i < option.data.length; i++) {
                            if (parseFloat(option.data[i]["配件数量"]) == 0) {
                            if (parseFloat(option.data[i]["配件数量"]) == 0|| isNaN(parseFloat(option.data[i]["配件数量"])) ) {
                                if (setIntervalIndex != null) {
                                    //clearInterval(setIntervalIndex);
                                    //setIntervalIndex = null;
                                    clearTimerQ();
                                    setIntervalIndex = 0;
                                }
                                return layer.msg("配件数量为0!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
@@ -910,6 +914,12 @@
                layer.msg("流转卡不能为空!")
                return;
            }
            //查询不良记录
            get_BadRecords();
            //查询合格记录
            get_HGRecords();
            if (option2.data.length != 0 || option3.data.length != 0) {
                get_BomList(HBarCode);
            }
@@ -918,12 +928,10 @@
            //    //保存到临时表
            //    get_AddBomTempList();
            //}
            //查询不良记录
            get_BadRecords();
            //查询合格记录
            get_HGRecords();
            setIntervalIndex = setInterval(setIntervalList, 30000);
            if (setIntervalIndex != null && setIntervalIndex != 0) {
                setIntervalIndex = setInterval(setIntervalList, 30000);
            }
        }
        //配件查询数据
@@ -1254,19 +1262,25 @@
        }
        //非空验证
        function AllowLoadData(data) {
        function AllowLoadData() {
            var HBarCode = $("#HBarCode").val();
            var HBarCode = $("#HBarCode_P").val();
            if (HBarCode == "") {
                layer.msg("产品SN不能为空!")
                return false;
            }
            var HBadReasonID = $("#HBadReasonID").val();
            if (HBadReasonID == 0) {
                layer.msg("不良原因不能为空!")
            var HEmpID2 = $("#HEmpID2").val();
            if (HEmpID2 == 0) {
                layer.msg("操作员不能为空!")
                return false;
            }
            //var HBadReasonID = $("#HBadReasonID").val();
            //if (HBadReasonID == 0) {
            //    layer.msg("不良原因不能为空!")
            //    return false;
            //}
            return true;
        }
WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/RetrospectiveQueryReport.html
@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>合格追溯查询报表</title>
    <title>质量追溯查询报表</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
@@ -28,7 +28,7 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">生产订单号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo"  value="">
                                        <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" value="">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -40,7 +40,7 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">流转卡号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo"  value="">
                                        <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -49,7 +49,7 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;margin-left:5%;">
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
@@ -81,10 +81,56 @@
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                        <div class="layui-tab layui-tab-card">
                            <ul class="layui-tab-title">
                                <li class="layui-this">进出站记录</li>
                                <li>不良汇报记录</li>
                                <li>工艺参数记录</li>
                                <li>配件清单</li>
                                <li>返修记录</li>
                                <li>配件变更记录</li>
                                <!--<li>出入库记录</li>-->
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
                                    <!--进出站记录-->
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--不良汇报记录-->
                                    <table class="layui-hide" id="mainTable5" lay-filter="mainTable5"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--工艺参数记录-->
                                    <table class="layui-hide" id="mainTable7" lay-filter="mainTable7"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--配件清单-->
                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--返修记录-->
                                    <table class="layui-hide" id="mainTable6" lay-filter="mainTable6"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--配件变更记录-->
                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--出入库记录-->
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo5">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn5"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
@@ -112,7 +158,13 @@
            , laydate = layui.laydate
            , soulTable = layui.soulTable
        var sWhere = "";
        var option = [];
        var option1 = [];
        var option2 = [];
        var option3 = [];
        var option4 = [];
        var option5 = [];
        var option6 = [];
        var option7 = [];
        var HModName = "RetrospectiveQueryReport";
        var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID", "HSourceEntryID"];//子表不需要显示的字段 å¯æ‰©å±•
@@ -130,7 +182,7 @@
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        // å¤´å·¥å…·æ äº‹ä»¶
        table.on('toolbar(mainTable)', function (obj) {
        table.on('toolbar(mainTable2)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn': get_HideColumn();
@@ -138,6 +190,34 @@
            };
        });
        table.on('row(mainTable2)', function (obj) {
            var HBardcode = obj.data["条码"];
            get_Display3(HBardcode);//配件清单
            get_Display6(HBardcode);//返修记录
            get_Display7(HBardcode);//工艺参数
        })
        table.on('row(mainTable5)', function (obj) {
            var HBardcode = obj.data["条码"];
            get_Display3(HBardcode);//配件清单
            get_Display6(HBardcode);//返修记录
            get_Display7(HBardcode);//工艺参数
        })
        table.on('row(mainTable6)', function (obj) {
            var HBardcode = obj.data["SN码"];
            get_Display4(HBardcode);//配件变更记录
        })
        table.on('toolbar(mainTable5)', function (obj) {
            switch (obj.event) {
                //列设置
                case 'set_HideColumn5': get_HideColumn5();
                    break;
            };
        });
        //查询按钮
        form.on('submit(btnSearch)', function (data) {//选择仓位
            get_FastQuery();
@@ -153,13 +233,210 @@
            get_FastQuery();
        }
        // æŸ¥è¯¢
        function get_Display(sWhere) {
        // è¿›å‡ºç«™æŸ¥è¯¢
        function get_Display2(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/RetrospectiveQueryReport',
                url: GetWEBURL() + '/Cj_SingleStation/EntryAndExitRecords',
                type: "GET",
                async: false,
                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }
                        //动态显示列名
                        option2 = {
                            elem: '#mainTable2'
                            , toolbar: '#toolbarDemo1'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option2);
                        //if ($("#HBardCode").val() != "" && data1.data.length != 0) {
                        //    $("#HICMOBillNo").val(data1.data[0]["生产订单号"]);
                        //    $("#HProcExchBillNo").val(data1.data[0]["流转卡"]);
                        //}
                        //刷新表格数据
                        DisPlay_HideColumn();
                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //配件清单
        function get_Display3(HBardcode) {
            var sWhere = " and äº§å“æ¡ç ='" + HBardcode + "'";
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Sc_AssemblyBill/list1',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }
                        //动态显示列名
                        option3 = {
                            elem: '#mainTable3'
                            , toolbar: '#toolbarDemo3'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option3);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //配件变更记录
        function get_Display4(HBardcode) {
            var sWhere = " and HMaterSN='" + HBardcode + "'";
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/Sc_SourceLineRepairBillSub_MaterList',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        //动态显示列名
                        option4 = {
                            elem: '#mainTable4'
                            , toolbar: '#toolbarDemo4'
                            , cols: [[
                                { type: 'checkbox', fixed: 'left' }
                                , { type: 'numbers', title: '序号' }
                                , { field: 'HICMOBillNo', title: '生产订单' }
                                , { field: 'HDate', title: '日期' }
                                , { field: 'HMaterNumber', title: '配件物料编码' }
                                , { field: 'HMaterName', title: '配件物料名称' }
                                , { field: 'HBarCode', title: '配件SN码' }
                                , { field: 'HMaterSN', title: '产品SN码' }
                            ]]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option4);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //不良汇报记录
        function get_Display5(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/BadQueryReport',
                type: "GET",
                async: false,
                data: { "HBardCode": $("#HBardCode").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(), "HICMOBillNo": $("#HICMOBillNo").val(), "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
@@ -190,8 +467,8 @@
                        //动态显示列名
                        option = {
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo'
                            elem: '#mainTable5'
                            , toolbar: '#toolbarDemo5'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
@@ -206,13 +483,147 @@
                        }
                        table.render(option);
                        //刷新表格数据
                        DisPlay_HideColumn();
                        ////刷新表格数据
                        //DisPlay_HideColumn();
                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        //if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                        //    ColFilter();
                        //}
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //返修记录
        function get_Display6(HBardcode) {
            var sWhere = " and SN码='" + HBardcode + "'";
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/ProcessItemRepair',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }
                        //动态显示列名
                        option6 = {
                            elem: '#mainTable6'
                            , toolbar: '#toolbarDemo6'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option6);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //工艺参数
        function get_Display7(HBardcode) {
            var sWhere = " and æ¡ç ='" + HBardcode + "'";
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Cj_SingleStation/ProcessParameters',
                type: "GET",
                async: false,
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                success: function (data1) {
                    if (data1.count == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left' });
                        for (var i = 0; i < data.length; i++) {
                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 180 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
                                }
                            }
                        }
                        //动态显示列名
                        option7 = {
                            elem: '#mainTable7'
                            , toolbar: '#toolbarDemo7'
                            , cols: [col]
                            , data: data1.data
                            , height: 800
                            , page: true
                            , totalRow: true
                            , cellMinWidth: 90
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {
                                soulTable.render(this);
                            }
                        }
                        table.render(option7);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
@@ -227,10 +638,12 @@
        // å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            var HBardCode = $("#HBardCode").val();
            var ColName = $("#ColName").val();//复选框
            var Comparator = $("#Comparator").val()
            var ColContent = $("#ColContent").val();
            var com = "";
            if (ColName != 0 && Comparator != 0) {
                switch (Comparator) {
@@ -253,7 +666,15 @@
                com = " and (" + ColName + " " + com + ")";
            }
            get_Display(sWhere);
            get_Display2(sWhere);
            get_Display5(sWhere);
            if (HBardCode != "") {
                get_Display3(HBardCode);//配件清单
                get_Display6(HBardCode);//返修记录
                get_Display7(HBardCode);//工艺参数
                get_Display4(HBardCode);//配件变更记录
            }
            sWhere = "";//调用接口后清空sWhere缓存
        }
@@ -261,8 +682,8 @@
        function get_HideColumn() {
            var colName = "";
            var contentUrl = "";
            for (var i = 1; i < option.cols[0].length - 1; i++) {
                colName += option.cols[0][i]["title"] + ",";
            for (var i = 1; i < option2.cols[0].length - 1; i++) {
                colName += option2.cols[0][i]["title"] + ",";
            }
            var urlStr = window.document.location.pathname;//获取文件路径
            var urlLen = urlStr.split('/');
@@ -307,50 +728,50 @@
                        dataCol = data1.data[0].HGridString.split(',');
                        for (var i = 0; i < option.cols[0].length - 2; i++) {
                        for (var i = 0; i < option2.cols[0].length - 2; i++) {
                            var dataCols = dataCol[i].split('|');
                            //隐藏列
                            if (dataCols[1] == 1) {
                                option.cols[0][i + 1]["hide"] = true;
                                option2.cols[0][i + 1]["hide"] = true;
                            }
                            //设置列宽
                            if (dataCols[3] > 0) {
                                option.cols[0][i + 1]["width"] = dataCols[3];
                                option2.cols[0][i + 1]["width"] = dataCols[3];
                            }
                            //设置内容字体大小
                            if (data1.data[0].HFontSize != 0) {
                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                            } else {
                                option.cols[0][i + 1]["style"] = "font-size:100%";
                                option2.cols[0][i + 1]["style"] = "font-size:100%";
                            }
                            //设置列宽
                            //if (data1.data[0].HColumnWidth != 0) {
                            //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //    option2.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                            //} else {
                            //    option.cols[0][i + 1]["width"] = "";
                            //    option2.cols[0][i + 1]["width"] = "";
                            //}
                            //显示列
                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                option.cols[0][i + 1]["hide"] = false;
                            if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
                                option2.cols[0][i + 1]["hide"] = false;
                            }
                            //字体所在位置(å·¦ å±…中 å³)
                            switch (dataCols[2]) {
                                case "L":
                                    option.cols[0][i + 1]["align"] = "left";
                                    option2.cols[0][i + 1]["align"] = "left";
                                    break;
                                case "M":
                                    option.cols[0][i + 1]["align"] = "center";
                                    option2.cols[0][i + 1]["align"] = "center";
                                    break;
                                case "R":
                                    option.cols[0][i + 1]["align"] = "right";
                                    option2.cols[0][i + 1]["align"] = "right";
                                    break;
                            }
                        }
                        //取消冻结列
                        for (var i = 1; i < option.cols[0].length - 1; i++) {
                            if (option.cols[0][i]["fixed"] != null) {
                                option.cols[0][i]["fixed"] = null;
                        for (var i = 1; i < option2.cols[0].length - 1; i++) {
                            if (option2.cols[0][i]["fixed"] != null) {
                                option2.cols[0][i]["fixed"] = null;
                            }
                            else {
                                break;
@@ -359,15 +780,15 @@
                        //冻结列
                        if (data1.data[0].HFixCols != 0) {
                            for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
                                    data1.data[0].HFixCols += 1;
                                }
                                option.cols[0][i + 1]["fixed"] = "left";
                                option2.cols[0][i + 1]["fixed"] = "left";
                            }
                        }
                        table.render(option);
                        table.render(option2);
                    } else {
                        table.render(option);
                        table.render(option2);
                    }
                }, error: function () {
                    layer.alert("接口请求失败!", { icon: 5 });
@@ -378,9 +799,9 @@
        // åˆ—明显示下拉框
        function ColFilter() {
            var Organization = '<option  value="0" selected="selected" ></option>';
            for (var i = 1; i < option.cols[0].length; i++) {
                if (option.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
            for (var i = 1; i < option2.cols[0].length; i++) {
                if (option2.cols[0][i].hide != true) {
                    Organization += '<option  style="color:blue;" value="' + option2.cols[0][i].field + '">' + option2.cols[0][i].field + '</option>';
                }
            }
            $("#ColName").empty();
WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -148,6 +148,32 @@
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div class="layui-tab layui-tab-card" style="margin-top:0px;">
                            <ul class="layui-tab-title">
                                <li >工艺参数</li>
                                <li>操作日志</li>
                                <li class="layui-this">SN序列码</li>
                                <li>操作员清单</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item">
                                    <!--工艺参数-->
                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--操作日志-->
                                    <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
                                </div>
                                <div class="layui-tab-item layui-show" >
                                    <!--SN序列码-->
                                    <table class="layui-hide" id="mainTable3" lay-filter="mainTable3"></table>
                                </div>
                                <div class="layui-tab-item">
                                    <!--操作员清单-->
                                    <table class="layui-hide" id="mainTable4" lay-filter="mainTable4"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>新增</button>
@@ -165,6 +191,30 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Exit" id="btn-Exit">退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo1">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete1" id="btn-Delete1"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn1" id="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete2" id="btn-Delete2"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn2" id="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo3">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete3" id="btn-Delete3"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn3" id="set_HideColumn3"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo4">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete4" id="btn-Delete4"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn4" id="set_HideColumn4"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
@@ -195,8 +245,16 @@
            //公用变量
            var sWhere = "";
            var option = [];
            var option1 = [];
            var option2 = [];
            var option3 = [];
            var option4 = [];
            var ins;                        //用于导出excel
            var HModName = "Cj_StationOutBillList";
            var HModName1 = "Sc_StationOutBillSub_TechParam";
            var HModName2 = "Sc_StationOutBillSub_Note";
            var HModName3 = "Sc_StationOutBillSub_SN";
            var HModName4 = "Sc_StationOutBillSub_Emp";
            var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "选择", "查询日期", "成本对象", "成本对象名称", "HBillStatus", "HBillType", "HPRDORGID"];//不需要显示的字段 å¯æ‰©å±•
@@ -251,6 +309,212 @@
                    $("#btnSearch").click();
                }
            });
            //点击主表带出从表数据
            table.on('row(mainTable)', function (obj) { //注:tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                //选中行改变颜色
                check_row(obj);
                var datas = obj.data; //获得当前行数据
                var HMainID = datas.hmainid;
                SelectTechParam(HMainID,"TechParam");//工艺参数
                SelectTechParam(HMainID,"Note");    //操作日志
                SelectTechParam(HMainID, "SN");    //SN序列码
                SelectTechParam(HMainID, "Emp");    //操作员清单
            });
            //查询工艺参数
            table.on('toolbar(mainTable1)', function (obj) {
                switch (obj.event) {
                    //删除
                    case 'btn-Delete1': btn_Delete1();
                        break;
                    //明细列设置
                    case 'set_HideColumn1': get_HideColumn_TechParam();
                        break;
                };
            });
            //查询操作日志
            table.on('toolbar(mainTable2)', function (obj) {
                switch (obj.event) {
                    //删除
                    case 'btn-Delete2': btn_Delete2();
                        break;
                    //明细列设置
                    case 'set_HideColumn2': get_HideColumn_Note();
                        break;
                };
            });
            //查询SN序列码
            table.on('toolbar(mainTable3)', function (obj) {
                switch (obj.event) {
                    //删除
                    case 'btn-Delete3': btn_Delete3();
                        break;
                    //明细列设置
                    case 'set_HideColumn3': get_HideColumn_SN();
                        break;
                };
            });
            //查询操作员清单
            table.on('toolbar(mainTable4)', function (obj) {
                switch (obj.event) {
                    //删除
                    case 'btn-Delete4': btn_Delete4();
                        break;
                    //明细列设置
                    case 'set_HideColumn4': get_HideColumn_Emp();
                        break;
                };
            });
            //查询工艺参数
            function SelectTechParam(HMainID,TableName) {
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/get_SubDisplay',
                    type: "GET",
                    data: { "sWhere": HMainID, "TableName": TableName},
                    async: false,
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, "") > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            switch (TableName) {
                                case "TechParam":
                                    //动态显示列名
                                    option1 = {
                                        elem: '#mainTable1'
                                        , toolbar: '#toolbarDemo1'
                                        , cols: [col]
                                        , data: data1.data
                                        , height: 550
                                        , page: true
                                        , cellMinWidth: 90
                                        , limit: 50
                                        , limits: [50, 500, 5000, 20000]
                                    }
                                    table.render(option1);
                                    DisPlay_HideColumn_TechParam();
                                    break;
                                case "Note":
                                    //动态显示列名
                                      option2 = {
                                        elem: '#mainTable2'
                                        , toolbar: '#toolbarDemo2'
                                        , cols: [col]
                                        , data: data1.data
                                        , height: 550
                                        , page: true
                                        , cellMinWidth: 90
                                        , limit: 50
                                        , limits: [50, 500, 5000, 20000]
                                    }
                                    table.render(option2);
                                    DisPlay_HideColumn_Note();
                                    break;
                                case "SN":
                                    //动态显示列名
                                      option3 = {
                                        elem: '#mainTable3'
                                        , toolbar: '#toolbarDemo3'
                                        , cols: [col]
                                        , data: data1.data
                                        , height: 550
                                        , page: true
                                        , cellMinWidth: 90
                                        , limit: 50
                                        , limits: [50, 500, 5000, 20000]
                                    }
                                    table.render(option3);
                                    DisPlay_HideColumn_SN();
                                    break;
                                case "Emp":
                                    //动态显示列名
                                     option4 = {
                                        elem: '#mainTable4'
                                        , toolbar: '#toolbarDemo4'
                                        , cols: [col]
                                        , data: data1.data
                                        , height: 550
                                        , page: true
                                        , cellMinWidth: 90
                                        , limit: 50
                                        , limits: [50, 500, 5000, 20000]
                                    }
                                    table.render(option4);
                                    DisPlay_HideColumn_Emp();
                                    break;
                            }
                            layer.close(wait);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(wait);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            function check_row(obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据,前面的只是添加或删除选中未选中样式以及设置背景色,字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            }
            //初始化表格
            function set_InitGrid() {
@@ -376,29 +640,63 @@
                };
            });
            //行监听事件
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据,前面的只是添加或删除选中未选中样式以及设置背景色,字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });
            ////行监听事件
            //table.on('row(mainTable)', function (obj) {
            //    var flag = !obj.tr.find(':checkbox:first').prop('checked');
            //    obj.tr.find(':checkbox').prop('checked', flag);
            //    if (flag) {
            //        obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
            //        $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
            //    } else {
            //        obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
            //        $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
            //    }
            //    //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据,前面的只是添加或删除选中未选中样式以及设置背景色,字体颜色
            //    layui.each(table.cache.mainTable, function (i, l) {
            //        if (obj.tr.index() == l.LAY_TABLE_INDEX) {
            //            l.LAY_CHECKED = flag;
            //        }
            //    });
            //});
            //隐藏列设置
            //条码删除
            function btn_Delete3() {
                var checkStatus = table.checkStatus('mainTable3')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    layer.confirm('确定删除条码:' + data[0].条码 + '吗?', function (index) {
                        var HInterID = data[0].HInterID;
                        var HBardcode = data[0].条码;
                        var ajaxLoad = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill_SN',
                            type: "GET",
                            data: { "HInterID": HInterID, "HBardcode": HBardcode, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
                            success: function (result) {
                                if (result.count == 1) {
                                    SelectTechParam(HInterID, "SN");
                                    layer.close(ajaxLoad);
                                } else {
                                    layer.close(ajaxLoad);
                                    layer.alert(result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.close(ajaxLoad);
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                        layer.close(index);
                    });
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //隐藏列设置 ä¸»è¡¨
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
@@ -422,7 +720,7 @@
                })
            }
            //显示列数据
            //显示列数据 ä¸»è¡¨
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -437,7 +735,7 @@
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
@@ -502,6 +800,466 @@
                            table.render(option);
                        }
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
             //隐藏列设置 å·¥è‰ºå‚æ•°
            function get_HideColumn_TechParam() {
                var colName = "";
                for (var i = 1; i < option1.cols[0].length; i++) {
                    colName += option1.cols[0][i]["title"] + ",";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName1 + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn_TechParam();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //显示列数据 å·¥è‰ºå‚æ•°
            function DisPlay_HideColumn_TechParam() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName1, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//不需要显示的字段 å¯æ‰©å±•*/
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option1.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option1.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option1.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option1.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option1.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option1.cols[0][i + 1]["title"], titleData) == -1) {
                                    option1.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option1.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option1.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option1.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }
                            //取消冻结列
                            for (var i = 1; i < option1.cols[0].length - 1; i++) {
                                if (option1.cols[0][i]["fixed"] != null) {
                                    option1.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option1.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option1.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option1);
                        } else {
                            table.render(option1);
                        }
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
              //隐藏列设置 æ“ä½œæ—¥å¿—
            function get_HideColumn_Note() {
                var colName = "";
                for (var i = 1; i < option2.cols[0].length  ; i++) {
                    colName += option2.cols[0][i]["title"] + ",";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn_Note();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //显示列数据  æ“ä½œæ—¥å¿—
            function DisPlay_HideColumn_Note() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName2, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//不需要显示的字段 å¯æ‰©å±•*/
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option2.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option2.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option2.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option2.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
                                    option2.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option2.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option2.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option2.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }
                            //取消冻结列
                            for (var i = 1; i < option2.cols[0].length - 1; i++) {
                                if (option2.cols[0][i]["fixed"] != null) {
                                    option2.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option2.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option2.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option2);
                        } else {
                            table.render(option2);
                        }
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
             //隐藏列设置 SN序列码
            function get_HideColumn_SN() {
                var colName = "";
                for (var i = 1; i < option3.cols[0].length; i++) {
                    colName += option3.cols[0][i]["title"] + ",";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName3 + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn_SN();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //显示列数据 SN序列码
            function DisPlay_HideColumn_SN() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName3, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//不需要显示的字段 å¯æ‰©å±•*/
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option3.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option3.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option3.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option3.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option3.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option3.cols[0][i + 1]["title"], titleData) == -1) {
                                    option3.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option3.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option3.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option3.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }
                            //取消冻结列
                            for (var i = 1; i < option3.cols[0].length - 1; i++) {
                                if (option3.cols[0][i]["fixed"] != null) {
                                    option3.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option3.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option3.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option3);
                        } else {
                            table.render(option3);
                        }
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //隐藏列设置 æ“ä½œå‘˜æ¸…单
            function get_HideColumn_Emp() {
                var colName = "";
                for (var i = 1; i < option4.cols[0].length; i++) {
                    colName += option4.cols[0][i]["title"] + ",";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName4 + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn_Emp();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //显示列数据 æ“ä½œå‘˜æ¸…单
            function DisPlay_HideColumn_Emp() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName4, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {
                            var dataCol = [];//数据库查询出的列数据
                            /*var titleData = ["HMaterID", "HUnitID", "HSourceID"];//不需要显示的字段 å¯æ‰©å±•*/
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option4.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option4.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option4.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option4.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option4.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option4.cols[0][i + 1]["title"], titleData) == -1) {
                                    option4.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option4.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option4.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option4.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }
                            //取消冻结列
                            for (var i = 1; i < option4.cols[0].length - 1; i++) {
                                if (option4.cols[0][i]["fixed"] != null) {
                                    option4.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option4.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option4.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option4);
                        } else {
                            table.render(option4);
                        }
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);
@@ -878,7 +1636,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-50'
                                , height: 300
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html
@@ -339,6 +339,7 @@
                       ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '日期', title: '日期', width: 160, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '单据号', title: '单据号', width: 160, sort: true }
                        , { field: '源单单号', title: '销售订单', width: 200, templet: "<div>{{d.HSourceBillType != 1401 ? '': d.源单单号}}</div>", sort: true }
                        , { field: '状态', title: '状态', width: 160, sort: true }
                        , { field: '红蓝单标记', title: '红蓝单标记', width: 160, sort: true }
                        , { field: 'hsupid', title: 'hsupid', width: 200, hide: true, sort: true }