diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
index 01e2e7b5..1559a11a 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
@@ -231,6 +231,38 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
             return _taskid;
         }
 
+        /// <summary>
+        /// 导入功能
+        /// </summary>
+        /// <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("SettleFisDiffExport-Make")]
+        [DisableRequestSizeLimit]
+
+        public async Task<string> SettleFisDiffExportMake( string version, string materialCode, string begin, string end)
+        {
+            List<CustomCondition> customConditionList = new List<CustomCondition>();
+            customConditionList.Add(new CustomCondition() { Name = "Version", Value = version  });
+            customConditionList.Add(new CustomCondition() { Name = "MaterialCode", Value = materialCode});
+            customConditionList.Add(new CustomCondition() { Name = "BeginTime", Value = begin });
+            customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end });
+            var _taskid = await _service.ExportEnqueueAsync("大众准时化结算数量差异比对表", ExportExtentsion.Excel, CurrentUser, typeof(SettleFisDiffExportService), customConditionList, (rs) =>
+            {
+            });
+            return _taskid;
+        }
+
+
+
+
+
+
+
+
+
+
+
         /// <summary>
         /// 结算总成和ERP总成价格对比
         /// </summary>
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index 929d29bb..c8a58fd8 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -2454,6 +2454,13 @@
             <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
             <returns></returns>
         </member>
+        <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettleFisDiffExportMake(System.String,System.String,System.String,System.String)">
+            <summary>
+            导入功能
+            </summary>
+            <param name="files">上传的文件(前端已经限制只能上传一个附件)</param>
+            <returns></returns>
+        </member>
         <member name="M:Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.SettledPartAndErpPartPriceDiffMake(System.String,System.String)">
             <summary>
             结算总成和ERP总成价格对比
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleFisDiffDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleFisDiffDetailDapperRepository.cs
index 9507d467..1c611486 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleFisDiffDetailDapperRepository.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleFisDiffDetailDapperRepository.cs
@@ -1,5 +1,6 @@
 using Dapper;
 using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
@@ -12,6 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 {
+    [ExcelExporter(Name = "未结明细", AutoFitAllColumn = true, MaxRowNumberOnASheet = 500000)]
     public class SettleFisDiffDetail
     {
         [ExporterHeader(DisplayName = "年")]
@@ -29,17 +31,17 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         [ExporterHeader(DisplayName = "零件号"   )]
         public string MaterialCode { set; get; }
         [ExporterHeader(DisplayName = "结算数量" )]
-        public string SettleQty { set; get; }
+        public decimal SettleQty { set; get; }
         [ExporterHeader(DisplayName = "M100状态" )]
         public string WMSBillNum { set; get; }
         [ExporterHeader(DisplayName = "M100数量" )]
-        public string Qty { set; get; }
+        public decimal Qty { set; get; }
         [ExporterHeader(DisplayName = "差异")]
-        public string DiffQty { set; get; }
+        public decimal DiffQty { set; get; }
         [ExporterHeader(DisplayName = "开票单价" )]
-        public string Price{ set; get; }
+        public decimal Price{ set; get; }
         [ExporterHeader(DisplayName = "差异金额")]
-        public string DiffPrice{ set; get; }
+        public decimal DiffPrice{ set; get; }
         [ExporterHeader(DisplayName =  "SAP编码")]
         public string SapCode { set; get; }
 
@@ -53,22 +55,22 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
         [ExporterHeader(DisplayName = "物料组车型")]
         public string MaterialCodeGroup { set; get; }
         [ExporterHeader(DisplayName = "SAP编码")]
-        public string KENNCode { set; get; }
+        public string SapCode { set; get; }
         [ExporterHeader(DisplayName = "零件号")]
         public string MaterialCode { set; get; }
 
         [ExporterHeader(DisplayName = "结算数量")]
-        public string SettleQty { set; get; }
+        public decimal SettleQty { set; get; }
         [ExporterHeader(DisplayName = "M100状态")]
         public string WMSBillNum { set; get; }
         [ExporterHeader(DisplayName = "M100数量")]
-        public string Qty { set; get; }
+        public decimal Qty { set; get; }
         [ExporterHeader(DisplayName = "差异数量")]
-        public string DiffQty { set; get; }
+        public decimal DiffQty { set; get; }
         [ExporterHeader(DisplayName = "开票单价")]
-        public string Price { set; get; }
+        public decimal Price { set; get; }
         [ExporterHeader(DisplayName = "差异金额")]
-        public string DiffPrice { set; get; }
+        public decimal DiffPrice { set; get; }
 
     }
     public class SettleFisDiffDetailDapperRepository : DapperRepository<SettleAccountDbContext>, ITransientDependency
@@ -101,7 +103,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
 "	Price,\n" +
 "	a.SettleQty - isnull( b.Qty, 0 ) DiffQty,(\n" +
 "	a.SettleQty - isnull( b.Qty, 0 ))* Price DiffPrice,\n" +
-"	d.CustomerPartCode SapCode \n" +
+"	d.MaterialCode SapCode \n" +
 "FROM\n" +
 "	( SELECT YEAR, KENNCode, ChassisNumber, Model, CP5A, CP7, MaterialCode, Qty SettleQty FROM Set_Settle WHERE version = '{0}' ) a\n" +
 "	LEFT JOIN (\n" +
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs
index fae4d798..c2fd9c20 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SettleFisDiffExportService.cs
@@ -27,14 +27,35 @@ namespace SettleAccount.Job.Services.Report
        
         public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> p_list)
         {
-            //var year = p_list.Where(p => p.Name == "Year").FirstOrDefault().Value;
-            //var state = p_list.Where(p => p.Name == "State").FirstOrDefault().Value;
             var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
-            var customerCode = p_list.Where(p => p.Name == "CustomerCode").FirstOrDefault().Value;
+            var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
             var begin    = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
             var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
-            var _list= _dapper.GetReportList(version,string.Empty,begin,end);
-            _outputService.Export<SettleFisDiffDetail>(id,string.Format("3.大众准时化结算数量差异比对表_{0}.xlsx", Guid.NewGuid().ToString()), _list);
+            var _list= _dapper.GetReportList(version, materialCode, begin,end);
+
+            _list.GroupBy(p => new { p.MaterialCode,p.SapCode }).Select(p =>new SettleFisDiffSum
+            {
+
+                 MaterialCode= p.Key.MaterialCode,
+                 SapCode= p.Key.SapCode,
+                 DiffPrice=p.Sum(p=>p.DiffPrice),
+                 DiffQty=p.Sum(p=>p.DiffQty),
+                 Qty=p.Sum(p=>p.Qty),
+                 SettleQty=p.Sum(p=>p.SettleQty),
+                 Price=p.Sum(p=>p.Price)
+
+
+            });
+
+       
+
+
+
+
+
+
+
+        _outputService.Export<SettleFisDiffDetail>(id,string.Format("大众准时化结算数量差异比对表_{0}.xlsx", Guid.NewGuid().ToString()), _list);
             return id.ToString();
 
         }
diff --git a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache
index f5e894ae..c0945f05 100644
Binary files a/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache and b/src/Shared/Win.Abp.Snowflakes/obj/Debug/netcoreapp5/Win.Abp.Snowflakes.csproj.AssemblyReference.cache differ
diff --git a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache
index cf20a4fd..b792a357 100644
Binary files a/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache and b/src/Shared/Win.Sfs.Shared/obj/Debug/netcoreapp5/Win.Sfs.Shared.csproj.AssemblyReference.cache differ
diff --git a/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache
index 1fbf501f..058428af 100644
Binary files a/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache and b/src/Shared/Win.Utils/obj/Debug/netcoreapp5/Win.Utils.csproj.AssemblyReference.cache differ
diff --git a/vue/src/components/ImportTxt/index.vue b/vue/src/components/ImportTxt/index.vue
index 4eea759b..6392dce9 100644
--- a/vue/src/components/ImportTxt/index.vue
+++ b/vue/src/components/ImportTxt/index.vue
@@ -345,6 +345,7 @@ export default {
         {
           fis: "FIS发运数据",
           settleAccount: "R3数据",
+          AssemblyCfgERP:"总成SAP数据",
         }[this.crmType] || ""
       );
     },
@@ -352,7 +353,8 @@ export default {
       return (
         {
           fis: "/api/settleaccount/fis/ExcelImport",
-          settleAccount: "/api/settleaccount/SettleAccount/ExcelImport",
+          settleAccount: "/api/settleaccount/SettleAccount/ExcelImport", 
+          AssemblyCfgERP:"/api/newjit/assembly-cfg-erp/import",
         }[this.crmType] || ""
       );
     },
@@ -362,6 +364,7 @@ export default {
         {
           fis: "FIS发运数据导入模板.xlsx",
           settleAccount: "R3数据模板.xlsx",
+          AssemblyCfgERP:"BOM-批量导入模板.txt",
         }[this.crmType] || ""
       );
     },
@@ -560,24 +563,48 @@ export default {
           .posts(webapi, fd)
           .then(async (res) => {
             console.log("导入条件：" + JSON.stringify(res));
-            if (res === "Success") {
-              if (this.isLt2M === "1" && this.isFileType === "1") {
-                this.$notify({
-                  title: "成功",
-                  message: "数据导入成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.stepList[1].status = "finish";
-                this.resultData.successMessage = "数据导入成功！";
-                this.stepsActive = 4;
+            if(this.crmType !== "AssemblyCfgERP"){
+              if (res === "Success") {
+                if (this.isLt2M === "1" && this.isFileType === "1") {
+                  this.$notify({
+                    title: "成功",
+                    message: "数据导入成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+                  this.stepList[1].status = "finish";
+                  this.resultData.successMessage = "数据导入成功！";
+                  this.stepsActive = 4;
+                }
+              } else {
+                this.stepList[0].status = "wait";
+                this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+                this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
+                this.resultData.successMessage = "数据导入失败！";
+                this.stepsActive = 3;
+              }
+            }
+            else{
+                console.log(res.status)
+              if (res.status === true) {
+                if (this.isLt2M === "1" && this.isFileType === "1") {
+                  this.$notify({
+                    title: "成功",
+                    message: "数据导入成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+                  this.stepList[1].status = "finish";
+                  this.resultData.successMessage = "数据导入成功！";
+                  this.stepsActive = 4;
+                }
+              } else {
+                this.stepList[0].status = "wait";
+                this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
+                this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
+                this.resultData.successMessage = "数据导入失败！";
+                this.stepsActive = 3;
               }
-            } else {
-              this.stepList[0].status = "wait";
-              this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载
-              this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见
-              this.resultData.successMessage = "数据导入失败！";
-              this.stepsActive = 3;
             }
             this.$emit("status", "finish");
             this.loading = false;
diff --git a/vue/src/router/modules/fis.js b/vue/src/router/modules/fis.js
index 4655ab23..576b0c7c 100644
--- a/vue/src/router/modules/fis.js
+++ b/vue/src/router/modules/fis.js
@@ -36,6 +36,16 @@ const pgfis = {
                 icon: '发货'
             }
         },
+        {
+            path: '/pg-unknownAssembly',
+            component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
+            name: 'pg-unknownAssembly',//命名路由
+            meta: {
+                title: '未知总成模块管理',
+                roles: ['SettleAccount.Reports'],
+                icon: '发货'
+            }
+        },
         {
             path: '/pg-workLine',
             component: () => import('@/views/pg-fis/basedate/productLine'),
diff --git a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
index 038670b9..8f4922c6 100644
--- a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
@@ -174,7 +174,7 @@
           align="center"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.model }}</span>
+            <span>{{ scope.row.vehicleModel }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -185,6 +185,7 @@
         :close-on-click-modal="false"
         :title="formTitle"
         width="700px"
+        @close='closeDialog'
       >
         <el-form
           ref="form"
@@ -335,6 +336,13 @@
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
       />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
     </div>
       <!-- 抽屉控件 -->
       <el-drawer
@@ -358,7 +366,7 @@
 import Pagination from "@/components/Pagination";
 import permission from "@/directive/permission/index.js";
 import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
+import importExcel from "@/components/ImportTxt";
 import Lockr from "lockr";
 import moment from "moment";
 import Detail from "./detail.vue";
@@ -411,7 +419,6 @@ export default {
       versionValue: "",
       searchContent: "", // 输入内容
       showExcelImport: false,
-      form: {},
       drawer: false,
       list: null,
       totalCount: 0,
@@ -697,8 +704,9 @@ export default {
     },
     importExcelData() {
       //关闭导入窗体时调用
+      this.listLoading = false;
       this.showExcelImport = false;
-      //this.getList();
+      this.getList();
     },
 
     /** 刷新列表 */
@@ -796,7 +804,11 @@ export default {
     },
 
     valueselectChange(){},
-    handleImportSAP(){},
+    handleImportSAP(){
+      //导入
+      this.showExcelImport = true;
+      this.$refs.importexcel.handleImportExcelClick();
+    },
 
     handleFilter() {
       this.page = 1;
@@ -849,6 +861,9 @@ export default {
           .catch(() => {
           });
     },
+    closeDialog(){
+      //this.multipleSelection = [];//清空数据
+    },
   },
 };
 </script>
diff --git a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
index 80ade2ac..fad25f00 100644
--- a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
@@ -22,7 +22,7 @@
       
       <el-form-item label="零件代码：" prop="partCode">
         <el-input
-          v-model="partCode"
+          v-model="listQuery.partCode"
           clearable
           size="small"
           placeholder=""
@@ -34,7 +34,7 @@
       
       <el-form-item label="零件名称：" prop="partName">
         <el-input
-          v-model="partName"
+          v-model="listQuery.partName"
           clearable
           size="small"
           placeholder=""
@@ -46,29 +46,35 @@
 
       <el-form-item label="零件类型：" prop="partType">
         <el-select
-          v-model="partType"
+          v-model="listQuery.partType"
           clearable
           placeholder="请选择"
           size="medium"
           style="margin-right: 15px"
-          @change="valueselectChange"
         >
-          <el-option label="结算" value="R0003"></el-option>
-          <el-option label="二配" value="R0001"></el-option>
+          <!-- @change="valueselectChange" -->
+          <el-option
+            v-for="item in partType1List"
+            :key="item.id"
+            :label="item.dicItemName"
+            :value="item.dicItemCode"/>
         </el-select>
       </el-form-item>
 
-      <el-form-item label="零件子类型：" prop="partChildType">
+      <el-form-item label="零件子类型：" prop="partType2">
         <el-select
-          v-model="partChildType"
+          v-model="listQuery.partType2"
           clearable
           placeholder="请选择"
           size="medium"
           style="margin-right: 15px"
-          @change="valueselectChange"
         >
-          <el-option label="结算" value="R0003"></el-option>
-          <el-option label="二配" value="R0001"></el-option>
+          <!-- @change="valueselectChange" -->
+          <el-option
+            v-for="item in partType2List"
+            :key="item.id"
+            :label="item.dicItemName"
+            :value="item.dicItemCode"/>
         </el-select>
       </el-form-item>
 
@@ -274,12 +280,12 @@ export default {
         MaxResultCount: 15,
         version: "",
         //site: "TH",
-        customerCode: "",
+        customerCode: undefined,
         //userId: "00000000-0000-0000-0000-000000000000",
         partCode:"",//零件编码
         partName:"",//零件名称
         partType:"",//零件类型
-        partChildType:"",//零件子类型
+        partType2:"",//零件子类型
       },
       listExportQuery: {
         Filters: [
@@ -308,26 +314,34 @@ export default {
       isEdit: false,
       sortState:false, //标记刷新是否是排序调用
 
-      partCode:'',
-      partName:'',
-      partType:'',
-      partChildType:'',
+
+      
+      partType1Query:{
+        dicTypeName:"客户零件类型1",
+      },
+      partType2Query:{
+        dicTypeName:"客户零件类型2",
+      },
+
+      partType1List:[],
+      partType2List:[],
       
     };
   },
   mounted() {
     this.$nextTick(() => { 
         var offsetHei = document.documentElement.clientHeight;
-        console.log(offsetHei);
+        //console.log(offsetHei);
         let boxH = this.$refs.box.offsetHeight;
         this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-        console.log(this.$refs.box.offsetHeight);
-        console.log(this.tableHeight);
+        //console.log(this.$refs.box.offsetHeight);
+        //console.log(this.tableHeight);
     });
   },
   created() {
     //this.getVersionInfo();
     //if (this.versionList == []) {
+      this.getPartType();
       this.getList();
     //}
   },
@@ -353,7 +367,7 @@ export default {
       });
       tempsTabs.push({
         label: "零件子类型",
-        prop: "partChildType",
+        prop: "partType2",
         width: 120,
       });
       tempsTabs.push({
@@ -452,16 +466,16 @@ export default {
         //return moment(date).format("YYYY-MM-DD HH:mm:ss");
         return moment(date).format("YYYY-MM-DD");
       } */
-      if(column.property === 'customerCode')
+      if(column.property === "partType")
       {
-        if(row[column.property] === 'R0001')
+        if(row[column.property] === "1")
         {
-          var vname = '二配';
+          var vname = '门板';
           return vname;
         }
-        else if(row[column.property] === 'R0003')
+        else if(row[column.property] === '2')
         {
-          var vname = '结算';
+          var vname = '柱护板';
           return vname;
         }
         else
@@ -472,7 +486,7 @@ export default {
       return row[column.property] || "--";
     },
     importExcelData() {
-      this.getVersionInfo();
+      //this.getVersionInfo();
       this.listLoading = false;
       //关闭导入窗体时调用
       this.showExcelImport = false;
@@ -480,34 +494,29 @@ export default {
     //导出功能
     async handleDownload() {
       this.listLoading = true;
-      if (this.versionValue === "") {
-        this.$message.error("必需选择版本！");
-        this.listLoading = false;
-        return;
-      }
-      if (this.versionValue != "") {
-        this.listQuery.version = this.versionValue;
-      }
+      // 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/SettlementPart/Export",
+          "/api/newjit/part-cfg/export",
           this.listQuery
         )
         .then((res) => {
-          let fileNameOfProject = res;
+          let filename = res.item;
           this.$axios
-            .BolbGets(
-              "/api/settleaccount/getblobfile/download/" + fileNameOfProject
-            )
+            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
             .then((response) => {
-              if (fileNameOfProject.indexOf("_") != -1) {
+              if (filename.indexOf("_") != -1) {
                 let downName =
-                  fileNameOfProject.slice(
-                    0,
-                    fileNameOfProject.lastIndexOf("_")
-                  ) +
-                  fileNameOfProject.slice(fileNameOfProject.lastIndexOf("."));
+                  filename.slice(0, filename.lastIndexOf("_")) +
+                  filename.slice(filename.lastIndexOf("."));
                 downloadFile(response, downName);
                 this.$notify({
                   title: "成功",
@@ -516,7 +525,7 @@ export default {
                   duration: 2000,
                 });
               } else {
-                downloadFile(response, fileNameOfProject);
+                downloadFile(response, filename);
                 this.$notify({
                   title: "成功",
                   message: "数据-导出成功！",
@@ -541,22 +550,22 @@ export default {
       }
       console.log("列表查询条件：" + JSON.stringify(this.listQuery));
       this.$axios
-        .posts(
+        .gets(
           "/api/newjit/part-cfg/list",
           this.listQuery
         )
         .then((response) => {
           this.list = response.items;
-          this.list.forEach(item => {
-            if(item.customerCode === 'R0001')
-            {
-              item.customerCode = '二配';
-            }
-            else if(item.customerCode === 'R0003')
-            {
-              item.customerCode = '结算';
-            }
-          });
+          // this.list.forEach(item => {
+          //   if(item.customerCode === 'R0001')
+          //   {
+          //     item.customerCode = '二配';
+          //   }
+          //   else if(item.customerCode === 'R0003')
+          //   {
+          //     item.customerCode = '结算';
+          //   }
+          // });
           this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
@@ -617,15 +626,15 @@ export default {
         this.listQuery.Filters.push(filter);
       }
 
-      if (this.partChildType != "") {
-        var column = "partChildType";
+      if (this.partType2 != "") {
+        var column = "partType2";
         let filter = {
           logic: 0,
           column: column,
           action: 0,
-          value: this.partChildType,
+          value: this.partType2,
         };
-        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partChildType")
+        this.listQuery.Filters = this.listQuery.Filters.filter(u => u.column !== "partType2")
         this.listQuery.Filters.push(filter);
       }
       */
@@ -677,9 +686,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery(refName) {
-      this.OnlineTimeVale = [];
-      this.ReceiveTimeVale = [];
+      this.listQuery.partCode = "";
+      this.listQuery.partName = "";
+      this.listQuery.partType = "";
+      this.listQuery.partType2 = "";
       this.$refs[refName].resetFields();
+      this.getPartType()
       this.handleFilter();
     },
     sortChange(data) {
@@ -723,6 +735,32 @@ export default {
       this.$refs.multipleTable.clearSelection();
       this.$refs.multipleTable.toggleRowSelection(row);
     },
+    //获取零件类型
+    getPartType()
+    {
+      this.$axios
+          .gets(
+            "/api/newjit/dic/list",this.partType1Query
+          )
+          .then((response) => {
+            console.log(response);
+            this.partType1List = response.item;
+            //console.log()
+          })
+          .catch(() => {
+          });
+      this.$axios
+          .gets(
+            "/api/newjit/dic/list",this.partType2Query
+          )
+          .then((response) => {
+            console.log(response);
+            this.partType2List = response.item;
+            //console.log()
+          })
+          .catch(() => {
+          });
+    },
   },
 };
 </script>
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/detail.vue b/vue/src/views/pg-fis/basedate/m100BIll/detail.vue
new file mode 100644
index 00000000..5ba51a93
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100BIll/detail.vue
@@ -0,0 +1,347 @@
+<!--M100上线信息-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="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"
+      :row-key="getRowKeys"
+      :expand-row-keys="expands"
+      @expand-change="exChange"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <!-- <el-table-column
+        prop="总成名称"
+        label="erpAssemblyName"
+        sortable
+        width="180"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="erpAssemblyVersion"
+        label="总成版本号"
+        sortable
+        width="180"
+      >
+              style="width: calc(100% - 47px)"
+            class="two-list"
+      </el-table-column> -->
+
+      <el-table-column type="expand" prop="details">
+        <template slot-scope="scope">
+          <el-table :data="scope.row.details">
+            <el-table-column
+              prop="partCode"
+              label="客户零件代码"
+            ></el-table-column>
+            <el-table-column
+              prop="partNum"
+              label="客户零件数量"
+            ></el-table-column>
+            <el-table-column prop="description" label="描述"></el-table-column>
+            <el-table-column prop="isKey" label="是否Key件">
+              <template slot-scope="scope">
+                <span v-if="scope.row.isKey == true">
+                  <span style="color: #00b46d">是</span>
+                </span>
+                <span v-else>
+                  <span style="color: #d75c89">否</span>
+                </span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </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-column
+        prop="erpAssemblyVersion"
+        label="总成版本号"
+        sortable
+        width="360"
+      >
+      </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"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+import Detail from "./detail";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockFisDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      expands: [], //只展开一行放入当前行id
+      getRowKeys: (row) => {
+        return row.id; //这里看这一行中需要根据哪个属性值是id
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        id: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "总成名称",
+        prop: "erpAssemblyName",
+        width: 160,
+      });
+      // tempsTabs.push({
+      //   label: "总成版本号",
+      //   prop: "erpAssemblyName",
+      //   width: 160,
+      // });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    exChange(row, rowList) {
+      this.loading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList() {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      this.$axios
+        .gets("/api/newjit/bill-m100/"+ this.customerInfo.parentId)
+        .then((response) => {
+          this.list = response;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "partCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        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 "../../../ux/styles/crmtable.scss";
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
index 6121f3e8..789de8c9 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@@ -320,9 +320,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="上线日期:">
+              <el-form-item label="上线日期:" prop="onlineTime" required>
               <el-date-picker
-                v-model="form.year"
+                v-model="form.onlineTime"
                 style="width: 350px"
                 type="datetime"
                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -362,26 +362,26 @@
                   >
                     <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
                     <el-table-column prop="erpAssemblyCode" label="ERP总成编号" width="150px" > 
-                      <!-- <template slot-scope="scope">
+                      <template slot-scope="scope">
                         <el-input v-model="scope.row.erpAssemblyCode" size="mini" style="width:135px"></el-input>
-                      </template> -->
+                      </template>
                     </el-table-column>
                     <el-table-column prop="erpAssemblyName" label="ERP总成名称">
-                      <!-- <template slot-scope="scope">
+                      <template slot-scope="scope">
                         <el-input v-model="scope.row.erpAssemblyName" size="mini"></el-input>
-                      </template>  -->
+                      </template> 
                     </el-table-column>
-                    <el-table-column prop="description" width="35px"> 
+                    <el-table-column  width="35px"> 
                       <template slot="header">
-                        <!-- <el-button @click="handleAddDetails" icon="el-icon-plus" type="text"></el-button> -->
+                        <el-button @click="handleAddLeftDetails" icon="el-icon-plus" type="text"></el-button>
                       </template>
                       <template slot-scope="scope">
-                        <el-button @click="handleDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
+                        <el-button @click="handleLeftDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
                       </template>
                     </el-table-column>
                   </el-table>
                 </el-row>
-                <el-divider class="divider2"  content-position="left">添加ERP总成</el-divider>
+                <!-- <el-divider class="divider2"  content-position="left">添加ERP总成</el-divider>
                 <el-row>
                   <el-form-item label="ERP总成编码:" prop="erpAssemblyCode"  >
                     <el-input
@@ -420,7 +420,7 @@
                 </el-row>
                 <div style="text-align:center;margin: 0px;margin-bottom: 15px;">
                   <el-button type="primary" @click="leftclick">添加总成</el-button>
-                </div>
+                </div> -->
               </div>
             </el-col>
             <el-col :span="12">
@@ -454,9 +454,9 @@
                         <el-input v-model="scope.row.partCode" size="mini" style="width:135px"></el-input>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="partName" label="客户零件名称">
+                    <el-table-column prop="description" label="客户零件名称">
                       <template slot-scope="scope">
-                        <el-input v-model="scope.row.partName" size="mini"></el-input>
+                        <el-input v-model="scope.row.description" size="mini"></el-input>
                       </template> 
                     </el-table-column>
                     <el-table-column prop="partNum" label="客户零件数量" width="120px" >
@@ -464,17 +464,17 @@
                         <el-input-number v-model="scope.row.partNum" :min="1"  size="mini" style="width:100px"></el-input-number>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="description" width="35px"> 
+                    <el-table-column width="35px"> 
                       <template slot="header">
-                        <!-- <el-button @click="handleAddDetails" icon="el-icon-plus" type="text"></el-button> -->
+                        <el-button @click="handleAddRightDetails" icon="el-icon-plus" type="text"></el-button>
                       </template>
                       <template slot-scope="scope">
-                        <el-button @click="handleDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
+                        <el-button @click="handleRightDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
                       </template>
                     </el-table-column>
                   </el-table>
                 </el-row>
-                <el-divider class="divider2"  content-position="left">添加ERP结算件</el-divider>
+                <!-- <el-divider class="divider2"  content-position="left">添加ERP结算件</el-divider>
                 <el-row>
                   <el-form-item label="客户零件代码:" prop="customerPartCode"  >
                     <el-input
@@ -507,7 +507,7 @@
                 </el-row>
                 <div style="text-align:center;margin: 0px;margin-bottom: 15px;">
                   <el-button type="primary">添加零件</el-button>
-                </div>
+                </div> -->
               </div>
             </el-col>
           </el-row>
@@ -559,6 +559,7 @@ import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
 import moment from "moment";
+import Detail from "./detail.vue";
 import { downloadFile } from "@/utils/crmindex.js";
 
 //组件计量单位
@@ -574,7 +575,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 
 export default {
   name: "m100Bill",
-  components: { Pagination, CRMTableHead, importExcel },
+  components: { Pagination, CRMTableHead, importExcel, Detail },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -652,6 +653,11 @@ export default {
         //UserId: "00000000-0000-0000-0000-000000000000",
       },
       form:{
+        knr:"",
+        vehicleModelCode:"",
+        vin:"",
+        hostSN:"",
+        onlineTimeVale:"",
         leftdetails:[],
         rightdetails:[],
       },
@@ -758,11 +764,12 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           console.log("保存参数:" + JSON.stringify(this.form));
+          console.log(this.form);
           this.formLoading = true;
           if (this.isEdit) {
             //修改
             this.$axios
-              .puts("/api/newjit/assembly-cfg-erp/" + this.form.id, this.form)
+              .puts("/api/newjit/new-m100" + this.form.id, this.form)
               .then((response) => {
                 this.formLoading = false;
                 this.$notify({
@@ -875,9 +882,9 @@ export default {
     fetchData(id) {
       //循环动态
       this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
+        .gets("/api/newjit/new-m100/" + id)
         .then((response) => {
-          this.form = response.item;
+          this.form = response.item.m100Bill;
           //this.details = response.item.details;
           //console.log(this.details);
         });
@@ -889,7 +896,7 @@ export default {
       this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
       console.log(JSON.stringify(this.listExportQuery));
       this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
+        .posts("/api/newjit/new-m100/export", this.listExportQuery)
         .then((res) => {
           let filename = res.item;
           this.$axios
@@ -932,10 +939,10 @@ export default {
       this.listQuery.KNREnd = "";
       this.listQuery.VINBegin = "";
       this.listQuery.VINEnd = "";
-      this.listQuery.OnlineTimeValue = "";
+      this.listQuery.OnlineTimeValue = [];
       this.listQuery.OnlineTimeBegin = "";
       this.listQuery.OnlineTimeEnd = "";
-      this.listQuery.ReceiveTimeValue = "";
+      this.listQuery.ReceiveTimeValue = [];
       this.listQuery.ReceiveTimeBegin = "";
       this.listQuery.ReceiveTimeEnd = "";
       this.handleQuery();
@@ -968,24 +975,42 @@ export default {
       }
     },
 
-    handleAddDetails() {
-      if (this.form.details === undefined) {
-        this.form.details = [];
+    handleAddLeftDetails() {
+      this.$forceUpdate();
+      if (this.form.leftdetails === undefined) {
+        this.form.leftdetails = [];
         //console.log(679);
       }
       let obj = {};
-      obj.partCode = "";
-      obj.partName = "";
-      obj.partNum = "";
-      obj.isKey = false;
-      obj.description = "";
+      obj.erpAssemblyCode = "";
+      obj.erpAssemblyName = "";
+      obj.vehicleModel = this.form.vehicleModel;
 
-      console.log(this.form.details);
-      this.form.details.push(obj);
+      console.log(this.form.leftdetails);
+      this.form.leftdetails.push(obj);
       //console.log(688);
     },
-    handleDeleteDetails(index){
-      this.form.details.splice(index, 1);
+    handleAddRightDetails() {
+      this.$forceUpdate();
+      if (this.form.rightdetails === undefined) {
+        this.form.rightdetails = [];
+        //console.log(679);
+      }
+      let obj = {};
+      obj.customerPartCode = "";
+      obj.customerpartName = "";
+      obj.partQty= "";
+
+      console.log(this.form.rightdetails);
+      this.form.rightdetails.push(obj);
+      //console.log(688);
+    },
+    handleLeftDeleteDetails(index){
+      this.form.leftdetails.splice(index, 1);
+      //console.log(693);
+    },
+    handleRightDeleteDetails(index){
+      this.form.rightdetails.splice(index, 1);
       //console.log(693);
     },
 
@@ -1009,8 +1034,22 @@ export default {
     getList() {
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 10;
+      console.log(1030)
+      if(this.listQuery.OnlineTimeValue!== undefined)
+      {
+        console.log(1033)
+        console.log(this.listQuery.OnlineTimeValue)
+        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
+        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
+      }
+      console.log(this.listQuery.OnlineTimeValue)
+      if(this.listQuery.ReceiveTimeValue!== undefined)
+      {
+        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
+      }
       this.$axios
-        .gets("/api/newjit/bill-r100/list", this.listQuery)
+        .gets("/api/newjit/new-m100/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -1121,6 +1160,7 @@ export default {
       //console.log(this.listQuery.productType)
       //console.log(this.PLChildList)
     },
+    //获取车型
     getvehicleModel()
     {
       this.$axios
@@ -1141,7 +1181,7 @@ export default {
       let obj = {};
       obj.erpAssemblyCode = this.form.erpAssemblyCode;
       obj.erpAssemblyName = this.form.erpAssemblyName;
-      obj.vehicleModel = this.form.vehicleModel;
+      obj.vehicleModel = this.form.vehicleModelCode;
       
       if (this.form.leftdetails === undefined) {
         this.form.leftdetails = [];
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detail.vue b/vue/src/views/pg-fis/basedate/m100Online/detail.vue
new file mode 100644
index 00000000..25108fdd
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/detail.vue
@@ -0,0 +1,354 @@
+<!--M100上线信息-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="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"
+      :row-key="getRowKeys"
+      :expand-row-keys="expands"
+      @expand-change="exChange"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <!-- <el-table-column
+        prop="总成名称"
+        label="erpAssemblyName"
+        sortable
+        width="180"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="erpAssemblyVersion"
+        label="总成版本号"
+        sortable
+        width="180"
+      >
+              style="width: calc(100% - 47px)"
+            class="two-list"
+      </el-table-column> -->
+
+      <el-table-column type="expand" prop="details">
+        <template slot-scope="scope">
+          <el-table :data="scope.row.details">
+            <el-table-column
+              prop="partCode"
+              label="客户零件代码"
+            ></el-table-column>
+            <el-table-column
+              prop="partNum"
+              label="客户零件数量"
+            ></el-table-column>
+            <el-table-column prop="description" label="描述"></el-table-column>
+            <el-table-column prop="isKey" label="是否Key件">
+              <template slot-scope="scope">
+                <span v-if="scope.row.isKey == true">
+                  <span style="color: #00b46d">是</span>
+                </span>
+                <span v-else>
+                  <span style="color: #d75c89">否</span>
+                </span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </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-column
+        prop="erpAssemblyVersion"
+        label="总成版本号"
+        sortable
+        width="360"
+      >
+      </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"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+import Detail from "./detail";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockFisDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      expands: [], //只展开一行放入当前行id
+      getRowKeys: (row) => {
+        return row.id; //这里看这一行中需要根据哪个属性值是id
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        id: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "总成编号",
+        prop: "erpAssemblyCode",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "总成名称",
+        prop: "erpAssemblyName",
+        width: 160,
+      });
+      // tempsTabs.push({
+      //   label: "总成版本号",
+      //   prop: "erpAssemblyName",
+      //   width: 160,
+      // });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    exChange(row, rowList) {
+      this.loading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList() {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
+        .then((response) => {
+          this.list = response;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "partCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        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 "../../../ux/styles/crmtable.scss";
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index 2246fc30..26d182b4 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -39,7 +39,7 @@
             v-for="item in PLChildList"
             :key="item.id"
             :label="item.productLineName"
-            :value="item.id"/>
+            :value="item.productLineCode"/>
           </el-select>
         </el-form-item>
 
@@ -141,7 +141,7 @@
 
         <el-form-item label="上线日期">
           <el-date-picker
-            v-model="listQuery.OnlineTimeVale"
+            v-model="listQuery.OnlineTimeValue"
             size="small"
             style="width: 380px"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -155,7 +155,7 @@
       <!-- <el-row> -->
         <el-form-item label="接收日期">
           <el-date-picker
-            v-model="listQuery.ReceiveTimeVale"
+            v-model="listQuery.ReceiveTimeValue"
             size="small"
             style="width: 380px"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -166,8 +166,8 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="单据状态" prop="State">
-          <el-checkbox-group  v-model="listQuery.state" >
-            <el-checkbox v-for="item in billState" :key="item.id" :label="item.id">
+          <el-checkbox-group  v-model="listQuery.state">
+            <el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id"  @change="checkedListChange(index)">
               {{ item.name }}
             </el-checkbox>
           </el-checkbox-group>
@@ -294,6 +294,12 @@
         :visible.sync="drawer"
         :before-close="handleDrawerClose"
       >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
       </el-drawer>
     </div>
   </div>
@@ -306,6 +312,7 @@ import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
 import moment from "moment";
+import Detail from "./detail.vue";
 import { downloadFile } from "@/utils/crmindex.js";
 
 //组件计量单位
@@ -323,7 +330,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 
 export default {
   name: "M100Online",
-  components: { Pagination, CRMTableHead, importExcel },
+  components: { Pagination, CRMTableHead, importExcel, Detail },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -381,7 +388,7 @@ export default {
         MaxResultCount: 15,
         productType: 1,
         ProductLine: undefined,
-        version:undefined,
+        Version:undefined,
         serialNumBegin:undefined,
         serialNumEnd:undefined,
         HostSNBegin:undefined,
@@ -390,12 +397,13 @@ export default {
         KNREnd:undefined,
         VINBegin:undefined,
         VINEnd:undefined,
-        OnlineTimeValue:undefined,
+        OnlineTimeValue:[],
         OnlineTimeBegin:undefined,
         OnlineTimeEnd:undefined,
-        ReceiveTimeValue:undefined,
+        ReceiveTimeValue:[],
         ReceiveTimeBegin:undefined,
         ReceiveTimeEnd:undefined,
+        billStatus:undefined,
         state:[],
 
       },
@@ -439,6 +447,12 @@ export default {
     });
   },
   created() {
+    this.billState.forEach((element,index) => {
+      if(index === 0)
+      {
+        this.listQuery.state.push(element.id);
+      }
+    });
     this.getList();
     this.getProductLine();
   },
@@ -488,6 +502,11 @@ export default {
         prop: "r100ReceiveTime",
         width: 180,
       });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 120,
+      });
       tempsTabs.push({
         label: "备注",
         prop: "remark",
@@ -500,7 +519,9 @@ export default {
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
-      var parentId = param.id; //主键id
+      console.log(510)
+      console.log(param)
+      var parentId = param.assemblyID; //主键id
       this.customerInfos = [
         {
           ParentId: parentId,
@@ -525,9 +546,9 @@ export default {
       this.listLoading = true;
       this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
       this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listExportQuery));
+      console.log(JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
+        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
         .then((res) => {
           let filename = res.item;
           this.$axios
@@ -563,19 +584,23 @@ export default {
       //this.$refs[refName].resetFields();
       this.listQuery.billType = "";
       this.listQuery.productLine = "";
-      this.listQuery.version = "";
+      this.listQuery.Version = "";
+      this.listQuery.serialNumBegin = "";
+      this.listQuery.serialNumEnd = "";
       this.listQuery.HostSNBegin = "";
       this.listQuery.HostSNEnd = "";
       this.listQuery.KNRBegin = "";
       this.listQuery.KNREnd = "";
       this.listQuery.VINBegin = "";
       this.listQuery.VINEnd = "";
-      this.listQuery.OnlineTimeValue = "";
+      this.listQuery.OnlineTimeValue = [];
       this.listQuery.OnlineTimeBegin = "";
       this.listQuery.OnlineTimeEnd = "";
-      this.listQuery.ReceiveTimeValue = "";
+      this.listQuery.ReceiveTimeValue = [];
       this.listQuery.ReceiveTimeBegin = "";
       this.listQuery.ReceiveTimeEnd = "";
+      this.listQuery.state = [];
+      this.listQuery.billStatus = "";
       this.handleQuery();
       this.getProductLine();
     },
@@ -647,6 +672,20 @@ export default {
     getList() {
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 10;
+      if(this.listQuery.OnlineTimeValue!== undefined)
+      {
+        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
+        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
+      }
+      if(this.listQuery.ReceiveTimeValue!== undefined)
+      {
+        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
+      }
+      if(this.listQuery.state!== undefined)
+      {
+        this.listQuery.billStatus = this.listQuery.state[0];
+      }
       this.$axios
         .gets("/api/newjit/bill-m100/list", this.listQuery)
         .then((response) => {
@@ -759,6 +798,19 @@ export default {
       this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
       //console.log(this.PLList)
     },
+    /*单据状态变更 */
+    checkedListChange(index)
+    {
+      if(this.listQuery.state.length <= 1)
+      {
+        this.listQuery.state.push(this.billState[index].id);
+      }
+      else
+      {
+        this.listQuery.state = [];
+        this.listQuery.state.push(this.billState[index].id);
+      }
+    },
   },
 };
 </script>
diff --git a/vue/src/views/pg-fis/basedate/productLine/index.vue b/vue/src/views/pg-fis/basedate/productLine/index.vue
index 3d824d00..b30113d7 100644
--- a/vue/src/views/pg-fis/basedate/productLine/index.vue
+++ b/vue/src/views/pg-fis/basedate/productLine/index.vue
@@ -394,9 +394,9 @@ export default {
         version: "",
         customerCode: "",
         //userId: "00000000-0000-0000-0000-000000000000",
-        userName:"",//用户名称
-        name:"",//真实姓名
-        productLineCode:"",//生产线
+        userName:undefined,//用户名称
+        name:undefined,//真实姓名
+        productLineCode:undefined,//生产线
       },
       listExportQuery: {
         Filters: [
diff --git a/vue/src/views/pg-fis/basedate/r100Online/detail.vue b/vue/src/views/pg-fis/basedate/r100Online/detail.vue
new file mode 100644
index 00000000..25108fdd
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/r100Online/detail.vue
@@ -0,0 +1,354 @@
+<!--M100上线信息-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="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"
+      :row-key="getRowKeys"
+      :expand-row-keys="expands"
+      @expand-change="exChange"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <!-- <el-table-column
+        prop="总成名称"
+        label="erpAssemblyName"
+        sortable
+        width="180"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="erpAssemblyVersion"
+        label="总成版本号"
+        sortable
+        width="180"
+      >
+              style="width: calc(100% - 47px)"
+            class="two-list"
+      </el-table-column> -->
+
+      <el-table-column type="expand" prop="details">
+        <template slot-scope="scope">
+          <el-table :data="scope.row.details">
+            <el-table-column
+              prop="partCode"
+              label="客户零件代码"
+            ></el-table-column>
+            <el-table-column
+              prop="partNum"
+              label="客户零件数量"
+            ></el-table-column>
+            <el-table-column prop="description" label="描述"></el-table-column>
+            <el-table-column prop="isKey" label="是否Key件">
+              <template slot-scope="scope">
+                <span v-if="scope.row.isKey == true">
+                  <span style="color: #00b46d">是</span>
+                </span>
+                <span v-else>
+                  <span style="color: #d75c89">否</span>
+                </span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </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-column
+        prop="erpAssemblyVersion"
+        label="总成版本号"
+        sortable
+        width="360"
+      >
+      </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"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+import Detail from "./detail";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockFisDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      expands: [], //只展开一行放入当前行id
+      getRowKeys: (row) => {
+        return row.id; //这里看这一行中需要根据哪个属性值是id
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        id: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "总成编号",
+        prop: "erpAssemblyCode",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "总成名称",
+        prop: "erpAssemblyName",
+        width: 160,
+      });
+      // tempsTabs.push({
+      //   label: "总成版本号",
+      //   prop: "erpAssemblyName",
+      //   width: 160,
+      // });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    exChange(row, rowList) {
+      this.loading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList() {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
+        .then((response) => {
+          this.list = response;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "partCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        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 "../../../ux/styles/crmtable.scss";
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue
index 0fe9f3c3..f107c337 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@@ -39,7 +39,7 @@
             v-for="item in PLChildList"
             :key="item.id"
             :label="item.productLineName"
-            :value="item.id"/>
+            :value="item.productLineCode"/>
           </el-select>
         </el-form-item>
 
@@ -98,7 +98,7 @@
         </el-form-item>
       <!-- </el-row> -->
       <!-- <el-row> -->
-        <el-form-item label="底盘号:" prop="VINBegin">
+        <!-- <el-form-item label="底盘号:" prop="VINBegin">
           <el-input
             v-model="listQuery.VINBegin"
             placeholder=""
@@ -117,11 +117,11 @@
             style="width: 240px"
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="上线日期">
           <el-date-picker
-            v-model="listQuery.OnlineTimeVale"
+            v-model="listQuery.OnlineTimeValue"
             size="small"
             style="width: 380px"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -135,7 +135,7 @@
       <!-- <el-row> -->
         <el-form-item label="接收日期">
           <el-date-picker
-            v-model="listQuery.ReceiveTimeVale"
+            v-model="listQuery.ReceiveTimeValue"
             size="small"
             style="width: 380px"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -147,7 +147,7 @@
         </el-form-item>
         <el-form-item label="单据状态" prop="State">
           <el-checkbox-group  v-model="listQuery.state" >
-            <el-checkbox v-for="item in billState" :key="item.id" :label="item.id">
+            <el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id"  @change="checkedListChange(index)">
               {{ item.name }}
             </el-checkbox>
           </el-checkbox-group>
@@ -210,9 +210,9 @@
         @row-click="handleRowClick"
       >
         
-        <!-- <el-table-column
-          label="底盘号"
-          prop="vin "
+        <el-table-column
+          label="KNR"
+          prop="knr "
           sortable="custom"
           align="center"
           
@@ -220,10 +220,10 @@
         >
           <template slot-scope="scope">
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-              scope.row.vin
+              scope.row.knr
             }}</span>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column
           v-for="(item, index) in getDefaultField"
           :key="index"
@@ -260,6 +260,12 @@
         :visible.sync="drawer"
         :before-close="handleDrawerClose"
       >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
       </el-drawer>
     </div>
   </div>
@@ -272,6 +278,7 @@ import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
 import moment from "moment";
+import Detail from "./detail.vue";
 import { downloadFile } from "@/utils/crmindex.js";
 
 //组件计量单位
@@ -289,7 +296,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 
 export default {
   name: "M100Online",
-  components: { Pagination, CRMTableHead, importExcel },
+  components: { Pagination, CRMTableHead, importExcel , Detail},
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -347,19 +354,20 @@ export default {
         MaxResultCount: 15,
         productType: 1,
         ProductLine: undefined,
-        version:undefined,
+        Version:undefined,
         HostSNBegin:undefined,
         HostSNBegin:undefined,
         KNRBegin:undefined,
         KNREnd:undefined,
-        VINBegin:undefined,
+        //VINBegin:undefined,
         VINEnd:undefined,
-        OnlineTimeValue:undefined,
+        OnlineTimeValue:[],
         OnlineTimeBegin:undefined,
         OnlineTimeEnd:undefined,
-        ReceiveTimeValue:undefined,
+        ReceiveTimeValue:[],
         ReceiveTimeBegin:undefined,
         ReceiveTimeEnd:undefined,
+        billStatus:undefined,
         state:[],
 
       },
@@ -402,6 +410,12 @@ export default {
     });
   },
   created() {
+    this.billState.forEach((element,index) => {
+      if(index === 0)
+      {
+        this.listQuery.state.push(element.id);
+      }
+    });
     this.getList();
     this.getProductLine();
   },
@@ -415,11 +429,11 @@ export default {
       //   prop: "vin",
       //   width: 130,
       // });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 150,
-      });
+      // tempsTabs.push({
+      //   label: "KNR",
+      //   prop: "knr",
+      //   width: 150,
+      // });
       tempsTabs.push({
         label: "单据状态",
         prop: "billState",
@@ -455,6 +469,11 @@ export default {
         prop: "erpAssemblyName",
         width: 180,
       });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 120,
+      });
       tempsTabs.push({
         label: "备注",
         prop: "remark",
@@ -467,7 +486,7 @@ export default {
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
-      var parentId = param.id; //主键id
+      var parentId = param.assemblyID; //主键id
       this.customerInfos = [
         {
           ParentId: parentId,
@@ -482,9 +501,9 @@ export default {
       this.listLoading = true;
       this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
       this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listExportQuery));
+      console.log(JSON.stringify(this.listQuery));
       this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
+        .posts("/api/newjit/bill-r100/export", this.listQuery)
         .then((res) => {
           let filename = res.item;
           this.$axios
@@ -520,19 +539,21 @@ export default {
       //this.$refs[refName].resetFields();
       this.listQuery.billType = "";
       this.listQuery.productLine = "";
-      this.listQuery.version = "";
+      this.listQuery.Version = "";
       this.listQuery.HostSNBegin = "";
       this.listQuery.HostSNEnd = "";
       this.listQuery.KNRBegin = "";
       this.listQuery.KNREnd = "";
-      this.listQuery.VINBegin = "";
+      //this.listQuery.VINBegin = "";
       this.listQuery.VINEnd = "";
-      this.listQuery.OnlineTimeValue = "";
+      this.listQuery.OnlineTimeValue = [];
       this.listQuery.OnlineTimeBegin = "";
       this.listQuery.OnlineTimeEnd = "";
-      this.listQuery.ReceiveTimeValue = "";
+      this.listQuery.ReceiveTimeValue = [];
       this.listQuery.ReceiveTimeBegin = "";
       this.listQuery.ReceiveTimeEnd = "";
+      this.listQuery.state = [];
+      this.listQuery.billStatus = "";
       this.handleQuery();
       this.getProductLine();
     },
@@ -604,8 +625,22 @@ export default {
     getList() {
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 10;
+      if(this.listQuery.OnlineTimeValue!== undefined)
+      {
+        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
+        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
+      }
+      if(this.listQuery.ReceiveTimeValue!== undefined)
+      {
+        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
+      }
+      if(this.listQuery.state!== undefined)
+      {
+        this.listQuery.billStatus = this.listQuery.state[0];
+      }
       this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQuery)
+        .gets("/api/newjit/bill-r100/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -714,6 +749,19 @@ export default {
       this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
       //console.log(this.PLList)
     },
+    /*单据状态变更 */
+    checkedListChange(index)
+    {
+      if(this.listQuery.state.length <= 1)
+      {
+        this.listQuery.state.push(this.billState[index].id);
+      }
+      else
+      {
+        this.listQuery.state = [];
+        this.listQuery.state.push(this.billState[index].id);
+      }
+    },
   },
 };
 </script>
diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
new file mode 100644
index 00000000..e5bc3487
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
@@ -0,0 +1,270 @@
+<!--未知总成-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="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="partCode "
+        sortable="custom"
+        align="center"
+        width="220px"
+      >
+        <template slot-scope="scope">
+            <span>{{ scope.row.partCode }}</span>
+        </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"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+import Detail from "./detail";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockFisDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        id: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 260,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 190;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      //tempsTabs.push({ label: "客户零件代码", prop: "partCode ", width: 120 });
+      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 95 });
+      tempsTabs.push({ label: "描述", prop: "description", width: 280 });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    // fieldFormatter(row, column) {
+    //   return row[column.property] || "--";
+    // },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList() {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      this.$axios
+        .gets("/api/newjit/unknown-assembly/" + this.customerInfo.parentId)
+        .then((response) => {
+          this.list = response.item.unknownAssemblyParts;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "partCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      return { textAlign: "left" };
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      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;
+}
diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
new file mode 100644
index 00000000..79970df8
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
@@ -0,0 +1,1491 @@
+<!--未知总成管理页-->
+<template>
+  <div class="cr-body-content">
+    <flexbox class="content-header">
+      <el-form
+        :model="listQuery"
+        ref="queryForm"
+        v-show="showSearch"
+        :inline="true"
+      >
+        <el-form-item label="KNR" prop="KNR">
+          <el-input
+            v-model="listQuery.KNR"
+            placeholder="请输入KNR号"
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="底盘号" prop="VIN">
+          <el-input
+            v-model="listQuery.VIN"
+            placeholder="请输入底盘号"
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="车型代码" prop="VehicleModelCode">
+          <el-input
+            v-model="listQuery.VehicleModelCode"
+            placeholder="请输入车型代码"
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="版本" prop="Version">
+          <el-input
+            v-model="listQuery.Version"
+            placeholder="请输入版本"
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="上线日期">
+          <el-date-picker
+            v-model="OnlineTimeVale"
+            size="small"
+            style="width: 380px"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="handleUpdate()"
+            >重新解析(批量操作)
+          </el-button>
+        </el-form-item>
+        
+        <el-form-item>
+          <el-button
+            class="addAssy"
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="handleCreate"
+            >添加总成
+          </el-button>
+        </el-form-item>
+
+        <el-form-item label="扫描点" prop="ScanPoint">
+          <el-input
+            v-model="listQuery.ScanPoint"
+            placeholder="请输入扫描点"
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleFilter"
+            >搜索</el-button
+          >
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="resetQuery('queryForm')"
+            >重置</el-button
+          >
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            style="margin-left: 15px"
+            @click="handleDownload()"
+            >导出(Excel)
+          </el-button>
+
+          <el-button
+            class="filter-item"
+            plain
+            size="mini"
+            type="success"
+            icon="el-icon-check"
+            @click="handleUpdateAll()"
+            >重新解析(执行全部)
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </flexbox>
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="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
+        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="vin"
+          sortable
+          align="center"
+          fixed
+          width="180px"
+        >
+          <template slot-scope="scope">
+              <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+                scope.row.vin
+              }}</span>
+          </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
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="操作" align="center" width="128px">
+          <template slot-scope="{ row }">
+            <el-button
+              type="primary"
+              size="mini"
+              @click="handleUpdate(row)"
+              icon="el-icon-edit"
+            />
+          </template>
+        </el-table-column> -->
+      </el-table>
+    </div>
+
+    <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"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+      
+      <!--添加总成-->
+      <el-dialog
+        :visible.sync="dialogFormVisible"
+        :close-on-click-modal="false"
+        :title="formTitle"
+        append-to-body
+        width="1000px"
+      >
+        <div style="width:980px;height:600px">
+          <el-row>
+            <el-col :span="8">
+              <div style="border:1px;width:280px">
+                <el-row>
+                  <div class="app">
+                      <!-- handleCurrentChange -->
+                    <el-table border style="margin:0px;width:280px;" height="260px" ref="asTable" :data="erpAssemblyCfgList" highlight-current-row @row-click="rowClickass" @select="selectAss">
+                        <el-table-column type="selection" width="40px"></el-table-column>
+                        <el-table-column prop="erpAssemblyCode" label="总成编号" align="center" width="178px"></el-table-column>
+                        <!-- 添加删除按钮 -->
+                        <el-table-column align="center" width="61px">
+                          <!-- type="button" :render-header="renderHeader" -->
+                          <!-- <template slot="header" slot-scope="scope">
+                            <el-button @click="addzc(scope.$index,scope.row)" icon="el-icon-plus">
+                            </el-button>
+                          </template> -->
+                          <template slot-scope="scope">
+                            <el-button @click="delzc(scope.$index,scope.row)" icon="el-icon-minus" size="mini" align="left">
+                            </el-button>
+                          </template>
+                        </el-table-column>
+                    </el-table>
+                  </div>
+                </el-row>
+                <el-row>
+                  <div style="width:280px;border:1px" >
+                    <el-divider content-position="center">添加Erp总成</el-divider>
+                    <el-form style="border:1px" :label-position="labelPosition" label-width="100px" :model="assly" ref="assly" border>
+                      <el-form-item label="Erp总成编码" style="height:40px;width:280px">
+                        <el-input v-model="assly.erpAssemblyCode" clearable placeholder="请输入Erp总成编码"></el-input>
+                      </el-form-item>
+                      <el-form-item label="Erp总成名称" style="height:40px;width:280px">
+                        <el-input v-model="assly.erpAssemblyName" clearable placeholder="请输入Erp总成名称"></el-input>
+                      </el-form-item>
+                      <el-form-item label="车型" style="height:40px;">
+                        <!-- <el-input v-model="assly.carModel" clearable></el-input> -->
+                        <el-select v-model="assly.carModel" clearable placeholder="请选择车型">
+                          <el-option
+                            v-for="item in vehicleModelList"
+                            :key="item.id"
+                            :label="item.dicItemName"
+                            :value="item.dicItemCode"/>
+                        </el-select>
+                      </el-form-item>
+                      <el-form-item>
+                        <el-button type="primary" @click="submitAssyForm('assly')">添加</el-button>
+                      </el-form-item>
+                    </el-form>
+                  </div>
+                </el-row>
+              </div>
+            </el-col>
+            <el-col :span="7">
+              <div style="border:1px;height:570px;width:270px">
+                <el-table :data="tempdetails" ref="leftTable" height="550" stripe border highlight-current-row @row-click="rowClickLeft" @select="selectLeft">
+                  <el-table-column type="selection" width="40px"></el-table-column>
+                  <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
+                  <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
+                </el-table>
+              </div>
+            </el-col>
+            <el-col :span="2">
+              <!-- 左右穿梭按钮 -->
+              <div align="center" style="height:570px;width:70px">
+                <el-row style="line-height: 300px;">
+                  <el-button @click="btnleftclick()" icon="el-icon-caret-left"></el-button>
+                </el-row>
+                <el-row>
+                  <el-button @click="btnrightclick()" icon="el-icon-caret-right"></el-button>
+                </el-row>
+              </div>
+            </el-col>
+            <el-col :span="7">
+              <div style="border:1px;height:570px;width:270px">
+                <el-table :data="data2" ref="rightTable" height="550" stripe border highlight-current-row @row-click="rowClickRight" @select="selectRight">
+                  <el-table-column type="selection" width="40px"></el-table-column>
+                  <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
+                  <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
+                </el-table>
+              </div>
+            </el-col>
+                <!-- <el-table-transfer
+                    leftTitle="结算件"
+                    rightTitle="未知总成"
+                    :columns='columns'
+                    :dataLeft="data1"
+                    :dataRight="data2"
+                >
+                    <template v-slot:default="{scope}">
+                        <div>
+                          {{scope.row[scope.col.value]}}
+                        </div>
+                    </template>
+                </el-table-transfer> -->
+                <!-- 可以使用插槽获取到列信息和行信息，从而进行数据的处理 -->
+              <!-- <el-col :span="17"></el-col> -->
+          </el-row>
+          
+          <div slot="footer" class="dialog-footer" align="right" style="width:950px">
+            <el-button v-loading="formLoading" type="primary" @click="save">确认</el-button>
+          </div>
+        </div>
+        
+      </el-dialog>
+
+      <!-- 移动数量窗体 -->
+      <el-dialog 
+        :visible.sync="dialogNumVisible"
+        :close-on-click-modal="false"
+        :title="numTitle"
+        append-to-body
+        width="570px"
+      >
+        <div>
+          <el-form :model="numFormData" ref="numFormData" label-width="100px" class="num-ruleForm">
+            <el-form-item
+              label="数量"
+              prop="num"
+              :rules="[
+                { required: true, message: '数量不能为空且至少为1'},
+              ]"
+            >
+              <el-input type="text" v-model="numFormData.num"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button v-loading="formLoading" type="primary" @click="saveNum()">确认</el-button>
+          <el-button type="text" @click="dialogNumVisible = false">取消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import moment from "moment";
+import Detail from "./detail.vue";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "UnknownAssembly",
+  components: { Pagination, CRMTableHead, importExcel, Detail},
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      crmType: "bomdatabase",
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      valueSelect: "",
+      OnlineTimeVale: [],//上线时间
+      customerInfos: [],
+      dialogOptions: [],
+      versionValue: "",
+      asTemp:[],//总成编号点击缓存
+      rightRowTemp: [],//右侧移动点击缓存
+      leftRowTemp: [],//左侧移动点击缓存
+      selectioned:'',//单选中的值
+      carModels:[],//车型下拉框数据源
+      currentRow: "",
+      versionList: [], //版本列表
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        OnlineTimeBegin: undefined,
+        OnlineTimeEnd: undefined,
+        KNR: undefined,
+        VIN: undefined,
+        ScanPoint: undefined,
+      },
+      listUnknownAssemblyQuery: {
+        billId:'',
+        //apply:"",
+        vin:'',
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      bomUnit,
+      multipleSelection: [],
+      drawer: false,
+      dialogFormVisible: false,
+      dialogNumVisible: false,
+      formTitle: "",
+      numTitle: "",
+      isEdit: false,
+      formLoading: false,
+      //dialogFormVisible: false,
+      tableHeight: document.documentElement.clientHeight - 220,
+      //columns: [
+      //          {name: '结算件代码', value: 'partCode', width: '180px'},
+      //          {name: '数量', value: 'partNum',},
+      //      ],
+      // data1: [
+      // ],
+      
+      numFormData:{
+        num: 1
+      },
+      zcCode:[],
+      /*最终提交缓存*/
+      tempAssCfgList: [
+      ],
+      /*右侧数据源*/
+      data2: [],
+      /*中间数据源*/
+      tempdetails:[
+            //{
+              // partCode: "1",
+              // partNum: 0,
+              // isKey: true
+            //}
+      ],
+      /*左侧总成数据源*/
+      erpAssemblyCfgList: [],
+        // {
+        //   erpAssemblyCode: "string",
+        //   erpAssemblyName: "string",
+        //   isCover: true,
+        //   carModel: "",
+        //   previousVersionId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        //   details: [
+        //     {
+        //       partCode: "string",
+        //       partNum: 0,
+        //       description: "string",
+        //       isKey: true
+        //     }
+        //   ]
+        // }
+      labelPosition: 'left',
+      assly: {
+        erpAssemblyCode: '',
+        erpAssemblyName: '',
+        carModel: ''
+      },
+      vehicleModelQuery:{
+        dicTypeName:"派格车型",
+      },
+      vehicleModelList:[],//车型list
+      };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 220;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "大众顺序号",
+        prop: "hostSN",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "上线时间",
+        prop: "onlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "扫描点",
+        prop: "scanPoint",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "车型名称",
+        prop: "vehicleModelName",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({ label: "客户零件数量", prop: "partNum", width: 135 });
+      tempsTabs.push({
+        label: "文件名",
+        prop: "fileName",
+        width: 180,
+      });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    handleUpdateAll() {
+      var params = {
+        isSelectAll: true,
+        unknownAssemblyIdList: [],
+      };
+      this.$confirm("是否要全部进行解析?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/newjit/unknown-assembly/to-parse", params)
+            .then((response) => {
+              if (response.status == true) {
+                this.$notify({
+                  title: "成功",
+                  message: "操作成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
+              } else {
+                this.$message({
+                  type: "warning",
+                  message: response.message,
+                });
+              }
+            });
+        })
+        .catch(() => {});
+    },
+    /** 重新计算总成 */
+    handleUpdate(row) {
+      if (this.multipleSelection.length == 0) {
+        this.$message({
+          message: "必须选择一行",
+          type: "warning",
+        });
+        return;
+      } else {
+        //批量操作
+        var params = {
+          isSelectAll: false,
+          unknownAssemblyIdList: [],
+        };
+        if (row) {
+          //单行
+          params.unknownAssemblyIdList.push(row.id);
+        } else {
+          //多选
+          this.multipleSelection.forEach((element) => {
+            let id = element.id;
+            params.unknownAssemblyIdList.push(id);
+          });
+        }
+        console.log("未知总成详表条件：" + JSON.stringify(params));
+        this.$axios
+          .posts("/api/newjit/unknown-assembly/to-parse", params)
+          .then((response) => {
+            if (response.status == true) {
+              this.$notify({
+                title: "成功",
+                message: "操作成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            } else {
+              this.$message({
+                type: "warning",
+                message: response.message,
+              });
+            }
+          });
+      }
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/newjit/unknown-assembly/" + id)
+        .then((response) => {
+          this.form = response.item;
+        });
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      this.$axios
+        .gets("/api/newjit/unknown-assembly/export", this.listQuery)
+        .then((res) => {
+          let filename = res;
+          this.$axios
+            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
+            .then((response) => {
+              if (filename.indexOf("_") != -1) {
+                let downName =
+                  filename.slice(0, filename.lastIndexOf("_")) +
+                  filename.slice(filename.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, filename);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.OnlineTimeVale = [];
+      this.$refs[refName].resetFields();
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.listQuery.SkipCount = 1;
+      this.getList();
+    },
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      //this.getList();
+    },
+    /* 主页面添加总成按钮事件 */
+    handleCreate() {
+      // this.$nextTick(() => {
+      //   this.$refs["formCount"].resetFields();
+      // });
+      if (this.multipleSelection.length !== 1) {
+        this.$message({
+          message: "必须选择一行",
+          type: "warning",
+        });
+        return;
+      } else {
+        console.log(this.multipleSelection[0].id);
+        console.log(this.multipleSelection[0].vin);
+        this.formTitle = "添加总成";
+        this.isEdit = false;
+        this.form = {};
+        this.getUnknownAssemblyList();
+        this.getZcCode();
+        this.getvehicleModel();
+        this.dialogFormVisible = true;
+      }
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "billStatus") {
+        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
+      }
+      if (column.property == "onlineTime" || column.property == "receiveTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList() {
+      this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (this.OnlineTimeVale != []) {
+        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0]//this.OnlineTimeVale
+          // ? this.OnlineTimeVale[0] || ""
+          // : "";
+        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1]//this.OnlineTimeVale
+          // ? this.OnlineTimeVale[1] || ""
+          // : "";
+      }
+      this.$axios
+        .gets("/api/newjit/unknown-assembly/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        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);
+    },
+    /* 获取车型数据源 */
+    getCarModel(){
+      this.$axios
+        .gets("/api/newjit/dic/list"+"?dicTypeName=车型")
+        .then((response) => {
+          console.log("this is response.items",response.item);
+          this.carModels = response.item;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+        //console.log("this is carModels",this.carModels);
+    },
+    /* 加号按钮添加事件 */
+    addzc()
+    {
+      //todo 添加总成左侧的 加号按钮 待做
+      alert("1")
+    },
+    /* 减号按钮删除事件 */
+    delzc(index)
+    {
+      this.erpAssemblyCfgList.splice(index, 1);
+      console.log(this.erpAssemblyCfgList);
+    },
+    /* 添加总成最终提交的数据事件*/
+    save() {
+      //if(this.data2.length ===0){
+        var lastSubmit = {
+            billId:this.listUnknownAssemblyQuery.billId,
+            scanPoint: "M100",
+            erpAssemblyCfgList:[]
+        };
+        lastSubmit.erpAssemblyCfgList = this.tempAssCfgList;
+
+        // var lastSubmitt = [];
+        // console.log("flag")
+        // this.tempAssCfgList.forEach(element => {
+        //   element.details.forEach(element1 => {
+        //     lastSubmitt.push({
+        //       erpAssemblyCode: element.erpAssemblyCode,
+        //       erpAssemblyName: element.erpAssemblyName,
+        //       isCover: false,
+        //       previousVersionId:"f7d45dba-3164-4a91-b477-3c568c81e6a0",
+        //       vehicleModel: element.vehicleModel,
+        //       details:{
+        //         partCode:element1.partCode,
+        //         partNum:element1.partNum,
+        //         description:element1.description,
+        //         isKey: true,
+        //       }
+        //     })
+        //   });
+        // });
+        // console.log("this is lastSubmitt:",lastSubmitt)
+        // var lastSubmit = [];
+        // lastSubmitt.forEach(element => {
+        //   lastSubmit.push({
+        //     billID:this.listUnknownAssemblyQuery.billId,
+        //     scanPoint: "M100",
+        //     erpAssemblyCfgList:[{
+        //       erpAssemblyCode: element.erpAssemblyCode,
+        //       erpAssemblyName: element.erpAssemblyName,
+        //       isCover: false,
+        //       previousVersionId: null,
+        //       vehicleModel: element.vehicleModel,
+        //       details:element.details
+        //     }]
+        //   })
+        // });
+        // console.log("this is lastSubmit:",lastSubmit)
+
+        this.$axios
+          .posts(
+            "/api/newjit/unknown-assembly/add-assembly",
+            lastSubmit
+          )
+          .then((response) => {
+            if(response.status === true){
+              this.$notify({
+                    title: "成功",
+                    message: "数据导入成功！",
+                    type: "success",
+                    duration: 2000,
+                  });
+            }
+          })
+          .catch(() => {
+            //this.listLoading = false;
+          });
+
+        this.leftRowTemp = [];
+        this.rightRowTemp = [];
+        this.tempAssCfgList = [];
+        this.tempdetails = [];
+        this.erpAssemblyCfgList =[];
+        this.asTemp = [];
+        this.dialogFormVisible = false;
+      // }
+      // else{
+      //   alert("未知零件未分配完，请确认！")
+      // }
+    },
+    /* 获取未知总成零件数据源 */
+    getUnknownAssemblyList(){
+      this.listUnknownAssemblyQuery.billId=this.multipleSelection[0].id;
+      //console.log(this.listUnknownAssemblyQuery);
+      this.$axios
+          .gets(
+            "/api/newjit/unknown-assembly/"+this.listUnknownAssemblyQuery.billId
+          ).then((response) => {
+          this.data2 = response.item.unknownAssemblyParts;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        })
+    },
+    /* 获取总成零件数据源*/
+    getZcCode(){
+      this.zcCode = [];
+      this.listUnknownAssemblyQuery.vin=this.multipleSelection[0].vin;
+      //console.log(this.listUnknownAssemblyQuery.vin);
+      this.$axios
+        .gets(
+          "/api/newjit/unknown-assembly/get-erp-assembly-code"+"?vin="+this.listUnknownAssemblyQuery.vin
+        ).then((response) => {
+          console.log(response.item);
+          if(response.item.length !== 0){
+            console.log("has no ASSCode");
+          }
+          else{
+            response.item.forEach((zccode) => {
+              this.erpAssemblyCfgList.push({
+                erpAssemblyCode: zccode,
+                erpAssemblyName: [],
+                isCover: false,
+                carModel: "",
+                previousVersionId: null,
+                details: [
+                  {
+                    partCode: "",
+                    partNum: 0,
+                    description: "",
+                    isKey: false
+                  }
+                ]
+              })
+            });
+          }
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+    },
+    /* 添加总成提交方法 */
+    submitAssyForm(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            if(this.assly.erpAssemblyCode !== ""){
+              this.erpAssemblyCfgList.push({
+                erpAssemblyCode: this.assly.erpAssemblyCode,
+                erpAssemblyName: this.assly.erpAssemblyName,
+                carModel: this.assly.carModel,
+                isCover: false,
+                previousVersionId: null,
+                details: []
+              })
+              console.log(this.erpAssemblyCfgList);
+              this.assly.erpAssemblyCode = '';
+              this.assly.erpAssemblyName = '';
+              this.assly.carModel = '';
+            }
+            else{
+              alert("请先填写Erp总成信息！")
+            }
+          } 
+          else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+    btnleftclick(){
+      if(this.asTemp.length === 0){
+        alert("请先选择总成编号！")
+      }
+      else{
+        if(this.rightRowTemp.length === 0){
+          alert("请先选择需移动的零件")
+        }
+        else if(this.rightRowTemp.length !== 0 && parseInt(this.rightRowTemp[0].partNum) !== 1){
+          this.numFormData.num = parseInt(this.rightRowTemp[0].partNum);
+          this.dialogNumVisible = true;
+          this.numTitle = "输入移动结算件数量"
+        }
+        else{
+          console.log("R->F");
+            this.numFormData.num = 1;
+            if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
+
+              //数据插入最终缓存
+              if(this.tempAssCfgList.length !== 0){
+                console.log("second")
+                var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
+                if(rfMove.length !== 0){
+                  var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
+                  if(sameDetail.length !== 0){
+                    sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
+                  }
+                  else{
+                    rfMove[0].details.push({
+                      description: this.rightRowTemp[0].description,
+                      isKey: false,
+                      partCode: this.rightRowTemp[0].partCode,
+                      partNum: this.numFormData.num,//移动框输入的数量
+                    })
+                  }
+                }
+                else{
+                  console.log("加进去了")
+                  this.tempAssCfgList.push({
+                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
+                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
+                  isCover: false,
+                  previousVersionId: this.asTemp[0].previousVersionId,
+                  vehicleModel: this.asTemp[0].carModel,
+                  details:[{
+                    description: this.rightRowTemp[0].description,
+                    isKey: false,
+                    partCode: this.rightRowTemp[0].partCode,
+                    partNum: this.numFormData.num,//移动框输入的数量
+                  }]
+                })
+                }
+              }
+              else{
+                console.log("first")
+                this.tempAssCfgList.push({
+                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
+                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
+                  isCover: false,
+                  previousVersionId: this.asTemp[0].previousVersionId,
+                  details:[{
+                    description: this.rightRowTemp[0].description,
+                    isKey: false,
+                    partCode: this.rightRowTemp[0].partCode,
+                    partNum: this.numFormData.num,//移动框输入的数量
+                  }]
+                })
+              }
+
+              console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
+              //数据插入中间数据源
+              var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
+              if(judge.length === 1){
+                var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
+                this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
+              }
+              else{
+                this.tempdetails.push({
+                  description: this.rightRowTemp[0].description,
+                  isKey: false,
+                  partCode: this.rightRowTemp[0].partCode,
+                  partNum: parseInt(this.numFormData.num),//移动框输入的数量
+                })
+              }
+              /* 右侧数据移动 */
+              var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
+              var n1 = parseInt(this.numFormData.num);
+              var n2 = parseInt(delid.partNum);
+              if(n1 === n2){
+                this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
+                this.rightRowTemp = [];
+              }
+              else{
+                this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum =  delid.partNum - this.numFormData.num;
+                this.rightRowTemp[0].partNum = n2 - n1;
+              }
+            }
+        }
+      }
+    },
+    btnrightclick(){
+      if(this.asTemp.length === 0){
+        alert("请先选择总成编号！")
+      }
+      else{
+        if(this.leftRowTemp.length === 0){
+        alert("请先选择需移动的零件")
+        }
+        else if(this.leftRowTemp.length !== 0 && parseInt(this.leftRowTemp[0].partNum) !== 1){
+          this.numFormData.num = parseInt(this.leftRowTempnpm[0].partNum);
+          this.dialogNumVisible = true;
+          this.numTitle = "输入移动结算件数量"
+        }
+        else{
+          console.log("F->R");
+          this.numFormData.num = 1;
+            if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
+              
+              //数据插入最终缓存
+              console.log("移除或删除")
+              var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
+              var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
+              if(samedetail.length !== 0){
+                if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
+                  frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
+                }
+                else{
+                  samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
+                }
+              }
+              else if(samedetail.length !== 0){
+                alert("没有数据!");
+              }
+
+              console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
+              
+              //数据插入右侧数据源
+              var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
+              if(judge.length === 1){
+                var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
+                this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
+              }
+              else{
+                  this.data2.push({
+                    description: this.leftRowTemp[0].description,
+                    isKey: false,
+                    partCode: this.leftRowTemp[0].partCode,
+                    partNum: parseInt(this.numFormData.num),//移动框输入的数量
+                })
+              }
+              /* 中间数据移动 */
+              var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
+              var n1 = parseInt(this.numFormData.num);
+              var n2 = parseInt(delid.partNum);
+              if(n1 === n2){
+                this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
+                this.leftRowTemp = [];
+              }
+              else{
+                this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
+                this.leftRowTemp[0].partNum = n2 - n1;
+              }
+            }
+        }
+      }
+    },
+    /* 保存数量事件 */
+    saveNum(){
+      if(this.asTemp.length !== 0){
+        //判断中间选中移动还是右侧选中移动
+        /*   左侧移动到右侧   */
+        if(this.leftRowTemp.length !== 0){
+          console.log("F->R");
+          if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
+            
+            //数据插入最终缓存
+            console.log("移除或删除")
+            var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
+            var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
+            if(samedetail.length !== 0){
+              if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
+                frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
+              }
+              else{
+                samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
+              }
+            }
+            else if(samedetail.length !== 0){
+              alert("没有数据!");
+            }
+
+            console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
+            
+            //数据插入右侧数据源
+            var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
+            if(judge.length === 1){
+              var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
+              this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
+            }
+            else{
+                this.data2.push({
+                  description: this.leftRowTemp[0].description,
+                  isKey: false,
+                  partCode: this.leftRowTemp[0].partCode,
+                  partNum: parseInt(this.numFormData.num),//移动框输入的数量
+              })
+            }
+            /* 中间数据移动 */
+            var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
+            var n1 = parseInt(this.numFormData.num);
+            var n2 = parseInt(delid.partNum);
+            if(n1 === n2){
+              this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
+              this.leftRowTemp = [];
+            }
+            else{
+              this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
+              this.leftRowTemp[0].partNum = n2 - n1;
+            }
+          }
+          else if(this.numFormData.num == 0){
+            alert("输入数字不能为0！");
+          }
+          else{
+            alert("输入不正确,请确认！");
+          }
+        }
+        /*   右侧移动到左侧   */
+        else if(this.rightRowTemp.length !== 0){
+          console.log("R->F");
+          if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
+
+            //数据插入最终缓存
+            if(this.tempAssCfgList.length !== 0){
+              console.log("second")
+              var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
+              if(rfMove.length !== 0){
+                var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
+                if(sameDetail.length !== 0){
+                  sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
+                }
+                else{
+                  rfMove[0].details.push({
+                    description: this.rightRowTemp[0].description,
+                    isKey: false,
+                    partCode: this.rightRowTemp[0].partCode,
+                    partNum: this.numFormData.num,//移动框输入的数量
+                  })
+                }
+              }
+              else{
+                console.log("加进去了")
+                this.tempAssCfgList.push({
+                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
+                erpAssemblyName: this.asTemp[0].erpAssemblyName,
+                vehicleModel: this.asTemp[0].carModel,
+                isCover: false,
+                previousVersionId: this.asTemp[0].previousVersionId,
+                details:[{
+                  description: this.rightRowTemp[0].description,
+                  isKey: false,
+                  partCode: this.rightRowTemp[0].partCode,
+                  partNum: this.numFormData.num,//移动框输入的数量
+                }]
+              })
+              }
+            }
+            else{
+              console.log("first")
+              this.tempAssCfgList.push({
+                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
+                erpAssemblyName: this.asTemp[0].erpAssemblyName,
+                isCover: false,
+                previousVersionId: this.asTemp[0].previousVersionId,
+                vehicleModel: this.asTemp[0].carModel,
+                details:[{
+                  description: this.rightRowTemp[0].description,
+                  isKey: false,
+                  partCode: this.rightRowTemp[0].partCode,
+                  partNum: this.numFormData.num,//移动框输入的数量
+                }]
+              })
+            }
+
+            console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
+            //数据插入中间数据源
+            var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
+            if(judge.length === 1){
+              var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
+              this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
+            }
+            else{
+              this.tempdetails.push({
+                description: this.rightRowTemp[0].description,
+                isKey: false,
+                partCode: this.rightRowTemp[0].partCode,
+                partNum: parseInt(this.numFormData.num),//移动框输入的数量
+              })
+            }
+            /* 右侧数据移动 */
+            var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
+            var n1 = parseInt(this.numFormData.num);
+            var n2 = parseInt(delid.partNum);
+            if(n1 === n2){
+              this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
+              this.rightRowTemp = [];
+            }
+            else{
+              this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum =  delid.partNum - this.numFormData.num;
+              this.rightRowTemp[0].partNum = n2 - n1;
+            }
+          }
+          else if(this.numFormData.num == 0){
+            alert("输入数字不能为0！");
+          }
+          else{
+            alert("输入不正确,请确认！");
+          }
+        }
+        this.dialogNumVisible = false;
+      }
+      else{
+        alert("请先选择总成编号！")
+      }
+      this.dialogNumVisible = false;
+    },
+    /* 总成编号选中事件 */
+    rowClickass(row) {
+      this.asTemp=[];
+      this.tempdetails=[];
+      this.$refs.asTable.clearSelection();
+      this.$refs.asTable.toggleRowSelection(row);
+      this.asTemp.push(row);
+      
+      if(this.asTemp[0].details.length !== 0){
+        //选中插入中间数据源
+        this.tempdetails.push({
+          isKey: false,
+          partCode: this.asTemp[0].details[0].partCode,
+          partNum: this.asTemp[0].details[0].partNum,
+          vehicleModel:this.asTemp[0].details[0].carModel,
+        })
+      }
+      //二次选中插入最终提交中的details
+      var judgeSec = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode)
+      console.log("this is judgeSec:",judgeSec);
+      if(judgeSec.length !== 0){
+        console.log("this is judgeSec[0].details:",judgeSec[0].details);
+        judgeSec[0].details.forEach(element => {
+            this.tempdetails.push(element)
+        });
+      }
+      console.log("this is this.tempdetails",this.tempdetails);
+      console.log("this is asTemp",this.asTemp);
+    },
+    /* 总成编号复选框单选事件 */
+    selectAss(selection, row) {
+      this.asTemp=[]; //清空已选
+      this.tempdetails = [];
+      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
+      // 选择项大于1时
+      if (selection.length > 1) {
+      let del_row = selection.shift();
+      // console.log('把数组的第一个元素从其中删除后', selection);
+      this.$refs.asTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      }
+      this.asTemp.push(selection[0])
+      console.log('当用户手动勾选数据行', this.asTemp)
+
+      if(this.asTemp[0].details.length !== 0){
+        //选中插入中间数据源
+        this.tempdetails.push({
+          isKey: false,
+          partCode: this.asTemp[0].details[0].partCode,
+          partNum: this.asTemp[0].details[0].partNum,
+          vehicleModel:this.asTemp[0].details[0].carModel,
+        })
+      }
+
+      //二次选中插入最终提交中的details
+      var judgeSec = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode)
+      console.log("this is judgeSec:",judgeSec);
+      if(judgeSec.length !== 0){
+        console.log("this is judgeSec[0].details:",judgeSec[0].details);
+        judgeSec[0].details.forEach(element => {
+            this.tempdetails.push(element)
+        });
+      }
+      console.log("this is this.tempdetails",this.tempdetails);
+      console.log("this is asTemp",this.asTemp);
+    },
+    /* 右侧数据选中事件 */
+    rowClickRight(row) {
+      this.rightRowTemp = [];
+      this.$refs.rightTable.clearSelection();
+      this.$refs.rightTable.toggleRowSelection(row);
+      this.rightRowTemp.push(row);
+    },
+    /* 左侧数据选中事件 */
+    rowClickLeft(row) {
+      this.leftRowTemp = [];
+      this.$refs.leftTable.clearSelection();
+      this.$refs.leftTable.toggleRowSelection(row);
+      this.leftRowTemp.push(row);
+    },
+    /* 右侧复选框单选事件 */
+    selectRight(selection, row) {
+      this.rightRowTemp=[]; //清空已选
+      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
+      // 选择项大于1时
+      if (selection.length > 1) {
+      let del_row = selection.shift();
+      // console.log('把数组的第一个元素从其中删除后', selection);
+      this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      }
+      this.rightRowTemp.push(selection[0])
+      console.log('当用户手动勾选数据行', this.rightRowTemp)
+    },
+    /* 左侧复选框单选事件 */
+    selectLeft(selection, row) {
+      this.leftRowTemp=[]; //清空已选
+      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
+      // 选择项大于1时
+      if (selection.length > 1) {
+      let del_row = selection.shift();
+      // console.log('把数组的第一个元素从其中删除后', selection);
+      this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      }
+      this.leftRowTemp.push(selection[0])
+      console.log('当用户手动勾选数据行', this.leftRowTemp)
+    },
+    getvehicleModel()
+    {
+      this.$axios
+          .gets(
+            "/api/newjit/dic/list",this.vehicleModelQuery
+          )
+          .then((response) => {
+            //console.log(response);
+            this.vehicleModelList = response.item;
+            //console.log()
+          })
+          .catch(() => {
+          });
+    },
+  },
+};
+
+</script>
+
+<style lang="scss" scoped>
+@import "../../../ux/styles/crmtable.scss";
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
index 5e91f023..4638babd 100644
--- a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
@@ -19,9 +19,11 @@
             style="margin-right: 15px"
             @change="ptypeselectChange"
           >
-            <el-option label="0" value="0"></el-option>
-            <el-option label="1" value="1"></el-option>
-            <el-option label="2" value="2"></el-option>
+            <el-option
+                v-for="item in productTypeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id" />  
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="productLine">
@@ -34,10 +36,10 @@
             @change="valueselectChange"
           >
           <el-option
-            v-for="item in PLList"
-            :key="item.productLineCode"
+            v-for="item in PLChildList"
+            :key="item.id"
             :label="item.productLineName"
-            :value="item.productLineCode"/>
+            :value="item.id"/>
           </el-select>
         </el-form-item>
 
@@ -139,7 +141,7 @@
 
         <el-form-item label="上线日期">
           <el-date-picker
-            v-model="listQuery.OnlineTimeVale"
+            v-model="listQuery.OnlineTimeValue"
             size="small"
             style="width: 380px"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -153,7 +155,7 @@
       <!-- <el-row> -->
         <el-form-item label="接收日期">
           <el-date-picker
-            v-model="listQuery.ReceiveTimeVale"
+            v-model="listQuery.ReceiveTimeValue"
             size="small"
             style="width: 380px"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -164,8 +166,8 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="对比状态" prop="State">
-          <el-checkbox-group  v-model="listQuery.state" >
-            <el-checkbox v-for="item in billState" :key="item.id" :label="item.id">
+          <el-checkbox-group  v-model="listQuery.cstate" >
+            <el-checkbox v-for="item in compareState" :key="item.id" :label="item.id">
               {{ item.name }}
             </el-checkbox>
           </el-checkbox-group>
@@ -192,7 +194,16 @@
             size="mini"
             style="margin-left: 15px"
             @click="handleDownload()"
-            >导出焊装总成对比
+            >导出焊装总成对比(Excel)
+          </el-button>
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            style="margin-left: 15px"
+            @click="handleDownloadCSV()"
+            >导出焊装总成对比(CSV)
           </el-button>
         </el-form-item>
       <!-- </el-row> -->
@@ -328,7 +339,7 @@ export default {
           { required: true, message: "必须输入！", trigger: "blur" },
         ],
       },
-      billState:[
+      compareState:[
         {id:0,name:"有焊装无总装"},
         {id:1,name:"有焊装有总装"}
       ],
@@ -373,7 +384,9 @@ export default {
         ReceiveTimeValue:undefined,
         ReceiveTimeBegin:undefined,
         ReceiveTimeEnd:undefined,
-        state:[],
+        HasR100NotHasM100:undefined,//有焊装无总装
+        HasR100HasM100:undefined,//有焊装有总装
+        cstate:[],
 
       },
       listExportQuery: {
@@ -400,6 +413,9 @@ export default {
       tableHeight: document.documentElement.clientHeight - 335,
       detailTableHeight:250,
       details:[], //修改子表数据源
+      billStatus:[],
+      PLChildList:[],//筛选后产线下拉
+	    productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
     };
   },
   mounted() {
@@ -413,6 +429,10 @@ export default {
     });
   },
   created() {
+    this.compareState.forEach((element,index) => {
+      this.listQuery.cstate.push(element.id);
+    });
+    this.getProductLine();
     this.getList();
   },
   computed: {
@@ -514,7 +534,45 @@ export default {
       this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
       console.log(JSON.stringify(this.listExportQuery));
       this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listExportQuery)
+        .posts("/api/newjit/r100-m100-compare/export", this.listExportQuery)
+        .then((res) => {
+          let filename = res.item;
+          this.$axios
+            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
+            .then((response) => {
+              if (filename.indexOf("_") != -1) {
+                let downName =
+                  filename.slice(0, filename.lastIndexOf("_")) +
+                  filename.slice(filename.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, filename);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+      this.listLoading = false;
+    },
+    /** 导出功能 */
+    handleDownloadCSV() {
+      this.listLoading = true;
+      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+      console.log(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/newjit/r100-m100-compare/export-CSV", this.listQuery)
         .then((res) => {
           let filename = res.item;
           this.$axios
@@ -550,7 +608,9 @@ export default {
       //this.$refs[refName].resetFields();
       this.listQuery.billType = "";
       this.listQuery.productLine = "";
-      this.listQuery.version = "";
+      this.listQuery.Version = "";
+      this.listQuery.serialNumBegin = "";
+      this.listQuery.serialNumEnd = "";
       this.listQuery.HostSNBegin = "";
       this.listQuery.HostSNEnd = "";
       this.listQuery.KNRBegin = "";
@@ -563,6 +623,7 @@ export default {
       this.listQuery.ReceiveTimeValue = "";
       this.listQuery.ReceiveTimeBegin = "";
       this.listQuery.ReceiveTimeEnd = "";
+      this.listQuery.cstate = [];
       this.handleQuery();
       this.getProductLine();
     },
@@ -634,8 +695,38 @@ export default {
     getList() {
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 10;
+      if(this.listQuery.OnlineTimeValue!== undefined)
+      {
+        this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
+        this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
+      }
+      if(this.listQuery.ReceiveTimeValue!== undefined)
+      {
+        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
+      }
+      
+      this.listQuery.HasR100NotHasM100 = false;
+      this.listQuery.HasR100HasM100 = false;
+
+      if(this.listQuery.cstate!== undefined && this.listQuery.cstate.length > 0)
+      {
+      console.log(this.listQuery.cstate)
+        this.listQuery.cstate.forEach(element => {
+          console.log(element)
+          if(element === 0)
+          {
+            this.listQuery.HasR100NotHasM100 = true;
+          }
+          if(element === 1)
+          {
+            this.listQuery.HasR100HasM100 = true;
+          }
+        });
+         
+      }
       this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/list", this.listQuery)
+        .gets("/api/newjit/r100-m100-compare/list", this.listQuery)
         .then((response) => {
           this.list = response.items;
           this.totalCount = response.totalCount;
@@ -729,7 +820,7 @@ export default {
           .then((response) => {
             //console.log(response);
             this.PLList = response.item;
-            //console.log(this.PLList);
+            this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
           })
           .catch(() => {
           });
@@ -738,7 +829,8 @@ export default {
     ptypeselectChange()
     {
       //console.log(this.listQuery.productType);
-      this.PLList = this.PLList.filter(u => u.productType === this.listQuery.productType);
+      this.listQuery.productLine = "";
+      this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType));
       //console.log(this.PLList);
     },
   },