diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs index 37a2af53..9295f724 100644 --- a/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs @@ -1,4 +1,5 @@ using CSRedis; +using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Hosting; using Newtonsoft.Json; @@ -130,7 +131,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.md /// /// [HttpGet("exportProduct")] - public IActionResult ExportProduct(DateTime starttime, DateTime endtime, string productCode="", string productName = "") + public IActionResult ExportProduct(DateTime starttime, DateTime endtime, string productCode = "", string productName = "") { List units = null; @@ -141,6 +142,46 @@ namespace ZR.Admin.WebApi.Controllers.mes.md return ExportExcel(result.Item2, result.Item1); } + + + /// + /// + /// + /// 0：只新增 1：新增且更新 + /// + [HttpPost("importExcel")] + public IActionResult ImportExcel() + { + + + IFormFileCollection files = Request.Form.Files; + foreach (IFormFile file in files) + { + string directory = Path.Combine(App.WebHostEnvironment.ContentRootPath, "Images"); + string fileExtension = Path.GetExtension(file.FileName); + string fileName = Guid.NewGuid().ToString() + fileExtension; + string filePath = Path.Combine(directory, fileName);// 生成文件路径 + + if (!Directory.Exists(directory)) + { + Directory.CreateDirectory(directory); + } + + // 写入文件 + using (var stream = new FileStream(filePath, FileMode.Create)) + { + file.CopyTo(stream); + stream.Flush(); + } + } + return null; + } + + public IActionResult importTemplate() + { + return null; + + } } } diff --git a/ZR.Admin.WebApi/Controllers/mes/md/MdUnitController.cs b/ZR.Admin.WebApi/Controllers/mes/md/MdUnitController.cs index 439e3d93..05739ff4 100644 --- a/ZR.Admin.WebApi/Controllers/mes/md/MdUnitController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/md/MdUnitController.cs @@ -104,18 +104,17 @@ namespace ZR.Admin.WebApi.Controllers.mes.md public IActionResult exportUnit([FromQuery] SearchOptionDTO searchOption) { List units = null; - if(searchOption != null) + if (searchOption != null) { - units= unitService.GetList(searchOption); + units = unitService.GetList(searchOption); } var result = ExportExcelMini(units, "unit", "单位列表"); return ExportExcel(result.Item2, result.Item1); - + } - - + } diff --git a/ZR.Admin.WebApi/Images/0c1af12b-35be-44fe-8dd6-8c425ce93552.xls b/ZR.Admin.WebApi/Images/0c1af12b-35be-44fe-8dd6-8c425ce93552.xls new file mode 100644 index 00000000..6d2ca343 Binary files /dev/null and b/ZR.Admin.WebApi/Images/0c1af12b-35be-44fe-8dd6-8c425ce93552.xls differ diff --git a/ZR.Admin.WebApi/Images/b39d12da-04ca-4d1b-93e2-9bec69e6f36c.xlsx b/ZR.Admin.WebApi/Images/b39d12da-04ca-4d1b-93e2-9bec69e6f36c.xlsx new file mode 100644 index 00000000..71df4975 Binary files /dev/null and b/ZR.Admin.WebApi/Images/b39d12da-04ca-4d1b-93e2-9bec69e6f36c.xlsx differ diff --git a/ZR.Vue/src/views/basisManagement/productEfinition.vue b/ZR.Vue/src/views/basisManagement/productEfinition.vue index d0b0e09c..b9c8f0f0 100644 --- a/ZR.Vue/src/views/basisManagement/productEfinition.vue +++ b/ZR.Vue/src/views/basisManagement/productEfinition.vue @@ -26,6 +26,9 @@ 导出 + + 导入 + @@ -102,6 +105,35 @@ 取 消 + + + + + +
将文件拖到此处，或点击上传
+ +
+
是否更新已经存在的设备数据
+ 仅允许导入xls、xlsx格式文件。 + 下载模板 +
+ +
+ 确 定 + 取 消 +
+ @@ -115,6 +147,7 @@ import { delproduct, exportProduct, } from '@/api/basisManagement/productEfinition.js' +import { getToken } from '@/utils/auth' import { debounce } from '@/utils' export default { @@ -198,6 +231,21 @@ export default { }, ], }, + //上传配置 + upload: { + // 是否显示弹出层（用户导入） + open: false, + // 弹出层标题（用户导入） + title: '上传', + // 是否禁用上传 + isUploading: false, + // 是否更新已经存在的用户数据 + updateSupport: 0, + // 设置上传的请求头部 + headers: { Authorization: 'Bearer ' + getToken() }, + // 上传的地址 + url: process.env.VUE_APP_BASE_API + '/mes/md/product/importExcel', + }, } }, created() { @@ -221,8 +269,8 @@ export default { this.open = true }, handleUpdate(row) { - debugger - this.dmlform.productUnitName = '22222222222222222' + + this.reset() this.open = true this.title = '修改' @@ -379,6 +427,35 @@ export default { handleProcessrouteNameSelect(row) { this.dmlform.Processroute = row.measureId }, + + //导入excel + handleExcel_import() { + this.upload.open = true + }, + // 文件上传中处理 + handleFileUploadProgress(event, file, fileList) { + this.upload.isUploading = true + }, + // 文件上传成功处理 + handleFileSuccess(response, file, fileList) { + this.upload.open = false + this.upload.isUploading = false + this.$refs.upload.clearFiles() + this.$alert("
" + response.msg + '
', '导入结果', { + dangerouslyUseHTMLString: true, + }) + this.getList() + }, + + // 提交上传文件 + submitFileForm() { + this.$refs.upload.submit() + }, + + /** 下载模板操作 */ + importTemplate() { + this.download('mes/dv/product/importTemplate', {}, `md_item_${new Date().getTime()}.xlsx`) + }, }, } diff --git a/ZR.Vue/src/views/basisManagement/workshop.vue b/ZR.Vue/src/views/basisManagement/workshop.vue index e69de29b..90478e92 100644 --- a/ZR.Vue/src/views/basisManagement/workshop.vue +++ b/ZR.Vue/src/views/basisManagement/workshop.vue @@ -0,0 +1,17 @@ + + + + +