diff --git a/vue/src/router/modules/fis.js b/vue/src/router/modules/fis.js
index 10c78188..3ef5e9dd 100644
--- a/vue/src/router/modules/fis.js
+++ b/vue/src/router/modules/fis.js
@@ -38,7 +38,7 @@ const pgfis = {
         },
         {
             path: '/pg-workLine',
-            component: () => import('@/views/pg-fis/basedate/workLine'),
+            component: () => import('@/views/pg-fis/basedate/productLine'),
             name: 'pg-workLine',
             meta: {
                 title: '生产线权限',
@@ -75,6 +75,16 @@ const pgfis = {
                 roles: ['SettleAccount.Reports'],
                 icon: '客户零件'
             }
+        },
+        {
+            path: '/pg-weldingAssembly',
+            component: () => import('@/views/pg-fis/basedate/weldingAssembly'),
+            name: 'pg-weldingAssembly',//命名路由
+            meta: {
+                title: '焊装总装对比',
+                roles: ['SettleAccount.Reports'],
+                icon: '客户零件'
+            }
         }
     ]
 }
diff --git a/vue/src/views/newJit/baseData/logRemind/index.vue b/vue/src/views/newJit/baseData/logRemind/index.vue
index 6d96236a..34d45e27 100644
--- a/vue/src/views/newJit/baseData/logRemind/index.vue
+++ b/vue/src/views/newJit/baseData/logRemind/index.vue
@@ -1,6 +1,7 @@
 <!--系统日志信息页-->
 <template>
   <div class="cr-body-content">
+    <div ref="box">
     <flexbox class="content-header">
       <el-form
         :model="listQuery"
@@ -69,6 +70,7 @@
         </el-form-item>
       </el-form>
     </flexbox>
+    </div>
     <div class="l-table">
       <!--表格渲染-->
       <el-table
@@ -104,7 +106,15 @@
           <template slot="header" slot-scope="scope">
             {{ scope.column.label }}
           </template>
-        </el-table-column>
+        </el-table-column >
+        <el-table-column
+            label="操作"
+            width="150">
+            <template slot-scope="scope">
+              <el-button @click="handleEdit(scope.row)" type="primary" size="small">处理</el-button><!-- type="text" -->
+              <el-button @click="handleIgnore(scope.row)" type="primary" size="small">忽略</el-button>
+            </template>
+      </el-table-column>
       </el-table>
     </div>
 
@@ -200,6 +210,9 @@ export default {
         LogType: undefined,
         SeriousLevel: undefined,
       },
+      operationQuery:{
+        id:undefined,
+      },
       page: 1,
       // 显示搜索条件
       showSearch: true,
@@ -210,11 +223,12 @@ export default {
     };
   },
   mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
-    };
+    this.$nextTick(() => { 
+        var offsetHei = document.documentElement.clientHeight;
+        //console.log(offsetHei);
+        let boxH = this.$refs.box.offsetHeight;
+        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
+    });
   },
   created() {
     this.getList();
@@ -387,6 +401,75 @@ export default {
       this.$refs.multipleTable.clearSelection();
       this.$refs.multipleTable.toggleRowSelection(row);
     },
+    handleEdit(row)
+    {
+      this.operationQuery.id = row.id;
+      this.$axios
+        .posts("/api/newjit/log-remind/do-process", this.operationQuery)
+        .then((response) => {
+          if(response.status === "true")
+          {
+            this.$notify({
+                  title: "成功",
+                  message: "处理成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+          }
+          else
+          {
+            this.$notify({
+                  title: "失败",
+                  message: "处理失败！",
+                  type: "success",
+                  duration: 2000,
+                });
+          }
+                
+        })
+        .catch(() => {
+                this.$notify({
+                  title: "失败",
+                  message: "处理失败！",
+                  type: "warning",
+                  duration: 2000,
+                });
+        });
+    },
+    handleIgnore(row)
+    {
+      this.operationQuery.id = row.id;
+      this.$axios
+        .posts("/api/newjit/log-remind/do-ignore", this.operationQuery)
+        .then((response) => {
+          if(response.status === "true")
+          {
+            this.$notify({
+                  title: "成功",
+                  message: "忽略成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+          }
+          else
+          {
+            this.$notify({
+                  title: "失败",
+                  message: "忽略失败！",
+                  type: "success",
+                  duration: 2000,
+                });
+          }
+        })
+        .catch(() => {
+                this.$notify({
+                  title: "失败",
+                  message: "忽略失败！",
+                  type: "warning",
+                  duration: 2000,
+                });
+        });
+    }
   },
 };
 </script>
diff --git a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
index b79d5b3b..daa791cc 100644
--- a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
@@ -46,7 +46,7 @@
         </el-select>
       </el-form-item>
 
-        <el-form-item class="forimitem">
+        <el-form-item class="formitem">
           <el-button
             type="primary"
             icon="el-icon-search"
@@ -196,7 +196,7 @@
               <el-form-item label="总成编码：" required />
             </el-col>
             <el-col :span="20">
-              <el-form-item prop="erpAssemblyCode ">
+              <el-form-item prop="erpAssemblyCode">
                 <el-input
                   style="width: 400px"
                   v-model="form.erpAssemblyCode"
@@ -211,7 +211,7 @@
               <el-form-item label="总成名称：" required />
             </el-col>
             <el-col :span="20">
-              <el-form-item prop="erpAssemblyName ">
+              <el-form-item prop="erpAssemblyName">
                 <el-input
                   style="width: 400px"
                   v-model="form.erpAssemblyName"
@@ -226,7 +226,7 @@
               <el-form-item label="总成类型：" required />
             </el-col>
             <el-col :span="20">
-              <el-form-item prop="erpAssemblyType ">
+              <el-form-item prop="erpAssemblyType">
                 <el-input
                   style="width: 200px"
                   v-model="form.erpAssemblyType"
@@ -241,7 +241,7 @@
               <el-form-item label="车型：" required />
             </el-col>
             <el-col :span="20">
-              <el-form-item prop="vehicleModel ">
+              <el-form-item prop="vehicleModel">
                 <el-input
                   style="width: 200px"
                   v-model="form.model"
@@ -540,6 +540,7 @@ export default {
     handleCreate() {
       if (this.$refs["form"] !== undefined) {
         this.$nextTick(() => {
+          this.$refs["form"] = [];
           this.$refs["form"].resetFields();
         });
       }
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
index 8ba688d5..c47eaffd 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@@ -10,30 +10,34 @@
         :inline="true"
       >
       <!-- <el-row> -->
-        <el-form-item label="生产线:" prop="workLine">
+        <el-form-item label="生产线:" prop="productType">
           <el-select
-            v-model="listQuery.workLine"
+            v-model="listQuery.productType"
             clearable
             placeholder="请选择"
             size="medium"
             style="margin-right: 15px"
-            @change="valueselectChange"
+            @change="ptypeselectChange"
           >
-            <el-option label="门板" value="R0003"></el-option>
-            <el-option label="二配" value="R0001"></el-option>
+            <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-select>
         </el-form-item>
-        <el-form-item label="" prop="workLineCode">
+        <el-form-item label="" prop="productLine">
           <el-select
-            v-model="listQuery.workLineCode"
+            v-model="listQuery.productLine"
             clearable
             placeholder="请选择"
             size="medium"
             style="margin-right: 15px"
             @change="valueselectChange"
           >
-            <el-option label="01-C8" value="01-C8"></el-option>
-            <el-option label="01-C9" value="01-C9"></el-option>
+          <el-option
+            v-for="item in PLList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"/>
           </el-select>
         </el-form-item>
 
@@ -49,9 +53,9 @@
           </el-form-item>
       <!-- </el-row> -->
       <!-- <el-row> -->
-        <el-form-item label="大众顺序号:" prop="ErpAssemblyName">
+        <el-form-item label="大众顺序号:" prop="HostSNBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.HostSNBegin"
             placeholder=""
             clearable
             size="small"
@@ -59,9 +63,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName">
+        <el-form-item label="-" prop="HostSNEnd">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.HostSNEnd"
             placeholder=""
             clearable
             size="small"
@@ -70,9 +74,9 @@
           />
         </el-form-item>
 
-        <el-form-item label="KNR:" prop="ErpAssemblyName">
+        <el-form-item label="KNR:" prop="KNRBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.KNRBegin"
             placeholder=""
             clearable
             size="small"
@@ -80,9 +84,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName">
+        <el-form-item label="-" prop="KNREnd">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.KNREnd"
             placeholder=""
             clearable
             size="small"
@@ -92,9 +96,9 @@
         </el-form-item>
       <!-- </el-row> -->
       <!-- <el-row> -->
-        <el-form-item label="底盘号:" prop="ErpAssemblyName">
+        <el-form-item label="底盘号:" prop="VINBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.VINBegin"
             placeholder=""
             clearable
             size="small"
@@ -102,9 +106,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName ">
+        <el-form-item label="-" prop="VINEnd ">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.VINEnd"
             placeholder=""
             clearable
             size="small"
@@ -115,7 +119,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"
@@ -129,7 +133,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"
@@ -608,17 +612,31 @@ export default {
       listQuery: {
         SkipCount: 0,
         MaxResultCount: 15,
-        ErpAssemblyName: undefined,
-        ErpAssemblyCode: undefined,
-        carType:undefined,
-        OnlineTimeVale:undefined,
-        ReceiveTimeVale:undefined,
+        productType: 1,
+        ProductLine: undefined,
+        version:undefined,
+        HostSNBegin:undefined,
+        HostSNEnd:undefined,
+        KNRBegin:undefined,
+        KNREnd:undefined,
+        VINBegin:undefined,
+        VINEnd:undefined,
+        OnlineTimeValue:undefined,
+        OnlineTimeBegin:undefined,
+        OnlineTimeEnd:undefined,
+        ReceiveTimeValue:undefined,
+        ReceiveTimeBegin:undefined,
+        ReceiveTimeEnd:undefined,
 
       },
       listExportQuery: {
         erpAssemblyCode: undefined,
         erpAssemblyName: undefined,
       },
+      listPLQuery:{
+        BillType: 1,
+        //UserId: "00000000-0000-0000-0000-000000000000",
+      },
       form:{
         details:[]
       },
@@ -634,21 +652,23 @@ export default {
       formLoading: false,
       tableHeight: document.documentElement.clientHeight - 335,
       detailTableHeight:250,
-      details:[] //修改子表数据源
+      details:[], //修改子表数据源
+      PLList:[],//产线下拉
     };
   },
   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.getList();
+    this.getProductLine();
   },
   computed: {
     getDefaultField() {
@@ -880,9 +900,23 @@ export default {
     /** 重置按钮操作 */
     resetQuery(refName) {
       //this.$refs[refName].resetFields();
-      this.listQuery.ErpAssemblyName = "";
-      this.listQuery.ErpAssemblyCode = "";
+      this.listQuery.billType = "";
+      this.listQuery.productLine = "";
+      this.listQuery.version = "";
+      this.listQuery.HostSNBegin = "";
+      this.listQuery.HostSNEnd = "";
+      this.listQuery.KNRBegin = "";
+      this.listQuery.KNREnd = "";
+      this.listQuery.VINBegin = "";
+      this.listQuery.VINEnd = "";
+      this.listQuery.OnlineTimeValue = "";
+      this.listQuery.OnlineTimeBegin = "";
+      this.listQuery.OnlineTimeEnd = "";
+      this.listQuery.ReceiveTimeValue = "";
+      this.listQuery.ReceiveTimeBegin = "";
+      this.listQuery.ReceiveTimeEnd = "";
       this.handleQuery();
+      this.getProductLine();
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -1036,6 +1070,28 @@ export default {
       this.$refs.multipleTable.clearSelection();
       this.$refs.multipleTable.toggleRowSelection(row);
     },
+    //获取所有产线
+    getProductLine()
+    {
+      this.$axios
+          .gets(
+            "/api/newjit/product-line/list",this.listPLQuery
+          )
+          .then((response) => {
+            //console.log(response);
+            this.PLList = response.item;
+            //console.log(this.PLList);
+          })
+          .catch(() => {
+          });
+    },
+    //产线类型变更
+    ptypeselectChange()
+    {
+      //console.log(this.listQuery.productType);
+      this.PLList = this.PLList.filter(u => u.productType === this.listQuery.productType);
+      //console.log(this.PLList)
+    },
   },
 };
 </script>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index 29450307..d22d3426 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -10,30 +10,34 @@
         :inline="true"
       >
       <!-- <el-row> -->
-        <el-form-item label="生产线:" prop="workLine">
+        <el-form-item label="生产线:" prop="productType">
           <el-select
-            v-model="listQuery.workLine"
+            v-model="listQuery.productType"
             clearable
             placeholder="请选择"
             size="medium"
             style="margin-right: 15px"
-            @change="valueselectChange"
+            @change="ptypeselectChange"
           >
-            <el-option label="门板" value="R0003"></el-option>
-            <el-option label="二配" value="R0001"></el-option>
+            <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-select>
         </el-form-item>
-        <el-form-item label="" prop="workLineCode">
+        <el-form-item label="" prop="productLine">
           <el-select
-            v-model="listQuery.workLineCode"
+            v-model="listQuery.productLine"
             clearable
             placeholder="请选择"
             size="medium"
             style="margin-right: 15px"
             @change="valueselectChange"
           >
-            <el-option label="01-C8" value="01-C8"></el-option>
-            <el-option label="01-C9" value="01-C9"></el-option>
+          <el-option
+            v-for="item in PLList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"/>
           </el-select>
         </el-form-item>
 
@@ -48,9 +52,9 @@
           />
         </el-form-item>
       <!-- </el-row> -->
-        <el-form-item label="流水号:" prop="ErpAssemblyName">
+        <el-form-item label="流水号:" prop="serialNumBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.serialNumBegin"
             placeholder=""
             clearable
             size="small"
@@ -58,9 +62,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName ">
+        <el-form-item label="-" prop="serialNumEnd">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.serialNumEnd"
             placeholder=""
             clearable
             size="small"
@@ -69,9 +73,9 @@
           />
         </el-form-item>
       <!-- <el-row> -->
-        <el-form-item label="大众顺序号:" prop="ErpAssemblyName">
+        <el-form-item label="大众顺序号:" prop="HostSNBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.HostSNBegin"
             placeholder=""
             clearable
             size="small"
@@ -79,9 +83,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName">
+        <el-form-item label="-" prop="HostSNEnd">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.HostSNEnd"
             placeholder=""
             clearable
             size="small"
@@ -90,9 +94,9 @@
           />
         </el-form-item>
 
-        <el-form-item label="KNR:" prop="ErpAssemblyName">
+        <el-form-item label="KNR:" prop="KNRBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.KNRBegin"
             placeholder=""
             clearable
             size="small"
@@ -100,9 +104,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName">
+        <el-form-item label="-" prop="KNREnd">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.KNREnd"
             placeholder=""
             clearable
             size="small"
@@ -112,9 +116,9 @@
         </el-form-item>
       <!-- </el-row> -->
       <!-- <el-row> -->
-        <el-form-item label="底盘号:" prop="ErpAssemblyName">
+        <el-form-item label="底盘号:" prop="VINBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.VINBegin"
             placeholder=""
             clearable
             size="small"
@@ -122,9 +126,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName ">
+        <el-form-item label="-" prop="VINEnd ">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.VINEnd"
             placeholder=""
             clearable
             size="small"
@@ -373,11 +377,23 @@ export default {
       listQuery: {
         SkipCount: 0,
         MaxResultCount: 15,
-        ErpAssemblyName: undefined,
-        ErpAssemblyCode: undefined,
-        carType:undefined,
-        OnlineTimeVale:undefined,
-        ReceiveTimeVale:undefined,
+        productType: 1,
+        ProductLine: undefined,
+        version:undefined,
+        serialNumBegin:undefined,
+        serialNumEnd:undefined,
+        HostSNBegin:undefined,
+        HostSNEnd:undefined,
+        KNRBegin:undefined,
+        KNREnd:undefined,
+        VINBegin:undefined,
+        VINEnd:undefined,
+        OnlineTimeValue:undefined,
+        OnlineTimeBegin:undefined,
+        OnlineTimeEnd:undefined,
+        ReceiveTimeValue:undefined,
+        ReceiveTimeBegin:undefined,
+        ReceiveTimeEnd:undefined,
         state:[],
 
       },
@@ -385,6 +401,10 @@ export default {
         erpAssemblyCode: undefined,
         erpAssemblyName: undefined,
       },
+      listPLQuery:{
+        BillType: 1,
+        //UserId: "00000000-0000-0000-0000-000000000000",
+      },
       form:{
         details:[]
       },
@@ -401,6 +421,7 @@ export default {
       tableHeight: document.documentElement.clientHeight - 335,
       detailTableHeight:250,
       details:[], //修改子表数据源
+      PLList:[],//产线下拉
     };
   },
   mounted() {
@@ -422,11 +443,6 @@ export default {
       var tempsTabs = [];
       tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
       tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
       // tempsTabs.push({
       //   label: "底盘号",
       //   prop: "vin",
@@ -439,12 +455,12 @@ export default {
       });
       tempsTabs.push({
         label: "M100上线时间",
-        prop: "m100OnlineTime",
+        prop: "onlineTime",
         width: 150,
       });
       tempsTabs.push({
         label: "M100接收时间",
-        prop: "m100ReceiveTime",
+        prop: "receiveTime",
         width: 180,
       });
       tempsTabs.push({
@@ -540,9 +556,23 @@ export default {
     /** 重置按钮操作 */
     resetQuery(refName) {
       //this.$refs[refName].resetFields();
-      this.listQuery.ErpAssemblyName = "";
-      this.listQuery.ErpAssemblyCode = "";
+      this.listQuery.billType = "";
+      this.listQuery.productLine = "";
+      this.listQuery.version = "";
+      this.listQuery.HostSNBegin = "";
+      this.listQuery.HostSNEnd = "";
+      this.listQuery.KNRBegin = "";
+      this.listQuery.KNREnd = "";
+      this.listQuery.VINBegin = "";
+      this.listQuery.VINEnd = "";
+      this.listQuery.OnlineTimeValue = "";
+      this.listQuery.OnlineTimeBegin = "";
+      this.listQuery.OnlineTimeEnd = "";
+      this.listQuery.ReceiveTimeValue = "";
+      this.listQuery.ReceiveTimeBegin = "";
+      this.listQuery.ReceiveTimeEnd = "";
       this.handleQuery();
+      this.getProductLine();
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -699,6 +729,28 @@ export default {
     print(){},
     rePrint(){},
     makeUpPrint(){},
+    //获取所有产线
+    getProductLine()
+    {
+      this.$axios
+          .gets(
+            "/api/newjit/product-line/list",this.listPLQuery
+          )
+          .then((response) => {
+            //console.log(response);
+            this.PLList = response.item;
+            //console.log(this.PLList)
+          })
+          .catch(() => {
+          });
+    },
+    //产线类型变更
+    ptypeselectChange()
+    {
+      //console.log(this.listQuery.productType);
+      this.PLList = this.PLList.filter(u => u.productType === this.listQuery.productType);
+      //console.log(this.PLList)
+    },
   },
 };
 </script>
diff --git a/vue/src/views/pg-fis/basedate/workLine/index.vue b/vue/src/views/pg-fis/basedate/productLine/index.vue
similarity index 97%
rename from vue/src/views/pg-fis/basedate/workLine/index.vue
rename to vue/src/views/pg-fis/basedate/productLine/index.vue
index 3c848f3d..e5ecc8b4 100644
--- a/vue/src/views/pg-fis/basedate/workLine/index.vue
+++ b/vue/src/views/pg-fis/basedate/productLine/index.vue
@@ -317,7 +317,7 @@ import XhJSSelect from "@/components/CreateCom/Xh-JS-Select-Label.vue";
 import { filter } from 'jszip/lib/object';
 
 export default {
-  name: "CustomerPartCfg",
+  name: "productLine",
   components: { Pagination, CRMTableHead, importExcel, XhJSSelect },
   directives: { permission },
   filters: {
@@ -340,7 +340,7 @@ export default {
   },
   data() {
     return {
-      crmType: "customerPartCfg",
+      crmType: "productLine",
       versionValue: "",
       //valueSelect: "R0003",
       versionList: [], //版本列表
@@ -584,24 +584,24 @@ export default {
         //return moment(date).format("YYYY-MM-DD HH:mm:ss");
         return moment(date).format("YYYY-MM-DD");
       } */
-      if(column.property === 'customerCode')
-      {
-        if(row[column.property] === 'R0001')
-        {
-          var vname = '二配';
-          return vname;
-        }
-        else if(row[column.property] === 'R0003')
-        {
-          var vname = '结算';
-          return vname;
-        }
-        else
-        {
-          return row[column.property];
-        }
-      }
-      return row[column.property] || "--";
+      // if(column.property === 'customerCode')
+      // {
+      //   if(row[column.property] === 'R0001')
+      //   {
+      //     var vname = '二配';
+      //     return vname;
+      //   }
+      //   else if(row[column.property] === 'R0003')
+      //   {
+      //     var vname = '结算';
+      //     return vname;
+      //   }
+      //   else
+      //   {
+      //     return row[column.property];
+      //   }
+      // }
+      // return row[column.property] || "--";
     },
     importExcelData() {
       //this.getVersionInfo();
@@ -859,6 +859,7 @@ export default {
     },
     handleDetailSelectionChange(){},
     sortDetailChange(){},
+    //获取所有产线
     getProductLine()
     {
       this.$axios
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue
index 81100237..6786bed2 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@@ -10,30 +10,34 @@
         :inline="true"
       >
       <!-- <el-row> -->
-        <el-form-item label="生产线:" prop="workLine">
+        <el-form-item label="生产线:" prop="productType">
           <el-select
-            v-model="listQuery.workLine"
+            v-model="listQuery.productType"
             clearable
             placeholder="请选择"
             size="medium"
             style="margin-right: 15px"
-            @change="valueselectChange"
+            @change="ptypeselectChange"
           >
-            <el-option label="门板" value="R0003"></el-option>
-            <el-option label="二配" value="R0001"></el-option>
+            <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-select>
         </el-form-item>
-        <el-form-item label="" prop="workLineCode">
+        <el-form-item label="" prop="productLine">
           <el-select
-            v-model="listQuery.workLineCode"
+            v-model="listQuery.productLine"
             clearable
             placeholder="请选择"
             size="medium"
             style="margin-right: 15px"
             @change="valueselectChange"
           >
-            <el-option label="01-C8" value="01-C8"></el-option>
-            <el-option label="01-C9" value="01-C9"></el-option>
+          <el-option
+            v-for="item in PLList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"/>
           </el-select>
         </el-form-item>
 
@@ -49,9 +53,9 @@
         </el-form-item>
       <!-- </el-row> -->
       <!-- <el-row> -->
-        <el-form-item label="大众顺序号:" prop="ErpAssemblyName">
+        <el-form-item label="大众顺序号:" prop="HostSNBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.HostSNBegin"
             placeholder=""
             clearable
             size="small"
@@ -59,9 +63,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName">
+        <el-form-item label="-" prop="HostSNEnd">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.HostSNEnd"
             placeholder=""
             clearable
             size="small"
@@ -70,9 +74,9 @@
           />
         </el-form-item>
 
-        <el-form-item label="KNR:" prop="ErpAssemblyName">
+        <el-form-item label="KNR:" prop="KNRBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.KNRBegin"
             placeholder=""
             clearable
             size="small"
@@ -80,9 +84,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName">
+        <el-form-item label="-" prop="KNREnd">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.KNREnd"
             placeholder=""
             clearable
             size="small"
@@ -92,9 +96,9 @@
         </el-form-item>
       <!-- </el-row> -->
       <!-- <el-row> -->
-        <el-form-item label="底盘号:" prop="ErpAssemblyName">
+        <el-form-item label="底盘号:" prop="VINBegin">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.VINBegin"
             placeholder=""
             clearable
             size="small"
@@ -102,9 +106,9 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="-" prop="ErpAssemblyName ">
+        <el-form-item label="-" prop="VINEnd ">
           <el-input
-            v-model="listQuery.ErpAssemblyName"
+            v-model="listQuery.VINEnd"
             placeholder=""
             clearable
             size="small"
@@ -339,11 +343,21 @@ export default {
       listQuery: {
         SkipCount: 0,
         MaxResultCount: 15,
-        ErpAssemblyName: undefined,
-        ErpAssemblyCode: undefined,
-        carType:undefined,
-        OnlineTimeVale:undefined,
-        ReceiveTimeVale:undefined,
+        productType: 1,
+        ProductLine: undefined,
+        version:undefined,
+        HostSNBegin:undefined,
+        HostSNBegin:undefined,
+        KNRBegin:undefined,
+        KNREnd:undefined,
+        VINBegin:undefined,
+        VINEnd:undefined,
+        OnlineTimeValue:undefined,
+        OnlineTimeBegin:undefined,
+        OnlineTimeEnd:undefined,
+        ReceiveTimeValue:undefined,
+        ReceiveTimeBegin:undefined,
+        ReceiveTimeEnd:undefined,
         state:[],
 
       },
@@ -351,6 +365,10 @@ export default {
         erpAssemblyCode: undefined,
         erpAssemblyName: undefined,
       },
+      listPLQuery:{
+        BillType: 1,
+        //UserId: "00000000-0000-0000-0000-000000000000",
+      },
       form:{
         details:[]
       },
@@ -387,11 +405,6 @@ export default {
       
       var tempsTabs = [];
       tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 120,
-      });
       // tempsTabs.push({
       //   label: "底盘号",
       //   prop: "vin",
@@ -500,9 +513,23 @@ export default {
     /** 重置按钮操作 */
     resetQuery(refName) {
       //this.$refs[refName].resetFields();
-      this.listQuery.ErpAssemblyName = "";
-      this.listQuery.ErpAssemblyCode = "";
+      this.listQuery.billType = "";
+      this.listQuery.productLine = "";
+      this.listQuery.version = "";
+      this.listQuery.HostSNBegin = "";
+      this.listQuery.HostSNEnd = "";
+      this.listQuery.KNRBegin = "";
+      this.listQuery.KNREnd = "";
+      this.listQuery.VINBegin = "";
+      this.listQuery.VINEnd = "";
+      this.listQuery.OnlineTimeValue = "";
+      this.listQuery.OnlineTimeBegin = "";
+      this.listQuery.OnlineTimeEnd = "";
+      this.listQuery.ReceiveTimeValue = "";
+      this.listQuery.ReceiveTimeBegin = "";
+      this.listQuery.ReceiveTimeEnd = "";
       this.handleQuery();
+      this.getProductLine();
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -657,6 +684,28 @@ export default {
       this.$refs.multipleTable.toggleRowSelection(row);
     },
     SAPExport(){},
+    //获取所有产线
+    getProductLine()
+    {
+      this.$axios
+          .gets(
+            "/api/newjit/product-line/list",this.listPLQuery
+          )
+          .then((response) => {
+            //console.log(response);
+            this.PLList = response.item;
+            //console.log(this.PLList);
+          })
+          .catch(() => {
+          });
+    },
+    //产线类型变更
+    ptypeselectChange()
+    {
+      //console.log(this.listQuery.productType);
+      this.PLList = this.PLList.filter(u => u.productType === this.listQuery.productType);
+      //console.log(this.PLList)
+    },
   },
 };
 </script>
diff --git a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
new file mode 100644
index 00000000..5e91f023
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
@@ -0,0 +1,772 @@
+<!--总成模块信息管理页-->
+<template>
+  <div class="cr-body-content">
+    <div ref="box">
+    <flexbox class="content-header" >
+      <el-form
+        :model="listQuery"
+        ref="queryForm"
+        v-show="showSearch"
+        :inline="true"
+      >
+      <!-- <el-row> -->
+        <el-form-item label="生产线:" prop="productType">
+          <el-select
+            v-model="listQuery.productType"
+            clearable
+            placeholder="请选择"
+            size="medium"
+            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-select>
+        </el-form-item>
+        <el-form-item label="" prop="productLine">
+          <el-select
+            v-model="listQuery.productLine"
+            clearable
+            placeholder="请选择"
+            size="medium"
+            style="margin-right: 15px"
+            @change="valueselectChange"
+          >
+          <el-option
+            v-for="item in PLList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"/>
+          </el-select>
+        </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-row> -->
+        <el-form-item label="流水号:" prop="serialNumBegin">
+          <el-input
+            v-model="listQuery.serialNumBegin"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="-" prop="serialNumEnd">
+          <el-input
+            v-model="listQuery.serialNumEnd"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+      <!-- <el-row> -->
+        <el-form-item label="大众顺序号:" prop="HostSNBegin">
+          <el-input
+            v-model="listQuery.HostSNBegin"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="-" prop="HostSNEnd">
+          <el-input
+            v-model="listQuery.HostSNEnd"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="KNR:" prop="KNRBegin">
+          <el-input
+            v-model="listQuery.KNRBegin"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="-" prop="KNREnd">
+          <el-input
+            v-model="listQuery.KNREnd"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+      <!-- </el-row> -->
+      <!-- <el-row> -->
+        <el-form-item label="底盘号:" prop="VINBegin">
+          <el-input
+            v-model="listQuery.VINBegin"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="-" prop="VINEnd ">
+          <el-input
+            v-model="listQuery.VINEnd"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="上线日期">
+          <el-date-picker
+            v-model="listQuery.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-row> -->
+      <!-- <el-row> -->
+        <el-form-item label="接收日期">
+          <el-date-picker
+            v-model="listQuery.ReceiveTimeVale"
+            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 label="对比状态" prop="State">
+          <el-checkbox-group  v-model="listQuery.state" >
+            <el-checkbox v-for="item in billState" :key="item.id" :label="item.id">
+              {{ item.name }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item style="margin: 0px">
+          <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()"
+            >导出焊装总成对比
+          </el-button>
+        </el-form-item>
+      <!-- </el-row> -->
+      </el-form>
+    </flexbox>
+    </div>
+    <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
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        
+        <!-- <el-table-column
+          label="底盘号"
+          prop="vin "
+          sortable="custom"
+          align="center"
+          
+          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="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </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"
+      >
+      </el-drawer>
+    </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 Lockr from "lockr";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+//组件计量单位
+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: "WeldingAssembly",
+  components: { Pagination, CRMTableHead, importExcel },
+  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: "WeldingAssembly",
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      billState:[
+        {id:0,name:"有焊装无总装"},
+        {id:1,name:"有焊装有总装"}
+      ],
+      valueSelect: "",
+      customerInfos: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        productType: 1,
+        ProductLine: undefined,
+        version:undefined,
+        serialNumBegin:undefined,
+        serialNumEnd:undefined,
+        HostSNBegin:undefined,
+        HostSNEnd:undefined,
+        KNRBegin:undefined,
+        KNREnd:undefined,
+        VINBegin:undefined,
+        VINEnd:undefined,
+        OnlineTimeValue:undefined,
+        OnlineTimeBegin:undefined,
+        OnlineTimeEnd:undefined,
+        ReceiveTimeValue:undefined,
+        ReceiveTimeBegin:undefined,
+        ReceiveTimeEnd:undefined,
+        state:[],
+
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery:{
+        BillType: 1,
+        //UserId: "00000000-0000-0000-0000-000000000000",
+      },
+      form:{
+        details:[]
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      bomUnit,
+      multipleSelection: [],
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      detailTableHeight:250,
+      details:[], //修改子表数据源
+    };
+  },
+  mounted() {
+    this.$nextTick(() => { 
+        var offsetHei = document.documentElement.clientHeight;
+        //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);
+    });
+  },
+  created() {
+    this.getList();
+  },
+  computed: {
+    getDefaultField() {
+      
+      var tempsTabs = [];
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+      // tempsTabs.push({
+      //   label: "底盘号",
+      //   prop: "vin",
+      //   width: 130,
+      // });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100单据状态",
+        prop: "r100BillState",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100上线时间",
+        prop: "r100OnlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100接收时间",
+        prop: "r100ReceiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100流水号",
+        prop: "m100Seq",
+        width: 130,
+      });
+      tempsTabs.push({
+        label: "M100底盘号",
+        prop: "m100Vin",
+        width: 130,
+      });
+      tempsTabs.push({
+        label: "M100上线时间",
+        prop: "m100OnlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100接收时间",
+        prop: "m100ReceiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "R100单据状态",
+        prop: "r100BillState",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "总成编号",
+        prop: "erpAssemblyCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "总成名称",
+        prop: "erpAssemblyName",
+        width: 180,
+      });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+      console.log(JSON.stringify(this.listExportQuery));
+      this.$axios
+        .posts("/api/newjit/assembly-cfg-erp/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;
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      //this.$refs[refName].resetFields();
+      this.listQuery.billType = "";
+      this.listQuery.productLine = "";
+      this.listQuery.version = "";
+      this.listQuery.HostSNBegin = "";
+      this.listQuery.HostSNEnd = "";
+      this.listQuery.KNRBegin = "";
+      this.listQuery.KNREnd = "";
+      this.listQuery.VINBegin = "";
+      this.listQuery.VINEnd = "";
+      this.listQuery.OnlineTimeValue = "";
+      this.listQuery.OnlineTimeBegin = "";
+      this.listQuery.OnlineTimeEnd = "";
+      this.listQuery.ReceiveTimeValue = "";
+      this.listQuery.ReceiveTimeBegin = "";
+      this.listQuery.ReceiveTimeEnd = "";
+      this.handleQuery();
+      this.getProductLine();
+    },
+    /** 搜索按钮操作 */
+    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();
+    },
+
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+
+    handleAddDetails() {
+      if (this.form.details === undefined) {
+        this.form.details = [];
+        //console.log(679);
+      }
+      let obj = {};
+      obj.partCode = "";
+      obj.partName = "";
+      obj.partNum = "";
+      obj.isKey = false;
+      obj.description = "";
+
+      console.log(this.form.details);
+      this.form.details.push(obj);
+      //console.log(688);
+    },
+    handleDeleteDetails(index){
+      this.form.details.splice(index, 1);
+      //console.log(693);
+    },
+
+    /** 格式化字段 */
+    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;
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    
+    getDetialList(partCode) {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
+        .then((response) => {
+          console.log(partCode)
+          if(partCode !== "" && partCode !== undefined)
+          {
+            //console.log(partCode)
+            this.list = response.item.details.filter(u => u.partCode === partCode);
+          }
+          else
+          {
+            this.list = response.item.details;
+          }
+          //alert(JSON.stringify(response.Items))
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    valueselectChange(){},
+    handleImportSAP(){},
+
+    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);
+    },
+    SAPExport(){},
+    //获取所有产线
+    getProductLine()
+    {
+      this.$axios
+          .gets(
+            "/api/newjit/product-line/list",this.listPLQuery
+          )
+          .then((response) => {
+            //console.log(response);
+            this.PLList = response.item;
+            //console.log(this.PLList);
+          })
+          .catch(() => {
+          });
+    },
+    //产线类型变更
+    ptypeselectChange()
+    {
+      //console.log(this.listQuery.productType);
+      this.PLList = this.PLList.filter(u => u.productType === this.listQuery.productType);
+      //console.log(this.PLList);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../../ux/styles/crmtable.scss";
+
+// /*表格全选框去除空框*/
+// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
+//   display: none;
+//   position: relative;
+// }
+// /*表格全选框改为：选择*/
+// .el-table >>> .DisabledSelection .cell:before {
+//   content: "是否Key件";
+//   position: absolute;
+//   left: 7px;
+// }
+.divider1{
+  margin: 0 ;
+}
+.divider2{
+  margin: 10px;
+  margin-bottom: 20px ;
+  width: 95%;
+}
+</style>
+
diff --git a/vue/static/config.js b/vue/static/config.js
index 0be624dd..2b444dcf 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -17,7 +17,7 @@ if (process.env.NODE_ENV === 'development') {
 			 public_port: '44378',
 			 backend_port: '44378', */
 			
-      ip: 'http://192.168.0.203',
+      ip: 'http://192.168.0.214',
       // ip: 'http://149.223.116.5',
       auth_port: '8066',
       public_port: '8092',