From caab4eb531f16305f4986bc3877db55812adcc91 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 22 九月 2023 13:40:32 +0800
Subject: [PATCH] 工作任务列表维护、任务汇报列表维护：处理根据账号获取数据和接单人/汇报人过滤框的关系
---
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 11 ++++-------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 14 +++++++-------
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBillList.html | 9 +++++----
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 5a48830..52bef5e 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>09/22/2023 09:36:13</publishTime>
+ <publishTime>09/22/2023 12:43:45</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>09/22/2023 09:36:13</publishTime>
+ <publishTime>09/22/2023 12:43:45</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/11/2023 16:34:42</publishTime>
@@ -846,7 +846,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/Baseset/SRM_OpenTmpList.html">
- <publishTime>07/21/2023 16:26:23</publishTime>
+ <publishTime>09/22/2023 12:03:42</publishTime>
</File>
<File Include="views/Baseset/SRM_OpenTmpList_GXPG.html">
<publishTime>07/21/2023 16:27:09</publishTime>
@@ -2277,7 +2277,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Kf_MateOutBillList.aspx">
- <publishTime>09/14/2023 12:19:16</publishTime>
+ <publishTime>09/22/2023 11:07:07</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Kf_OtherOutBillList.aspx">
<publishTime>05/19/2023 09:24:32</publishTime>
@@ -4581,13 +4581,13 @@
<publishTime>09/07/2023 10:55:19</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillList.html">
- <publishTime>09/20/2023 14:17:08</publishTime>
+ <publishTime>09/22/2023 13:34:07</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html">
<publishTime>09/20/2023 13:35:48</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBillList.html">
- <publishTime>09/20/2023 14:21:33</publishTime>
+ <publishTime>09/22/2023 13:35:05</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html">
<publishTime>09/03/2023 14:04:05</publishTime>
@@ -4869,7 +4869,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/22/2023 09:36:17</publishTime>
+ <publishTime>09/22/2023 12:43:48</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_WorkTaskBillList.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_WorkTaskBillList.html"
index 3cdbc5d..02bba11 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_WorkTaskBillList.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_WorkTaskBillList.html"
@@ -402,12 +402,6 @@
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
- //鑻ヨ繃婊ゆ潯浠讹細鎺ュ崟浜� 涓嶄负绌猴紝鍒欏拷鐣ヨ处鍙蜂俊鎭紝閫氳繃鎺ュ崟浜鸿繘琛岃繃婊�
- if (HReceiveEmp && HReceiveEmp!="") {
- sWhere = " and 鎺ュ崟浜� like '%" + HReceiveEmp + "%'";
- }
-
-
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -450,7 +444,10 @@
if (HBillStatus) {
sWhere += " and 鍗曟嵁鐘舵�� like '%" + HBillStatus + "%'";
}
-
+ if (HReceiveEmp) {
+ sWhere += " and 鎺ュ崟浜� like '%" + HReceiveEmp + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
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_WorkTaskReportBillList.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_WorkTaskReportBillList.html"
index caf6312..feb683a 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_WorkTaskReportBillList.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_WorkTaskReportBillList.html"
@@ -398,10 +398,7 @@
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
- //鑻ヨ繃婊ゆ潯浠讹細姹囨姤浜� 涓嶄负绌猴紝鍒欏拷鐣ヨ处鍙蜂俊鎭紝閫氳繃鎺ュ崟浜鸿繘琛岃繃婊�
- if (HReportEmp && HReportEmp!="" ) {
- sWhere = " and 姹囨姤浜� like '%" + HReportEmp + "%'";
- }
+
if (ColName != 0 && Comparator != 0) {
@@ -447,6 +444,10 @@
if (HTaskNote) {
sWhere += " and 浠诲姟鎻忚堪 like '%" + HTaskNote + "%'";
}
+ if (HReportEmp) {
+ sWhere += " and 姹囨姤浜� like '%" + HReportEmp + "%'";
+ }
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
--
Gitblit v1.9.1