Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

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
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

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
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         [ExporterHeader(DisplayName = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExporterHeader(DisplayName = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "金额")]
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         [ImporterHeader(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ImporterHeader(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ImporterHeader(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ImporterHeader(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ImporterHeader(Name = "金额")]
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         public string StorageLocation { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
+
         /// <summary>
         /// 存储地点描述
         /// </summary>

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
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

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
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         [ExporterHeader(DisplayName = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "验收单号")]
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExporterHeader(DisplayName = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "金额")]
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         [ImporterHeader(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ImporterHeader(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ImporterHeader(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ImporterHeader(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ImporterHeader(Name = "金额")]
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         public string StorageLocation { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
+
         /// <summary>
         /// 存储地点描述
         /// </summary>

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
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

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
         /// 存储地点描述
         /// </summary>
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         [ExporterHeader(DisplayName = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ExporterHeader(DisplayName = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ExporterHeader(DisplayName = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ExporterHeader(DisplayName = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ExporterHeader(DisplayName = "金额")]
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         [ImporterHeader(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [ImporterHeader(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [ImporterHeader(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [ImporterHeader(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [ImporterHeader(Name = "金额")]
+        public decimal Amt { set; get; }
     }
 }

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
         /// </summary>
         public string StorageLocation { get; set; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal Amt { set; get; }
+
         /// <summary>
         /// 存储地点描述
         /// </summary>

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
         /// </summary>
         [Display(Name = "物料凭证号")]
         public string MaterialVoucherNo { get; set; }
-
+        ///// <summary>
+        /////验收单号
+        ///// </summary>
+        //[Display(Name = "验收单号")]
+        //public string AcceptanceNo { get; set; }
         /// <summary>
         ///会计年度
         /// </summary>
@@ -120,6 +128,32 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car
         [Display(Name = "存储地点描述")]
         public string StorageLocationDesc { get; set; }
 
+
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [Display(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [Display(Name = "数量")]
+        public decimal Qty { set; get; }
+
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [Display(Name = "单价")]
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [Display(Name = "金额")]
+        public decimal Amt { set; get; }
+
+
         /// <summary>
         /// 备注
         /// </summary>

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; }
 
+        /// <summary>
+        ///验收单号
+        /// </summary>
+        [Display(Name = "验收单号")]
+        public string AcceptanceNo { get; set; }
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [Display(Name = "数量")]
+        public decimal Qty { set; get; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 数量
+        /// 单价
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "数量")]
+        [Display(Name = "单价")]
-        //public decimal Qty { set; get; }
+        public decimal Price { set; get; }
-
-        ///// <summary>
-        ///// 单价
-        ///// </summary>
-        //[Display(Name = "单价")]
-        //public decimal Price { set; get; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 金额
+        /// 金额
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "金额")]
+        [Display(Name = "金额")]
-        //public decimal Amt { set; get; }
+        public decimal Amt { set; get; }
 
 
         /// <summary>

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; }
 
 
-        ///// <summary>
+        /// <summary>
-        ///// 数量
+        ///验收单号
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "数量")]
+        [Display(Name = "验收单号")]
-        //public decimal Qty { set; get; }
+        public string AcceptanceNo { get; set; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 单价
+        /// 数量
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "单价")]
+        [Display(Name = "数量")]
-        //public decimal Price { set; get; }
+        public decimal Qty { set; get; }
 
-        ///// <summary>
+        /// <summary>
-        ///// 金额
+        /// 单价
-        ///// </summary>
+        /// </summary>
-        //[Display(Name = "金额")]
+        [Display(Name = "单价")]
-        //public decimal Amt { set; get; }
+        public decimal Price { set; get; }
+
+        /// <summary>
+        /// 金额
+        /// </summary>
+        [Display(Name = "金额")]
+        public decimal Amt { set; get; }
 
 
         /// <summary>

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -498,6 +498,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);
 

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: '红旗工厂',
@@ -16,8 +16,8 @@ const hqMenudataRouter = {
         {
             path: '/H',
             name: 'import-h-data',//命名路由-二级
-            component: () => import('@/views/ux/vw/dataInput/hq_h'),
+            component: () => import('@/views/ux/vw/dataInput/index'),
-            redirect: 'ux/vw/dataInput/hq_h',
+            redirect: 'ux/vw/dataInput/index',
             meta: {
                 title: 'H平台',
                 // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'],
@@ -36,21 +36,23 @@ const hqMenudataRouter = {
                 },
                 {
                     path: 'hq-H-platform-export',
-                    component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
+                    component: () => import('@/views/ux/vw/dataInput/hq_h_report'),
-                    name: 'ScrapClaims',
+                    name: 'HQH',
                     meta: {
                         title: 'H平台结算差异输出',
-                        roles: ['SettleAccount.FISs'],
+                        //roles: ['SettleAccount.FISs'],
                         icon: '文件'
                     }
                 }
             ]
+            
         },
+
         {
             path: '/M',
-            component: () => import('@/views/ux/vw/dataInput/hq_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'],
@@ -82,9 +84,9 @@ const hqMenudataRouter = {
         },
         {
             path: '/F',
-            component: () => import('@/views/ux/vw/dataInput/hq_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'],
@@ -112,8 +114,43 @@ const hqMenudataRouter = {
                         icon: '二配'
                     }
                 }
-            ]
+            ],
+        },
+
+        {
+            path: '/hqcar',
+            name: 'import-y-data',//命名路由-二级
+            component: () => import('@/views/ux/vw/dataInput/index'),
+            redirect: 'ux/vw/dataInput/index',
+            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: '文件'
+                    }
+                }
+            ]
+            
+        },
     ]
 }
 

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'),

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: "采购订单号",
+        label: "看板号",
-        prop: "purchaseOrderNo",
+        prop: "hqhKanBan",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
         width: 170,
       });
+      tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 });
       tempsTabs.push({
-        label: "采购订单文本",
+        label: "物料凭证号",
-        prop: "purchaseOrderNoText",
+        prop: "materialVoucherNo",
-        width: 170,
+        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: "采购价格不含税",
+        label: "物料号",
-        prop: "purchasePriceNoTax",
+        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: "日期",
+        label: "验收单号",
-        prop: "spareDate",
+        prop: "acceptanceNo",
-        width: 150,
+        width: 130,
-        formType: "datetime",
       });
-
       tempsTabs.push({
-        label: "交货单号",
+        label: "验收单日期",
-        prop: "deliveryOrderNo",
+        prop: "acceptanceDate",
-        width: 150,
+        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: "交货行号",
+        label: "存储地点",
-        prop: "deliveryLineNum",
+        prop: "storageLocation",
-        width: 150,
+        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: "德国发票号",
+        label: "存储地点描述",
-        prop: "germanInvoiceNo",
+        prop: "storageLocationDesc",
-        width: 150,
+        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,

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,47 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
-      tempsTabs.push({ label: "行号", prop: "lineNumber", width: 100 });
-      tempsTabs.push({ label: "采购类型", prop: "purchaseType", width: 150 });
       tempsTabs.push({
-        label: "采购订单号",
+        label: "看板号",
-        prop: "purchaseOrderNo",
+        prop: "hqhKanBan",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
         width: 170,
       });
+      tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 });
       tempsTabs.push({
-        label: "采购订单文本",
+        label: "物料凭证号",
-        prop: "purchaseOrderNoText",
+        prop: "materialVoucherNo",
-        width: 170,
+        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: "采购价格不含税",
+        label: "物料号",
-        prop: "purchasePriceNoTax",
+        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: "日期",
+        label: "验收单号",
-        prop: "spareDate",
+        prop: "acceptanceNo",
-        width: 150,
+        width: 130,
-        formType: "datetime",
       });
-
       tempsTabs.push({
-        label: "交货单号",
+        label: "验收单日期",
-        prop: "deliveryOrderNo",
+        prop: "acceptanceDate",
-        width: 150,
+        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: "交货行号",
+        label: "存储地点",
-        prop: "deliveryLineNum",
+        prop: "storageLocation",
-        width: 150,
+        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: "德国发票号",
+        label: "存储地点描述",
-        prop: "germanInvoiceNo",
+        prop: "storageLocationDesc",
-        width: 150,
+        width: 250,
       });
       tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
       return tempsTabs;
     },
   },
@@ -435,10 +421,7 @@ export default {
       // if (column.property === "state") {
       //   return { 0: "其他", 2: "已结" }[row[column.property]];
       // }
-      if (
+      if (column.property == "acceptanceDate") {
-        column.property == "settleInputDate" ||
-        column.property == "settleDate"
-      ) {
         var date = row[column.property];
         if (date == undefined) {
           return "";
@@ -489,7 +472,7 @@ export default {
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "purchaseOrderNo";
+        var column = "hqhKanBan";
         let filter = {
           logic: 0,
           column: column,

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: "采购订单号",
+        label: "看板号",
-        prop: "purchaseOrderNo",
+        prop: "hqmKanBan",
-        width: 220,
-      });
-      tempsTabs.push({
-        label: "采购订单行项目",
-        prop: "purchaseOrderNoItem",
         width: 170,
       });
+      tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 });
       tempsTabs.push({
-        label: "采购订单文本",
+        label: "物料凭证号",
-        prop: "purchaseOrderNoText",
+        prop: "materialVoucherNo",
-        width: 170,
+        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: "采购价格不含税",
+        label: "物料号",
-        prop: "purchasePriceNoTax",
+        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: "日期",
+        label: "验收单号",
-        prop: "spareDate",
+        prop: "acceptanceNo",
-        width: 150,
+        width: 130,
-        formType: "datetime",
       });
-
       tempsTabs.push({
-        label: "交货单号",
+        label: "验收单日期",
-        prop: "deliveryOrderNo",
+        prop: "acceptanceDate",
-        width: 150,
+        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: "交货行号",
+        label: "存储地点",
-        prop: "deliveryLineNum",
+        prop: "storageLocation",
-        width: 150,
+        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: "德国发票号",
+        label: "存储地点描述",
-        prop: "germanInvoiceNo",
+        prop: "storageLocationDesc",
-        width: 150,
+        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,

vue/src/views/ux/vw/dataInput/hq_y/index.vue

@@ -0,0 +1,639 @@
+<!--一汽轿车平台导入功能-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <XhJSSelect
+        :options="versionList"
+        style="width: 200px"
+        class="search-container"
+        @value-change="selectValue"
+      ></XhJSSelect>
+      <el-button
+        class="filter-item"
+        size="mini"
+        type="warning"
+        icon="el-icon-upload2"
+        @click="handleImportExcel()"
+        >导入文件（Excel）
+      </el-button>
+      <!-- <el-button
+        class="filter-item"
+        size="mini"
+        type="primary"
+        icon="el-icon-download"
+        @click="handleDownload()"
+        >导出Excel
+      </el-button> -->
+      <el-dropdown
+        size="small"
+        class="filter-item"
+        style="margin-left: 15px; font-weight: bold"
+        @command="handleCommand"
+      >
+        <span class="el-dropdown-link">
+          导出数据<i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="excel" icon="el-icon-plus"
+            >导出Excel</el-dropdown-item
+          >
+          <el-dropdown-item command="csv" icon="el-icon-circle-plus"
+            >导出Csv</el-dropdown-item
+          >
+        </el-dropdown-menu>
+      </el-dropdown>
+      <el-input
+        v-model="searchContent"
+        clearable
+        size="small"
+        placeholder="按照看板号搜索..."
+        style="width: 200px"
+        class="search-container"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        size="mini"
+        type="success"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索
+      </el-button>
+      <!--表格头组件，filter查询-->
+      <c-r-m-table-head
+        ref="crmTableHead"
+        :crm-type="crmType"
+        @handle="handleHandle"
+        @filter="handleFilters"
+      >
+      </c-r-m-table-head>
+    </flexbox>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading.fullscreen.lock="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <el-table-column
+        label="版本"
+        prop="version"
+        sortable="custom"
+        align="center"
+        width="100px"
+        fixed
+      >
+        <template slot-scope="scope">
+          <el-tooltip :content="scope.row.version" placement="top">
+            <span class="link-type">{{ scope.row.version }}</span>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import importExcel from "@/components/ImportExcel-base";
+import CRMTableHead from "../../../components/CRMTableHead";
+import moment from "moment";
+import Lockr from "lockr";
+import { downloadFile } from "@/utils/crmindex.js";
+import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
+
+export default {
+  name: "HQYPlatform",
+  components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "hqYPlatform",
+      versionValue: "",
+      versionList: [], //版本列表
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        settleAccountId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: true,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listVersionQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        version: "",
+        site: "TH",
+        userId: "00000000-0000-0000-0000-000000000000",
+      },
+      listExportQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        //OrgID:"",
+        SkipCount: 0,
+        MaxResultCount: 15,
+        version: "",
+        fileType: 0,
+        userId: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 220,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 220;
+    };
+  },
+  created() {
+    this.getVersionInfo();
+    if (this.versionList == []) {
+      this.getList();
+    }
+  },
+  computed: {
+    /** 列表字段 */
+     getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "看板号",
+        prop: "btCarKanBan",
+        width: 170,
+      });
+      tempsTabs.push({ label: "看板编号", prop: "kanbanNumber", width: 250 });
+      tempsTabs.push({
+        label: "物料凭证号",
+        prop: "materialVoucherNo",
+        width: 200,
+      });
+
+      tempsTabs.push({
+        label: "物料号",
+        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: "存储地点",
+        prop: "storageLocation",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "存储地点描述",
+        prop: "storageLocationDesc",
+        width: 250,
+      });
+      tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
+      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) {
+      if (this.versionValue === "") {
+        this.$message.error("请先选择版本！");
+        return;
+      }
+      switch (command) {
+        case "excel":
+          this.listQuery.fileType = 1; //0是csv,1是excel
+          break;
+        case "csv":
+          this.listQuery.fileType = 0; //0是csv,1是excel
+          break;
+        default:
+          //这里是没有找到对应的值处理
+          break;
+      }
+      this.listLoading = true;
+      if (this.versionValue === "") {
+        this.$message.error("必需选择版本！");
+        this.listLoading = false;
+        return;
+      }
+      if (this.versionValue != "") {
+        this.listQuery.version = this.versionValue;
+      }
+      console.log("一汽轿车平台导出：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/settleaccount/BT_Carlatform/Export", this.listQuery)
+        .then((res) => {
+          let fileNameOfProject = res;
+          this.$axios
+            .BolbGets(
+              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
+            )
+            .then((response) => {
+              if (fileNameOfProject.indexOf("_") != -1) {
+                let downName =
+                  fileNameOfProject.slice(
+                    0,
+                    fileNameOfProject.lastIndexOf("_")
+                  ) +
+                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, fileNameOfProject);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    getVersionInfo() {
+      //取版本列表信息
+      //this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/BT_Carlatform/listversion", this.listQuery)
+        .then((response) => {
+          this.versionList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.id;
+            options.label = element.version;
+            this.versionList.push(options);
+          });
+          if (JSON.stringify(this.versionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.versionValue = this.versionList[0].label;
+            this.getList();
+          }
+          this.listLoading = false;
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleImportExcel() {
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      // if (column.property === "state") {
+      //   return { 0: "其他", 2: "已结" }[row[column.property]];
+      // }
+      if (
+        column.property == "settleInputDate" ||
+        column.property == "settleDate"
+      ) {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      this.getVersionInfo();
+      this.listLoading = false;
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+    },
+
+    getList() {
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (this.versionValue != "") {
+        this.listQuery.version = this.versionValue;
+      }
+      console.log("列表查询条件：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/settleaccount/BT_Carlatform/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/settleaccount/BT_Carlatform/" + id)
+        .then((response) => {
+          this.form = response;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "btCarKanBan";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 0,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    /** 多项筛选操作 */
+    /** 筛选操作 */
+    handleFilters(data) {
+      if (data === null) {
+        this.listQuery.Filters = [];
+        this.getList(); //查询所有
+      } else {
+        this.filterObj = data;
+        console.log("筛选" + JSON.stringify(data));
+        var offsetHei = document.documentElement.clientHeight;
+        var removeHeight = Object.keys(this.filterObj).length > 0 ? 310 : 240;
+        this.tableHeight = offsetHei - removeHeight;
+        this.currentPage = 1;
+        let Filter = [];
+        data.forEach((item) => {
+          let filter = {};
+          if (item.formType === "datetime" || item.formType === "datetime") {
+            //日期类型的过滤条件是 (datetime >= a and  datetime <=b)
+            filter["Column"] = item.fieldName;
+            filter["Logic"] = 0;
+            filter["Value"] = item.value[0];
+            filter["Action"] = item.action;
+            Filter.push(filter);
+
+            if (item.value[1] != null) {
+              filter["Value"] = item.value[1];
+              filter["Action"] = 5;
+              Filter.push(filter);
+            }
+          } else {
+            filter["Column"] = item.fieldName;
+            filter["Value"] = item.value;
+            filter["Logic"] = 0;
+            filter["Action"] = item.action;
+            Filter.push(filter);
+          }
+        });
+        console.log("筛选条件" + JSON.stringify(Filter));
+        this.listQuery.Filters = Filter;
+        this.getList();
+      }
+    },
+    resetQuery() {},
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      console.log(this.listQuery.Sorting);
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      // if (column.property === "qty") {
+      //   return { textAlign: "right" };
+      // } else {
+      //   return { textAlign: "left" };
+      // }
+      return { textAlign: "left" };
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../../styles/crmtable.scss";
+</style>
+<style lang="scss">
+.el-table .cell.el-tooltip {
+  white-space: pre-wrap;
+}
+</style>
+
+

vue/src/views/ux/vw/dataInput/index.vue

@@ -0,0 +1,7 @@
+ <!-- 父级路由组件  -->
+<template>
+  <div>
+    <!-- xxx html 内容  -->
+    <router-view />
+  </div>
+</template>

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",
+        "fieldName": "storageLocationDesc",
-        "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",
         "setting": []
       }
     ]