From 0d1bfcecb930f28872cd6b41491ff78b064a7a0e Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 16 Nov 2021 14:19:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2021116=E5=89=8D=E5=90=8E=E7=AB=AF=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appsettings.Development.json | 8 +- .../appsettings.json | 8 +- .../Entities/Boms/ImportBomDto.cs | 4 +- .../Entities/Invoices/InvoiceDtoBase.cs | 2 +- .../Entities/VWKanBan/VWKanBanImportDto.cs | 4 +- .../VWScrapClaims/ScrapClaimsImportDto.cs | 2 +- .../VWSparePart/SparePartImportDto.cs | 8 +- .../UnSettleAccountImportService.cs | 208 ++++--- vue/src/components/ImportExcel-vw/index.vue | 16 +- vue/src/router/index.js | 7 +- vue/src/router/modules/basedata.js | 62 +- vue/src/router/modules/fis.js | 2 +- vue/src/router/modules/vwFisData.js | 42 +- vue/src/router/modules/vwKBdata.js | 25 +- vue/src/settings.js | 2 +- vue/src/views/login/index.vue | 4 +- .../views/ux/vw/dataInput/r3-open/index.vue | 572 ++++++++++++++++++ vue/src/views/ux/vw/dataInput/r3/index.vue | 182 +----- vue/static/tableFieldForSearch.json | 70 +++ 19 files changed, 896 insertions(+), 332 deletions(-) create mode 100644 vue/src/views/ux/vw/dataInput/r3-open/index.vue diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json index 734cc4b1..55446fc9 100644 --- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json +++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.Development.json @@ -2,9 +2,13 @@ "App": { "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088" }, + //"ConnectionStrings": { + // "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#", + // "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;" + //}, "ConnectionStrings": { - "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#", - "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;" + "Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008", + "SettleAccountService": "Server=192.168.0.140;Database=SettleAccountService;user id=sa;Password=Microsoft2008;" }, "Logging": { "LogLevel": { diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json index 03b8ad70..c8fa80a2 100644 --- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json +++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json @@ -2,9 +2,13 @@ "App": { "CorsOrigins": "https://*.abc.com,http://localhost:9528,http://149.223.116.5:8088" }, + //"ConnectionStrings": { + // "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#", + // "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;" + //}, "ConnectionStrings": { - "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;user id=sa;Password=1q2w!@#", - "SettleAccountService": "Server=LAPTOP-V3U07C2O;Database=SettleAccountService;user id=sa;Password=1q2w!@#;" + "Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008", + "SettleAccountService": "Server=192.168.0.140;Database=SettleAccountService;user id=sa;Password=Microsoft2008;" }, "Logging": { "LogLevel": { diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/ImportBomDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/ImportBomDto.cs index d44eabb9..d95038dd 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/ImportBomDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Boms/ImportBomDto.cs @@ -37,7 +37,7 @@ namespace Win.Sfs.SettleAccount.Boms //[MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] //public string Name { get; set; } - [ImporterHeader(Name = "父物料号")] + [ImporterHeader(Name = "父物料号", FixAllSpace = true)] [Required(ErrorMessage = "{0}是必填项")] [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ParentItemCode { get; set; } @@ -49,7 +49,7 @@ namespace Win.Sfs.SettleAccount.Boms public string ParentItemDesc { get; set; } - [ImporterHeader(Name = "组件")] + [ImporterHeader(Name = "组件", FixAllSpace = true)] [Required(ErrorMessage = "{0}是必填项")] [MaxLength(CommonConsts.MaxNameLength, ErrorMessage = "{0}最多输入{1}个字符")] public string ChildItemCode { get; set; } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs index 4300023a..ac59e86a 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Invoices/InvoiceDtoBase.cs @@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.Invoices /// ///零件号 /// - [ImporterHeader(Name = "零件号")] + [ImporterHeader(Name = "零件号", FixAllSpace = true)] public string MaterialCode { get; set; } /// ///零件名称 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanImportDto.cs index 16e822bf..b5494680 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWKanBan/VWKanBanImportDto.cs @@ -26,7 +26,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWKanBan /// ///看板条码号 /// - [ImporterHeader(Name = "看板条码号")] + [ImporterHeader(Name = "看板条码号", FixAllSpace = true)] public string Kanban { set; get; } /// @@ -42,7 +42,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWKanBan /// /// 零件号 /// - [ImporterHeader(Name = "零件号")] + [ImporterHeader(Name = "零件号", FixAllSpace = true)] public virtual string MaterialCode { set; get; } /// /// 零件类型 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs index 966d0259..4d2344d7 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWScrapClaims/ScrapClaimsImportDto.cs @@ -30,7 +30,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWScrapClaims /// /// 零件号 /// - [ImporterHeader(Name = "零件号")] + [ImporterHeader(Name = "零件号", FixAllSpace = true)] public virtual string MaterialCode { set; get; } /// /// 零件类型 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs index d63f82cc..2ce7e0c2 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/VWSparePart/SparePartImportDto.cs @@ -26,7 +26,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart /// /// 采购订单号 /// - [ImporterHeader(Name = "采购订单号")] + [ImporterHeader(Name = "采购订单号", FixAllSpace = true)] public string PurchaseOrderNo { get; set; } /// /// 采购订单行项目 @@ -62,12 +62,12 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart /// /// 科目号 /// - [ImporterHeader(Name = "科目号")] + [ImporterHeader(Name = "科目号", FixAllSpace = true)] public string AccountNum { get; set; } /// /// 物料代码 /// - [ImporterHeader(Name = "物料代码")] + [ImporterHeader(Name = "物料代码", FixAllSpace = true)] public string MaterialCode { get; set; } /// /// 物料描述 @@ -82,7 +82,7 @@ namespace Win.Sfs.SettleAccount.Entities.VWSparePart /// /// 交货单号 /// - [ImporterHeader(Name = "交货单号")] + [ImporterHeader(Name = "交货单号", FixAllSpace = true)] public string DeliveryOrderNo { get; set; } /// /// 交货行号 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs index 74247508..9322831d 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/UnSettleAccount/UnSettleAccountImportService.cs @@ -1,5 +1,6 @@ using Magicodes.ExporterAndImporter.Core; using Magicodes.ExporterAndImporter.Excel; +using SettleAccount.Job.Services; using System; using System.Collections.Generic; using System.IO; @@ -10,7 +11,7 @@ using TaskJob.EventArgs; using TaskJob.Interfaces; using Volo.Abp.DependencyInjection; using Win.Sfs.SettleAccount.Entities.SettleAccounts; - +using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.SettleAccount.Repository.SettleAccount; namespace TaskJob.Services @@ -22,13 +23,16 @@ namespace TaskJob.Services { private readonly UnSettleAccountRepository _repository; private readonly UnSettleAccountVersionRepository _versionRepository; + private readonly InputService _inputService; public UnSettleAccountImportService( + InputService inputService, UnSettleAccountRepository repository, UnSettleAccountVersionRepository versionRepository ) { _repository = repository; _versionRepository = versionRepository; + _inputService = inputService; } public string ImportFile(Guid id, List fileName, List realfileName, List customConditions) @@ -37,91 +41,59 @@ namespace TaskJob.Services string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\"; var version = customConditions.Where(p => p.Name == "Version").FirstOrDefault().Value; var customerCode = customConditions.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value; + var year = customConditions.Where(p => p.Name == "Year").FirstOrDefault().Value; + var period = customConditions.Where(p => p.Name == "Period").FirstOrDefault().Value; + var factory = customConditions.Where(p => p.Name == "Factory").FirstOrDefault().Value; + //_versionRepository.Delete(version); + //_repository.Delete(version); + + var _id = Guid.NewGuid(); foreach (var itm in fileName) { try { + var filePath = fileSavePath + itm;//获取到导入的excel + var exten = Path.GetExtension(fileSavePath); List _setls = new List(); List _errorList = new List(); - var _id = Guid.NewGuid(); - //var checkList = new List(); - //var _chList = await _relrepository.GetAllAsync(GuidGenerator.Create(), true); - //var _chls = _chList.Select(p => p.SettleMaterialCode).Distinct(); + + var checkList = new List(); + List _precodeList = new List();// - using (TextReader textReader = new StreamReader(filePath)) + + var errorlist = new List(); + var dtoList = _inputService.Input(filePath, null, errorlist); + foreach (var dto in dtoList) { - - int i = 0; - while (true) + if (dto.KENNCode.Length == 6) { - string str = textReader.ReadLine(); - if (string.IsNullOrEmpty(str)) - { - break; - } - else - { - try - { - var _lst = str.Split(new char[] { '|' }).ToList(); - string _settleyear = _lst[1].Trim(); - string _kENNCode = _lst[2].Trim(); - string _chassisNumber = _lst[3].Trim(); - string _model = _lst[4].Trim(); - DateTime _cP5A = DateTime.Parse(_lst[5].Trim()); - DateTime _cP7 = DateTime.Parse(_lst[6].Trim()); - string _materialCode = _lst[7].Trim(); - decimal _qty = decimal.Parse(_lst[8].Trim()); - string _reason = (!string.IsNullOrEmpty(_lst[9])) ? _lst[9].Trim() : string.Empty; - //string _settlementID = _lst[10].Trim(); - //string _settlementSupplier = _lst[12].Trim(); - _setls.Add(new UnSettleAccount( - Guid.NewGuid(), - Guid.NewGuid(), - _settleyear, - _kENNCode, - _chassisNumber, - _model, - _cP5A, - _cP7, - _materialCode, - _qty, - string.Empty, - string.Empty, - //, - //, - DateTime.Now.Year.ToString(), - DateTime.Now.Month.ToString(), - _id, - version, - DateTime.Now, - Guid.NewGuid(), - _reason - )); - } - catch - { - - } - } - i++; + dto.KENNCode = "0" + dto.KENNCode; } - textReader.Close(); + var _settleaccount = new UnSettleAccount(Guid.NewGuid(), Guid.NewGuid(), dto.SettleYear, dto.KENNCode, + dto.ChassisNumber, dto.Model, dto.CP5A, dto.CP7, + dto.MaterialCode, dto.Qty, string.Empty, string.Empty, + DateTime.Now.Year.ToString(), DateTime.Now.Month.ToString(),_id, version, DateTime.Now, Guid.NewGuid(),dto.UnsettledReason); + + _setls.Add(_settleaccount); } - var _ls = _setls; + var _ls = _setls; + var a = _ls.Where(p => string.IsNullOrEmpty(p.KENNCode)); var query = from arc in _ls - group arc by new { arc.ChassisNumber, arc.MaterialCode } - into g + group arc by new { arc.ChassisNumber, arc.MaterialCode } into g where g.Count() > 1 select g; - - _repository.Insert(_setls); _versionRepository.Insert(version, customerCode, customerCode); - - + + + #region + //var errorFileName = "错误文件.xlsx"; + //checkList.Add(new ErrorExportDto(version, customerCode, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("ERP物料号{0}底盘号 {1}有重复", "11111111111", "22222222222"), string.Empty)); + + //_service.ExportError(id,errorFileName, checkList); + #endregion } catch (Exception e) { @@ -130,5 +102,105 @@ namespace TaskJob.Services } return id.ToString(); } + + //public string ImportFile(Guid id, List fileName, List realfileName, List customConditions) + //{ + // IExporter _excel = new ExcelExporter(); + // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\"; + // var version = customConditions.Where(p => p.Name == "Version").FirstOrDefault().Value; + // var customerCode = customConditions.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value; + // foreach (var itm in fileName) + // { + // try + // { + // var filePath = fileSavePath + itm;//获取到导入的excel + // List _setls = new List(); + // List _errorList = new List(); + // var _id = Guid.NewGuid(); + // //var checkList = new List(); + // //var _chList = await _relrepository.GetAllAsync(GuidGenerator.Create(), true); + // //var _chls = _chList.Select(p => p.SettleMaterialCode).Distinct(); + // List _precodeList = new List();// + // using (TextReader textReader = new StreamReader(filePath)) + // { + + // int i = 0; + // while (true) + // { + // string str = textReader.ReadLine(); + // if (string.IsNullOrEmpty(str)) + // { + // break; + // } + // else + // { + // try + // { + // var _lst = str.Split(new char[] { '|' }).ToList(); + // string _settleyear = _lst[1].Trim(); + // string _kENNCode = _lst[2].Trim(); + // string _chassisNumber = _lst[3].Trim(); + // string _model = _lst[4].Trim(); + // DateTime _cP5A = DateTime.Parse(_lst[5].Trim()); + // DateTime _cP7 = DateTime.Parse(_lst[6].Trim()); + // string _materialCode = _lst[7].Trim(); + // decimal _qty = decimal.Parse(_lst[8].Trim()); + // string _reason = (!string.IsNullOrEmpty(_lst[9])) ? _lst[9].Trim() : string.Empty; + // //string _settlementID = _lst[10].Trim(); + // //string _settlementSupplier = _lst[12].Trim(); + // _setls.Add(new UnSettleAccount( + // Guid.NewGuid(), + // Guid.NewGuid(), + // _settleyear, + // _kENNCode, + // _chassisNumber, + // _model, + // _cP5A, + // _cP7, + // _materialCode, + // _qty, + // string.Empty, + // string.Empty, + // //, + // //, + // DateTime.Now.Year.ToString(), + // DateTime.Now.Month.ToString(), + // _id, + // version, + // DateTime.Now, + // Guid.NewGuid(), + // _reason + // )); + // } + // catch + // { + + // } + // } + // i++; + // } + // textReader.Close(); + // } + // var _ls = _setls; + + // var query = from arc in _ls + // group arc by new { arc.ChassisNumber, arc.MaterialCode } + // into g + // where g.Count() > 1 + // select g; + + + // _repository.Insert(_setls); + // _versionRepository.Insert(version, customerCode, customerCode); + + + // } + // catch (Exception e) + // { + // throw e; + // } + // } + // return id.ToString(); + //} } } diff --git a/vue/src/components/ImportExcel-vw/index.vue b/vue/src/components/ImportExcel-vw/index.vue index bf938db5..1947ba66 100644 --- a/vue/src/components/ImportExcel-vw/index.vue +++ b/vue/src/components/ImportExcel-vw/index.vue @@ -339,24 +339,16 @@ export default { crmTypeName() { return ( { - bomdatabase: "产品结构BOM", - settleAccount: "结算数据", - material: "物料主数据", - ItemInvoicePrice:"QAD出库账单", - materialRelation: "总成与结算件关系", + settleAccount: "大众已结算数据", + unSettleAccount: "大众未结数据", }[this.crmType] || "" ); }, getWebApi() { return ( { - settleAccount: "/api/settleaccount/SettleAccount/ExcelImport-TH", - bomdatabase: "/api/settleaccount/Material/ExcelImport-TH", - material: "/api/settleaccount/Material/ExcelImport-TH", - ItemInvoicePrice: "/api/settleaccount/ItemInvoicePrice/ExcelImport", - materialRelation: - "/api/settleaccount/EstimatedInventoryDetail/ExcelImport-TH", - settlementCrossReference:"/api/settleaccount/SettlementCrossReference/ExcelImport", + settleAccount: "/api/settleaccount/SettleAccount/ExcelImport-PG", + unSettleAccount: "/api/settleaccount/UnSettleAccount/ExcelImport", }[this.crmType] || "" ); }, diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 1a490220..0f52e00e 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -16,7 +16,7 @@ import vwFisDataRouter from './modules/vwFisData' import wheeldataRouter from './modules/wheeldata' import vwNoBarcodeRouter from './modules/vwKBNoBarcodedata' import JobTimeDataRouter from './modules/jobtimedata' -import newjitRouter from './modules/newjit-basedata' +//import newjitRouter from './modules/newjit-basedata' import pgfis from './modules/fis' /** @@ -169,12 +169,13 @@ export const asyncRoutes = [ managerRouter,//系统首页 personRouter,//系统管理 basedataRouter,//基础数据维护 - newjitRouter,//FIS数据管理 + //newjitRouter,//FIS数据管理 vwFisDataRouter,//结算与开票数据导入 billdataRouter,//销售结算与开票报表 + pgfis,//派格fis //wheeldataRouter,//二配 JobTimeDataRouter,//后台作业监控 - pgfis,//派格fis + // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/vue/src/router/modules/basedata.js b/vue/src/router/modules/basedata.js index 9e3e39ea..4d6d0346 100644 --- a/vue/src/router/modules/basedata.js +++ b/vue/src/router/modules/basedata.js @@ -38,16 +38,16 @@ const basedataRouter = { name: 'codeSetting',//命名路由 meta: { title: '通用代码设置', roles: ['SettleAccount.CodeSettings'], icon: '通用' } }, - { - path: '/settlementParts', - component: () => import('@/views/ux/basedata/settlementParts/index'), - name: 'settlementParts',//命名路由 - meta: { - title: '结算件基本信息', - roles: ['SettleAccount.SettlementParts'], - icon: '零件' - } - }, + // { + // path: '/settlementParts', + // component: () => import('@/views/ux/basedata/settlementParts/index'), + // name: 'settlementParts',//命名路由 + // meta: { + // title: '结算件基本信息', + // roles: ['SettleAccount.SettlementParts'], + // icon: '零件' + // } + // }, { path: '/partsSettlement', component: () => import('@/views/ux/basedata/partsSettlement/index'), @@ -73,33 +73,33 @@ const basedataRouter = { component: () => import('@/views/ux/basedata/Prebatch/index'), name: 'Prebatch',//命名路由 meta: { - title: '预批量数据导入', + title: '客户信息管理', roles: ['SettleAccount.Prebatchs'], icon: '批量' } }, - { - path: 'bomdatabase', - component: () => import('@/views/ux/basedata/bomdatabase/index'), - name: 'Bomdatabase',//命名路由 - meta: { - title: 'BOM', - roles: ['SettleAccount.Boms'], - icon: '未结算' - } - }, + // { + // path: 'bomdatabase', + // component: () => import('@/views/ux/basedata/bomdatabase/index'), + // name: 'Bomdatabase',//命名路由 + // meta: { + // title: 'BOM', + // roles: ['SettleAccount.Boms'], + // icon: '未结算' + // } + // }, - { - path: '/settlementPakAndSparePartsRef', - component: () => import('@/views/ux/basedata/settlementPakAndSparePartsRef/index'), - name: 'settlementPakAndSparePartsRef',//命名路由 - meta: { - title: '结算包与散件对应关系', - roles: ['SettleAccount.Boms'], - icon: '零件' - } - }, + // { + // path: '/settlementPakAndSparePartsRef', + // component: () => import('@/views/ux/basedata/settlementPakAndSparePartsRef/index'), + // name: 'settlementPakAndSparePartsRef',//命名路由 + // meta: { + // title: '结算包与散件对应关系', + // roles: ['SettleAccount.Boms'], + // icon: '零件' + // } + // }, ] } diff --git a/vue/src/router/modules/fis.js b/vue/src/router/modules/fis.js index 3ef5e9dd..4655ab23 100644 --- a/vue/src/router/modules/fis.js +++ b/vue/src/router/modules/fis.js @@ -9,7 +9,7 @@ const pgfis = { name: 'pgfis', meta: { //requiresAuth: true, - title: '派格fis', + title: 'JIT数据管理', index: 0, type: 'crm', icon: '业务', diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js index 5c51135c..f7b2dd1f 100644 --- a/vue/src/router/modules/vwFisData.js +++ b/vue/src/router/modules/vwFisData.js @@ -9,7 +9,7 @@ const vwFisDataRouter = { //hidden: true, meta: { //requiresAuth: true, - title: '结算与开票数据导入', + title: '大众结算与开票数据导入', index: 0, type: 'crm', icon: '单据导入', @@ -21,7 +21,17 @@ const vwFisDataRouter = { component: () => import('@/views/ux/vw/dataInput/r3'), name: 'SettleAccount',//命名路由 meta: { - title: '结算数据导入', + title: 'FIS未结算数据导入', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: '/settleAccount-finish', + component: () => import('@/views/ux/vw/dataInput/r3-open'), + name: 'SettleAccount',//命名路由 + meta: { + title: 'FIS已结算数据导入', roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） icon: '结算' } @@ -31,7 +41,7 @@ const vwFisDataRouter = { component: () => import('@/views/ux/basedata/Invoice/index'), name: 'Invoices',//命名路由 meta: { - title: '开票数据导入', + title: '大众发票汇总导入', roles: ['SettleAccount.Invoices'], icon: '对比' } @@ -41,7 +51,7 @@ const vwFisDataRouter = { component: () => import('@/views/ux/vw/dataInput/itemInvoicePrice/index'), name: 'ItemInvoicePrice',//命名路由 meta: { - title: 'QAD出库账单导入', + title: '看板结算明细导入', roles: ['SettleAccount.ItemInvoicePrices'], icon: '发运' } @@ -51,7 +61,7 @@ const vwFisDataRouter = { component: () => import('@/views/ux/vw/dataInput/fis'), name: 'FIS', meta: { - title: 'FIS数据查询', + title: 'CP7报废和索赔导入', roles: ['SettleAccount.FISs'], icon: '文件' } @@ -62,22 +72,22 @@ const vwFisDataRouter = { component: () => import('@/views/ux/vw/dataInput/SettlementCrossReference'), name: 'SettlementCrossReference',//命名路由 meta: { - title: '结算件对照关系', + title: '大众备件结算明细导入', roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） icon: '结算' } }, - { - path: '/EP', - component: () => import('@/views/ux/vw/dataInput/erpei'), - name: 'ERPEI',//命名路由 - meta: { - title: '二配结算表', - roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） - icon: '结算' - } - }, + // { + // path: '/EP', + // component: () => import('@/views/ux/vw/dataInput/erpei'), + // name: 'ERPEI',//命名路由 + // meta: { + // title: '二配结算表', + // roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + // icon: '结算' + // } + // }, ] } diff --git a/vue/src/router/modules/vwKBdata.js b/vue/src/router/modules/vwKBdata.js index 041eced2..4ca36bf7 100644 --- a/vue/src/router/modules/vwKBdata.js +++ b/vue/src/router/modules/vwKBdata.js @@ -9,7 +9,7 @@ const billdataRouter = { //hidden: true, meta: { //requiresAuth: true, - title: '销售结算与开票报表', + title: '大众销售结算与开票报表', index: 0, type: 'crm', icon: '销售', @@ -21,7 +21,7 @@ const billdataRouter = { component: () => import('@/views/ux/billManage/IssuedUnsettled/index'), name: 'IssuedUnsettled',//命名路由 meta: { - title: '发出未结算报表', + title: '大众准时化未结明细', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '报表' } @@ -31,17 +31,27 @@ const billdataRouter = { component: () => import('@/views/ux/billManage/settledPartAndErpPartPriceDiff/index'), name: 'SettledPartAndErpPartPriceDiff',//命名路由 meta: { - title: '总成定价和结算价对比', + title: '大众准时化未结比对', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '结算' } }, + { + path: '/audiAndvw1', + component: () => import('@/views/ux/billManage/audiAndvw'), + name: 'audiAndvw',//命名路由 + meta: { + title: '准时化未结差异比对', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '售后' + } + }, { path: '/InvoiceSettledDiff', component: () => import('@/views/ux/billManage/InvoiceSettledDiff'), name: 'InvoiceSettledDiff',//命名路由 meta: { - title: '结算与开票数据对比', + title: '发票与结算核对汇总', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '结算对比' } @@ -51,7 +61,7 @@ const billdataRouter = { component: () => import('@/views/ux/billManage/FisUnSettledDiff'), name: 'FisUnSettledDiff',//命名路由 meta: { - title: 'ERP总成开票报表', + title: '准时化交货与结算核对', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '看板' } @@ -61,7 +71,7 @@ const billdataRouter = { component: () => import('@/views/ux/billManage/PriceQtyDiff'), name: 'PriceQtyDiff',//命名路由 meta: { - title: '价差量差分析报表', + title: '准时化结算数量差异比对', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '售后' } @@ -71,11 +81,12 @@ const billdataRouter = { component: () => import('@/views/ux/billManage/audiAndvw'), name: 'audiAndvw',//命名路由 meta: { - title: '二配报表', + title: '准时化结算门板价格差异', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '售后' } }, + ] } diff --git a/vue/src/settings.js b/vue/src/settings.js index 6efa2a08..e7015144 100644 --- a/vue/src/settings.js +++ b/vue/src/settings.js @@ -1,5 +1,5 @@ module.exports = { - title: '长春采埃孚富奥结算管理系统', + title: '长春派格汽车塑料技术有限公司结算管理系统', /** * @type {boolean} true | false diff --git a/vue/src/views/login/index.vue b/vue/src/views/login/index.vue index a2a1bdcb..1fd290af 100644 --- a/vue/src/views/login/index.vue +++ b/vue/src/views/login/index.vue @@ -1,14 +1,14 @@