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

3 years ago · 3f84a26b51
11 changed files with 1422 additions and 15139 deletions
--- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211214.txt
+++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20211214.txt
--- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211129095823_init.Designer.cs
+++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211129095823_init.Designer.cs
--- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211129095823_init.cs
+++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211129095823_init.cs
--- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/SettleAccountHttpApiHostMigrationsDbContextModelSnapshot.cs
+++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/SettleAccountHttpApiHostMigrationsDbContextModelSnapshot.cs
@ -1643,6 +1643,126 @@ namespace Win.Sfs.SettleAccount.Migrations
                    b.ToTable("Set_btcarseq_version");
                });

+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.BT_Car.BT_Car_Platform", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("AcceptanceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("BTCarKanBan")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<Guid>("BranchId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Extend")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ExternalKanbanNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Factory")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("KanbanNumber")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MaterialCode")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("MaterialVoucherNo")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("Period")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("StorageLocation")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("StorageLocationDesc")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("Supplier")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Version")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Year")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Version", "KanbanNumber", "MaterialCode")
+                        .IsUnique()
+                        .HasFilter("IsDeleted=0");
+
+                    b.ToTable("Set_BT_Car_Platform");
+                });
+
            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.Boms.BomVersion", b =>
                {
                    b.Property<Guid>("Id")
@ -3130,6 +3250,412 @@ namespace Win.Sfs.SettleAccount.Migrations
                    b.ToTable("Set_hqspkb_version");
                });

+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.HQ_H.HQ_H_Platform", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("AcceptanceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("BranchId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Extend")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ExternalKanbanNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Factory")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("HQHKanBan")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("KanbanNumber")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MaterialCode")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("MaterialVoucherNo")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("Period")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("StorageLocation")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("StorageLocationDesc")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("Supplier")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Version")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Year")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Version", "HQHKanBan", "MaterialCode")
+                        .IsUnique()
+                        .HasFilter("IsDeleted=0");
+
+                    b.ToTable("Set_HQ_H_Platform");
+                });
+
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.HQ_H.HQ_H_PlatformVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("BranchId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CustomerCode")
+                        .HasMaxLength(36)
+                        .HasColumnType("nvarchar(36)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Period")
+                        .IsRequired()
+                        .HasMaxLength(36)
+                        .HasColumnType("nvarchar(36)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasMaxLength(36)
+                        .HasColumnType("nvarchar(36)");
+
+                    b.Property<string>("Year")
+                        .IsRequired()
+                        .HasMaxLength(36)
+                        .HasColumnType("nvarchar(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Version")
+                        .IsUnique()
+                        .HasFilter("IsDeleted=0");
+
+                    b.ToTable("Set_HQ_H_PlatformVersion");
+                });
+
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.HQ_M.HQ_M_Platform", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("AcceptanceDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("BranchId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Extend")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ExternalKanbanNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Factory")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("HQMKanBan")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("KanbanNumber")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MaterialCode")
+                        .IsRequired()
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("MaterialVoucherNo")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("Period")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("StorageLocation")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("StorageLocationDesc")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("Supplier")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Version")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Year")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Version", "HQMKanBan", "MaterialCode")
+                        .IsUnique()
+                        .HasFilter("IsDeleted=0");
+
+                    b.ToTable("Set_HQ_M_Platform");
+                });
+
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.HQ_M.HQ_M_PlatformVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("BranchId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CustomerCode")
+                        .HasMaxLength(36)
+                        .HasColumnType("nvarchar(36)");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Period")
+                        .IsRequired()
+                        .HasMaxLength(36)
+                        .HasColumnType("nvarchar(36)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasMaxLength(36)
+                        .HasColumnType("nvarchar(36)");
+
+                    b.Property<string>("Year")
+                        .IsRequired()
+                        .HasMaxLength(36)
+                        .HasColumnType("nvarchar(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Version")
+                        .IsUnique()
+                        .HasFilter("IsDeleted=0");
+
+                    b.ToTable("Set_HQ_M_PlatformVersion");
+                });
+
            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.ImportMap.ImportColumnMap", b =>
                {
                    b.Property<Guid>("Id")
@ -5266,7 +5792,7 @@ namespace Win.Sfs.SettleAccount.Migrations

                    b.HasIndex("state");

-                    b.HasIndex("Version", "ChassisNumber", "MaterialCode")
+                    b.HasIndex("Version", "ChassisNumber", "MaterialCode", "KENNCode")
                        .IsUnique();

                    b.ToTable("Set_Unsettle");
@ -6772,7 +7298,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .IsUnique()
                        .HasFilter("IsDeleted=0");

-                    b.ToTable("Set_WMSSparePart_Version");
+                    b.ToTable("Set_BT_Car_PlatformVersion");
                });

            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.WMS_KanBan.WMSKanBanSettle", b =>
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
@ -814,7 +814,7 @@ namespace Win.Sfs.SettleAccount

                b.Property(x => x.Enabled);
                b.HasIndex(x => new { x.state });
-                b.HasIndex(x => new { x.Version, x.ChassisNumber, x.MaterialCode }).IsUnique();
+                b.HasIndex(x => new { x.Version, x.ChassisNumber, x.MaterialCode,x.KENNCode }).IsUnique();
            });
        }
        /// <summary>
--- a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache
+++ b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.assets.cache
--- a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache
+++ b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.assets.cache
--- a/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache
+++ b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.assets.cache
--- a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
@ -378,7 +378,7 @@ export default {
  watch: {
    customerInfosMB: {
      handler(newVal) {
-        console.log("门板-接收的父组件的值："+JSON.stringify(newVal))
+        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
        if (newVal == "" || newVal == "undefined") {
          //TODO
        } else {
@ -386,9 +386,7 @@ export default {
            this.customerInfo.printType = element.PrintType;
            this.customerInfo.productLine = element.ProductLine;
          });
-          if (
-            this.customerInfo.productLine != ""
-          ) {
+          if (this.customerInfo.productLine != "") {
            this.getList();
          }
        }
@ -586,12 +584,15 @@ export default {
              });
              return;
            } else {
-              let dataname = JSON.stringify(response.item);
-              console.log("门板-调用Handlers/Handler1.ashx?report=menban传的值："+dataname)
+              this.fileQuery.dataname = JSON.stringify(response.item);
+              console.log(
+                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
              this.$axios
                .posts(
                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(dataname)
+                  qs.stringify(this.fileQuery)
                )
                .then((response) => {
                  this.printpdf(response); //打印我文件流
--- a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
@ -274,7 +274,7 @@ export default {
      totalCount: 0,
      listLoading: true,
      customerInfo: {
-        printType: "",
+        printType: "1",
        productLine: "",
      },
      // 高级搜索
@ -358,18 +358,16 @@ export default {
  watch: {
    customerInfosZHB: {
      handler(newVal) {
-        console.log("柱护板-接收的父组件的值："+JSON.stringify(newVal))
+        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
        if (newVal == "" || newVal == "undefined") {
          //TODO
        } else {
          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
+            this.customerInfo.printType = "1";
            this.customerInfo.productLine = element.ProductLine;
          });
-          console.log("柱护板监控传值："+JSON.stringify(this.customerInfo))
-          if (
-            this.customerInfo.productLine != ""
-          ) {
+          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
+          if (this.customerInfo.productLine != "") {
            this.getList();
          }
        }
@ -516,7 +514,7 @@ export default {
        this.listQuery.ProductLine = this.customerInfo.productLine;
      }

-      console.log("柱护板-列表查询条件："+JSON.stringify(this.listQuery));
+      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
      this.$axios
        .posts(
          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
@ -549,7 +547,7 @@ export default {
        let beginVin1 = this.multipleSelection[0].beginVin1;
        let endVin1 = this.multipleSelection[0].endVin1;
        var params = {
-          printType: this.customerInfo.printType,
+          printType: "1",
          productLine: this.customerInfo.productLine,
          beginVin: beginVin1,
          endVin: endVin1,
@ -558,7 +556,7 @@ export default {
        this.$axios
          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
          .then((response) => {
-            console.log("柱护版-打印返回的状态："+response.status);
+            console.log("柱护版-打印返回的状态：" + response.status);
            const index = this.list.indexOf(row);
            if (response.status === false) {
              this.$message({
@ -567,12 +565,15 @@ export default {
              });
              return;
            } else {
-              let dataname = JSON.stringify(response.item);
-              console.log("柱板-调用Handlers/Handler1.ashx?report=menban传的值："+dataname)
+              this.fileQuery.dataname = JSON.stringify(response.item);
+              console.log(
+                "柱板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
              this.$axios
                .posts(
                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(dataname)
+                  qs.stringify(this.fileQuery)
                )
                .then((response) => {
                  this.printpdf(response); //打印我文件流
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@ -1575,7 +1575,6 @@ export default {
      document.body.appendChild(ifr);
      this.doPrint("printPdf" + date);
      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      alert()
      this.dialogFormVisible = false;
    },
    httpPost(URL, PARAMS) {