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 66fd5c13..44d722e3 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/PurchaseGetListOutput.cs b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs index c6cc5c75..27b3c5e5 100644 --- a/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs +++ b/Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs @@ -16,6 +16,7 @@ namespace Yi.Framework.DtoModel.ERP.Purchase public long TotalMoney { get; set; } public long PaidMoney { get; set; } + public string? Remarks { get; set; } public string SupplierName { get; set; } = string.Empty; public PurchaseStateEnum PurchaseState { get; set; } diff --git a/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseCreateInput.cs b/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseCreateInput.cs index 7de37c45..8e80a6ce 100644 --- a/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseCreateInput.cs +++ b/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseCreateInput.cs @@ -16,6 +16,8 @@ namespace Yi.Framework.DtoModel.ERP.Purchase public DateTime? NeedTime { get; set; } public string Buyer { get; set; } = string.Empty; + public string? Remarks { get; set; } + public long SupplierId { get; set; } public List? PurchaseDetails { get; set; } diff --git a/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs b/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs index 88f05610..d63ed7dc 100644 --- a/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs +++ b/Yi.Framework.Net6/Yi.Framework.DtoModel/ERP/Purchase/PurchaseUpdateInput.cs @@ -16,6 +16,8 @@ namespace Yi.Framework.DtoModel.ERP.Purchase public string? Buyer { get; set; } public long TotalMoney { get; set; } public long PaidMoney { get; set; } + + public string? Remarks { get; set; } public PurchaseStateEnum PurchaseState { get; set; } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs index 7a9dffc4..13ec61e8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseEntity.cs @@ -57,6 +57,11 @@ namespace Yi.Framework.Model.ERP.Entitys /// public float PaidMoney { get; set; } + /// + /// 备注 + /// + public string? Remarks { get; set; } + /// /// 采购状态 /// diff --git a/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue b/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue index 8c6a5b0b..bedefe85 100644 --- a/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue +++ b/Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue @@ -459,7 +459,7 @@ - + + + + 查询 + + @@ -493,7 +500,7 @@ - + {{ form.remarks }} @@ -669,6 +676,7 @@ function handleGet(row) { getListByPurchaseId(row.id).then((response) => { form.value.purchaseDetails = response.data; }); + form.value.remarks=row.remarks; openDetails.value = true; }