From 2feca62b8be21d02187999e0433a0a85cf57b314 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 16 八月 2023 14:33:19 +0800
Subject: [PATCH] 项目阶段汇报：必填标识、取消上一行下一行、取消分页、启用合计行、子表不可编辑做颜色区分、重复校验、
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
WebTM/views/项目管理/项目阶段/PM_ProjectReportBill.html | 259 +++++++++++----------------------------------------
2 files changed, 57 insertions(+), 204 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 08e72b2..dbfc2aa 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4455,7 +4455,7 @@
<publishTime>07/06/2023 09:17:28</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectReportBill.html">
- <publishTime>07/25/2023 15:45:20</publishTime>
+ <publishTime>08/16/2023 14:30:15</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectReportBillList.html">
<publishTime>07/14/2023 10:39:07</publishTime>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
index 2a04d0f..1da54da 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\351\241\271\347\233\256\351\230\266\346\256\265/PM_ProjectReportBill.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,26 +75,20 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <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;">
<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">
- <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>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">椤圭洰浠ｇ爜<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber">
- </div>
- </div>-->
<div class="layui-inline">
- <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;">
<input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
@@ -106,7 +100,7 @@
</div>
</div>
<div class="layui-inline">
- <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;">
<input type="text" class="layui-input" lay-verify="HProjectStageName" name="HProjectStageName" id="HProjectStageName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
@@ -141,7 +135,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <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;">
<input type="text" class="layui-input" lay-verify="HReportEmpName" name="HReportEmpName" id="HReportEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HReportEmpID" id="HReportEmpID" lay-verify="HReportEmpID" value="0">
@@ -193,7 +187,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞<label style="color:red"> * </label></label>
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
</div>
@@ -201,7 +195,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <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: 501px;">
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
@@ -320,8 +314,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>
</div>
@@ -378,10 +372,6 @@
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
}, function () { window.location.href = "../../user/login.html"; });
}
- //#endregion
-
- //#region 鍒濆鍖栬〃鏍�
- //DisPlay_HideColumn();
//#endregion
//#region 鍒濆鍖栫粍缁�
@@ -526,30 +516,6 @@
}
});
//#endregion
-
- //#region 瀹℃牳
- form.on('submit(set_CheckBill)', function (data) {
- set_CheckBill(data);
- });
- //#endregion
-
- //#region 鍙嶅鏍�
- form.on('submit(set_AbandonCheck)', function (data) {
- set_AbandonCheck(data);
- });
- //#endregion
-
- //#region 鍏抽棴
- form.on('submit(set_CloseBill)', function (data) {
- set_CloseBill(data);
- });
- //#endregion
-
- //#region 鍙嶅叧闂�
- form.on('submit(set_CancelCloseBill)', function (data) {
- set_CancelCloseBill(data);
- });
- //#endregion
//#endregion
//#endregion
@@ -602,12 +568,10 @@
//涓婁竴琛�
case 'btn_up':
btn_up(data);
- CheckedSet_tableSub_Emp();
break;
//涓嬩竴琛�
case 'btn_under':
btn_under(data);
- CheckedSet_tableSub_Emp();
break;
}
});
@@ -617,24 +581,11 @@
table.on('tool(mainTable)', function (obj) {
set_GridDelete(obj); //琛屽唴鍒犻櫎
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
-
});
//#endregion
//#region 瀛愯〃锛氳鍐呴紶鏍囩寮�浜嬩欢锛氭鏌ラ」鐩樁娈垫槸鍚﹂噸澶�
table.on('edit(mainTable)', function (obj) {
- if (obj.field == "HEmpID") {
- var num = 0;
- for (var i = 0; i < option.data.length; i++) {
- if (obj.value == option.data[i]["HEmpID"]) {
- num += 1;
- }
- if (num > 1) {
- layer.msg("鎴愬憳:" + obj.value + "閲嶅!");
- return false;
- }
- }
- }
})
//#endregion
@@ -723,26 +674,27 @@
}
//#endregion
- //#region 椤圭洰闃舵琛ㄣ�侀」鐩垚鍛樿〃鍒濆鍖�
+ //#region 瀛愯〃鍒濆鍖�
function get_InitGrid1() {
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: 'HEmpName', title: '鎴愬憳', edit: 'text', event: "HEmpName" } //f7
, { field: 'HIsPM', title: '椤圭洰缁忕悊', templet: "#HIsPM" }
- , { field: 'HRate', title: '椤圭洰鍗犳瘮', hide: true }
- , { field: 'HAvgMoney', title: '鍒嗛厤涓氱哗', edit: 'text' }
- , { field: 'HCountMoney', title: '鎻愭垚', edit: 'text' }
+ , { field: 'HRate', title: '椤圭洰鍗犳瘮', totalRow: true, style: 'background-color: #f9f9f9;'}
+ , { field: 'HAvgMoney', title: '鍒嗛厤涓氱哗', totalRow: true, style: 'background-color: #f9f9f9;' }
+ , { field: 'HCountMoney', title: '鎻愭垚', totalRow: true, style: 'background-color: #f9f9f9;' }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -788,14 +740,14 @@
}
//璁剧疆琛ㄥご鏁版嵁
//璁剧疆鏂囨湰妗嗗��
- $("#HProNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);//宸ョ▼椤圭洰浠ｇ爜
- $("#HProjectStageID").val(checkStatus.data[0].HProjectStageID);//宸ョ▼椤圭洰浠ｇ爜
- $("#HProjectStageName").val(checkStatus.data[0].椤圭洰闃舵);//宸ョ▼椤圭洰浠ｇ爜
- $("#HStageNote").val(checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭);//宸ョ▼椤圭洰浠ｇ爜
- $("#HPMGoodsID").val(checkStatus.data[0].HPMGoodsID);//宸ョ▼椤圭洰浠ｇ爜
- $("#HRelationGoods").val(checkStatus.data[0].闃舵鐩稿叧浜や粯鐗�);//宸ョ▼椤圭洰浠ｇ爜
- $("#HIsKey").val((checkStatus.data[0].閲岀▼纰�=='Y'?true:false));//宸ョ▼椤圭洰浠ｇ爜
- $("#HRate").val(checkStatus.data[0].闃舵涓氱哗鍗犳瘮);//宸ョ▼椤圭洰浠ｇ爜
+ $("#HProNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
+ $("#HProjectStageID").val(checkStatus.data[0].HProjectStageID);
+ $("#HProjectStageName").val(checkStatus.data[0].椤圭洰闃舵);
+ $("#HStageNote").val(checkStatus.data[0].椤圭洰闃舵璇︾粏鍐呭);
+ $("#HPMGoodsID").val(checkStatus.data[0].HPMGoodsID);
+ $("#HRelationGoods").val(checkStatus.data[0].闃舵鐩稿叧浜や粯鐗�);
+ $("#HIsKey").val((checkStatus.data[0].閲岀▼纰�=='Y'?true:false));
+ $("#HRate").val(checkStatus.data[0].闃舵涓氱哗鍗犳瘮);
//璁剧疆澶嶉�夋閫変腑鐘舵��
if ($("#HIsKey").val() == "true") {
@@ -828,8 +780,7 @@
, 'HAvgMoney': '0'
, 'HCountMoney': '0'
, 'HRemarkSub': ''
- }
- ;
+ };
num.push(rowdata);
}
option.data = num;
@@ -1147,106 +1098,6 @@
//#endregion
- //#region 瀹℃牳
- function set_CheckBill() {
- layer.confirm("纭瑕佸鏍稿悧?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- //#endregion
-
- //#region 鍙嶅鏍�
- function set_AbandonCheck() {
- layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- //#endregion
-
- //#region 鍏抽棴
- function set_CloseBill() {
- layer.confirm("纭瑕佸叧闂悧?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- //#endregion
-
- //#region 鍙嶅叧闂�
- function set_CancelCloseBill() {
- layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
- var wait = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
- type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- layer.close(wait);
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- layer.close(wait);
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- layer.close(wait);
- }
- });
- })
- }
- //#endregion
-
//#region 闈炵┖楠岃瘉
function AllowLoadData(data) {
//#region 琛ㄥご鏁版嵁妫�楠�
@@ -1254,16 +1105,20 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
-
- if ($("#HProNumber").val() == "") {
- layer.msg("椤圭洰浠ｇ爜涓嶈兘涓虹┖!");
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
- if ($("#HProjectStageName").val() == "") {
+
+ if ($("#HProID").val() == "0") {
+ layer.msg("椤圭洰浠ｇ爜鏈�夋嫨!");
+ return false;
+ }
+ if ($("#HProjectStageID").val() == "0") {
layer.msg("椤圭洰闃舵鏈�夋嫨!");
return false;
}
- if ($("#HReportEmpName").val() == "") {
+ if ($("#HReportEmpID").val() == "0") {
layer.msg("姹囨姤浜烘病鏈夐�夋嫨!");
return false;
}
@@ -1276,7 +1131,7 @@
} else {
var ref = /^[0-9]+\.?[0-9]*$/;
if (!ref.test(HRate1)) {
- layer.msg("涓氱哗鍗犳瘮璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
+ layer.msg("鏈樁娈典笟缁╁崰姣旇杈撴纭叆鏁板瓧锛�");
return;
}
}
@@ -1284,25 +1139,11 @@
//#endregion
//#region 瀛愯〃鏁版嵁妫�楠�
- var num = [];
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
- //鎴愬憳娈甸噸澶嶆楠�
- if ($.inArray(option.data[i]["HEmpID"], num) == -1) {
- num.push(option.data[i]["HEmpID"]);
- } else {
- layer.msg("绗�" + (i + 1) + "琛�,鎴愬憳:" + option.data[i]["HEmpName"] + "閲嶅!");
- return false;
- }
//鎴愬憳闈炵┖妫�楠�
- if (option.data[i]["HEmpName"] == "") {
+ if (option.data[i]["HEmpID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:鎴愬憳涓嶈兘涓虹┖!");
- return false;
- }
-
- //鏄惁椤圭洰缁忕悊鏍煎紡妫�楠�
- if (option.data[i]["HIsPM"] != "1" && option.data[i]["HIsPM"] != '0') {
- layer.msg("绗�" + (i + 1) + "琛�:鏄惁椤圭洰缁忕悊璇疯緭鍏�0鎴�1!");
return false;
}
@@ -1344,6 +1185,18 @@
return;
}
}
+ }
+ }
+ //#endregion
+
+ //#region 瀛愯〃鍏抽敭瀛楅噸澶嶆牎楠�
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if ($.inArray(option.data[i]["HEmpID"], num) == -1) {
+ num.push(option.data[i]["HEmpID"]);
+ } else {
+ layer.msg("绗�" + (i + 1) + "琛�,鎴愬憳:" + option.data[i]["HEmpName"] + "閲嶅!");
+ return false;
}
}
//#endregion
@@ -1534,9 +1387,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