Merge branch 'feature/zs_v1.3_0822' into feature/zs_v1.3_risk

YLErpWeb/Controllers/SystemController.cs

@@ -1,11 +1,22 @@
-using Dapper;
+using BaseOUDAL;
+using Dapper;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
+using Org.BouncyCastle.Asn1.Ocsp;
+using System;
+using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using YLErp.Abstract;
 using YLErp.BLL;
+using YLErp.DBModels;
 using YLErp.DBModels.Consts;
 using YLErp.Modules.DictionaryModule;
 using YLErp.Modules.SystemModule;
+using YLErp.Web.Models;
 
 namespace YLErp.Web.Controllers
 {
@@ -667,7 +678,7 @@ namespace YLErp.Web.Controllers
             r.Password = null;
             return View(r);
         }
-
+        
         [MyAuthorize("系统管理-用户管理")]
         public ActionResult UserLevelView(int id)
         {
@@ -852,6 +863,15 @@ namespace YLErp.Web.Controllers
             }
         }
 
+        public JsonResult accountDelete(int accountIds)
+        {
+            var r = basedb.SystemUsers.Find(accountIds);
+            r.State = 2;
+            basedb.SaveChanges();
+            new SysUserService(CurUser).UpdateState(accountIds, 2);
+            return JsonSuccess("注销账户成功", r);
+        }
+
         public JsonResult accountAble(int accountIds)
         {
             var r = basedb.SystemUsers.Find(accountIds);

YLErpWeb/Controllers/entryexitController.cs

@@ -354,7 +354,7 @@ namespace YLErp.Web.Controllers
             {
                 return JsonError("找不到出入金信息");
             }
-            if (r.Direction != "出金" && r.Direction != "入金" && r.Direction != "其他收入" && r.Direction != "其他支出")
+            if (r.Direction != "出金" && r.Direction != "入金" && r.Direction != "其他收入" && r.Direction != "其他支出" && r.Direction != "划转")
             {
                 return JsonError("该笔交易不可以删除");
             }

YLErpWeb/Controllers/supervise_reportController.cs

@@ -1394,7 +1394,7 @@ namespace YLErp.Web.Controllers
             {
                 Directory.CreateDirectory(targetPath);
             }
-
+            ExcelPackage.LicenseContext= LicenseContext.NonCommercial;
             var targetFileName = Path.Combine(targetPath, service.TargetFileName);
             var path = ExcelTemplate.GeneratePDFFromExeclTemplate(sourcePath, sourceFileName, modelDict, targetPath, targetFileName, null, null, null, false);