Merge branch 'master' of http://192.168.31.17:3000/1790429840/KN_CAMP_SOFTWARE_TEST

Code/ClassLib/ZHYQ/OracleDAL/OA/OA_TOLERANCE.cs

@@ -653,6 +653,10 @@ namespace FangYar.OracleDAL.OA
             }
             strSql.Append(" limit " + startnum + ", " + PageSize);
             strSql.Append(" ) SELECT t.*,o.ORG_NAME ORG_NAME from t LEFT JOIN tbl_sys_emp e on e.users_uid = t.PPL_ID LEFT JOIN FIRE_ORG o on o.org_id = e.org_id ");
+            if (order != null && order != "")
+            {
+                strSql.Append(" ORDER BY " + order);
+            }
             return FangYar.Common.MySqlHelper.QueryTable(strSql.ToString());
         }
 

Code/智慧营区/DOCManageAPP（阿克苏）/DocManageAPP.csproj

@@ -2776,13 +2776,17 @@
     <Content Include="OA\Knowledge\InfoSet\KnowledgeInfoList.html" />
     <Content Include="OA\Knowledge\TypeSet\KnowledgeTypeEdit.html" />
     <Content Include="OA\Knowledge\TypeSet\KnowledgeTypeList.html" />
+    <Content Include="OA\Meeting2\MeetNewList.html" />
     <Content Include="OA\PersonAlarm\PersonAlarmAdd.html" />
     <Content Include="OA\PersonAlarm\PersonAlarmCancelItem.html" />
     <Content Include="OA\PersonAlarm\PersonAlarmListCheck.html" />
     <Content Include="OA\PersonAlarm\PersonAlarmListCancel.html" />
+    <Content Include="OA\ReportLocation\OaLeaveAdd.html" />
     <Content Include="OA\SealManage\SealEdit.html" />
     <Content Include="OA\SealManage\SealList.html" />
     <Content Include="OA\Statistics\personStrengthSta.js" />
+    <Content Include="OA\Tolerance\ToleranceAdd.html" />
+    <Content Include="OA\Tree\visIntree.html" />
     <Content Include="OA\UserGroup\audit.html" />
     <Content Include="OA\UserGroup\audit.js" />
     <Content Include="OA\UserGroup\edit.html" />
@@ -4468,10 +4472,19 @@
     <Content Include="TempPage\Device\DeviceLinkFlowList.html" />
     <Content Include="TempPage\Device\DeviceLinkList.html" />
     <Content Include="TempPage\Device\aa.mp3" />
+    <Content Include="TempPage\Emp\EmpAttendApprowalList.html" />
     <Content Include="TempPage\Emp\EmpContentEdit.html" />
     <Content Include="TempPage\Emp\EmpAttendSta.html" />
     <Content Include="TempPage\Emp\EmpDutySuppApproList.html" />
+    <Content Include="TempPage\Emp\EmpZhiBanDangRiPage.html" />
+    <Content Include="TempPage\Emp\EmpZhiBanFangHuoAdd.html" />
+    <Content Include="TempPage\Emp\EmpZhiBanDangRiAdd.html" />
     <Content Include="TempPage\Emp\EmpDutyUpdApproList.html" />
+    <Content Include="TempPage\Emp\EmpZhiBanFangHuoEdit.html" />
+    <Content Include="TempPage\Emp\EmpZhiBanDangRiEdit.html" />
+    <Content Include="TempPage\Emp\EmpZhiBanFangHuoPage.html" />
+    <Content Include="TempPage\Emp\EmpZhiBanFangHuoList.html" />
+    <Content Include="TempPage\Emp\EmpZhiBanDangRiList.html" />
     <Content Include="TempPage\Emp\EmpVideoEdit.html" />
     <Content Include="TempPage\Emp\EmpVideoList.html" />
     <Content Include="TempPage\Emp\EmpContentList.html" />

Code/智慧营区/DOCManageAPP（阿克苏）/OA/Exercise/Plan/PlanItem.js

@@ -106,7 +106,7 @@ layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () {
     //出操点
     $.ajax({
         type: "post",
-        url: "../../../ashx/OaPatrolSpotHandler.ashx",
+        url: "/ashx/OaPatrolSpotHandler.ashx",
         data: { Action: "getSpots", OrgId: jgOrgId, patrolSpotType: '3' },
         dataType: "json",
         success: function (result) {
@@ -161,6 +161,13 @@ layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () {
             }
         });
     });
+    //计算时间差
+    function timJS() {
+        var s_time = $("#S_TIME").val();
+        var e_time = $("#E_TIME").val();
+        var time = new Date('2024-09-27 ' + e_time) - new Date('2024-09-27 ' + s_time);
+        return Math.floor(time / (60 * 1000));
+    }
 
     form.on("submit(AddEdit)", function (data) {
         //判断时间是否符合要求
@@ -179,9 +186,13 @@ layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () {
             layer.msg("结束时间未选择！");
             return false;
         }
+        var minJs = timJS();
+        if (minJs > 15) {
+            layer.msg("开始和结束时间不允许超过15分钟！");
+            return false;
+        }
 
-        if (new Date("2000-01-01 " + s_time) >= new Date("2000-01-01 " +m_time))
-        {
+        if (new Date("2000-01-01 " + s_time) >= new Date("2000-01-01 " + m_time)) {
             layer.msg("节点时间早于起始时间，请重新选择！");
             return false;
         }
@@ -189,6 +200,9 @@ layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () {
             layer.msg("结束时间早于节点时间，请重新选择！");
             return false;
         }
+
+
+
         var WORK_DAY_Array = new Array();
         $("#WORK_DAY input[name='WORK_DAY']:checked").each(function (i) {
             WORK_DAY_Array[i] = $(this).val();

Code/智慧营区/DOCManageAPP（阿克苏）/OA/Meeting2/MeetNewList.html

@@ -0,0 +1,208 @@
+<!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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <style>
+        .searchVal {
+            width: 300px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+    </style>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div id="divOrgDept" style=" position: absolute; top: 0; bottom: 0px; left: 0; width: 270px; min-height: 500px; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; ">
+        <blockquote class="layui-elem-quote title">机构目录</blockquote>
+        <div style="width: 100%;height: calc(100% - 52px);overflow: auto">
+            <ul id="ztree" class="ztree"></ul>
+        </div>
+    </div>
+    <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
+
+        <div class="layui-input-inline">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;" id="ipt_seach">
+        </div>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
+        <div class="layui-inline">
+            <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
+            <input type="file" id="btn_upd_hide" style="display:none;" />
+        </div>
+
+
+        <table class="layui-hide" id="ItemInfoList" lay-filter="ItemInfoList"></table>
+
+    </div>
+
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+
+
+            //var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+
+            var OrgId = 'D8DC637B8B984848A63F82A018AFAEB0';
+
+            var selTreeID = OrgId;
+
+            var $zTree, OrgList = [];
+            var setting = {
+                view: {
+                    selectedMulti: false
+                },
+                data: {
+                    key: {
+                        name: "NAME"
+                    },
+                    simpleData: {
+                        enable: true,
+                        type: "TYPE",
+                        idKey: "ID",
+                        pIdKey: "PID"
+                    }
+                },
+                edit: {
+                    enable: false
+                },
+                callback: {
+                    onClick: function (e, treeId, treeNode) {
+
+                        // search(treeNode.ID, treeNode.TYPE);
+
+                        selTreeID = treeNode.ID;
+
+                        InitTable();
+                        //search(selTreeID, treeNode.TYPE);
+
+                    }
+                }
+            };
+            //初始化树
+            $(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/SysEmpHandler.ashx",
+                    data: { Action: "OrgDeptTree", OrgId: OrgId },
+                    dataType: "json",
+                    success: function (result) {
+                        var zNodes = result.data;
+                        if (zNodes.length > 0) {
+                            for (var i in zNodes) {
+                                OrgList.push(zNodes[i].ID);
+                            }
+                        }
+                        $zTree = $.fn.zTree.init($("#ztree"), setting, zNodes);
+
+                        var nodes = $zTree.getNodes();
+                        for (var i = 0; i < nodes.length; i++) {
+                            $zTree.expandNode($zTree.getNodes()[i], true, false, false);
+                        }
+                    }
+                });
+            });
+
+            var table = layui.table;
+            function InitTable() {
+
+                table.render({
+                    elem: '#ItemInfoList'
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: { Action: 'SelInfoPage', tbName: "oa_meeting_memo", wheres: " MSUBJECT like '%" + $("#ipt_seach").val() + "%' ", random: new Date().getTime() }
+                    , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
+                    , cols: [[
+                        //{ field: 'id', align: "center", title: 'ID', sort: true }
+                        { field: 'MSUBJECT', align: "center", title: '会议名称' }
+                        , { field: 'MHOST', align: "center", title: '主持人' }
+                        , { field: 'MPARTICIPANT', align: "center", title: '参会人员' }
+                        , { field: 'MCONTENT', align: "center", title: '会议内容' }
+                        , { field: 'A_TIME', align: "center", title: '时间', sort: true }
+                        , {
+                            field: 'cz', align: "center", title: '操作', templet: function (d) {
+                                var htmlStr = ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" /></a>  ';
+                                return htmlStr;
+                            }
+                        }
+                    ]]
+                    , page: true
+                    , limits: [10, 15, 20, 50, 999, 9999]
+                    , toolbar: true
+                    , defaultToolbar: ['filter', 'print', 'exports']
+                    , limit: 15
+                });
+
+            }
+
+            InitTable();
+
+            $("#btn_seach").click(function () {
+
+                InitTable();
+            });
+
+            //列表操作
+            table.on('tool(ItemInfoList)', function (obj) {
+                var layEvent = obj.event;
+                data = obj.data;
+                //console.log(data);
+
+                switch (layEvent) {
+                    //删除
+                    case 'del':
+                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+
+                            $.ajax({
+                                type: "post",
+                                url: "/ashx/A_CommonHandler.ashx",
+                                data: { Action: "DelInfo", tbName: "oa_meeting_memo", wheres: " id = '" + data.ID + "'" },
+                                dataType: "json",
+                                success: function (result) {
+                                    InitTable();
+                                    layer.closeAll();
+                                }
+                            });
+                        });
+                        break;
+                }
+            })
+
+
+        });
+    </script>
+
+
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/OA/PAccess/PAccessList.js

@@ -167,27 +167,13 @@
         id: "PAccessListTable",
         cols: [[
             { type: "checkbox", fixed: "left", width: 30 },
-            {
-                field: 'NAME', title: '姓名', minWidth: 60, align: "center",
-                templet: function (v) {
-                    if (v.IFCONSISTENT == "0") {
-                        return v.NAME + '<span style="color:red">（编号异常请联系管理员）</span>';
-                    }
-                    else {
-                        return v.NAME;
-                    }
-                }
-            },
-            //{
-            //    field: 'EXTEND2', title: '编号', minWidth: 60, align: "center",
-            //    templet: function (v) {
-            //        return v.EXTEND2.replace(/(\w{8})\w*(\w{2})/, '$1******$2')
-            //    }
-            //},
-            /*            { field: 'EXTEND4', title: '编号', minWidth: 60, align: "center" },*/
+            { field: 'NAME', title: '姓名', minWidth: 60, align: "center" },
             { field: 'START_TIME', title: '时间', minWidth: 60, align: "center" },
+            { field: 'sy', title: '事由', minWidth: 60, align: "center", templet: function (d) { return '正常出入'; } },
+            { field: 'ls', title: '类型', minWidth: 60, align: "center", templet: function (d) { if (d.ADDR.indexOf('口')) { return '门禁'; } else { return '考勤'; } } },
             { field: 'ADDR', title: '地址', minWidth: 60, align: "center" },
             { field: 'ORG_NAME', title: '机构', minWidth: 60, align: "center" },
+            { field: 'dh', title: '电话', minWidth: 60, align: "center", templet: function (d) { return '无'; } },
             { title: '操作', width: 180, templet: '#PAccessListBar', fixed: "right", align: "center" }
         ]]
     });

Code/智慧营区/DOCManageAPP（阿克苏）/OA/PERFORMANCE/BASIC/index.js

@@ -38,6 +38,7 @@
                     }
                 }
             },
+            { field: 'time', title: '时间', minWidth: 60, align: "center", templet: function (d) { return getDate(); } },
             { field: 'DEPTNAME', title: '部门', minWidth: 60, align: "center" },
         ]],
         done: function (res, curr, count) {
@@ -48,6 +49,20 @@
             }
         }
     });
+    function getDate() {
+        const now = new Date();
+
+        const year = now.getFullYear();
+        const month = ('0' + (now.getMonth() + 1)).slice(-2);
+        const day = ('0' + now.getDate()).slice(-2);
+        const hours = ('0' + now.getHours()).slice(-2);
+        const minutes = ('0' + now.getMinutes()).slice(-2);
+        const seconds = ('0' + now.getSeconds()).slice(-2);
+
+        const formattedTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
+
+        return formattedTime;
+    }
 
 
     //搜索

Code/智慧营区/DOCManageAPP（阿克苏）/OA/PERFORMANCE/RECORD/RecordList.js

@@ -82,7 +82,9 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
         cols: [[
             { field: 'ORG_NAME', title: '所属消防机构', minWidth: 60, align: "center" },
             { field: 'DEPT_NAME', title: '所属部门', minWidth: 60, align: "center" },
-            { field: 'USERNAME', title: '申请人', minWidth: 60, align: "center" },
+            { field: 'USERNAME', title: '姓名', minWidth: 60, align: "center" },
+            { field: 'USERUID', title: '电话', minWidth: 60, align: "center" },
+            { field: 'time', title: '时间', minWidth: 60, align: "center", templet: function (d) { return getDate(); } },
             {
                 field: 'FRACTION_SUM', title: '加减总分', minWidth: 60, align: "center", templet: function (d) {
                     return "<div title=\"点击查看【" + d.USERNAME + "】加减分记录\" style=\"width:100%;height:100%;cursor:pointer;\" onclick=\"goRecordItem('" + d.USERUID + "', '" + d.USERNAME + "')\"><a style=\"color: #0a1cf9;text-decoration: underline;\" href=\"#\">" + d.FRACTION_SUM + "</a>";
@@ -91,6 +93,21 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
         ]]
     });
 
+    function getDate() {
+        const now = new Date();
+
+        const year = now.getFullYear();
+        const month = ('0' + (now.getMonth() + 1)).slice(-2);
+        const day = ('0' + now.getDate()).slice(-2);
+        const hours = ('0' + now.getHours()).slice(-2);
+        const minutes = ('0' + now.getMinutes()).slice(-2);
+        const seconds = ('0' + now.getSeconds()).slice(-2);
+
+        const formattedTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
+
+        return formattedTime;
+    }
+
     $(".addNews_btn").click(function () {
         var clientWidth = parseInt(document.body.clientWidth * 0.7) + 'px';
         var clientHeight = parseInt(document.body.clientHeight * 0.9) + 'px';

Code/智慧营区/DOCManageAPP（阿克苏）/OA/ReportLocation/OaLeaveAdd.html

@@ -0,0 +1,243 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+    <style>
+        .searchVal {
+            width: 200px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+
+        .layui-form-label {
+            width: 100px;
+        }
+    </style>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div style="float:left;width:100%;height:100%;">
+        <form class="layui-form" style="width: 99%;">
+            <input class="layui-input ID" type="hidden" />
+            <input class="layui-input Action" type="hidden" />
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    姓名
+                </label>
+                <div class="layui-input-block">
+                    <select id="pplName" lay-filter="pplName" lay-search="">
+                        <option value="">---申请人---</option>
+                    </select>
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    电话
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="pplId" readonly="readonly" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    标题
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="title" readonly="readonly" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    离营时间
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="sTime" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    归队时间
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="eTime" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    请假天数
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="lNum" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    事由
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="reason" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    去向
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="lOut" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    审批人
+                </label>
+                <div class="layui-input-block">
+                    <select id="app_pplId" lay-filter="app_pplId" lay-search="">
+                        <option value="">---审批人---</option>
+                    </select>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1" id="btn_save">保存</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+
+            var form = layui.form;
+            var laydate = layui.laydate;
+
+            laydate.render({ elem: '#sTime', type: 'datetime', value: new Date() });
+            laydate.render({ elem: '#eTime', type: 'datetime', value: new Date() });
+
+            //获取Url参数
+            function getParameterByName(name) {
+                var params = {};
+                var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function (m, key, value) {
+                    params[key] = value;
+                });
+                return params[name] || '';
+            }
+
+            var OrgId = getParameterByName('orgId');
+            //申请人切换
+            form.on('select(pplName)', function (data) {
+                //console.log(data);
+                $("#pplId").val(data.value);
+                //选择信息
+                var tag = $('#pplName option:selected').text();
+                if (tag == "---申请人---") {
+                    $("#title").val("");
+                } else {
+                    $("#title").val(tag + "的请假申请");
+                }
+
+            });
+
+
+            //初始化树
+            $(function () {
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/SysEmpHandler.ashx",
+                    data: { Action: 'OrgEmpList', random: new Date().getTime(), OrgId: OrgId, is_admin: 0, IsAdmin: 1, is_content: 1, limit: 999 },
+                    dataType: "json",
+                    success: function (res) {
+                        //console.log(res);
+                        var htmlStr = '';
+                        res.data.forEach(function (obj, index, arr) {
+                            htmlStr += "<option value='" + obj.EMP_MOBILE + "'>" + obj.EMP_NAME + "</option>";
+                        });
+                        $("#pplName").append(htmlStr);
+                        $("#app_pplId").append(htmlStr);
+
+                        form.render('select');
+
+                    }
+                });
+
+            });
+
+
+
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/AppFlowHandler.ashx",
+                    data: {
+                        Action: 'AppLeaveTaskApply'
+                        , random: new Date().getTime()
+                        , extend2: 1
+                        , pplId: $("#pplId").val()
+                        , pplName: $('#pplName option:selected').text()
+                        , lType: "a1e92887-8230-4aba-8a06-bebffdee8043"
+                        , sTime: $("#sTime").val()
+                        , eTime: $("#eTime").val()
+                        , lNum: $("#lNum").val()
+                        , reason: $("#reason").val()
+                        , title: $("#title").val()
+                        , app_pplId: $("#app_pplId").val()
+                        , opation: "apply"
+                        , receiveId: $("#app_pplId").val()
+                        , groupid: "734389c7ae364584aea9918693bba3de"
+                        , issign: 0
+                        , senderId: $("#pplId").val()
+                    },
+                    dataType: "json",
+                    success: function (res) {
+
+                        top.layer.msg("OK", { time: 1800 });
+                        var index = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(index);
+                    }
+                });
+
+            });
+
+        });
+    </script>
+
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/OA/ReportLocation/OaLeaveAudit.js

@@ -84,7 +84,7 @@
                             li += "<p>发起时间：" + obj.COMPLETEDTIME1 + "</p>";
                         }
                     } else {
-                        li += "<p>处理人：" + obj.RECEIVENAME + "</p>";
+                        li += "<p>审批人：" + obj.RECEIVENAME + "</p>";
                         if (obj.COMPLETEDTIME1 != "") {
                             li += "<p>审批时间：" + obj.COMPLETEDTIME1 + "</p>";
                             li += "<p>审批意见：" + obj.COMMENT2 + "</p>";

Code/智慧营区/DOCManageAPP（阿克苏）/OA/ReportLocation/OaLeaveList.html

@@ -12,8 +12,10 @@
     <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
     <link rel="stylesheet" href="../../css/public.css" media="all" />
     <link rel="stylesheet" href="../../css/ztree/metro/ztree.css" />
+    <script src="/js/jquery-2.1.3.min.js"></script>
     <script src="../../js/websocket/mqttws31.js" type="text/javascript"></script>
     <script src="../../js/websocket/iotpush.js" type="text/javascript"></script>
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
     <style>
         .ztree {
             overflow: auto;
@@ -70,9 +72,9 @@
                             <input type="checkbox" id="is_content" name='is_content' value="1" title="包含下级所属单位" checked="checked" />
                         </div>
                         <a class="layui-btn search_btn" data-type="reload">搜索</a>
+                        <a class="layui-btn" id="btn_add">添加</a>
                         <div class="layui-inline">
                             <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
-                            <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="confirm('删除后无法恢复，是否确认删除？')" >删除</a>
                             <input type="file" id="btn_upd_hide" style="display:none;" />
                         </div>
                         <!--<a class="layui-btn layui-btn-normal" id="btn_export_demo" style="display:none;" data-type="reload">导出</a>-->
@@ -84,11 +86,13 @@
                 <script type="text/html" id="oaleaveListBar">
                     <a lay-event="audit"><img src="../../images/xiangqing.png" style="height:20px;width:20px;cursor:pointer;" title="查看" /></a>
                     <a lay-event="audit"><img src="../../images/edit.png" style="height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="编辑" /></a>
+                    <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" /></a>
                 </script>
                 <!--请假通过 操作-->
                 <script type="text/html" id="oaleaveListBar2">
                     <a lay-event="audit"><img src="../../images/xiangqing.png" style="height:20px;width:20px;margin-right:20px;cursor:pointer;" title="查看" /></a>
                     <a lay-event="audit"><img src="../../images/edit.png" style="height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="编辑" /></a>
+                    <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" /></a>
                     <a lay-event="reportLocation"><img src="../../images/yqjj.png" style="height:20px;width:20px;cursor:pointer;" title="查看请假期间打卡记录" /></a>
                 </script>
             </form>

Code/智慧营区/DOCManageAPP（阿克苏）/OA/ReportLocation/OaLeaveList.js

@@ -13,7 +13,7 @@
 
     // 选中部门ID
     var selDeptId = "";
-    var selTreeID = "";
+    var selTreeID = OrgId;
     var $zTree, OrgList = [];
     var setting = {
         view: {
@@ -114,11 +114,11 @@
             cols: [[
                 { type: "checkbox", fixed: "left", width: 30 },
                 { field: 'DIC_TEXT', title: '请假类型', width: 100, align: "center" },
-                { field: 'PPL_NAME', title: '申请人名称', width: 120, align: "center" },
+                { field: 'PPL_NAME', title: '申请人姓名', width: 120, align: "center" },
+                { field: 'PPL_ID', title: '电话', width: 120, align: "center" },
                 { field: 'ORG_NAME', title: '所属消防机构', minWidth: 120, align: "center" },
-                { field: 'S_TIME', title: '开始时间', width: 150, align: "center" },
-                { field: 'E_TIME', title: '结束时间', width: 150, align: "center" },
-                { field: 'L_REASON', title: '请假事由', align: 'center', minWidth: 120 },
+                { field: 'S_TIME', title: '离营时间', width: 150, align: "center" },
+                { field: 'E_TIME', title: '归队时间', width: 150, align: "center" },
                 {
                     field: 'STATE', title: '状态', align: 'center', width: 100, templet: function (d) {
                         if (d.STATE == "0") {
@@ -152,7 +152,7 @@
                     }
                 },
                 {
-                    title: '操作', width: 150, fixed: "right", align: "center", templet: function (d) {
+                    title: '操作', width: 220, fixed: "right", align: "center", templet: function (d) {
                         if (d.STATE == "1") {
                             return $('#oaleaveListBar2').html();
                         } else {
@@ -164,6 +164,24 @@
         });
     });
 
+    //添加
+    $("#btn_add").click(function () {
+
+
+        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+        var clientHeight = parseInt(document.body.clientHeight * 0.9) + 'px';
+        var index = layui.layer.open({
+            title: "信息编辑",
+            type: 2,
+            area: [clientWidth, clientHeight],
+            maxmin: true,
+            content: "OaLeaveAdd.html?orgId=" + selTreeID,
+            success: function (layero, index) {
+            }
+        });
+
+    });
+
 
     //每次加载节点触发的方法
     function onAsyncSuccess(event, treeId, treeNode, msg) {
@@ -320,10 +338,33 @@
     table.on('tool(leaveList)', function (obj) {
         var layEvent = obj.event;
         data = obj.data;
-        if (layEvent == 'audit') {//查看
+        switch (layEvent) {
+            //查看
+            case 'audit':
                 audit(data);
-        } else if (layEvent == 'reportLocation') {//查看请假期间打卡记录
+                break;
+            //删除
+            case 'del':
+                layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+
+
+                    $.ajax({
+                        type: "post",
+                        url: "/ashx/A_CommonHandler.ashx",
+                        data: { Action: "DelInfo", tbName: "oa_leave", wheres: " id = '" + data.ID + "'" },
+                        dataType: "json",
+                        success: function (result) {
+                            search(selTreeID, "1");
+                        }
+                    });
+
+                    layer.closeAll();
+                });
+                break;
+            //查看请假期间打卡记录
+            case 'reportLocation':
                 reportLocation(data);
+                break;
         }
     })
 })

Code/智慧营区/DOCManageAPP（阿克苏）/OA/Tolerance/ToleranceAdd.html

@@ -0,0 +1,243 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+    <style>
+        .searchVal {
+            width: 200px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+
+        .layui-form-label {
+            width: 100px;
+        }
+    </style>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div style="float:left;width:100%;height:100%;">
+        <form class="layui-form" style="width: 99%;">
+            <input class="layui-input ID" type="hidden" />
+            <input class="layui-input Action" type="hidden" />
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    姓名
+                </label>
+                <div class="layui-input-block">
+                    <select id="pplName" lay-filter="pplName" lay-search="">
+                        <option value="">---申请人---</option>
+                    </select>
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    电话
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="pplId" readonly="readonly" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    标题
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="title" readonly="readonly" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    离营时间
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="sTime" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    归队时间
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="eTime" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    请假天数
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="lNum" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    事由
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="reason" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    去向
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="lOut" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    审批人
+                </label>
+                <div class="layui-input-block">
+                    <select id="app_pplId" lay-filter="app_pplId" lay-search="">
+                        <option value="">---审批人---</option>
+                    </select>
+                </div>
+            </div>
+
+
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1" id="btn_save">保存</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+
+            var form = layui.form;
+            var laydate = layui.laydate;
+
+            laydate.render({ elem: '#sTime', type: 'datetime', value: new Date() });
+            laydate.render({ elem: '#eTime', type: 'datetime', value: new Date() });
+
+            //获取Url参数
+            function getParameterByName(name) {
+                var params = {};
+                var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function (m, key, value) {
+                    params[key] = value;
+                });
+                return params[name] || '';
+            }
+
+            var OrgId = getParameterByName('orgId');
+            //申请人切换
+            form.on('select(pplName)', function (data) {
+                //console.log(data);
+                $("#pplId").val(data.value);
+                //选择信息
+                var tag = $('#pplName option:selected').text();
+                if (tag == "---申请人---") {
+                    $("#title").val("");
+                } else {
+                    $("#title").val(tag + "的公差申请");
+                }
+
+            });
+
+
+            //初始化树
+            $(function () {
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/SysEmpHandler.ashx",
+                    data: { Action: 'OrgEmpList', random: new Date().getTime(), OrgId: OrgId, is_admin: 0, IsAdmin: 1, is_content: 1, limit: 999 },
+                    dataType: "json",
+                    success: function (res) {
+                        //console.log(res);
+                        var htmlStr = '';
+                        res.data.forEach(function (obj, index, arr) {
+                            htmlStr += "<option value='" + obj.EMP_MOBILE + "'>" + obj.EMP_NAME + "</option>";
+                        });
+                        $("#pplName").append(htmlStr);
+                        $("#app_pplId").append(htmlStr);
+
+                        form.render('select');
+
+                    }
+                });
+
+            });
+
+
+
+
+            $("#btn_save").click(function () {
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/AppFlowHandler.ashx",
+                    data: {
+                        Action: 'AppToleranceTaskApply'
+                        , random: new Date().getTime()
+                        , extend2: 1
+                        , pplId: $("#pplId").val()
+                        , pplName: $('#pplName option:selected').text()
+                        , lType: "ee62a186-336f-4984-b650-fd9826ad82cd"
+                        , sTime: $("#sTime").val()
+                        , eTime: $("#eTime").val()
+                        , lNum: $("#lNum").val()
+                        , reason: $("#reason").val()
+                        , title: $("#title").val()
+                        , app_pplId: $("#app_pplId").val()
+                        , opation: "apply"
+                        , receiveId: $("#app_pplId").val()
+                        , groupid: "734389c7ae364584aea9918693bba3de"
+                        , issign: 0
+                        , senderId: $("#pplId").val()
+                    },
+                    dataType: "json",
+                    success: function (res) {
+
+                        top.layer.msg("OK", { time: 1800 });
+                        var index = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(index);
+                    }
+                });
+            });
+
+        });
+    </script>
+
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/OA/Tolerance/ToleranceAudit.js

@@ -85,7 +85,7 @@
                             li += "<p>发起时间：" + obj.COMPLETEDTIME1 + "</p>";
                         }
                     } else {
-                        li += "<p>处理人：" + obj.RECEIVENAME + "</p>";
+                        li += "<p>审批人：" + obj.RECEIVENAME + "</p>";
                         if (obj.COMPLETEDTIME1 != "") {
                             li += "<p>审批时间：" + obj.COMPLETEDTIME1 + "</p>";
                             li += "<p>审批意见：" + obj.COMMENT2 + "</p>";
@@ -101,94 +101,6 @@
             }
         });
     });
-    //agreeClick = function () {
-    //    //load提交
-    //    var index = layer.msg('数据提交中，请稍候', { icon: 16, time: false, shade: 0.8 });
-    //    if (count < countSum) {
-    //        isOver = "0";
-    //    } else {
-    //        isOver = "1";
-    //    }
-    //    layer.confirm('请问是否同意【' + pplName + '】的请假', {
-    //        icon: 1,
-    //        title: '提示',
-    //        btn: ['确定', '取消'] //按钮
-    //    }, function () {
-    //        $.post("../../ashx/OaToleranceHandler.ashx", {
-    //            Action: "editWait",
-    //            toleranceId: lId, //请假表ID
-    //            waitId: waitId, //待办表ID
-    //            state: "2", //同意状态
-    //            sort: sort, //审批顺序
-    //            a_opinion: $("#a_opinion").val(), //审批意见
-    //            isOver: isOver //是否审批结束
-    //        }, function (res) {
-    //            res = $.parseJSON(res);
-    //            var pplid = res.data;
-    //            if (pplid != "") {
-    //                if (isOver == "0") {
-    //                    var title = "请假申请审批";
-    //                    var content = UserName + "的请假申请，请审批！";
-    //                    var usercode = pplid;
-    //                    sendMessage(title, content, usercode);
-    //                    top.layer.msg("审批成功！");
-    //                    parent.location.reload();
-    //                } else if (isOver == "1") {
-    //                    var title = "请假申请通过";
-    //                    var content = UserName + "您的请假申请已审批通过！";
-    //                    var usercode = pplid;
-    //                    sendMessage(title, content, usercode);
-    //                    top.layer.msg("审批成功！");
-    //                    parent.location.reload();
-    //                }
-    //            } else {
-    //                top.layer.msg("审批失败！");
-    //            }
-    //            layer.close(index);
-    //        });
-    //        layer.close(index);
-    //        return false;
-    //    });
-    //}
-    //disagreeClick = function () {
-    //    var index = layer.msg('数据提交中，请稍候', { icon: 16, time: false, shade: 0.8 });
-    //    if (count < countSum) {
-    //        isOver = "0";
-    //    } else {
-    //        isOver = "1";
-    //    }
-    //    layer.confirm('请问是否不同意【' + pplName + '】的请假', {
-    //        icon: 2,
-    //        title: '提示',
-    //        btn: ['确定', '取消'] //按钮
-    //    }, function () {
-    //        $.post("../../ashx/OaToleranceHandler.ashx", {
-    //            Action: "editWait",
-    //            toleranceId: lId, //请假表ID
-    //            waitId: waitId, //待办表ID
-    //            state: "3", //同意状态
-    //            sort: sort, //审批顺序
-    //            a_opinion: $("#a_opinion").val(), //审批意见
-    //            isOver: isOver //是否审批结束
-    //        }, function (res) {
-    //            res = $.parseJSON(res);
-    //            var pplid = res.data;
-    //            if (pplid != "") {
-    //                var title = "请假申请不通过";
-    //                var content = "抱歉，" + UserName + "您的请假申请未审批通过！";
-    //                var usercode = pplid;
-    //                sendMessage(title, content, usercode);
-    //                top.layer.msg("审批成功！");
-    //                parent.location.reload();
-    //            } else {
-    //                top.layer.msg("审批失败！");
-    //            }
-    //            layer.close(index);
-    //        });
-    //        layer.close(index);
-    //        return false;
-    //    });
-    //}
 
     startMqttServer();
 })

Code/智慧营区/DOCManageAPP（阿克苏）/OA/Tolerance/ToleranceListOrg.html

@@ -47,6 +47,7 @@
                             <input type="checkbox" id="is_content" lay-filter="bellow" name='is_content' value="1" title="包含下级所属单位" checked="checked" />
                         </div>
                         <a class="layui-btn search_btn" data-type="reload">搜索</a>
+                        <a class="layui-btn" id="btn_add">添加</a>
                         <div class="layui-inline">
                             <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
                             <input type="file" id="btn_upd_hide" style="display:none;" />

Code/智慧营区/DOCManageAPP（阿克苏）/OA/Tolerance/ToleranceListOrg.js

@@ -15,7 +15,7 @@
 
     // 选中部门ID
     var selDeptId = "";
-    var selTreeID = "";
+    var selTreeID = OrgId;
 
     laydate.render({
         elem: '#searchTime'
@@ -61,6 +61,25 @@
 
 
 
+    //添加
+    $("#btn_add").click(function () {
+
+
+        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+        var clientHeight = parseInt(document.body.clientHeight * 0.9) + 'px';
+        var index = layui.layer.open({
+            title: "信息编辑",
+            type: 2,
+            area: [clientWidth, clientHeight],
+            maxmin: true,
+            content: "ToleranceAdd.html?orgId=" + selTreeID,
+            success: function (layero, index) {
+            }
+        });
+
+    });
+
+
     //初始化树
     $(function () {
 
@@ -122,10 +141,11 @@
             id: "toleranceListTable",
             cols: [[
                 { field: 'DIC_TEXT', title: '出差类型', width: 100, align: "center" },
-                { field: 'PPL_NAME', title: '申请人', width: 120, align: "center" },
+                { field: 'PPL_NAME', title: '申请人姓名', width: 120, align: "center" },
+                { field: 'PPL_ID', title: '电话', width: 120, align: "center" },
                 { field: 'ORG_NAME', title: '所属消防机构', Width: 120, align: "center" },
-                { field: 'S_TIME', title: '开始时间', width: 150, align: "center" },
-                { field: 'E_TIME', title: '结束时间', width: 150, align: "center" },
+                { field: 'S_TIME', title: '离营时间', width: 150, align: "center" },
+                { field: 'E_TIME', title: '归队时间', width: 150, align: "center" },
                 { field: 'L_REASON', title: '出差事由', align: 'center', minWidth: 120 },
                 {
                     field: 'STATE', title: '状态', align: 'center', width: 110, templet: function (d) {
@@ -251,24 +271,33 @@
     //删除
     function del(edit) {
         layer.confirm('确定删除这条出差记录？', { icon: 3, title: '提示信息' }, function (index) {
-            //提交信息
-            $.post("../../ashx/OaToleranceHandler.ashx", {
-                Action: "Del",
-                id: edit.ID,
-                sTime: edit.S_TIME,
-                random: new Date().getTime()    //随机参数
-            }, function (res) {
-                res = $.parseJSON(res); //转json对象
-                top.layer.msg(res.msg);
-                var pplId_s = res.data.split(",");
-                for (var i in pplId_s) {
-                    var title = "出差撤回通知";
-                    var content = edit.PPL_NAME + "的出差，已撤回";
-                    sendMessage(title, content, pplId_s[i]);
-                }
-                reload();
+            ////提交信息
+            //$.post("../../ashx/OaToleranceHandler.ashx", {
+            //    Action: "Del",
+            //    id: edit.ID,
+            //    sTime: edit.S_TIME,
+            //    random: new Date().getTime()    //随机参数
+            //}, function (res) {
+            //    res = $.parseJSON(res); //转json对象
+            //    top.layer.msg(res.msg);
+            //    var pplId_s = res.data.split(",");
+            //    for (var i in pplId_s) {
+            //        var title = "出差撤回通知";
+            //        var content = edit.PPL_NAME + "的出差，已撤回";
+            //        sendMessage(title, content, pplId_s[i]);
+            //    }
+
+            $.ajax({
+                type: "post",
+                url: "/ashx/A_CommonHandler.ashx",
+                data: { Action: "DelInfo", tbName: "OA_TOLERANCE", wheres: " id = '" + edit.ID + "'" },
+                dataType: "json",
+                success: function (result) {
+                    search(selTreeID, "1");
                     layer.close(index);
+                }
             });
+
         });
     }
 

Code/智慧营区/DOCManageAPP（阿克苏）/OA/Tree/visIntree.html

@@ -27,7 +27,21 @@
             layer = parent.layer === undefined ? layui.layer : top.layer,
                 $ = layui.jquery;
             var menuIDArry = [];
-          var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+
+            //获取Url参数
+            function getParameterByName(name) {
+                var params = {};
+                var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function (m, key, value) {
+                    params[key] = value;
+                });
+                return params[name] || '';
+            }
+            var OrgId = getParameterByName('orgId');
+            if (OrgId.length < 20) {
+                OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+            }
+
+
             var chkStyle = $("#chkStyle", window.parent.document).val();
             if (chkStyle == "" || chkStyle == null || chkStyle == undefined) { chkStyle = "checkbox" };
             var setting = {
@@ -57,7 +71,7 @@
             function inittree() {
                 $.ajax({
                     type: "post",
-                  url: "../../ashx/VisitorInHandler.ashx",
+                    url: "/ashx/VisitorInHandler.ashx",
                     data: { Action: "getVisInTree", OrgId: OrgId },
                     dataType: "json",
                     success: function (result) {

Code/智慧营区/DOCManageAPP（阿克苏）/OA/Visitor/VisitorList.js

@@ -167,10 +167,14 @@
         cols: [[
             { field: 'NAME', title: '姓名', minWidth: 60, align: "center" },
             //{ field: 'EXTEND2', title: '身份证号', minWidth: 60, align: "center" },
-            { field: 'M_ADDR', title: '进入地点', minWidth: 60, align: "center" },
-            { field: 'INTIME', title: '通过时间', minWidth: 60, align: "center" },
-            //{ field: 'REASON', title: '来访原因', minWidth: 60, align: "center" },
-            //{ field: 'VED_MAN', title: '审批领导', minWidth: 60, align: "center" },
+            { field: 'M_ADDR', title: '营区', minWidth: 60, align: "center" },
+            { field: 'INTIME', title: '时间', minWidth: 60, align: "center" },
+            { field: 'dh', title: '电话', minWidth: 60, align: "center", templet: function (d) { return '未填写'; } },
+            { field: 'gs', title: '公司', minWidth: 60, align: "center", templet: function (d) { return '未填写'; } },
+            { field: 'lx', title: '进出类型', minWidth: 60, align: "center", templet: function (d) { return '未填写'; } },
+            { field: 'sy', title: '进出事由', minWidth: 60, align: "center", templet: function (d) { return '未填写'; } },
+            { field: 'fz', title: '负责人', minWidth: 60, align: "center", templet: function (d) { return '未填写'; } },
+            { field: 'zb', title: '值班人', minWidth: 60, align: "center", templet: function (d) { return '未填写'; } },
             { title: '操作', width: 180, templet: '#VisitorListBar', fixed: "right", align: "center" }
         ]]
     });

Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/VisitorRegItem.html

@@ -1,20 +1,22 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta charset="utf-8">
+    <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, maximum-scale=1">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="format-detection" content="telephone=no">
+    <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" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
     <link rel="stylesheet" href="../../layui/css/layui.css" media="all" />
     <link rel="stylesheet" href="../../css/public.css" media="all" />
     <script type="text/javascript" src="../../js/jquery-2.1.3.min.js"></script>
     <script type="text/javascript" src="../../js/jq_extend.js"></script>
     <style>
-        .layui-timeline-item:before{width:0 !important}
+        .layui-timeline-item:before {
+            width: 0 !important
+        }
     </style>
 </head>
 <body class="childrenBody">
@@ -22,45 +24,79 @@
         <input id="chkStyle" class="layui-input" type="hidden" />
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
-                登记人姓名</label>
+                登记人姓名
+            </label>
             <div class="layui-input-block">
                 <input type="text" class="layui-input" id="NAME" placeholder="请输入登记人姓名" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
-                来访人</label>
+                电话
+            </label>
             <div class="layui-input-block">
-                <input id="VISIN_NAME" placeholder="点击选择来访人" type="text" class="layui-input" readonly />
+                <input type="text" class="layui-input" id="Mobile" placeholder="请输入手机号" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
-                访问事由</label>
+                公司
+            </label>
+            <div class="layui-input-block">
+                <input type="text" class="layui-input" id="Mobile" placeholder="请输入公司" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                照片
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="EMPCOUNT" onclick="document.getElementById('btn_upd_hide').click();" />
+                <div class="layui-inline">
+                    <input type="file" id="btn_upd_hide" style="display:none;" />
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                来访人
+            </label>
+            <div class="layui-input-block">
+                <input id="VISIN_NAME" placeholder="点击选择来访人" type="text" class="layui-input" readonly=readonly />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                访问事由
+            </label>
             <div class="layui-input-block">
                 <textarea id="REASON" placeholder="请输入访问事由" class="layui-textarea"></textarea>
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
-                大约访问时长</label>
+                大约访问时长
+            </label>
             <div class="layui-input-block">
                 <input type="number" class="layui-input" id="ABOUTTIME" placeholder="请输入大约访问时长，单位：（小时）" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
-                被访问人</label>
+                被访问人
+            </label>
             <div class="layui-input-block">
-                <input id="VED_NAME" placeholder="点击选择被访问人" type="text" class="layui-input" readonly />
+                <input id="VED_NAME" placeholder="点击选择被访问人" type="text" class="layui-input" readonly=readonly />
                 <input id="VED_ID" class="layui-input" type="hidden" />
             </div>
         </div>
         <div class="layui-center">
-            <a class="layui-btn layui-btn-normal addNews_btn" lay-filter="AddEdit" lay-submit >提交</a>
+            <a class="layui-btn layui-btn-normal addNews_btn" lay-filter="AddEdit" lay-submit=lay-submit>提交</a>
         </div>
     </form>
     <script type="text/javascript" src="../../layui/layui.js"></script>
     <script type="text/javascript" src="VisitorRegItem.js"></script>
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
 </body>
 </html>

Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/VisitorRegItem.js

@@ -5,7 +5,22 @@
         laytpl = layui.laytpl,
         table = layui.table;
     laydate = layui.laydate;
-    var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID
+
+
+    //获取Url参数
+    function getParameterByName(name) {
+        var params = {};
+        var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function (m, key, value) {
+            params[key] = value;
+        });
+        return params[name] || '';
+    }
+
+    //var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID
+    var OrgId = getParameterByName('orgId');
+    if (OrgId.length < 20) {
+        OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+    }
 
     var visInId_data = { data: [] };
 
@@ -15,7 +30,7 @@
             type: 2,
             title: '来访人选择',
             area: ['260px', '420px'],
-            content: '../Tree/visIntree.html',
+            content: '../Tree/visIntree.html?orgId=' + OrgId,
             btn: ['确定'],
             success: function (layero, index) {
                 var body = layui.layer.getChildFrame('body', index);
@@ -51,7 +66,7 @@
             type: 2,
             title: '被访问人选择',
             area: ['260px', '420px'],
-            content: '../Tree/Orgtree.html',
+            content: '../Tree/Orgtree.html?org_id=' + OrgId,
             btn: ['确定'],
             success: function (layero, index) {
                 var body = layui.layer.getChildFrame('body', index);
@@ -78,10 +93,10 @@
             top.layer.msg('请选择被访问人！');
             return;
         }
-        if (visInId_data.data.length == 0) {
-            top.layer.msg('至少选择一位来访人！');
-            return;
-        }
+        //if (visInId_data.data.length == 0) {
+        //    top.layer.msg('至少选择一位来访人！');
+        //    return;
+        //}
         //load提交
         var index = layer.msg('数据提交中，请稍候', { icon: 16, time: false, shade: 0.8 });
         $.post("../../ashx/VisitorRegHandler.ashx", {

Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/VisitorRegList.html

@@ -47,18 +47,20 @@
                 </div>
                 <a class="layui-btn search_btn" data-type="reload">搜索</a>
             </div>
-            <!--<div class="layui-inline">
+            <div class="layui-inline">
                 <a class="layui-btn layui-btn-normal addNews_btn">访客登记</a>
-            </div>-->
+            </div>
         </form>
         <table id="visRegList" lay-filter="visRegList">
         </table>
         <!--操作-->
         <script type="text/html" id="visRegListBar">
             <a lay-event="audit"><img src="../../images/xiangqing.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="详情" /></a>
+            <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" /></a>
         </script>
         <script type="text/html" id="visRegListBar1">
             <a lay-event="edit"><img src="../../images/edit.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="处理" /></a>
+            <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" /></a>
         </script>
         <script type="text/javascript" src="/js/layui/layui.js"></script>
         <script type="text/javascript" src="VisitorRegList.js"></script>

Code/智慧营区/DOCManageAPP（阿克苏）/OA/VisitorReg/VisitorRegList.js

@@ -13,7 +13,7 @@
 
     // 选中部门ID
     var selDeptId = "";
-    var selTreeID = "";
+    var selTreeID = OrgId;
     var $zTree, OrgList = [];
     var setting = {
         view: {
@@ -145,25 +145,13 @@
         limit: 20,
         id: "visRegListTable",
         cols: [[
-            { field: 'ORG_NAME', title: '机构名称', minWidth: 60, align: "center" },
+            { field: 'ORG_NAME', title: '营区', minWidth: 60, align: "center" },
             { field: 'NAME', title: '登记人姓名', minWidth: 60, align: "center" },
+            { field: 'dh', title: '电话', minWidth: 60, align: "center" },
+            { field: 'zp', title: '照片', minWidth: 60, align: "center" },
             { field: 'REASON', title: '访问事由', minWidth: 60, align: "center" },
             { field: 'VED_MAN', title: '被访问人', minWidth: 60, align: "center" },
             { field: 'REGISTERTIME', title: '登记时间', align: 'center', minWidth: 60 },
-            //{
-            //    field: 'STATE', title: '状态', align: 'center', minWidth: 60, templet: function (d) {
-            //        if (d.STATE == "0") {
-            //            return ' <div class="layui-table-cell laytable-cell-1-LPPL_NAME">审批中</div>';
-            //        } else if (d.STATE == "1") {
-            //            return ' <div class="layui-table-cell laytable-cell-1-LPPL_NAME">审批通过</div>';
-            //        } else if (d.STATE == "2") {
-            //            return ' <div class="layui-table-cell laytable-cell-1-LPPL_NAME">审批未通过</div>';
-            //        }
-            //        else {
-            //            return ' <div class="layui-table-cell laytable-cell-1-LPPL_NAME"></div>';
-            //        }
-            //    }
-            //},
             {
                 title: '操作', width: 180, templet: function (d) {
                     if (d.STATE == "0") {
@@ -258,7 +246,7 @@
             type: 2,
             area: [clientWidth, clientHeight],
             maxmin: true,
-            content: "VisitorRegItem.html"
+            content: "VisitorRegItem.html?orgId=" + selTreeID
         })
         window.sessionStorage.setItem("index", index);
         //改变窗口大小时，重置弹窗的宽高，防止超出可视区域（如F12调出debug的操作）
@@ -301,10 +289,34 @@
     table.on('tool(visRegList)', function (obj) {
         var layEvent = obj.event;
         data = obj.data;
-        if (layEvent == 'audit') {//查看
+        switch (layEvent) {
+            //查看
+            case 'audit':
                 audit(data);
-        } else if (layEvent == 'edit') {//处理
+                break;
+            //处理
+            case 'edit':
                 audit(data);
+                break;
+            //处理
+            case 'del':
+
+                layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+
+
+                    $.ajax({
+                        type: "post",
+                        url: "/ashx/A_CommonHandler.ashx",
+                        data: { Action: "DelInfo", tbName: "tbl_visitor_reg", wheres: " id = '" + data.ID + "'" },
+                        dataType: "json",
+                        success: function (result) {
+                            search(selTreeID, "1");
+                        }
+                    });
+
+                    layer.closeAll();
+                });
+                break;
         }
     })
 

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Device/DeviceBuySpeedList.html

@@ -190,7 +190,7 @@
                             //console.log(d);
                             var htmlStr = '<a lay-event="audit"><img src="/images/xiangqing.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="详情" /></a> ' +
                                 '<a lay-event="edit"><img src="/images/edit.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="编辑" /></a> ' +
-                                ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" />  ';
+                                ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" /></a>  ';
                             return htmlStr;
                         }
                     }

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Device/DeviceDispatchInfoList.html

@@ -226,7 +226,7 @@
                             //console.log(d);
                             var htmlStr = '<a lay-event="audit"><img src="/images/xiangqing.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="详情" /></a> ' +
                                 '<a lay-event="edit"><img src="/images/edit.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="编辑" /></a> ' +
-                                ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" />  ';
+                                ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" /></a>  ';
                             return htmlStr;
                         }
                     }

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpAttendAdd.html

@@ -17,6 +17,7 @@
     <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
     <link rel="stylesheet" href="/css/right-list.css" media="all" />
     <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
     <style>
         .searchVal {
             width: 200px;
@@ -42,25 +43,67 @@
             width: 100px;
         }
     </style>
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+            var form = layui.form;
+            var laydate = layui.laydate;
+
+            form.render();
+            laydate.render({
+                elem: '#SHENQINGSHIJIAN'
+                , type: 'datetime'
+                , value: new Date()
+            });
+
+
+
+            function guid() {
+                return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                    var r = Math.random() * 16 | 0,
+                        v = c == 'x' ? r : (r & 0x3 | 0x8);
+                    return v.toString(16);
+                });
+            }
+
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "InsInfo", tbName: "oa_kaoqinbulou", columns: "ID,SHENQING_NAME,SHENQINGSHIJIAN,SHUOMING,KAOQIN_TYPE,SHENPI_NAME"
+                        , values: "'" + guid() + "','" + $("#SHENQING_NAME").val() + "','" + $("#SHENQINGSHIJIAN").val() + "','" + $("#SHUOMING").val() + "','" +
+                            $("#KAOQIN_TYPE").val() + "','" + $("#SHENPI_NAME").val() + "' "
+                    },
+
+
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+            });
+
+        });
+    </script>
 </head>
 <body style="border: 1px solid #0c6f89;
             background: rgba(12, 70, 100, 0.8);
             padding: 20px;
             box-sizing: border-box;
         ">
-    <div style="float:left;width:49%;height:100%;">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>信息</legend>
-        </fieldset>
+    <div style="float:left;width:100%;height:100%;">
         <form class="layui-form" style="width: 99%;">
-            <input class="layui-input ID" type="hidden" />
-            <input class="layui-input Action" type="hidden" />
+            <input class="layui-input" id="ID" type="hidden" />
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
                     申请人
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column1" disabled=disabled />
+                    <input class="layui-input" id="SHENQING_NAME" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
@@ -68,43 +111,45 @@
                     时间
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="createTime" disabled=disabled />
+                    <input class="layui-input" id="SHENQINGSHIJIAN" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
-                    审批人
+                    事由
+                </label>
+                <div class="layui-input-block">
+                    <input class="layui-input" id="SHUOMING" />
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    类型
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column2" disabled=disabled />
+                    <select id="KAOQIN_TYPE">
+                        <option value="上午上班">上午上班</option>
+                        <option value="上午下班">上午下班</option>
+                        <option value="下午上班">下午上班</option>
+                        <option value="下午下班">下午下班</option>
+                    </select>
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
-                    说明
+                    审批人
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column3" disabled=disabled />
+                    <input class="layui-input" id="SHENPI_NAME" />
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">确定</button>
+                    <a class="layui-btn" id="btn_save">保存</a>
                 </div>
             </div>
         </form>
     </div>
-    <div style="float:left;position: absolute;left: 50%;top: 0;z-index: 0;width: 2px;height: 100%;background: linear-gradient(rgba(52, 1, 255, .8), rgba(255,1,255,.8));"></div>
-    <div style="float:right;width:49%;height:100%;padding-left:20px">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>流转信息</legend>
-        </fieldset>
-        <ul id="stepMsg" class="layui-timeline"></ul>
-        <!--<fieldset class="layui-elem-field layui-field-title">
-            <legend>销假_流转信息</legend>
-        </fieldset>
-        <ul id="stepMsg2" class="layui-timeline"></ul>-->
-    </div>
 </body>
 </html> 

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpAttendApprowalList.html

@@ -0,0 +1,288 @@
+<!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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <style>
+        .searchVal {
+            width: 300px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+    </style>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div id="divOrgDept" style=" position: absolute; top: 0; bottom: 0px; left: 0; width: 270px; min-height: 500px; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; ">
+        <blockquote class="layui-elem-quote title">机构目录</blockquote>
+        <div style="width: 100%;height: calc(100% - 52px);overflow: auto">
+            <ul id="ztree" class="ztree"></ul>
+        </div>
+    </div>
+    <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
+
+        <div class="layui-input-inline">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;" id="ipt_seach">
+        </div>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
+
+
+        <table class="layui-hide" id="ItemInfoList" lay-filter="ItemInfoList"></table>
+
+    </div>
+
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+
+
+            //var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+
+            var OrgId = 'D8DC637B8B984848A63F82A018AFAEB0';
+
+
+
+            var $zTree, OrgList = [];
+            var setting = {
+                view: {
+                    selectedMulti: false
+                },
+                data: {
+                    key: {
+                        name: "NAME"
+                    },
+                    simpleData: {
+                        enable: true,
+                        type: "TYPE",
+                        idKey: "ID",
+                        pIdKey: "PID"
+                    }
+                },
+                edit: {
+                    enable: false
+                },
+                callback: {
+                    onClick: function (e, treeId, treeNode) {
+
+                        // search(treeNode.ID, treeNode.TYPE);
+
+                        selTreeID = treeNode.ID;
+                        InitTable();
+
+                    }
+                }
+            };
+            //初始化树
+            $(function () {
+
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/SysEmpHandler.ashx",
+                    data: { Action: "OrgDeptTree", OrgId: OrgId },
+                    dataType: "json",
+                    success: function (result) {
+                        var zNodes = result.data;
+                        if (zNodes.length > 0) {
+                            for (var i in zNodes) {
+                                OrgList.push(zNodes[i].ID);
+                            }
+                        }
+                        $zTree = $.fn.zTree.init($("#ztree"), setting, zNodes);
+
+                        var nodes = $zTree.getNodes();
+                        for (var i = 0; i < nodes.length; i++) {
+                            $zTree.expandNode($zTree.getNodes()[i], true, false, false);
+                        }
+
+                    }
+                });
+
+                InitTable();
+            });
+
+
+
+
+            var table = layui.table;
+
+            function InitTable() {
+
+                var keys = $("#ipt_seach").val();
+
+                table.render({
+                    elem: '#ItemInfoList'
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_kaoqinbulou", random: new Date().getTime(), wheres: " shenqing_name like '%" + keys + "%' or shuoming like '%" + keys +
+                            "%' or kaoqin_type like '%" + keys + "%' or shenpi_name like '%" + keys + "%' or state like '%" + keys + "%' "
+                        , orderBy: 'createtime desc'
+                    }
+                    , cellMinWidth: 80
+                    , cols: [[
+                        { field: 'SHENQING_NAME', align: "center", title: '申请人' }
+                        , { field: 'SHENQINGSHIJIAN', align: "center", title: '时间', width: 170, sort: true }
+                        , { field: 'SHUOMING', align: "center", title: '事由' }
+                        , { field: 'KAOQIN_TYPE', align: "center", title: '类型' }
+                        , { field: 'SHENPI_NAME', align: "center", title: '审批人' }
+                        , { field: 'SHENPISHIJIAN', align: "center", title: '审批时间', width: 170 }
+                        , {
+                            field: 'STATE', align: "center", title: '审批结果', templet: function (d) {
+                                switch (d.STATE) {
+                                    case '0':
+                                        return '未审批';
+                                    case '1':
+                                        return '通过';
+                                    case '2':
+                                        return '拒绝';
+                                }
+                            }
+                        }
+                        , {
+                            field: 'cz', align: "center", width: 170, title: '操作', templet: function (d) {
+                                //console.log(d);
+                                var htmlStr = '<a lay-event="audit"><img src="/images/xiangqing.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="详情" /></a> ' +
+                                    '<a lay-event="edit"><img src="/images/同意.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="同意" /></a> ' +
+                                    ' <a lay-event="del"><img src="/images/不同意.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" />  ';
+                                return htmlStr;
+                            }
+                        }
+                    ]]
+                    , page: true
+                    , limits: [10, 15, 20, 50, 999, 9999]
+                    , toolbar: true
+                    , defaultToolbar: ['filter', 'print', 'exports']
+                    , limit: 15
+                });
+            }
+
+            //列表操作
+            table.on('tool(ItemInfoList)', function (obj) {
+                var layEvent = obj.event;
+                data = obj.data;
+                //console.log(data);
+
+                switch (layEvent) {
+                    //查看
+                    case 'audit':
+
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpAttendEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#KAOQIN_TYPE").val(data.KAOQIN_TYPE);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
+                                body.find("#btn_save").hide();
+
+                            }
+                        });
+                        break;
+                    //处理
+                    case 'edit':
+                        $.ajax({
+                            type: "post",
+                            url: "/ashx/A_CommonHandler.ashx",
+                            data: {
+                                Action: "UpdInfo", tbName: "oa_kaoqinbulou", sets: "shenpiyijian='同意',shenpishijian=now(),state='1'"
+                                , wheres: "id = '" + data.ID + "'"
+                            },
+                            dataType: "json",
+                            success: function (result) {
+
+                                var col1 = '';
+                                var col2 = '';
+
+                                switch (data.KAOQIN_TYPE) {
+                                    case '上午上班': col1 = 'KQ_FACE_READ_START_STATE_AM'; col2 = 'KQ_FACE_READ_START_TIME_AM'; break;
+                                    case '上午下班': col1 = 'KQ_FACE_READ_END_STATE_AM'; col2 = 'KQ_FACE_READ_END_TIME_AM'; break;
+                                    case '下午上班': col1 = 'KQ_FACE_READ_START_STATE_PM'; col2 = 'KQ_FACE_READ_START_TIME_PM'; break;
+                                    case '下午下班': col1 = 'KQ_FACE_READ_END_STATE_PM'; col2 = 'KQ_FACE_READ_END_TIME_PM'; break;
+                                }
+
+                                $.ajax({
+                                    type: "post",
+                                    url: "/ashx/A_CommonHandler.ashx",
+                                    data: {
+                                        Action: "UpdInfo", tbName: "oa_attendance_record", sets: col1 + "='1'," + col2 + "='" + data.SHENQINGSHIJIAN + "'"
+                                        , wheres: "ATTENDANCE_DATE = date_format('" + data.SHENQINGSHIJIAN + "','%Y-%m-%d') and USERS_NAME = '" + data.SHENQING_NAME + "' and " + col1 + "='0'"
+                                    },
+                                    dataType: "json",
+                                    success: function (result) {
+                                        InitTable();
+                                    }
+                                });
+                            }
+                        });
+                        break;
+                    //删除
+                    case 'del':
+                        $.ajax({
+                            type: "post",
+                            url: "/ashx/A_CommonHandler.ashx",
+                            data: {
+                                Action: "UpdInfo", tbName: "oa_kaoqinbulou", sets: "shenpiyijian='拒绝',shenpishijian=now(),state='2'"
+                                , wheres: "id = '" + data.ID + "'"
+                            },
+                            dataType: "json",
+                            success: function (result) {
+                                InitTable();
+                            }
+                        });
+                        break;
+                }
+            })
+
+
+
+            $("#btn_seach").click(function () {
+                InitTable();
+            });
+
+        });
+    </script>
+
+
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpAttendEdit.html

@@ -17,6 +17,7 @@
     <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
     <link rel="stylesheet" href="/css/right-list.css" media="all" />
     <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
     <style>
         .searchVal {
             width: 200px;
@@ -42,6 +43,41 @@
             width: 100px;
         }
     </style>
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+            var form = layui.form;
+            var laydate = layui.laydate;
+
+            form.render();
+            laydate.render({
+                elem: '#SHENQINGSHIJIAN'
+                , type: 'datetime'
+                , value: new Date()
+            });
+
+
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "UpdInfo", tbName: "oa_kaoqinbulou", sets: "SHENQING_NAME='" + $("#SHENQING_NAME").val() + "',SHENQINGSHIJIAN='" + $("#SHENQINGSHIJIAN").val() +
+                            "',SHUOMING='" + $("#SHUOMING").val() + "',KAOQIN_TYPE='" + $("#KAOQIN_TYPE").val() + "',SHENPI_NAME='" + $("#SHENPI_NAME").val() + "'"
+                        , wheres: "id = '" + $("#ID").val() + "'"
+                    },
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+            });
+
+        });
+    </script>
 </head>
 <body style="border: 1px solid #0c6f89;
             background: rgba(12, 70, 100, 0.8);
@@ -53,14 +89,13 @@
             <legend>信息</legend>
         </fieldset>
         <form class="layui-form" style="width: 99%;">
-            <input class="layui-input ID" type="hidden" />
-            <input class="layui-input Action" type="hidden" />
+            <input class="layui-input" id="ID" type="hidden" />
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
                     申请人
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column1" disabled=disabled />
+                    <input class="layui-input" id="SHENQING_NAME" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
@@ -68,29 +103,42 @@
                     时间
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="createTime" disabled=disabled />
+                    <input class="layui-input" id="SHENQINGSHIJIAN" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
-                    审批人
+                    事由
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column2" disabled=disabled />
+                    <input class="layui-input" id="SHUOMING" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
-                    说明
+                    类型
+                </label>
+                <div class="layui-input-block">
+                    <select id="KAOQIN_TYPE">
+                        <option value="上午上班">上午上班</option>
+                        <option value="上午下班">上午下班</option>
+                        <option value="下午上班">下午上班</option>
+                        <option value="下午下班">下午下班</option>
+                    </select>
+                </div>
+            </div>
+            <div class="layui-form-item layui-row layui-col-xs12">
+                <label class="layui-form-label">
+                    审批人
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column3" disabled=disabled />
+                    <input class="layui-input" id="SHENPI_NAME" />
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">确定</button>
+                    <a class="layui-btn" id="btn_save">保存</a>
                 </div>
             </div>
         </form>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpAttendList.html

@@ -52,9 +52,9 @@
     <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
 
         <div class="layui-input-inline">
-            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;" id="ipt_seach">
         </div>
-        <button type="button" class="layui-btn layui-btn-normal">搜索</button>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
         <button type="button" class="layui-btn layui-btn-normal" id="btn_add">添加</button>
         <div class="layui-inline">
             <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
@@ -105,19 +105,7 @@
                         // search(treeNode.ID, treeNode.TYPE);
 
                         selTreeID = treeNode.ID;
-                        //判断选中标签是否部门
-                        if (treeNode.TYPE == "dept") {
-                            //选中节点是部门
-                            selDeptId = treeNode.ID;
-                            selTreeID = treeNode.PID;
-                            TREEID = selTreeID;
-                        } else {
-                            //选中节点是机构
-                            selDeptId = "";
-                            TREEID = treeNode.ID;
-                        }
-
-                        //search(selTreeID, treeNode.TYPE);
+                        InitTable();
 
                     }
                 }
@@ -147,45 +135,49 @@
 
                     }
                 });
+
+                InitTable();
             });
 
 
 
 
             var table = layui.table;
-            var dataArr = [
-                { "id": "10002", "column1": "卓玛央宗", "column2": "平措旺堆", "column3": "忘记考勤", "createTime": "2024-08-29 17:21:33" },
-                { "id": "10003", "column1": "扎西次旦", "column2": "土旦尼玛", "column3": "忘记考勤", "createTime": "2024-08-28 17:21:33" },
-                { "id": "10004", "column1": "次旦索朗", "column2": "格桑卓嘎", "column3": "忘记考勤", "createTime": "2024-08-27 17:21:33" },
-                { "id": "10005", "column1": "次仁平措", "column2": "索朗多杰", "column3": "忘记考勤", "createTime": "2024-08-26 17:21:33" },
-                { "id": "10006", "column1": "洛松克珠", "column2": "白玛桑珠", "column3": "忘记考勤", "createTime": "2024-08-25 17:21:33" },
-                { "id": "10007", "column1": "德吉央宗", "column2": "次旺卓玛", "column3": "忘记考勤", "createTime": "2024-08-24 17:21:33" },
-                { "id": "10008", "column1": "洛桑曲扎", "column2": "米玛次仁", "column3": "忘记考勤", "createTime": "2024-08-23 17:21:33" },
-                { "id": "10009", "column1": "平措旺堆", "column2": "扎西江措", "column3": "忘记考勤", "createTime": "2024-08-22 17:21:33" },
-                { "id": "10010", "column1": "土旦尼玛", "column2": "德吉白珍", "column3": "忘记考勤", "createTime": "2024-08-21 17:21:33" },
-                { "id": "10011", "column1": "格桑卓嘎", "column2": "贡觉次成", "column3": "忘记考勤", "createTime": "2024-08-20 17:21:33" },
-                { "id": "10012", "column1": "索朗多杰", "column2": "旦增顿旦", "column3": "忘记考勤", "createTime": "2024-08-19 17:21:33" },
-                { "id": "10013", "column1": "白玛桑珠", "column2": "平措曲珍", "column3": "忘记考勤", "createTime": "2024-08-18 17:21:33" },
-                { "id": "10015", "column1": "米玛次仁", "column2": "卓玛央宗", "column3": "忘记考勤", "createTime": "2024-08-16 17:21:33" },
-                { "id": "10016", "column1": "扎西江措", "column2": "扎西次旦", "column3": "忘记考勤", "createTime": "2024-08-15 17:21:33" },
-                { "id": "10017", "column1": "德吉白珍", "column2": "次旦索朗", "column3": "忘记考勤", "createTime": "2024-08-14 17:21:33" },
-                { "id": "10018", "column1": "贡觉次成", "column2": "次仁平措", "column3": "忘记考勤", "createTime": "2024-08-13 17:21:33" },
-                { "id": "10019", "column1": "旦增顿旦", "column2": "洛松克珠", "column3": "忘记考勤", "createTime": "2024-08-12 17:21:33" },
-                { "id": "10020", "column1": "平措曲珍", "column2": "德吉央宗", "column3": "忘记考勤", "createTime": "2024-08-11 17:21:33" },
-            ];
+
+            function InitTable() {
+
+                var keys = $("#ipt_seach").val();
 
                 table.render({
                     elem: '#ItemInfoList'
-                , data: dataArr
-                , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_kaoqinbulou", random: new Date().getTime(), wheres: " shenqing_name like '%" + keys + "%' or shuoming like '%" + keys +
+                            "%' or kaoqin_type like '%" + keys + "%' or shenpi_name like '%" + keys + "%' or state like '%" + keys + "%' "
+                        , orderBy: 'createtime desc'
+                    }
+                    , cellMinWidth: 80
                     , cols: [[
-                    //{ field: 'id', align: "center", title: 'ID', sort: true }
-                    { field: 'column1', align: "center", title: '申请人' } //width 支持：数字、百分比和不填写。你还可以通过 minWidth 参数局部定义当前单元格的最小宽度，layui 2.2.1 新增
-                    , { field: 'createTime', align: "center", title: '时间', sort: true }
-                    , { field: 'column2', align: "center", title: '审批人' }
-                    , { field: 'column3', align: "center", title: '说明' }
+                        { field: 'SHENQING_NAME', align: "center", title: '申请人' }
+                        , { field: 'SHENQINGSHIJIAN', align: "center", title: '时间', width: 170, sort: true }
+                        , { field: 'SHUOMING', align: "center", title: '事由' }
+                        , { field: 'KAOQIN_TYPE', align: "center", title: '类型' }
+                        , { field: 'SHENPI_NAME', align: "center", title: '审批人' }
+                        , { field: 'SHENPISHIJIAN', align: "center", title: '审批时间', width: 170 }
                         , {
-                        field: 'cz', align: "center", title: '操作', templet: function (d) {
+                            field: 'STATE', align: "center", title: '审批结果', templet: function (d) {
+                                switch (d.STATE) {
+                                    case '0':
+                                        return '未审批';
+                                    case '1':
+                                        return '通过';
+                                    case '2':
+                                        return '拒绝';
+                                }
+                            }
+                        }
+                        , {
+                            field: 'cz', align: "center", title: '操作', width: 170, templet: function (d) {
                                 //console.log(d);
                                 var htmlStr = '<a lay-event="audit"><img src="/images/xiangqing.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="详情" /></a> ' +
                                     '<a lay-event="edit"><img src="/images/edit.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="编辑" /></a> ' +
@@ -200,7 +192,7 @@
                     , defaultToolbar: ['filter', 'print', 'exports']
                     , limit: 15
                 });
-
+            }
 
             //列表操作
             table.on('tool(ItemInfoList)', function (obj) {
@@ -213,7 +205,7 @@
                     case 'audit':
 
                         var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                        var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
                         var index = layui.layer.open({
                             title: "信息编辑",
                             type: 2,
@@ -222,11 +214,11 @@
                             content: "EmpAttendEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#KAOQIN_TYPE").val(data.KAOQIN_TYPE);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
                                 body.find("#btn_save").hide();
 
                             }
@@ -235,7 +227,7 @@
                     //处理
                     case 'edit':
                         var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                        var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
                         var index = layui.layer.open({
                             title: "信息编辑",
                             type: 2,
@@ -244,17 +236,34 @@
                             content: "EmpAttendEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#ID").val(data.ID);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#KAOQIN_TYPE").val(data.KAOQIN_TYPE);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
+                            }
+                            , end: function () {
+                                // 弹窗关闭的回调
+                                // 这里可以执行关闭后的操作
+                                InitTable();
                             }
                         });
                         break;
                     //删除
                     case 'del':
-                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) { layer.closeAll(); });
+                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+                            $.ajax({
+                                type: "post",
+                                url: "/ashx/A_CommonHandler.ashx",
+                                data: { Action: "DelInfo", tbName: "oa_kaoqinbulou", wheres: " id = '" + data.ID + "'" },
+                                dataType: "json",
+                                success: function (result) {
+                                    InitTable();
+                                }
+                            });
+                            layer.closeAll();
+                        });
                         break;
                 }
             })
@@ -263,7 +272,7 @@
             $("#btn_add").click(function () {
 
                 var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
+                var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
                 var index = layui.layer.open({
                     title: "信息编辑",
                     type: 2,
@@ -272,8 +281,17 @@
                     content: "EmpAttendAdd.html",
                     success: function (layero, index) {
                     }
+                    , end: function () {
+                        // 弹窗关闭的回调
+                        // 这里可以执行关闭后的操作
+                        InitTable();
+                    }
+                });
+
             });
 
+            $("#btn_seach").click(function () {
+                InitTable();
             });
 
         });

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutySta.html

@@ -101,7 +101,7 @@
                 , type: 'month'
                 , value: nowY + '-' + nowM
                 , done: function (value) {
-                    getStaData(value);
+                    InitData();
                 }
             });
 
@@ -162,35 +162,32 @@
 
                     }
                 });
+                InitData();
             });
 
-
+            var dataArr = [];
             var table = layui.table;
-            var dataArr = [
-                { "id": "10002", "column1": "卓玛央宗", "column2": "10", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-29 17:21:33" },
-                { "id": "10003", "column1": "扎西次旦", "column2": "18", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-28 17:21:33" },
-                { "id": "10004", "column1": "次旦索朗", "column2": "16", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-27 17:21:33" },
-                { "id": "10005", "column1": "次仁平措", "column2": "13", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-26 17:21:33" },
-                { "id": "10006", "column1": "洛松克珠", "column2": "14", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-25 17:21:33" },
-                { "id": "10007", "column1": "德吉央宗", "column2": "12", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-24 17:21:33" },
-                { "id": "10008", "column1": "洛桑曲扎", "column2": "10", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-23 17:21:33" },
-                { "id": "10009", "column1": "平措旺堆", "column2": "16", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-22 17:21:33" },
-                { "id": "10010", "column1": "土旦尼玛", "column2": "14", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-21 17:21:33" },
-                { "id": "10011", "column1": "格桑卓嘎", "column2": "15", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-20 17:21:33" },
-                { "id": "10012", "column1": "索朗多杰", "column2": "19", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-19 17:21:33" },
-                { "id": "10013", "column1": "白玛桑珠", "column2": "13", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-18 17:21:33" },
-                { "id": "10014", "column1": "次旺卓玛", "column2": "14", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-17 17:21:33" },
-                { "id": "10015", "column1": "米玛次仁", "column2": "18", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-16 17:21:33" },
-                { "id": "10016", "column1": "扎西江措", "column2": "12", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-15 17:21:33" },
-            ];
+
+            function InitData() {
+
+                var ipt_seach = $("#dataTime_1").val();
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: { Action: "SelInfo", tbName: "oa_fanghuobanzhiban", columns: "ZHIBAN_NAME,sum(1) COU", wheres: " date_format(zhiban_day,'%Y-%m') = '" + ipt_seach + "' GROUP BY zhiban_name  " },
+                    dataType: "json",
+                    success: function (result) {
+
+                        dataArr = result.data;
 
                         table.render({
                             elem: '#ItemInfoList'
                             , data: dataArr
                             , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                             , cols: [[
-                    { field: 'column1', align: "center", title: '姓名' }
-                    , { field: 'column2', align: "center", title: '值班次数' }
+                                { field: 'ZHIBAN_NAME', align: "center", title: '姓名' }
+                                , { field: 'COU', align: "center", title: '值班次数' }
                             ]]
                             , page: true
                             , limits: [5, 15, 20, 50, 999, 9999]
@@ -201,6 +198,11 @@
 
                         eacherInit();
 
+
+                    }
+                });
+            }
+
             function eacherInit() {
                 var myChart = echarts.init(document.getElementById('echarts_1'));
 
@@ -211,8 +213,8 @@
                 let data = [];
 
                 dataArr.forEach(function (item, index) {
-                    dataAxis.push(item.column1);
-                    data.push(item.column2);
+                    dataAxis.push(item.ZHIBAN_NAME);
+                    data.push(item.COU);
                 });
                 let yMax = 500;
                 let dataShadow = [];
@@ -293,6 +295,8 @@
                 myChart.setOption(option);
             }
 
+
+
         })
     </script>
     <link rel="stylesheet" href="/css/right-list.css" media="all" />

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutySuppApproList.html

@@ -52,9 +52,9 @@
     <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
 
         <div class="layui-input-inline">
-            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:260px;" id="ipt_seach">
         </div>
-        <button type="button" class="layui-btn layui-btn-normal">搜索</button>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
 
 
         <table class="layui-hide" id="ItemInfoList" lay-filter="ItemInfoList"></table>
@@ -97,22 +97,8 @@
                 callback: {
                     onClick: function (e, treeId, treeNode) {
 
-                        // search(treeNode.ID, treeNode.TYPE);
-
                         selTreeID = treeNode.ID;
-                        //判断选中标签是否部门
-                        if (treeNode.TYPE == "dept") {
-                            //选中节点是部门
-                            selDeptId = treeNode.ID;
-                            selTreeID = treeNode.PID;
-                            TREEID = selTreeID;
-                        } else {
-                            //选中节点是机构
-                            selDeptId = "";
-                            TREEID = treeNode.ID;
-                        }
-
-                        //search(selTreeID, treeNode.TYPE);
+                        InitTable();
 
                     }
                 }
@@ -142,43 +128,33 @@
 
                     }
                 });
+                InitTable();
             });
 
 
 
 
             var table = layui.table;
-            var dataArr = [
-                { "id": "10002", "column1": "卓玛央宗", "column2": "平措旺堆", "column3": "忘记打卡", "createTime": "2024-08-29 17:21:33" },
-                { "id": "10003", "column1": "扎西次旦", "column2": "土旦尼玛", "column3": "忘记打卡", "createTime": "2024-08-28 17:21:33" },
-                { "id": "10004", "column1": "次旦索朗", "column2": "格桑卓嘎", "column3": "忘记打卡", "createTime": "2024-08-27 17:21:33" },
-                { "id": "10005", "column1": "次仁平措", "column2": "索朗多杰", "column3": "忘记打卡", "createTime": "2024-08-26 17:21:33" },
-                { "id": "10006", "column1": "洛松克珠", "column2": "白玛桑珠", "column3": "忘记打卡", "createTime": "2024-08-25 17:21:33" },
-                { "id": "10007", "column1": "德吉央宗", "column2": "次旺卓玛", "column3": "忘记打卡", "createTime": "2024-08-24 17:21:33" },
-                { "id": "10008", "column1": "洛桑曲扎", "column2": "米玛次仁", "column3": "忘记打卡", "createTime": "2024-08-23 17:21:33" },
-                { "id": "10009", "column1": "平措旺堆", "column2": "扎西江措", "column3": "忘记打卡", "createTime": "2024-08-22 17:21:33" },
-                { "id": "10010", "column1": "土旦尼玛", "column2": "德吉白珍", "column3": "忘记打卡", "createTime": "2024-08-21 17:21:33" },
-                { "id": "10011", "column1": "格桑卓嘎", "column2": "贡觉次成", "column3": "忘记打卡", "createTime": "2024-08-20 17:21:33" },
-                { "id": "10012", "column1": "索朗多杰", "column2": "旦增顿旦", "column3": "忘记打卡", "createTime": "2024-08-19 17:21:33" },
-                { "id": "10013", "column1": "白玛桑珠", "column2": "平措曲珍", "column3": "忘记打卡", "createTime": "2024-08-18 17:21:33" },
-                { "id": "10015", "column1": "米玛次仁", "column2": "卓玛央宗", "column3": "忘记打卡", "createTime": "2024-08-16 17:21:33" },
-                { "id": "10016", "column1": "扎西江措", "column2": "扎西次旦", "column3": "忘记打卡", "createTime": "2024-08-15 17:21:33" },
-                { "id": "10017", "column1": "德吉白珍", "column2": "次旦索朗", "column3": "忘记打卡", "createTime": "2024-08-14 17:21:33" },
-                { "id": "10018", "column1": "贡觉次成", "column2": "次仁平措", "column3": "忘记打卡", "createTime": "2024-08-13 17:21:33" },
-                { "id": "10019", "column1": "旦增顿旦", "column2": "洛松克珠", "column3": "忘记打卡", "createTime": "2024-08-12 17:21:33" },
-                { "id": "10020", "column1": "平措曲珍", "column2": "德吉央宗", "column3": "忘记打卡", "createTime": "2024-08-11 17:21:33" },
-            ];
+
+
+            function InitTable() {
+
+                var keys = $("#ipt_seach").val();
 
                 table.render({
                     elem: '#ItemInfoList'
-                , data: dataArr
-                , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_zhibanbulou", random: new Date().getTime(), wheres: " shenqing_name like '%" + keys + "%' or shenpi_name like '%" + keys +
+                            "%' or shuoming like '%" + keys + "%' or shenpiyijian like '%" + keys + "%' "
+                    }
+                    , cellMinWidth: 80
                     , cols: [[
                         //{ field: 'id', align: "center", title: 'ID', sort: true }
-                    { field: 'column1', align: "center", title: '申请人' } //width 支持：数字、百分比和不填写。你还可以通过 minWidth 参数局部定义当前单元格的最小宽度，layui 2.2.1 新增
-                    , { field: 'createTime', align: "center", title: '时间', sort: true }
-                    , { field: 'column2', align: "center", title: '审批人' }
-                    , { field: 'column3', align: "center", title: '说明' }
+                        { field: 'SHENQING_NAME', align: "center", title: '申请人' } //width 支持：数字、百分比和不填写。你还可以通过 minWidth 参数局部定义当前单元格的最小宽度，layui 2.2.1 新增
+                        , { field: 'SHENQINGSHIJIAN', align: "center", title: '时间', sort: true }
+                        , { field: 'SHENPI_NAME', align: "center", title: '值班人' }
+                        , { field: 'SHUOMING', align: "center", title: '事由' }
                         , {
                             field: 'cz', align: "center", title: '操作', templet: function (d) {
                                 //console.log(d);
@@ -195,7 +171,7 @@
                     , defaultToolbar: ['filter', 'print', 'exports']
                     , limit: 15
                 });
-
+            }
 
             //列表操作
             table.on('tool(ItemInfoList)', function (obj) {
@@ -217,11 +193,11 @@
                             content: "EmpDutySupplEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#ID").val(data.ID);
                                 body.find("#btn_save").hide();
 
                             }
@@ -239,24 +215,9 @@
             })
 
 
-            $("#btn_add").click(function () {
-
-                var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
-                var index = layui.layer.open({
-                    title: "信息编辑",
-                    type: 2,
-                    area: [clientWidth, clientHeight],
-                    maxmin: true,
-                    content: "EmpDutySupplAdd.html",
-                    success: function (layero, index) {
-                        //var body = layui.layer.getChildFrame('body', index);
-                        //var iframe = window['layui-layer-iframe' + index];
-                        //body.find(".ID").val(data.ID)//ID与action是一个隐藏的元素
-                        //body.find(".Action").val("view");
-                    }
-                });
 
+            $("#btn_seach").click(function () {
+                InitTable();
             });
 
         });

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutySupplAdd.html

@@ -42,16 +42,38 @@
             width: 100px;
         }
     </style>
+    <script type="text/javascript">
+        $(function () {
+
+            function guid() {
+                return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                    var r = Math.random() * 16 | 0,
+                        v = c == 'x' ? r : (r & 0x3 | 0x8);
+                    return v.toString(16);
+                });
+            }
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "InsInfo", tbName: "oa_zhibanbulou", columns: "ID,SHENQING_NAME,SHENQINGSHIJIAN,SHENPI_NAME,SHUOMING"
+                        , values: "'" + guid() + "','" + $("#SHENQING_NAME").val() + "','" + $("#SHENQINGSHIJIAN").val() + "','" + $("#SHENPI_NAME").val() + "','" + $("#SHUOMING").val() + "'"
+                    },
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+            });
+
+        });
+    </script>
 </head>
-<body style="border: 1px solid #0c6f89;
-        background: rgba(12, 70, 100, 0.8);
-        padding: 20px;
-        box-sizing: border-box;
-    ">
-    <div style="float:left;width:49%;height:100%;">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>信息</legend>
-        </fieldset>
+<body style="border: 1px solid #0c6f89;background: rgba(12, 70, 100, 0.8);padding: 20px;box-sizing: border-box;">
+    <div style="float:left;width:100%;height:100%;">
         <form class="layui-form" style="width: 99%;">
             <input class="layui-input ID" type="hidden" />
             <input class="layui-input Action" type="hidden" />
@@ -60,7 +82,7 @@
                     申请人
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column1" disabled=disabled />
+                    <input class="layui-input" id="SHENQING_NAME" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
@@ -68,43 +90,33 @@
                     时间
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="createTime" disabled=disabled />
+                    <input class="layui-input" id="SHENQINGSHIJIAN" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
-                    审批人
+                    值班人
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column2" disabled=disabled />
+                    <input class="layui-input" id="SHENPI_NAME" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
-                    说明
+                    事由
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column3" disabled=disabled />
+                    <input class="layui-input" id="SHUOMING" />
                 </div>
             </div>
 
+
             <div class="layui-form-item">
                 <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">确定</button>
+                    <a class="layui-btn" id="btn_save">保存</a>
                 </div>
             </div>
         </form>
     </div>
-    <div style="float:left;position: absolute;left: 50%;top: 0;z-index: 0;width: 2px;height: 100%;background: linear-gradient(rgba(52, 1, 255, .8), rgba(255,1,255,.8));"></div>
-    <div style="float:right;width:49%;height:100%;padding-left:20px">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>流转信息</legend>
-        </fieldset>
-        <ul id="stepMsg" class="layui-timeline"></ul>
-        <!--<fieldset class="layui-elem-field layui-field-title">
-            <legend>销假_流转信息</legend>
-        </fieldset>
-        <ul id="stepMsg2" class="layui-timeline"></ul>-->
-    </div>
 </body>
 </html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutySupplEdit.html

@@ -42,25 +42,42 @@
             width: 100px;
         }
     </style>
+    <script type="text/javascript">
+        $(function () {
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "UpdInfo", tbName: "oa_zhibanbulou", sets: "SHENQING_NAME='" + $("#SHENQING_NAME").val() + "',SHENQINGSHIJIAN='" + $("#SHENQINGSHIJIAN").val() +
+                            "',SHENPI_NAME='" + $("#SHENPI_NAME").val() + "',SHUOMING='" + $("#SHUOMING").val() + "'"
+                        , wheres: "id = '" + $("#ID").val() + "'"
+                    },
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+            });
+
+        });
+    </script>
 </head>
-<body style="border: 1px solid #0c6f89;
-        background: rgba(12, 70, 100, 0.8);
-        padding: 20px;
-        box-sizing: border-box;
-    ">
+<body style="border: 1px solid #0c6f89;background: rgba(12, 70, 100, 0.8);padding: 20px;box-sizing: border-box;">
     <div style="float:left;width:49%;height:100%;">
         <fieldset class="layui-elem-field layui-field-title">
             <legend>信息</legend>
         </fieldset>
         <form class="layui-form" style="width: 99%;">
-            <input class="layui-input ID" type="hidden" />
-            <input class="layui-input Action" type="hidden" />
+            <input class="layui-input" id="ID" type="hidden" />
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
                     申请人
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column1" disabled=disabled />
+                    <input class="layui-input" id="SHENQING_NAME" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
@@ -68,29 +85,29 @@
                     时间
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="createTime" disabled=disabled />
+                    <input class="layui-input" id="SHENQINGSHIJIAN" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
-                    审批人
+                    值班人
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column2" disabled=disabled />
+                    <input class="layui-input" id="SHENPI_NAME" />
                 </div>
             </div>
             <div class="layui-form-item layui-row layui-col-xs12">
                 <label class="layui-form-label">
-                    说明
+                    事由
                 </label>
                 <div class="layui-input-block">
-                    <input class="layui-input" id="column3" disabled=disabled />
+                    <input class="layui-input" id="SHUOMING" />
                 </div>
             </div>
 
             <div class="layui-form-item">
                 <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">确定</button>
+                    <a class="layui-btn" id="btn_save">保存</a>
                 </div>
             </div>
         </form>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutySupplList.html

@@ -38,11 +38,7 @@
         }
     </style>
 </head>
-<body style="border: 1px solid #0c6f89;
-        background: rgba(12, 70, 100, 0.8);
-        padding: 20px;
-        box-sizing: border-box;
-    ">
+<body style="border: 1px solid #0c6f89;background: rgba(12, 70, 100, 0.8);padding: 20px;box-sizing: border-box;">
     <div id="divOrgDept" style=" position: absolute; top: 0; bottom: 0px; left: 0; width: 270px; min-height: 500px; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; ">
         <blockquote class="layui-elem-quote title">机构目录</blockquote>
         <div style="width: 100%;height: calc(100% - 52px);overflow: auto">
@@ -52,9 +48,9 @@
     <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
 
         <div class="layui-input-inline">
-            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;" id="ipt_seach">
         </div>
-        <button type="button" class="layui-btn layui-btn-normal">搜索</button>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
         <button type="button" class="layui-btn layui-btn-normal" id="btn_add">添加</button>
         <div class="layui-inline">
             <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
@@ -105,19 +101,7 @@
                         // search(treeNode.ID, treeNode.TYPE);
 
                         selTreeID = treeNode.ID;
-                        //判断选中标签是否部门
-                        if (treeNode.TYPE == "dept") {
-                            //选中节点是部门
-                            selDeptId = treeNode.ID;
-                            selTreeID = treeNode.PID;
-                            TREEID = selTreeID;
-                        } else {
-                            //选中节点是机构
-                            selDeptId = "";
-                            TREEID = treeNode.ID;
-                        }
-
-                        //search(selTreeID, treeNode.TYPE);
+                        InitTable();
 
                     }
                 }
@@ -147,43 +131,30 @@
 
                     }
                 });
+                InitTable();
             });
 
 
 
 
             var table = layui.table;
-            var dataArr = [
-                { "id": "10002", "column1": "卓玛央宗", "column2": "平措旺堆", "column3": "忘记打卡", "createTime": "2024-08-29 17:21:33" },
-                { "id": "10003", "column1": "扎西次旦", "column2": "土旦尼玛", "column3": "忘记打卡", "createTime": "2024-08-28 17:21:33" },
-                { "id": "10004", "column1": "次旦索朗", "column2": "格桑卓嘎", "column3": "忘记打卡", "createTime": "2024-08-27 17:21:33" },
-                { "id": "10005", "column1": "次仁平措", "column2": "索朗多杰", "column3": "忘记打卡", "createTime": "2024-08-26 17:21:33" },
-                { "id": "10006", "column1": "洛松克珠", "column2": "白玛桑珠", "column3": "忘记打卡", "createTime": "2024-08-25 17:21:33" },
-                { "id": "10007", "column1": "德吉央宗", "column2": "次旺卓玛", "column3": "忘记打卡", "createTime": "2024-08-24 17:21:33" },
-                { "id": "10008", "column1": "洛桑曲扎", "column2": "米玛次仁", "column3": "忘记打卡", "createTime": "2024-08-23 17:21:33" },
-                { "id": "10009", "column1": "平措旺堆", "column2": "扎西江措", "column3": "忘记打卡", "createTime": "2024-08-22 17:21:33" },
-                { "id": "10010", "column1": "土旦尼玛", "column2": "德吉白珍", "column3": "忘记打卡", "createTime": "2024-08-21 17:21:33" },
-                { "id": "10011", "column1": "格桑卓嘎", "column2": "贡觉次成", "column3": "忘记打卡", "createTime": "2024-08-20 17:21:33" },
-                { "id": "10012", "column1": "索朗多杰", "column2": "旦增顿旦", "column3": "忘记打卡", "createTime": "2024-08-19 17:21:33" },
-                { "id": "10013", "column1": "白玛桑珠", "column2": "平措曲珍", "column3": "忘记打卡", "createTime": "2024-08-18 17:21:33" },
-                { "id": "10015", "column1": "米玛次仁", "column2": "卓玛央宗", "column3": "忘记打卡", "createTime": "2024-08-16 17:21:33" },
-                { "id": "10016", "column1": "扎西江措", "column2": "扎西次旦", "column3": "忘记打卡", "createTime": "2024-08-15 17:21:33" },
-                { "id": "10017", "column1": "德吉白珍", "column2": "次旦索朗", "column3": "忘记打卡", "createTime": "2024-08-14 17:21:33" },
-                { "id": "10018", "column1": "贡觉次成", "column2": "次仁平措", "column3": "忘记打卡", "createTime": "2024-08-13 17:21:33" },
-                { "id": "10019", "column1": "旦增顿旦", "column2": "洛松克珠", "column3": "忘记打卡", "createTime": "2024-08-12 17:21:33" },
-                { "id": "10020", "column1": "平措曲珍", "column2": "德吉央宗", "column3": "忘记打卡", "createTime": "2024-08-11 17:21:33" },
-            ];
+            function InitTable() {
+                var keys = $("#ipt_seach").val();
 
                 table.render({
                     elem: '#ItemInfoList'
-                , data: dataArr
-                , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_zhibanbulou", random: new Date().getTime(), wheres: " shenqing_name like '%" + keys + "%' or shenpi_name like '%" + keys +
+                            "%' or shuoming like '%" + keys + "%' or shenpiyijian like '%" + keys + "%' "
+                    }
+                    , cellMinWidth: 80
                     , cols: [[
                         //{ field: 'id', align: "center", title: 'ID', sort: true }
-                    { field: 'column1', align: "center", title: '申请人' } //width 支持：数字、百分比和不填写。你还可以通过 minWidth 参数局部定义当前单元格的最小宽度，layui 2.2.1 新增
-                    , { field: 'createTime', align: "center", title: '时间', sort: true }
-                    , { field: 'column2', align: "center", title: '审批人' }
-                    , { field: 'column3', align: "center", title: '说明' }
+                        { field: 'SHENQING_NAME', align: "center", title: '申请人' } //width 支持：数字、百分比和不填写。你还可以通过 minWidth 参数局部定义当前单元格的最小宽度，layui 2.2.1 新增
+                        , { field: 'SHENQINGSHIJIAN', align: "center", title: '时间', sort: true }
+                        , { field: 'SHENPI_NAME', align: "center", title: '值班人' }
+                        , { field: 'SHUOMING', align: "center", title: '事由' }
                         , {
                             field: 'cz', align: "center", title: '操作', templet: function (d) {
                                 //console.log(d);
@@ -200,7 +171,7 @@
                     , defaultToolbar: ['filter', 'print', 'exports']
                     , limit: 15
                 });
-
+            }
 
             //列表操作
             table.on('tool(ItemInfoList)', function (obj) {
@@ -222,11 +193,11 @@
                             content: "EmpDutySupplEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#ID").val(data.ID);
                                 body.find("#btn_save").hide();
 
                             }
@@ -244,17 +215,33 @@
                             content: "EmpDutySupplEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#ID").val(data.ID);
+                            }
+                            , end: function () {
+                                // 弹窗关闭的回调
+                                InitTable();
                             }
                         });
                         break;
                     //删除
                     case 'del':
-                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) { layer.closeAll(); });
+
+                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+                            $.ajax({
+                                type: "post",
+                                url: "/ashx/A_CommonHandler.ashx",
+                                data: { Action: "DelInfo", tbName: "oa_zhibanbulou", wheres: " id = '" + data.ID + "'" },
+                                dataType: "json",
+                                success: function (result) {
+                                    InitTable();
+                                }
+                            });
+                            layer.closeAll();
+                        });
                         break;
                 }
             })
@@ -271,13 +258,18 @@
                     maxmin: true,
                     content: "EmpDutySupplAdd.html",
                     success: function (layero, index) {
-                        //var body = layui.layer.getChildFrame('body', index);
-                        //var iframe = window['layui-layer-iframe' + index];
-                        //body.find(".ID").val(data.ID)//ID与action是一个隐藏的元素
-                        //body.find(".Action").val("view");
                     }
+                    , end: function () {
+                        // 弹窗关闭的回调
+                        // 这里可以执行关闭后的操作
+                        InitTable();
+                    }
+                });
+
             });
 
+            $("#btn_seach").click(function () {
+                InitTable();
             });
 
         });

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutyUpdAdd.html

@@ -42,25 +42,54 @@
             width: 100px;
         }
     </style>
+    <script type="text/javascript">
+        $(function () {
+
+            function guid() {
+                return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                    var r = Math.random() * 16 | 0,
+                        v = c == 'x' ? r : (r & 0x3 | 0x8);
+                    return v.toString(16);
+                });
+            }
+
+
+
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "InsInfo", tbName: "oa_huanban", columns: "ID,SHENQING_NAME,SHENQINGSHIJIAN,DINGBAN_NAME,SHENPI_NAME,SHUOMING,STATE,BANCI_OLD,BANCI_NEW"
+                        , values: "'" + guid() + "','" + $("#SHENQING_NAME").val() + "','" + $("#SHENQINGSHIJIAN").val() + "','" + $("#DINGBAN_NAME").val() + "','" +
+                            $("#SHENPI_NAME").val() + "','" + $("#SHUOMING").val() + "','0','" + $("#BANCI_OLD").val() + "','" + $("#BANCI_NEW").val() + "'"
+                    },
+
+
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+            });
+
+        });
+    </script>
 </head>
 <body style="border: 1px solid #0c6f89;
         background: rgba(12, 70, 100, 0.8);
         padding: 20px;
         box-sizing: border-box;
     ">
-    <div style="float:left;width:49%;height:100%;">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>信息</legend>
-        </fieldset>
-        <form class="layui-form" style="width: 99%;">
-            <input class="layui-input ID" type="hidden" />
-            <input class="layui-input Action" type="hidden" />
+    <div style="float:left;width:100%;height:100%;">
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
                 申请人
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="ppl_name" disabled=disabled />
+                <input class="layui-input" id="SHENQING_NAME" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -68,7 +97,7 @@
                 时间
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="l_type" disabled=disabled />
+                <input class="layui-input" id="SHENQINGSHIJIAN" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -76,7 +105,7 @@
                 审批人
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column2" disabled=disabled />
+                <input class="layui-input" id="SHENPI_NAME" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -84,35 +113,41 @@
                 顶班人
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column3" disabled=disabled />
+                <input class="layui-input" id="DINGBAN_NAME" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
-                    说明
+                原班次
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column4" disabled=disabled />
+                <input class="layui-input" id="BANCI_OLD" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                新班次
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="BANCI_NEW" />
             </div>
         </div>
 
-            <div class="layui-form-item">
+
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                原因
+            </label>
             <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">确定</button>
+                <input class="layui-input" id="SHUOMING" />
+            </div>
         </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" id="btn_save">确定</button>
             </div>
-        </form>
         </div>
-    <div style="float:left;position: absolute;left: 50%;top: 0;z-index: 0;width: 2px;height: 100%;background: linear-gradient(rgba(52, 1, 255, .8), rgba(255,1,255,.8));"></div>
-    <div style="float:right;width:49%;height:100%;padding-left:20px">
-        <fieldset class="layui-elem-field layui-field-title">
-            <legend>流转信息</legend>
-        </fieldset>
-        <ul id="stepMsg" class="layui-timeline"></ul>
-        <!--<fieldset class="layui-elem-field layui-field-title">
-            <legend>销假_流转信息</legend>
-        </fieldset>
-        <ul id="stepMsg2" class="layui-timeline"></ul>-->
     </div>
 </body>
 </html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutyUpdApproList.html

@@ -142,43 +142,29 @@
 
                     }
                 });
+
+                InitTable();
             });
 
 
 
 
             var table = layui.table;
-            var dataArr = [
-                { "id": "10002", "column1": "卓玛央宗", "column2": "平措旺堆", "column3": "白玛桑珠", "column4": "公差任务换班", "createTime": "2024-08-29 17:21:33" },
-                { "id": "10003", "column1": "扎西次旦", "column2": "土旦尼玛", "column3": "次旺卓玛", "column4": "公差任务换班", "createTime": "2024-08-28 17:21:33" },
-                { "id": "10004", "column1": "次旦索朗", "column2": "格桑卓嘎", "column3": "米玛次仁", "column4": "公差任务换班", "createTime": "2024-08-27 17:21:33" },
-                { "id": "10005", "column1": "次仁平措", "column2": "索朗多杰", "column3": "扎西江措", "column4": "公差任务换班", "createTime": "2024-08-26 17:21:33" },
-                { "id": "10006", "column1": "洛松克珠", "column2": "白玛桑珠", "column3": "德吉白珍", "column4": "公差任务换班", "createTime": "2024-08-25 17:21:33" },
-                { "id": "10007", "column1": "德吉央宗", "column2": "次旺卓玛", "column3": "贡觉次成", "column4": "公差任务换班", "createTime": "2024-08-24 17:21:33" },
-                { "id": "10008", "column1": "洛桑曲扎", "column2": "米玛次仁", "column3": "旦增顿旦", "column4": "公差任务换班", "createTime": "2024-08-23 17:21:33" },
-                { "id": "10009", "column1": "平措旺堆", "column2": "扎西江措", "column3": "平措曲珍", "column4": "公差任务换班", "createTime": "2024-08-22 17:21:33" },
-                { "id": "10011", "column1": "格桑卓嘎", "column2": "贡觉次成", "column3": "卓玛央宗", "column4": "公差任务换班", "createTime": "2024-08-20 17:21:33" },
-                { "id": "10012", "column1": "索朗多杰", "column2": "旦增顿旦", "column3": "扎西次旦", "column4": "公差任务换班", "createTime": "2024-08-19 17:21:33" },
-                { "id": "10013", "column1": "白玛桑珠", "column2": "平措曲珍", "column3": "次旦索朗", "column4": "公差任务换班", "createTime": "2024-08-18 17:21:33" },
-                { "id": "10015", "column1": "米玛次仁", "column2": "卓玛央宗", "column3": "洛松克珠", "column4": "公差任务换班", "createTime": "2024-08-16 17:21:33" },
-                { "id": "10016", "column1": "扎西江措", "column2": "扎西次旦", "column3": "德吉央宗", "column4": "公差任务换班", "createTime": "2024-08-15 17:21:33" },
-                { "id": "10017", "column1": "德吉白珍", "column2": "次旦索朗", "column3": "洛桑曲扎", "column4": "公差任务换班", "createTime": "2024-08-14 17:21:33" },
-                { "id": "10018", "column1": "贡觉次成", "column2": "次仁平措", "column3": "索朗多杰", "column4": "公差任务换班", "createTime": "2024-08-13 17:21:33" },
-                { "id": "10019", "column1": "旦增顿旦", "column2": "洛松克珠", "column3": "白玛桑珠", "column4": "公差任务换班", "createTime": "2024-08-12 17:21:33" },
-                { "id": "10020", "column1": "平措曲珍", "column2": "德吉央宗", "column3": "次旺卓玛", "column4": "公差任务换班", "createTime": "2024-08-11 17:21:33" },
-            ];
 
+            function InitTable() {
                 table.render({
                     elem: '#ItemInfoList'
-                , data: dataArr
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: { Action: 'SelInfoPage', tbName: "oa_huanban", random: new Date().getTime(), wheres: "" }
                     , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                     , cols: [[
-                    //{ field: 'id', align: "center", title: 'ID', sort: true }
-                    { field: 'column1', align: "center", title: '申请人' } //width 支持：数字、百分比和不填写。你还可以通过 minWidth 参数局部定义当前单元格的最小宽度，layui 2.2.1 新增
-                    , { field: 'createTime', align: "center", title: '时间', sort: true }
-                    , { field: 'column2', align: "center", title: '审批人' }
-                    , { field: 'column3', align: "center", title: '顶班人' }
-                    , { field: 'column4', align: "center", title: '说明' }
+                        { field: 'SHENQING_NAME', align: "center", title: '申请人' }
+                        , { field: 'SHENQINGSHIJIAN', align: "center", title: '时间', sort: true }
+                        , { field: 'SHENPI_NAME', align: "center", title: '审批人' }
+                        , { field: 'DINGBAN_NAME', align: "center", title: '顶班人' }
+                        , { field: 'BANCI_OLD', align: "center", title: '原班次' }
+                        , { field: 'BANCI_NEW', align: "center", title: '新班次' }
+                        , { field: 'SHUOMING', align: "center", title: '原因' }
                         , {
                             field: 'cz', align: "center", title: '操作', templet: function (d) {
                                 //console.log(d);
@@ -195,6 +181,7 @@
                     , defaultToolbar: ['filter', 'print', 'exports']
                     , limit: 15
                 });
+            }
 
 
             //列表操作
@@ -208,7 +195,7 @@
                     case 'audit':
 
                         var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                        var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
                         var index = layui.layer.open({
                             title: "信息编辑",
                             type: 2,
@@ -217,11 +204,13 @@
                             content: "EmpDutyUpdEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
+                                body.find("#DINGBAN_NAME").val(data.DINGBAN_NAME);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#BANCI_OLD").val(data.BANCI_OLD);
+                                body.find("#BANCI_NEW").val(data.BANCI_NEW);
                                 body.find("#btn_save").hide();
 
                             }
@@ -242,7 +231,7 @@
             $("#btn_add").click(function () {
 
                 var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
+                var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
                 var index = layui.layer.open({
                     title: "信息编辑",
                     type: 2,
@@ -250,10 +239,6 @@
                     maxmin: true,
                     content: "EmpDutyUpdAdd.html",
                     success: function (layero, index) {
-                        //var body = layui.layer.getChildFrame('body', index);
-                        //var iframe = window['layui-layer-iframe' + index];
-                        //body.find(".ID").val(data.ID)//ID与action是一个隐藏的元素
-                        //body.find(".Action").val("view");
                     }
                 });
 

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutyUpdEdit.html

@@ -42,25 +42,41 @@
             width: 100px;
         }
     </style>
+    <script type="text/javascript">
+        $(function () {
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "UpdInfo", tbName: "oa_huanban", sets: "SHENQING_NAME='" + $("#SHENQING_NAME").val() + "',SHENQINGSHIJIAN='" + $("#SHENQINGSHIJIAN").val() + "',SHENPI_NAME='" + $("#SHENPI_NAME").val() +
+                            "',DINGBAN_NAME='" + $("#DINGBAN_NAME").val() + "',SHUOMING='" + $("#SHUOMING").val() + "',BANCI_OLD='" + $("#BANCI_OLD").val() + "',BANCI_NEW='" + $("#BANCI_NEW").val() + "'"
+                        , wheres: "id = '" + $("#ID").val() + "'"
+                    },
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+            });
+
+        });
+    </script>
 </head>
-<body style="border: 1px solid #0c6f89;
-        background: rgba(12, 70, 100, 0.8);
-        padding: 20px;
-        box-sizing: border-box;
-    ">
+<body style="border: 1px solid #0c6f89;background: rgba(12, 70, 100, 0.8);padding: 20px;box-sizing: border-box;">
     <div style="float:left;width:49%;height:100%;">
         <fieldset class="layui-elem-field layui-field-title">
             <legend>信息</legend>
         </fieldset>
-        <form class="layui-form" style="width: 99%;">
-            <input class="layui-input ID" type="hidden" />
-            <input class="layui-input Action" type="hidden" />
+        <input class="layui-input" id="ID" type="hidden" />
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
                 申请人
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column1" disabled=disabled />
+                <input class="layui-input" id="SHENQING_NAME" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -68,7 +84,7 @@
                 时间
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="createTime" disabled=disabled />
+                <input class="layui-input" id="SHENQINGSHIJIAN" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -76,7 +92,7 @@
                 审批人
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column2" disabled=disabled />
+                <input class="layui-input" id="SHENPI_NAME" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -84,24 +100,39 @@
                 顶班人
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column3" disabled=disabled />
+                <input class="layui-input" id="DINGBAN_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                原班次
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="BANCI_OLD" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                新班次
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="BANCI_NEW" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
-                    说明
+                原因
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column4" disabled=disabled />
+                <input class="layui-input" id="SHUOMING" />
             </div>
         </div>
 
         <div class="layui-form-item">
             <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1" id="btn_save">确定</button>
+                <button class="layui-btn" id="btn_save">确定</button>
             </div>
         </div>
-        </form>
     </div>
     <div style="float:left;position: absolute;left: 50%;top: 0;z-index: 0;width: 2px;height: 100%;background: linear-gradient(rgba(52, 1, 255, .8), rgba(255,1,255,.8));"></div>
     <div style="float:right;width:49%;height:100%;padding-left:20px">

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpDutyUpdList.html

@@ -52,9 +52,9 @@
     <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
 
         <div class="layui-input-inline">
-            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:260px;" id="ipt_seach">
         </div>
-        <button type="button" class="layui-btn layui-btn-normal">搜索</button>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
         <button type="button" class="layui-btn layui-btn-normal" id="btn_add">添加</button>
         <div class="layui-inline">
             <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
@@ -147,43 +147,36 @@
 
                     }
                 });
+                InitTable();
             });
 
 
 
 
             var table = layui.table;
-            var dataArr = [
-                { "id": "10002", "column1": "卓玛央宗", "column2": "平措旺堆", "column3": "白玛桑珠", "column4": "公差任务换班", "createTime": "2024-08-29 17:21:33" },
-                { "id": "10003", "column1": "扎西次旦", "column2": "土旦尼玛", "column3": "次旺卓玛", "column4": "公差任务换班", "createTime": "2024-08-28 17:21:33" },
-                { "id": "10004", "column1": "次旦索朗", "column2": "格桑卓嘎", "column3": "米玛次仁", "column4": "公差任务换班", "createTime": "2024-08-27 17:21:33" },
-                { "id": "10005", "column1": "次仁平措", "column2": "索朗多杰", "column3": "扎西江措", "column4": "公差任务换班", "createTime": "2024-08-26 17:21:33" },
-                { "id": "10006", "column1": "洛松克珠", "column2": "白玛桑珠", "column3": "德吉白珍", "column4": "公差任务换班", "createTime": "2024-08-25 17:21:33" },
-                { "id": "10007", "column1": "德吉央宗", "column2": "次旺卓玛", "column3": "贡觉次成", "column4": "公差任务换班", "createTime": "2024-08-24 17:21:33" },
-                { "id": "10008", "column1": "洛桑曲扎", "column2": "米玛次仁", "column3": "旦增顿旦", "column4": "公差任务换班", "createTime": "2024-08-23 17:21:33" },
-                { "id": "10009", "column1": "平措旺堆", "column2": "扎西江措", "column3": "平措曲珍", "column4": "公差任务换班", "createTime": "2024-08-22 17:21:33" },
-                { "id": "10011", "column1": "格桑卓嘎", "column2": "贡觉次成", "column3": "卓玛央宗", "column4": "公差任务换班", "createTime": "2024-08-20 17:21:33" },
-                { "id": "10012", "column1": "索朗多杰", "column2": "旦增顿旦", "column3": "扎西次旦", "column4": "公差任务换班", "createTime": "2024-08-19 17:21:33" },
-                { "id": "10013", "column1": "白玛桑珠", "column2": "平措曲珍", "column3": "次旦索朗", "column4": "公差任务换班", "createTime": "2024-08-18 17:21:33" },
-                { "id": "10015", "column1": "米玛次仁", "column2": "卓玛央宗", "column3": "洛松克珠", "column4": "公差任务换班", "createTime": "2024-08-16 17:21:33" },
-                { "id": "10016", "column1": "扎西江措", "column2": "扎西次旦", "column3": "德吉央宗", "column4": "公差任务换班", "createTime": "2024-08-15 17:21:33" },
-                { "id": "10017", "column1": "德吉白珍", "column2": "次旦索朗", "column3": "洛桑曲扎", "column4": "公差任务换班", "createTime": "2024-08-14 17:21:33" },
-                { "id": "10018", "column1": "贡觉次成", "column2": "次仁平措", "column3": "索朗多杰", "column4": "公差任务换班", "createTime": "2024-08-13 17:21:33" },
-                { "id": "10019", "column1": "旦增顿旦", "column2": "洛松克珠", "column3": "白玛桑珠", "column4": "公差任务换班", "createTime": "2024-08-12 17:21:33" },
-                { "id": "10020", "column1": "平措曲珍", "column2": "德吉央宗", "column3": "次旺卓玛", "column4": "公差任务换班", "createTime": "2024-08-11 17:21:33" },
-            ];
+
+
+
+            function InitTable() {
+
+                var keys = $("#ipt_seach").val();
 
                 table.render({
                     elem: '#ItemInfoList'
-                , data: dataArr
-                , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_huanban", random: new Date().getTime(), wheres: " shenqing_name like '%" + keys + "%' or dingban_name like '%" + keys +
+                            "%' or shenpi_name like '%" + keys + "%' or shuoming like '%" + keys + "%' or shenpiyijian like '%" + keys + "%' "
+                    }
+                    , cellMinWidth: 80
                     , cols: [[
-                    //{ field: 'id', align: "center", title: 'ID', sort: true }
-                    { field: 'column1', align: "center", title: '申请人' } //width 支持：数字、百分比和不填写。你还可以通过 minWidth 参数局部定义当前单元格的最小宽度，layui 2.2.1 新增
-                    , { field: 'createTime', align: "center", title: '时间', sort: true }
-                    , { field: 'column2', align: "center", title: '审批人' }
-                    , { field: 'column3', align: "center", title: '顶班人' }
-                    , { field: 'column4', align: "center", title: '说明' }
+                        { field: 'SHENQING_NAME', align: "center", title: '申请人' }
+                        , { field: 'SHENQINGSHIJIAN', align: "center", title: '时间', sort: true }
+                        , { field: 'SHENPI_NAME', align: "center", title: '审批人' }
+                        , { field: 'DINGBAN_NAME', align: "center", title: '顶班人' }
+                        , { field: 'BANCI_OLD', align: "center", title: '原班次' }
+                        , { field: 'BANCI_NEW', align: "center", title: '新班次' }
+                        , { field: 'SHUOMING', align: "center", title: '原因' }
                         , {
                             field: 'cz', align: "center", title: '操作', templet: function (d) {
                                 //console.log(d);
@@ -200,20 +193,20 @@
                     , defaultToolbar: ['filter', 'print', 'exports']
                     , limit: 15
                 });
+            }
 
 
             //列表操作
             table.on('tool(ItemInfoList)', function (obj) {
                 var layEvent = obj.event;
                 data = obj.data;
-                //console.log(data);
 
                 switch (layEvent) {
                     //查看
                     case 'audit':
 
                         var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                        var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
                         var index = layui.layer.open({
                             title: "信息编辑",
                             type: 2,
@@ -222,20 +215,21 @@
                             content: "EmpDutyUpdEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
+                                body.find("#DINGBAN_NAME").val(data.DINGBAN_NAME);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#BANCI_OLD").val(data.BANCI_OLD);
+                                body.find("#BANCI_NEW").val(data.BANCI_NEW);
                                 body.find("#btn_save").hide();
-
                             }
                         });
                         break;
                     //处理
                     case 'edit':
                         var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                        var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
                         var index = layui.layer.open({
                             title: "信息编辑",
                             type: 2,
@@ -244,17 +238,38 @@
                             content: "EmpDutyUpdEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#ID").val(data.ID);
+                                body.find("#SHENQING_NAME").val(data.SHENQING_NAME);
+                                body.find("#SHENQINGSHIJIAN").val(data.SHENQINGSHIJIAN);
+                                body.find("#SHENPI_NAME").val(data.SHENPI_NAME);
+                                body.find("#DINGBAN_NAME").val(data.DINGBAN_NAME);
+                                body.find("#SHUOMING").val(data.SHUOMING);
+                                body.find("#BANCI_OLD").val(data.BANCI_OLD);
+                                body.find("#BANCI_NEW").val(data.BANCI_NEW);
+                            }
+                            , end: function () {
+                                // 弹窗关闭的回调
+                                // 这里可以执行关闭后的操作
+                                console.log('弹窗已关闭');
+                                InitTable();
                             }
                         });
                         break;
                     //删除
                     case 'del':
-                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) { layer.closeAll(); });
+
+                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+                            $.ajax({
+                                type: "post",
+                                url: "/ashx/A_CommonHandler.ashx",
+                                data: { Action: "DelInfo", tbName: "oa_huanban", wheres: " id = '" + data.ID + "'" },
+                                dataType: "json",
+                                success: function (result) {
+                                    InitTable();
+                                }
+                            });
+                            layer.closeAll();
+                        });
                         break;
                 }
             })
@@ -263,7 +278,7 @@
             $("#btn_add").click(function () {
 
                 var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
-                var clientHeight = parseInt(document.body.clientHeight * 0.6) + 'px';
+                var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
                 var index = layui.layer.open({
                     title: "信息编辑",
                     type: 2,
@@ -271,13 +286,18 @@
                     maxmin: true,
                     content: "EmpDutyUpdAdd.html",
                     success: function (layero, index) {
-                        //var body = layui.layer.getChildFrame('body', index);
-                        //var iframe = window['layui-layer-iframe' + index];
-                        //body.find(".ID").val(data.ID)//ID与action是一个隐藏的元素
-                        //body.find(".Action").val("view");
                     }
+                    , end: function () {
+                        // 弹窗关闭的回调
+                        // 这里可以执行关闭后的操作
+                        InitTable();
+                    }
+                });
+
             });
 
+            $("#btn_seach").click(function () {
+                InitTable();
             });
 
         });

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpTrainAdd.html

@@ -42,6 +42,39 @@
             width: 100px;
         }
     </style>
+    <script type="text/javascript">
+        $(function () {
+
+            function guid() {
+                return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                    var r = Math.random() * 16 | 0,
+                        v = c == 'x' ? r : (r & 0x3 | 0x8);
+                    return v.toString(16);
+                });
+            }
+
+
+            $("#btn_save").click(function () {
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "InsInfo", tbName: "tbl_emp_train_log", columns: "ID,EMP_NAME,EMP_MOBILE,EMP_TRAIN_SCORE,TRAIN_CONTENT,TRAIN_TIME,ORG_ID"
+                        , values: "'" + guid() + "','" + $("#EMP_NAME").val() + "','" + $("#EMP_MOBILE").val() + "','" + $("#EMP_TRAIN_SCORE").val() + "','" +
+                            $("#TRAIN_CONTENT").val() + "','" + $("#TRAIN_TIME").val() + "','" + $("#OrgId").val() + "'"
+                    },
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+
+                    }
+                });
+
+            });
+        })
+    </script>
 </head>
 <body style="border: 1px solid #0c6f89;
         background: rgba(12, 70, 100, 0.8);
@@ -49,15 +82,13 @@
         box-sizing: border-box;
     ">
     <div style="float:left;width:100%;height:100%;">
-        <form class="layui-form" style="width: 99%;">
-            <input class="layui-input ID" type="hidden" />
-            <input class="layui-input Action" type="hidden" />
+        <input class="layui-input" id="OrgId" type="hidden" />
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
                 姓名
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column1" disabled=disabled />
+                <input class="layui-input" id="EMP_NAME" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -65,7 +96,7 @@
                 电话
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column2" disabled=disabled />
+                <input class="layui-input" id="EMP_MOBILE" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -73,7 +104,7 @@
                 成绩
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column3" disabled=disabled />
+                <input class="layui-input" id="EMP_TRAIN_SCORE" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -81,7 +112,7 @@
                 内容
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column4" disabled=disabled />
+                <input class="layui-input" id="TRAIN_CONTENT" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -89,16 +120,15 @@
                 时间
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="createTime" disabled=disabled />
+                <input class="layui-input" id="TRAIN_TIME" />
             </div>
         </div>
 
         <div class="layui-form-item">
             <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">确定</button>
+                <button class="layui-btn" id="btn_save">确定</button>
             </div>
         </div>
-        </form>
     </div>
 </body>
 </html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpTrainEdit.html

@@ -42,6 +42,29 @@
             width: 100px;
         }
     </style>
+    <script type="text/javascript">
+        $(function () {
+
+            $("#btn_save").click(function () {
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "UpdInfo", tbName: "tbl_emp_train_log", sets: "EMP_NAME='" + $("#EMP_NAME").val() + "',EMP_MOBILE='" + $("#EMP_MOBILE").val() +
+                            "',EMP_TRAIN_SCORE='" + $("#EMP_TRAIN_SCORE").val() + "',TRAIN_CONTENT='" + $("#TRAIN_CONTENT").val() + "',TRAIN_TIME='" + $("#TRAIN_TIME").val() + "'"
+                        , wheres: "id = '" + $("#ID").val() + "'"
+                    },
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+
+            });
+        })
+    </script>
 </head>
 <body style="border: 1px solid #0c6f89;
         background: rgba(12, 70, 100, 0.8);
@@ -49,15 +72,14 @@
         box-sizing: border-box;
     ">
     <div style="float:left;width:100%;height:100%;">
-        <form class="layui-form" style="width: 99%;">
-            <input class="layui-input ID" type="hidden" />
-            <input class="layui-input Action" type="hidden" />
+        <input class="layui-input" id="ID" type="hidden" />
+        <input class="layui-input" id="OrgId" type="hidden" />
         <div class="layui-form-item layui-row layui-col-xs12">
             <label class="layui-form-label">
                 姓名
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column1" disabled=disabled />
+                <input class="layui-input" id="EMP_NAME" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -65,7 +87,7 @@
                 电话
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column2" disabled=disabled />
+                <input class="layui-input" id="EMP_MOBILE" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -73,7 +95,7 @@
                 成绩
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column3" disabled=disabled />
+                <input class="layui-input" id="EMP_TRAIN_SCORE" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -81,7 +103,7 @@
                 内容
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="column4" disabled=disabled />
+                <input class="layui-input" id="TRAIN_CONTENT" />
             </div>
         </div>
         <div class="layui-form-item layui-row layui-col-xs12">
@@ -89,16 +111,15 @@
                 时间
             </label>
             <div class="layui-input-block">
-                    <input class="layui-input" id="createTime" disabled=disabled />
+                <input class="layui-input" id="TRAIN_TIME" />
             </div>
         </div>
 
         <div class="layui-form-item">
             <div class="layui-input-block">
-                    <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">确定</button>
+                <button class="layui-btn" id="btn_save">确定</button>
             </div>
         </div>
-        </form>
     </div>
 </body>
 </html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpTrainList.html

@@ -52,9 +52,9 @@
     <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
 
         <div class="layui-input-inline">
-            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="请输入" class="layui-input" style="width:160px;">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="姓名、电话、训练类容，训练成绩" class="layui-input" style="width:260px;" id="ipt_seach">
         </div>
-        <button type="button" class="layui-btn layui-btn-normal">搜索</button>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
         <button type="button" class="layui-btn layui-btn-normal" id="btn_add">添加</button>
         <div class="layui-inline">
             <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
@@ -78,7 +78,7 @@
 
             var OrgId = 'D8DC637B8B984848A63F82A018AFAEB0';
 
-
+            var selTreeID = OrgId;
 
             var $zTree, OrgList = [];
             var setting = {
@@ -105,19 +105,7 @@
                         // search(treeNode.ID, treeNode.TYPE);
 
                         selTreeID = treeNode.ID;
-                        //判断选中标签是否部门
-                        if (treeNode.TYPE == "dept") {
-                            //选中节点是部门
-                            selDeptId = treeNode.ID;
-                            selTreeID = treeNode.PID;
-                            TREEID = selTreeID;
-                        } else {
-                            //选中节点是机构
-                            selDeptId = "";
-                            TREEID = treeNode.ID;
-                        }
-
-                        //search(selTreeID, treeNode.TYPE);
+                        InitTable();
 
                     }
                 }
@@ -147,50 +135,39 @@
 
                     }
                 });
+                InitTable();
             });
 
+            $("#btn_seach").click(function () {
 
-
+                InitTable();
+            });
 
             var table = layui.table;
-            var dataArr = [
-                { "id": "10002", "column1": "卓玛央宗", "column2": "17389953725", "column3": "98", "column4": "月训练", "createTime": "2024-08-29 17:21:33" },
-                { "id": "10003", "column1": "扎西次旦", "column2": "17889009119", "column3": "88", "column4": "月训练", "createTime": "2024-08-28 17:21:33" },
-                { "id": "10004", "column1": "次旦索朗", "column2": "18134684641", "column3": "82", "column4": "月训练", "createTime": "2024-08-27 17:21:33" },
-                { "id": "10005", "column1": "次仁平措", "column2": "17784581293", "column3": "75", "column4": "月训练", "createTime": "2024-08-26 17:21:33" },
-                { "id": "10006", "column1": "洛松克珠", "column2": "17789066314", "column3": "60", "column4": "月训练", "createTime": "2024-08-25 17:21:33" },
-                { "id": "10007", "column1": "德吉央宗", "column2": "19327487268", "column3": "75", "column4": "月训练", "createTime": "2024-08-24 17:21:33" },
-                { "id": "10008", "column1": "洛桑曲扎", "column2": "18008973619", "column3": "87", "column4": "月训练", "createTime": "2024-08-23 17:21:33" },
-                { "id": "10009", "column1": "平措旺堆", "column2": "13298985835", "column3": "76", "column4": "月训练", "createTime": "2024-08-22 17:21:33" },
-                { "id": "10010", "column1": "土旦尼玛", "column2": "13989018517", "column3": "98", "column4": "月训练", "createTime": "2024-08-21 17:21:33" },
-                { "id": "10011", "column1": "格桑卓嘎", "column2": "13518948570", "column3": "83", "column4": "月训练", "createTime": "2024-08-20 17:21:33" },
-                { "id": "10012", "column1": "索朗多杰", "column2": "15726770473", "column3": "84", "column4": "月训练", "createTime": "2024-08-19 17:21:33" },
-                { "id": "10013", "column1": "白玛桑珠", "column2": "18908934498", "column3": "98", "column4": "月训练", "createTime": "2024-08-18 17:21:33" },
-                { "id": "10015", "column1": "米玛次仁", "column2": "13381000788", "column3": "91", "column4": "月训练", "createTime": "2024-08-16 17:21:33" },
-                { "id": "10016", "column1": "扎西江措", "column2": "13308900453", "column3": "98", "column4": "月训练", "createTime": "2024-08-15 17:21:33" },
-                { "id": "10017", "column1": "德吉白珍", "column2": "15048756967", "column3": "93", "column4": "月训练", "createTime": "2024-08-14 17:21:33" },
-                { "id": "10018", "column1": "贡觉次成", "column2": "18208041142", "column3": "98", "column4": "月训练", "createTime": "2024-08-13 17:21:33" },
-                { "id": "10019", "column1": "旦增顿旦", "column2": "18840531681", "column3": "96", "column4": "月训练", "createTime": "2024-08-12 17:21:33" },
-                { "id": "10020", "column1": "平措曲珍", "column2": "13618978725", "column3": "89", "column4": "月训练", "createTime": "2024-08-11 17:21:33" },
-            ];
-
+            function InitTable() {
                 table.render({
                     elem: '#ItemInfoList'
-                , data: dataArr
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "tbl_emp_train_log", random: new Date().getTime()
+                        , wheres: " ( EMP_NAME like '%" + $("#ipt_seach").val() + "%' or EMP_MOBILE like '%" + $("#ipt_seach").val() + "%' " +
+                            " or EMP_TRAIN_SCORE like '%" + $("#ipt_seach").val() + "%' or TRAIN_CONTENT like '%" + $("#ipt_seach").val() + "%' ) and ORG_ID='" + selTreeID + "' "
+
+                    }
                     , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                     , cols: [[
-                    //{ field: 'id', align: "center", title: 'ID', sort: true }
-                    { field: 'column1', align: "center", title: '姓名' }
-                    , { field: 'column2', align: "center", title: '电话' }
-                    , { field: 'column3', align: "center", title: '成绩' }
-                    , { field: 'column4', align: "center", title: '内容' }
-                    , { field: 'createTime', align: "center", title: '时间', sort: true }
+                        //{ field: 'ID', align: "center", title: 'ID', sort: true }
+                        { field: 'EMP_NAME', align: "center", title: '姓名' }
+                        , { field: 'EMP_MOBILE', align: "center", title: '电话' }
+                        , { field: 'EMP_TRAIN_SCORE', align: "center", title: '成绩' }
+                        , { field: 'TRAIN_CONTENT', align: "center", title: '内容' }
+                        , { field: 'TRAIN_TIME', align: "center", title: '时间', sort: true }
                         , {
                             field: 'cz', align: "center", title: '操作', templet: function (d) {
                                 //console.log(d);
                                 var htmlStr = '<a lay-event="audit"><img src="/images/xiangqing.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="详情" /></a> ' +
                                     '<a lay-event="edit"><img src="/images/edit.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="编辑" /></a> ' +
-                                ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" />  ';
+                                    ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" /></a>  ';
                                 return htmlStr;
                             }
                         }
@@ -201,6 +178,10 @@
                     , defaultToolbar: ['filter', 'print', 'exports']
                     , limit: 15
                 });
+            }
+
+
+
 
 
             //列表操作
@@ -223,13 +204,13 @@
                             content: "EmpTrainEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#ID").val(data.ID);
+                                body.find("#EMP_NAME").val(data.EMP_NAME);
+                                body.find("#TRAIN_TIME").val(data.TRAIN_TIME);
+                                body.find("#EMP_MOBILE").val(data.EMP_MOBILE);
+                                body.find("#EMP_TRAIN_SCORE").val(data.EMP_TRAIN_SCORE);
+                                body.find("#TRAIN_CONTENT").val(data.TRAIN_CONTENT);
                                 body.find("#btn_save").hide();
-
                             }
                         });
                         break;
@@ -245,11 +226,18 @@
                             content: "EmpTrainEdit.html",
                             success: function (layero, index) {
                                 var body = layui.layer.getChildFrame('body', index);
-                                body.find("#column1").val(data.column1);
-                                body.find("#createTime").val(data.createTime);
-                                body.find("#column2").val(data.column2);
-                                body.find("#column3").val(data.column3);
-                                body.find("#column4").val(data.column4);
+                                body.find("#ID").val(data.ID);
+                                body.find("#EMP_NAME").val(data.EMP_NAME);
+                                body.find("#TRAIN_TIME").val(data.TRAIN_TIME);
+                                body.find("#EMP_MOBILE").val(data.EMP_MOBILE);
+                                body.find("#EMP_TRAIN_SCORE").val(data.EMP_TRAIN_SCORE);
+                                body.find("#TRAIN_CONTENT").val(data.TRAIN_CONTENT);
+                            }
+                            , end: function () {
+                                // 弹窗关闭的回调
+                                // 这里可以执行关闭后的操作
+                                console.log('弹窗已关闭');
+                                InitTable();
                             }
                         });
                         break;
@@ -272,6 +260,14 @@
                     maxmin: true,
                     content: "EmpTrainAdd.html",
                     success: function (layero, index) {
+                        var body = layui.layer.getChildFrame('body', index);
+                        body.find("#OrgId").val(selTreeID);
+                    }
+                    , end: function () {
+                        // 弹窗关闭的回调
+                        // 这里可以执行关闭后的操作
+                        console.log('弹窗已关闭');
+                        InitTable();
                     }
                 });
 

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpZhiBanDangRiAdd.html

@@ -0,0 +1,151 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <style>
+        .searchVal {
+            width: 200px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+
+        .layui-form-label {
+            width: 100px;
+        }
+    </style>
+    <script type="text/javascript">
+        $(function () {
+
+            function guid() {
+                return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                    var r = Math.random() * 16 | 0,
+                        v = c == 'x' ? r : (r & 0x3 | 0x8);
+                    return v.toString(16);
+                });
+            }
+
+
+
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "InsInfo", tbName: "oa_dangrizhiban", columns: "ID,ZHIBAN_NAME,ORG_NAME,KAISHI_TIME,JIESHU_TIME,ZHIBAN_DAY,HUANGANG,BANCI_NAME"
+                        , values: "'" + guid() + "','" + $("#ZHIBAN_NAME").val() + "','" + $("#ORG_NAME").val() + "','" + $("#KAISHI_TIME").val() + "','" +
+                            $("#JIESHU_TIME").val() + "','" + $("#ZHIBAN_DAY").val() + "','" + $("#HUANGANG").val() + "','" + $("#BANCI_NAME").val() + "'"
+                    },
+
+
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+            });
+
+        });
+    </script>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div style="float:left;width:100%;height:100%;">
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班人员
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                营区
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ORG_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                开始时间
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="KAISHI_TIME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                结束时间
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="JIESHU_TIME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班日期
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_DAY" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                是否换岗
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="HUANGANG" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                班次名称
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="BANCI_NAME" />
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" id="btn_save">确定</button>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpZhiBanDangRiEdit.html

@@ -0,0 +1,158 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <style>
+        .searchVal {
+            width: 200px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+
+        .layui-form-label {
+            width: 100px;
+        }
+    </style>
+    <script type="text/javascript">
+        $(function () {
+
+            $("#btn_save").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: {
+                        Action: "UpdInfo", tbName: "oa_dangrizhiban", sets: "ZHIBAN_NAME='" + $("#ZHIBAN_NAME").val() + "',ORG_NAME='" + $("#ORG_NAME").val() + "',KAISHI_TIME='" + $("#KAISHI_TIME").val() +
+                            "',JIESHU_TIME='" + $("#JIESHU_TIME").val() + "',ZHIBAN_DAY='" + $("#ZHIBAN_DAY").val() + "',HUANGANG='" + $("#HUANGANG").val() + "',BANCI_NAME='" + $("#BANCI_NAME").val() + "'"
+                        , wheres: "id = '" + $("#ID").val() + "'"
+                    },
+                    dataType: "json",
+                    success: function (result) {
+                        var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                        parent.layer.close(index); // 关闭当前弹框
+                    }
+                });
+            });
+
+        });
+    </script>
+</head>
+<body style="border: 1px solid #0c6f89;background: rgba(12, 70, 100, 0.8);padding: 20px;box-sizing: border-box;">
+    <div style="float:left;width:49%;height:100%;">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>信息</legend>
+        </fieldset>
+        <input class="layui-input" id="ID" type="hidden" />
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班人员
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                营区
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ORG_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                开始时间
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="KAISHI_TIME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                结束时间
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="JIESHU_TIME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班日期
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_DAY" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                是否换岗
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="HUANGANG" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                班次名称
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="BANCI_NAME" />
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" id="btn_save">确定</button>
+            </div>
+        </div>
+    </div>
+    <div style="float:left;position: absolute;left: 50%;top: 0;z-index: 0;width: 2px;height: 100%;background: linear-gradient(rgba(52, 1, 255, .8), rgba(255,1,255,.8));"></div>
+    <div style="float:right;width:49%;height:100%;padding-left:20px">
+        <fieldset class="layui-elem-field layui-field-title">
+            <legend>流转信息</legend>
+        </fieldset>
+        <ul id="stepMsg" class="layui-timeline">
+            <li class='layui-timeline-item'>
+                <i class='layui-icon layui-icon-circle' style='color:black'></i>
+                <div class='layui-timeline-content layui-text'>
+                    <h4 class='layui-timeline-title' style='font-size: 16px;'><span style='color: #008000 '>【已处理】</span>&nbsp&nbsp步骤：信息创建</h4>
+                </div>
+            </li>
+            <li class='layui-timeline-item'>
+                <i class='layui-icon layui-icon-circle' style='color:black'></i>
+                <div class='layui-timeline-content layui-text'>
+                    <h4 class='layui-timeline-title' style='font-size: 16px;'><span style='color: blue '>【待处理】</span>&nbsp&nbsp步骤：审批</h4>
+                </div>
+            </li>
+        </ul>
+    </div>
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpZhiBanDangRiList.html

@@ -0,0 +1,304 @@
+<!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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <style>
+        .searchVal {
+            width: 300px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+    </style>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div id="divOrgDept" style=" position: absolute; top: 0; bottom: 0px; left: 0; width: 270px; min-height: 500px; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; ">
+        <blockquote class="layui-elem-quote title">机构目录</blockquote>
+        <div style="width: 100%;height: calc(100% - 52px);overflow: auto">
+            <ul id="ztree" class="ztree"></ul>
+        </div>
+    </div>
+    <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
+
+        <div class="layui-input-inline">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="值班人员、营区、开始时间、结束时间、值班日期、是否换岗、班次名称" class="layui-input" style="width:500px;" id="ipt_seach">
+        </div>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_add">添加</button>
+        <div class="layui-inline">
+            <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
+            <input type="file" id="btn_upd_hide" style="display:none;" />
+        </div>
+
+
+        <table class="layui-hide" id="ItemInfoList" lay-filter="ItemInfoList"></table>
+
+    </div>
+
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+
+
+            //var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+
+            var OrgId = 'D8DC637B8B984848A63F82A018AFAEB0';
+
+
+
+            var $zTree, OrgList = [];
+            var setting = {
+                view: {
+                    selectedMulti: false
+                },
+                data: {
+                    key: {
+                        name: "NAME"
+                    },
+                    simpleData: {
+                        enable: true,
+                        type: "TYPE",
+                        idKey: "ID",
+                        pIdKey: "PID"
+                    }
+                },
+                edit: {
+                    enable: false
+                },
+                callback: {
+                    onClick: function (e, treeId, treeNode) {
+
+                        // search(treeNode.ID, treeNode.TYPE);
+
+                        selTreeID = treeNode.ID;
+                        //判断选中标签是否部门
+                        if (treeNode.TYPE == "dept") {
+                            //选中节点是部门
+                            selDeptId = treeNode.ID;
+                            selTreeID = treeNode.PID;
+                            TREEID = selTreeID;
+                        } else {
+                            //选中节点是机构
+                            selDeptId = "";
+                            TREEID = treeNode.ID;
+                        }
+
+                        //search(selTreeID, treeNode.TYPE);
+
+                    }
+                }
+            };
+            //初始化树
+            $(function () {
+
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/SysEmpHandler.ashx",
+                    data: { Action: "OrgDeptTree", OrgId: OrgId },
+                    dataType: "json",
+                    success: function (result) {
+                        var zNodes = result.data;
+                        if (zNodes.length > 0) {
+                            for (var i in zNodes) {
+                                OrgList.push(zNodes[i].ID);
+                            }
+                        }
+                        $zTree = $.fn.zTree.init($("#ztree"), setting, zNodes);
+
+                        var nodes = $zTree.getNodes();
+                        for (var i = 0; i < nodes.length; i++) {
+                            $zTree.expandNode($zTree.getNodes()[i], true, false, false);
+                        }
+
+                    }
+                });
+                InitTable();
+            });
+
+
+            var table = layui.table;
+
+            function InitTable() {
+
+                var keys = $("#ipt_seach").val();
+
+                table.render({
+                    elem: '#ItemInfoList'
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_dangrizhiban", random: new Date().getTime(), wheres: " ZHIBAN_NAME like '%" + keys + "%' or ORG_NAME like '%" + keys + "%' or KAISHI_TIME like '%" +
+                            keys + "%' or JIESHU_TIME like '%" + keys + "%' or ZHIBAN_DAY like '%" + keys + "%'or HUANGANG like '%" + keys + "%' or BANCI_NAME like '%" + keys + "%' "
+                    }
+                    , cellMinWidth: 80
+                    , cols: [[
+                        { field: 'ZHIBAN_NAME', align: "center", title: '值班人员' }
+                        , { field: 'ORG_NAME', align: "center", title: '营区', sort: true }
+                        , { field: 'KAISHI_TIME', align: "center", title: '开始时间' }
+                        , { field: 'JIESHU_TIME', align: "center", title: '结束时间' }
+                        , { field: 'ZHIBAN_DAY', align: "center", title: '值班日期' }
+                        , { field: 'HUANGANG', align: "center", title: '是否换岗' }
+                        , { field: 'BANCI_NAME', align: "center", title: '班次名称' }
+                        , {
+                            field: 'cz', align: "center", title: '操作', templet: function (d) {
+                                //console.log(d);
+                                var htmlStr = '<a lay-event="audit"><img src="/images/xiangqing.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="详情" /></a> ' +
+                                    '<a lay-event="edit"><img src="/images/edit.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="编辑" /></a> ' +
+                                    ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" />  ';
+                                return htmlStr;
+                            }
+                        }
+                    ]]
+                    , page: true
+                    , limits: [10, 15, 20, 50, 999, 9999]
+                    , toolbar: true
+                    , defaultToolbar: ['filter', 'print', 'exports']
+                    , limit: 15
+                });
+            }
+
+
+            //列表操作
+            table.on('tool(ItemInfoList)', function (obj) {
+                var layEvent = obj.event;
+                data = obj.data;
+
+                switch (layEvent) {
+                    //查看
+                    case 'audit':
+
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpZhiBanDangRiEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#ZHIBAN_NAME").val(data.ZHIBAN_NAME);
+                                body.find("#ORG_NAME").val(data.ORG_NAME);
+                                body.find("#KAISHI_TIME").val(data.KAISHI_TIME);
+                                body.find("#JIESHU_TIME").val(data.JIESHU_TIME);
+                                body.find("#ZHIBAN_DAY").val(data.ZHIBAN_DAY);
+                                body.find("#HUANGANG").val(data.HUANGANG);
+                                body.find("#BANCI_NAME").val(data.BANCI_NAME);
+                                body.find("#btn_save").hide();
+                            }
+                        });
+                        break;
+                    //处理
+                    case 'edit':
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpZhiBanDangRiEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#ID").val(data.ID);
+                                body.find("#ZHIBAN_NAME").val(data.ZHIBAN_NAME);
+                                body.find("#ORG_NAME").val(data.ORG_NAME);
+                                body.find("#KAISHI_TIME").val(data.KAISHI_TIME);
+                                body.find("#JIESHU_TIME").val(data.JIESHU_TIME);
+                                body.find("#ZHIBAN_DAY").val(data.ZHIBAN_DAY);
+                                body.find("#HUANGANG").val(data.HUANGANG);
+                                body.find("#BANCI_NAME").val(data.BANCI_NAME);
+                            }
+                            , end: function () {
+                                // 弹窗关闭的回调
+                                // 这里可以执行关闭后的操作
+                                console.log('弹窗已关闭');
+                                InitTable();
+                            }
+                        });
+                        break;
+                    //删除
+                    case 'del':
+
+                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+                            $.ajax({
+                                type: "post",
+                                url: "/ashx/A_CommonHandler.ashx",
+                                data: { Action: "DelInfo", tbName: "oa_dangrizhiban", wheres: " id = '" + data.ID + "'" },
+                                dataType: "json",
+                                success: function (result) {
+                                    InitTable();
+                                }
+                            });
+                            layer.closeAll();
+                        });
+                        break;
+                }
+            })
+
+
+            $("#btn_add").click(function () {
+
+                var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                var index = layui.layer.open({
+                    title: "信息编辑",
+                    type: 2,
+                    area: [clientWidth, clientHeight],
+                    maxmin: true,
+                    content: "EmpZhiBanDangRiAdd.html",
+                    success: function (layero, index) {
+                    }
+                    , end: function () {
+                        // 弹窗关闭的回调
+                        // 这里可以执行关闭后的操作
+                        InitTable();
+                    }
+                });
+
+            });
+
+            $("#btn_seach").click(function () {
+                InitTable();
+            });
+
+        });
+    </script>
+
+
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpZhiBanDangRiPage.html

@@ -0,0 +1,290 @@
+<!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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <style>
+        .searchVal {
+            width: 300px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+    </style>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div id="divOrgDept" style=" position: absolute; top: 0; bottom: 0px; left: 0; width: 270px; min-height: 500px; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; ">
+        <blockquote class="layui-elem-quote title">机构目录</blockquote>
+        <div style="width: 100%;height: calc(100% - 52px);overflow: auto">
+            <ul id="ztree" class="ztree"></ul>
+        </div>
+    </div>
+    <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
+
+        <div class="layui-input-inline">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="值班人员、营区、开始时间、结束时间、值班日期、是否换岗、班次名称" class="layui-input" style="width:500px;" id="ipt_seach">
+        </div>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
+
+
+        <table class="layui-hide" id="ItemInfoList" lay-filter="ItemInfoList"></table>
+
+    </div>
+
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+
+
+            //var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+
+            var OrgId = 'D8DC637B8B984848A63F82A018AFAEB0';
+
+
+
+            var $zTree, OrgList = [];
+            var setting = {
+                view: {
+                    selectedMulti: false
+                },
+                data: {
+                    key: {
+                        name: "NAME"
+                    },
+                    simpleData: {
+                        enable: true,
+                        type: "TYPE",
+                        idKey: "ID",
+                        pIdKey: "PID"
+                    }
+                },
+                edit: {
+                    enable: false
+                },
+                callback: {
+                    onClick: function (e, treeId, treeNode) {
+
+                        // search(treeNode.ID, treeNode.TYPE);
+
+                        selTreeID = treeNode.ID;
+                        //判断选中标签是否部门
+                        if (treeNode.TYPE == "dept") {
+                            //选中节点是部门
+                            selDeptId = treeNode.ID;
+                            selTreeID = treeNode.PID;
+                            TREEID = selTreeID;
+                        } else {
+                            //选中节点是机构
+                            selDeptId = "";
+                            TREEID = treeNode.ID;
+                        }
+
+                        //search(selTreeID, treeNode.TYPE);
+
+                    }
+                }
+            };
+            //初始化树
+            $(function () {
+
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/SysEmpHandler.ashx",
+                    data: { Action: "OrgDeptTree", OrgId: OrgId },
+                    dataType: "json",
+                    success: function (result) {
+                        var zNodes = result.data;
+                        if (zNodes.length > 0) {
+                            for (var i in zNodes) {
+                                OrgList.push(zNodes[i].ID);
+                            }
+                        }
+                        $zTree = $.fn.zTree.init($("#ztree"), setting, zNodes);
+
+                        var nodes = $zTree.getNodes();
+                        for (var i = 0; i < nodes.length; i++) {
+                            $zTree.expandNode($zTree.getNodes()[i], true, false, false);
+                        }
+
+                    }
+                });
+                InitTable();
+            });
+
+
+            var table = layui.table;
+
+            function InitTable() {
+
+                var keys = $("#ipt_seach").val();
+
+                table.render({
+                    elem: '#ItemInfoList'
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_dangrizhiban", random: new Date().getTime(), wheres: " (ZHIBAN_NAME like '%" + keys + "%' or ORG_NAME like '%" + keys + "%' or KAISHI_TIME like '%" +
+                            keys + "%' or JIESHU_TIME like '%" + keys + "%' or HUANGANG like '%" + keys + "%' or BANCI_NAME like '%" + keys + "%') and zhiban_day = date_format(now(),'%Y-%m-%d') "
+                    }
+                    , cellMinWidth: 80
+                    , cols: [[
+                        { field: 'ZHIBAN_NAME', align: "center", title: '值班人员' }
+                        , { field: 'ORG_NAME', align: "center", title: '营区', sort: true }
+                        , { field: 'KAISHI_TIME', align: "center", title: '开始时间' }
+                        , { field: 'JIESHU_TIME', align: "center", title: '结束时间' }
+                        , { field: 'ZHIBAN_DAY', align: "center", title: '值班日期' }
+                        , { field: 'HUANGANG', align: "center", title: '是否换岗' }
+                        , { field: 'BANCI_NAME', align: "center", title: '班次名称' }
+                    ]]
+                    , page: true
+                    , limits: [10, 15, 20, 50, 999, 9999]
+                    , toolbar: true
+                    , defaultToolbar: ['filter', 'print', 'exports']
+                    , limit: 15
+                });
+            }
+
+
+            //列表操作
+            table.on('tool(ItemInfoList)', function (obj) {
+                var layEvent = obj.event;
+                data = obj.data;
+
+                switch (layEvent) {
+                    //查看
+                    case 'audit':
+
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpZhiBanDangRiEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#ZHIBAN_NAME").val(data.ZHIBAN_NAME);
+                                body.find("#ORG_NAME").val(data.ORG_NAME);
+                                body.find("#KAISHI_TIME").val(data.KAISHI_TIME);
+                                body.find("#JIESHU_TIME").val(data.JIESHU_TIME);
+                                body.find("#ZHIBAN_DAY").val(data.ZHIBAN_DAY);
+                                body.find("#HUANGANG").val(data.HUANGANG);
+                                body.find("#BANCI_NAME").val(data.BANCI_NAME);
+                                body.find("#btn_save").hide();
+                            }
+                        });
+                        break;
+                    //处理
+                    case 'edit':
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpZhiBanDangRiEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#ID").val(data.ID);
+                                body.find("#ZHIBAN_NAME").val(data.ZHIBAN_NAME);
+                                body.find("#ORG_NAME").val(data.ORG_NAME);
+                                body.find("#KAISHI_TIME").val(data.KAISHI_TIME);
+                                body.find("#JIESHU_TIME").val(data.JIESHU_TIME);
+                                body.find("#ZHIBAN_DAY").val(data.ZHIBAN_DAY);
+                                body.find("#HUANGANG").val(data.HUANGANG);
+                                body.find("#BANCI_NAME").val(data.BANCI_NAME);
+                            }
+                            , end: function () {
+                                // 弹窗关闭的回调
+                                // 这里可以执行关闭后的操作
+                                console.log('弹窗已关闭');
+                                InitTable();
+                            }
+                        });
+                        break;
+                    //删除
+                    case 'del':
+
+                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+                            $.ajax({
+                                type: "post",
+                                url: "/ashx/A_CommonHandler.ashx",
+                                data: { Action: "DelInfo", tbName: "oa_dangrizhiban", wheres: " id = '" + data.ID + "'" },
+                                dataType: "json",
+                                success: function (result) {
+                                    InitTable();
+                                }
+                            });
+                            layer.closeAll();
+                        });
+                        break;
+                }
+            })
+
+
+            $("#btn_add").click(function () {
+
+                var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                var index = layui.layer.open({
+                    title: "信息编辑",
+                    type: 2,
+                    area: [clientWidth, clientHeight],
+                    maxmin: true,
+                    content: "EmpZhiBanDangRiAdd.html",
+                    success: function (layero, index) {
+                    }
+                    , end: function () {
+                        // 弹窗关闭的回调
+                        // 这里可以执行关闭后的操作
+                        InitTable();
+                    }
+                });
+
+            });
+
+            $("#btn_seach").click(function () {
+                InitTable();
+            });
+
+        });
+    </script>
+
+
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpZhiBanFangHuoAdd.html

@@ -0,0 +1,147 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+    <style>
+        .searchVal {
+            width: 200px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+
+        .layui-form-label {
+            width: 100px;
+        }
+    </style>
+    <script type="text/javascript">
+
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+            var laydate = layui.laydate;
+            laydate.render({
+                elem: '#ZHIBAN_DAY'
+                , value: new Date()
+            });
+
+            $(function () {
+
+                function guid() {
+                    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                        var r = Math.random() * 16 | 0,
+                            v = c == 'x' ? r : (r & 0x3 | 0x8);
+                        return v.toString(16);
+                    });
+                }
+
+                $("#btn_save").click(function () {
+                    $.ajax({
+                        type: "post",
+                        url: "/ashx/A_CommonHandler.ashx",
+                        data: {
+                            Action: "InsInfo", tbName: "oa_fanghuobanzhiban", columns: "ID,ZHIBAN_DAY,ZHIBAN_NAME,ORG_NAME,ZHIBAN_MOBILE,ZHIBAN_RENYUAN,ZHIBAN_BANZHANG"
+                            , values: "'" + guid() + "','" + $("#ZHIBAN_DAY").val() + "','" + $("#ZHIBAN_NAME").val() + "','" + $("#ORG_NAME").val() + "','" +
+                                $("#ZHIBAN_MOBILE").val() + "','" + $("#ZHIBAN_RENYUAN").val() + "','" + $("#ZHIBAN_BANZHANG").val() + "' "
+                        },
+
+
+                        dataType: "json",
+                        success: function (result) {
+                            var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                            parent.layer.close(index); // 关闭当前弹框
+                        }
+                    });
+                });
+            });
+        });
+    </script>
+</head>
+<body style="border: 1px solid #0c6f89;background: rgba(12, 70, 100, 0.8);padding: 20px;box-sizing: border-box;">
+    <div style="float:left;width:100%;height:100%;">
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班日期
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_DAY" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                姓名
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                营区
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ORG_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                电话
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_MOBILE" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班人员
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_RENYUAN" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班班长
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_BANZHANG" />
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" id="btn_save">确定</button>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpZhiBanFangHuoEdit.html

@@ -0,0 +1,136 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+    <style>
+        .searchVal {
+            width: 200px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+
+        .layui-form-label {
+            width: 100px;
+        }
+    </style>
+    <script type="text/javascript">
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+            var laydate = layui.laydate;
+            laydate.render({
+                elem: '#ZHIBAN_DAY'
+                , value: new Date()
+            });
+            $(function () {
+
+                $("#btn_save").click(function () {
+                    $.ajax({
+                        type: "post",
+                        url: "/ashx/A_CommonHandler.ashx",
+                        data: {
+                            Action: "UpdInfo", tbName: "oa_fanghuobanzhiban", sets: "ZHIBAN_DAY='" + $("#ZHIBAN_DAY").val() + "',ZHIBAN_NAME='" + $("#ZHIBAN_NAME").val() + "',ORG_NAME='" + $("#ORG_NAME").val() +
+                                "',ZHIBAN_MOBILE='" + $("#ZHIBAN_MOBILE").val() + "',ZHIBAN_RENYUAN='" + $("#ZHIBAN_RENYUAN").val() + "',ZHIBAN_BANZHANG='" + $("#ZHIBAN_BANZHANG").val() + "' "
+                            , wheres: "id = '" + $("#ID").val() + "'"
+                        },
+                        dataType: "json",
+                        success: function (result) {
+                            var index = parent.layer.getFrameIndex(window.name); // 获取当前弹框的索引
+                            parent.layer.close(index); // 关闭当前弹框
+                        }
+                    });
+                });
+            });
+        });
+    </script>
+</head>
+<body style="border: 1px solid #0c6f89;background: rgba(12, 70, 100, 0.8);padding: 20px;box-sizing: border-box;">
+    <div style="float:left;width:100%;height:100%;">
+        <input class="layui-input" id="ID" type="hidden" />
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班日期
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_DAY" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                姓名
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                营区
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ORG_NAME" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                电话
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_MOBILE" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班人员
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_RENYUAN" />
+            </div>
+        </div>
+        <div class="layui-form-item layui-row layui-col-xs12">
+            <label class="layui-form-label">
+                值班班长
+            </label>
+            <div class="layui-input-block">
+                <input class="layui-input" id="ZHIBAN_BANZHANG" />
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <div class="layui-input-block">
+                <button class="layui-btn" id="btn_save">确定</button>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpZhiBanFangHuoList.html

@@ -0,0 +1,291 @@
+<!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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <style>
+        .searchVal {
+            width: 300px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+    </style>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div id="divOrgDept" style=" position: absolute; top: 0; bottom: 0px; left: 0; width: 270px; min-height: 500px; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; ">
+        <blockquote class="layui-elem-quote title">机构目录</blockquote>
+        <div style="width: 100%;height: calc(100% - 52px);overflow: auto">
+            <ul id="ztree" class="ztree"></ul>
+        </div>
+    </div>
+    <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
+
+        <div class="layui-input-inline">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="姓名、时间、电话、值班班长、值班人员" class="layui-input" style="width:360px;" id="ipt_seach">
+        </div>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_add">添加</button>
+        <div class="layui-inline">
+            <a class="layui-btn layui-btn-danger layui-btn-normal" onclick="document.getElementById('btn_upd_hide').click();">导入</a>
+            <input type="file" id="btn_upd_hide" style="display:none;" />
+        </div>
+
+
+        <table class="layui-hide" id="ItemInfoList" lay-filter="ItemInfoList"></table>
+
+    </div>
+
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+
+
+            //var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+
+            var OrgId = 'D8DC637B8B984848A63F82A018AFAEB0';
+
+
+
+            var $zTree, OrgList = [];
+            var setting = {
+                view: {
+                    selectedMulti: false
+                },
+                data: {
+                    key: {
+                        name: "NAME"
+                    },
+                    simpleData: {
+                        enable: true,
+                        type: "TYPE",
+                        idKey: "ID",
+                        pIdKey: "PID"
+                    }
+                },
+                edit: {
+                    enable: false
+                },
+                callback: {
+                    onClick: function (e, treeId, treeNode) {
+
+
+                        selTreeID = treeNode.ID;
+
+                    }
+                }
+            };
+            //初始化树
+            $(function () {
+
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/SysEmpHandler.ashx",
+                    data: { Action: "OrgDeptTree", OrgId: OrgId },
+                    dataType: "json",
+                    success: function (result) {
+                        var zNodes = result.data;
+                        if (zNodes.length > 0) {
+                            for (var i in zNodes) {
+                                OrgList.push(zNodes[i].ID);
+                            }
+                        }
+                        $zTree = $.fn.zTree.init($("#ztree"), setting, zNodes);
+
+                        var nodes = $zTree.getNodes();
+                        for (var i = 0; i < nodes.length; i++) {
+                            $zTree.expandNode($zTree.getNodes()[i], true, false, false);
+                        }
+
+                    }
+                });
+                InitTable();
+            });
+
+
+
+
+            var table = layui.table;
+
+
+
+            function InitTable() {
+
+                var keys = $("#ipt_seach").val();
+
+                table.render({
+                    elem: '#ItemInfoList'
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_fanghuobanzhiban", random: new Date().getTime(), wheres: " zhiban_day like '%" + keys + "%' or zhiban_name like '%" + keys +
+                            "%' or org_name like '%" + keys + "%' or zhiban_mobile like '%" + keys + "%' or zhiban_renyuan like '%" + keys + "%' or zhiban_banzhang like '%" + keys + "%' "
+                    }
+                    , cellMinWidth: 80
+                    , cols: [[
+                        { field: 'ZHIBAN_DAY', align: "center", title: '值班日期' }
+                        , { field: 'ZHIBAN_NAME', align: "center", title: '姓名', sort: true }
+                        , { field: 'ORG_NAME', align: "center", title: '营区' }
+                        , { field: 'ZHIBAN_MOBILE', align: "center", title: '电话' }
+                        , { field: 'ZHIBAN_RENYUAN', align: "center", title: '值班人员' }
+                        , { field: 'ZHIBAN_BANZHANG', align: "center", title: '值班班长' }
+                        , {
+                            field: 'cz', align: "center", title: '操作', templet: function (d) {
+                                //console.log(d);
+                                var htmlStr = '<a lay-event="audit"><img src="/images/xiangqing.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="详情" /></a> ' +
+                                    '<a lay-event="edit"><img src="/images/edit.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="编辑" /></a> ' +
+                                    ' <a lay-event="del"><img src="/images/del.png" style=" height:20px; width:20px; margin-right: 20px; cursor:pointer;" title="删除" />  ';
+                                return htmlStr;
+                            }
+                        }
+                    ]]
+                    , page: true
+                    , limits: [10, 15, 20, 50, 999, 9999]
+                    , toolbar: true
+                    , defaultToolbar: ['filter', 'print', 'exports']
+                    , limit: 15
+                });
+            }
+
+
+            //列表操作
+            table.on('tool(ItemInfoList)', function (obj) {
+                var layEvent = obj.event;
+                data = obj.data;
+
+                switch (layEvent) {
+                    //查看
+                    case 'audit':
+
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpZhiBanFangHuoEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#ZHIBAN_DAY").val(data.ZHIBAN_DAY);
+                                body.find("#ZHIBAN_NAME").val(data.ZHIBAN_NAME);
+                                body.find("#ORG_NAME").val(data.ORG_NAME);
+                                body.find("#ZHIBAN_MOBILE").val(data.ZHIBAN_MOBILE);
+                                body.find("#ZHIBAN_RENYUAN").val(data.ZHIBAN_RENYUAN);
+                                body.find("#ZHIBAN_BANZHANG").val(data.ZHIBAN_BANZHANG);
+                                body.find("#btn_save").hide();
+                            }
+                        });
+                        break;
+                    //处理
+                    case 'edit':
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpZhiBanFangHuoEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#ID").val(data.ID);
+                                body.find("#ZHIBAN_DAY").val(data.ZHIBAN_DAY);
+                                body.find("#ZHIBAN_NAME").val(data.ZHIBAN_NAME);
+                                body.find("#ORG_NAME").val(data.ORG_NAME);
+                                body.find("#ZHIBAN_MOBILE").val(data.ZHIBAN_MOBILE);
+                                body.find("#ZHIBAN_RENYUAN").val(data.ZHIBAN_RENYUAN);
+                                body.find("#ZHIBAN_BANZHANG").val(data.ZHIBAN_BANZHANG);
+                            }
+                            , end: function () {
+                                // 弹窗关闭的回调
+                                // 这里可以执行关闭后的操作
+                                console.log('弹窗已关闭');
+                                InitTable();
+                            }
+                        });
+                        break;
+                    //删除
+                    case 'del':
+
+                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+                            $.ajax({
+                                type: "post",
+                                url: "/ashx/A_CommonHandler.ashx",
+                                data: { Action: "DelInfo", tbName: "oa_fanghuobanzhiban", wheres: " id = '" + data.ID + "'" },
+                                dataType: "json",
+                                success: function (result) {
+                                    InitTable();
+                                }
+                            });
+                            layer.closeAll();
+                        });
+                        break;
+                }
+            })
+
+
+            $("#btn_add").click(function () {
+
+                var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                var index = layui.layer.open({
+                    title: "信息编辑",
+                    type: 2,
+                    area: [clientWidth, clientHeight],
+                    maxmin: true,
+                    content: "EmpZhiBanFangHuoAdd.html",
+                    success: function (layero, index) {
+                    }
+                    , end: function () {
+                        // 弹窗关闭的回调
+                        // 这里可以执行关闭后的操作
+                        InitTable();
+                    }
+                });
+
+            });
+
+            $("#btn_seach").click(function () {
+                InitTable();
+            });
+
+        });
+    </script>
+
+
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/EmpZhiBanFangHuoPage.html

@@ -0,0 +1,258 @@
+<!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, maximum-scale=1" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <script src="/js/jquery-2.1.3.min.js"></script>
+    <link rel="stylesheet" href="/css/ztree/metro/ztree.css" />
+    <link rel="stylesheet" href="/js/layui/css/layui.css" media="all" />
+    <link rel="stylesheet" href="/css/public.css" media="all" />
+    <link href="/Index/css/zhgl-style.css" rel="stylesheet" />
+    <link rel="stylesheet" href="/css/right-list.css" media="all" />
+    <link rel="stylesheet" href="/css/bulletframebg.css" media="all" />
+    <style>
+        .searchVal {
+            width: 300px;
+        }
+
+        .layui-laypage {
+            margin: 10px 20%;
+        }
+
+        .ztree {
+            overflow: auto;
+        }
+
+        .layui-layer-btn {
+            background-color: #164D6A;
+        }
+
+        .layui-layer-content {
+            background-color: #164D6A;
+        }
+    </style>
+</head>
+<body style="border: 1px solid #0c6f89;
+        background: rgba(12, 70, 100, 0.8);
+        padding: 20px;
+        box-sizing: border-box;
+    ">
+    <div id="divOrgDept" style=" position: absolute; top: 0; bottom: 0px; left: 0; width: 270px; min-height: 500px; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; ">
+        <blockquote class="layui-elem-quote title">机构目录</blockquote>
+        <div style="width: 100%;height: calc(100% - 52px);overflow: auto">
+            <ul id="ztree" class="ztree"></ul>
+        </div>
+    </div>
+    <div id="divEmpBody" class="layui-col-lg10 layui-col-md10 layui-col-xs10" style=" position: absolute; left: 290px; right: 0; top: 0; bottom: 0; z-index: 998; width: auto; overflow: hidden; overflow-y: auto; box-sizing: border-box; border: 1px solid #0c6f89; background: rgba(12, 70, 100, 0.8); border-radius: 4px; padding: 20px; ">
+
+        <div class="layui-input-inline">
+            <input type="text" name="title" lay-verify="title" autocomplete="off" placeholder="姓名、时间、电话、值班班长、值班人员" class="layui-input" style="width:360px;" id="ipt_seach">
+        </div>
+        <button type="button" class="layui-btn layui-btn-normal" id="btn_seach">搜索</button> 
+
+        <table class="layui-hide" id="ItemInfoList" lay-filter="ItemInfoList"></table>
+
+    </div>
+
+    <script type="text/javascript" src="/js/layui/layui.js"></script>
+
+    <script>
+        layui.config({
+            base: '/js/'
+        }).use(['ztree', 'form', 'layer', 'table', 'laytpl', 'laydate', 'laypage'], function () {
+
+
+            //var OrgId = JSON.parse(window.sessionStorage.getItem("userInfo")).OrgID;
+
+            var OrgId = 'D8DC637B8B984848A63F82A018AFAEB0';
+
+
+
+            var $zTree, OrgList = [];
+            var setting = {
+                view: {
+                    selectedMulti: false
+                },
+                data: {
+                    key: {
+                        name: "NAME"
+                    },
+                    simpleData: {
+                        enable: true,
+                        type: "TYPE",
+                        idKey: "ID",
+                        pIdKey: "PID"
+                    }
+                },
+                edit: {
+                    enable: false
+                },
+                callback: {
+                    onClick: function (e, treeId, treeNode) {
+
+
+                        selTreeID = treeNode.ID;
+
+                    }
+                }
+            };
+            //初始化树
+            $(function () {
+
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/SysEmpHandler.ashx",
+                    data: { Action: "OrgDeptTree", OrgId: OrgId },
+                    dataType: "json",
+                    success: function (result) {
+                        var zNodes = result.data;
+                        if (zNodes.length > 0) {
+                            for (var i in zNodes) {
+                                OrgList.push(zNodes[i].ID);
+                            }
+                        }
+                        $zTree = $.fn.zTree.init($("#ztree"), setting, zNodes);
+
+                        var nodes = $zTree.getNodes();
+                        for (var i = 0; i < nodes.length; i++) {
+                            $zTree.expandNode($zTree.getNodes()[i], true, false, false);
+                        }
+
+                    }
+                });
+                InitTable();
+            });
+
+
+
+
+            var table = layui.table;
+
+
+
+            function InitTable() {
+
+                var keys = $("#ipt_seach").val();
+
+                table.render({
+                    elem: '#ItemInfoList'
+                    , url: '/ashx/A_CommonHandler.ashx'
+                    , where: {
+                        Action: 'SelInfoPage', tbName: "oa_fanghuobanzhiban", random: new Date().getTime(), wheres: " (zhiban_day like '%" + keys + "%' or zhiban_name like '%" + keys +
+                            "%' or org_name like '%" + keys + "%' or zhiban_mobile like '%" + keys + "%' or zhiban_renyuan like '%" + keys + "%' or zhiban_banzhang like '%" + keys + "%') and " +
+                            " zhiban_day>=DATE_SUB(CURDATE(), INTERVAL WEEKDAY(now()) DAY) and zhiban_day <=DATE_ADD(DATE_SUB(CURDATE(), INTERVAL WEEKDAY(now()) DAY), INTERVAL 6 DAY) "
+                        , columns: " *,CASE DAYOFWEEK( zhiban_day) WHEN 1 THEN	'周日' WHEN 2 THEN '周一' WHEN 3 THEN '周二' WHEN 4 THEN '周三' WHEN 5 THEN '周四' WHEN 6 THEN '周五' WHEN 7 THEN '周六' END xq "
+                    }
+                    , cellMinWidth: 80
+                    , cols: [[
+                        { field: 'ZHIBAN_DAY', align: "center", title: '值班日期', sort: true }
+                        , { field: 'XQ', align: "center", title: '星期', sort: true }
+                        , { field: 'ZHIBAN_NAME', align: "center", title: '姓名', sort: true }
+                        , { field: 'ORG_NAME', align: "center", title: '营区' }
+                        , { field: 'ZHIBAN_MOBILE', align: "center", title: '电话' }
+                        , { field: 'ZHIBAN_RENYUAN', align: "center", title: '值班人员' }
+                        , { field: 'ZHIBAN_BANZHANG', align: "center", title: '值班班长' }
+                    ]]
+                    , page: true
+                    , limits: [10, 15, 20, 50, 999, 9999]
+                    , toolbar: true
+                    , defaultToolbar: ['filter', 'print', 'exports']
+                    , limit: 15
+                });
+            }
+
+
+            //列表操作
+            table.on('tool(ItemInfoList)', function (obj) {
+                var layEvent = obj.event;
+                data = obj.data;
+
+                switch (layEvent) {
+                    //查看
+                    case 'audit':
+
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpZhiBanFangHuoEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#ZHIBAN_DAY").val(data.ZHIBAN_DAY);
+                                body.find("#ZHIBAN_NAME").val(data.ZHIBAN_NAME);
+                                body.find("#ORG_NAME").val(data.ORG_NAME);
+                                body.find("#ZHIBAN_MOBILE").val(data.ZHIBAN_MOBILE);
+                                body.find("#ZHIBAN_RENYUAN").val(data.ZHIBAN_RENYUAN);
+                                body.find("#ZHIBAN_BANZHANG").val(data.ZHIBAN_BANZHANG);
+                                body.find("#btn_save").hide();
+                            }
+                        });
+                        break;
+                    //处理
+                    case 'edit':
+                        var clientWidth = parseInt(document.body.clientWidth * 0.6) + 'px';
+                        var clientHeight = parseInt(document.body.clientHeight * 0.8) + 'px';
+                        var index = layui.layer.open({
+                            title: "信息编辑",
+                            type: 2,
+                            area: [clientWidth, clientHeight],
+                            maxmin: true,
+                            content: "EmpZhiBanFangHuoEdit.html",
+                            success: function (layero, index) {
+                                var body = layui.layer.getChildFrame('body', index);
+                                body.find("#ID").val(data.ID);
+                                body.find("#ZHIBAN_DAY").val(data.ZHIBAN_DAY);
+                                body.find("#ZHIBAN_NAME").val(data.ZHIBAN_NAME);
+                                body.find("#ORG_NAME").val(data.ORG_NAME);
+                                body.find("#ZHIBAN_MOBILE").val(data.ZHIBAN_MOBILE);
+                                body.find("#ZHIBAN_RENYUAN").val(data.ZHIBAN_RENYUAN);
+                                body.find("#ZHIBAN_BANZHANG").val(data.ZHIBAN_BANZHANG);
+                            }
+                            , end: function () {
+                                // 弹窗关闭的回调
+                                // 这里可以执行关闭后的操作
+                                console.log('弹窗已关闭');
+                                InitTable();
+                            }
+                        });
+                        break;
+                    //删除
+                    case 'del':
+
+                        layer.confirm('是否确认删除？', { icon: 3, title: '提示信息' }, function (index) {
+                            $.ajax({
+                                type: "post",
+                                url: "/ashx/A_CommonHandler.ashx",
+                                data: { Action: "DelInfo", tbName: "oa_fanghuobanzhiban", wheres: " id = '" + data.ID + "'" },
+                                dataType: "json",
+                                success: function (result) {
+                                    InitTable();
+                                }
+                            });
+                            layer.closeAll();
+                        });
+                        break;
+                }
+            })
+
+
+            $("#btn_seach").click(function () {
+                InitTable();
+            });
+
+        });
+    </script>
+
+
+</body>
+</html>

Code/智慧营区/DOCManageAPP（阿克苏）/TempPage/Emp/OrgDutySta.html

@@ -3,7 +3,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>营区值班统计</title>
+    <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">
@@ -101,7 +101,7 @@
                 , type: 'month'
                 , value: nowY + '-' + nowM
                 , done: function (value) {
-                    getStaData(value);
+                    InitData();
                 }
             });
 
@@ -162,29 +162,32 @@
 
                     }
                 });
+                InitData();
             });
 
-
+            var dataArr = [];
             var table = layui.table;
-            var dataArr = [
-                { "id": "10001", "column1": "总队机关", "column2": "212", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-30 17:21:33" },
-                { "id": "10002", "column1": "拉萨支队", "column2": "210", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-29 17:21:33" },
-                { "id": "10003", "column1": "日喀则支队", "column2": "318", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-28 17:21:33" },
-                { "id": "10004", "column1": "昌都支队", "column2": "316", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-27 17:21:33" },
-                { "id": "10005", "column1": "林芝支队", "column2": "213", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-26 17:21:33" },
-                { "id": "10006", "column1": "山南支队", "column2": "214", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-25 17:21:33" },
-                { "id": "10007", "column1": "阿里支队", "column2": "212", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-24 17:21:33" },
-                { "id": "10008", "column1": "那曲支队", "column2": "210", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-23 17:21:33" },
-                { "id": "10009", "column1": "训保支队", "column2": "316", "column3": "总队机关大门出口", "column4": "【不假外出】", "createTime": "2024-08-22 17:21:33" },
-            ];
+
+            function InitData() {
+
+                var ipt_seach = $("#dataTime_1").val();
+
+                $.ajax({
+                    type: "post",
+                    url: "/ashx/A_CommonHandler.ashx",
+                    data: { Action: "SelInfo", tbName: "oa_fanghuobanzhiban", columns: "org_name ZHIBAN_NAME,sum(1) COU", wheres: " date_format(zhiban_day,'%Y-%m') = '" + ipt_seach + "' GROUP BY org_name  " },
+                    dataType: "json",
+                    success: function (result) {
+
+                        dataArr = result.data;
 
                         table.render({
                             elem: '#ItemInfoList'
                             , data: dataArr
                             , cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
                             , cols: [[
-                    { field: 'column1', align: "center", title: '姓名' }
-                    , { field: 'column2', align: "center", title: '值班次数' }
+                                { field: 'ZHIBAN_NAME', align: "center", title: '营区' }
+                                , { field: 'COU', align: "center", title: '值班次数' }
                             ]]
                             , page: true
                             , limits: [5, 15, 20, 50, 999, 9999]
@@ -195,6 +198,11 @@
 
                         eacherInit();
 
+
+                    }
+                });
+            }
+
             function eacherInit() {
                 var myChart = echarts.init(document.getElementById('echarts_1'));
 
@@ -205,8 +213,8 @@
                 let data = [];
 
                 dataArr.forEach(function (item, index) {
-                    dataAxis.push(item.column1);
-                    data.push(item.column2);
+                    dataAxis.push(item.ZHIBAN_NAME);
+                    data.push(item.COU);
                 });
                 let yMax = 500;
                 let dataShadow = [];
@@ -287,6 +295,8 @@
                 myChart.setOption(option);
             }
 
+
+
         })
     </script>
     <link rel="stylesheet" href="/css/right-list.css" media="all" />

Code/智慧营区/DOCManageAPP（阿克苏）/ashx/PersonAccessHandler.ashx.cs

@@ -263,6 +263,208 @@ namespace FangYar.WebUI.ashx
             return returnstr;
         }
 
+
+        //列表数据获取
+        private string perListNew(HttpContext context)
+        {
+            string returnstr = "";
+            try
+            {
+                string OrgId = context.Request.Params["OrgId"];
+                //判断是否APP或者小程序访问
+                if (Common.WebCommonUtil.IsPhoneRequest(context))
+                {
+                    //增加上级转换机关机构数据转换
+                    OrgId = Common.WebCommonUtil.GetOrgIdUpLevelToDownLevel(OrgId);
+                }
+
+                string EmpId = context.Request.Params["EmpId"];
+                string keyword = context.Request.Params["keywords"];
+                string page = context.Request.Params["page"];
+                string limit = context.Request.Params["limit"];
+                string startTime = context.Request.Params["startTime"];
+                string endTime = context.Request.Params["endTime"];
+                string treeID = context.Request.Params["treeID"];
+                string type = context.Request.Params["type"];
+                string IS_Attendance = context.Request.Params["IS_Attendance"] + "";
+                string selDeptId = context.Request.Params["selDeptId"];
+                //登录账号所属部门
+                string DeptID = context.Request.Params["DeptID"] + "";
+                //是否管理员账号
+                string IsAdmin = context.Request.Params["IsAdmin"] + "";
+                string is_content = context.Request.Params["is_content"];//2022-09-20 重新启用包含下级查询 页面默认不勾选
+                //string is_content = context.Request.Params["is_content"];//因为数据量太多，递归查询速度太慢，所以屏蔽无法查询下级单位数据
+
+                int pageIndex = 1;
+                int pageSize = 10;
+                if (!string.IsNullOrEmpty(page)) { pageIndex = int.Parse(page); }
+                if (!string.IsNullOrEmpty(limit)) { pageSize = int.Parse(limit); }
+                string where = " 1=1 ";
+
+                if (!string.IsNullOrEmpty(treeID) && treeID != OrgId)
+                {
+                    OrgId = treeID;
+                }
+
+                //判断是否和上级营区同驻地
+                string pOrgId = "";
+
+                try
+                {
+                    //查询当前单位是否和上级单位同一驻地
+                    string sqlStr1 = " SELECT IS_TOP_CAMP,PID from fire_org WHERE ORG_ID = '" + OrgId + "' ";
+
+                    var dt1 = Common.MySqlHelper.QueryTable(sqlStr1);
+
+                    if (dt1.Rows[0]["IS_TOP_CAMP"] + "" == "1")
+                    {
+                        pOrgId = Common.WebCommonUtil.GetOrgIdUpLevelToDownLevel(dt1.Rows[0]["PID"] + "");
+
+                        //var itemOrg = OrgId;
+                        //OrgId = pOrgId;
+                        //pOrgId = itemOrg;
+
+                    }
+
+                }
+                catch (Exception ex)
+                {
+
+                }
+
+
+
+                //where = " ORG_ID = '" + OrgId + "'";
+                if (is_content == "1")
+                {
+                    where += " and ( find_in_set(org_id, cids) ) ";
+                }
+                else
+                {
+                    where += " and ( ORG_ID = '" + OrgId + "' )";
+                    ////判断是否和上级营区同驻地
+                    //if (string.IsNullOrWhiteSpace(pOrgId))
+                    //{
+                    //    where += " and ( ORG_ID = '" + OrgId + "' )";
+                    //}
+                    //else
+                    //{
+                    //    where += " and ( ORG_ID = '" + OrgId + "' or ORG_ID = '" + pOrgId + "' )";
+                    //}
+
+                }
+
+                if (!string.IsNullOrWhiteSpace(selDeptId))
+                {
+                    where += " and EMPID in ( SELECT ID from tbl_sys_emp WHERE ORG_ID='" + OrgId + "' and  DEPT_ID='" + selDeptId + "' and DEPT_ID <> '6c9972c7ef2b4388b329003738962af7' ) ";
+                }
+
+                //判断是否管理员账号，如果不是管理员则只查询本部门数据
+                if (IsAdmin != "1")
+                {
+                    if (!string.IsNullOrWhiteSpace(DeptID))
+                    {
+                        where += " and EMPID in ( SELECT ID from tbl_sys_emp WHERE ORG_ID='" + OrgId + "' and  DEPT_ID='" + DeptID + "' and DEPT_ID <> '6c9972c7ef2b4388b329003738962af7' ) ";
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(startTime))
+                {
+                    if (!startTime.Contains("请选择"))
+                    {
+                        where += " and start_time >= date_format('" + startTime + "','%Y-%m-%d %H:%i:%s')";
+                    }
+                }
+                if (!string.IsNullOrEmpty(endTime))
+                {
+                    if (!endTime.Contains("请选择"))
+                    {
+                        where += " and start_time <= date_format('" + endTime + "','%Y-%m-%d %H:%i:%s')";
+                    }
+                }
+                if (!string.IsNullOrEmpty(keyword))
+                {
+                    if (where != null)
+                    {
+                        where += " and ";
+                    }
+                    where += "( name like '%" + keyword + "%' or ADDR like '%" + keyword + "%' or EXTEND2 like '%" + keyword + "%')";
+                }
+
+                if (IS_Attendance != "1")
+                {
+                    if (string.IsNullOrWhiteSpace(pOrgId))
+                    {
+                        where += " and EXTEND3 not in (SELECT EPUIP_ID from tbl_epuip_org where ORG_ID = '" + OrgId + "' and IS_Attendance='1') ";
+                    }
+                    else
+                    {
+                        where += " and EXTEND3 not in (SELECT EPUIP_ID from tbl_epuip_org where (ORG_ID = '" + OrgId + "' or ORG_ID = '" + pOrgId + "' ) and IS_Attendance='1') ";
+                    }
+                }
+
+                if (!string.IsNullOrWhiteSpace(EmpId))
+                {
+                    where += " or EMPID = '" + EmpId + "' ";
+                }
+
+                returnstr = "{\"code\":0,\"msg\":\"\",";
+                int count = bll.GetRecordCount(where, OrgId);
+                //int count = bll.GetRecordCount(where);
+                returnstr += "\"count\":" + count + ",\"data\":";
+                if (count == 0)
+                {
+                    returnstr += "[]";
+                }
+                else
+                {
+                    //List<FangYar.Model.TBL_PERSONACCESS> list = bll.QueryList(pageIndex, pageSize, where, "");
+                    //returnstr += FangYar.Common.JsonHelper.ToJson(list);
+                    string data = "[";
+                    List<FangYar.Model.TBL_PERSONACCESS> list = bll.QueryList(pageIndex, pageSize, where, " (START_TIME) DESC ", OrgId);
+                    //List<FangYar.Model.TBL_PERSONACCESS> list = bll.QueryList(pageIndex, pageSize, where, " (START_TIME) DESC ");
+
+                    for (int i = 0; i < list.Count; i++)
+                    {
+                        string pic1 = "";
+                        string pic2 = "";
+                        if (list[i].PICTURE != null && list[i].PICTURE.ToString() != "")
+                        {
+                            pic1 = Convert.ToBase64String((byte[])list[i].PICTURE);
+                        }
+                        if (list[i].CLOSEUP_PIC != null && list[i].CLOSEUP_PIC.ToString() != "")
+                        {
+                            pic2 = Convert.ToBase64String((byte[])list[i].CLOSEUP_PIC);
+                        }
+
+                        data += "{\"ID\":\"" + list[i].ID + "\",\"NAME\":\"" + list[i].NAME.Replace("\0", "") + "\",\"EMPID\":\"" + list[i].EMPID + "\",\"SEX\":\"" + list[i].SEX + "\",\"PROF\":\"" + list[i].PROF + "\",\"START_TIMESTAMP\":\"" + list[i].START_TIMESTAMP + "\",\"START_TIME\":\"" + list[i].START_TIME + "\",";
+                        data += "\"CAMERA_ID\":\"" + list[i].CAMERA_ID + "\",\"ORG_ID\":\"" + list[i].ORG_ID + "\",\"INOROUT\":\"" + list[i].INOROUT + "\",\"ADDR\":\"" + list[i].ADDR + "\",\"ORG_NAME\":\"" + list[i].ORG_NAME + "\",";
+                        data += "\"EXTEND1\":\"" + list[i].EXTEND1 + "\",\"EXTEND2\":\"" + list[i].EXTEND2 + "\",\"EXTEND3\":\"" + list[i].EXTEND3 + "\",\"EXTEND4\":\"" + list[i].EXTEND4 + "\",";
+                        data += "\"CLOSEUP_PIC_URL\":\"" + list[i].CLOSEUP_PIC_URL + "\",";
+                        data += "\"PICTURE\":\"" + pic1 + "\",\"CLOSEUP_PIC\":\"" + pic2 + "\"}";
+
+                        if (i != list.Count - 1)
+                        {
+                            data += ",";
+                        }
+                    }
+                    returnstr += data + "]";
+                }
+
+                returnstr += "}";
+            }
+            catch (Exception e)
+            {
+                returnstr = "{\"code\":0,\"msg\":\"\",\"count\":0,\"data\":[]}";
+                // 记录操作日志
+                BLL.SysOperationLogHelp.AddSysOperationLog(context, Common.EnumOperationLogType.Error, "人员出入操作请求", "列表数据获取异常：" + e);
+            }
+            // 记录操作日志
+            BLL.SysOperationLogHelp.AddSysOperationLog(context, Common.EnumOperationLogType.Query, "人员出入操作请求", "列表数据获取");
+            return returnstr;
+        }
+
+
         //查询
         private string APPCountList(HttpContext context)
         {