From c63769060cb96d446f5129225d2d32e66eaef31d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 16 八月 2023 15:29:55 +0800
Subject: [PATCH] 工程项目：必选标识、取消上一行下一行、取消分页、增加合计行、重复校验，子表不可编辑做颜色区分、子表单元格根据宽度隐藏内容、
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 2
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 332 +++++++++++++++++++------------------------------------
2 files changed, 116 insertions(+), 218 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index dbfc2aa..ef68e2c 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4434,7 +4434,7 @@
<publishTime>07/14/2023 10:59:09</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html">
- <publishTime>07/25/2023 15:45:13</publishTime>
+ <publishTime>08/16/2023 15:19:50</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html">
<publishTime>07/16/2023 20:47:30</publishTime>
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index 26dbd52..56c8f47 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.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,7 +75,7 @@
<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">
@@ -88,13 +88,13 @@
</div>
</div>
<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;">
<input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName">
</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="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -106,25 +106,25 @@
</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: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>
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
</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: 185px;">
<input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
</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="HPMEmpName" name="HPMEmpName" id="HPMEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">
@@ -136,7 +136,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="HWorkEmpName" name="HWorkEmpName" id="HWorkEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HWorkEmpID" id="HWorkEmpID" lay-verify="HWorkEmpID" value="0">
@@ -146,7 +146,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="HDepEmpName" name="HDepEmpName" id="HDepEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HDepEmpID" id="HDepEmpID" lay-verify="HDepEmpID" value="0">
@@ -156,7 +156,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="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
@@ -185,13 +185,13 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">椤圭洰闅炬槗绫诲瀷</label>
- <div class="layui-input-block" style="margin-left: 120px;">
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
<select name="HProType" id="HProType" lay-filter="HProType" style="width:190px;">
</select>
</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="HPayCusName" name="HPayCusName" id="HPayCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="hidden" name="HPayCusID" id="HPayCusID" lay-verify="HPayCusID" value="0">
@@ -203,7 +203,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>
@@ -211,7 +211,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">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
@@ -377,8 +377,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>
@@ -390,8 +390,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up1"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under1"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up1"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under1"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
</div>
</script>
</div>
@@ -460,10 +460,6 @@
icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
}, function () { window.location.href = "../../user/login.html"; });
}
- //#endregion
-
- //#region 鍒濆鍖栬〃鏍�
- //DisPlay_HideColumn();
//#endregion
//#region 鍒濆鍖栫粍缁�
@@ -615,30 +611,6 @@
} else if (params[1] == null) {
Pub_Close(2);
}
- });
- //#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
@@ -925,28 +897,29 @@
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: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;'}
+ , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
+ , { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HProjectStageName', title: '椤圭洰闃舵', edit: 'text', event: "HProjectStageName" } //f7
- , { field: 'HStageNote', title: '椤圭洰璇︾粏鍐呭' }
- , { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true }
+ , { field: 'HStageNote', title: '椤圭洰璇︾粏鍐呭', style: 'background-color: #f9f9f9;' }
+ , { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HPMGoodsName', title: '鐩稿叧浜や粯鐗�', edit: 'text', event: "HPMGoodsName" } //f7
, { field: 'HIsKey', title: '閲岀▼纰�', templet: "#HIsKey" }
- , { field: 'HRate', title: '涓氱哗鍗犳瘮', edit: 'text' }
- , { field: 'HEmpID', title: '闃舵璐熻矗浜篒D', hide: true }
+ , { field: 'HRate', title: '涓氱哗鍗犳瘮', edit: 'text', totalRow: true }
+ , { field: 'HEmpID', title: '闃舵璐熻矗浜篒D', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HEmpName', title: '闃舵璐熻矗浜�', edit: 'text', event: "HEmpName" } //f7
- , { field: 'HCheckEmpID', title: '闃舵瀹℃牳浜篒D', hide: true }
+ , { field: 'HCheckEmpID', title: '闃舵瀹℃牳浜篒D', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HCheckEmpName', title: '闃舵瀹℃牳浜�', edit: 'text', event: "HCheckEmpName" } //f7
, { field: 'HFinishDate', title: '棰勮瀹屾垚鏃ユ湡', event: "HFinishDate" }
- , { field: 'HWorkDays', title: '棰勮浜哄ぉ', edit: 'text' }
+ , { field: 'HWorkDays', title: '棰勮浜哄ぉ', edit: 'text', totalRow: true }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -985,14 +958,14 @@
, height: 400
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'RowID', title: '琛屽彿', hide: true } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HEmployeeID', title: '椤圭洰鎴愬憳ID', hide: true }
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+ , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
+ , { field: 'HEmployeeID', title: '椤圭洰鎴愬憳ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HEmployeeName', title: '椤圭洰鎴愬憳', edit: 'text', event: "HEmployeeName" } //f7
, { field: 'HIsPM', title: '鏄惁椤圭洰缁忕悊', templet: "#HIsPM" }
, { field: 'HRate', title: '椤圭洰鍗犳瘮', edit: 'text' }
- , { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗', edit: 'text' }
- , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', edit: 'text' }
+ , { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗', style: 'background-color: #f9f9f9;' }
+ , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', style: 'background-color: #f9f9f9;' }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
]]
@@ -1433,106 +1406,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 琛ㄥご鏁版嵁妫�楠�
@@ -1540,56 +1413,54 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
-
- if ($("#HProNumber").val() == "") {
- layer.msg("椤圭洰浠ｇ爜涓嶈兘涓虹┖!");
+ if ($("#HDate").val() == "") {
+ layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
- if ($("#HProName").val() == "") {
- layer.msg("椤圭洰鍚嶇О涓嶈兘涓虹┖!");
+ if ($("#HBeginDate").val() == "") {
+ layer.msg("寮�濮嬫棩鏈熶笉鑳戒负绌�!");
return false;
}
- if ($("#HCusName").val() == "") {
- layer.msg("瀹㈡埛娌℃湁閫夋嫨!");
+ if ($("#HEndDate").val() == "") {
+ layer.msg("缁撴潫鏃ユ湡涓嶈兘涓虹┖!");
return false;
}
- if ($("#HPMEmpName").val() == "") {
- layer.msg("椤圭洰缁忕悊娌℃湁閫夋嫨!");
+ if ($("#HProID").val() == "0") {
+ layer.msg("椤圭洰浠ｇ爜鏈�夋嫨!");
return false;
}
- if ($("#HWorkEmpName").val() == "") {
- layer.msg("瀹炴柦鎷呭綋娌℃湁閫夋嫨");
+ if ($("#HCusID").val() == "0") {
+ layer.msg("瀹㈡埛鏈�夋嫨!");
return false;
}
- if ($("#HDepEmpName").val() == "") {
- layer.msg("寮�鍙戞媴褰撴病鏈夐�夋嫨");
+ if ($("#HPMEmpID").val() == "0") {
+ layer.msg("椤圭洰缁忕悊鏈�夋嫨!");
return false;
}
- if ($("#HMaterName").val() == "") {
- layer.msg("瀵瑰簲浜у搧娌℃湁閫夋嫨");
+ if ($("#HWorkEmpID").val() == "0") {
+ layer.msg("瀹炴柦鎷呭綋鏈�夋嫨");
return false;
}
- if ($("#HPayCusName").val() == "") {
- layer.msg("缁撶畻鏂规病鏈夐�夋嫨");
+ if ($("#HDepEmpID").val() == "0") {
+ layer.msg("寮�鍙戞媴褰撴湭閫夋嫨");
return false;
}
-
-
+ if ($("#HMaterID").val() == "0") {
+ layer.msg("瀵瑰簲浜у搧鏈�夋嫨");
+ return false;
+ }
+ if ($("#HPayCusID").val() == "0") {
+ layer.msg("缁撶畻鏂规湭閫夋嫨");
+ return false;
+ }
//#endregion
//#region 椤圭洰闃舵琛ㄦ暟鎹楠�
- var num = [];
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
- //椤圭洰闃舵閲嶅妫�楠�
- if ($.inArray(option.data[i]["HProjectStageID"], num) == -1) {
- num.push(option.data[i]["HProjectStageID"]);
- } else {
- layer.msg("绗�" + (i + 1) + "琛�,椤圭洰闃舵:" + option.data[i]["HProjectStageName"] + "閲嶅!");
- return false;
- }
+
//椤圭洰闃舵闈炵┖妫�楠�
- if (option.data[i]["HProjectStageName"] == "") {
+ if (option.data[i]["HProjectStageID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:椤圭洰闃舵涓嶈兘涓虹┖!");
return false;
}
@@ -1606,10 +1477,6 @@
return;
}
}
- ////閲岀▼纰戝唴瀹规楠�
- //if (option.data[i]["HIsKey"] != "1" && option.data[i]["HIsKey"] != "0") {
- // layer.msg("閲岀▼纰戣杈撳叆0鎴�1锛�");
- //}
//棰勮浜哄ぉ鏍煎紡妫�楠�
var HWorkDays = option.data[i]["HWorkDays"] + "";
@@ -1625,13 +1492,13 @@
}
//闃舵璐熻矗浜洪潪绌烘楠�
- if (option.data[i]["HEmpName"] == "") {
+ if (option.data[i]["HEmpID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:闃舵璐熻矗浜轰笉鑳戒负绌�!");
return false;
}
//闃舵瀹℃牳浜洪潪绌烘楠�
- if (option.data[i]["HCheckEmpName"] == "") {
+ if (option.data[i]["HCheckEmpID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:闃舵瀹℃牳浜轰笉鑳戒负绌�!");
return false;
}
@@ -1640,19 +1507,10 @@
//#endregion
//#region 椤圭洰鎴愬憳琛ㄦ暟鎹楠�
- var num1 = [];
for (var i = 0; i < option1.data.length; i++) {
if (option1.data[i] != "") {
- //椤圭洰鎴愬憳閲嶅妫�楠�
- if ($.inArray(option1.data[i]["HEmployeeID"], num1) == -1) {
- num1.push(option1.data[i]["HEmployeeID"]);
- } else {
- layer.msg("绗�" + (i + 1) + "琛�,椤圭洰鎴愬憳:" + option1.data[i]["HEmployeeName"] + "閲嶅!");
- return false;
- }
-
//椤圭洰鎴愬憳闈炵┖妫�楠�
- if (option1.data[i]["HEmployeeName"] == "") {
+ if (option1.data[i]["HEmployeeID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:椤圭洰鎴愬憳涓嶈兘涓虹┖!");
return false;
}
@@ -1669,10 +1527,6 @@
return;
}
}
- ////鏄惁椤圭洰缁忕悊妫�楠�
- //if (option1.data[i]["HIsPM"] != "1" && option1.data[i]["HIsPM"] != "0") {
- // layer.msg("绗�" + (i + 1) + "琛岋細鏄惁椤圭洰缁忕悊璇疯緭鍏�0鎴�1锛�");
- //}
//棰勮鍒嗛厤涓氱哗鏍煎紡妫�楠�
var HPlanAvgMoney = option1.data[i]["HPlanAvgMoney"] + "";
@@ -1700,6 +1554,50 @@
}
}
}
+ }
+ //#endregion
+
+ //#region 瀛愯〃1鍏抽敭瀛楅噸澶嶆牎楠�
+ var num = [];
+ for (var i = 0; i < option.data.length; i++) {
+ if ($.inArray(option.data[i]["HProjectStageID"], num) == -1) {
+ num.push(option.data[i]["HProjectStageID"]);
+ } else {
+ layer.msg("绗�" + (i + 1) + "琛�,椤圭洰闃舵:" + option.data[i]["HProjectStageName"] + "閲嶅!");
+ return false;
+ }
+ }
+ //#endregion
+
+ //#region 瀛愯〃2鍏抽敭瀛楅噸澶嶆牎楠�
+ var num1 = [];
+ for (var i = 0; i < option1.data.length; i++) {
+ if ($.inArray(option1.data[i]["HEmployeeID"], num1) == -1) {
+ num1.push(option1.data[i]["HEmployeeID"]);
+ } else {
+ layer.msg("绗�" + (i + 1) + "琛�,椤圭洰鎴愬憳:" + option1.data[i]["HEmployeeName"] + "閲嶅!");
+ return false;
+ }
+ }
+ //#endregion
+
+ //#region 瀛愯〃1涓氱哗鍗犳瘮鍚堣鏍￠獙
+ var total = 0;
+ for (var i = 0; i < option.data.length; i++) {
+ total += option.data[i]["HRate"] * 1;
+ }
+ if (total > 100) {
+ layer.msg("椤圭洰闃舵琛細涓氱哗鍗犳瘮鍚堣瓒呭嚭100锛岃妫�鏌ワ紒!");
+ }
+ //#endregion
+
+ //#region 瀛愯〃2椤圭洰鍗犳瘮鍚堣鏍￠獙
+ var total1 = 0;
+ for (var i = 0; i < option1.data.length; i++) {
+ total1 += option1.data[i]["HRate"] * 1;
+ }
+ if (total1 > 100) {
+ layer.msg("椤圭洰鎴愬憳琛細椤圭洰鍗犳瘮鍚堣瓒呭嚭100锛岃妫�鏌ワ紒!");
}
//#endregion
@@ -2059,9 +1957,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) {
@@ -2183,9 +2081,9 @@
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
- option1.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ option1.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
} else {
- option1.cols[0][i + 1]["style"] = "font-size:100%";
+ option1.cols[0][i + 1]["style"] += "font-size:100%";
}
//璁剧疆鍒楀
//if (data1.data[0].HColumnWidth != 0) {
--
Gitblit v1.9.1