1

Property.Modele.FixedAssets/PropertyModule.cs

@@ -4516,6 +4516,10 @@ namespace Property.Module.FixedAssets
                     }
                     //发送通知  经办人有变更（让其快速处理采购）
                     PushBuyingMessage(account, 0, "您有请购单待采购，请往资产管理系统查看", "请购单通知", userInfo.EmployeeId, Common.Models.PushMessageCategoryEnum.PurchaseRequisition);
+
+                    string markdownContent2 = $"`您有待采购的请购单\n>**概要信息** \n>请购标题：{model.Name}\n>请购类型：{(model.Type == 1 ? "资产" : "耗材")}\n>采购状态：<font color='comment'>待采购</font>\n>";
+                    string JumpUrl2 = System.Web.HttpUtility.UrlEncode($"/PurchaseRequisitionExamine?showTable=4");
+                    PushWeChatWorkAuditMsg(Common.Models.PushMessageCategoryEnum.BuyingRequisition, markdownContent2, "请购单采购", account, JumpUrl2);
                 }
             }
             return flag;

Property.Modele.FixedAssets/WorkFlowModule.cs

@@ -4296,11 +4296,11 @@ namespace Property.Module.FixedAssets
                     //推送企业微信
                     string markdownContent = $"`资产请购单审批完成\n>**概要信息** \n>请购标题：{usemodel.Name}\n>请购类型：{(usemodel.Type == 1 ? "资产" : "耗材")}\n>申  请  人：<font color='warning'>{CreateModel?.EmployeeName}</font>\n>通过时间：<font color='comment'>{DateTime.Now.ToString("MM-dd HH-mm")}</font>\n>";
                     string JumpUrl = System.Web.HttpUtility.UrlEncode($"/PurchaseRequisitionDetail?Id={usemodel.Id}&backto=PurchaseRequisitionExamine&showTable=1&compType=chakan");
-                    PushWeChatWorkAuditMsg(Common.Models.PushMessageCategoryEnum.BuyingRequisition, markdownContent, "请购审批完成", AuditAccountList, JumpUrl);
+                    PushWeChatWorkAuditMsg(Common.Models.PushMessageCategoryEnum.BuyingRequisition, markdownContent, "请购审批完成", EmNameList, JumpUrl);
 
                     string markdownContent2 = $"`您有待采购的请购单\n>**概要信息** \n>请购标题：{usemodel.Name}\n>请购类型：{(usemodel.Type == 1 ? "资产" : "耗材")}\n>申  请  人：<font color='warning'>{CreateModel?.EmployeeName}</font>\n>采购状态：<font color='comment'>待采购</font>\n>";
                     string JumpUrl2 = System.Web.HttpUtility.UrlEncode($"/PurchaseRequisitionExamine?showTable=4");
-                    PushWeChatWorkAuditMsg(Common.Models.PushMessageCategoryEnum.BuyingRequisition, markdownContent2, "请购单采购", AuditAccountList, JumpUrl2);
+                    PushWeChatWorkAuditMsg(Common.Models.PushMessageCategoryEnum.BuyingRequisition, markdownContent2, "请购单采购", OperatorList, JumpUrl2);
                 }
                 else
                 {