From ffc6426a0a6a5b59ae798607e4654c259b73d73e Mon Sep 17 00:00:00 2001 From: zel Date: Sun, 16 Mar 2025 03:09:58 +0800 Subject: [PATCH] 11111111 --- .../CustomerOrder/CustomerOrderEntity.cs | 132 ---------- .../OrderManagement/OrderCustomerEntity.cs | 101 ++++++++ .../CustomerOrder/CustomerOrderService.cs | 89 ------- .../OrderManagement/OrderCustomerService.cs | 104 ++++++++ .../Controllers/CustomerOrderController.cs | 78 ------ .../Views/CustomerOrder/Index.cshtml | 237 ------------------ .../Views/CustomerOrder/Index.cshtml.cs | 11 - .../Controllers/OrderCustomerController.cs | 88 +++++++ .../Views/OrderCustomer/Details.cshtml | 109 ++++++++ .../Views/OrderCustomer}/Form.cshtml | 101 ++++---- .../Views/OrderCustomer/Index.cshtml | 204 +++++++++++++++ WaterCloud.Web/WaterCloud.Web.csproj | 3 - WaterCloud.Web/WaterCloud.Web.xml | 7 + WaterCloud.Web/watercloudnetdb.db | Bin 5828608 -> 5828608 bytes 14 files changed, 666 insertions(+), 598 deletions(-) delete mode 100644 WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs create mode 100644 WaterCloud.Domain/Entity/OrderManagement/OrderCustomerEntity.cs delete mode 100644 WaterCloud.Service/CustomerOrder/CustomerOrderService.cs create mode 100644 WaterCloud.Service/OrderManagement/OrderCustomerService.cs delete mode 100644 WaterCloud.Web/Areas/CustomerOrder/Controllers/CustomerOrderController.cs delete mode 100644 WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Index.cshtml delete mode 100644 WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Index.cshtml.cs create mode 100644 WaterCloud.Web/Areas/OrderManagement/Controllers/OrderCustomerController.cs create mode 100644 WaterCloud.Web/Areas/OrderManagement/Views/OrderCustomer/Details.cshtml rename WaterCloud.Web/Areas/{CustomerOrder/Views/CustomerOrder => OrderManagement/Views/OrderCustomer}/Form.cshtml (70%) create mode 100644 WaterCloud.Web/Areas/OrderManagement/Views/OrderCustomer/Index.cshtml diff --git a/WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs b/WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs deleted file mode 100644 index a37a0f5..0000000 --- a/WaterCloud.Domain/Entity/CustomerOrder/CustomerOrderEntity.cs +++ /dev/null @@ -1,132 +0,0 @@ -using SqlSugar; -using System; -using System.ComponentModel.DataAnnotations; - -namespace WaterCloud.Domain.Entity.CustomerOrder; - -[SugarTable("cms_customerorder")] -public class CustomerOrderEntity : IEntity, ICreationAudited, IModificationAudited, IDeleteAudited -{ - #region 通用部分 - - /// - /// Key - /// - [SugarColumn(ColumnName = "F_Id", IsPrimaryKey = true, ColumnDescription = "主键Id")] - public string F_Id { get; set; } - - /// - /// 逻辑删除标志 - /// - /// - [SugarColumn(IsNullable = true, ColumnDescription = "逻辑删除标志")] - public bool? F_DeleteMark { get; set; } - - /// - /// 创建时间 - /// - /// - [SugarColumn(IsNullable = true, ColumnDescription = "创建时间")] - public DateTime? F_CreatorTime { get; set; } - - /// - /// 创建人 - /// - /// - [SugarColumn(IsNullable = true, ColumnName = "F_CreatorUserId", ColumnDataType = "nvarchar(50)", - ColumnDescription = "创建人")] - public string F_CreatorUserId { get; set; } - - /// - /// 最后修改时间 - /// - /// - [SugarColumn(IsNullable = true, ColumnDescription = "最后修改时间")] - public DateTime? F_LastModifyTime { get; set; } - - /// - /// 最后修改人 - /// - /// - [SugarColumn(IsNullable = true, ColumnName = "F_LastModifyUserId", ColumnDataType = "nvarchar(50)", - ColumnDescription = "最后修改人")] - public string F_LastModifyUserId { get; set; } - - /// - /// 删除时间 - /// - /// - [SugarColumn(IsNullable = true, ColumnDescription = "删除时间")] - public DateTime? F_DeleteTime { get; set; } - - /// - /// 删除人 - /// - /// - [SugarColumn(IsNullable = true, ColumnName = "F_DeleteUserId", ColumnDataType = "nvarchar(50)", - ColumnDescription = "删除人")] - public string F_DeleteUserId { get; set; } - - #endregion - - /// - /// 客户名称 - /// - [Required(ErrorMessage = "客户名称不能为空")] - [SugarColumn(IsNullable = true, ColumnName = "F_Name", ColumnDataType = "nvarchar(200)", - ColumnDescription = "客户名称")] - public string F_Name { get; set; } - - /// - /// 对接人 - /// - [SugarColumn(IsNullable = true, ColumnName = "F_ContactPerson", ColumnDataType = "nvarchar(200)", - ColumnDescription = "对接人")] - public string F_ContactPerson { get; set; } - - /// - /// 开始合作时间 - /// - [SugarColumn(IsNullable = true, ColumnName = "F_CooperationTime", ColumnDescription = "开始合作时间")] - public DateTime? F_CooperationTime { get; set; } - - /// - /// 贴文时间 - /// - [SugarColumn(IsNullable = true, ColumnName = "F_PostTime", ColumnDescription = "发帖时间")] - public DateTime? F_PostTime { get; set; } - - /// - /// 合作进展 1:持续合作 0：断续 - /// - [SugarColumn(IsNullable = true, ColumnName = "F_OrderState", ColumnDescription = "合作进展")] - public int? F_OrderState { get; set; } - - /// - /// 附件 - /// - [SugarColumn(IsNullable = true, ColumnName = "F_Attachment", ColumnDescription = "附件", - ColumnDataType = "nvarchar(200)")] - public string F_Attachment { get; set; } - - /// - /// 联系方式 - /// - [SugarColumn(IsNullable = true, ColumnName = "F_Contact", ColumnDescription = "联系方式", - ColumnDataType = "nvarchar(500)")] - public string F_Contact { get; set; } - - /// - /// 对接情况 - /// - [SugarColumn(IsNullable = true, ColumnName = "F_Docking", ColumnDescription = "对接情况", - ColumnDataType = "nvarchar(100)")] - public string F_Docking { get; set; } - - /// - /// 备注 - /// - [SugarColumn(IsNullable = true, ColumnName = "F_Remark", ColumnDescription = "备注", - ColumnDataType = "nvarchar(500)")] - public string F_Remark { get; set; } -} \ No newline at end of file diff --git a/WaterCloud.Domain/Entity/OrderManagement/OrderCustomerEntity.cs b/WaterCloud.Domain/Entity/OrderManagement/OrderCustomerEntity.cs new file mode 100644 index 0000000..73ed6be --- /dev/null +++ b/WaterCloud.Domain/Entity/OrderManagement/OrderCustomerEntity.cs @@ -0,0 +1,101 @@ +using System; +using System.ComponentModel.DataAnnotations; +using SqlSugar; + +namespace WaterCloud.Domain.OrderManagement +{ + /// + /// 创 建：超级管理员 + /// 日 期：2025-03-16 01:39 + /// 描 述：用户订单实体类 + /// + [SugarTable("cms_ordercustomer")] + public class OrderCustomerEntity : IEntity,ICreationAudited,IModificationAudited,IDeleteAudited + { + /// + /// 主键Id + /// + [SugarColumn(ColumnName="F_Id", ColumnDescription = "主键Id",ColumnDataType = "varchar(50)",IsPrimaryKey = true)] + public string F_Id { get; set; } + /// + /// 逻辑删除标志 + /// + [SugarColumn(ColumnName="F_DeleteMark", ColumnDescription = "逻辑删除标志",ColumnDataType = "tinyint(1)", IsNullable = true)] + public bool? F_DeleteMark { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName="F_CreatorTime", ColumnDescription = "创建时间",ColumnDataType = "datetime", IsNullable = true)] + public DateTime? F_CreatorTime { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName="F_CreatorUserId", ColumnDescription = "创建人",ColumnDataType = "varchar(50)", IsNullable = true)] + public string F_CreatorUserId { get; set; } + /// + /// 最后修改时间 + /// + [SugarColumn(ColumnName="F_LastModifyTime", ColumnDescription = "最后修改时间",ColumnDataType = "datetime", IsNullable = true)] + public DateTime? F_LastModifyTime { get; set; } + /// + /// 最后修改人 + /// + [SugarColumn(ColumnName="F_LastModifyUserId", ColumnDescription = "最后修改人",ColumnDataType = "varchar(50)", IsNullable = true)] + public string F_LastModifyUserId { get; set; } + /// + /// 删除时间 + /// + [SugarColumn(ColumnName="F_DeleteTime", ColumnDescription = "删除时间",ColumnDataType = "datetime", IsNullable = true)] + public DateTime? F_DeleteTime { get; set; } + /// + /// 删除人 + /// + [SugarColumn(ColumnName="F_DeleteUserId", ColumnDescription = "删除人",ColumnDataType = "varchar(50)", IsNullable = true)] + public string F_DeleteUserId { get; set; } + /// + /// 客户名称 + /// + [SugarColumn(ColumnName="F_Name", ColumnDescription = "客户名称",ColumnDataType = "varchar(200)", IsNullable = true)] + public string F_Name { get; set; } + /// + /// 开始合作时间 + /// + [SugarColumn(ColumnName="F_CooperationTime", ColumnDescription = "开始合作时间",ColumnDataType = "datetime", IsNullable = true)] + public DateTime? F_CooperationTime { get; set; } + /// + /// 发帖时间 + /// + [SugarColumn(ColumnName="F_PostTime", ColumnDescription = "发帖时间",ColumnDataType = "datetime", IsNullable = true)] + public DateTime? F_PostTime { get; set; } + /// + /// 合作进展 + /// + [SugarColumn(ColumnName="F_OrderState", ColumnDescription = "合作进展",ColumnDataType = "int(11)", IsNullable = true)] + public int? F_OrderState { get; set; } + /// + /// 对接人 + /// + [SugarColumn(ColumnName="F_ContactPerson", ColumnDescription = "对接人",ColumnDataType = "varchar(200)", IsNullable = true)] + public string F_ContactPerson { get; set; } + /// + /// 附件 + /// + [SugarColumn(ColumnName="F_Attachment", ColumnDescription = "附件",ColumnDataType = "varchar(200)", IsNullable = true)] + public string F_Attachment { get; set; } + /// + /// 联系方式 + /// + [SugarColumn(ColumnName="F_Contact", ColumnDescription = "联系方式",ColumnDataType = "varchar(500)", IsNullable = true)] + public string F_Contact { get; set; } + /// + /// 对接情况 + /// + [SugarColumn(ColumnName="F_Docking", ColumnDescription = "对接情况",ColumnDataType = "varchar(100)", IsNullable = true)] + public string F_Docking { get; set; } + /// + /// 备注 + /// + [SugarColumn(ColumnName="F_Remark", ColumnDescription = "备注",ColumnDataType = "varchar(500)", IsNullable = true)] + public string F_Remark { get; set; } + } +} diff --git a/WaterCloud.Service/CustomerOrder/CustomerOrderService.cs b/WaterCloud.Service/CustomerOrder/CustomerOrderService.cs deleted file mode 100644 index aa7acf1..0000000 --- a/WaterCloud.Service/CustomerOrder/CustomerOrderService.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System; -using SqlSugar; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using WaterCloud.Code; -using WaterCloud.DataBase; -using WaterCloud.Domain.Entity.CustomerOrder; - -namespace WaterCloud.Service.CustomerOrder; - -public class CustomerOrderService : BaseService, IDenpendency -{ - public CustomerOrderService(ISqlSugarClient context) : base(context) - { - } - - - public async Task> GetList(string keyword = "") - { - var query = repository.IQueryable(); - if (!string.IsNullOrWhiteSpace(keyword)) - query = query.Where(oo => oo.F_Name.Contains(keyword)); - - //普通用户仅可查看自己的数据 - if (!currentuser.IsAdmin || !currentuser.IsBoss || !currentuser.IsSuperAdmin || !currentuser.IsSenior) - query = query.Where(oo => oo.F_CreatorUserId == currentuser.UserId); - - return await query.OrderBy(oo => oo.F_CreatorTime).ToListAsync(); - } - - public async Task> GetPageList(Pagination pagination, string keyword = "") - { - var query = repository.IQueryable().Where(a => a.F_DeleteMark == false); - if (!string.IsNullOrWhiteSpace(keyword)) - query = query.Where(oo => oo.F_Name.Contains(keyword)); - - //普通用户仅可查看自己的数据 - if (!currentuser.IsAdmin || !currentuser.IsBoss || !currentuser.IsSuperAdmin || !currentuser.IsSenior) - query = query.Where(oo => oo.F_CreatorUserId == currentuser.UserId); - - return await query.ToPageListAsync(pagination); - } - - public async Task GetForm(string keyValue) - { - var data = await repository.FindEntity(keyValue); - return data; - } - - #region 提交数据 - - public async Task SubmitForm(CustomerOrderEntity entity, string keyValue) - { - if (string.IsNullOrWhiteSpace(keyValue)) - { - entity.F_DeleteMark = false; - entity.Create(); - await repository.Insert(entity); - } - else - { - if ((!currentuser.IsAdmin || !currentuser.IsBoss || !currentuser.IsSuperAdmin || !currentuser.IsSenior) && - currentuser.UserId != entity.F_CreatorUserId) - { - return; - } - - entity.Modify(keyValue); - await repository.Update(entity); - } - } - - - public async Task DeleteForm(string keyValue) - { - var ids = keyValue.Split(','); - var data = await repository.FindEntity(keyValue); - if (data == null) - return; - if ((!currentuser.IsAdmin || !currentuser.IsBoss || !currentuser.IsSuperAdmin || !currentuser.IsSenior) && - currentuser.UserId != data.F_CreatorUserId) - throw new Exception("违规删除"); - - await repository.Delete(oo=>ids.Contains(oo.F_Id)); - } - - #endregion -} \ No newline at end of file diff --git a/WaterCloud.Service/OrderManagement/OrderCustomerService.cs b/WaterCloud.Service/OrderManagement/OrderCustomerService.cs new file mode 100644 index 0000000..d702c47 --- /dev/null +++ b/WaterCloud.Service/OrderManagement/OrderCustomerService.cs @@ -0,0 +1,104 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using System.Collections.Generic; +using WaterCloud.Code; +using SqlSugar; +using WaterCloud.DataBase; +using WaterCloud.Domain.OrderManagement; + +namespace WaterCloud.Service.OrderManagement +{ + /// + /// 创 建：超级管理员 + /// 日 期：2025-03-16 01:39 + /// 描 述：用户订单服务类 + /// + public class OrderCustomerService : BaseService, IDenpendency + { + public OrderCustomerService(ISqlSugarClient context) : base(context) + { + } + #region 获取数据 + public async Task> GetList(string keyword = "") + { + var data = repository.IQueryable(); + if (!string.IsNullOrEmpty(keyword)) + { + data = data.Where(a => a.F_Name.Contains(keyword) + || a.F_ContactPerson.Contains(keyword)); + } + return await data.Where(a => a.F_DeleteMark == false).OrderBy(a => a.F_CreatorTime , OrderByType.Desc).ToListAsync(); + } + + public async Task> GetLookList(string keyword = "") + { + var query = repository.IQueryable().Where(a => a.F_DeleteMark == false); + if (!string.IsNullOrEmpty(keyword)) + { + //此处需修改 + query = query.Where(a => a.F_Name.Contains(keyword) + || a.F_ContactPerson.Contains(keyword)); + } + //权限过滤 + query = GetDataPrivilege("a", "", query); + return await query.OrderBy(a => a.F_CreatorTime , OrderByType.Desc).ToListAsync(); + } + + public async Task> GetLookList(SoulPage pagination,string keyword = "",string id="") + { + var query = repository.IQueryable().Where(a => a.F_DeleteMark == false); + if (!string.IsNullOrEmpty(keyword)) + { + query = query.Where(a => a.F_Name.Contains(keyword) + || a.F_ContactPerson.Contains(keyword)); + } + if(!string.IsNullOrEmpty(id)) + { + query= query.Where(a=>a.F_Id==id); + } + //权限过滤 + query = GetDataPrivilege("a","",query); + return await query.ToPageListAsync(pagination); + } + + public async Task GetForm(string keyValue) + { + var data = await repository.FindEntity(keyValue); + return data; + } + #endregion + + public async Task GetLookForm(string keyValue) + { + var data = await repository.FindEntity(keyValue); + return GetFieldsFilterData(data); + } + + #region 提交数据 + public async Task SubmitForm(OrderCustomerEntity entity, string keyValue) + { + if(string.IsNullOrEmpty(keyValue)) + { + //初始值添加 + entity.F_DeleteMark = false; + entity.Create(); + await repository.Insert(entity); + } + else + { + //此处需修改 + entity.Modify(keyValue); + await repository.Update(entity); + } + } + + public async Task DeleteForm(string keyValue) + { + var ids = keyValue.Split(','); + await repository.Delete(a => ids.Contains(a.F_Id.ToString())); + } + #endregion + + } +} diff --git a/WaterCloud.Web/Areas/CustomerOrder/Controllers/CustomerOrderController.cs b/WaterCloud.Web/Areas/CustomerOrder/Controllers/CustomerOrderController.cs deleted file mode 100644 index f603c04..0000000 --- a/WaterCloud.Web/Areas/CustomerOrder/Controllers/CustomerOrderController.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using WaterCloud.Code; -using WaterCloud.Domain.Entity.CustomerOrder; -using WaterCloud.Service.CustomerOrder; - -namespace WaterCloud.Web.Areas.CustomerOrder.Controllers; - -[Area("CustomerOrder")] -public class CustomerOrderController : BaseController -{ - public CustomerOrderService CustomerOrderService { get; set; } - - [HttpGet] - [HandlerAjaxOnly] - public async Task GetPageList(Pagination pagination, string keyword) - { - if (string.IsNullOrEmpty(pagination.field)) - { - pagination.order = "desc"; - pagination.field = "F_CreatorTime"; - } - var data = await CustomerOrderService.GetPageList(pagination, keyword); - return Success(pagination.records, data); - } - - [HttpGet] - [HandlerAjaxOnly] - public async Task GetListJson(string keyword) - { - var data = await CustomerOrderService.GetList(keyword); - return Content(data.ToJson()); - } - - [HttpGet] - [HandlerAjaxOnly] - public async Task GetFormJson(string keyValue) - { - var data = await CustomerOrderService.GetForm(keyValue); - return Content(data.ToJson()); - } - - #region 提交数据 - - [HttpPost] - [HandlerAjaxOnly] - public async Task SubmitForm(CustomerOrderEntity entity, string keyValue) - { - try - { - await CustomerOrderService.SubmitForm(entity, keyValue); - return await Success("操作成功。", "", keyValue); - } - catch (Exception ex) - { - return await Error(ex.Message, "", keyValue); - } - } - - [HttpPost] - [HandlerAjaxOnly] - [HandlerAuthorize] - public async Task DeleteForm(string keyValue) - { - try - { - await CustomerOrderService.DeleteForm(keyValue); - return await Success("操作成功。", "", keyValue, DbLogType.Delete); - } - catch (Exception ex) - { - return await Error(ex.Message, "", keyValue, DbLogType.Delete); - } - } - - #endregion 提交数据 -} \ No newline at end of file diff --git a/WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Index.cshtml b/WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Index.cshtml deleted file mode 100644 index 0691603..0000000 --- a/WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Index.cshtml +++ /dev/null @@ -1,237 +0,0 @@ -@{ - ViewBag.Title = "Index"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
-
- -
- -
-
-
- -
-
-
-
-
- -
- -
-
- - \ No newline at end of file diff --git a/WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Index.cshtml.cs b/WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Index.cshtml.cs deleted file mode 100644 index 31bd4b2..0000000 --- a/WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Index.cshtml.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace WaterCloud.Web.Areas.CustomerOrder.Views.CustomerOrder; - -public class Index : PageModel -{ - public void OnGet() - { - - } -} \ No newline at end of file diff --git a/WaterCloud.Web/Areas/OrderManagement/Controllers/OrderCustomerController.cs b/WaterCloud.Web/Areas/OrderManagement/Controllers/OrderCustomerController.cs new file mode 100644 index 0000000..994ab4a --- /dev/null +++ b/WaterCloud.Web/Areas/OrderManagement/Controllers/OrderCustomerController.cs @@ -0,0 +1,88 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc; +using WaterCloud.Code; +using WaterCloud.Domain.OrderManagement; +using WaterCloud.Service; +using Microsoft.AspNetCore.Authorization; +using WaterCloud.Service.OrderManagement; + +namespace WaterCloud.Web.Areas.OrderManagement.Controllers +{ + /// + /// 创 建：超级管理员 + /// 日 期：2025-03-16 01:39 + /// 描 述：用户订单控制器类 + /// + [Area("OrderManagement")] + public class OrderCustomerController : BaseController + { + public OrderCustomerService _service {get;set;} + + #region 获取数据 + [HandlerAjaxOnly] + [IgnoreAntiforgeryToken] + public async Task GetGridJson(SoulPage pagination, string keyword) + { + if (string.IsNullOrEmpty(pagination.field)) + { + pagination.field = "F_CreatorTime"; + pagination.order = "desc"; + } + var data = await _service.GetLookList(pagination,keyword); + return Content(pagination.setData(data).ToJson()); + } + + [HttpGet] + [HandlerAjaxOnly] + public async Task GetListJson(string keyword) + { + var data = await _service.GetList(keyword); + return Content(data.ToJson()); + } + + [HttpGet] + [HandlerAjaxOnly] + public async Task GetFormJson(string keyValue) + { + var data = await _service.GetLookForm(keyValue); + return Content(data.ToJson()); + } + #endregion + + #region 提交数据 + [HttpPost] + [HandlerAjaxOnly] + public async Task SubmitForm(OrderCustomerEntity entity, string keyValue) + { + try + { + await _service.SubmitForm(entity, keyValue); + return await Success("操作成功。", "", keyValue); + } + catch (Exception ex) + { + return await Error(ex.Message, "", keyValue); + } + } + + [HttpPost] + [HandlerAjaxOnly] + [HandlerAuthorize] + public async Task DeleteForm(string keyValue) + { + try + { + await _service.DeleteForm(keyValue); + return await Success("操作成功。", "", keyValue, DbLogType.Delete); + } + catch (Exception ex) + { + return await Error(ex.Message, "", keyValue, DbLogType.Delete); + } + } + #endregion + } +} diff --git a/WaterCloud.Web/Areas/OrderManagement/Views/OrderCustomer/Details.cshtml b/WaterCloud.Web/Areas/OrderManagement/Views/OrderCustomer/Details.cshtml new file mode 100644 index 0000000..74ba661 --- /dev/null +++ b/WaterCloud.Web/Areas/OrderManagement/Views/OrderCustomer/Details.cshtml @@ -0,0 +1,109 @@ +@{ + ViewBag.Title = "Details"; + Layout = "~/Views/Shared/_Form.cshtml"; +} + + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + diff --git a/WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Form.cshtml b/WaterCloud.Web/Areas/OrderManagement/Views/OrderCustomer/Form.cshtml similarity index 70% rename from WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Form.cshtml rename to WaterCloud.Web/Areas/OrderManagement/Views/OrderCustomer/Form.cshtml index fdfb46e..5cc74ac 100644 --- a/WaterCloud.Web/Areas/CustomerOrder/Views/CustomerOrder/Form.cshtml +++ b/WaterCloud.Web/Areas/OrderManagement/Views/OrderCustomer/Form.cshtml @@ -3,8 +3,10 @@ Layout = "~/Views/Shared/_Form.cshtml"; } + + +
+ + + + + + + diff --git a/WaterCloud.Web/WaterCloud.Web.csproj b/WaterCloud.Web/WaterCloud.Web.csproj index c151fa6..ccde475 100644 --- a/WaterCloud.Web/WaterCloud.Web.csproj +++ b/WaterCloud.Web/WaterCloud.Web.csproj @@ -81,9 +81,6 @@ - - - diff --git a/WaterCloud.Web/WaterCloud.Web.xml b/WaterCloud.Web/WaterCloud.Web.xml index 3c8552d..58b9711 100644 --- a/WaterCloud.Web/WaterCloud.Web.xml +++ b/WaterCloud.Web/WaterCloud.Web.xml @@ -67,6 +67,13 @@ 描 述：订单管理控制器类 + + + 创 建：超级管理员 + 日 期：2025-03-16 01:39 + 描 述：用户订单控制器类 + + 创 建：超级管理员 diff --git a/WaterCloud.Web/watercloudnetdb.db b/WaterCloud.Web/watercloudnetdb.db index e63c8602c9775ec2e263aa398a3ec0015bc7ed9a..c8ba4f860d466a211d088102ee1ad5f9f4c8641e 100644 GIT binary patch delta 1977 zcmb8wTWl0n7y#gz+1X)s+u7-`-CdzAZRswzGTXV|%J!<2Dzyu`x=+&Gxx82*RbNa@ zU<;KOO_3E3F(e2QgLe?aluHPj7>P07-~kh2Py*$_n3(vYpz+^@wNR2Kp5#krcK`YR zbIzXmcl(vA#CEW|37>kcc@UpEHg=e$aCQsEZt=M+?yzKu#T&}cweIoBbHrt~Jk{Fv zi9j|`1Hr8rdkLkp!Dh7L3hq^+uafAy(EzzkFdRpdU5$5&vcxO4QQ!?laCyU!w4!br znqkWWs{%Rvzd+mcY+ey0kvB}&;bl#8P1!X})iL|;2`qS;#w((u^M+f1KvQuGy6&2u zsQ1+Zw^eJKvgz=OV@tfDD+aH5N>Pz@Qx|Qew-#9q)C-kK%23uQI0~<7PC=9%T`UU4 zo_hl2Vi6|k6&2nPb&a=OLsvyp5CqfB)B@FF(cLjIj(B< z|Mb1*h2C76BTBKp514dcc4PVEvoZ4b;(CXbr|p~>&>z?+iuZA5w6s39 zG?&9usSa#OC`7}+QD&HX2@j)_!`wQ*sh?wM5*GE9pC0Be#F_fnu~0CMMJ_Q%gKy#~l8(-nOrn~D#%UT(SwEaI1|1vczAT^H9ITxk1AeBotjUU|qJ!tzl&^W* z(-hRen|JLS=fGkR1&tsE;vfMY087A9&;%;+EnpdF1#O@mEC(GR2~uDMSP52v)nEp%wdfL_oC`oRDg1P_9Tzz}#CtOvv35%4J3 z07k%LU=(D*Mz9Gy4xRux@FaN3-#4Bge?A_fHe!*Vm^1Z<>Mn#&h7QnEi=Lr2R!)pg z1tt>%<#R?OZ0^DxP!c4S7i9j<+iX~>RBpGd*4d8^&hCDhpFMth_Vj@p)BCTzy7%tu z@|c;dyXzU$HNqtkcOt(6@1Lu?KtsK+t|b5ex{_QuQc3jrS*Y7rsVi33yFh=QS68>n zrQSID(9gG*W6JvQTvOYVNtItwlCY7za|>FaozF|G-QGy0+^7uKvchNO3AvWGXD;mm z&Hui%f(iRHFRh4xy_29$f>+kdq=C^ ZNv5F6BKquXekHyR<{k4-{hA*N{0mJ!W7Gfu delta 1071 zcmZwEOH30%90u^6b~|pN+iit{6cm)Ah*0*?r7a*2Q52sAtTu!MZ3~73HPM4dc^tTj zSi_hYV<5(8GyxyUqLRp2jZY37jM1pT!Eo{$e6!R0^}D4PuI7?U z!+8zl(xX#%B+9usPC93}Bjk)kuB9&IUt8;%HM>4Yq&U@=?|UrsE?P}HIcb*pBeuNM z_PRE6{HKk*KW60zx*Lt|Msn*uHMn#`Y%zx(q-PCmB014Sj#8ApS+I*$(fTOI6=txZ z6(X~hB~s*zoIZD^p}VcK=g0HmA1_De`o`yVX({0`vdo0@bot+XCf~(;>-&7Z zOpDhF?nocaC2mTVcCwlzO~YfR@!MCw2bYE@Yybi5kOt}C01=!Z8B0ShI^n@YiFi5Z zg80_4=n&Gr*?-$hSXP}o%nBmpwc)LIy9B;(zsGC%o7|tW%(K|3&N*kr3CDHAdCD!= z3{>V5L+^5TP`*E>+&g%q#|;}H12Vw_S&$8zAP3C4T*!mXum$p=0Jg$5CB4^8Tg?bWKci_4FaG;1q2}kVW@;EsD|B81GP{G^{@vTU@z>0M%WJrpa~Ab zAvg?2;3yn}2sA?rw8C+S!U;HO+~|q*Tuie%#yIB}amq1fUgvd(wLiN$H68L8&ws@l Gt$zVam1IQ#