From 729e47e5aa77d73914de4353e95f56350611f820 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 14 四月 2025 10:50:55 +0800
Subject: [PATCH] Merge branch 'main' of http://182.92.203.7:2001/r/OAManage
---
app/user/view/attendance/index.html | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 101 insertions(+), 11 deletions(-)
diff --git a/app/user/view/attendance/index.html b/app/user/view/attendance/index.html
index 5bdd46c..62914e5 100644
--- a/app/user/view/attendance/index.html
+++ b/app/user/view/attendance/index.html
@@ -5,11 +5,6 @@
<table class="layui-hide" id="test" lay-filter="test"></table>
</div>
-<script type="text/html" id="status">
- <i
- class="layui-icon {{# if(d.status == 1){ }}green layui-icon-ok{{# } else { }}yellow layui-icon-close{{# } }}"
- ></i>
-</script>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" lay-event="add">+ 娣诲姞鑰冨嫟缁�</button>
@@ -44,23 +39,114 @@
cols: [
[
{
- field: "title",
+ field: "name",
title: "鍚嶇О",
- align: "center"
+ align: "center",
+ width: 300
},
{
field: "peopleNum",
title: "浜烘暟",
- width: 120
+ width: 120,
+ templet: function (d) {
+ var users = d.linkUserDate.filter((item) => item.type == "1");
+ return users.length;
+ }
},
{
field: "type",
title: "绫诲瀷",
- width: 120
+ width: 120,
+ templet: function (d) {
+ if (d.type == "1") {
+ return "鍥哄畾鐝埗";
+ }
+ if (d.type == "2") {
+ return "鑷敱宸ユ椂";
+ }
+ }
},
{
field: "time",
- title: "鑰冨嫟鏃堕棿"
+ title: "鑰冨嫟鏃堕棿",
+ templet: function (d) {
+ // 鎸夌収鐝鍒嗙粍
+ var planMap = {};
+ Object.keys(d.work_plan).forEach((key) => {
+ var item = d.work_plan[key];
+ var showTxt = "";
+ var index = 0;
+ if (key.indexOf("mon_") > -1) {
+ showTxt = "鍛ㄤ竴";
+ index = 1;
+ }
+ if (key.indexOf("tue_") > -1) {
+ showTxt = "鍛ㄤ簩";
+ index = 2;
+ }
+ if (key.indexOf("wed_") > -1) {
+ showTxt = "鍛ㄤ笁";
+ index = 3;
+ }
+ if (key.indexOf("thur_") > -1) {
+ showTxt = "鍛ㄥ洓";
+ index = 4;
+ }
+ if (key.indexOf("fri_") > -1) {
+ showTxt = "鍛ㄤ簲";
+ index = 5;
+ }
+ if (key.indexOf("sat_") > -1) {
+ showTxt = "鍛ㄥ叚";
+ index = 6;
+ }
+ if (key.indexOf("sun_") > -1) {
+ showTxt = "鍛ㄦ棩";
+ index = 7;
+ }
+ if (item.id) {
+ if (!planMap[item.id])
+ planMap[item.id] = { showTxt: [], index: null };
+ planMap[item.id].times = item.times;
+ planMap[item.id].showTxt.push(showTxt);
+ if (planMap[item.id].index) {
+ if (planMap[item.id].index > index)
+ planMap[item.id].index = index;
+ } else {
+ planMap[item.id].index = index;
+ }
+ } else {
+ if (!planMap["null"]) planMap["null"] = { showTxt: [], index: 999 };
+ planMap.null.showTxt.push(showTxt);
+ }
+ });
+
+ // 鏍规嵁鐝鍒嗙被鏄剧ず鏃堕棿锛屽苟涓旀牴鎹懆涓�鍒板懆鏃ユ帓搴忥紝浼戞伅鏀惧湪鏈�鍚�
+ var infoList = [];
+ Object.keys(planMap).forEach((key) => {
+ infoList.push(planMap[key])
+ });
+ infoList.sort((a, b) => a.index - b.index);
+ console.log(infoList, "infoList");
+ var html_ = "";
+ for (let i = 0; i < infoList.length; i++) {
+ const infoItem = infoList[i];
+ html_ +=
+ "<p>" +
+ infoItem.showTxt.join("銆�") +
+ "锛�" +
+ (infoItem.times && infoItem.times.length > 0
+ ? infoItem.times.map(
+ (item) => item.begin_time + " - " + item.end_time
+ )
+ : "浼戞伅") +
+ "</p>";
+ }
+
+ console.log(html_);
+
+ return html_;
+ }
},
{
field: "right",
@@ -101,7 +187,11 @@
obj.del();
}
};
- tool.delete("/user/attendance/delete", { id: obj.data.id }, callback);
+ tool.delete(
+ "/user/attendance/delete",
+ { id: obj.data.id },
+ callback
+ );
layer.close(index);
}
);
--
Gitblit v1.9.1