From 26ee948a990931ea3a0e7b0aedf9dc29803a7767 Mon Sep 17 00:00:00 2001 From: 1790429840 <1790429840@qq.com> Date: Wed, 2 Oct 2024 16:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZHYQ/OracleDAL/OA/OA_TOLERANCE.cs | 4 + .../DocManageAPP.csproj | 13 + .../OA/Exercise/Plan/PlanItem.js | 34 +- .../OA/Meeting2/MeetNewList.html | 208 ++++++++++++ .../OA/PAccess/PAccessList.js | 22 +- .../OA/PERFORMANCE/BASIC/index.js | 15 + .../OA/PERFORMANCE/RECORD/RecordList.js | 21 +- .../OA/ReportLocation/OaLeaveAdd.html | 243 ++++++++++++++ .../OA/ReportLocation/OaLeaveAudit.js | 2 +- .../OA/ReportLocation/OaLeaveList.html | 6 +- .../OA/ReportLocation/OaLeaveList.js | 61 +++- .../OA/Tolerance/ToleranceAdd.html | 243 ++++++++++++++ .../OA/Tolerance/ToleranceAudit.js | 90 +----- .../OA/Tolerance/ToleranceListOrg.html | 1 + .../OA/Tolerance/ToleranceListOrg.js | 69 ++-- .../OA/Tree/visIntree.html | 150 +++++---- .../OA/Visitor/VisitorList.js | 12 +- .../OA/VisitorReg/VisitorRegItem.html | 70 +++- .../OA/VisitorReg/VisitorRegItem.js | 37 ++- .../OA/VisitorReg/VisitorRegList.html | 6 +- .../OA/VisitorReg/VisitorRegList.js | 54 ++-- .../TempPage/Device/DeviceBuySpeedList.html | 2 +- .../Device/DeviceDispatchInfoList.html | 2 +- .../TempPage/Emp/EmpAttendAdd.html | 103 ++++-- .../TempPage/Emp/EmpAttendApprowalList.html | 288 +++++++++++++++++ .../TempPage/Emp/EmpAttendEdit.html | 76 ++++- .../TempPage/Emp/EmpAttendList.html | 172 +++++----- .../TempPage/Emp/EmpDutySta.html | 82 ++--- .../TempPage/Emp/EmpDutySuppApproList.html | 137 +++----- .../TempPage/Emp/EmpDutySupplAdd.html | 66 ++-- .../TempPage/Emp/EmpDutySupplEdit.html | 45 ++- .../TempPage/Emp/EmpDutySupplList.html | 160 +++++---- .../TempPage/Emp/EmpDutyUpdAdd.html | 151 +++++---- .../TempPage/Emp/EmpDutyUpdApproList.html | 99 +++--- .../TempPage/Emp/EmpDutyUpdEdit.html | 127 +++++--- .../TempPage/Emp/EmpDutyUpdList.html | 158 +++++---- .../TempPage/Emp/EmpTrainAdd.html | 116 ++++--- .../TempPage/Emp/EmpTrainEdit.html | 107 +++--- .../TempPage/Emp/EmpTrainList.html | 148 +++++---- .../TempPage/Emp/EmpZhiBanDangRiAdd.html | 151 +++++++++ .../TempPage/Emp/EmpZhiBanDangRiEdit.html | 158 +++++++++ .../TempPage/Emp/EmpZhiBanDangRiList.html | 304 ++++++++++++++++++ .../TempPage/Emp/EmpZhiBanDangRiPage.html | 290 +++++++++++++++++ .../TempPage/Emp/EmpZhiBanFangHuoAdd.html | 147 +++++++++ .../TempPage/Emp/EmpZhiBanFangHuoEdit.html | 136 ++++++++ .../TempPage/Emp/EmpZhiBanFangHuoList.html | 291 +++++++++++++++++ .../TempPage/Emp/EmpZhiBanFangHuoPage.html | 258 +++++++++++++++ .../TempPage/Emp/OrgDutySta.html | 78 +++-- .../ashx/PersonAccessHandler.ashx.cs | 202 ++++++++++++ .../CampOpenWebAPI/obj/Debug/build.force | 0 .../LibFengHuoAPI/obj/Debug/build.force | 0 .../LibDiningXZZD/obj/Debug/build.force | 0 52 files changed, 4339 insertions(+), 1076 deletions(-) create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/OA/Meeting2/MeetNewList.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveAdd.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceAdd.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendApprowalList.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiAdd.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiEdit.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiList.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiPage.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoAdd.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoEdit.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoList.html create mode 100644 Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoPage.html delete mode 100644 Code/智慧营区/营区OpenAPI/CampOpenWebAPI/obj/Debug/build.force delete mode 100644 Code/智慧营区/营区OpenAPI/WebAPILib/烽火项目对接/LibFengHuoAPI/obj/Debug/build.force delete mode 100644 Code/智慧营区/营区OpenAPI/WebAPILib/西藏总队餐厅/LibDiningXZZD/obj/Debug/build.force diff --git a/Code/ClassLib/ZHYQ/OracleDAL/OA/OA_TOLERANCE.cs b/Code/ClassLib/ZHYQ/OracleDAL/OA/OA_TOLERANCE.cs index ae995da..d1e1e8c 100644 --- a/Code/ClassLib/ZHYQ/OracleDAL/OA/OA_TOLERANCE.cs +++ b/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()); } diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/DocManageAPP.csproj b/Code/智慧营区/DOCManageAPP(阿克苏)/DocManageAPP.csproj index 60a147b..a389f22 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/DocManageAPP.csproj +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/DocManageAPP.csproj @@ -2776,13 +2776,17 @@ + + + + @@ -4468,10 +4472,19 @@ + + + + + + + + + diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Exercise/Plan/PlanItem.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Exercise/Plan/PlanItem.js index cc359d3..19032e1 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Exercise/Plan/PlanItem.js +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Exercise/Plan/PlanItem.js @@ -52,24 +52,24 @@ layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () { laydate.render({ elem: '#REPORT_TIME', type: 'time' - , trigger: 'click' + , trigger: 'click' }); laydate.render({ elem: '#S_TIME', type: 'time' - , trigger: 'click' + , trigger: 'click' }); laydate.render({ elem: '#M_TIME', type: 'time' - , trigger: 'click' + , trigger: 'click' , change: function (value, date, endDate) { var s_time = $("#S_TIME").val(); if (s_time == "") { layer.msg("起始时间未选择!"); } - else if (new Date("2000-01-01 " + s_time) >= new Date("2000-01-01 " +value)){ + else if (new Date("2000-01-01 " + s_time) >= new Date("2000-01-01 " + value)) { layer.msg("所选时间早于起始时间,请重新选择!"); } } @@ -77,13 +77,13 @@ layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () { laydate.render({ elem: '#E_TIME', type: 'time' - , trigger: 'click' + , trigger: 'click' , change: function (value, date, endDate) { var m_time = $("#M_TIME").val(); if (m_time == "") { layer.msg("起始时间未选择!"); } - else if (new Date("2000-01-01 " + m_time) >= new Date("2000-01-01 " +value)) { + else if (new Date("2000-01-01 " + m_time) >= new Date("2000-01-01 " + value)) { layer.msg("所选时间早于节点时间,请重新选择!"); } } @@ -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,16 +186,23 @@ 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; } - if (new Date("2000-01-01 " + m_time) >= new Date("2000-01-01 " +e_time)) { + if (new Date("2000-01-01 " + m_time) >= new Date("2000-01-01 " + e_time)) { 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(); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Meeting2/MeetNewList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Meeting2/MeetNewList.html new file mode 100644 index 0000000..ee6116e --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Meeting2/MeetNewList.html @@ -0,0 +1,208 @@ + + + + + 会议列表 + + + + + + + + + + + + + + + + +
+
机构目录
+
+
    +
    +
    +
    + +
    + +
    + +
    + 导入 + +
    + + +
    + +
    + + + + + + + + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PAccess/PAccessList.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PAccess/PAccessList.js index 3d85022..c9e3d58 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PAccess/PAccessList.js +++ b/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 + '(编号异常请联系管理员)'; - } - 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" } ]] }); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PERFORMANCE/BASIC/index.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PERFORMANCE/BASIC/index.js index 67cea15..baa0664 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PERFORMANCE/BASIC/index.js +++ b/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; + } //搜索 diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PERFORMANCE/RECORD/RecordList.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PERFORMANCE/RECORD/RecordList.js index 2b761ee..057ef6b 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/PERFORMANCE/RECORD/RecordList.js +++ b/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 "
    " + d.FRACTION_SUM + ""; @@ -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'; @@ -101,7 +118,7 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () { maxmin: true, content: "RecordItem.html", success: function (layero, index) { - + } }) window.sessionStorage.setItem("index", index); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveAdd.html b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveAdd.html new file mode 100644 index 0000000..47d2592 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveAdd.html @@ -0,0 +1,243 @@ + + + + + 添加--报警信息 + + + + + + + + + + + + + + + + + + +
    +
    + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + + +
    +
    + +
    +
    +
    +
    + + + + + diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveAudit.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveAudit.js index f816630..89abc3e 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveAudit.js +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveAudit.js @@ -84,7 +84,7 @@ li += "

    发起时间:" + obj.COMPLETEDTIME1 + "

    "; } } else { - li += "

    处理人:" + obj.RECEIVENAME + "

    "; + li += "

    审批人:" + obj.RECEIVENAME + "

    "; if (obj.COMPLETEDTIME1 != "") { li += "

    审批时间:" + obj.COMPLETEDTIME1 + "

    "; li += "

    审批意见:" + obj.COMMENT2 + "

    "; diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveList.html index 8d3fb46..9f52b98 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/ReportLocation/OaLeaveList.html @@ -12,8 +12,10 @@ + + + + +
    +
    + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + + +
    +
    + +
    +
    +
    +
    + + + + + diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceAudit.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceAudit.js index a47b08f..1f894a2 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceAudit.js +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceAudit.js @@ -85,7 +85,7 @@ li += "

    发起时间:" + obj.COMPLETEDTIME1 + "

    "; } } else { - li += "

    处理人:" + obj.RECEIVENAME + "

    "; + li += "

    审批人:" + obj.RECEIVENAME + "

    "; if (obj.COMPLETEDTIME1 != "") { li += "

    审批时间:" + obj.COMPLETEDTIME1 + "

    "; li += "

    审批意见:" + obj.COMMENT2 + "

    "; @@ -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(); }) \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceListOrg.html b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceListOrg.html index 704e41c..b55dd2c 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceListOrg.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceListOrg.html @@ -47,6 +47,7 @@
    搜索 + 添加
    导入 diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceListOrg.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceListOrg.js index 9abc30e..c885410 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tolerance/ToleranceListOrg.js +++ b/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]); + ////提交信息 + //$.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); } - reload(); - layer.close(index); }); + }); } diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tree/visIntree.html b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tree/visIntree.html index 5cc3f0b..b36e3cf 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tree/visIntree.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Tree/visIntree.html @@ -1,76 +1,90 @@  - - 系统中心--方亚权限资源管理系统 - - - - - - - - + + 系统中心--方亚权限资源管理系统 + + + + + + + + -
    -
      -
    - - - +
    +
      +
    + + + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Visitor/VisitorList.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Visitor/VisitorList.js index 7bb503b..295be0a 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/Visitor/VisitorList.js +++ b/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" } ]] }); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegItem.html b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegItem.html index 0444c0e..edd3e09 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegItem.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegItem.html @@ -1,66 +1,102 @@  - + 添加--菜单管理 - - - - - - + + + + + +
    - +
    + 登记人姓名 +
    + 电话 +
    - +
    + 公司 + +
    + +
    +
    +
    + +
    + +
    + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + 大约访问时长 +
    + 被访问人 +
    - +
    + + diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegItem.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegItem.js index 84195de..f73b395 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegItem.js +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegItem.js @@ -1,11 +1,26 @@ layui.use(['form', 'layer', 'table', 'laytpl', 'laydate'], function () { var form = layui.form, - layer = parent.layer === undefined ? layui.layer : top.layer, - $ = layui.jquery, - laytpl = layui.laytpl, - table = layui.table; + layer = parent.layer === undefined ? layui.layer : top.layer, + $ = layui.jquery, + 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", { diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegList.html index 093ef39..31ac870 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegList.html @@ -47,18 +47,20 @@
    搜索 - +
    diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegList.js b/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegList.js index e5237c2..bd9bbae 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/OA/VisitorReg/VisitorRegList.js +++ b/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 '
    审批中
    '; - // } else if (d.STATE == "1") { - // return '
    审批通过
    '; - // } else if (d.STATE == "2") { - // return '
    审批未通过
    '; - // } - // else { - // return '
    '; - // } - // } - //}, { 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') {//查看 - audit(data); - } else if (layEvent == 'edit') {//处理 - audit(data); + switch (layEvent) { + //查看 + case 'audit': + audit(data); + 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; } }) diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Device/DeviceBuySpeedList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Device/DeviceBuySpeedList.html index 4c9ba1b..c917edf 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Device/DeviceBuySpeedList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Device/DeviceBuySpeedList.html @@ -190,7 +190,7 @@ //console.log(d); var htmlStr = ' ' + ' ' + - ' '; + ' '; return htmlStr; } } diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Device/DeviceDispatchInfoList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Device/DeviceDispatchInfoList.html index c524e2a..eec2452 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Device/DeviceDispatchInfoList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Device/DeviceDispatchInfoList.html @@ -226,7 +226,7 @@ //console.log(d); var htmlStr = ' ' + ' ' + - ' '; + ' '; return htmlStr; } } diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendAdd.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendAdd.html index 71bab72..41ffd04 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendAdd.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendAdd.html @@ -17,6 +17,7 @@ + + -
    -
    - 信息 -
    + background: rgba(12, 70, 100, 0.8); + padding: 20px; + box-sizing: border-box; + "> +
    - - +
    - +
    @@ -68,43 +111,45 @@ 时间
    - +
    - +
    - + +
    +
    +
    + +
    +
    - + 保存
    -
    -
    -
    - 流转信息 -
    -
      - -
      - + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendApprowalList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendApprowalList.html new file mode 100644 index 0000000..4a7494c --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendApprowalList.html @@ -0,0 +1,288 @@ + + + + + 人员考勤补卡 + + + + + + + + + + + + + + + + +
      +
      机构目录
      +
      +
        +
        +
        +
        + +
        + +
        + + + +
        + +
        + + + + + + + + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendEdit.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendEdit.html index 440e1d8..8dd278d 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendEdit.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendEdit.html @@ -17,6 +17,7 @@ + + + background: rgba(12, 70, 100, 0.8); + padding: 20px; + box-sizing: border-box; + ">
        信息
        - - +
        - +
        @@ -68,29 +103,42 @@ 时间
        - +
        - +
        +
        + +
        +
        +
        +
        - +
        - + 保存
        @@ -116,4 +164,4 @@
        - + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendList.html index 0a8951e..661d32d 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpAttendList.html @@ -52,9 +52,9 @@
        - +
        - +
        导入 @@ -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,60 +135,64 @@ } }); + + 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" }, - ]; - - table.render({ - elem: '#ItemInfoList' - , data: dataArr - , 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: 'cz', align: "center", title: '操作', templet: function (d) { - //console.log(d); - var htmlStr = ' ' + - ' ' + - ' '; - return htmlStr; - } - } - ]] - , page: true - , limits: [10, 15, 20, 50, 999, 9999] - , toolbar: true - , defaultToolbar: ['filter', 'print', 'exports'] - , limit: 15 - }); + 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", title: '操作', width: 170, templet: function (d) { + //console.log(d); + var htmlStr = ' ' + + ' ' + + ' '; + 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) { @@ -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,19 +272,28 @@ $("#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, area: [clientWidth, clientHeight], maxmin: true, content: "EmpAttendAdd.html", - success: function (layero, index) { + success: function (layero, index) { + } + , end: function () { + // 弹窗关闭的回调 + // 这里可以执行关闭后的操作 + InitTable(); } }); }); + $("#btn_seach").click(function () { + InitTable(); + }); + }); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySta.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySta.html index bfaf519..be9d373 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySta.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySta.html @@ -80,7 +80,7 @@ diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySuppApproList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySuppApproList.html index 52313a7..79691a6 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySuppApproList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySuppApproList.html @@ -52,13 +52,13 @@
        - +
        - +
        - +
        @@ -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,61 +128,51 @@ } }); + 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" }, - ]; - - table.render({ - elem: '#ItemInfoList' - , data: dataArr - , 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: 'cz', align: "center", title: '操作', templet: function (d) { - //console.log(d); - var htmlStr = '
        ' + - ' ' + - ' '; - return htmlStr; - } - } - ]] - , page: true - , limits: [10, 15, 20, 50, 999, 9999] - , toolbar: true - , defaultToolbar: ['filter', 'print', 'exports'] - , limit: 15 - }); + function InitTable() { + + var keys = $("#ipt_seach").val(); + + table.render({ + elem: '#ItemInfoList' + , 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: '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); + var htmlStr = ' ' + + ' ' + + ' '; + 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; @@ -217,13 +193,13 @@ 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(); - + } }); break; @@ -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(); }); }); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplAdd.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplAdd.html index 1e772e9..edd8eff 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplAdd.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplAdd.html @@ -42,16 +42,38 @@ width: 100px; } + - - -
        -
        -
        - 流转信息 -
        -
          - -
          diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplEdit.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplEdit.html index 7005d2a..75265a3 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplEdit.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplEdit.html @@ -42,25 +42,42 @@ width: 100px; } + - +
          信息
          - - +
          - +
          @@ -68,29 +85,29 @@ 时间
          - +
          - +
          - +
          - + 保存
          diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplList.html index db9e82c..00cb904 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutySupplList.html @@ -38,11 +38,7 @@ } - +
          机构目录
          @@ -52,9 +48,9 @@
          - +
          - +
          导入 @@ -63,7 +59,7 @@
          - +
          @@ -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,60 +131,47 @@ } }); + 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" }, - ]; - - table.render({ - elem: '#ItemInfoList' - , data: dataArr - , 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: 'cz', align: "center", title: '操作', templet: function (d) { - //console.log(d); - var htmlStr = ' ' + - ' ' + - ' '; - return htmlStr; - } + function InitTable() { + var keys = $("#ipt_seach").val(); + + table.render({ + elem: '#ItemInfoList' + , 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 + "%' " } - ]] - , page: true - , limits: [10, 15, 20, 50, 999, 9999] - , toolbar: true - , defaultToolbar: ['filter', 'print', 'exports'] - , limit: 15 - }); - + , cellMinWidth: 80 + , cols: [[ + //{ field: 'id', align: "center", title: 'ID', sort: true } + { 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); + var htmlStr = ' ' + + ' ' + + ' '; + 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) { @@ -222,13 +193,13 @@ 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(); - + } }); break; @@ -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,15 +258,20 @@ 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(); + }); + }); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdAdd.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdAdd.html index d051cd0..0cdc6d6 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdAdd.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdAdd.html @@ -42,77 +42,112 @@ width: 100px; } + -
          -
          - 信息 -
          -
          - - -
          - -
          - -
          +
          +
          + +
          + +
          +
          +
          + +
          + +
          +
          +
          + +
          +
          -
          - -
          - -
          +
          +
          + +
          +
          -
          - -
          - -
          +
          +
          + +
          +
          -
          - -
          - -
          +
          +
          + +
          +
          -
          - -
          - -
          +
          + + +
          + +
          +
          +
          -
          -
          - -
          +
          +
          +
          - -
          -
          -
          -
          - 流转信息 -
          -
            - +
            diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdApproList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdApproList.html index d018346..33562fe 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdApproList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdApproList.html @@ -142,59 +142,46 @@ } }); + + 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" }, - ]; - - table.render({ - elem: '#ItemInfoList' - , data: dataArr - , 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: 'cz', align: "center", title: '操作', templet: function (d) { - //console.log(d); - var htmlStr = '
            ' + - ' ' + - ' '; - return htmlStr; + + function InitTable() { + table.render({ + elem: '#ItemInfoList' + , url: '/ashx/A_CommonHandler.ashx' + , where: { Action: 'SelInfoPage', tbName: "oa_huanban", random: new Date().getTime(), wheres: "" } + , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 新增 + , cols: [[ + { 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); + var htmlStr = ' ' + + ' ' + + ' '; + return htmlStr; + } } - } - ]] - , page: true - , limits: [10, 15, 20, 50, 999, 9999] - , toolbar: true - , defaultToolbar: ['filter', 'print', 'exports'] - , limit: 15 - }); + ]] + , page: true + , limits: [10, 15, 20, 50, 999, 9999] + , toolbar: true + , 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"); } }); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdEdit.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdEdit.html index cd7f2a4..057eaa7 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdEdit.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdEdit.html @@ -42,66 +42,97 @@ width: 100px; } + - +
            信息
            -
            - - -
            - -
            - -
            + +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            + +
            +
            +
            + +
            +
            +
            +
            + +
            + +
            +
            -
            -
            - -
            +
            +
            +
            - +
            diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdList.html index 66d9860..655d479 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpDutyUpdList.html @@ -52,9 +52,9 @@
            - +
            - +
            导入 @@ -63,7 +63,7 @@
            - +
            @@ -147,73 +147,66 @@ } }); + 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" }, - ]; - - table.render({ - elem: '#ItemInfoList' - , data: dataArr - , 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: 'cz', align: "center", title: '操作', templet: function (d) { - //console.log(d); - var htmlStr = '
            ' + - ' ' + - ' '; - return htmlStr; - } + + + + function InitTable() { + + var keys = $("#ipt_seach").val(); + + table.render({ + elem: '#ItemInfoList' + , 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 + "%' " } - ]] - , page: true - , limits: [10, 15, 20, 50, 999, 9999] - , toolbar: true - , defaultToolbar: ['filter', 'print', 'exports'] - , limit: 15 - }); + , cellMinWidth: 80 + , cols: [[ + { 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); + var htmlStr = ' ' + + ' ' + + ' '; + 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.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,15 +286,20 @@ 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(); + }); + }); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainAdd.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainAdd.html index 4962d3f..660fb77 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainAdd.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainAdd.html @@ -42,6 +42,39 @@ width: 100px; } +
            -
            - - -
            - -
            - -
            + +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            +
            -
            -
            - -
            +
            +
            +
            - +
            diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainEdit.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainEdit.html index 4962d3f..2d55009 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainEdit.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainEdit.html @@ -42,6 +42,29 @@ width: 100px; } +
            -
            - - -
            - -
            - -
            + + +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            -
            - -
            - -
            +
            +
            + +
            +
            +
            -
            -
            - -
            +
            +
            +
            - +
            diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainList.html index 25e5a2b..a1fcd61 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainList.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpTrainList.html @@ -52,9 +52,9 @@
            - +
            - +
            导入 @@ -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,60 +135,53 @@ } }); + 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" }, - ]; - - table.render({ - elem: '#ItemInfoList' - , data: dataArr - , 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: 'cz', align: "center", title: '操作', templet: function (d) { - //console.log(d); - var htmlStr = ' ' + - ' ' + - ' '; - return htmlStr; - } + function InitTable() { + table.render({ + elem: '#ItemInfoList' + , 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 + "' " + } - ]] - , page: true - , limits: [10, 15, 20, 50, 999, 9999] - , toolbar: true - , defaultToolbar: ['filter', 'print', 'exports'] - , limit: 15 - }); + , cellMinWidth: 80 //全局定义常规单元格的最小宽度,layui 2.2.1 新增 + , cols: [[ + //{ 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 = ' ' + + ' ' + + ' '; + return htmlStr; + } + } + ]] + , page: true + , limits: [10, 15, 20, 50, 999, 9999] + , toolbar: true + , 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; @@ -271,7 +259,15 @@ area: [clientWidth, clientHeight], maxmin: true, content: "EmpTrainAdd.html", - success: function (layero, index) { + success: function (layero, index) { + var body = layui.layer.getChildFrame('body', index); + body.find("#OrgId").val(selTreeID); + } + , end: function () { + // 弹窗关闭的回调 + // 这里可以执行关闭后的操作 + console.log('弹窗已关闭'); + InitTable(); } }); diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiAdd.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiAdd.html new file mode 100644 index 0000000..d10c0bf --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiAdd.html @@ -0,0 +1,151 @@ + + + + + 添加--报警信息 + + + + + + + + + + + + + + + + + + +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            + +
            +
            + +
            +
            +
            + + diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiEdit.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiEdit.html new file mode 100644 index 0000000..02294a5 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiEdit.html @@ -0,0 +1,158 @@ + + + + + 添加--报警信息 + + + + + + + + + + + + + + + + + + +
            +
            + 信息 +
            + +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            +
            + +
            + +
            +
            + +
            +
            + +
            +
            +
            +
            +
            +
            + 流转信息 +
            +
              +
            • + +
              +

              【已处理】  步骤:信息创建

              +
              +
            • +
            • + +
              +

              【待处理】  步骤:审批

              +
              +
            • +
            +
            + + diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiList.html new file mode 100644 index 0000000..f1fcf06 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiList.html @@ -0,0 +1,304 @@ + + + + + 当日值班 + + + + + + + + + + + + + + + + +
            +
            机构目录
            +
            +
              +
              +
              +
              + +
              + +
              + + +
              + 导入 + +
              + + +
              + +
              + + + + + + + + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiPage.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiPage.html new file mode 100644 index 0000000..af673c6 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanDangRiPage.html @@ -0,0 +1,290 @@ + + + + + 当日值班 + + + + + + + + + + + + + + + + +
              +
              机构目录
              +
              +
                +
                +
                +
                + +
                + +
                + + + +
                + +
                + + + + + + + + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoAdd.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoAdd.html new file mode 100644 index 0000000..52f7488 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoAdd.html @@ -0,0 +1,147 @@ + + + + + 添加--报警信息 + + + + + + + + + + + + + + + + + + + +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                + +
                +
                + +
                +
                +
                + + diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoEdit.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoEdit.html new file mode 100644 index 0000000..c17bd38 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoEdit.html @@ -0,0 +1,136 @@ + + + + + 添加--报警信息 + + + + + + + + + + + + + + + + + + + +
                + +
                + +
                + +
                +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                +
                + +
                + +
                +
                + +
                +
                + +
                +
                +
                + + diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoList.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoList.html new file mode 100644 index 0000000..2009975 --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoList.html @@ -0,0 +1,291 @@ + + + + + 防火值班 + + + + + + + + + + + + + + + + +
                +
                机构目录
                +
                +
                  +
                  +
                  +
                  + +
                  + +
                  + + +
                  + 导入 + +
                  + + +
                  + +
                  + + + + + + + + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoPage.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoPage.html new file mode 100644 index 0000000..44c651c --- /dev/null +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/EmpZhiBanFangHuoPage.html @@ -0,0 +1,258 @@ + + + + + 防火值班 + + + + + + + + + + + + + + + + +
                  +
                  机构目录
                  +
                  +
                    +
                    +
                    +
                    + +
                    + +
                    + + +
                    + +
                    + + + + + + + + \ No newline at end of file diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/OrgDutySta.html b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/OrgDutySta.html index 3e79d02..420fb20 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/OrgDutySta.html +++ b/Code/智慧营区/DOCManageAPP(阿克苏)/TempPage/Emp/OrgDutySta.html @@ -3,7 +3,7 @@ - 营区值班统计 + 人员值班统计 @@ -80,7 +80,7 @@ diff --git a/Code/智慧营区/DOCManageAPP(阿克苏)/ashx/PersonAccessHandler.ashx.cs b/Code/智慧营区/DOCManageAPP(阿克苏)/ashx/PersonAccessHandler.ashx.cs index 66c57c3..4d9d814 100644 --- a/Code/智慧营区/DOCManageAPP(阿克苏)/ashx/PersonAccessHandler.ashx.cs +++ b/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 list = bll.QueryList(pageIndex, pageSize, where, ""); + //returnstr += FangYar.Common.JsonHelper.ToJson(list); + string data = "["; + List list = bll.QueryList(pageIndex, pageSize, where, " (START_TIME) DESC ", OrgId); + //List 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) { diff --git a/Code/智慧营区/营区OpenAPI/CampOpenWebAPI/obj/Debug/build.force b/Code/智慧营区/营区OpenAPI/CampOpenWebAPI/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/Code/智慧营区/营区OpenAPI/WebAPILib/烽火项目对接/LibFengHuoAPI/obj/Debug/build.force b/Code/智慧营区/营区OpenAPI/WebAPILib/烽火项目对接/LibFengHuoAPI/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/Code/智慧营区/营区OpenAPI/WebAPILib/西藏总队餐厅/LibDiningXZZD/obj/Debug/build.force b/Code/智慧营区/营区OpenAPI/WebAPILib/西藏总队餐厅/LibDiningXZZD/obj/Debug/build.force deleted file mode 100644 index e69de29..0000000