From 21c9b78c0569a269e635d8c8b38544f89dbff1bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZR20090193-=E9=99=88=E6=95=AC=E5=8B=87?= Date: Thu, 11 Jan 2024 16:48:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-admin-web/.env | 4 +- .../baseinfo/tenantaudit/TenantModal.vue | 125 +++++++++ .../src/views/baseinfo/tenantaudit/api.ts | 31 +++ .../views/baseinfo/tenantaudit/columns.tsx | 242 ++++++++++++++++++ .../src/views/baseinfo/tenantaudit/index.vue | 129 ++++++++++ .../DS.Module.Core/Data/CommonAuditInput.cs | 39 +++ .../DS.Module.SqlSugar/SqlsugarInstall.cs | 13 +- .../System/Dtos/TenantApplyInfoRes.cs | 4 + .../System/Dtos/TenantApplyListRes.cs | 74 ++++++ .../System/Entity/SysTenantApply.cs | 5 + .../System/Interface/ITenantApplyService.cs | 21 ++ .../System/Method/TenantApplyService.cs | 100 ++++++++ .../DS.WMS.Core/System/Method/UserService.cs | 1 + .../appsettings.Development.json | 2 +- ds-wms-service/DS.WMS.MainApi/Api.xml | 35 +++ .../Controllers/TenantApplyController.cs | 41 +++ .../DS.WMS.MainApi/Logs/internal-nlog.txt | 21 ++ .../src/views/system/tenantApply/index.vue | 12 +- 18 files changed, 881 insertions(+), 18 deletions(-) create mode 100644 ds-wms-admin-web/src/views/baseinfo/tenantaudit/TenantModal.vue create mode 100644 ds-wms-admin-web/src/views/baseinfo/tenantaudit/api.ts create mode 100644 ds-wms-admin-web/src/views/baseinfo/tenantaudit/columns.tsx create mode 100644 ds-wms-admin-web/src/views/baseinfo/tenantaudit/index.vue create mode 100644 ds-wms-service/DS.Module.Core/Data/CommonAuditInput.cs create mode 100644 ds-wms-service/DS.WMS.Core/System/Dtos/TenantApplyListRes.cs diff --git a/ds-wms-admin-web/.env b/ds-wms-admin-web/.env index d10d9e92..ede427ee 100644 --- a/ds-wms-admin-web/.env +++ b/ds-wms-admin-web/.env @@ -1,8 +1,8 @@ # port -VITE_PORT = 3110 +VITE_PORT = 3112 # 网站标题 -VITE_GLOB_APP_TITLE = 东胜物流管理平台 +VITE_GLOB_APP_TITLE = 东胜物流管理后台 # 简称，用于配置文件名字 不要出现空格、数字开头等特殊字符 VITE_GLOB_APP_SHORT_NAME = WmsAdmin diff --git a/ds-wms-admin-web/src/views/baseinfo/tenantaudit/TenantModal.vue b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/TenantModal.vue new file mode 100644 index 00000000..848ef55f --- /dev/null +++ b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/TenantModal.vue @@ -0,0 +1,125 @@ + + diff --git a/ds-wms-admin-web/src/views/baseinfo/tenantaudit/api.ts b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/api.ts new file mode 100644 index 00000000..89884ba0 --- /dev/null +++ b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/api.ts @@ -0,0 +1,31 @@ +// @ts-ignore +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' +enum Api { + list = '/mainApi/TenantApply/GetTenantApplyList', + getTenantAuditInfo = '/mainApi/TenantApply/GetTenantAuditInfo', + auditInfo = '/mainApi/TenantApply/AuditTenantApply', +} +export function getTenantApplyList(data: PageRequest) { + return request({ + url: Api.list, + method: 'post', + data, + }) +} + +export function getTenantAuditInfo(query: { id: string }) { + return request({ + url: Api.getTenantAuditInfo, + method: 'get', + params: query, + }) +} + +export function auditInfo(data: any) { + return request({ + url: Api.auditInfo, + method: 'post', + data, + }) +} diff --git a/ds-wms-admin-web/src/views/baseinfo/tenantaudit/columns.tsx b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/columns.tsx new file mode 100644 index 00000000..ad9c85e0 --- /dev/null +++ b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/columns.tsx @@ -0,0 +1,242 @@ +import { BasicColumn, FormSchema } from '/@/components/Table' +import { Tag } from 'ant-design-vue' +import { UploadTypeEnum } from '/@/components/Form/src/Ds/components/DUpload' +// import { getDictDropDown } from '/@/api/common'; +// @ts-ignore +export const columns: BasicColumn[] = [ + // { + // title: '唯一编码', + // dataIndex: 'countryCode', + // width: 200, + // }, + { + title: '公司名称', + dataIndex: 'name', + width: 150, + }, + { + title: '信用代码', + dataIndex: 'taxNo', + width: 150, + }, + { + title: '公司法人', + dataIndex: 'chief', + width: 100, + }, + { + title: '公司地址', + dataIndex: 'address', + width: 100, + }, + { + title: '公司电话', + dataIndex: 'tel', + width: 100, + }, + { + title: '审核状态', + dataIndex: 'auditStatus', + width: 100, + filters: [ + { text: '待审批', value: '0' }, + { text: '审核通过', value: '1' }, + { text: '驳回', value: '2' }, + ], + customRender: ({ text }) => { + if (text === 0) { + return 待审批 + } else if (text === 1) { + return 审核通过 + } else if (text === 2) { + return 驳回 + } + return text + }, + }, + { + title: '审批时间', + dataIndex: 'auditTime', + width: 100, + sorter: true, + }, +] + +export const searchFormSchema: FormSchema[] = [ + { + field: 'Name', + label: '公司名称', + component: 'Input', + colProps: { span: 8 }, + }, +] +export const formSchema: FormSchema[] = [ + { + field: 'divider-selects', + component: 'Divider', + label: '基本信息', + colProps: { span: 24 }, + }, + { + label: '', + field: 'id', + component: 'Input', + defaultValue: '', + show: false, + }, + { + field: 'name', + label: '公司名称', + component: 'Input', + required: true, + colProps: { span: 16 }, + componentProps: { + disabled: true, + }, + }, + { + field: 'shortname', + label: '公司简称', + component: 'Input', + required: true, + colProps: { span: 8 }, + componentProps: { + disabled: true, + }, + }, + { + field: 'taxNo', + label: '信用代码', + component: 'Input', + required: true, + colProps: { span: 12 }, + componentProps: { + disabled: true, + }, + }, + { + field: 'chief', + label: '公司法人', + component: 'Input', + required: true, + colProps: { span: 12 }, + }, + { + field: 'address', + label: '公司地址', + component: 'Input', + required: true, + colProps: { span: 12 }, + }, + { + field: 'tel', + label: '公司电话', + component: 'Input', + required: true, + colProps: { span: 12 }, + itemProps: { + extra: '电话格式 0531-XXXXXXX', + }, + }, + { + field: 'email', + label: '公司邮箱', + component: 'Input', + required: true, + colProps: { span: 12 }, + itemProps: { + extra: '请输入正确的邮箱格式', + }, + }, + { + field: 'loginname', + label: '管理员账号', + component: 'Input', + colProps: { span: 12 }, + dynamicDisabled: ({ values }) => { + return !!values.gid + }, + }, + { + field: 'remark', + label: '备注', + component: 'InputTextArea', + colProps: { span: 18 }, + // ifShow: ({ values }) => !isButton(values.menuType), + }, + { + field: 'divider-selects', + component: 'Divider', + label: '认证资料', + helpMessage: ['请按要求上传认证资料!'], + colProps: { span: 24 }, + }, + { + field: 'licensefiles', + component: 'DUpload', + helpMessage: '最多上传1个文件', + label: '营业执照', + colProps: { + span: 24, + }, + componentProps: { + maxCount: 1, + disabled: true, + fileType: UploadTypeEnum.image, + }, + }, + { + field: 'cardfiles', + component: 'DUpload', + helpMessage: '最多上传2个文件', + label: '法人身份证', + colProps: { + span: 24, + }, + componentProps: { + maxCount: 2, + disabled: true, + fileType: UploadTypeEnum.image, + }, + }, + { + field: 'divider-selects', + component: 'Divider', + label: '审批意见', + colProps: { span: 24 }, + }, + { + field: 'auditStatus', + label: '审核状态', + component: 'Input', + colProps: { + span: 24, + }, + slot: 'auditStatusSlot', + }, + { + field: 'auditNote', + component: 'InputTextArea', + label: '审核意见', + componentProps: { + placeholder: '请填写审核意见', + rows: 4, + }, + colProps: { span: 18 }, + }, + { + field: 'status', + component: 'RadioButtonGroup', + label: '审批选项', + defaultValue: 1, + required: true, + colProps: { span: 12 }, + componentProps: { + placeholder: '请选择状态', + options: [ + { label: '通过', value: 1 }, + { label: '驳回', value: 2 }, + ], + }, + }, +] diff --git a/ds-wms-admin-web/src/views/baseinfo/tenantaudit/index.vue b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/index.vue new file mode 100644 index 00000000..37abe2d0 --- /dev/null +++ b/ds-wms-admin-web/src/views/baseinfo/tenantaudit/index.vue @@ -0,0 +1,129 @@ + + diff --git a/ds-wms-service/DS.Module.Core/Data/CommonAuditInput.cs b/ds-wms-service/DS.Module.Core/Data/CommonAuditInput.cs new file mode 100644 index 00000000..f187c0ae --- /dev/null +++ b/ds-wms-service/DS.Module.Core/Data/CommonAuditInput.cs @@ -0,0 +1,39 @@ +using FluentValidation; + +namespace DS.Module.Core.Data; + +/// +/// 企业用户审批实体 +/// +public class CommonAuditInput +{ + /// + /// ID + /// + public long Id { get; set; } + /// + /// 审核状态 + /// + public int Status { get; set; } + + /// + /// 审批备注 + /// + public string AuditNote { get; set; } = ""; +} +/// +/// 验证 +/// +public class CommonAuditInputValidator : AbstractValidator +{ + /// + /// 构造函数 + /// + public CommonAuditInputValidator() + { + this.RuleFor(o => o.Id) + .NotEmpty().WithName("ID"); + this.RuleFor(o => o.Status) + .NotEmpty().WithName("审核选项").InclusiveBetween(1, 2).WithMessage("非法状态") ; + } +} \ No newline at end of file diff --git a/ds-wms-service/DS.Module.SqlSugar/SqlsugarInstall.cs b/ds-wms-service/DS.Module.SqlSugar/SqlsugarInstall.cs index fa0346fc..bb241ec3 100644 --- a/ds-wms-service/DS.Module.SqlSugar/SqlsugarInstall.cs +++ b/ds-wms-service/DS.Module.SqlSugar/SqlsugarInstall.cs @@ -116,6 +116,7 @@ public static class SqlsugarInstall { entityInfo.SetValue(GuidHelper.GetSnowflakeId()); } + if (entityInfo.EntityColumnInfo.PropertyInfo.PropertyType == typeof(long)) { entityInfo.SetValue(SnowFlakeSingle.Instance.NextId()); @@ -140,11 +141,11 @@ public static class SqlsugarInstall { entityInfo.SetValue(1288018625843826688); } - } + } + - if (entityInfo.PropertyName == "Deleted") - entityInfo.SetValue(false); + entityInfo.SetValue(false); } // 更新操作 @@ -152,15 +153,15 @@ public static class SqlsugarInstall { if (entityInfo.PropertyName == "UpdateTime") entityInfo.SetValue(DateTime.Now); - if (entityInfo.PropertyName == "UpdateBy" && user != null) - entityInfo.SetValue(user.UserId); + if (entityInfo.PropertyName == "UpdateBy" && !user.UserId.IsNullOrEmpty()) + entityInfo.SetValue(user.UserId); } }; dbProvider.Aop.OnError = (exp) => //执行SQL 错误事件 { Logger.Error(DateTime.Now.ToString() + "\r\n" + exp.Sql + "\r\n" + exp.Parametres); }; - + //全局过滤租户Id dbProvider.QueryFilter.AddTableFilter(m => m.TenantId == user.GetTenantId()); //全局软删除过滤 dbProvider.QueryFilter.AddTableFilter(m => m.Deleted == false); diff --git a/ds-wms-service/DS.WMS.Core/System/Dtos/TenantApplyInfoRes.cs b/ds-wms-service/DS.WMS.Core/System/Dtos/TenantApplyInfoRes.cs index a4a272ab..2d573d44 100644 --- a/ds-wms-service/DS.WMS.Core/System/Dtos/TenantApplyInfoRes.cs +++ b/ds-wms-service/DS.WMS.Core/System/Dtos/TenantApplyInfoRes.cs @@ -64,4 +64,8 @@ public class TenantApplyInfoRes /// 审批意见 /// public string AuditNote { get; set; } + /// + /// 审批时间 + /// + public DateTime AuditTime { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/System/Dtos/TenantApplyListRes.cs b/ds-wms-service/DS.WMS.Core/System/Dtos/TenantApplyListRes.cs new file mode 100644 index 00000000..de2e63dd --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/System/Dtos/TenantApplyListRes.cs @@ -0,0 +1,74 @@ +using DS.Module.Core; + +namespace DS.WMS.Core.System.Dtos; + +/// +/// 企业用户注册列表 +/// +public class TenantApplyListRes +{ + /// + /// 主键ID + /// + public long Id { get; set; } + + + /// + /// 公司名称 + /// + public string Name { get; set; } + + /// + /// 拼音码 + /// + public string PinYinCode { get; set; }= ""; + /// + /// 公司地址 + /// + public string Address { get; set; }= ""; + /// + /// 管理员电话 + /// + public string Phone { get; set; } + /// + /// 公司电话 + /// + public string Tel { get; set; } + /// + /// 邮箱 + /// + public string Email { get; set; } + /// + /// 企业法人 + /// + public string Chief { get; set; } + /// + /// 企业税号 + /// + public string TaxNo { get; set; } + /// + /// 管理员账号 + /// + public string AdminUserCode { get; set; } + + /// + /// 合同开始日期 + /// + public DateTime ContractBeginDate { get; set; } + /// + /// 合同结束日期 + /// + public DateTime ContractEndDate { get; set; } + /// + /// 审批状态 + /// + public AuditStatusEnum? AuditStatus { get; set; } = AuditStatusEnum.NoAudit; + /// + /// 审批意见 + /// + public string AuditNote { get; set; } + /// + /// 审批时间 + /// + public DateTime AuditTime { get; set; } +} \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/System/Entity/SysTenantApply.cs b/ds-wms-service/DS.WMS.Core/System/Entity/SysTenantApply.cs index 985d0068..c172a68d 100644 --- a/ds-wms-service/DS.WMS.Core/System/Entity/SysTenantApply.cs +++ b/ds-wms-service/DS.WMS.Core/System/Entity/SysTenantApply.cs @@ -68,6 +68,11 @@ public class SysTenantApply : BaseModel /// [SugarColumn(ColumnDescription = "审批状态")] public AuditStatusEnum? AuditStatus { get; set; } = AuditStatusEnum.NoAudit; + + /// + /// 审批时间 + /// + public DateTime AuditTime { get; set; } /// /// 审批意见 /// diff --git a/ds-wms-service/DS.WMS.Core/System/Interface/ITenantApplyService.cs b/ds-wms-service/DS.WMS.Core/System/Interface/ITenantApplyService.cs index 8db24054..ce5818b8 100644 --- a/ds-wms-service/DS.WMS.Core/System/Interface/ITenantApplyService.cs +++ b/ds-wms-service/DS.WMS.Core/System/Interface/ITenantApplyService.cs @@ -1,4 +1,5 @@ using DS.Module.Core; +using DS.Module.Core.Data; using DS.WMS.Core.System.Dtos; using DS.WMS.Core.System.Entity; @@ -25,4 +26,24 @@ public interface ITenantApplyService /// /// public DataResult SubmitTenantApply(string id); + + /// + /// 企业注册用户列表 + /// + /// + /// + public DataResult> GetListByPage(PageRequest request); + + /// + /// 获取注册企业审批信息 + /// + /// + public DataResult GetTenantAuditInfo(string id); + + /// + /// 企业用户审批 + /// + /// + /// + public DataResult AuditTenantApply(CommonAuditInput req); } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/System/Method/TenantApplyService.cs b/ds-wms-service/DS.WMS.Core/System/Method/TenantApplyService.cs index 92064728..25bbe7c1 100644 --- a/ds-wms-service/DS.WMS.Core/System/Method/TenantApplyService.cs +++ b/ds-wms-service/DS.WMS.Core/System/Method/TenantApplyService.cs @@ -1,9 +1,12 @@ using DS.Module.Core; +using DS.Module.Core.Data; +using DS.Module.Core.Extensions; using DS.Module.UserModule; using DS.WMS.Core.System.Dtos; using DS.WMS.Core.System.Entity; using DS.WMS.Core.System.Interface; using Mapster; +using Masuit.Tools.Systems; using Microsoft.Extensions.DependencyInjection; using SqlSugar; @@ -26,7 +29,101 @@ public class TenantApplyService : ITenantApplyService user = _serviceProvider.GetRequiredService(); } + #region 企业用户审批 + /// + /// 企业注册用户列表 + /// + /// + /// + public DataResult> GetListByPage(PageRequest request) + { + // var query = _commonService.GetDataRuleFilter(); + //序列化查询条件 + var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition); + var data = db.Queryable().ClearFilter() + .Select() + .Where(x=>x.AuditStatus!= AuditStatusEnum.NoAudit) + .Where(whereList).ToQueryPage(request.PageCondition); + return data; + } + + /// + /// 获取注册企业审批信息 + /// + /// + public DataResult GetTenantAuditInfo(string id) + { + var data = db.Queryable() + .Where(a => a.Id == long.Parse(id)) + .Select() + .First(); + return DataResult.Success(data); + } + /// + /// 企业用户审批 + /// + /// + /// + public DataResult AuditTenantApply(CommonAuditInput req) + { + var userId = user.UserId; + + var apply = db.Queryable().Where(x => x.Id == req.Id).First(); + + if (apply.IsNull()) + { + return DataResult.Failed("企业用户信息不存在!"); + } + + if (apply.AuditStatus == AuditStatusEnum.Approve) + { + return DataResult.Failed("已审批通过!"); + } + + if (req.Status == 1) + { + try + { + //开启事务 + db.Ado.BeginTran(); + apply.AuditStatus = (AuditStatusEnum)(int)req.Status; + apply.AuditNote = req.AuditNote; + db.Updateable(apply).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); + + //TODO 处理租户相关数据 + + // var client = company.Adapt();; + // client.CODENAME = PinYinUtil.GetFristLetter(company.SHORTNAME); + // client.GID = clientId.ToString(); + // client.STATUS = 0; + // db.Insertable(client).ExecuteCommand(); + + db.Ado.CommitTran(); + return DataResult.Successed("审批成功!"); + } + catch (Exception ex) + { + db.Ado.RollbackTran(); + return DataResult.Failed("审批失败!" + ",请联系管理员!"); + } + } + else + { + apply.AuditStatus = (AuditStatusEnum)(int)req.Status; + apply.AuditNote = req.AuditNote; + db.Updateable(req).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); + return DataResult.Successed("驳回成功!"); + } + + } + + #endregion + + + #region 企业用户维护信息 + + /// /// 获取注册企业申请信息 /// /// @@ -189,4 +286,7 @@ public class TenantApplyService : ITenantApplyService return DataResult.Successed("提交成功"); } + + #endregion + } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/System/Method/UserService.cs b/ds-wms-service/DS.WMS.Core/System/Method/UserService.cs index 92ebbfc2..8eeef8cf 100644 --- a/ds-wms-service/DS.WMS.Core/System/Method/UserService.cs +++ b/ds-wms-service/DS.WMS.Core/System/Method/UserService.cs @@ -3,6 +3,7 @@ using DS.Module.Core.Extensions; using DS.Module.Core.Helpers; using DS.Module.UserModule; using DS.WMS.Core.System.Dtos; +using DS.WMS.Core.System.Entity; using DS.WMS.Core.System.Interface; using Microsoft.Extensions.DependencyInjection; using SqlSugar; diff --git a/ds-wms-service/DS.WMS.Gateway/appsettings.Development.json b/ds-wms-service/DS.WMS.Gateway/appsettings.Development.json index 5de7bc60..ca5f066b 100644 --- a/ds-wms-service/DS.WMS.Gateway/appsettings.Development.json +++ b/ds-wms-service/DS.WMS.Gateway/appsettings.Development.json @@ -7,7 +7,7 @@ }, "Cors": { "PolicyName": "WMSCore.API", - "Url": "http://localhost:3110,https://localhost:3110,http://localhost:3111,https://localhost:3111" + "Url": "http://localhost:3110,https://localhost:3110,http://localhost:3112,https://localhost:3112" }, "JwtSettings": { "Issuer": "vol.core.owner", diff --git a/ds-wms-service/DS.WMS.MainApi/Api.xml b/ds-wms-service/DS.WMS.MainApi/Api.xml index 4e0cba8b..bc79c3c3 100644 --- a/ds-wms-service/DS.WMS.MainApi/Api.xml +++ b/ds-wms-service/DS.WMS.MainApi/Api.xml @@ -204,6 +204,41 @@ + + + 编辑 + + + + + + + 提交审核 + + + + + + + 企业注册用户列表 + + + + + + + 获取注册企业审批信息 + + + + + + + 企业用户审批 + + + + 用户模块 diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/TenantApplyController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/TenantApplyController.cs index d63119c4..67fac18e 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/TenantApplyController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/TenantApplyController.cs @@ -1,4 +1,5 @@ using DS.Module.Core; +using DS.Module.Core.Data; using DS.WMS.Core.System.Dtos; using DS.WMS.Core.System.Interface; using Microsoft.AspNetCore.Mvc; @@ -58,5 +59,45 @@ public class TenantApplyController : ApiController var res = _invokeService.SubmitTenantApply(id); return res; } + + + /// + /// 企业注册用户列表 + /// + /// + /// + [HttpPost] + [Route("GetTenantApplyList")] + public DataResult> GetTenantApplyList([FromBody] PageRequest request) + { + var res = _invokeService.GetListByPage(request); + return res; + } + + /// + /// 获取注册企业审批信息 + /// + /// + /// + [HttpGet] + [Route("GetTenantAuditInfo")] + public DataResult GetTenantAuditInfo([FromQuery] string id) + { + var res = _invokeService.GetTenantAuditInfo(id); + return res; + } + + /// + /// 企业用户审批 + /// + /// + /// + [HttpPost] + [Route("AuditTenantApply")] + public DataResult AuditTenantApply([FromBody] CommonAuditInput model) + { + var res = _invokeService.AuditTenantApply(model); + return res; + } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt b/ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt index 54668162..2db0e6f0 100644 --- a/ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt +++ b/ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt @@ -812,3 +812,24 @@ 2024-01-11 10:29:24.9802 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config 2024-01-11 10:29:25.0074 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile 2024-01-11 10:29:25.0667 Info Configuration initialized. +2024-01-11 14:20:48.9786 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-01-11 14:20:49.0008 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-01-11 14:20:49.0145 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-01-11 14:20:49.0305 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.7.2287. Product version: 5.2.7+a1ef7cd83b5a6a172142a6850f0ced4e759a4b3b. GlobalAssemblyCache: False +2024-01-11 14:20:49.0488 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config +2024-01-11 14:20:49.0568 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-01-11 14:20:49.0781 Info Configuration initialized. +2024-01-11 15:40:28.5248 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-01-11 15:40:28.5422 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-01-11 15:40:28.5572 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-01-11 15:40:28.5745 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.7.2287. Product version: 5.2.7+a1ef7cd83b5a6a172142a6850f0ced4e759a4b3b. GlobalAssemblyCache: False +2024-01-11 15:40:28.5956 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config +2024-01-11 15:40:28.6077 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-01-11 15:40:28.6484 Info Configuration initialized. +2024-01-11 16:38:23.9286 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-01-11 16:38:23.9434 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-01-11 16:38:23.9566 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-01-11 16:38:23.9566 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.7.2287. Product version: 5.2.7+a1ef7cd83b5a6a172142a6850f0ced4e759a4b3b. GlobalAssemblyCache: False +2024-01-11 16:38:23.9900 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config +2024-01-11 16:38:23.9900 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-01-11 16:38:24.0184 Info Configuration initialized. diff --git a/ds-wms-web/src/views/system/tenantApply/index.vue b/ds-wms-web/src/views/system/tenantApply/index.vue index af2436de..3f050c65 100644 --- a/ds-wms-web/src/views/system/tenantApply/index.vue +++ b/ds-wms-web/src/views/system/tenantApply/index.vue @@ -84,19 +84,13 @@ await setProps({ submitButtonOptions: { loading: true } }) var main = getFieldsValue() var files = getFileFieldsValue() + // console.log(main, files) - console.log(main, files) - - const postData = reactive({ - id: main.id, - name: main.name, - address: main.address, - phone: main.phone, - chief: main.chief, - email: main.email, + const postData = Object.assign({}, main, { cardfiles: files.cardfiles, licensefiles: files.licensefiles, }) + console.log(postData) await editInfo(postData).then((res) => { if (res.succeeded) { notification.success({ message: res.message, duration: 3 })