From 4865345b8afabe9f5147989771448c08f1c2ae18 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 15 八月 2023 14:46:43 +0800
Subject: [PATCH] 扣补项目费用单 ：添加子表重复校验，子表做颜色区分，子表单元格根据宽度隐藏内容，取消分页，添加合计行，取消上一行下一行
---
WebTM/views/工资管理/扣补项目费用单/Pay_DuSubsidyItemBill.html | 186 ++++++++++++++++++++++++---------------------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
2 files changed, 100 insertions(+), 88 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index ba78030..b849679 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -2775,7 +2775,7 @@
<publishTime>07/25/2023 10:31:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/鎵ｈˉ椤圭洰璐圭敤鍗�/Pay_DuSubsidyItemBill.html">
- <publishTime>07/25/2023 16:19:57</publishTime>
+ <publishTime>08/15/2023 14:43:30</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/鎵ｈˉ椤圭洰璐圭敤鍗�/Pay_DuSubsidyItemBillList.html">
<publishTime>07/25/2023 19:22:05</publishTime>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
index 381941e..de86e3b 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\346\211\243\350\241\245\351\241\271\347\233\256\350\264\271\347\224\250\345\215\225/Pay_DuSubsidyItemBill.html"
@@ -14,7 +14,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
- <style>
+ <!--<style>
.main-btn { /*澶撮儴涓绘寜閽�*/
padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
height: 30px;
@@ -44,7 +44,7 @@
.layui-form-label {
width: 25%;
}
- </style>
+ </style>-->
</head>
<body>
@@ -75,14 +75,14 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline" style="width:500px;">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width: 180px;">
<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
</div>
</div>
<div class="layui-inline" style="width:500px;">
- <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width:180px;">
<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
@@ -96,7 +96,7 @@
</div>
<div class="layui-row">
<div class="layui-inline" style="width:500px;">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐝粍</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐝粍<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px; width: 270px;">
<input type="text" class="layui-input" lay-verify="HGroupName" name="HGroupName" id="HGroupName" style="background-color: #efefef4d; width: 180px; display: inline-block;" readonly>
<input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0">
@@ -106,7 +106,7 @@
</div>
</div>
<div class="layui-inline" style="width:500px;">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px; width: 270px;">
<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color: #efefef4d; width: 180px; display: inline-block;" readonly>
<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
@@ -236,8 +236,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
</div>
</script>
</form>
@@ -541,24 +541,25 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , page: true
- , limit: 500
- , limits: [50, 500, 5000, 50000]
+ //, page: true
+ //, limit: 500
+ //, limits: [50, 500, 5000, 50000]
+ , totalRow: true
, cellMinWidth: 120
, height: 400
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'RowID', title: '琛屽彿', hide: true } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HEmpID', title: '鑱屽憳ID', hide: true }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
+ , { field: 'HEmpID', title: '鑱屽憳ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', edit: 'text', event: "HEmpNumber" } //f7
- , { field: 'HEmpName', title: '鑱屽憳鍚嶇О' }
- , { field: 'HDuSubsidyItemID', title: '鎵ｈˉ椤圭洰ID', hide: true }
+ , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', style: 'background-color: #f9f9f9;' }
+ , { field: 'HDuSubsidyItemID', title: '鎵ｈˉ椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HDuSubsidyItemNumber', title: '鎵ｈˉ椤圭洰浠ｇ爜', edit: 'text', event: "HDuSubsidyItemNumber" } //f7
- , { field: 'HDuSubsidyItemName', title: '鎵ｈˉ椤圭洰鍚嶇О' }
+ , { field: 'HDuSubsidyItemName', title: '鎵ｈˉ椤圭洰鍚嶇О', style: 'background-color: #f9f9f9;' }
, { field: 'HQty', title: '鏁伴噺', edit: 'text'} //f7
, { field: 'HPrice', title: '鍗曚环', edit: 'text'} //f7
- , { field: 'HMoney', title: '閲戦' }
+ , { field: 'HMoney', title: '閲戦', totalRow: true, style: 'background-color: #f9f9f9;' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -752,76 +753,87 @@
//#region 鏁版嵁鏍￠獙
function AllowLoadData(data) {
//#region 琛ㄥご鏁版嵁妫�楠�
- //if ($("#HBillNo").val() == "") {
- // layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
- // return false;
- //}
- //if ($("#HInnerBillNo").val() == "") {
- // layer.msg("鍐呴儴鍗曟嵁鍙蜂笉鑳戒负绌�!");
- // return false;
- //}
- //if ($("#HGroupName").val() == "") {
- // layer.msg("鐝粍鏈�夋嫨!");
- // return false;
- //}
- //if ($("#HDeptName").val() == "") {
- // layer.msg("閮ㄩ棬鏈�夋嫨!");
- // return false;
- //}
- //if ($("#HEmpName").val() == "") {
- // layer.msg("涓荤鏈�夋嫨!");
- // return false;
- //}
- //if ($("#HPayTypeName").val() == "") {
- // layer.msg("宸ヨ祫绫诲瀷鏈�夋嫨!");
- // return false;
- //}
+ if ($("#HBillNo").val() == "") {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+ return false;
+ }
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+ return false;
+ }
+ if ($("#HGroupID").val() == "0") {
+ layer.msg("鐝粍鏈�夋嫨!");
+ return false;
+ }
+ if ($("#HDeptID").val() == "0") {
+ layer.msg("閮ㄩ棬鏈�夋嫨!");
+ return false;
+ }
//#endregion
//#region 瀛愯〃鏁版嵁妫�楠�
- //var temp; //璁板綍闇�瑕佹楠岀殑灞炴�х殑鍊硷紝鐢ㄤ簬妫�楠�
- //var ref = /^\d+(\.\d+)?$/; //鍒ゆ柇鏄惁鏄潪璐熸诞鐐规暟
- //var ref1 = /^\d+$/; //鍒ゆ柇鏄惁鏄潪璐熸暣鏁�
- //var value1 = ["HTimes", "HQty", "HPrice", "HPriceRate", "HSubsidyQty", "HSubsidyMoney", "HSubsidyTotal", "HDeuctTotal", "HPackQty", "HPackPrice", "HPackMoney", "HMoney"]; //瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗�
- //var value1_ = ["宸ユ椂", "鏁伴噺", "宸ヤ环", "瀹氶娴姩姣旂巼", "琛ヨ创鏁伴噺", "琛ヨ创閲戦", "琛ヨ创鍚堣", "鎵ｆ灏忚", "鍖呰鏁伴噺", "鍖呰鍗曚环", "鍖呰閲戦", "閲戦"]; ////瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗曞搴旂殑鍒楀悕娓呭崟
- //var value2 = ["HICMOInterID", "HProcReportInterID", "HProcReportEntryID", "HProcPlanInterID", "HProcPlanEntryID"]; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗�
- //var value2_ = ["鐢熶骇浠诲姟鍗旾D", "宸ュ簭姹囨姤鍗旾D", "宸ュ簭姹囨姤鍗曞瓙ID", "宸ュ簭璁″垝鍗旾D", "宸ュ簭璁″垝鍗曞瓙ID"]; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
- //var value3 = ["HMaterNumber", "HProcNumber", "HEmpNumber", "HPackMaterName"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
- //var value3_ = ["鐗╂枡", "宸ュ簭", "鑱屽憳", "鍖呰鏂瑰紡"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
- //for (var i = 0; i < option.data.length; i++) {
- // if (option.data[i] != "") {
- // //闈炵┖妫�楠�
- // for (var j = 0; j < value3.length; j++) {
- // temp = option.data[i][value3[j]] + "";
- // if (temp == "") {
- // layer.msg("绗�" + (i + 1) + "琛�:" + value3_[j] + "鏈�夋嫨!");
- // return false;
- // }
- // }
- // //鏁存暟妫�楠�
- // for (var j = 0; j < value2.length; j++) {
- // temp = option.data[i][value2[j]] + "";
- // if (temp == "") {
- // layer.msg("绗�" + (i + 1) + "琛�:" + value2_[j] + "涓嶈兘涓虹┖!");
- // return false;
- // } else if (!ref1.test(temp)) {
- // layer.msg("绗�" + (i + 1) + "琛�:" + value2_[j] + "璇疯緭鍏ラ潪璐熸暣鏁�!");
- // return false;
- // }
- // }
- // //娴偣鏁版楠�
- // for (var j = 0; j < value1.length; j++) {
- // temp = option.data[i][value1[j]] + "";
- // if (temp == "") {
- // layer.msg("绗�" + (i + 1) + "琛�:" + value1_[j] + "涓嶈兘涓虹┖!");
- // return false;
- // } else if (!ref.test(temp)) {
- // layer.msg("绗�" + (i + 1) + "琛�:" + value1_[j] + "璇疯緭鍏ユ纭潪璐熸暟瀛�!");
- // return false;
- // }
- // }
- // }
- //}
+ var temp; //璁板綍闇�瑕佹楠岀殑灞炴�х殑鍊硷紝鐢ㄤ簬妫�楠�
+ var ref = /^\d+(\.\d+)?$/; //鍒ゆ柇鏄惁鏄潪璐熸诞鐐规暟
+ var ref1 = /^\d+$/; //鍒ゆ柇鏄惁鏄潪璐熸暣鏁�
+ var value1 = ["HQty","HPrice"]; //瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗�
+ var value1_ = ["鏁伴噺", "鍗曚环"]; ////瀛愯〃闇�瑕佽繘琛屾诞鐐规暟楠岃瘉鐨勫睘鎬ф竻鍗曞搴旂殑鍒楀悕娓呭崟
+ var value2 = []; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗�
+ var value2_ = []; //瀛愯〃闇�瑕佹暣鏁版楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
+ var value3 = ["HEmpID", "HDuSubsidyItemID"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗�
+ var value3_ = ["鑱屽憳"," 鎵ｈˉ椤圭洰"]; //瀛愯〃闇�瑕佽繘琛岄潪绌烘楠岀殑灞炴�ф竻鍗曞搴旂殑鍒楀悕娓呭崟
+ for (var i = 0; i < option.data.length; i++) {
+ if (option.data[i] != "") {
+ //闈炵┖妫�楠�
+ for (var j = 0; j < value3.length; j++) {
+ temp = option.data[i][value3[j]] + "";
+ if (temp == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:" + value3_[j] + "鏈�夋嫨!");
+ return false;
+ }
+ }
+ //鏁存暟妫�楠�
+ for (var j = 0; j < value2.length; j++) {
+ temp = option.data[i][value2[j]] + "";
+ if (temp == "") {
+ layer.msg("绗�" + (i + 1) + "琛�:" + value2_[j] + "涓嶈兘涓虹┖!");
+ return false;
+ } else if (!ref1.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛�:" + value2_[j] + "璇疯緭鍏ラ潪璐熸暣鏁�!");
+ return false;
+ }
+ }
+ //娴偣鏁版楠�
+ for (var j = 0; j < value1.length; j++) {
+ temp = option.data[i][value1[j]] + "";
+ if (temp == "") {
+ layer.msg("绗�" + (i + 1) + "琛�:" + value1_[j] + "涓嶈兘涓虹┖!");
+ return false;
+ } else if (!ref.test(temp)) {
+ layer.msg("绗�" + (i + 1) + "琛�:" + value1_[j] + "璇疯緭鍏ユ纭潪璐熸暟瀛�!");
+ return false;
+ }
+ }
+
+ //鐗规畩妫�楠�
+ temp = option.data[i]["HQty"] + "";
+ if (temp == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:鏁伴噺涓嶈兘涓�0锛�");
+ return false;
+ }
+ }
+ }
+ //#endregion
+
+ //#region 瀛愯〃鍏抽敭瀛楁閲嶅妫�楠�
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ temp = option.data[i]["HEmpID"] + "|" + option.data[i]["HDuSubsidyItemID"];
+ if ($.inArray(temp, num) != -1) {
+ layer.msg("绗�" + (i + 1) + "琛岋細鑱屽憳銆佹墸琛ラ」鐩噸澶嶏紝璇烽噸鏂伴�夋嫨锛�");
+ return false;
+ }
+ num.push(temp);
+ }
//#endregion
return true;
}
@@ -1029,9 +1041,9 @@
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
+ option.cols[0][i + 1]["style"] += "font-size:100%";
}
//璁剧疆鍒楀
//if (data1.data[0].HColumnWidth != 0) {
--
Gitblit v1.9.1