From d9571ca977b6c38f9b52f0b15a8e38f103a59c41 Mon Sep 17 00:00:00 2001
From: "yu.wu" <yu.wu@ccwin-in.com>
Date: Mon, 29 Nov 2021 16:31:34 +0800
Subject: [PATCH] =?UTF-8?q?fis=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/router/modules/fis.js                 |  20 +-
 .../pg-fis/basedate/assemblyCfg/detail.vue    |   6 +-
 .../pg-fis/basedate/assemblyCfg/index.vue     |  73 ++---
 .../pg-fis/basedate/customerPartCfg/index.vue |  10 +-
 .../views/pg-fis/basedate/logRemind/index.vue |  14 +-
 .../views/pg-fis/basedate/m100BIll/detail.vue |   2 +-
 .../views/pg-fis/basedate/m100BIll/index.vue  |  30 +-
 .../pg-fis/basedate/m100Online/detail.vue     |   6 +-
 .../pg-fis/basedate/m100Online/index.vue      | 293 ++++++++++++++++--
 .../pg-fis/basedate/productLine/index.vue     |   2 +-
 .../pg-fis/basedate/r100Online/detail.vue     |   6 +-
 .../pg-fis/basedate/r100Online/index.vue      |  32 +-
 .../pg-fis/basedate/repeatR100/detail.vue     |   4 +-
 .../pg-fis/basedate/repeatR100/index.vue      | 103 ++++--
 .../basedate/unknownAssembly/detail.vue       |   6 +-
 .../pg-fis/basedate/unknownAssembly/index.vue |  24 +-
 .../pg-fis/basedate/weldingAssembly/index.vue |  36 +--
 .../pg-fis/components/mixins/message_table.js |  57 ++++
 vue/src/views/pg-fis/styles/crmtable.scss     |  59 ++--
 19 files changed, 566 insertions(+), 217 deletions(-)
 create mode 100644 vue/src/views/pg-fis/components/mixins/message_table.js

diff --git a/vue/src/router/modules/fis.js b/vue/src/router/modules/fis.js
index 4580960a..90e60076 100644
--- a/vue/src/router/modules/fis.js
+++ b/vue/src/router/modules/fis.js
@@ -106,16 +106,16 @@ const pgfis = {
                 icon: '客户零件'
             }
         },
-        // {
-        //     path: '/pg-repeatR100',
-        //     component: () => import('@/views/pg-fis/basedate/repeatR100'),
-        //     name: 'pg-repeatR100',//命名路由
-        //     meta: {
-        //         title: '系统内通知',
-        //         roles: ['SettleAccount.Reports'],
-        //         icon: '客户零件'
-        //     }
-        // }
+        {
+            path: '/pg-repeatR100',
+            component: () => import('@/views/pg-fis/basedate/repeatR100'),
+            name: 'pg-repeatR100',//命名路由
+            meta: {
+                title: '重复报文',
+                roles: ['SettleAccount.Reports'],
+                icon: '客户零件'
+            }
+        }
     ]
 }
 
diff --git a/vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue b/vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue
index 7cf4f451..0aafcee6 100644
--- a/vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue
+++ b/vue/src/views/pg-fis/basedate/assemblyCfg/detail.vue
@@ -153,7 +153,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 30,
       isEdit: false,
     };
   },
@@ -161,7 +161,7 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
+      self.tableHeight = offsetHei - 30;
     };
   },
   created() {
@@ -307,6 +307,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
+@import "../../../pg-fis/styles/crmtable.scss";
 </style>
 
diff --git a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
index 46886ec2..f7670b83 100644
--- a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue
@@ -133,12 +133,14 @@
         @row-click="handleRowClick"
       >
         <el-table-column type="selection" width="44px"></el-table-column>
+        
         <el-table-column
           label="ERP总成编码"
           prop="erpAssemblyCode"
           sortable="custom"
           align="center"
-          width="420px"
+          
+          width="180px"
         >
           <template slot-scope="scope">
             <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
@@ -147,34 +149,18 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="ERP总成名称"
-          prop="erpAssemblyName "
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
           sortable="custom"
-          align="center"
+          show-overflow-tooltip
+          :gutter="0"
         >
-          <template slot-scope="scope">
-            <span>{{ scope.row.erpAssemblyName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="ERP总成版本"
-          prop="erpAssemblyVersion "
-          sortable="custom"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.erpAssemblyVersion }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          label="车型"
-          prop="vehicleModel "
-          sortable="custom"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.vehicleModel }}</span>
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
           </template>
         </el-table-column>
       </el-table>
@@ -320,7 +306,7 @@
           <el-button type="text" @click="dialogFormVisible = false"
             >取消</el-button
           >
-          <el-button v-loading="formLoading" type="primary" @click="save"
+          <el-button v-loading="formLoading" type="primary" @click="save()"
             >确认</el-button
           >
         </div>
@@ -473,6 +459,7 @@ export default {
         //console.log(offsetHei);
         let boxH = this.$refs.box.offsetHeight;
         this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
+        //this.$refs.form.rendered=true;
         //console.log(boxH);
         //console.log(this.tableHeight);
     });
@@ -484,16 +471,21 @@ export default {
   computed: {
     getDefaultField() {
       var tempsTabs = [];
-      // tempsTabs.push({
-      //   label: "ERP总成名称",
-      //   prop: "erpAssemblyName ",
-      //   width: 220,
-      // });
+      tempsTabs.push({
+        label: "总成名称",
+        prop: "erpAssemblyName",
+        width: 180,
+      });
       tempsTabs.push({
         label: "ERP总成版本",
-        prop: "erpAssemblyVersion ",
+        prop: "erpAssemblyVersion",
         width: 100,
       });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModel",
+        width: 120,
+      });
       return tempsTabs;
     },
   },
@@ -512,6 +504,7 @@ export default {
       done();
     },
     save() {
+      //console.log(this.$refs.form);
       this.$refs.form.validate((valid) => {
         if (valid) {
           console.log("保存参数:" + JSON.stringify(this.form));
@@ -561,7 +554,7 @@ export default {
     handleCreate() {
       if (this.$refs["form"] !== undefined) {
         this.$nextTick(() => {
-          this.$refs["form"] = [];
+          //this.$refs["form"] = [];
           this.$refs["form"].resetFields();
         });
       }
@@ -680,10 +673,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery(refName) {
-      //this.$refs[refName].resetFields();
-      this.listQuery.ErpAssemblyName = "";
-      this.listQuery.ErpAssemblyCode = "";
-      this.listQuery.vehicleModelCode = "";
+      this.$refs[refName].resetFields();
+      this.listQuery.ErpAssemblyName = undefined;
+      this.listQuery.ErpAssemblyCode = undefined;
+      // this.listQuery.vehicleModelCode = "";
       this.getvehicleModel();
       this.handleQuery();
       
@@ -885,7 +878,7 @@ export default {
 // }
 .divider1{
   margin: 0 ;
-  width: 118%;
+  //width: 100%;
 }
 .formitem{
   margin-bottom: 0;
diff --git a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
index ab16bbcc..a6905f0c 100644
--- a/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
+++ b/vue/src/views/pg-fis/basedate/customerPartCfg/index.vue
@@ -682,10 +682,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery(refName) {
-      this.listQuery.partCode = "";
-      this.listQuery.partName = "";
-      this.listQuery.partType = "";
-      this.listQuery.partType2 = "";
+      this.listQuery.partCode = undefined;
+      this.listQuery.partName = undefined;
+      this.listQuery.partType = undefined;
+      this.listQuery.partType2 = undefined;
       this.$refs[refName].resetFields();
       this.getPartType()
       this.handleFilter();
@@ -763,7 +763,7 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
+@import "../../../pg-fis/styles/crmtable.scss";
 </style>
 <style lang="scss">
 .el-table .cell.el-tooltip {
diff --git a/vue/src/views/pg-fis/basedate/logRemind/index.vue b/vue/src/views/pg-fis/basedate/logRemind/index.vue
index d2913152..01681ec3 100644
--- a/vue/src/views/pg-fis/basedate/logRemind/index.vue
+++ b/vue/src/views/pg-fis/basedate/logRemind/index.vue
@@ -147,6 +147,7 @@ import Lockr from "lockr";
 import moment from "moment";
 import { mapGetters } from "vuex";
 import { downloadFile } from "@/utils/crmindex.js";
+import qs from 'qs';
 
 //组件计量单位
 const bomUnit = [
@@ -348,6 +349,7 @@ export default {
     getList() {
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 10;
+      //this.listQuery.LogType = 1;//1: R100 2: M100）
       this.$axios
         .gets("/api/newjit/log-remind/list", this.listQuery)
         .then((response) => {
@@ -405,9 +407,9 @@ export default {
     {
       this.operationQuery.id = row.id;
       this.$axios
-        .posts("/api/newjit/log-remind/do-process", this.operationQuery)
+        .posts("/api/newjit/log-remind/do-process",qs.stringify(this.operationQuery))
         .then((response) => {
-          if(response.status === "true")
+          if(response.status === true)
           {
             this.$notify({
                   title: "成功",
@@ -421,7 +423,7 @@ export default {
             this.$notify({
                   title: "失败",
                   message: "处理失败！",
-                  type: "success",
+                  type: "warning",
                   duration: 2000,
                 });
           }
@@ -440,9 +442,9 @@ export default {
     {
       this.operationQuery.id = row.id;
       this.$axios
-        .posts("/api/newjit/log-remind/do-ignore", this.operationQuery)
+        .posts("/api/newjit/log-remind/do-ignore",qs.stringify(this.operationQuery))
         .then((response) => {
-          if(response.status === "true")
+          if(response.status === true)
           {
             this.$notify({
                   title: "成功",
@@ -456,7 +458,7 @@ export default {
             this.$notify({
                   title: "失败",
                   message: "忽略失败！",
-                  type: "success",
+                  type: "warning",
                   duration: 2000,
                 });
           }
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/detail.vue b/vue/src/views/pg-fis/basedate/m100BIll/detail.vue
index 35119046..607b4791 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/detail.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/detail.vue
@@ -349,6 +349,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
+@import "../../../pg-fis/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 ef8f3f6d..6af416e2 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@@ -1105,22 +1105,22 @@ export default {
     },
     /** 重置按钮操作 */
     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.$refs[refName].resetFields();
+      this.listQuery.billType = undefined;
+      this.listQuery.productLine = undefined;
+      this.listQuery.version = undefined;
+      this.listQuery.HostSNBegin = undefined;
+      this.listQuery.HostSNEnd = undefined;
+      this.listQuery.KNRBegin = undefined;
+      this.listQuery.KNREnd = undefined;
+      this.listQuery.VINBegin = undefined;
+      this.listQuery.VINEnd = undefined;
       this.listQuery.OnlineTimeValue = [];
-      this.listQuery.OnlineTimeBegin = "";
-      this.listQuery.OnlineTimeEnd = "";
+      this.listQuery.OnlineTimeBegin = undefined;
+      this.listQuery.OnlineTimeEnd = undefined;
       this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.ReceiveTimeBegin = "";
-      this.listQuery.ReceiveTimeEnd = "";
+      this.listQuery.ReceiveTimeBegin = undefined;
+      this.listQuery.ReceiveTimeEnd = undefined;
       this.handleQuery();
       this.getProductLine();
     },
@@ -1476,7 +1476,7 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
+@import "../../../pg-fis/styles/crmtable.scss";
 
 // /*表格全选框去除空框*/
 // .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detail.vue b/vue/src/views/pg-fis/basedate/m100Online/detail.vue
index 25108fdd..8f84588e 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detail.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detail.vue
@@ -184,7 +184,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 30,
       isEdit: false,
     };
   },
@@ -192,7 +192,7 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
+      self.tableHeight = offsetHei - 30;
     };
   },
   created() {
@@ -349,6 +349,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
+@import "../../../pg-fis/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 d71b3e2d..163b4492 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -392,6 +392,7 @@ import Lockr from "lockr";
 import moment from "moment";
 import Detail from "./detail.vue";
 import { downloadFile } from "@/utils/crmindex.js";
+import qs from 'qs'
 
 //组件计量单位
 const bomUnit = [
@@ -520,6 +521,9 @@ export default {
         beginVin: undefined,
         endVin: undefined
       },
+      fileQuery:{
+        dataname:undefined,
+      },
       form:{
         details:[]
       },
@@ -691,25 +695,25 @@ export default {
     /** 重置按钮操作 */
     resetQuery(refName) {
       //this.$refs[refName].resetFields();
-      this.listQuery.billType = "";
-      this.listQuery.productLine = "";
-      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.billType = undefined;
+      this.listQuery.productLine = undefined;
+      this.listQuery.Version = undefined;
+      this.listQuery.serialNumBegin = undefined;
+      this.listQuery.serialNumEnd = undefined;
+      this.listQuery.HostSNBegin = undefined;
+      this.listQuery.HostSNEnd = undefined;
+      this.listQuery.KNRBegin = undefined;
+      this.listQuery.KNREnd = undefined;
+      this.listQuery.VINBegin = undefined;
+      this.listQuery.VINEnd = undefined;
       this.listQuery.OnlineTimeValue = [];
-      this.listQuery.OnlineTimeBegin = "";
-      this.listQuery.OnlineTimeEnd = "";
+      this.listQuery.OnlineTimeBegin = undefined;
+      this.listQuery.OnlineTimeEnd = undefined;
       this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.ReceiveTimeBegin = "";
-      this.listQuery.ReceiveTimeEnd = "";
+      this.listQuery.ReceiveTimeBegin = undefined;
+      this.listQuery.ReceiveTimeEnd = undefined;
       this.listQuery.state = [];
-      this.listQuery.billStatus = "";
+      this.listQuery.billStatus = undefined;
       this.handleQuery();
       this.getProductLine();
     },
@@ -1087,6 +1091,7 @@ export default {
                         .then((response) => {
                           console.log("打印门板装箱单");
                           console.log(response);
+                          console.log(response.status);
                           if(response.status === false)
                           {
                               this.$message({
@@ -1097,8 +1102,119 @@ export default {
                           }
                           else
                           {
-                            //传给grid++接口json数据，得到返回的文件流pdfstream
-                            this.printpdf(pdfstream);//打印我文件流
+                            //传给grid++接口json数据，得到返回的文件base64
+                            //this.fileQuery.report = "menban";
+                            this.fileQuery.dataname = JSON.stringify(response.item);
+                            this.fileQuery.dataname = `[{
+"masters": [{
+			"id": "1",
+			"billNum": " 10000000009",
+			"billSerialNum": "04",
+			"billLocation": "左",
+			"providerCode": "0709FAW-VW7XH",
+			"partType": "C8 DP",
+			"capacity": "12",
+			"printDate": "2021-11-27 10:12:04",
+			"printType": 0,
+			"productLine": "01",
+			"beginVin": "LFV2A24K2M3303677",
+			"endVin": "LFV2A24K2M3303792"
+		},
+		{
+			"id": "2",
+			"billNum": " 10000000010",
+			"billSerialNum": "04",
+			"billLocation": "右",
+			"providerCode": "0709FAW-VW7XH",
+			"partType": "C8 DP",
+			"capacity": "12",
+			"printDate": "2021-11-27 10:12:04",
+			"printType": 0,
+			"productLine": "01",
+			"beginVin": "LFV2A24K2M3303677",
+			"endVin": "LFV2A24K2M3303792"
+		}
+	]
+	"details": [{
+			"id": "1",
+			"billNum": " 10000000009",
+			"knr": " 21321501481001",
+			"vin": "LFV2A24K2M3303677",
+			"hostSN": 85,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "01",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		},
+		{
+			"id": "1",
+			"billNum": " 10000000009",
+			"knr": " 21321501481001",
+			"vin": "LFV2A24K2M3303680",
+			"hostSN": 86,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "02",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		},
+		{
+			"id": "1",
+			"billNum": " 10000000009",
+			"knr": " 21321501481001",
+			"vin": "LFV2A24K2M3303694",
+			"hostSN": 87,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "03",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		},
+		{
+			"id": "2",
+			"billNum": " 10000000010",
+			"knr": " 21321501481001",
+			"vin": "LFV2A24K2M3303713",
+			"hostSN": 88,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "04",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		},
+		{
+			"id": "2",
+			"billNum": " 10000000010",
+			"knr": " 21321502851001",
+			"vin": "LFV2A24K2M3303727",
+			"hostSN": 89,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "05",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		}
+
+	]
+
+}]`
+                            //this.fileQuery.dataname = "";
+                            console.log("打印json");
+                            console.log(this.fileQuery.dataname);
+                            this.$axios
+                              .posts(
+                                "/Handlers/Handler1.ashx?report=menban",qs.stringify(this.fileQuery))
+                              .then((response) => {
+                                console.log("获取文件base64编码");
+                                console.log(response);
+                                this.printpdf(response);//打印我文件流
+                              })
                           }
                         })
                       
@@ -1132,7 +1248,7 @@ export default {
                   .catch(() => {
                   });
                 }
-                else
+                else//无断号
                 {
                   //判断productType类型
                     if(this.listQuery.productType === 1)//门板
@@ -1155,8 +1271,119 @@ export default {
                           }
                           else
                           {
-                            //传给grid++接口json数据，得到返回的文件流pdfstream
-                            this.printpdf(pdfstream);//打印我文件流
+                            //传给grid++接口json数据，得到返回的文件base64
+                            //this.fileQuery.report = "menban";
+                            this.fileQuery.dataname = JSON.stringify(response.item);
+                            this.fileQuery.dataname = `[{
+"masters": [{
+			"id": "1",
+			"billNum": " 10000000009",
+			"billSerialNum": "04",
+			"billLocation": "左",
+			"providerCode": "0709FAW-VW7XH",
+			"partType": "C8 DP",
+			"capacity": "12",
+			"printDate": "2021-11-27 10:12:04",
+			"printType": 0,
+			"productLine": "01",
+			"beginVin": "LFV2A24K2M3303677",
+			"endVin": "LFV2A24K2M3303792"
+		},
+		{
+			"id": "2",
+			"billNum": " 10000000010",
+			"billSerialNum": "04",
+			"billLocation": "右",
+			"providerCode": "0709FAW-VW7XH",
+			"partType": "C8 DP",
+			"capacity": "12",
+			"printDate": "2021-11-27 10:12:04",
+			"printType": 0,
+			"productLine": "01",
+			"beginVin": "LFV2A24K2M3303677",
+			"endVin": "LFV2A24K2M3303792"
+		}
+	]
+	"details": [{
+			"id": "1",
+			"billNum": " 10000000009",
+			"knr": " 21321501481001",
+			"vin": "LFV2A24K2M3303677",
+			"hostSN": 85,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "01",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		},
+		{
+			"id": "1",
+			"billNum": " 10000000009",
+			"knr": " 21321501481001",
+			"vin": "LFV2A24K2M3303680",
+			"hostSN": 86,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "02",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		},
+		{
+			"id": "1",
+			"billNum": " 10000000009",
+			"knr": " 21321501481001",
+			"vin": "LFV2A24K2M3303694",
+			"hostSN": 87,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "03",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		},
+		{
+			"id": "2",
+			"billNum": " 10000000010",
+			"knr": " 21321501481001",
+			"vin": "LFV2A24K2M3303713",
+			"hostSN": 88,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "04",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		},
+		{
+			"id": "2",
+			"billNum": " 10000000010",
+			"knr": " 21321502851001",
+			"vin": "LFV2A24K2M3303727",
+			"hostSN": 89,
+			"vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020",
+			"topBoxPositionNum": "05",
+			"topSAPMaterialNum": "30052525",
+			"topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）",
+			"belowSAPMaterialNum": "30052524",
+			"belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）"
+		}
+
+	]
+
+}]`
+                            //this.fileQuery.dataname = "";
+                            console.log("打印json");
+                            console.log(this.fileQuery.dataname);
+                            this.$axios
+                              .posts(
+                                "/Handlers/Handler1.ashx?report=menban",qs.stringify(this.fileQuery))
+                              .then((response) => {
+                                console.log("获取文件base64编码");
+                                console.log(response);
+                                this.printpdf(response);//打印我文件流
+                              })
                           }
                         })
                         .catch(() => {
@@ -1340,10 +1567,10 @@ export default {
         this.pdfLoading = false
       }, 100)
     },
-    printpdf(blob)
+    printpdf(dataResult)
     {
       //打印功能，dataResult是后台返回的base64
-      //let blob = this.dataURLtoBlob(dataResult);
+      let blob = this.dataURLtoBlob(dataResult);
       var date = (new Date()).getTime()
       var ifr = document.createElement('iframe')
       ifr.style.frameborder = 'no'
@@ -1356,13 +1583,31 @@ export default {
       this.doPrint('printPdf' + date)
       window.URL.revokeObjectURL(ifr.src) // 释放URL 对象
     },
+    httpPost(URL, PARAMS) {
+					var temp = document.createElement("form");
+					temp.action = URL;
+					temp.method = "post";
+					temp.style.display = "none";
+
+					for (var x in PARAMS) {
+							var opt = document.createElement("textarea");
+							opt.name = x;
+							opt.value = PARAMS[x];
+							temp.appendChild(opt);
+					}
+
+					document.body.appendChild(temp);
+					temp.submit();
+
+					return temp;
+			}
   },
 };
 </script>
 
 
 <style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
+@import "../../../pg-fis/styles/crmtable.scss";
 
 // /*表格全选框去除空框*/
 // .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
diff --git a/vue/src/views/pg-fis/basedate/productLine/index.vue b/vue/src/views/pg-fis/basedate/productLine/index.vue
index b30113d7..7410942b 100644
--- a/vue/src/views/pg-fis/basedate/productLine/index.vue
+++ b/vue/src/views/pg-fis/basedate/productLine/index.vue
@@ -955,7 +955,7 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
+@import "../../../pg-fis/styles/crmtable.scss";
 </style>
 <style lang="scss">
 .el-table .cell.el-tooltip {
diff --git a/vue/src/views/pg-fis/basedate/r100Online/detail.vue b/vue/src/views/pg-fis/basedate/r100Online/detail.vue
index 25108fdd..8f84588e 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/detail.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/detail.vue
@@ -184,7 +184,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 30,
       isEdit: false,
     };
   },
@@ -192,7 +192,7 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
+      self.tableHeight = offsetHei - 30;
     };
   },
   created() {
@@ -349,6 +349,6 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
+@import "../../../pg-fis/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 f107c337..a0076ab5 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@@ -212,7 +212,7 @@
         
         <el-table-column
           label="KNR"
-          prop="knr "
+          prop="knr"
           sortable="custom"
           align="center"
           
@@ -537,23 +537,23 @@ export default {
     /** 重置按钮操作 */
     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.billType = undefined;
+      this.listQuery.productLine = undefined;
+      this.listQuery.Version = undefined;
+      this.listQuery.HostSNBegin = undefined;
+      this.listQuery.HostSNEnd = undefined;
+      this.listQuery.KNRBegin = undefined;
+      this.listQuery.KNREnd = undefined;
+      this.listQuery.VINBegin = undefined;
+      this.listQuery.VINEnd = undefined;
       this.listQuery.OnlineTimeValue = [];
-      this.listQuery.OnlineTimeBegin = "";
-      this.listQuery.OnlineTimeEnd = "";
+      this.listQuery.OnlineTimeBegin = undefined;
+      this.listQuery.OnlineTimeEnd = undefined;
       this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.ReceiveTimeBegin = "";
-      this.listQuery.ReceiveTimeEnd = "";
+      this.listQuery.ReceiveTimeBegin = undefined;
+      this.listQuery.ReceiveTimeEnd = undefined;
       this.listQuery.state = [];
-      this.listQuery.billStatus = "";
+      this.listQuery.billStatus = undefined;
       this.handleQuery();
       this.getProductLine();
     },
@@ -768,7 +768,7 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
+@import "../../../pg-fis/styles/crmtable.scss";
 
 // /*表格全选框去除空框*/
 // .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/detail.vue b/vue/src/views/pg-fis/basedate/repeatR100/detail.vue
index cb1ca3e5..5cc6b73f 100644
--- a/vue/src/views/pg-fis/basedate/repeatR100/detail.vue
+++ b/vue/src/views/pg-fis/basedate/repeatR100/detail.vue
@@ -122,7 +122,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 30,
       isEdit: false,
     };
   },
@@ -130,7 +130,7 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
+      self.tableHeight = offsetHei - 30;
     };
   },
   created() {
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index.vue b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
index 6680cebb..41cd7f9a 100644
--- a/vue/src/views/pg-fis/basedate/repeatR100/index.vue
+++ b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
@@ -29,20 +29,40 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="KNR" prop="KNR">
+        <el-form-item label="KNR:" prop="KNRBegin">
           <el-input
-            v-model="listQuery.KNR"
-            placeholder="请输入KNR号"
+            v-model="listQuery.KNRBegin"
+            placeholder=""
             clearable
             size="small"
             style="width: 240px"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="底盘号" prop="VIN">
+        <el-form-item label="-" prop="KNREnd">
           <el-input
-            v-model="listQuery.VIN"
-            placeholder="请输入底盘号"
+            v-model="listQuery.KNREnd"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <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"
@@ -74,7 +94,7 @@
 
         <el-form-item label="上线日期">
           <el-date-picker
-            v-model="OnlineTimeVale"
+            v-model="OnlineTimeValue"
             size="small"
             style="width: 240px"
             value-format="yyyy-MM-dd"
@@ -86,7 +106,7 @@
         </el-form-item>
         <el-form-item label="接收日期">
           <el-date-picker
-            v-model="ReceiveTimeVale"
+            v-model="ReceiveTimeValue"
             size="small"
             style="width: 240px"
             value-format="yyyy-MM-dd"
@@ -265,8 +285,8 @@ export default {
     return {
       crmType: "bomdatabase",
       customerInfos: [],
-      OnlineTimeVale: [],
-      ReceiveTimeVale: [],
+      OnlineTimeValue: [],
+      ReceiveTimeValue: [],
       versionValue: "",
       versionList: [], //版本列表
       searchContent: "", // 输入内容
@@ -381,29 +401,29 @@ export default {
     /** 导出功能 */
     handleDownload() {
       this.listLoading = true;
-      // if (this.OnlineTimeVale != []) {
-      //   this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0];
-      //   this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1];
+      // if (this.OnlineTimeValue != []) {
+      //   this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
+      //   this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
       // }
-      // if (this.ReceiveTimeVale != []) {
-      //   this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0];
-      //   this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1];
+      // if (this.ReceiveTimeValue != []) {
+      //   this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
+      //   this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
       // }
-      if (this.OnlineTimeVale != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale
-          ? this.OnlineTimeVale[0] || undefined
+      if (this.OnlineTimeValue != []) {
+        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue
+          ? this.OnlineTimeValue[0] || undefined
           : undefined;
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale
-          ? this.OnlineTimeVale[1] || undefined
+        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue
+          ? this.OnlineTimeValue[1] || undefined
           : undefined;
       }
-      if (this.ReceiveTimeVale != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale
-          ? this.ReceiveTimeVale[0] || undefined
+      if (this.ReceiveTimeValue != []) {
+        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue
+          ? this.ReceiveTimeValue[0] || undefined
           : undefined;
 
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale
-          ? this.ReceiveTimeVale[1] || undefined
+        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue
+          ? this.ReceiveTimeValue[1] || undefined
           : undefined;
       }
       console.log("重复报文导出条件：" + JSON.stringify(this.listQuery));
@@ -443,8 +463,23 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery(refName) {
-      this.OnlineTimeVale = [];
-      this.ReceiveTimeVale = [];
+      this.OnlineTimeValue = [];
+      this.ReceiveTimeValue = [];
+      //this.listQuery.billType = "";
+      this.listQuery.productLine = undefined;
+      this.listQuery.Version = undefined;
+      this.listQuery.HostSNBegin = undefined;
+      this.listQuery.HostSNEnd = undefined;
+      this.listQuery.KNRBegin = undefined;
+      this.listQuery.KNREnd = undefined;
+      this.listQuery.VINBegin = undefined;
+      this.listQuery.VINEnd = undefined;
+      this.listQuery.OnlineTimeBegin = undefined;
+      this.listQuery.OnlineTimeEnd = undefined;
+      this.listQuery.ReceiveTimeBegin = undefined;
+      this.listQuery.ReceiveTimeEnd = undefined;
+      //this.listQuery.billStatus = "";
+      this.listQuery.VehicleModelCode = undefined;
       this.$refs[refName].resetFields();
       this.handleQuery();
     },
@@ -496,13 +531,13 @@ export default {
     getList() {
       this.listLoading = true;
       this.listQuery.SkipCount = (this.page - 1) * 10;
-      if (this.OnlineTimeVale != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0];
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1];
+      if (this.OnlineTimeValue != []) {
+        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
+        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
       }
-      if (this.ReceiveTimeVale != []) {
-        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeVale[0];
-        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeVale[1];
+      if (this.ReceiveTimeValue != []) {
+        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
       }
       this.$axios
         .gets("/api/newjit/repeat-m100/list", this.listQuery)
diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
index e5bc3487..cc1ee2d5 100644
--- a/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
+++ b/vue/src/views/pg-fis/basedate/unknownAssembly/detail.vue
@@ -139,7 +139,7 @@ export default {
       formTitle: "",
       drawer: false,
       showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 260,
+      tableHeight: document.documentElement.clientHeight - 30,
       isEdit: false,
     };
   },
@@ -147,7 +147,7 @@ export default {
     var self = this;
     window.onresize = function () {
       var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 190;
+      self.tableHeight = offsetHei - 30;
     };
   },
   created() {
@@ -261,7 +261,7 @@ export default {
 
 
 <style lang="scss" scoped>
-@import "../../styles/crmtable.scss";
+@import "../../../pg-fis/styles/crmtable.scss";
 </style>
 
 <style lang="scss">
diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
index 79970df8..8552714e 100644
--- a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
@@ -30,14 +30,20 @@
         </el-form-item>
 
         <el-form-item label="车型代码" prop="VehicleModelCode">
-          <el-input
-            v-model="listQuery.VehicleModelCode"
-            placeholder="请输入车型代码"
+          <el-select
+            v-model="listQuery.vehicleModelCode"
             clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
+            placeholder="请选择"
+            size="medium"
+            style="margin-right: 15px"
+            @change="valueselectChange"
+          >
+            <el-option
+              v-for="item in vehicleModelList"
+              :key="item.id"
+              :label="item.dicItemName"
+              :value="item.dicItemCode"/>
+          </el-select>
         </el-form-item>
 
         <el-form-item label="版本" prop="Version">
@@ -532,6 +538,7 @@ export default {
     };
   },
   created() {
+    this.getvehicleModel();
     this.getList();
   },
   computed: {
@@ -1480,12 +1487,13 @@ export default {
           .catch(() => {
           });
     },
+    valueselectChange(){},
   },
 };
 
 </script>
 
 <style lang="scss" scoped>
-@import "../../../ux/styles/crmtable.scss";
+@import "../../../pg-fis/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 55b53a5a..ba9764ed 100644
--- a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
@@ -605,24 +605,24 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery(refName) {
-      //this.$refs[refName].resetFields();
-      this.listQuery.billType = "";
-      this.listQuery.productLine = "";
-      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.OnlineTimeBegin = "";
-      this.listQuery.OnlineTimeEnd = "";
-      this.listQuery.ReceiveTimeValue = "";
-      this.listQuery.ReceiveTimeBegin = "";
-      this.listQuery.ReceiveTimeEnd = "";
+      this.$refs[refName].resetFields();
+      this.listQuery.billType = undefined;
+      this.listQuery.productLine = undefined;
+      this.listQuery.Version = undefined;
+      this.listQuery.serialNumBegin = undefined;
+      this.listQuery.serialNumEnd = undefined;
+      this.listQuery.HostSNBegin = undefined;
+      this.listQuery.HostSNEnd = undefined;
+      this.listQuery.KNRBegin = undefined;
+      this.listQuery.KNREnd = undefined;
+      this.listQuery.VINBegin = undefined;
+      this.listQuery.VINEnd = undefined;
+      this.listQuery.OnlineTimeValue = [];
+      this.listQuery.OnlineTimeBegin = undefined;
+      this.listQuery.OnlineTimeEnd = undefined;
+      this.listQuery.ReceiveTimeValue = [];
+      this.listQuery.ReceiveTimeBegin = undefined;
+      this.listQuery.ReceiveTimeEnd = undefined;
       this.listQuery.cstate = [];
       this.handleQuery();
       this.getProductLine();
diff --git a/vue/src/views/pg-fis/components/mixins/message_table.js b/vue/src/views/pg-fis/components/mixins/message_table.js
new file mode 100644
index 00000000..b1025c84
--- /dev/null
+++ b/vue/src/views/pg-fis/components/mixins/message_table.js
@@ -0,0 +1,57 @@
+
+export default {
+  components: {},
+  data() {
+    return {
+      loading: false, // 加载动画
+      tableHeight: document.documentElement.clientHeight - 300, // 表的高度
+      total: 0
+    }
+  },
+
+  computed: {
+    // 展示options下拉选择
+    showOptions() {
+      if (this.infoType == 'putInPoolRemind') {
+        return false
+      }
+      return true
+    }
+  },
+
+  mounted() {
+    this.$bus.on('message-scroll', tableHeight => {
+      this.tableHeight = tableHeight
+    })
+
+    this.$bus.on('examine-handle-bus', () => {
+    })
+
+    /** 控制table的高度 */
+    window.onresize = () => {
+      this.updateTableHeight()
+    }
+  },
+
+  beforeDestroy() {
+    this.$bus.off('message-scroll')
+    this.$bus.off('examine-handle-bus')
+
+    if (document.getElementById('crm-table')) {
+      document.getElementById('crm-table').removeEventListener('click', e => {
+        e.stopPropagation()
+      })
+    }
+  },
+
+  methods: {
+    /**
+     * 更新表高
+     */
+    updateTableHeight() {
+      var offsetHei = document.documentElement.clientHeight
+      var removeHeight = Object.keys(this.filterObj).length > 0 ? 360 : 300
+      this.tableHeight = offsetHei - removeHeight
+    }
+  }
+}
diff --git a/vue/src/views/pg-fis/styles/crmtable.scss b/vue/src/views/pg-fis/styles/crmtable.scss
index d0dd421f..5d83e892 100644
--- a/vue/src/views/pg-fis/styles/crmtable.scss
+++ b/vue/src/views/pg-fis/styles/crmtable.scss
@@ -38,8 +38,8 @@
 
   .right-more-item {
     cursor: pointer;
-    border: 1px solid #dcdfe6;
-    background-color: white;
+    border: 1px solid #e6e1dc;
+    background-color: rgb(255, 255, 255);
     font-size: 13px;
     color: #777;
     padding: 0 12px;
@@ -48,40 +48,29 @@
   }
 }
 
-.el-input {
-  display: inline-block;
-  
-  width: 50%;
-
-  input {
-    background: transparent;
-    border: 0px;
-    -webkit-appearance: none;
-    border-radius: 0px;
-    padding: 12px;
-    height: 47px;
-    caret-color: #1a1818;
-
-    &:-webkit-autofill {
-      box-shadow: 0 0 0px 1000px #e5e5e5 inset !important;
-      -webkit-text-fill-color: #454545 !important;
-      color:#454545 !important;
-    }
-  }
-}
-
 //表尾 上一页按钮
 .table-footer {
   padding: 1px 20px;
 }
 
+// .el-table /deep/ thead th {
+//   font-weight: 400;
+//   font-size: 12px;
+// }
 .el-table /deep/ thead th {
+  background-color: #fafdff;
   font-weight: 400;
+  border-color: #E6E6E6;
+  color: #475059;
   font-size: 12px;
 }
 
 .el-table /deep/ tbody tr td {
-  font-size: 12px;
+  border-top-color: transparent;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  border-bottom-color: #E6E6E6;
+  font-size: 13px;
 }
 
 .el-table /deep/ thead .el-checkbox {
@@ -96,6 +85,16 @@ body .el-table th.gutter {
   height: calc(100% - 58px) !important;
 }
 
+.n-table--border {
+  border-color: #e6e6e6;
+  border-left-color: transparent;
+  border-right-color: transparent;
+}
+
+.n-table--border::after {
+  display: none;
+}
+
 .el-dropdown-link {
   cursor: pointer;
   color: #409EFF;
@@ -108,4 +107,14 @@ body .el-table th.gutter {
   color: #8492a6;
   font-size: 14px;
   margin-bottom: 20px;
+}
+
+.link-type,
+.link-type:focus {
+  color: #337ab7;
+  cursor: pointer;
+
+  &:hover {
+    color: rgb(32, 160, 255);
+  }
 }
\ No newline at end of file