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_EquipDotCheckBillEdit.html | 94 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 37 deletions(-)
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 17d93d6..f4ebe73 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -13,6 +13,7 @@
<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/PageTitle.js"></script>
<style type="text/css">
.layui-form-label {
width: 95px;
@@ -42,7 +43,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">
@@ -82,7 +83,9 @@
<label class="layui-form-label">鐐规璁″垝缂栧彿<label style="color:red"></label></label>
<div class="layui-input-inline">
<input type="hidden" name="HPlanNo" id="HPlanNo" 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="readonly">
+ <input type="hidden" name="HEquipDotCheckPlanEntryID" id="HEquipDotCheckPlanEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+ <input type="hidden" name="HEquipDotCheckPlanInterID" id="HEquipDotCheckPlanInterID" 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="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>
</button>
@@ -185,6 +188,14 @@
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "3903";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+ $("h1").html('<b>' + HPageTitle + '</b>');
+ //#endregion
+
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -209,7 +220,7 @@
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+ var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" };
switch (obj.event) {
//鏂板涓�琛�
case 'btn-AddLine': btnAddLine(NewRow);
@@ -260,6 +271,7 @@
}
});
});
+ //鑾峰彇璁惧鐐规瑙勭▼
function get_DocCheckItem() {
$.ajax({
url: GetWEBURL() + "/Web/GetDotCheckRuleItemByEquipProjectID",
@@ -268,20 +280,20 @@
success: function (result) {
if (result != null) {
if (result.count == 1) {
- var BYData = result;//
+ var DJData = result;//
var rowdate1 = layui.table.cache["mainTable"];
option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
table.render(option);
- $("#HEquipDotCheckRuleInterID").val(BYData.data[0].HInterID);
- $("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo);
- if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ $("#HEquipDotCheckRuleInterID").val(DJData.data[0].HInterID);
+ $("#HEquipDotCheckRuleInterNo").val(DJData.data[0].HBillNo);
+ if (DJData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < BYData.data.length; i++) {
+ for (var i = 0; i < DJData.data.length; i++) {
var checkrow = {
- "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
- "HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
- "HManagerName": BYData.data[i].HManagerName
+ "HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
+ "HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
+ "HManagerName": DJData.data[i].HManagerName
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -293,7 +305,7 @@
else {
option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
table.render(option);
- layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
+ //layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
}
}
}
@@ -343,19 +355,19 @@
success: function (result) {
if (result != null) {
if (result.count == 1) {
- var BYData = result;//
+ var DJData = result;//
var rowdate1 = layui.table.cache["mainTable"];
option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
table.render(option);
- if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ if (DJData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < BYData.data.length; i++) {
+ for (var i = 0; i < DJData.data.length; i++) {
var checkrow = {
- "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
- "HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
- "HManagerName": BYData.data[i].HManagerName
+ "HDotCheckItemID": DJData.data[i].HDotCheckItemID, "HDotCheckCode": DJData.data[i].HDotCheckCode, "HDotCheckItem": DJData.data[i].HDotCheckItem,
+ "HDotCheckPart": DJData.data[i].HDotCheckPart, "HManagerID": DJData.data[i].HManagerID, "HManagerCode": DJData.data[i].HManagerCode,
+ "HManagerName": DJData.data[i].HManagerName
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
@@ -367,7 +379,7 @@
else {
option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
table.render(option);
- layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
+ //layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
}
}
}
@@ -396,50 +408,56 @@
}
$("#HPlanName").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HPlanNo").val(checkStatus.data[0].hmainid);
- $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
- $("#HEquipID").val(checkStatus.data[0].璁惧ID);
+ $("#HEquipDotCheckPlanInterID").val(checkStatus.data[0].hmainid);
+ //$("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ //$("#HEquipID").val(checkStatus.data[0].璁惧ID);
$("#HEquipDotCheckRuleInterID").val(checkStatus.data[0].HMouldDotCheckRuleID);
$("#HEquipDotCheckRuleInterNo").val(checkStatus.data[0].璁惧鐐规瑙勭▼);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
get_DocCheckItem3();
-
+
}
});
});
function get_DocCheckItem3() {
+ var HPlanID = $("#HPlanNo").val() //鐐规璁″垝ID
+ var HDate = $("#HDate").val(); //褰撳ぉ鏃ユ湡
$.ajax({
- url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListProjectDetai",
+ url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBill_PlanList",
type: "GET",
- data: { "sqlWhere": "and hmainid=" + $("#HPlanNo").val()},
+ data: { "HInterID": HPlanID, "HDate": HDate },
success: function (result) {
if (result != null) {
if (result.count == 1) {
- var BYData = result;//
+ var DJData = result.data;//
var rowdate1 = layui.table.cache["mainTable"];
option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
table.render(option);
-
- if (BYData.data.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+
+ if (DJData.length != 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
{
+ $("#HEquipDotCheckPlanEntryID").val(DJData[0].HPlanEntryID);
buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < BYData.data.length; i++) {
+ for (var i = 0; i < DJData.length; i++) {
var checkrow = {
- "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
- "HDotCheckPart": BYData.data[i].HDotCheckPart, "HClaim": BYData.data[i].HClaim, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
- "HManagerCode": BYData.data[i].HManagerCode, "HManagerName": BYData.data[i].HManagerName, "HRemark": BYData.data[i].HRemark
+ "HDotCheckItemID": DJData[i].HDotCheckID, "HDotCheckCode": DJData[i].鐐规椤圭洰浠ｇ爜, "HDotCheckItem": DJData[i].鐐规椤圭洰,
+ "HDotCheckPart": DJData[i].鐐规閮ㄤ綅, "HClaim": DJData[i].鍏蜂綋瑕佹眰, "HManagerID": DJData[i].HEmployeeID,
+ "HManagerCode": DJData[i].璐熻矗浜轰唬鐮�, "HManagerName": DJData[i].璐熻矗浜哄悕绉�, "HRemark": DJData[i].HRemark
};
buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
}
table.reload("mainTable", {
data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
})
+ } else {
+ layer.alert("鐐瑰墠鏃堕棿娈垫殏鏃犻渶瑕佺偣妫�鐨勮鍒�", { icon: 5 });
}
}
else {
option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
table.render(option);
- layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
+ //layer.alert("璇ヨ澶囨殏鏃犻粯璁ょ偣妫�璁板綍", { icon: 5 });
}
}
}
@@ -517,7 +535,7 @@
function set_InitGrid() {
//琛ㄥご
columns = [
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�'}
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
, { field: 'HDotCheckItemID', title: '鐐规椤圭洰ID', edit: 'text', hide: true }
, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠ｇ爜', edit: 'text', event: "HDotCheckCode" }
@@ -535,6 +553,8 @@
, elem: '#mainTable'
, toolbar: '#toolbarDemo'
, page: true
+ , limit: 100
+ , totalRow: true
, cellMinWidth: 120
, height: 500
, cols: [columns]
@@ -608,7 +628,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../PublicPage/CheckItemInformation.html', 'yes'],
+ content: ['../鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -620,8 +640,8 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
HDotCheckItemID: checkStatus.data[0].HItemID,
- HDotCheckCode: checkStatus.data[0].HNumber,
- HDotCheckItem: checkStatus.data[0].HName
+ HDotCheckCode: checkStatus.data[0].鐐规椤圭洰浠ｇ爜,
+ HDotCheckItem: checkStatus.data[0].鐐规椤圭洰鍚嶇О
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -699,7 +719,7 @@
function set_AddFNew() {
//鑾峰彇鏈�澶у崟鎹彿
get_MAXNum();
- option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
+ option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerCode": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "" }];
table.render(option);
}
--
Gitblit v1.9.1