From a137c837d4ae36ffd67a3cee253bd7b5507f32a9 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 01 三月 2024 13:56:20 +0800
Subject: [PATCH] 1、工资管理模块下的全部单据和单据列表模块：单据有网格的增加合计行，单据列表增加合计行；模块标题名称根据单据类型从数据库单据类型表里动态获取；2、扣补项目费用单、请假申请单、加班申请单、工资单列表模块修改完善
---
WebTM/views/设备管理/Sb_EquipMaintainBill_PDA.html | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
index dd3fc25..9035f99 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBill_PDA.html"
@@ -68,6 +68,10 @@
.layui-form-label {
width: 25%;
}
+ /*鏄庣粏琛屽閫夋灞呬腑*/
+ .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+ margin-left: 35%;
+ }
</style>
</head>
@@ -219,8 +223,8 @@
</table>
</div>
<div class="layui-tab-item">
- <div class="layui-inline">
- <label class="layui-form-label">璁惧淇濆吇瑙勭▼</label>
+ <div class="layui-inline" style="margin-bottom:5px;">
+ <label class="layui-form-label" style="width:100px;">璁惧淇濆吇瑙勭▼</label>
<div class="layui-input-inline">
<input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
<input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
@@ -257,11 +261,15 @@
</div>
</div>
<!--琛屼笅鎷夐�夋嫨(淇濆吇缁撴灉)-->
- <script type="text/html" id="HDotCheckResult">
+ <!--<script type="text/html" id="HDotCheckResult">
<select name="HDotCheckResult" lay-filter="HDotCheckResult" id="HDotCheckResult{{d.LAY_TABLE_INDEX+1}}" style="height:30px;">
<option value="OK">OK</option>
<option value="NG">NG</option>
</select>
+ </script>-->
+ <!--澶嶉�夋锛堜繚鍏荤粨鏋滐級-->
+ <script type="text/html" id="HMaintainResult">
+ <input type="checkbox" value="{{d.HMaintainResult}}" lay-skin="primary" id="HMaintainResult{{d.LAY_TABLE_INDEX+1}}" lay-filter="HMaintainResult" {{ d.HMaintainResult == 1 ? 'checked' : '' }}>
</script>
<script>
layui.config({
@@ -326,7 +334,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HMaintainResult": "OK", "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -365,13 +373,25 @@
});
//琛岄�夋嫨澶勭悊锛堟楠岀粨鏋滐級
- form.on('select(HDotCheckResult)', function (data) {
+ //form.on('select(HDotCheckResult)', function (data) {
+ // //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ // var elem = data.othis.parents('tr');
+ // var dataindex = elem.attr("data-index");
+ // $.each(option.data, function (index, value) {
+ // if (value.LAY_TABLE_INDEX == dataindex) {
+ // value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ // }
+ // });
+ //});
+
+ //鏄惁鍚堟牸
+ form.on('checkbox(HMaintainResult)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
var elem = data.othis.parents('tr');
var dataindex = elem.attr("data-index");
$.each(option.data, function (index, value) {
if (value.LAY_TABLE_INDEX == dataindex) {
- value.HDotCheckResult = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ value.HMaintainResult = data.elem.checked;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
}
});
});
@@ -431,7 +451,7 @@
// 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
$("#formData")[0].reset();
layui.form.render();
- option.data = [{ "HMaintainResult": "OK", "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
table.render(option);
$("#HBarCode").focus();
@@ -509,7 +529,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList.html', 'yes'],
+ content: ['../璁惧绠＄悊/璁惧瑙勭▼鍗�/Sb_EquipMaintainRuleList_PDA.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -543,6 +563,7 @@
if (result.count == 1) {
var BYData = result;//
var rowdate1 = layui.table.cache["mainTable"];
+ var data = result.data;
option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
table.render(option);
@@ -579,14 +600,14 @@
columns = [
{ type: 'checkbox' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe", width: 80 }
- , { field: 'HMaintainResult', title: '淇濆吇缁撴灉', templet: '#HDotCheckResult' }
+ , { field: 'HMaintainResult', title: '淇濆吇缁撴灉', templet: '#HMaintainResult' }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
- , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true}
+ , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
, { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: "" }
, { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text', event: "" }
, { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
, { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
- , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode', width: 150, hide: true}
+ , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
, { field: 'HManagerName', title: '璐熻矗浜哄悕绉�', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { title: '鎿嶄綔', toolbar: '#barDemo', width: 80 }
@@ -604,7 +625,7 @@
}
};
- option.data = [{ "HMaintainResult": "OK", "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "" ,"HRemark":""}];
+ option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
table.render(option);
}
//澧炲姞涓�琛�
@@ -712,7 +733,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetItemByEquipFile",
type: "GET",
- data: { "EquipProjectID": $("#HEquipID").val(),"Type":"BY" },
+ data: { "EquipProjectID": $("#HEquipID").val(), "Type": "BY" },
success: function (result) {
var data = result.data;
$("#HEquipMaintainRuleInterID").val(data[0].淇濆吇瑙勭▼ID);
@@ -721,13 +742,13 @@
for (let i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaintainResult": "OK", "HMaintainItemID": data[i].淇濆吇椤圭洰ID, "HMaintainNumber": data[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": data[i].淇濆吇椤圭洰鍚嶇О,
+ "HMaintainResult": data[i].榛樿缁撹, "HMaintainItemID": data[i].淇濆吇椤圭洰ID, "HMaintainNumber": data[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": data[i].淇濆吇椤圭洰鍚嶇О,
"HMaintainPart": data[i].淇濆吇閮ㄤ綅, "HClaim": data[i].鍏蜂綋瑕佹眰, "HManagerID": data[i].璐熻矗浜篒D, "HManagerNumber": data[i].璐熻矗浜轰唬鐮�,
- "HManagerName": data[i].璐熻矗浜哄悕绉�,"HRemark":""
+ "HManagerName": data[i].璐熻矗浜哄悕绉�, "HRemark": ""
}
);
}
-
+
option.data = rowdata;
table.render(option);
}
--
Gitblit v1.9.1