工作任务列表维护、任务汇报列表维护：处理根据账号获取数据和接单人/汇报人过滤框的关系

duhe

2023-09-22 caab4eb531f16305f4986bc3877db55812adcc91

工作任务列表维护、任务汇报列表维护：处理根据账号获取数据和接单人/汇报人过滤框的关系

 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>

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/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 = "";//调用接口后清空sWhere缓存
            }

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/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 = "";//调用接口后清空sWhere缓存
            }