From cb4717375f0524ff7c28fc73f453e6b53b7f5afb Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期日, 09 七月 2023 14:42:27 +0800
Subject: [PATCH] 1
---
WebTM/views/项目管理/项目阶段/Add_Edit_Gy_ProjectStage.html | 6 ++
WebTM/views/项目管理/项目阶段/PM_ProjectStageBill.html | 5 ++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 19 +++++++--
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 6 +-
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 34 ++++++++++-------
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 5 ++
WebTM/WebTM.csproj | 4 +-
7 files changed, 53 insertions(+), 26 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 601cc29..bc61233 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>07/09/2023 11:16:30</publishTime>
+ <publishTime>07/09/2023 13:48:31</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>07/09/2023 11:16:30</publishTime>
+ <publishTime>07/09/2023 13:48:31</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/11/2023 16:34:42</publishTime>
@@ -4272,10 +4272,16 @@
<publishTime>07/08/2023 23:52:28</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html">
- <publishTime>07/09/2023 13:12:46</publishTime>
+ <publishTime>07/09/2023 14:18:56</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBillList.html">
<publishTime>07/09/2023 11:43:49</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html">
+ <publishTime>07/09/2023 14:39:58</publishTime>
+ </File>
+ <File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html">
+ <publishTime>07/09/2023 13:47:48</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectReportBill.html">
<publishTime>07/09/2023 00:33:17</publishTime>
@@ -4284,7 +4290,7 @@
<publishTime>07/08/2023 23:54:41</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/Add_Edit_Gy_ProjectStage.html">
- <publishTime>07/06/2023 13:26:15</publishTime>
+ <publishTime>07/09/2023 14:28:24</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStage.html">
<publishTime>07/08/2023 11:32:20</publishTime>
@@ -4292,8 +4298,11 @@
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/Gy_ProjectStageList.html">
<publishTime>07/06/2023 09:17:28</publishTime>
</File>
+ <File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectReportBill.html">
+ <publishTime>07/09/2023 13:40:25</publishTime>
+ </File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectStageBill.html">
- <publishTime>07/09/2023 02:00:24</publishTime>
+ <publishTime>07/09/2023 14:38:06</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectStageBillList.html">
<publishTime>07/09/2023 02:05:17</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 537362f..3b5a1b9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1252,8 +1252,8 @@
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill.html" />
- <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectReportBill.html" />
- <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectReportBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBillList.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\Add_Edit_Gy_ProjectStage.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\Gy_ProjectStage.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectStageBillList.html" />
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 9425366..2b30144 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"
@@ -827,6 +827,11 @@
layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
return false;
}
+
+ if ($("#HReportEmpName").val() == "") {
+ layer.msg("姹囨姤浜烘湭閫夋嫨!");
+ return false;
+ }
//#endregion
//#region 椤圭洰闃舵琛ㄦ暟鎹楠�
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_ProjectReportBill.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"
similarity index 98%
rename from "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_ProjectReportBill.html"
rename to "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 070cd0d..77c10aa 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_ProjectReportBill.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"
@@ -416,7 +416,7 @@
, element = layui.element;
//妯″潡鍚�
- var HModName = "Gy_ProjectReportBill";
+ var HModName = "Gy_ProjectBill";
//琛ㄦ牸娓叉煋鍙傛暟
var option = {}; //椤圭洰闃舵琛ㄦ覆鏌撳弬鏁�
var option1 = {}; //椤圭洰鎴愬憳琛ㄦ覆鏌撳弬鏁�
@@ -1215,6 +1215,12 @@
});
//瀛愯〃 璧嬪��
+ for (var i = 0; i < tableSub.length; i++) {
+ tableSub[i].HIsKey = (tableSub[i].HIsKey) ? 1 : 0;
+ }
+ for (var i = 0; i < tableSub_Emp.length; i++) {
+ tableSub_Emp[i].HIsPM = (tableSub_Emp[i].HIsPM) ? 1 : 0;
+ }
option.data = tableSub;
table.render(option);
option1.data = tableSub_Emp;
@@ -1386,7 +1392,7 @@
}
//涓氱哗鍗犳瘮鏍煎紡妫�楠�
- var HRate = option.data[i]["HRate"];
+ var HRate = option.data[i]["HRate"] + "";
if (HRate.substring(HRate.length - 1, HRate.length) == ".") {
layer.msg("涓氱哗鍗犳瘮鏈熬涓嶈兘涓�.锛�");
return;
@@ -1397,13 +1403,13 @@
return;
}
}
- //閲岀▼纰戝唴瀹规楠�
- if (option.data[i]["HIsKey"] != "1" && option.data[i]["HIsKey"] != "0") {
- layer.msg("閲岀▼纰戣杈撳叆0鎴�1锛�");
- }
+ ////閲岀▼纰戝唴瀹规楠�
+ //if (option.data[i]["HIsKey"] != "1" && option.data[i]["HIsKey"] != "0") {
+ // layer.msg("閲岀▼纰戣杈撳叆0鎴�1锛�");
+ //}
//棰勮浜哄ぉ鏍煎紡妫�楠�
- var HWorkDays = option.data[i]["HWorkDays"];
+ var HWorkDays = option.data[i]["HWorkDays"] + "";
if (HWorkDays.substring(HWorkDays.length - 1, HWorkDays.length) == ".") {
layer.msg("棰勮浜哄ぉ鏈熬涓嶈兘涓�.锛�");
return;
@@ -1449,7 +1455,7 @@
}
//椤圭洰鍗犳瘮鏍煎紡妫�楠�
- var HRate = option1.data[i]["HRate"];
+ var HRate = option1.data[i]["HRate"] + "";
if (HRate.substring(HRate.length - 1, HRate.length) == ".") {
layer.msg("绗�" + (i + 1) + "琛岋細椤圭洰鍗犳瘮鏈熬涓嶈兘涓�.锛�");
return;
@@ -1460,13 +1466,13 @@
return;
}
}
- //鏄惁椤圭洰缁忕悊妫�楠�
- if (option1.data[i]["HIsPM"] != "1" && option1.data[i]["HIsPM"] != "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細鏄惁椤圭洰缁忕悊璇疯緭鍏�0鎴�1锛�");
- }
+ ////鏄惁椤圭洰缁忕悊妫�楠�
+ //if (option1.data[i]["HIsPM"] != "1" && option1.data[i]["HIsPM"] != "0") {
+ // layer.msg("绗�" + (i + 1) + "琛岋細鏄惁椤圭洰缁忕悊璇疯緭鍏�0鎴�1锛�");
+ //}
//棰勮鍒嗛厤涓氱哗鏍煎紡妫�楠�
- var HPlanAvgMoney = option1.data[i]["HPlanAvgMoney"];
+ var HPlanAvgMoney = option1.data[i]["HPlanAvgMoney"] + "";
if (HPlanAvgMoney.substring(HPlanAvgMoney.length - 1, HPlanAvgMoney.length) == ".") {
layer.msg("绗�" + (i + 1) + "琛岋細棰勮鍒嗛厤涓氱哗鏈熬涓嶈兘涓�.锛�");
return;
@@ -1479,7 +1485,7 @@
}
//棰勮鎻愭垚鏍煎紡妫�楠�
- var HPlanCountMoney = option1.data[i]["HPlanCountMoney"];
+ var HPlanCountMoney = option1.data[i]["HPlanCountMoney"] + "";
if (HPlanCountMoney.substring(HPlanCountMoney.length - 1, HPlanCountMoney.length) == ".") {
layer.msg("绗�" + (i + 1) + "琛岋細棰勮鎻愭垚鏈熬涓嶈兘涓�.锛�");
return;
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_ProjectReportBillList.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_ProjectBillList.html"
similarity index 99%
rename from "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_ProjectReportBillList.html"
rename to "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_ProjectBillList.html"
index 3c603c9..90801c9 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_ProjectReportBillList.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_ProjectBillList.html"
@@ -132,7 +132,7 @@
, laydate = layui.laydate
var option = [];
var sWhere = "";
- var HModName = "PM_ProjectReportBillList";
+ var HModName = "PM_ProjectBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID","HProcessID_K3","HUSEORGID"];
@@ -416,7 +416,7 @@
, area: ['100%', '100%']
, title: '宸ョ▼椤圭洰鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectReportBill.html?OperationType=1&linterid=0&HSouceBillType='
+ , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=1&linterid=0&HSouceBillType='
,btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
btn1: function (index, layero, that) {
@@ -439,7 +439,7 @@
, area: ['100%', '100%']
, title: '宸ョ▼椤圭洰鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
btn1: function (index, layero, that) {
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/Add_Edit_Gy_ProjectStage.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/Add_Edit_Gy_ProjectStage.html"
index f556fdd..284deba 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/Add_Edit_Gy_ProjectStage.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/Add_Edit_Gy_ProjectStage.html"
@@ -220,7 +220,11 @@
//閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
- Pub_Close(1);
+ if (params[1] != null) {
+ Pub_Close(1);
+ } else if (params[1] == null) {
+ Pub_Close(2);
+ }
})
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
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_ProjectStageBill.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_ProjectStageBill.html"
index a59bf2b..0285d0a 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_ProjectStageBill.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_ProjectStageBill.html"
@@ -664,6 +664,9 @@
});
//瀛愯〃 璧嬪��
+ for (var i = 0; i < tableSub.length; i++) {
+ tableSub[i].HIsKey = (tableSub[i].HIsKey) ? 1 : 0;
+ }
option.data = tableSub;
table.render(option);
}
@@ -798,7 +801,7 @@
}
//涓氱哗鍗犳瘮鏍煎紡妫�楠�
- var HRate = option.data[i]["HRate"];
+ var HRate = option.data[i]["HRate"] + "";
if (HRate.substring(HRate.length - 1, HRate.length) == ".") {
layer.msg("涓氱哗鍗犳瘮鏈熬涓嶈兘涓�.锛�");
return;
--
Gitblit v1.9.1