Browse Source

update

pull/1/head
wanggang 1 year ago
parent
commit
cc777cd128
  1. 2
      docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs
  2. 2
      docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs
  3. 2
      docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs
  4. 3
      docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs
  5. 2
      docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs
  6. 2
      docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs
  7. 2
      docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs
  8. 3
      docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs
  9. 2
      docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs
  10. 2
      docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs
  11. 2
      docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs
  12. 3
      docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs
  13. 2
      docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs
  14. 3
      docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs
  15. 2
      docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs
  16. 2
      docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs
  17. 2
      docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs
  18. 3
      docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs
  19. 2
      docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs
  20. 2
      docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs
  21. 2
      docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs
  22. 3
      docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs
  23. 4
      docs/demo/src/WTA.Shared/Controllers/GenericController.cs
  24. 2
      docs/demo/src/WTA/wwwroot/components/list/index.js

2
docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs

@ -17,7 +17,7 @@ public class BBAC_DNController : GenericController<BBAC_DN, BBAC_DN, BBAC_DN, BB
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs

@ -16,7 +16,7 @@ public class BBAC_DN_DETAILController : GenericController<BBAC_DN_DETAIL, BBAC_D
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs

@ -23,7 +23,7 @@ public class BBAC_SAController : GenericController<BBAC_SA, BBAC_SA, BBAC_SA, BB
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

3
docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs

@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -14,7 +15,7 @@ public class BBAC_SE_DETAILController : GenericController<BBAC_SE_DETAIL, BBAC_S
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs

@ -17,7 +17,7 @@ public class BJ_DNController : GenericController<BJ_DN, BJ_DN, BJ_DN, BJ_DN, BJ_
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs

@ -16,7 +16,7 @@ public class BJ_DN_DETAILController : GenericController<BJ_DN_DETAIL, BJ_DN_DETA
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs

@ -23,7 +23,7 @@ public class BJ_SAController : GenericController<BJ_SA, BJ_SA, BJ_SA, BJ_SA, BJ_
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

3
docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs

@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -14,7 +15,7 @@ public class BJ_SE_DETAILController : GenericController<BJ_SE_DETAIL, BJ_SE_DETA
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs

@ -17,7 +17,7 @@ public class HBPO_DNController : GenericController<HBPO_DN, HBPO_DN, HBPO_DN, HB
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs

@ -16,7 +16,7 @@ public class HBPO_DN_DETAILController : GenericController<HBPO_DN_DETAIL, HBPO_D
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs

@ -29,7 +29,7 @@ public class HBPO_SAController : GenericController<HBPO_SA, HBPO_SA, HBPO_SA, HB
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

3
docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs

@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -14,7 +15,7 @@ public class HBPO_SE_DETAILController : GenericController<HBPO_SE_DETAIL, HBPO_S
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs

@ -17,7 +17,7 @@ public class INVOICEController : GenericController<INVOICE, INVOICE, INVOICE, IN
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

3
docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs

@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -15,7 +16,7 @@ public class INVOICE_DETAILController : GenericController<INVOICE_DETAIL, INVOIC
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs

@ -17,7 +17,7 @@ public class IN_DNController : GenericController<IN_DN, IN_DN, IN_DN, IN_DN, IN_
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs

@ -16,7 +16,7 @@ public class IN_DN_DETAILController : GenericController<IN_DN_DETAIL, IN_DN_DETA
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs

@ -23,7 +23,7 @@ public class IN_SAController : GenericController<IN_SA, IN_SA, IN_SA, IN_SA, IN_
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

3
docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs

@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -14,7 +15,7 @@ public class IN_SE_DETAILController : GenericController<IN_SE_DETAIL, IN_SE_DETA
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs

@ -17,7 +17,7 @@ public class JIT_DNController : GenericController<JIT_DN, JIT_DN, JIT_DN, JIT_DN
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs

@ -16,7 +16,7 @@ public class JIT_DN_DETAILController : GenericController<JIT_DN_DETAIL, JIT_DN_D
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

2
docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs

@ -23,7 +23,7 @@ public class JIT_SAController : GenericController<JIT_SA, JIT_SA, JIT_SA, JIT_SA
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

3
docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs

@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -14,7 +15,7 @@ public class JIT_SE_DETAILController : GenericController<JIT_SE_DETAIL, JIT_SE_D
} }
[NonAction] [NonAction]
public override IActionResult Import(IFormFile importexcelfile) public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
return base.Import(importexcelfile); return base.Import(importexcelfile);
} }

4
docs/demo/src/WTA.Shared/Controllers/GenericController.cs

@ -1,3 +1,4 @@
using System.ComponentModel.DataAnnotations;
using System.Globalization; using System.Globalization;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@ -194,8 +195,9 @@ public class GenericController<TEntity, TModel, TListModel, TSearchModel, TImpor
} }
} }
[Consumes("multipart/form-data")]
[HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")] [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")]
public virtual IActionResult Import(IFormFile importexcelfile) public virtual IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false)
{ {
try try
{ {

2
docs/demo/src/WTA/wwwroot/components/list/index.js

@ -235,7 +235,7 @@ export default {
<el-link type="primary" @click="getImportTemplate">{{$t('下载')}}</el-link> <el-link type="primary" @click="getImportTemplate">{{$t('下载')}}</el-link>
</el-form-item> </el-form-item>
<el-form-item :label="$t('文件')"> <el-form-item :label="$t('文件')">
<el-upload drag v-model="importModel.file"> <el-upload drag v-model="importModel.file" :auto-upload="false">
<el-icon class="el-icon--upload"><ep-upload-filled /></el-icon> <el-icon class="el-icon--upload"><ep-upload-filled /></el-icon>
<div class="el-upload__text">{{$t('拖放文件到此处或')}} <em>{{$t('点击上传')}}</em></div> <div class="el-upload__text">{{$t('拖放文件到此处或')}} <em>{{$t('点击上传')}}</em></div>
</el-upload> </el-upload>

Loading…
Cancel
Save