From 37a68d069b7000c1f591354645fb0e285fa7c5d4 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 20 九月 2023 14:33:50 +0800
Subject: [PATCH] 工作任务维护、任务汇报维护：根据用户对应职员过滤与过滤条件 派单人/汇报人 冲突问题解决
---
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 18 +++++++++++-------
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 4 ++--
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBillList.html | 17 ++++++++++-------
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 2ef2153..1885fa3 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -4578,13 +4578,13 @@
<publishTime>09/07/2023 10:55:19</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillList.html">
- <publishTime>09/20/2023 13:40:17</publishTime>
+ <publishTime>09/20/2023 14:17:08</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/19/2023 15:48:33</publishTime>
+ <publishTime>09/20/2023 14:21:33</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html">
<publishTime>09/03/2023 14:04:05</publishTime>
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 3556bac..3cdbc5d 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"
@@ -386,10 +386,10 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
//鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
- //var HUserName = getHEmpByHUserName();
- //if (HUserName != "" && HUserName != null) {
- // sWhere += " and (娲惧崟浜� = '" + HUserName + "' or 鎺ュ崟浜� = '" + HUserName + "' or 鎶勯�佷汉 like '%" + HUserName + "%') ";
- //}
+ var HUserName = getHEmpByHUserName();
+ if (HUserName != "" && HUserName != null) {
+ sWhere += " and (娲惧崟浜� = '" + HUserName + "' or 鎺ュ崟浜� = '" + HUserName + "' or 鎶勯�佷汉 like '%" + HUserName + "%') ";
+ }
var HOrgID = "";
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -401,6 +401,12 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+
+ //鑻ヨ繃婊ゆ潯浠讹細鎺ュ崟浜� 涓嶄负绌猴紝鍒欏拷鐣ヨ处鍙蜂俊鎭紝閫氳繃鎺ュ崟浜鸿繘琛岃繃婊�
+ if (HReceiveEmp && HReceiveEmp!="") {
+ sWhere = " and 鎺ュ崟浜� like '%" + HReceiveEmp + "%'";
+ }
+
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -444,9 +450,7 @@
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 866240a..caf6312 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"
@@ -382,10 +382,10 @@
//#region 蹇�熻繃婊�
function get_FastQuery(number) {
////鑾峰彇鐧诲綍璐︽埛瀵瑰簲鑱屽憳鍚嶇О
- //var HUserName = getHEmpByHUserName();
- //if (HUserName != "" && HUserName != null) {
- // sWhere = " and 姹囨姤浜� = '" + HUserName + "' ";
- //}
+ var HUserName = getHEmpByHUserName();
+ if (HUserName != "" && HUserName != null) {
+ sWhere = " and 姹囨姤浜� = '" + HUserName + "' ";
+ }
var HOrgID = "";
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -397,6 +397,12 @@
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+
+ //鑻ヨ繃婊ゆ潯浠讹細姹囨姤浜� 涓嶄负绌猴紝鍒欏拷鐣ヨ处鍙蜂俊鎭紝閫氳繃鎺ュ崟浜鸿繘琛岃繃婊�
+ if (HReportEmp && HReportEmp!="" ) {
+ sWhere = " and 姹囨姤浜� like '%" + HReportEmp + "%'";
+ }
+
if (ColName != 0 && Comparator != 0) {
var com = "";
@@ -431,9 +437,6 @@
}
if (HOrgID) {
sWhere += " and HOrgID = '" + HOrgID + "'";
- }
- if (HReportEmp) {
- sWhere += " and 姹囨姤浜� like '%" + HReportEmp + "%'";
}
if (HBillStatus) {
sWhere += " and 鍗曟嵁鐘舵�� like '%" + HBillStatus + "%'";
--
Gitblit v1.9.1