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_EquipMaintainBillEdit.html | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 4725d33..07516fc 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 85px;
@@ -38,7 +39,7 @@
<li class="layui-this">鍩烘湰淇℃伅</li>-->
<!--<li>鍏朵粬淇℃伅</li>-->
<!--</ul>-->
- <h1 style="text-align:center;"><b>璁惧淇濆吇璁板綍鍗�</b></h1>
+ <h1 style="text-align: center; padding: 10px 0;"><b>璁惧淇濆吇璁板綍鍗�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
@@ -78,6 +79,8 @@
<label class="layui-form-label">淇濆吇璁″垝缂栧彿</label>
<div class="layui-input-inline">
<input type="hidden" name="HPlanNo" id="HPlanNo" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEquipMaintainPlanEntryID" id="HEquipMaintainPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HEquipMaintainPlanInterID" id="HEquipMaintainPlanInterID" class="layui-input" value="0" style="float:left;width:150px;">
<input type="text" name="HPlanName" id="HPlanName" class="layui-input" value="" style="float:left;width:150px;background-color:#efefef4d;" readonly">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -212,6 +215,13 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3901";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
//鍒濆鍖栬〃鏍�
@@ -238,7 +248,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
+ var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -324,8 +334,11 @@
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
- $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
- $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
+ if (BYData.length != 0) {
+ $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
+ $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
+ }
+
if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
@@ -429,7 +442,7 @@
var checkrow = {
"HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
"HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
- "HManagerName": BYData[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
+ "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -448,7 +461,7 @@
"HMaterID": PJData[i].HMaterID, "HMaterNumber": PJData[i].HMaterNumber, "HMaterName": PJData[i].HMaterName,
"HUnitID": PJData[i].HUnitID, "HUnitNumber": PJData[i].HUnitNumber,
"HUnitName": PJData[i].HUnitName, "HQty": PJData[i].HQty,
- "HRemark": rowdate2[i].HRemark
+ "HRemark": PJData[i].HRemark
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -467,16 +480,19 @@
//閫夋嫨淇濆吇璁″垝婧愬崟鐨勬椂鍊欏甫鍑烘暟鎹�
function get_MaintainItem3() {
+ var HPlanID = $("#HPlanNo").val() //淇濆吇璁″垝ID
+ var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
+
$.ajax({
- url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew",
+ url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBill_PlanList",
type: "GET",
async: false,
- data: { "HInterID": $("#HPlanNo").val() },
+ data: { "HInterID": HPlanID, "HDate": HDate },
success: function (result) {
if (result != null) {
if (result.count == 1) {
- var BYData = result.list[0];//淇濆吇
- var PJData = result.list[1];//閰嶄欢
+ var BYData = result.data[0];//淇濆吇
+ var PJData = result.data[1];//閰嶄欢
var rowdate1 = layui.table.cache["mainTable"];
var rowdate2 = layui.table.cache["mainTable1"];
option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
@@ -486,12 +502,13 @@
if (BYData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
+ $("#HEquipMaintainPlanEntryID").val(BYData[0].HPlanEntryID);
buttonArr = [];//娓呯┖鏁扮粍
for (var i = 0; i < BYData.length; i++) {
var checkrow = {
- "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
- "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
- "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
+ "HMaintainItemID": BYData[i].HMaintainRuleID, "HMaintainItemNumber": BYData[i].淇濆吇椤圭洰浠ｇ爜, "HMaintainItem": BYData[i].淇濆吇椤圭洰,
+ "HMaintainPart": BYData[i].淇濆吇閮ㄤ綅, "HManagerID": BYData[i].HEmployeeID, "HManagerNumber": BYData[i].璐熻矗浜轰唬鐮�,
+ "HManagerName": BYData[i].璐熻矗浜哄悕绉�, "HClaim": BYData[i].鍏蜂綋瑕佹眰, "HRemark": BYData[i].HRemark
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -549,6 +566,7 @@
}
$("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HPlanNo").val(checkStatus.data[0].hmainid);
+ $("#HEquipMaintainPlanInterID").val(checkStatus.data[0].hmainid);
$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
$("#HEquipID").val(checkStatus.data[0].HEquipID);
$("#HEquipMaintainRuleInterID").val(checkStatus.data[0].HMouldMaintainRuleID);
@@ -669,7 +687,7 @@
function Table() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
, { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠ｇ爜', hide: true ,edit: 'text' }
@@ -687,6 +705,8 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: false
+ , limit: 100
+ , totalRow: true
, cellMinWidth: 120
, height: 500
, cols: [columns]
@@ -698,7 +718,7 @@
function Table1() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
, { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
, { field: 'HMaterNumber', title: '閰嶄欢浠ｇ爜', edit: 'text', event: "HMaterCode" }
@@ -709,7 +729,7 @@
//, { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
//, { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
//, { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
- , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text' }
+ , { field: 'HQty', title: '鐢ㄩ噺', edit: 'text', totalRow: true }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
];
@@ -719,6 +739,7 @@
, toolbar: '#toolbarDemo1'
, height: 500
, page: true
+ , totalRow: true
, limit: 500
, cellMinWidth: 120
, height: 500
@@ -732,7 +753,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+ option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "" }];
table.render(option);
table.render(option1);
@@ -791,6 +812,8 @@
, "HPlanName": data.淇濆吇璁″垝
, "HPlanNo": data.淇濆吇璁″垝缂栧彿 //
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HEquipMaintainRuleInterID": data.HEquipMaintainRuleInterID //澶囨敞
+ , "HEquipMaintainRuleInterNo": data.璁惧淇濆吇瑙勭▼ //澶囨敞
});
--
Gitblit v1.9.1