From ba3dcd90fb59e28eff2e4dd02b7f77a0682150c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Wed, 5 Jan 2022 13:56:18 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E6=B1=BD?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/ux/vw/dataInput/hq_y/index.vue | 594 +++++++++++++++++++ 1 file changed, 594 insertions(+) create mode 100644 vue/src/views/ux/vw/dataInput/hq_y/index.vue diff --git a/vue/src/views/ux/vw/dataInput/hq_y/index.vue b/vue/src/views/ux/vw/dataInput/hq_y/index.vue new file mode 100644 index 00000000..f9eb78a3 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_y/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + From 5e6cd77fdcf5ffe060eb76d53f356895388dbaf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Wed, 5 Jan 2022 14:17:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=B8=80=E6=B1=BD=E8=BD=BF=E8=BD=A6?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/modules/hq_menu.js | 45 ++++++++++++++++++++++++++--- vue/src/router/modules/vwFisData.js | 10 +++++++ 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js index 68c1aa9b..7274243e 100644 --- a/vue/src/router/modules/hq_menu.js +++ b/vue/src/router/modules/hq_menu.js @@ -14,7 +14,7 @@ const hqMenudataRouter = { }, children: [ { - path: '/H', + path: '/import-h-data', name: 'import-h-data',//命名路由-二级 component: () => import('@/views/ux/vw/dataInput/hq_h'), redirect: 'ux/vw/dataInput/hq_h', @@ -45,9 +45,11 @@ const hqMenudataRouter = { } } ] + }, + { - path: '/M', + path: '/export-m-data', component: () => import('@/views/ux/vw/dataInput/hq_m'), name: 'export-m-data',//命名路由 redirect: '/ux/vw/dataInput/hq_m', @@ -81,7 +83,7 @@ const hqMenudataRouter = { ] }, { - path: '/F', + path: '/export-f-data', component: () => import('@/views/ux/vw/dataInput/hq_f'), name: 'export-f-data',//命名路由 redirect: '/ux/vw/dataInput/hq_f', @@ -112,8 +114,43 @@ const hqMenudataRouter = { icon: '二配' } } + ], + }, + + { + path: '/import-y-data', + name: 'import-y-data',//命名路由-二级 + component: () => import('@/views/ux/vw/dataInput/hq_y'), + redirect: 'ux/vw/dataInput/hq_y', + meta: { + title: '一汽轿车平台', + // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + icon: '看板' + }, + children: [ + { + path: 'hq-Y-platform', + component: () => import('@/views/ux/vw/dataInput/hq_y'), + name: 'ERPEI',//命名路由 + meta: { + title: '一汽轿车平台导入', + roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'hq-Y-platform-export', + component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), + name: 'ScrapClaims', + meta: { + title: '一汽轿车平台结算差异输出', + roles: ['SettleAccount.FISs'], + icon: '文件' + } + } ] - } + + }, ] } diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js index e52fc1d1..a48c471b 100644 --- a/vue/src/router/modules/vwFisData.js +++ b/vue/src/router/modules/vwFisData.js @@ -88,6 +88,16 @@ const vwFisDataRouter = { icon: '结算' } }, + { + path: 'hq-Y-platform', + component: () => import('@/views/ux/vw/dataInput/hq_y'), + name: 'ERPEI',//命名路由 + meta: { + title: '一汽轿车平台', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, { path: 'hq-M-platform', component: () => import('@/views/ux/vw/dataInput/hq_m'), From 7c1ebb9582363de547ee4be606ba8b4e4036c210 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Wed, 5 Jan 2022 14:21:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BT_Car/BT_Car_PlatformDto.cs | 20 +++++++++ .../Entities/BT_Car/BT_Car_PlatformDtoBase.cs | 20 +++++++++ .../BT_Car/BT_Car_PlatformExportDto.cs | 25 +++++++++++ .../BT_Car/BT_Car_PlatformImportDto.cs | 24 +++++++++++ .../BT_Car/BT_Car_PlatformRequestDto.cs | 20 +++++++++ .../Entities/HQ_F/HQ_F_PlatformDto.cs | 19 +++++++++ .../Entities/HQ_F/HQ_F_PlatformDtoBase.cs | 19 +++++++++ .../Entities/HQ_F/HQ_F_PlatformExportDto.cs | 23 ++++++++++ .../Entities/HQ_F/HQ_F_PlatformImportDto.cs | 23 ++++++++++ .../Entities/HQ_F/HQ_F_PlatformRequestDto.cs | 19 +++++++++ .../Entities/HQ_M/HQ_M_PlatformDto.cs | 20 +++++++++ .../Entities/HQ_M/HQ_M_PlatformDtoBase.cs | 20 +++++++++ .../Entities/HQ_M/HQ_M_PlatformExportDto.cs | 24 +++++++++++ .../Entities/HQ_M/HQ_M_PlatformImportDto.cs | 24 +++++++++++ .../Entities/HQ_M/HQ_M_PlatformRequestDto.cs | 20 +++++++++ .../Entities/BT_Car/BT_Car_Platform.cs | 38 ++++++++++++++++- .../Entities/HQ_F/HQ_F_Platform.cs | 42 +++++++++++-------- .../Entities/HQ_M/HQ_M_Platform.cs | 42 ++++++++++++------- ...AccountDbContextModelCreatingExtensions.cs | 1 + 19 files changed, 408 insertions(+), 35 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs index dc89ff81..e230bc17 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs @@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs index 12180351..6f000845 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs @@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs index 9ac1a36b..a835d119 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs @@ -81,5 +81,30 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// [ExporterHeader(DisplayName = "存储地点描述")] public string StorageLocationDesc { get; set; } + + + /// + ///验收单号 + /// + [ExporterHeader(DisplayName = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ExporterHeader(DisplayName = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs index 5b35507c..0a6598c3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs @@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// [ImporterHeader(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ImporterHeader(Name = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [ImporterHeader(Name = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ImporterHeader(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ImporterHeader(Name = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs index 600cced9..7896945f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs @@ -65,6 +65,26 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// public string StorageLocation { get; set; } + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } + /// /// 存储地点描述 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs index f49ce8ce..16e546b6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs @@ -68,5 +68,24 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs index 3d3cf82a..a496a00b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs @@ -68,5 +68,24 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs index 086fab5e..75cb76d1 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs @@ -81,5 +81,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// [ExporterHeader(DisplayName = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ExporterHeader(DisplayName = "验收单号")] + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ExporterHeader(DisplayName = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs index 6bbeaf48..52521ca5 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs @@ -81,5 +81,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// [ImporterHeader(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ImporterHeader(Name = "验收单号")] + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + [ImporterHeader(Name = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ImporterHeader(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ImporterHeader(Name = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs index 52b1bc57..6f38b676 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs @@ -65,6 +65,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// public string StorageLocation { get; set; } + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } + /// /// 存储地点描述 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs index de9a7648..9a1847c5 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs @@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs index 4e24abce..f3879604 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs @@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs index ac758d0d..8f41c9f3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs @@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// [ExporterHeader(DisplayName = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ExporterHeader(DisplayName = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ExporterHeader(DisplayName = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs index a8190c22..dab9e93b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs @@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// [ImporterHeader(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ImporterHeader(Name = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [ImporterHeader(Name = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ImporterHeader(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ImporterHeader(Name = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs index fb74a3d0..7197dae8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs @@ -65,6 +65,26 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// public string StorageLocation { get; set; } + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } + /// /// 存储地点描述 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs index 3002ffa2..0916c151 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs @@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car public BT_Car_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber, string kanbanNumber, string year, string factory, DateTime acceptanceDate, string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc, - string materialCode) : base(Id) + string materialCode, string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id) { MaterialVoucherNo = materialVoucherNo; KanbanNumber = kanbanNumber; @@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car Supplier = supplier; StorageLocation = storageLocation; StorageLocationDesc = storageLocationDesc; + AcceptanceNo = acceptanceNo; + Qty = qty; + Price = price; + Amt = amt; } //验收单号 外部单号 物料凭证号 物料凭证日期 物料凭证记账日期 看板编号 外部看板编号 物料号 物料描述 数量 单价 金额 @@ -67,7 +71,11 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// [Display(Name = "物料凭证号")] public string MaterialVoucherNo { get; set; } - + ///// + /////验收单号 + ///// + //[Display(Name = "验收单号")] + //public string AcceptanceNo { get; set; } /// ///会计年度 /// @@ -120,6 +128,32 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car [Display(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [Display(Name = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [Display(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [Display(Name = "金额")] + public decimal Amt { set; get; } + + /// /// 备注 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs index f871b668..2b673fc8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs @@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F public HQ_F_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber, string kanbanNumber, string year, string factory, DateTime acceptanceDate, string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc, - string materialCode) : base(Id) + string materialCode, string acceptanceNo,decimal qty, decimal price, decimal amt) : base(Id) { MaterialVoucherNo = materialVoucherNo; KanbanNumber = kanbanNumber; @@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F Supplier = supplier; StorageLocation = storageLocation; StorageLocationDesc = storageLocationDesc; + AcceptanceNo = acceptanceNo; + Qty = qty; + Price = price; + Amt = amt; } //验收单号 外部单号 物料凭证号 物料凭证日期 物料凭证记账日期 看板编号 外部看板编号 物料号 物料描述 数量 单价 金额 @@ -124,24 +128,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F [Display(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + /// + ///验收单号 + /// + [Display(Name = "验收单号")] + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { set; get; } - ///// - ///// 数量 - ///// - //[Display(Name = "数量")] - //public decimal Qty { set; get; } - - ///// - ///// 单价 - ///// - //[Display(Name = "单价")] - //public decimal Price { set; get; } + /// + /// 单价 + /// + [Display(Name = "单价")] + public decimal Price { set; get; } - ///// - ///// 金额 - ///// - //[Display(Name = "金额")] - //public decimal Amt { set; get; } + /// + /// 金额 + /// + [Display(Name = "金额")] + public decimal Amt { set; get; } /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs index c3a3df94..779fb3b9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs @@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M public HQ_M_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber, string kanbanNumber, string year, string factory, DateTime acceptanceDate, string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc, - string materialCode) : base(Id) + string materialCode, string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id) { MaterialVoucherNo = materialVoucherNo; KanbanNumber = kanbanNumber; @@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M Supplier = supplier; StorageLocation = storageLocation; StorageLocationDesc = storageLocationDesc; + AcceptanceNo = acceptanceNo; + Qty = qty; + Price = price; + Amt = amt; } //验收单号 外部单号 物料凭证号 物料凭证日期 物料凭证记账日期 看板编号 外部看板编号 物料号 物料描述 数量 单价 金额 @@ -125,23 +129,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M public string StorageLocationDesc { get; set; } - ///// - ///// 数量 - ///// - //[Display(Name = "数量")] - //public decimal Qty { set; get; } + /// + ///验收单号 + /// + [Display(Name = "验收单号")] + public string AcceptanceNo { get; set; } - ///// - ///// 单价 - ///// - //[Display(Name = "单价")] - //public decimal Price { set; get; } + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { set; get; } - ///// - ///// 金额 - ///// - //[Display(Name = "金额")] - //public decimal Amt { set; get; } + /// + /// 单价 + /// + [Display(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [Display(Name = "金额")] + public decimal Amt { set; get; } /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs index 647dfd8c..887894ab 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs @@ -365,6 +365,7 @@ namespace Win.Sfs.SettleAccount b.Property(x => x.Supplier).HasMaxLength(50); b.Property(x => x.StorageLocation).HasMaxLength(50); b.Property(x => x.StorageLocationDesc).HasMaxLength(150); + b.Property(x => x.AcceptanceNo).HasMaxLength(50); //创建组合索引 b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter); From 8897cba282422479f57bcd0daef3bcb6c4ea5154 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Thu, 6 Jan 2022 09:15:10 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=89=8D=E7=AB=AFH=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/ux/vw/dataInput/hq_h/index.vue | 68 +++++++------------- vue/static/tableFieldForSearch.json | 40 ++---------- 2 files changed, 29 insertions(+), 79 deletions(-) diff --git a/vue/src/views/ux/vw/dataInput/hq_h/index.vue b/vue/src/views/ux/vw/dataInput/hq_h/index.vue index e5d35866..5b163733 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h/index.vue @@ -46,7 +46,7 @@ v-model="searchContent" clearable size="small" - placeholder="按照采购订单号搜索..." + placeholder="按照看板号搜索..." style="width: 200px" class="search-container" @keyup.enter.native="handleFilter" @@ -264,61 +264,42 @@ export default { /** 列表字段 */ getDefaultField() { var tempsTabs = []; - tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); - tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 }); tempsTabs.push({ - label: "采购订单号", - prop: "purchaseOrderNo", - width: 220, - }); - tempsTabs.push({ - label: "采购订单行项目", - prop: "purchaseOrderNoItem", - width: 170, - }); - tempsTabs.push({ - label: "采购订单文本", - prop: "purchaseOrderNoText", + label: "看板号", + prop: "hqhKanBan", width: 170, }); - tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 }); - tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 }); - tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 }); + tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 }); tempsTabs.push({ - label: "采购价格不含税", - prop: "purchasePriceNoTax", + label: "物料凭证号", + prop: "materialVoucherNo", width: 200, }); - tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 }); - tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 }); - tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 }); + tempsTabs.push({ - label: "日期", - prop: "spareDate", - width: 150, - formType: "datetime", + label: "物料号", + prop: "materialCode", + width: 200, }); - tempsTabs.push({ - label: "交货单号", - prop: "deliveryOrderNo", - width: 150, + label: "验收单日期", + prop: "acceptanceDate", + width: 170, }); + tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ - label: "交货行号", - prop: "deliveryLineNum", - width: 150, + label: "存储地点", + prop: "storageLocation", + width: 120, }); - tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 }); - tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 }); - tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 }); tempsTabs.push({ - label: "德国发票号", - prop: "germanInvoiceNo", - width: 150, + label: "存储地点描述", + prop: "storageLocationDesc", + width: 250, }); + tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "工厂", prop: "factory", width: 150 }); - tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 }); return tempsTabs; }, }, @@ -436,8 +417,7 @@ export default { // return { 0: "其他", 2: "已结" }[row[column.property]]; // } if ( - column.property == "settleInputDate" || - column.property == "settleDate" + column.property == "acceptanceDate" ) { var date = row[column.property]; if (date == undefined) { @@ -489,7 +469,7 @@ export default { this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { - var column = "purchaseOrderNo"; + var column = "hqhKanBan"; let filter = { logic: 0, column: column, diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 101b21c2..51f5ea6e 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2780,17 +2780,17 @@ { "fieldId": 3, "formType": "text", - "name": "采购订单号", + "name": "看板号", "type": 1, "value": "", "fieldType": 1, - "fieldName": "purchaseOrderNo", + "fieldName": "hqhKanBan", "setting": [] }, { "fieldId": 5, "formType": "text", - "name": "物料代码", + "name": "物料号", "type": 1, "value": "", "fieldType": 1, @@ -2800,41 +2800,11 @@ { "fieldId": 5, "formType": "text", - "name": "科目号", + "name": "存储地点描述", "type": 1, "value": "", "fieldType": 1, - "fieldName": "accountNum", - "setting": [] - }, - { - "fieldId": 5, - "formType": "text", - "name": "交货单号", - "type": 1, - "value": "", - "fieldType": 1, - "fieldName": "deliveryOrderNo", - "setting": [] - }, - { - "fieldId": 5, - "formType": "text", - "name": "工厂", - "type": 1, - "value": "", - "fieldType": 1, - "fieldName": "factory", - "setting": [] - }, - { - "fieldId": 5, - "formType": "text", - "name": "工厂名称", - "type": 1, - "value": "", - "fieldType": 1, - "fieldName": "factoryName", + "fieldName": "storageLocationDesc", "setting": [] } ] From acaeea2be437cf2bca37eb309d4b89b7d8dfba69 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Thu, 6 Jan 2022 09:31:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?H=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/ux/vw/dataInput/hq_h/index.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/vue/src/views/ux/vw/dataInput/hq_h/index.vue b/vue/src/views/ux/vw/dataInput/hq_h/index.vue index 5b163733..5c981f11 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h/index.vue @@ -281,11 +281,18 @@ export default { prop: "materialCode", width: 200, }); + tempsTabs.push({ + label: "验收单号", + prop: "acceptanceNo", + width: 130, + }); tempsTabs.push({ label: "验收单日期", prop: "acceptanceDate", width: 170, }); + tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ label: "存储地点", @@ -297,8 +304,6 @@ export default { prop: "storageLocationDesc", width: 250, }); - tempsTabs.push({ label: "数量", prop: "price", width: 100 }); - tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); tempsTabs.push({ label: "工厂", prop: "factory", width: 150 }); return tempsTabs; }, @@ -416,9 +421,7 @@ export default { // if (column.property === "state") { // return { 0: "其他", 2: "已结" }[row[column.property]]; // } - if ( - column.property == "acceptanceDate" - ) { + if (column.property == "acceptanceDate") { var date = row[column.property]; if (date == undefined) { return ""; From a9bdcf764dfd72878f92af80bf38a43acb94dbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Thu, 6 Jan 2022 14:44:53 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/ux/vw/dataInput/hq_f/index.vue | 125 +++++++++++------ vue/src/views/ux/vw/dataInput/hq_m/index.vue | 66 ++++----- vue/src/views/ux/vw/dataInput/hq_y/index.vue | 135 ++++++++++++------- 3 files changed, 201 insertions(+), 125 deletions(-) diff --git a/vue/src/views/ux/vw/dataInput/hq_f/index.vue b/vue/src/views/ux/vw/dataInput/hq_f/index.vue index 4d622545..ff358a34 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f/index.vue @@ -46,7 +46,7 @@ v-model="searchContent" clearable size="small" - placeholder="按照采购订单号搜索..." + placeholder="按照看板号搜索..." style="width: 200px" class="search-container" @keyup.enter.native="handleFilter" @@ -264,63 +264,108 @@ export default { /** 列表字段 */ getDefaultField() { var tempsTabs = []; - tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); - tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 }); tempsTabs.push({ - label: "采购订单号", - prop: "purchaseOrderNo", - width: 220, - }); - tempsTabs.push({ - label: "采购订单行项目", - prop: "purchaseOrderNoItem", + label: "看板号", + prop: "hqhKanBan", width: 170, }); + tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 }); tempsTabs.push({ - label: "采购订单文本", - prop: "purchaseOrderNoText", - width: 170, + label: "物料凭证号", + prop: "materialVoucherNo", + width: 200, }); - tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 }); - tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 }); - tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 }); + tempsTabs.push({ - label: "采购价格不含税", - prop: "purchasePriceNoTax", + label: "物料号", + prop: "materialCode", width: 200, }); - tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 }); - tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 }); - tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ - label: "日期", - prop: "spareDate", - width: 150, - formType: "datetime", + label: "验收单号", + prop: "acceptanceNo", + width: 130, }); - tempsTabs.push({ - label: "交货单号", - prop: "deliveryOrderNo", - width: 150, + label: "验收单日期", + prop: "acceptanceDate", + width: 170, }); + tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); + tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ - label: "交货行号", - prop: "deliveryLineNum", - width: 150, + label: "存储地点", + prop: "storageLocation", + width: 120, }); - tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 }); - tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 }); - tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 }); tempsTabs.push({ - label: "德国发票号", - prop: "germanInvoiceNo", - width: 150, + label: "存储地点描述", + prop: "storageLocationDesc", + width: 250, }); tempsTabs.push({ label: "工厂", prop: "factory", width: 150 }); - tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 }); return tempsTabs; }, + // getDefaultField() { + // var tempsTabs = []; + // tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); + // tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 }); + // tempsTabs.push({ + // label: "采购订单号", + // prop: "purchaseOrderNo", + // width: 220, + // }); + // tempsTabs.push({ + // label: "采购订单行项目", + // prop: "purchaseOrderNoItem", + // width: 170, + // }); + // tempsTabs.push({ + // label: "采购订单文本", + // prop: "purchaseOrderNoText", + // width: 170, + // }); + // tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 }); + // tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 }); + // tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 }); + // tempsTabs.push({ + // label: "采购价格不含税", + // prop: "purchasePriceNoTax", + // width: 200, + // }); + // tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 }); + // tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 }); + // tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 }); + // tempsTabs.push({ + // label: "日期", + // prop: "spareDate", + // width: 150, + // formType: "datetime", + // }); + + // tempsTabs.push({ + // label: "交货单号", + // prop: "deliveryOrderNo", + // width: 150, + // }); + // tempsTabs.push({ + // label: "交货行号", + // prop: "deliveryLineNum", + // width: 150, + // }); + // tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 }); + // tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 }); + // tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 }); + // tempsTabs.push({ + // label: "德国发票号", + // prop: "germanInvoiceNo", + // width: 150, + // }); + // tempsTabs.push({ label: "工厂", prop: "factory", width: 150 }); + // tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 }); + // return tempsTabs; + // }, }, methods: { handleCommand(command) { @@ -489,7 +534,7 @@ export default { this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { - var column = "purchaseOrderNo"; + var column = "hqhKanBan"; let filter = { logic: 0, column: column, diff --git a/vue/src/views/ux/vw/dataInput/hq_m/index.vue b/vue/src/views/ux/vw/dataInput/hq_m/index.vue index f4c47c4e..8ebbf02b 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m/index.vue @@ -46,7 +46,7 @@ v-model="searchContent" clearable size="small" - placeholder="按照采购订单号搜索..." + placeholder="按照看板号搜索..." style="width: 200px" class="search-container" @keyup.enter.native="handleFilter" @@ -264,61 +264,47 @@ export default { /** 列表字段 */ getDefaultField() { var tempsTabs = []; - tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); - tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 }); tempsTabs.push({ - label: "采购订单号", - prop: "purchaseOrderNo", - width: 220, - }); - tempsTabs.push({ - label: "采购订单行项目", - prop: "purchaseOrderNoItem", + label: "看板号", + prop: "hqmKanBan", width: 170, }); + tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 }); tempsTabs.push({ - label: "采购订单文本", - prop: "purchaseOrderNoText", - width: 170, + label: "物料凭证号", + prop: "materialVoucherNo", + width: 200, }); - tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 }); - tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 }); - tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 }); + tempsTabs.push({ - label: "采购价格不含税", - prop: "purchasePriceNoTax", + label: "物料号", + prop: "materialCode", width: 200, }); - tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 }); - tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 }); - tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ - label: "日期", - prop: "spareDate", - width: 150, - formType: "datetime", + label: "验收单号", + prop: "acceptanceNo", + width: 130, }); - tempsTabs.push({ - label: "交货单号", - prop: "deliveryOrderNo", - width: 150, + label: "验收单日期", + prop: "acceptanceDate", + width: 170, }); + tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); + tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ - label: "交货行号", - prop: "deliveryLineNum", - width: 150, + label: "存储地点", + prop: "storageLocation", + width: 120, }); - tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 }); - tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 }); - tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 }); tempsTabs.push({ - label: "德国发票号", - prop: "germanInvoiceNo", - width: 150, + label: "存储地点描述", + prop: "storageLocationDesc", + width: 250, }); tempsTabs.push({ label: "工厂", prop: "factory", width: 150 }); - tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 }); return tempsTabs; }, }, @@ -489,7 +475,7 @@ export default { this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { - var column = "purchaseOrderNo"; + var column = "hqmKanBan"; let filter = { logic: 0, column: column, diff --git a/vue/src/views/ux/vw/dataInput/hq_y/index.vue b/vue/src/views/ux/vw/dataInput/hq_y/index.vue index f9eb78a3..0b86b2c4 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y/index.vue @@ -46,7 +46,7 @@ v-model="searchContent" clearable size="small" - placeholder="按照采购订单号搜索..." + placeholder="按照看板号搜索..." style="width: 200px" class="search-container" @keyup.enter.native="handleFilter" @@ -262,65 +262,110 @@ export default { }, computed: { /** 列表字段 */ - getDefaultField() { + getDefaultField() { var tempsTabs = []; - tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); - tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 }); tempsTabs.push({ - label: "采购订单号", - prop: "purchaseOrderNo", - width: 220, - }); - tempsTabs.push({ - label: "采购订单行项目", - prop: "purchaseOrderNoItem", + label: "看板号", + prop: "btCarKanBan", width: 170, }); + tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 }); tempsTabs.push({ - label: "采购订单文本", - prop: "purchaseOrderNoText", - width: 170, + label: "物料凭证号", + prop: "materialVoucherNo", + width: 200, }); - tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 }); - tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 }); - tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 }); + tempsTabs.push({ - label: "采购价格不含税", - prop: "purchasePriceNoTax", + label: "物料号", + prop: "materialCode", width: 200, }); - tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 }); - tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 }); - tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ - label: "日期", - prop: "spareDate", - width: 150, - formType: "datetime", + label: "验收单号", + prop: "acceptanceNo", + width: 130, }); - tempsTabs.push({ - label: "交货单号", - prop: "deliveryOrderNo", - width: 150, + label: "验收单日期", + prop: "acceptanceDate", + width: 170, }); + tempsTabs.push({ label: "数量", prop: "price", width: 100 }); + tempsTabs.push({ label: "金额", prop: "amt", width: 100 }); + tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 }); tempsTabs.push({ - label: "交货行号", - prop: "deliveryLineNum", - width: 150, + label: "存储地点", + prop: "storageLocation", + width: 120, }); - tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 }); - tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 }); - tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 }); tempsTabs.push({ - label: "德国发票号", - prop: "germanInvoiceNo", - width: 150, + label: "存储地点描述", + prop: "storageLocationDesc", + width: 250, }); tempsTabs.push({ label: "工厂", prop: "factory", width: 150 }); - tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 }); return tempsTabs; }, + // getDefaultField() { + // var tempsTabs = []; + // tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 }); + // tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 }); + // tempsTabs.push({ + // label: "采购订单号", + // prop: "purchaseOrderNo", + // width: 220, + // }); + // tempsTabs.push({ + // label: "采购订单行项目", + // prop: "purchaseOrderNoItem", + // width: 170, + // }); + // tempsTabs.push({ + // label: "采购订单文本", + // prop: "purchaseOrderNoText", + // width: 170, + // }); + // tempsTabs.push({ label: "收货数量", prop: "receiptQty", width: 120 }); + // tempsTabs.push({ label: "开票数量", prop: "invoicedQty", width: 120 }); + // tempsTabs.push({ label: "不含税金额", prop: "amountNoTax", width: 150 }); + // tempsTabs.push({ + // label: "采购价格不含税", + // prop: "purchasePriceNoTax", + // width: 200, + // }); + // tempsTabs.push({ label: "科目号", prop: "accountNum", width: 150 }); + // tempsTabs.push({ label: "物料代码", prop: "materialCode", width: 180 }); + // tempsTabs.push({ label: "物料描述", prop: "materialDesc", width: 250 }); + // tempsTabs.push({ + // label: "日期", + // prop: "spareDate", + // width: 150, + // formType: "datetime", + // }); + + // tempsTabs.push({ + // label: "交货单号", + // prop: "deliveryOrderNo", + // width: 150, + // }); + // tempsTabs.push({ + // label: "交货行号", + // prop: "deliveryLineNum", + // width: 150, + // }); + // tempsTabs.push({ label: "批次号", prop: "batchNo", width: 150 }); + // tempsTabs.push({ label: "税率", prop: "taxRate", width: 100 }); + // tempsTabs.push({ label: "税码", prop: "taxCode", width: 110 }); + // tempsTabs.push({ + // label: "德国发票号", + // prop: "germanInvoiceNo", + // width: 150, + // }); + // tempsTabs.push({ label: "工厂", prop: "factory", width: 150 }); + // tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 }); + // return tempsTabs; + // }, }, methods: { handleCommand(command) { @@ -350,7 +395,7 @@ export default { } console.log("一汽轿车平台导出：" + JSON.stringify(this.listQuery)); this.$axios - .posts("/api/settleaccount/HQHPlatform/Export", this.listQuery) + .posts("/api/settleaccount/BT_Carlatform/Export", this.listQuery) .then((res) => { let fileNameOfProject = res; this.$axios @@ -399,7 +444,7 @@ export default { //this.listLoading = true; this.listQuery.SkipCount = (this.page - 1) * 1000; this.$axios - .posts("/api/settleaccount/HQHPlatform/listVersion", this.listQuery) + .posts("/api/settleaccount/BT_Carlatform/listversion", this.listQuery) .then((response) => { this.versionList = []; response.items.forEach((element) => { @@ -462,7 +507,7 @@ export default { } console.log("列表查询条件：" + JSON.stringify(this.listQuery)); this.$axios - .posts("/api/settleaccount/HQHPlatform/list", this.listQuery) + .posts("/api/settleaccount/BT_Carlatform/list", this.listQuery) .then((response) => { this.list = response.items; this.totalCount = response.totalCount; @@ -478,7 +523,7 @@ export default { fetchData(id) { //循环动态 this.$axios - .gets("/api/settleaccount/HQHPlatform/" + id) + .gets("/api/settleaccount/BT_Carlatform/" + id) .then((response) => { this.form = response; }); @@ -489,7 +534,7 @@ export default { this.getList(); this.listQuery.Filters = []; if (this.searchContent != "") { - var column = "purchaseOrderNo"; + var column = "btCarKanBan"; let filter = { logic: 0, column: column, From 43053cdfa8a5dc6fad2944511831e8f12bc3938d Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Thu, 6 Jan 2022 14:46:32 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=BA=A2=E6=97=97=E8=BD=BF=E8=BD=A6?= =?UTF-8?q?=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/modules/hq_menu.js | 32 +- .../ux/vw/dataInput/hq_h_report/index.vue | 1491 +++++++++++++++++ vue/src/views/ux/vw/dataInput/index.vue | 7 + 3 files changed, 1514 insertions(+), 16 deletions(-) create mode 100644 vue/src/views/ux/vw/dataInput/hq_h_report/index.vue diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js index 7274243e..a9e76a13 100644 --- a/vue/src/router/modules/hq_menu.js +++ b/vue/src/router/modules/hq_menu.js @@ -4,7 +4,7 @@ import Layout from '@/layout' const hqMenudataRouter = { path: '/capt-hq', component: Layout, - redirect: 'ux/vw/dataInput/hq_h', + redirect: 'ux/vw/dataInput/index', name: 'HQData', meta: { title: '红旗工厂', @@ -14,10 +14,10 @@ const hqMenudataRouter = { }, children: [ { - path: '/import-h-data', + path: '/H', name: 'import-h-data',//命名路由-二级 - component: () => import('@/views/ux/vw/dataInput/hq_h'), - redirect: 'ux/vw/dataInput/hq_h', + component: () => import('@/views/ux/vw/dataInput/index'), + redirect: 'ux/vw/dataInput/index', meta: { title: 'H平台', // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], @@ -36,11 +36,11 @@ const hqMenudataRouter = { }, { path: 'hq-H-platform-export', - component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), - name: 'ScrapClaims', + component: () => import('@/views/ux/vw/dataInput/hq_h_report'), + name: 'HQH', meta: { title: 'H平台结算差异输出', - roles: ['SettleAccount.FISs'], + //roles: ['SettleAccount.FISs'], icon: '文件' } } @@ -49,10 +49,10 @@ const hqMenudataRouter = { }, { - path: '/export-m-data', - component: () => import('@/views/ux/vw/dataInput/hq_m'), + path: '/M', + component: () => import('@/views/ux/vw/dataInput/index'), name: 'export-m-data',//命名路由 - redirect: '/ux/vw/dataInput/hq_m', + redirect: 'ux/vw/dataInput/index', meta: { title: 'M平台', //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], @@ -83,10 +83,10 @@ const hqMenudataRouter = { ] }, { - path: '/export-f-data', - component: () => import('@/views/ux/vw/dataInput/hq_f'), + path: '/F', + component: () => import('@/views/ux/vw/dataInput/index'), name: 'export-f-data',//命名路由 - redirect: '/ux/vw/dataInput/hq_f', + redirect: 'ux/vw/dataInput/index', meta: { title: 'F平台', //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], @@ -118,10 +118,10 @@ const hqMenudataRouter = { }, { - path: '/import-y-data', + path: '/hqcar', name: 'import-y-data',//命名路由-二级 - component: () => import('@/views/ux/vw/dataInput/hq_y'), - redirect: 'ux/vw/dataInput/hq_y', + component: () => import('@/views/ux/vw/dataInput/index'), + redirect: 'ux/vw/dataInput/index', meta: { title: '一汽轿车平台', // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], diff --git a/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue new file mode 100644 index 00000000..d68f47c5 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_h_report/index.vue @@ -0,0 +1,1491 @@ + + + + + + \ No newline at end of file diff --git a/vue/src/views/ux/vw/dataInput/index.vue b/vue/src/views/ux/vw/dataInput/index.vue index e69de29b..509198d1 100644 --- a/vue/src/views/ux/vw/dataInput/index.vue +++ b/vue/src/views/ux/vw/dataInput/index.vue @@ -0,0 +1,7 @@ + + \ No newline at end of file