From bbc4e956d3bd91796567eafd0dffc82e9fb902c3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 08 二月 2023 11:32:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/工资管理/工资报表/Pay_WorkTimesPayMentSumReport.html | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentSumReport.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentSumReport.html"
index 57f018c..15628b6 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentSumReport.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\346\212\245\350\241\250/Pay_WorkTimesPayMentSumReport.html"
@@ -3,14 +3,17 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>璁℃椂宸ヨ祫姹囨�昏〃</title>
- <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../../layuiadmin/PubCustom.js"></script>
- <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -88,12 +91,14 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <!--<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- </div>
- </script>-->
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <!--<script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ </div>
+ </script>-->
</form>
</div>
</div>
@@ -326,9 +331,9 @@
, limits: [50, 500, 5000, 20000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165 }
+ , { field: 'HDeptID', title: 'HDeptID', sort: true, width: 165, hide: true }
, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 170 }
- , { field: 'HEmpID', title: 'HEmpID', width: 170 }
+ , { field: 'HEmpID', title: 'HEmpID', width: 170, hide: true }
, { field: '鍛樺伐', title: '鍛樺伐', width: 160 }
, { field: '璁℃椂宸ヨ祫', title: '璁℃椂宸ヨ祫', width: 160 }
]]
--
Gitblit v1.9.1