yusijie
2023-08-16 2697d1954e6ab87a4b39176d0d521157c63d2ce1
产线工位,条码生成选源单过滤,缓存列表撤销
2个文件已添加
14个文件已修改
1185 ■■■■■ 已修改文件
WebTM/WebTM.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/HSourceReportHtml.html 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSet.html 390 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产工位/Gy_SourceWorkStationSetList.html 540 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserList.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Kf_OtherOutBill_FastList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/其他入库/Kf_OtherInBill_FastList.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Kf_POStockInBill_FastList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -247,6 +247,8 @@
    <Content Include="views\条码明细\Kf_BarCodeDetailQuery.html" />
    <Content Include="views\生产管理\日计划基础资料\Cg_PODemandPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\MaterialShorAnalysisReport.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSet.html" />
    <Content Include="views\生产管理\生产工位\Gy_SourceWorkStationSetList.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ShopCalendar.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu.html" />
    <Content Include="views\系统管理\快捷方式自定义\Xt_UserFastMenu_IconSet.html" />
WebTM/views/PublicPage/HSourceReportHtml.html
@@ -478,6 +478,21 @@
                        }
                        return sWhere;
                        break;
                    case '生产入库单':
                        if (HBillNo) {
                            sWhere += " and å•据号 like '%" + HBillNo + "%'";
                        }
                        if (PartNumber) {
                            sWhere += " and ç‰©æ–™ä»£ç  like '%" + PartNumber + "%'";
                        }
                        if (PartName) {
                            sWhere += " and ç‰©æ–™åç§° like '%" + PartName + "%'";
                        }
                        if (HDeptName && HDeptName != 0) {
                            sWhere += " and HDeptID = '" + HDeptName + "'";
                        }
                        return sWhere;
                        break;
                    case '退货通知单':
                        return sWhere;
                        break;
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_FastList.html
@@ -266,8 +266,8 @@
            }else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo == 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1207'
            $.ajax(
                {
@@ -308,7 +308,7 @@
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
                //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax(
WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html
@@ -226,6 +226,7 @@
            //监听当前处于哪一个页签,传 HModName å€¼
            element.on('tab(tab-TabTest)', function (data) {
                HMaterInfo = table.cache['mainTable'];
                var cur_title = data.elem.context.innerText;
                if (cur_title == "物料信息") {
                    HModName = "Gy_BarCodeBill";
@@ -1414,7 +1415,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../Baseset/基础资料/Gy_MaterialList_LSQP.html', 'yes'],
                                content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¹¤Î»/Gy_SourceWorkStationSet.html
New file
@@ -0,0 +1,390 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>生产工位编辑</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, 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/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        .layui-form-item .layui-inline {
            margin-top: 5px;
            margin-bottom: 5px;
            margin-right: 0px;
        }
        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 15px;">
            <div class="layui-card-body" style="padding: 1px;">
                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                    <div class="layui-card-header">
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
                        <div class="layui-row">
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">本地MAC号</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HMacAddr" id="HMacAddr" lay-verify="HMacAddr" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">匹配类型</label>
                                <div class="layui-input-inline">
                                    <select name="HType" id="HType" lay-filter="HType" class="layui-input" value="" style="float:left;width:150px">
                                        <option value="按工位匹配">按工位匹配</option>
                                        <option value="按工序匹配">按工序匹配</option>
                                        <option value="按工位+工序匹配">按工位+工序匹配</option>
                                    </select>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">视频播放</label>
                                <div class="layui-input-inline">
                                    <div class="layui-input-inline">
                                        <select name="HVideo" id="HVideo" lay-filter="HVideo" class="layui-input" value="" style="float:left;width:150px">
                                            <option value="0">否</option>
                                            <option value="1">是</option>
                                        </select>
                                    </div>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">资源名称</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工位号</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" lay-verify="HWorkStationName" name="HWorkStationName" id="HWorkStationName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <input type="hidden" name="HWorkStationID" id="HWorkStationID" lay-verify="HWorkStationID" value="0">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkStation" id="btnHWorkStation" style="padding: 0 10px;float: right;margin-right: 3px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                </div>
                            </div>
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                <div class="layui-input-block" style="margin-left: 77px;">
                                    <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                    <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-inline">
                                <label class="layui-form-label" style="width: 85px;">创建人</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
                                </div>
                            </div>
                            <div class="layui-col-xs3 layui-inline">
                                <label class="layui-form-label">创建日期</label>
                                <div class="layui-input-inline">
                                    <input type="datetime" class="layui-input" name="HCreateDate" id="HCreateDate">
                                </div>
                            </div>
                        </div>
                        <div class="layui-row">
                            <input id="HItemID" name="HItemID" type="hidden" value="0" />
                        </div>
                    </div>
                </form>
            </div>
        </div>
    </div>
    <script>
        //#region æŠ˜å æ³¨é‡Š
        //#endregion
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var sWhere = "";
            var date = new Date();
            var day = date.getDate();
            var month = date.getMonth() + 1;
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            $('#HCreator').val(sessionStorage["HUserName"])
            $('#HCreateDate').val(Format(new Date(), "yyyy-MM-dd"))
            //判断是否登录 æœªç™»å½•则跳到登录页
            get_LoginIs();
            //获取页面跳转参数
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//操作类型
            } else {
                var OperationType = params[params[0]];//操作类型
                var linterid = params[params[1]];//源单id
                var HSouceBillType = params[params[2]];//源单类型
            }
            //判断操作类型
            if (OperationType == 1) {//无源单新增
                $("#HItemID").val(0);
            }
            else if (OperationType == 3) {//编辑
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
            }
            else if (OperationType == 4) {//浏览
                $("#HItemID").val(linterid);//
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//保存后加载数据时保存按钮禁用
            }
            else {
                layer.alert("未知操作类型!", { icon: 5 });
            }
            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //退出按钮
            form.on('submit(Cancel)', function () {
                Pub_Close(1);
            })
            //选择生产资源
            form.on('submit(btnHSource)', function () {
                get_checkHSource();
            });
            //选择工位
            form.on('submit(btnHWorkStation)', function () {
                get_checkHWorkStation();
            });
            //选择工序
            form.on('submit(btnHProc)', function () {
                get_checkHProc();
            });
            //保存按钮
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
            });
            //#endregion
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //#region åˆ¤æ–­æ˜¯å¦ç™»å½• æœªç™»å½•则跳到登录页
            function get_LoginIs() {
                if (sessionStorage.login != "login") {
                    layer.confirm("登录失效,请重新登录!", {
                        icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                    }, function () { window.location.href = "../../user/login.html"; });
                }
            }
            //#endregion
            //#region åŠ è½½è¡¨å¤´
            function RoadBillMain(linterid) {
                //查询检验方案单是否存在
                var ajaxLoad = layer.load();
                sWhere = " and HItemID = " + linterid
                $.ajax({
                    url: GetWEBURL() + "Gy_SourceWorkStationSet/list",
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HItemID": data.HItemID
                                , "HMacAddr": data.MAC号
                                , "HSourceID": data.HSourceID
                                , "HSourceName": data.生产资源名称
                                , "HWorkStationID": data.HWorkStationID
                                , "HWorkStationName": data.工位名称
                                , "HProcID": data.HProcID
                                , "HProcName": data.工序名称
                                , "HType": data.匹配类型
                                , "HVideo": data.是否默认播放视频 == "是" ? 1 : 0
                                , "HRemark": data.备注
                                , "HCreateDate": Format(data.创建日期, "yyyy-MM-dd")
                                , "HCreator": data.创建人
                            });
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
                var sMainStr = JSON.stringify(data.field);
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "Gy_SourceWorkStationSet/Save", //方法所在页面和方法名
                    async: true,
                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            //ReRoadBillMain();
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.alert("错误:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    }
                });
            }
            //#endregion
            //#region é€‰æ‹©ç”Ÿäº§èµ„源方法
            function get_checkHSource() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '生产资源列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Source.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('请选择数据');
                        }
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
            //#region é€‰æ‹©å·¥ä½æ–¹æ³•
            function get_checkHWorkStation() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工位列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_WorkStationList.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('请选择数据');
                        }
                        $("#HWorkStationName").val(checkStatus.data[0].工位名称);
                        $("#HWorkStationID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
            //#region é€‰æ‹©å·¥åºæ–¹æ³•
            function get_checkHProc() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.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('请选择数据');
                        }
                        $("#HProcName").val(checkStatus.data[0].工序名称);
                        $("#HProcID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
            //#region ä¿å­˜åŽæµè§ˆæ–¹æ³•
            function ReRoadBillMain() {
                location.replace('Add_Edit_Gy_Warehouse.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//保存后加载数据时保存按钮禁用
            }
            //#endregion
            //#endregion
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/Éú²ú¹ÜÀí/Éú²ú¹¤Î»/Gy_SourceWorkStationSetList.html
New file
@@ -0,0 +1,540 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>产线工位维护</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, 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>
</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" style="width: 85px;padding: 9px 18px;">资源名称:</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </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:5px">
                                        <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>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script>
        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
            var sWhere = "";
            var option = [];
            var Organization = sessionStorage["Organization"]
            var HModName = "Gy_SourceWorkStationSetList";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "HSourceID", "HProdOrgID", "HProcID","HWorkStationID"];
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //初始化界面
            set_ClearBill();
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //退出按钮
                    case 'get_Exit': parent.layui.admin.events.closeThisTabs();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
                };
            });
            //#endregion
            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                $("#HSourceName").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
                sWhere = "";
                //$("#btnSearch").click();
            });
            //#endregion
            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });
            //#endregion
            //#endregion
            //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„æ‰€æœ‰æ–¹æ³•
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
            }
            //#endregion
            //#region åˆå§‹åŒ–表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90
                    //, cols: [[
                    //]]
                };
            }
            //#endregion
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_SourceWorkStationSet/list',
                    type: "GET",
                    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')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [500, 2000, 5000, 50000]
                                , limit: 500
                                , cellMinWidth: 90
                            }
                            table.render(option);
                            //刷新表格数据
                            DisPlay_HideColumn();
                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HSourceName = $("#HSourceName").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                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;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (HSourceName) {
                    sWhere += " and ç”Ÿäº§èµ„源名称 like '%" + HSourceName + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
            //#region åˆ·æ–°é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HNumber").val("");
                $("#HName").val("");
                sWhere = "";
            }
            //#endregion
            //#region æ–°å¢ž
            function set_AddNew() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '生产工位列表-新增'
                    , shift: 0//弹出动画
                    , content: './Gy_SourceWorkStationSet.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion
            //#region ç¼–辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HItemID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '包装方式列表-编辑'
                        , shift: 0//弹出动画
                        , content: './Gy_SourceWorkStationSet.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
                }
            }
            //#endregion
            //#region åˆ é™¤
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_PackType',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        window.location.reload();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据删除!');
                }
            }
            //#endregion
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
                get_Display(sWhere);
            }
            //#endregion
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }
                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            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 = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }
                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }
            //#endregion
            //#region åˆ—明显示下拉框
            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
            //#endregion
            //以上是layui模块
        });
    </script>
</body>
</html>
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserList.html
@@ -222,7 +222,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Xt_User/list',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -465,7 +465,9 @@
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html
@@ -164,11 +164,11 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验方案</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
                                                <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -595,8 +595,8 @@
                    </div>
                    <script type="text/html" id="toolbarDemo">
                        <div class="layui-btn-container">
                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>-->
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增加一行</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>复制一行</button>
                        </div>
                    </script>
                    <!--隐藏字段-->
@@ -862,8 +862,11 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HQCCheckItemID": "", "检验项目": "", "HQCStd": "", "HResult": "",
                    "HRemark": ""
                     "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": 0, "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -872,6 +875,7 @@
                        table.render(option);
                        for (var i = 1; i <= option.data.length; i++) {
                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
                            $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                        }
                        form.render('select');
                        break;
@@ -891,6 +895,7 @@
                            table.render(option);//将数据渲染到表格上
                            for (var i = 1; i <= option.data.length; i++) {
                                $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
                            }
                            form.render('select');
                        }
@@ -1266,7 +1271,7 @@
            //#endregion
            //表头信息检验方案弹窗
            form.on('submit(btnSearchCheckProject)', function () {
            form.on('submit(btnSearchQCScheme)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -1286,8 +1291,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
                        $("#HQCCheckProjectName").val(checkStatus.data[0].方案名称);
                        $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
                        $("#HQCSchemeName").val(checkStatus.data[0].方案名称);
                        get_CheckItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
@@ -1325,8 +1330,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
                        $("#HQCCheckProjectName").val(checkStatus.data[0].方案名称);
                        $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
                        $("#HQCSchemeName").val(checkStatus.data[0].方案名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -1540,7 +1545,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
                    data: { "CheckProjectID": $("#HQCCheckProjectID").val() },
                    data: { "CheckProjectID": $("#HQCSchemeID").val() },
                    success: function (result) {
                        //option.data = result.data;
                        //table.render(option);
@@ -1796,7 +1801,7 @@
                }];
                option = {
                    elem: '#mainTable'
                    //, toolbar: '#toolbarDemo'
                    , toolbar: '#toolbarDemo'
                    , limit: 500 //每页默认显示的数量
                    , height: 'full-50'
                    , cellMinWidth: 150
@@ -1811,7 +1816,7 @@
                        , { field: 'HAnalysisMethod', title: '分析方法', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
                        , { field: 'HKeyInspect', title: '重点检查', templet: '#HKeyInspect', unresize: false }
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        //, { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HMax', title: '最大值', edit: 'text' }
@@ -2759,7 +2764,7 @@
                    isHavingCount = false;
                    //回显检验值
                    $.ajax({
                        url: GetWEBURL() + "/QC_ValueTable/getValueList",
                        url: GetWEBURL() + "/QC_ValueTable_ProcessCheck/getValueList",
                        type: "GET",
                        async: false,
                        data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html
@@ -168,11 +168,11 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">检验方案</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchCheckProject" id="btnSearchCheckProject" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <input type="text" class="layui-input" name="HQCSchemeName" id="HQCSchemeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchQCScheme" id="btnSearchQCScheme" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HQCCheckProjectID" id="HQCCheckProjectID" value="0">
                                                <input type="hidden" name="HQCSchemeID" id="HQCSchemeID" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -932,8 +932,12 @@
                //新增行表格数据
                var NewRow = {
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": ""
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
                    "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
                    "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
                        table.cache["mainTable"].push(NewRow);
@@ -1390,9 +1394,9 @@
                                , "HProcExchEntryID": data.HProcExchEntryID
                                , "HFirstCheckEmp": data.HFirstCheckEmp
                                , "HFirstCheckEmpName": data.质检员名称
                                //, "HQCCheckProjectID": data.检验方案ID
                                //, "HQCCheckProjectName": data.检验方案名称
                                //, "HQCCheckProjectID": data.HManagerID
                                //, "HQCSchemeID": data.检验方案ID
                                //, "HQCSchemeName": data.检验方案名称
                                //, "HQCSchemeID": data.HManagerID
                                //, "HPSStyleID": data.HPSStyleID
                                , "HRemark": data.表头备注
                                //, "HSSID": data.HSSID
@@ -1439,10 +1443,13 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目": data[i].检验项目名称, "HQCStd": data[i].检验标准,
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": "0", "检验仪器": "","HQCStd": data[i].检验标准,
                                        "HUnit": data[i].检验单位, "HQCNote": data[i].检验记录, "HResult": data[i].结论,
                                        "HMax": data[i].最大值, "HMin": data[i].最小值, "HAvg": data[i].平均值, "HRemark": data[i].表体备注,
                                        "HAnalysisMethod": data[i].分析方法, "HKeyInspect": data[i].重点检查 == 0 ? false : true,
                                        "HAnalysisMethod": data[i].分析方法, "HKeyInspect": data[i].重点检查 == 0 ? false : true, "HSampleSchemeID": 0, "HUnitID": 0,
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '',
                                        "HSampleSchemeName": "", "HSampleQty": "", "HSampleDamageQty": "", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
                                        "HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                                    }
                                )
                            }
@@ -1487,7 +1494,7 @@
            //#endregion
            //表头信息检验方案弹窗
            form.on('submit(btnSearchCheckProject)', function () {
            form.on('submit(btnSearchQCScheme)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -1507,8 +1514,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
                        $("#HQCCheckProjectName").val(checkStatus.data[0].方案名称);
                        $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
                        $("#HQCSchemeName").val(checkStatus.data[0].方案名称);
                        get_CheckItem();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
@@ -1547,8 +1554,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HQCCheckProjectID").val(checkStatus.data[0].HItemID);
                        $("#HQCCheckProjectName").val(checkStatus.data[0].方案名称);
                        $("#HQCSchemeID").val(checkStatus.data[0].HItemID);
                        $("#HQCSchemeName").val(checkStatus.data[0].方案名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -1763,7 +1770,7 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                    type: "GET",
                    data: { "CheckProjectID": $("#HQCCheckProjectID").val() },
                    data: { "CheckProjectID": $("#HQCSchemeID").val() },
                    success: function (result) {
                        var rowdata = [];
                        var data = result.data;
@@ -3293,7 +3300,7 @@
                var sValueTable = JSON.stringify(table.cache['ValueTable']);
                var HInterID = $("#HInterID").val();
                var HEntryID = dataindex;
                console.log(sValueTable);
                var msg = sValueTable + ";" + HInterID + ";" + HEntryID
                var index = layer.load();
WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList.html
@@ -59,9 +59,18 @@
                        </form>
                        <!--</div>-->
                    </div>
                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <div class="layui-tab layui-tab-card">
                        <ul class="layui-tab-title">
                            <li class="layui-this">检测值</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
                                <!--检测值-->
                                <table class="layui-hide" id="mainTable_Value" lay-filter="mainTable_Value"></table>
                            </div>
                        </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-Add"><i class="layui-icon layui-icon-form"></i>新增</button>
@@ -84,6 +93,8 @@
        var _cur_page = 1;
        var sql = " ";
        var titleData = ["hmainid", "hentryid", "HEntryID", "HSourceID", "HMaterID", "HFirstCheckEmp", "HQCCheckItemID", "HUnitID", "HSampleSchemeID"];
        var checkobj = ""; //复选框
        var trindex = ""; //默认选中行下标
        //var options = document.getElementById('HStatus').children;
        function getUrlVars() {
            var vars = [], hash;
@@ -143,6 +154,8 @@
            //公用变量
            var option = [];
            var HModName = "QC_FirstPieceCheckBillList";
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆæ£€æµ‹å€¼ï¼‰
            var titleData_Value = [];
            //隐藏勾选字段
            DisPlay_HideColumn();
            //常规用法
@@ -386,6 +399,78 @@
            }
            //点击主表带出从表数据
            table.on('rowDouble(mainTable)', function (obj) { //注:tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                //选中行改变颜色
                check_row(obj);
                var datas = obj.data; //获得当前行数据
                HBillNo = datas["单据号"].toString();
                var HInterID = datas.hmainid;
                var HEntryID = datas.hsubid;
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_ValueTable/getValueList',
                    type: "GET",
                    data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
                    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, titleData_Value) > -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 });
                                    }
                                }
                            }
                            //动态显示列名
                            option_Value = {
                                elem: '#mainTable_Value'
                                //, toolbar: '#toolbarDemo2'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option_Value);
                            //刷新表格数据
                            //DisPlay_HideColumn();
                            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 });
                    }
                });
            });
            form.on('submit(f_Query)', function (data) {//查询
                var sqlWhere = " and 1=1 ";
                //if ($("#HStatus").val() != "")
@@ -461,6 +546,32 @@
                RoadHBillNo(sqlWhere);
            });
            //改变选中行颜色
            function check_row(obj) {
                if (checkobj != "") {
                    checkobj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    checkobj.tr.find(':checkbox:first').prop('checked', false);//取消复选框选中样式
                    $(checkobj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                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背景颜色和字体颜色
                    checkobj = obj;
                } 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_AddNew() {
                layer.open({
WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBill_FastList.html
@@ -227,8 +227,8 @@
            } else {
                return layer.msg("请选择一条数据");
            }                
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo == 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1206'
            $.ajax(
                {
@@ -268,7 +268,7 @@
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    $.ajax(
                        {
                            type: "Get",
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_FastList.html
@@ -219,8 +219,8 @@
            }else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo == 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1205'
            $.ajax(
                {
@@ -259,7 +259,7 @@
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
                //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    var wait = layer.load();
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_FastList.html
@@ -265,8 +265,8 @@
            }  else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo == 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1204'
            $.ajax(
                {
@@ -307,7 +307,7 @@
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
                //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax(
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_FastList.html
@@ -313,8 +313,8 @@
                } else {
                    return layer.msg("请选择一条数据");
                }
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
                var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
                var sBillNo = data[0].HBillNo == 'undefined' ? data[0].单据号 : data[0].HBillNo;
                var sBillType = '1202'
                $.ajax(
                    {
@@ -356,7 +356,7 @@
                var checkStatus = table.checkStatus('dj-table')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax(
WebTM/views/ÑéÊÕÈë¿â/ÆäËûÈë¿â/Kf_OtherInBill_FastList.html
@@ -253,8 +253,8 @@
            }else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo = 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
            var sBillNo = data[0].HBillNo == 'undefined' ? data[0].单据号 : data[0].HBillNo;
            var sBillType = '1203'
            $.ajax(
                {
@@ -296,7 +296,7 @@
            var checkStatus = table.checkStatus('dj-table')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
            //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax(
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_FastList.html
@@ -278,7 +278,7 @@
                var checkStatus = table.checkStatus('dj-table')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var sInterID = data[0].HInterID = 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    var sInterID = data[0].HInterID == 'undefined' ? data[0].单据内码 : data[0].HInterID;
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax(