工作任务维护、任务汇报维护：根据用户对应职员过滤与过滤条件 派单人/汇报人 冲突问题解决

duhe

2023-09-20 37a68d069b7000c1f591354645fb0e285fa7c5d4

工作任务维护、任务汇报维护：根据用户对应职员过滤与过滤条件 派单人/汇报人 冲突问题解决

 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>

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

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/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 + "%'";