diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index 7208b340..76b70ba5 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -215,6 +215,74 @@ + + + 分页查 + + + + + + 单查 + + + + + + 增 + + + + + + + 更 + + + + + + + + 删 + + + + + + + 分页查 + + + + + + 单查 + + + + + + 增 + + + + + + + 更 + + + + + + + + 删 + + + + 分页查 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseController.cs new file mode 100644 index 00000000..e710568e --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseController.cs @@ -0,0 +1,81 @@ +using Microsoft.AspNetCore.Mvc; +using Yi.Framework.Common.Models; +using Yi.Framework.DtoModel.ERP.Purchase; +using Yi.Framework.Interface.ERP; + +namespace Yi.Framework.ApiMicroservice.Controllers.ERP +{ + [ApiController] + [Route("api/[controller]/[action]")] + public class PurchaseController : ControllerBase + { + private readonly ILogger _logger; + private readonly IPurchaseService _purchaseService; + public PurchaseController(ILogger logger, IPurchaseService purchaseService) + { + _logger = logger; + _purchaseService = purchaseService; + } + + /// + /// 分页查 + /// + /// + [HttpGet] + public async Task PageList([FromQuery] PurchaseCreateUpdateInput input, [FromQuery] PageParModel page) + { + var result = await _purchaseService.PageListAsync(input, page); + return Result.Success().SetData(result); + } + + /// + /// 单查 + /// + /// + [HttpGet] + [Route("{id}")] + public async Task GetById(long id) + { + var result = await _purchaseService.GetByIdAsync(id); + return Result.Success().SetData(result); + } + + /// + /// 增 + /// + /// + /// + [HttpPost] + public async Task Create(PurchaseCreateUpdateInput input) + { + var result = await _purchaseService.CreateAsync(input); + return Result.Success().SetData(result); + } + + /// + /// 更 + /// + /// + /// + /// + [HttpPut] + [Route("{id}")] + public async Task Update(long id, PurchaseCreateUpdateInput input) + { + var result = await _purchaseService.UpdateAsync(id, input); + return Result.Success().SetData(result); + } + + /// + /// 删 + /// + /// + /// + [HttpDelete] + public async Task Del(List ids) + { + await _purchaseService.DeleteAsync(ids); + return Result.Success(); + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs new file mode 100644 index 00000000..b1b5dd45 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs @@ -0,0 +1,81 @@ +using Microsoft.AspNetCore.Mvc; +using Yi.Framework.Common.Models; +using Yi.Framework.DtoModel.ERP.PurchaseDetails; +using Yi.Framework.Interface.ERP; + +namespace Yi.Framework.ApiMicroservice.Controllers.ERP +{ + [ApiController] + [Route("api/[controller]/[action]")] + public class PurchaseDetailsController : ControllerBase + { + private readonly ILogger _logger; + private readonly IPurchaseDetailsService _purchaseDetailsService; + public PurchaseDetailsController(ILogger logger, IPurchaseDetailsService purchaseDetailsService) + { + _logger = logger; + _purchaseDetailsService = purchaseDetailsService; + } + + /// + /// 分页查 + /// + /// + [HttpGet] + public async Task PageList([FromQuery] PurchaseDetailsCreateUpdateInput input, [FromQuery] PageParModel page) + { + var result = await _purchaseDetailsService.PageListAsync(input, page); + return Result.Success().SetData(result); + } + + /// + /// 单查 + /// + /// + [HttpGet] + [Route("{id}")] + public async Task GetById(long id) + { + var result = await _purchaseDetailsService.GetByIdAsync(id); + return Result.Success().SetData(result); + } + + /// + /// 增 + /// + /// + /// + [HttpPost] + public async Task Create(PurchaseDetailsCreateUpdateInput input) + { + var result = await _purchaseDetailsService.CreateAsync(input); + return Result.Success().SetData(result); + } + + /// + /// 更 + /// + /// + /// + /// + [HttpPut] + [Route("{id}")] + public async Task Update(long id, PurchaseDetailsCreateUpdateInput input) + { + var result = await _purchaseDetailsService.UpdateAsync(id, input); + return Result.Success().SetData(result); + } + + /// + /// 删 + /// + /// + /// + [HttpDelete] + public async Task Del(List ids) + { + await _purchaseDetailsService.DeleteAsync(ids); + return Result.Success(); + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 86af01f9..6e7a4260 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/ConstConfig/PurchaseConst.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/ConstConfig/PurchaseConst.cs new file mode 100644 index 00000000..6018d781 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/ConstConfig/PurchaseConst.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.DtoModel.ERP.Purchase.ConstConfig +{ + public class PurchaseConst + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/MapperConfig/PurchaseProfile.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/MapperConfig/PurchaseProfile.cs new file mode 100644 index 00000000..220daa82 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/MapperConfig/PurchaseProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.ERP.Entitys; + +namespace Yi.Framework.DtoModel.ERP.Purchase.MapperConfig +{ + public class SuppliERProfile:Profile + { + public SuppliERProfile() + { + CreateMap(); + CreateMap(); + + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseCreateUpdateInput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseCreateUpdateInput.cs new file mode 100644 index 00000000..c7370660 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseCreateUpdateInput.cs @@ -0,0 +1,21 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Base; +using Yi.Framework.Model.ERP.Entitys; + +namespace Yi.Framework.DtoModel.ERP.Purchase +{ + public class PurchaseCreateUpdateInput : EntityDto + { + public string Code { get; set; } + public DateTime NeedTime { get; set; } + public string Buyer { get; set; } + public long TotalMoney { get; set; } + public long PaidMoney { get; set; } + public PurchaseStateEnum PurchaseState { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs new file mode 100644 index 00000000..1a746dfd --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Base; +using Yi.Framework.Model.ERP.Entitys; + +namespace Yi.Framework.DtoModel.ERP.Purchase +{ + public class PurchaseGetListOutput: EntityDto + { + public string Code { get; set; } + public DateTime NeedTime { get; set; } + public string Buyer { get; set; } + public long TotalMoney { get; set; } + public long PaidMoney { get; set; } + public PurchaseStateEnum PurchaseState { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/ConstConfig/PurchaseDetailsConst.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/ConstConfig/PurchaseDetailsConst.cs new file mode 100644 index 00000000..b8087c84 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/ConstConfig/PurchaseDetailsConst.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.DtoModel.ERP.PurchaseDetails.ConstConfig +{ + public class PurchaseDetailsConst + { + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/MapperConfig/PurchaseDetailsProfile.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/MapperConfig/PurchaseDetailsProfile.cs new file mode 100644 index 00000000..488b267c --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/MapperConfig/PurchaseDetailsProfile.cs @@ -0,0 +1,20 @@ +using AutoMapper; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.ERP.Entitys; + +namespace Yi.Framework.DtoModel.ERP.PurchaseDetails.MapperConfig +{ + public class SuppliERProfile:Profile + { + public SuppliERProfile() + { + CreateMap(); + CreateMap(); + + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs new file mode 100644 index 00000000..b6782ce9 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs @@ -0,0 +1,19 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.DtoModel.ERP.PurchaseDetails +{ + public class PurchaseDetailsCreateUpdateInput : EntityDto + { + public string MaterialUnit { get; set; } + public float UnitPrice { get; set; } + public long TotalNumber { get; set; } + public long CompleteNumber { get; set; } + public string Remarks { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsGetListOutput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsGetListOutput.cs new file mode 100644 index 00000000..f8c1bd8a --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsGetListOutput.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Model.Base; + +namespace Yi.Framework.DtoModel.ERP.PurchaseDetails +{ + public class PurchaseDetailsGetListOutput: EntityDto + { + public string MaterialUnit { get; set; } + public float UnitPrice { get; set; } + public long TotalNumber { get; set; } + public long CompleteNumber { get; set; } + public string Remarks { get; set; } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs new file mode 100644 index 00000000..d0ef37a7 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Common.Models; +using Yi.Framework.DtoModel.ERP.PurchaseDetails; +using Yi.Framework.Interface.Base.Crud; + +namespace Yi.Framework.Interface.ERP +{ + public interface IPurchaseDetailsService : ICrudAppService + { + Task>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page); + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseService.cs new file mode 100644 index 00000000..94630608 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseService.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Common.Models; +using Yi.Framework.DtoModel.ERP.Purchase; +using Yi.Framework.Interface.Base.Crud; + +namespace Yi.Framework.Interface.ERP +{ + public interface IPurchaseService : ICrudAppService + { + Task>> PageListAsync(PurchaseCreateUpdateInput input, PageParModel page); + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs index fa3ab6ac..d893a431 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs @@ -37,10 +37,15 @@ namespace Yi.Framework.Model.ERP.Entitys /// public long MaterialId { get; set; } + /// + /// 物料单位 + /// + public string MaterialUnit { get; set; } + + /// /// 单价 /// - public float UnitPrice { get; set; } /// /// 总数量 diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs new file mode 100644 index 00000000..2bbe84f7 --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs @@ -0,0 +1,32 @@ +using AutoMapper; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Common.Models; +using Yi.Framework.DtoModel.ERP.PurchaseDetails; +using Yi.Framework.Interface.ERP; +using Yi.Framework.Model.ERP.Entitys; +using Yi.Framework.Repository; +using Yi.Framework.Service.Base.Crud; + +namespace Yi.Framework.Service.ERP +{ + public class PurchaseDetailsService : CrudAppService, IPurchaseDetailsService + { + public PurchaseDetailsService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + public async Task>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page) + { + RefAsync totalNumber = 0; + var data = await Repository._DbQueryable + //.WhereIF(input.Code is not null,u=>u.Code.Contains(input.Code)) + //.WhereIF(input.Name is not null, u => u.Name.Contains(input.Name)) + .ToPageListAsync(page.PageNum, page.PageSize, totalNumber); + return new PageModel> { Total = totalNumber.Value, Data = await MapToGetListOutputDtosAsync(data) }; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseService.cs new file mode 100644 index 00000000..22640c6b --- /dev/null +++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseService.cs @@ -0,0 +1,32 @@ +using AutoMapper; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Yi.Framework.Common.Models; +using Yi.Framework.DtoModel.ERP.Purchase; +using Yi.Framework.Interface.ERP; +using Yi.Framework.Model.ERP.Entitys; +using Yi.Framework.Repository; +using Yi.Framework.Service.Base.Crud; + +namespace Yi.Framework.Service.ERP +{ + public class PurchaseService : CrudAppService, IPurchaseService + { + public PurchaseService(IRepository repository, IMapper mapper) : base(repository, mapper) + { + } + public async Task>> PageListAsync(PurchaseCreateUpdateInput input, PageParModel page) + { + RefAsync totalNumber = 0; + var data = await Repository._DbQueryable + //.WhereIF(input.Code is not null,u=>u.Code.Contains(input.Code)) + //.WhereIF(input.Name is not null, u => u.Name.Contains(input.Name)) + .ToPageListAsync(page.PageNum, page.PageSize, totalNumber); + return new PageModel> { Total = totalNumber.Value, Data = await MapToGetListOutputDtosAsync(data) }; + } + } +} diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs b/Yi.Framework.Net6/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs index a6f3ef05..758cde8a 100644 --- a/Yi.Framework.Net6/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs +++ b/Yi.Framework.Net6/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs @@ -67,6 +67,11 @@ namespace Yi.Framework.Template.Abstract continue; } } + //以}结尾，不包含get不是属性，代表类结尾 + if (enetityDatas[i].EndsWith("}") && !enetityDatas[i].Contains("get")) + { + break; + } } //拼接实体字段 diff --git a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ErrorHandExtension.cs b/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ErrorHandExtension.cs index 8b91d51b..6dc669c5 100644 --- a/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ErrorHandExtension.cs +++ b/Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ErrorHandExtension.cs @@ -41,13 +41,10 @@ namespace Yi.Framework.WebCore.MiddlewareExtend } catch (Exception ex) { - _logger.LogError("系统错误",ex); + _logger.LogError(ex,$"系统错误:{ex.Message}"); //await _errorHandle.Invoer(context, ex); var statusCode = context.Response.StatusCode; - if (ex is ArgumentException) - { - statusCode = 200; - } + context.Response.StatusCode = 500; await HandleExceptionAsync(context, statusCode, ex.Message); } finally diff --git a/Yi.Vue3.X.RuoYi/src/utils/request.js b/Yi.Vue3.X.RuoYi/src/utils/request.js index 7294023a..f21085a9 100644 --- a/Yi.Vue3.X.RuoYi/src/utils/request.js +++ b/Yi.Vue3.X.RuoYi/src/utils/request.js @@ -69,7 +69,6 @@ service.interceptors.request.use(config => { } return config }, error => { - console.log(error) Promise.reject(error) }) @@ -117,7 +116,6 @@ service.interceptors.response.use(res => { } }, error => { - console.log('err' + error) let { message } = error; if (message == "Network Error") { message = "后端接口连接异常"; diff --git a/Yi.Vue3.x.RuoYi/src/api/erp/purchaseApi.js b/Yi.Vue3.x.RuoYi/src/api/erp/purchaseApi.js new file mode 100644 index 00000000..98ff7b78 --- /dev/null +++ b/Yi.Vue3.x.RuoYi/src/api/erp/purchaseApi.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/purchase/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/purchase/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/purchase/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/purchase/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/purchase/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.Vue3.x.RuoYi/src/api/erp/purchaseDetailsApi.js b/Yi.Vue3.x.RuoYi/src/api/erp/purchaseDetailsApi.js new file mode 100644 index 00000000..1bcbb35d --- /dev/null +++ b/Yi.Vue3.x.RuoYi/src/api/erp/purchaseDetailsApi.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 分页查询 +export function listData(query) { + return request({ + url: '/purchaseDetails/pageList', + method: 'get', + params: query + }) +} + +// id查询 +export function getData(code) { + return request({ + url: '/purchaseDetails/getById/' + code, + method: 'get' + }) +} + +// 新增 +export function addData(data) { + return request({ + url: '/purchaseDetails/create', + method: 'post', + data: data + }) +} + +// 修改 +export function updateData(id,data) { + return request({ + url: `/purchaseDetails/update/${id}`, + method: 'put', + data: data + }) +} + +// 删除 +export function delData(code) { + return request({ + url: '/purchaseDetails/del', + method: 'delete', + data:"string"==typeof(code)?[code]:code + }) +} diff --git a/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue b/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue new file mode 100644 index 00000000..54ab4b7b --- /dev/null +++ b/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue @@ -0,0 +1,347 @@ + + + \ No newline at end of file diff --git a/Yi.Vue3.x.RuoYi/src/views/ERP/unit/index.vue b/Yi.Vue3.x.RuoYi/src/views/ERP/unit/index.vue index a7ef4509..f5180285 100644 --- a/Yi.Vue3.x.RuoYi/src/views/ERP/unit/index.vue +++ b/Yi.Vue3.x.RuoYi/src/views/ERP/unit/index.vue @@ -287,12 +287,6 @@ /** 表单重置 */ function reset() { - form.value = { - id: undefined, - title: undefined, - isDeleted: false, - remark: undefined, - }; proxy.resetForm("dataRef"); } /** 搜索按钮操作 */ diff --git a/Yi.Vue3.x.RuoYi/src/views/system/dict/index copy.vue b/Yi.Vue3.x.RuoYi/src/views/system/dict/index copy.vue deleted file mode 100644 index eb6406a8..00000000 --- a/Yi.Vue3.x.RuoYi/src/views/system/dict/index copy.vue +++ /dev/null @@ -1,318 +0,0 @@ - - -