From f72e704d0516142dd291f13f1b80fa03cf5ed265 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 12 十月 2023 10:53:24 +0800
Subject: [PATCH] 任务汇报：数据校验子表耗用工时不能为0；子表同一项目、阶段、名字重复校验报错问题解决
---
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 8 ++++----
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 10 +++++++---
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 301ac8a..eae1487 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -18,10 +18,10 @@
<publishTime>01/28/2016 14:22:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>10/07/2023 10:23:01</publishTime>
+ <publishTime>10/12/2023 10:50:59</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>10/07/2023 10:23:01</publishTime>
+ <publishTime>10/12/2023 10:50:59</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/11/2023 16:34:42</publishTime>
@@ -4602,7 +4602,7 @@
<publishTime>09/22/2023 14:45:23</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html">
- <publishTime>09/20/2023 13:35:48</publishTime>
+ <publishTime>10/12/2023 10:50:46</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBillList.html">
<publishTime>09/22/2023 14:47:37</publishTime>
@@ -4890,7 +4890,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="Web.config">
- <publishTime>10/07/2023 10:23:04</publishTime>
+ <publishTime>10/08/2023 16:51:06</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
index 7cb1354..869611f 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskReportBill.html"
@@ -1069,7 +1069,11 @@
if (HRelTimes.substring(HRelTimes.length - 1, HRelTimes.length) == ".") {
layer.msg("绗�" + (i + 1) + "琛岋細鑰楃敤宸ユ椂鏈熬涓嶈兘涓�.锛�");
return;
- } else {
+ } else if (HRelTimes == "0") {
+ layer.msg("绗�" + (i + 1) + "琛岋細鑰楃敤宸ユ椂涓嶈兘涓�0锛�");
+ return;
+ }
+ else {
var ref = /^[0-9]+\.?[0-9]*$/;
if (!ref.test(HRelTimes)) {
layer.msg("绗�" + (i + 1) + "琛岋細鑰楃敤宸ユ椂璇疯緭姝ｇ‘鍏ユ暟瀛楋紒");
@@ -1083,9 +1087,9 @@
//#region 瀛愯〃鍏抽敭瀛楁閲嶅妫�楠�
var num = [];
for (var i = 0; i < option.data.length; i++) {
- temp = option.data[i]["HProjectID"] + "|" + option.data[i]["HProjectStageID"] + "|" + option.data[i]["HName"];
+ temp = option.data[i]["HProjectID"] + "|" + option.data[i]["HProjectStageID"] + "|" + option.data[i]["HName"] + "|" + option.data[i]["HSourceInterID"] + "|" + option.data[i]["HSourceEntryID"];
if ($.inArray(temp, num) != -1) {
- layer.msg("绗�" + (i + 1) + "琛岋細椤圭洰浠ｇ爜銆侀」鐩樁娈点�佷换鍔″悕绉伴噸澶嶏紝璇烽噸鏂伴�夋嫨锛�");
+ layer.msg("绗�" + (i + 1) + "琛岋細浠诲姟閲嶅锛岃閲嶆柊閫夋嫨锛�");
return false;
}
num.push(temp);
--
Gitblit v1.9.1