yusijie
2024-04-25 3de6a9eb5d6c00a756831fbab13da264c198ece7
用户编辑页面添加 IC卡号 自动;异常反馈单刷卡签到
1个文件已添加
4个文件已修改
409 ■■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackSignBill_BrushCard.html 383 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -296,6 +296,7 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill_KaiBei.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectBasis.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,8 +7,8 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
   /* var WEBURL = "http://47.96.97.237/API/";   //智云服务器*/
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackSignBillMain.html
@@ -488,8 +488,7 @@
            }
            //无源单新增
            function set_AddFNew()
            {
            function set_AddFNew() {
                //加源单类型区分(可以写不同的方法)
                refSav = "Add";
                //初始基本信息赋值
@@ -503,8 +502,7 @@
            }
            //有源单新增
            function set_AddNew()
            {
            function set_AddNew() {
                refSav = "Add";
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
@@ -578,13 +576,12 @@
                                    $("#HEquipName").val(LoadData[0].设备名称); //设备名称
                                    $("#HMouldID").val(LoadData[0].HMouldID); //模治具名称Id
                                    $("#HMouldName").val(LoadData[0].模治具名称); //模治具名称
                                    $("#HMainSourceBillNo").val(LoadData[0].单据号); //源单单号(暂时取值订单编号)
                                    $("#HMainSourceInterID").val(LoadData[0].hmainid); //源单主内码(取值HInterID)
                                    $("#HMainSourceEntryID").val(LoadData[0].HEntryID == undefined ? "0" : LoadData[0].HEntryID); //源单子内码
                                    $("#HMainSourceBillType").val(HSouceBillType); //源单类型
                                    $("#HSignEmpID").val(LoadData[0].HHandleEmpID); //签到人ID
                                    $("#HSignEmpName").val(LoadData[0].指派处理人); //签到人
                                }
                            
                                form.render('select');
@@ -601,8 +598,7 @@
            }
            //编辑
            function set_EditFromGrid()
            {
            function set_EditFromGrid() {
                refSav = "Update";
                form.render('select');
                $.ajax({
WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackSignBill_BrushCard.html
New file
@@ -0,0 +1,383 @@
<!DOCTYPE html>
<html>
<head>
    <meta charset="utf-8" />
    <title>异常反馈刷卡签到</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <style>
        .main-btn { /*头部主按钮*/
            padding: 0 2px; /*调整按钮左右空隙大小*/
            height: 30px;
            line-height: 30px;
        }
        .btn-title {
            font-size: 16px;
        }
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
            overflow: visible !important;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }
        .layui-form-item .layui-inline {
            margin-top: 5px;
            margin-bottom: 5px;
            margin-right: 0px;
        }
        .layui-form-label {
            width: 25%;
        }
    </style>
</head>
<body>
    <div class="layui-fluid" style="padding: 0;">
        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
            <div class="layui-card-body" style="padding: 1px;">
                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                    <div style="padding: 2px; ">
                        <button class="layui-btn layui-btn-normal" style="margin-left: 5px" type="button" lay-submit="" lay-filter="btnSignIn" id="btnSignIn">签到</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnQuery" id="btnQuery">查询</button>
                        <button class="layui-btn layui-btn-normal" style="margin-left: 10px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">退出</button>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
                        <h1 style="text-align: center; padding: 10px 0;"><b>异常反馈刷卡签到</b></h1>
                        <div class="layui-tab-content">
                            <!--基本信息-->
                            <div class="layui-tab-item layui-show">
                                <div class="layui-form-item" style="padding-top: 10px;">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">IC卡号:</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HICNumber" lay-verify="HICNumber" id="HICNumber">
                                            </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="HSignInEmp" lay-verify="HSignInEmp" id="HSignInEmp" style="background-color:#efefef4d;" readonly>
                                            </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="HEquipName" name="HEquipName" id="HEquipName" style="width: 60%;display: inline-block;">
                                                <input type="hidden" name="HEquipID" id="HEquipID" lay-verify="HEquipID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnEquip" id="btnEquip" 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>
                            </div>
                        </div>
                    </div>
                    <table class="" id="mainTable" lay-filter="mainTable" style="margin-top:10px;"></table>
                </form>
            </div>
        </div>
    </div>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element', 'upload', 'soulTable'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , soulTable = layui.soulTable
                , upload = layui.upload;
            //模块名
            var HModName = "OA_ErrMsgBackSignBill_BrushCard";
            var sWhere = "";
            var option = "";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = [];
            //#endregion
            //#region è¿›å…¥é¡µé¢å³åŠ è½½
            //#region ã€åŠ¨æ€èŽ·å–æ¨¡å—åç§°ã€‘
            var HModuleType = "0";
            //通过单据类型,从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
            $("h1").html('<b>' + HPageTitle + '</b>');
            //#endregion
            //初始化界面
            set_ClearBill()
            //#endregion
            //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
            //选择设备
            form.on('submit(btnEquip)', function () {//选择设备
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '设备档案列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../设备管理/设备档案/Gy_EquipFileMainList.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('请选择数据');
                        }
                        $("#HEquipName").val(checkStatus.data[0].设备名称);
                        $("#HEquipID").val(checkStatus.data[0].hmainid);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {
                    },
                    success: function (layero, index) {
                    }
                })
            });
            //查询
            form.on('submit(btnQuery)', function () {
                if ($('#HICNumber').val() == "") {
                    layer.msg("请先刷IC卡");
                    return;
                }
                get_FastQuery();//查询
            });
            //签到
            form.on('submit(btnSignIn)', function () {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '异常反馈接收单签到'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + 0 + '&HSouceBillType=' + 4529 + ''
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            get_FastQuery();//查询
                        }
                        , cancel: function () {
                        }
                    })
                } else {
                    layer.msg('请选择一个异常反馈接收单进行签到!');
                }
            });
            //退出
            form.on('submit(btnEdit)', function () {
                //关闭页签
                Pub_Close(2);
            });
            //IC卡回车方法
            $('#HICNumber').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_FastQuery();//查询
                }
            });
            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据,前面的只是添加或删除选中未选中样式以及设置背景色,字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })
            //#endregion
            //#endregion
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
            }
            //#endregion
            //初始化表格
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    , limits: [50, 500, 5000, 20000]
                    , limit: 50 //每页默认显示的数量
                    , cellMinWidth: 200
                    , done: function (res, curr, count) {
                        //soulTable.render(this);
                    }
                };
                option.data = [];
                option.cols = [];
                table.render(option);
            }
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(sql) {
                var HICNumber = $("#HICNumber").val();
                var HEquipName = $("#HEquipName").val();
                if (HICNumber) {
                    sWhere += " and IC卡号 = '" + HICNumber + "'";
                }
                if (HEquipName) {
                    sWhere += " and è®¾å¤‡åç§° like '%" + HEquipName + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/OA_ErrMsgBackSignBill_BrushCard/ErrMsgBackReceive',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            if (data1.data.length > 0) {
                                $("#HSignInEmp").val(data1.data[0].指派处理人);
                            } else {
                                $("#HSignInEmp").val("");
                                layer.msg('没有被指派异常反馈单', { time: 2 * 1000});
                            }
                            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 });
                                //获取不需要显示的列(H开头的列不显示)
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }
                            //在列表左边添加勾选框
                            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;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , totalRow: true
                                , done: function (res, curr, count) {
                                    //soulTable.render(this);
                                }
                            }
                            ins = table.render(option);
                            layer.close(ajaxLoad);
                        } else {
                            option.data = data1.data
                            ins = table.render(option);
                            layer.close(ajaxLoad);
                            //layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion
        });
    </script>
</body>
</html>
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html
@@ -104,6 +104,12 @@
                                                                </button>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label" style="width:110px;">IC卡号</label>
                                                            <div class="layui-input-inline">
                                                                <input class="layui-input" name="HICNumber" id="HICNumber">
                                                            </div>
                                                        </div>
                                                    </div>
                                                </div>
                                            </div>
@@ -999,6 +1005,7 @@
                                , "HCheckEmpName": data.检验员
                                , "HWorkCenterID": data.HWorkCenterID
                                , "HWorkCenterName": data.工作中心
                                , "HICNumber": data.IC卡号
                            });
                        } else {