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 @@
+
+
+
+
+
+
+
+
+
+