Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

zrg

2024-06-12 59c0a65a973f9809213e39007d54db73cbcbb375

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/WebTM.csproj

@@ -359,6 +359,7 @@
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBillList_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBill_PDA_old.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA_OLD.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_SwipeCardStart.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
@@ -375,6 +376,7 @@
    <Content Include="views\质量管理\巡检记录单\QC_PatrolProcCheckOtherBillList.html" />
    <Content Include="views\质量管理\库存检验单\QC_Add_Edit_StockCheckBill.html" />
    <Content Include="views\质量管理\库存检验单\QC_StockCheckBillList.html" />
    <Content Include="views\质量管理\质量报表\QC_InspectionFormReport.html" />
    <Content Include="views\质量管理\车间自检单\QC_Add_Edit_WorkSelfCheckBill.html" />
    <Content Include="views\质量管理\车间自检单\QC_WorkSelfCheckBillList.html" />
    <Content Include="views\车间管理\产线\222.jpg" />
@@ -400,6 +402,7 @@
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
    <Content Include="views\车间管理\报表分析\Cj_SPCOscillationCurve.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
@@ -1513,7 +1516,6 @@
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapRequestBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldStatusChangeBillList.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\BatchGen_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBill_Out.html" />

 WebTM/views/index.html

@@ -705,6 +705,12 @@
                                        <dd><a lay-href="品质管理/客诉处理/Crm_CustomerAppealBillList.html">客诉处理单维护</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>质量报表</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="质量管理/质量报表/QC_InspectionFormReport.html">SPC检验单分析</a></dd>
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        <!--器具管理-->

 WebTM/views/user/login.html

@@ -365,6 +365,7 @@
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(result.Message, { icon: 1 });
                            //sessionStorage["HUserName"] = user.username;
                            sessionStorage["HMaker"] = result.data[0].Czymc;
                            sessionStorage["HUserName"] = result.data[0].Czymc;
                            sessionStorage["HBillerID"] = result.data[0].HK3UserID;
                            sessionStorage["SourceFlag"] = false;

 WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldUpperBillEdit_PDA.html

@@ -522,11 +522,6 @@

            //条形码回车方法
            function txtHBarCode_KeyDown(HBarCode) {
                var BillNoType2 = HBarCode.substr(0, 2);
                var BillNoType3 = HBarCode.substr(0, 3);
                var BillNoType4 = HBarCode.substr(0, 4);
                var BillNoType5 = HBarCode.substr(0, 8);
                var BillNoType6 = HBarCode.substr(0, 5);

                var index = layer.load();
                $.ajax({
@@ -537,31 +532,23 @@
                        if (result.count == 1) {
                            var data = result.data[0];

                            switch (BillNoType2) {
                                //生产资源
                                case "BM":
                                case "SS":
                                case "10":
                            var num = data["Num"];

                            switch (num) {
                                case 1:
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HSourceID": data.HItemID,
                                        "HSourceName": data.HName,
                                    });
                                    break;
                                //生产订单
                                case "MO":
                                case 2:
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HICMOBillNo": data.单据号,
                                        "HICMOInterID": data.hmainid,
                                        "HICMOEntryID": data.HEntryID
                                    });
                                    break;
                            }


                            switch (BillNoType3) {
                                  //器具档案
                                case "MJD":
                                case "PAK":
                                case 3:
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HMouldID": data.hmainid,
                                        "HMouldNumber": data.模具编号,
@@ -570,30 +557,7 @@
                                        "HQty": 1,
                                    });
                                    break;
                                case "CMR":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HSourceID": data.HItemID,
                                        "HSourceName": data.HName,
                                    });
                                    break;
                            }

                            switch (BillNoType6) {
                                //器具档案
                                case "https":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HMouldID": data.hmainid,
                                        "HMouldNumber": data.模具编号,
                                        "HMouldName": data.模具名称,
                                        "HMouldModel": data.模具型号,
                                        "HQty": 1,
                                    });
                                    break;
                            }

                            switch (BillNoType4) {
                                 //流转卡
                                case "GXLX":
                                case 4:
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchInterID": data.hmainid,
@@ -603,23 +567,7 @@
                                        "HICMOEntryID": data.HICMOEntryID
                                    });
                                    break;
                            }



                            if (BillNoType5.length == 8) {
                                BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);

                                if (isValidDate(BillNoType5)) {
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchInterID": data.hmainid,
                                        "HProcExchEntryID": data.HEntryID,
                                        "HICMOBillNo": data.任务单号,
                                        "HICMOInterID": data.hicmointerid,
                                        "HICMOEntryID": data.HICMOEntryID
                                    });
                                }
                                default:
                            }

                            $("#HBarCode").val("");

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_InspectionFormReport.html

New file
@@ -0,0 +1,820 @@
<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>SPC检验单分析</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <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>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-colla-title layui-inline">
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:160px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:160px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">部门</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                            <!--动态渲染车间-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">工序</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HProcName" id="HProcName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <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;">
                                        <!--其他条件-->
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料代码</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">物料名称</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">规格型号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">上限</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HUpLoad" id="HUpLoad">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">检验项目</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HCheckItem" id="HCheckItem">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">测量单位</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" id="HUnitName">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">标准值</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" id="HStandard">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">下限</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" id="HDownLoad">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin: 10px 0 10px;display:none;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div>
                            <table class="" id="mainTable" lay-filter="mainTable"></table>
                            <div id="histogram_Avg" style="width:99.5%;height:calc(35vh);margin-top:5px;">

                            </div>
                            <div id="histogram_Diff" style="width:99.5%;height:calc(35vh);margin-top:5px;">

                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "QC_InspectionFormReport";
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

            //初始化界面
            set_ClearBill();

            //#endregion

          

            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //退出
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                };
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //车间弹窗
            form.on('submit(HWorkShopList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '车间列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HWorkShopName").val(checkStatus.data[0].部门名称);
                        $("#HWorkShopID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });
          
            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

            //初始化界面
            function set_ClearBill() {
                get_Dept();
                //初始化时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                //初始化表格
                set_InitGrid();
                //加载数据到网格
                get_Display();
                //get_FastQuery();
                DisPlay_HideColumn();
                set_Line();
            }

            //初始化表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-430'
                    //, page: true
                    , totalRow: true
                    , cellMinWidth: 70
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , cols: [[
                        { type: 'checkbox', fixed: 'left', totalRowText: '∑X' }
                        ,{ field: 'xh', title: '序号' }
                        , { field: '1', title: '1' , totalRow: true}
                        , { field: '2', title: '2' , totalRow: true}
                        , { field: '3', title: '3' , totalRow: true}
                        , { field: '4', title: '4' , totalRow: true}
                        , { field: '5', title: '5' , totalRow: true}
                        , { field: '6', title: '6' , totalRow: true}
                        , { field: '7', title: '7' , totalRow: true}
                        , { field: '8', title: '8' , totalRow: true}
                        , { field: '9', title: '9', totalRow: true}
                        , { field: '10', title: '10' , totalRow: true}
                        , { field: '11', title: '11' , totalRow: true}
                        , { field: '12', title: '12' , totalRow: true}
                        , { field: '13', title: '13' , totalRow: true}
                        , { field: '14', title: '14' , totalRow: true}
                        , { field: '15', title: '15' , totalRow: true}
                        , { field: '16', title: '16' , totalRow: true}
                        , { field: '17', title: '17' , totalRow: true}
                        , { field: '18', title: '18' , totalRow: true}
                        , { field: '19', title: '19' , totalRow: true}
                        , { field: '20', title: '20' , totalRow: true}
                        , { field: '21', title: '21' , totalRow: true}
                        , { field: '22', title: '22' , totalRow: true}
                        , { field: '23', title: '23' , totalRow: true}
                        , { field: '24', title: '24' , totalRow: true}
                        , { field: '25', title: '25', totalRow: true}
                    ]]
                    , data: []
                }
                var sj = [];
                for (let i = 0; i < 5; i++) {
                    var obj = {
                        xh : i+1,
                        1: (Math.random() * (15 - 13) ).toFixed(2),
                        2: (Math.random() * (15 - 13) ).toFixed(2),
                        3: (Math.random() * (15 - 13) ).toFixed(2),
                        4: (Math.random() * (15 - 13) ).toFixed(2),
                        5: (Math.random() * (15 - 13) ).toFixed(2),
                        6: (Math.random() * (15 - 13) ).toFixed(2),
                        7: (Math.random() * (15 - 13) ).toFixed(2),
                        8: (Math.random() * (15 - 13) ).toFixed(2),
                        9: (Math.random() * (15 - 13) ).toFixed(2),
                        10: (Math.random() * (15 - 13) ).toFixed(2),
                        11: (Math.random() * (15 - 13) ).toFixed(2),
                        12: (Math.random() * (15 - 13) ).toFixed(2),
                        13: (Math.random() * (15 - 13) ).toFixed(2),
                        14: (Math.random() * (15 - 13) ).toFixed(2),
                        15: (Math.random() * (15 - 13) ).toFixed(2),
                        16: (Math.random() * (15 - 13) ).toFixed(2),
                        17: (Math.random() * (15 - 13) ).toFixed(2),
                        18: (Math.random() * (15 - 13) ).toFixed(2),
                        19: (Math.random() * (15 - 13) ).toFixed(2),
                        20: (Math.random() * (15 - 13) ).toFixed(2),
                        21: (Math.random() * (15 - 13) ).toFixed(2),
                        22: (Math.random() * (15 - 13) ).toFixed(2),
                        23: (Math.random() * (15 - 13) ).toFixed(2),
                        24: (Math.random() * (15 - 13) ).toFixed(2),
                        25: (Math.random() * (15 - 13) ).toFixed(2)
                    };
                    sj.push(obj);
                }
                option.data = sj;


                table.render(option);
            }

            //加载网格
            function get_Display(sWhere) {
                sWhere = $("#HYear").val();
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/QC_InspectionFormReport',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '汇总' });
                            //判断是否是纯英文
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
                            for (var i = 0; i < data.length; i++) {
                                if (!patrn.test(data[i].name)) {
                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //隐藏列
                                }
                                else {
                                    switch (data[i].Type) {
                                        case 'DateTime':
                                            col.push({ field: data[i].name, 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')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true });
                                    }
                                }
                            }

                            option.cols = [col];
                            option.data = data1.data;

                            table.render(option);
                            layer.close(wait);
                        } else {
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //折线图
            function set_Line() {
                //#region【折线图】
                //平均值
                var chartDom = document.getElementById('histogram_Avg');
                var myChart = echarts.init(chartDom);
                var option_ZXT_Avg;

                let H_X = [];//x轴标题
                let HAvg = [];//平均值

                for (let i = 1; i <= 25; i++) {
                    H_X.push(i);
                }

                for (let j = 1; j <= 25; j++) {
                    var avg = 0;
                    for (let i = 0; i < option.data.length; i++) {
                        avg += Number(option.data[i][j]);
                    }
                    avg = avg / option.data.length;
                    HAvg.push(avg.toFixed(2));
                }

                option_ZXT_Avg = {
                    grid: {
                        x: '3%', //相当于距离左边效果:padding-left
                        //y: '5%',  //相当于距离上边效果:padding-top
                        bottom: '5%',
                        containLabel: true
                    },
                    xAxis: {
                        type: 'category',
                        data: H_X
                    },
                    yAxis: {
                        type: 'value'
                    },
                    series: [
                        {
                            data: HAvg,
                            type: 'line',
                            areaStyle: {//填充的颜色
                                color: {//线性渐变前四个参数分别是 x0, y0, x2, y2, èŒƒå›´ä»Ž 0 - 1，相当于在图形包围盒中的百分比，如果 globalCoord ä¸º `true`，则该四个值是绝对的像素位置
                                    type: 'linear',
                                    x: 0,
                                    y: 1,
                                    x2: 0,
                                    y2: 0,
                                    colorStops: [{
                                        offset: 0, color: 'rgba(232,247,247)' // 0% å¤„的颜色
                                    }, {
                                        offset: 1, color: 'rgba(183,252,252)' // 100% å¤„的颜色
                                    }],
                                    globalCoord: false// ç¼ºçœä¸º false
                                }
                            },
                            markLine: {
                                symbol: 'none',//去掉箭头
                                data: [
                                    { type: 'max', name: 'Max', lineStyle: { color: 'red' } },
                                    { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
                                    { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
                                ]
                            },
                        }
                    ]
                };
                option_ZXT_Avg && myChart.setOption(option_ZXT_Avg);

                //差值
                var chartDom = document.getElementById('histogram_Diff');
                var myChart = echarts.init(chartDom);
                var option_ZXT_Diff;

                let HDifference = [];//差值
                var HArr = []; //装检验值

                for (let j = 1; j <= 25; j++) {
                    HArr = [];
                    for (let i = 0; i < option.data.length; i++) {
                        HArr.push(option.data[i][j]);
                    }
                    var HMaxValue = Math.max(...HArr);//获取数组中的最大值
                    var HMinValue = Math.min(...HArr);//获取数组中的最小值
                    HDifference.push(Number(HMaxValue) - Number(HMinValue));
                }


                option_ZXT_Diff = {
                    grid: {
                        x: '3%', //相当于距离左边效果:padding-left
                        //y: '5%',  //相当于距离上边效果:padding-top
                        bottom: '5%',
                        containLabel: true
                    },
                    xAxis: {
                        type: 'category',
                        data: H_X
                    },
                    yAxis: {
                        type: 'value'
                    },
                    series: [
                        {
                            data: HDifference,
                            type: 'line',
                            areaStyle: {//填充的颜色
                                color: {//线性渐变前四个参数分别是 x0, y0, x2, y2, èŒƒå›´ä»Ž 0 - 1，相当于在图形包围盒中的百分比，如果 globalCoord ä¸º `true`，则该四个值是绝对的像素位置
                                    type: 'linear',
                                    x: 0,
                                    y: 1,
                                    x2: 0,
                                    y2: 0,
                                    colorStops: [{
                                        offset: 0, color: 'rgba(255,240,170,0)' // 0% å¤„的颜色
                                    }, {
                                        offset: 1, color: 'rgba(255,240,170,1)' // 100% å¤„的颜色
                                    }],
                                    globalCoord: false// ç¼ºçœä¸º false
                                }
                            },
                            markLine: {
                                symbol: 'none',//去掉箭头
                                data: [
                                    { type: 'max', name: 'Max', lineStyle: { color: 'red' } },
                                    { type: 'average', name: 'Avg', lineStyle: { color: 'blue' } },
                                    { type: 'min', name: 'Min', lineStyle: { color: 'green' } },
                                ]
                            },
                        }
                    ]
                };
                option_ZXT_Diff && myChart.setOption(option_ZXT_Diff);

            //#endregion

            }

            //生产车间
            function get_Dept() {
                //获取车间列
                var HDeptName = '<option value="0" style="color:red;" selected>全部车间</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            if (sessionStorage["OrganizationID"] == 100014) {
                                HDeptName += '<option  style="color:blue;"  value="2679633" >水箱一条流</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592361" >部件油冷器巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592371" >小车装芯巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592374" >小车总成巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="1743766" >卡车装芯巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="1743767" >卡车总成巴</option>';
                                HDeptName += '<option  style="color:blue;"  value="2679647" >卡车水箱一条流</option>';
                            } else {
                                for (var i = 0; i < data.length; i++) {
                                    HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                                }
                            }

                            $("#HDeptName").append(HDeptName);
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //快速过滤
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//流转卡号
                var HICMOBillNo = $("#HICMOBillNo").val(); //批号
                var HWorkShopID = $("#HDeptName").val();//车间
                var F_BSV_WYID = $("#F_BSV_WYID").val();//唯一ID
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HState = $("#HState").val();//状态
                var HSTATUS = $("#HSTATUS").val();//生产订单状态
                var HOrgID = sessionStorage["OrganizationID"];
                var checkWRuku = $("input[name='checkWRuku']").prop("checked");//复选框
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var sWhere1 = "";
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like''%" + ColContent + "%''";
                            break;
                        case "8":
                            com = "like''%" + ColContent + "''";
                            break;
                        case "9":
                            com = "like''" + ColContent + "%''";
                            break;
                        case "10":
                            com = "not like''%" + ColContent + "%''";
                            break;
                        default:
                            com = "" + Comparator + "''" + ColContent + "''";
                            break;
                    }
                    sWhere1 += " and " + ColName + " " + com;
                }

                if (checkWRuku) {
                    checkWRuku = 1;
                } else {
                    checkWRuku = 0;
                }

                sWhere = {
                    HBeginDate: HBeginDate
                    , HEndDate: HEndDate
                    , HICMOBillNo: HICMOBillNo
                    , HWorkShopID: HWorkShopID
                    , F_BSV_WYID: F_BSV_WYID
                    , HMaterNumber: HMaterNumber
                    , HOrgID: HOrgID
                    , HBillNo: HBillNo
                    , IsTrue: checkWRuku
                    , HState: HState
                    , HSTATUS: HSTATUS
                    , sWhere1: sWhere1
                }

                //get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
            }
            //重置过滤条件
            function set_ClearQuery() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                $("#HICMOBillNo").val("");
                $("#HProcExchBillNo").val("");
                $("#HName").val("");
                $("#HBillNo").val("");
                $("#HMaterNumber").val("");
                $("#F_BSV_WYID").val("");
                $("#HState").val("0")
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("input[name='checkWRuku']").prop("checked", false);
                form.render()
                sWhere = "";
            }

            //物料
            function get_btnHMaterID() {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '物料'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HMaterID").val(checkStatus.data[0].HItemID);
                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                })
            }

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.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=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }

            //显示列数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = [];//不需要显示的字段 å¯æ‰©å±•

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

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }

            //列明显示下拉框
            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>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }


            //#endregion
        });
    </script>
</body>
</html>

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackaging.html

@@ -1058,9 +1058,9 @@
                                var report1 = "";
                                var parintName = $("#PrintName").val();
                                if (parintName == "斯莫尔") {
                                    report1 = urlAddRandomNo("../../views/grf/包装单物料标识卡(网页版).grf");
                                    report1 = urlAddRandomNo("../../grf/包装单物料标识卡(网页版).grf");
                                } else {
                                    report1 = urlAddRandomNo("../../views/grf/包装单物料标识卡(网页版)2.grf");
                                    report1 = urlAddRandomNo("../../grf/包装单物料标识卡(网页版)2.grf");
                                }

                                var args = {

 WebTM/views/³µ¼ä¹ÜÀí/²úÏß/MES_ProductionLinePackagingList.html

@@ -470,7 +470,7 @@
                                var args = {
                                    type: "print",
                                    showOptionDlg: false, //如果不显示打印对话框而直接打印，将此行注释去掉即可
                                    report: urlAddRandomNo("../../views/grf/白标打印.grf"),
                                    report: urlAddRandomNo("../../grf/白标打印.grf"),
                                    data: Customer
                                };
                                //var args = {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeArrangement_PG.html

@@ -53,15 +53,43 @@
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <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="HName" id="HName">
                                                <input type="text" class="layui-input" name="HSourceNumber" id="HSourceNumber">
                                            </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="HModel" id="HModel">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName">
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">工序代码</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input" name="HProcNumber" id="HProcNumber">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">工序名称</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input" name="HProcName" id="HProcName">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:5px">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">物料名称</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input" name="HName" id="HName">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">规格型号</label>
                                                <div class="layui-input-block">
                                                    <input type="text" class="layui-input" name="HModel" id="HModel">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row" style="margin-top:5px">
@@ -232,6 +260,30 @@
                        return;
                    }
                    get_FastQuery();
                }
            });

            //生产资源代码 å›žè½¦
            $('#HSourceNumber').on('keydown', function (event) {
                var HSourceNumber = $('#HSourceNumber').val();
                if (event.keyCode == 13) {
                    if (!HSourceNumber) {
                        layer.msg("生产资源代码不能为空！")
                        return;
                    }
                    get_Display_Tree();
                }
            });

            //生产资源 å›žè½¦
            $('#HSourceName').on('keydown', function (event) {
                var HSourceName = $('#HSourceName').val();
                if (event.keyCode == 13) {
                    if (!HSourceName) {
                        layer.msg("生产资源不能为空！")
                        return;
                    }
                    get_Display_Tree();
                }
            });

@@ -496,6 +548,8 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HProcNumber = $("#HProcNumber").val();
                var HProcName = $("#HProcName").val();
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                var HModel = $("#HModel").val();
@@ -523,6 +577,12 @@
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HProcNumber) {
                    sWhere += " and å·¥åºä»£ç  like '%" + HProcNumber + "%'";
                }
                if (HProcName) {
                    sWhere += " and å·¥åº like '%" + HProcName + "%'";
                }
                if (HNumber) {
                    sWhere += " and äº§å“ä»£ç  like '%" + HNumber + "%'";
@@ -640,6 +700,17 @@
            // æ ‘状图查询
            function get_Display_Tree() {
                var sql = " where 1=1 and HUSEORGID=" + sessionStorage["OrganizationID"];

                var HSourceNumber = $('#HSourceNumber').val();
                var HSourceName = $('#HSourceName').val();
                if (HSourceNumber) {
                    sql += " and hnumber like '%" + HSourceNumber + "%'";
                }
                if (HSourceName) {
                    sql += " and hname like '%" + HSourceName + "%'";
                }

             
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_Source/Gy_SourceTreeList',

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -917,6 +917,7 @@

            function txtHBarCode_KeyDown(HBarCode) {
                var barNo = HBarCode.substr(0, 3);
                var barNo2 = HBarCode.substr(0, 2);
                if (barNo == 'PRO' && $('#HProcExchHinteID').val() == '') {
                    layer.msg("请扫完流转卡后再扫工序码")
                    layer.close(index);
@@ -932,6 +933,101 @@
                        if (result.count == 1) {
                            var data = result.data[0];

                            switch (barNo2) {
                                case "20":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HICMOInterID": data.hicmointerid,
                                        "lngICMOEntryID": data.lngICMOEntryID,
                                        "HICMOBillNo": data.任务单号,
                                        "HMaterID": data.HMaterID,
                                        "HMaterName": data.产品,
                                        "HMaterNumber": data.产品代码,
                                        "HMaterModel": data.规格型号,
                                        "HPieceQty": data.流转卡数量,
                                        "HPlanQty": data.流转卡数量,
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchHinteID": data.hmainid,
                                        "HICMOQty": data.任务单数量,
                                        "lngBillKey": data.hmainid,
                                        "HOrderProcNO": data.订单跟踪号,
                                        "HPRDOrg": data.组织,
                                        "HPRDOrgID": data.组织
                                    });

                                    HProcExchBillNoFlag = true;

                                    var HProcExchHinteID = $('#HProcExchHinteID').val();

                                    var HInterID = data.hmainid;
                                    //自动匹配流水号
                                    $.ajax({
                                        url: GetWEBURL() + "/Sc_StationInBill/autoGetProcNo",
                                        type: "GET",
                                        data: { "HUserID": sessionStorage["Czybm"], "HInterID": HInterID, "BillType": "In" },
                                        success: function (data1) {
                                            if (data1.count == 1) {
                                                var data = data1.data[0];
                                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                                    "lngBillSubKey": data.hsubid,
                                                    "HProcName": data.工序,
                                                    "HProcID": data.工序ID,
                                                    "HProcNo": data.流水号,
                                                    "HCenterName": data.工作中心,
                                                    "HCenterID": data.HCenterID
                                                });
                                                $("#HProcNo").attr("readonly", "readonly");
                                                $("#HProcNo").css("background-color", "#efefef4d");
                                            }
                                        }
                                    })

                                    //动态列
                                    $.ajax({
                                        url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                        type: "GET",
                                        data: { "HProcExchHinteID": HProcExchHinteID },
                                        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')}}</div>", width: 200 });
                                                                break;
                                                            default:
                                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                                        }
                                                    }
                                                }
                                            }
                                            option = {
                                                elem: '#mainTable',
                                                url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
                                                type: "GET",
                                                //, cellMinWidth: 80
                                                toolbar: '#toolbarDemo'
                                                , where: { HProcExchHinteID: HProcExchHinteID }
                                                , cols: [col]
                                                , height: 500
                                            }
                                            table.render(option)
                                        }
                                    })
                            }

                            switch (barNo) {
                                case "HCX":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值