From 6029d9cca9e132c4ba7a64cefe3db5eeaaecdf74 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 07 十一月 2025 09:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/项目管理/报表分析/PM_WorkTaskReportMonthSumReport.html | 102 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 86 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_WorkTaskReportMonthSumReport.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_WorkTaskReportMonthSumReport.html"
index 2897cbf..2f1d8d0 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_WorkTaskReportMonthSumReport.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_WorkTaskReportMonthSumReport.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>鏈堝害姹囨姤缁熻鎶ヨ〃</title>
@@ -22,6 +23,7 @@
}
</style>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -39,7 +41,8 @@
<div class="layui-inline">
<label class="layui-form-label">鑱屽憳</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
+ <input type="text" class="layui-input" name="HEmpName" id="HEmpName"
+ style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -50,7 +53,8 @@
</select>
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -69,6 +73,8 @@
</div>
</div>
</div>
+
+ </script>
<script>
//#region 鎶樺彔娉ㄩ噴
//#endregion
@@ -76,9 +82,9 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
-
- //#region 鍏叡鍙橀噺
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -87,6 +93,7 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
+ , util = layui.util
var sDate = Format(new Date(), "yyyy-MM-dd")
var sWhere = "";
var option = [];
@@ -94,9 +101,9 @@
var columns = "";
var HModName = "PM_ProjectWorkDaysSumReport";
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
- //#endregion
+ //#endregion
- //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -106,7 +113,7 @@
//鑾峰彇缁勭粐
Organ();
//鍒濆鍖栬〃鍗曟椂闂�
- set_InitDate();
+ set_InitDate();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
@@ -129,7 +136,7 @@
});
}
//閫夋嫨鏈堜唤鍗抽�変腑鍏抽棴 骞翠唤鎵斿彲浠ュ乏鍙崇偣鍑婚�夋嫨
- ,change: function (value, date, endDate) { //鐩戝惉鏃ユ湡琚垏鎹�
+ , change: function (value, date, endDate) { //鐩戝惉鏃ユ湡琚垏鎹�
lay('#HDate').val(value);
sDate = Format($("#HDate").val() + "-01", "yyyy-MM-dd");
$('.laydate-month-list').on('click', 'li', function () {//鍒╃敤鐨勪簨浠跺鎵�
@@ -285,9 +292,9 @@
}
//#endregion
- //#endregion
+ //#endregion
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//#region 宸ュ叿鏍忎簨浠�
table.on('toolbar(mainTable)', function (obj) {
@@ -314,11 +321,45 @@
});
//#endregion
+ //#region 鍗曞厓鏍煎崟鍑讳簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ let index = obj.index
+ let $elem = $(this) // 鑾峰彇鐐瑰嚮鐨勫厓绱�
+
+ if (obj.event === "workTimeClickHandler") {
+ debugger
+ let dateInfo = $elem.data('value')
+ get_WorkTaskList(obj.data['鑱屽憳'], dateInfo)
+ }
+ })
+ //#endregion
+
//#region 瀵煎嚭Execel
function get_Export() {
table.exportFile(ins.config.id, option.data, "xls");
}
//#endregion
+
+ function get_WorkTaskList(Employee, DateInfo) {
+ let EmployeeEncode = encodeURIComponent(Employee)
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "宸ヤ綔浠诲姟" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBillList.html?openType=&HOrgID=' + sessionStorage["OrganizationID"] + '&Employee=' + EmployeeEncode + '&DateInfo=' + DateInfo, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ get_Display();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
//#region 鏌ヨ
function get_Display() {
@@ -326,7 +367,6 @@
var HEmpName = $("#HEmpName").val(); //鑱屽憳
sWhere = "'" + HDate + "','" + HEmpName + "'";
-
var ajaxLoad = layer.load();
$.ajax({
type: "GET",
@@ -358,8 +398,38 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div'>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
+ //姣忔棩宸ヤ綔鏃堕暱
+ case 'Decimal':
+ let date = util.toDateString(HDate, "yyyy-MM")
+ let prefix = data[i].name.split("_").reverse()[1]
+ console.log(typeof prefix)
+ if (typeof prefix == "undefined") {
+
+ }
+ else if (prefix.length < 2) {
+ prefix = '-0' + prefix
+ }
+ else {
+ prefix = '-' + prefix
+ }
+ prefix = prefix || ''
+
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: ((d) => {
+ let node = document.createElement("div")
+ let node_sub = document.createElement("div")
+ node_sub.setAttribute("data-value", date + prefix)
+ node_sub.setAttribute("lay-event", "workTimeClickHandler")
+ node_sub.style.color = "blue";
+ node_sub.innerHTML = "{{= d['" + data[i].name + "']==0? '0' : d['" + data[i].name + "'] }}"
+ node.appendChild(node_sub)
+ return node.outerHTML
+ })()
+ , width: 200
+ });
+ break
default:
if (data[i].name == '鏈湀鍚堣') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
@@ -533,8 +603,7 @@
}
//#endregion
- //#endregion
-
+ //#endregion
});
@@ -544,4 +613,5 @@
</script>
</body>
-</html>
+
+</html>
\ No newline at end of file
--
Gitblit v1.9.1