From 33fe2f5eb0950d0fa22f6ce11612605366d2accb Mon Sep 17 00:00:00 2001
From: liuyunfeng <yunfeng.liu@ccwin-in.com>
Date: Tue, 11 Mar 2025 08:47:31 +0800
Subject: [PATCH] =?UTF-8?q?public/index.html=E6=B7=BB=E5=8A=A0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=98=E9=87=8F=EF=BC=8C=E6=AD=A3=E5=B8=B8=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/public/index.html                         |    5 +
 vue/src/App.vue                               |    5 +
 .../newJit/baseData/excludePartCfgs/index.vue |   10 +-
 .../basedate/m100Online/RepetitionMB.vue      | 1440 +++----
 .../basedate/m100Online/RepetitionZHB.vue     | 1517 ++++---
 .../pg-fis/basedate/m100Online/ScrapMB.vue    | 1614 ++++---
 .../pg-fis/basedate/m100Online/ScrapZHB.vue   | 1613 ++++---
 .../pg-fis/basedate/m100Online/budaMB.vue     | 1365 +++---
 .../pg-fis/basedate/m100Online/budaZHB.vue    | 1434 +++----
 .../pg-fis/basedate/m100Online/detail.vue     |  649 ++-
 .../pg-fis/basedate/m100Online/detailMB.vue   | 1400 +++---
 .../pg-fis/basedate/m100Online/detailZHB.vue  | 1380 +++---
 .../pg-fis/basedate/m100Online/index.vue      |    2 +-
 .../basedate/m100Online/normalPritIndex.vue   | 3812 ++++++++---------
 .../pg-fis/basedate/partSwitch/index.vue      |    2 +-
 .../pg-fis/basedate/productLine/index.vue     |    2 +-
 .../pg-fis/basedate/repeatR100/index.vue      |    2 +-
 vue/static/config.js                          |   36 +-
 18 files changed, 7801 insertions(+), 8487 deletions(-)

diff --git a/vue/public/index.html b/vue/public/index.html
index ccd356df..5bfd0021 100644
--- a/vue/public/index.html
+++ b/vue/public/index.html
@@ -7,6 +7,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
+		<script>
+		  // 初始化
+		  window.SITE_CONFIG = {};
+		</script>
+		<script src="./config.js"></script>
 <!--    <link rel="stylesheet" href="./css/style.css" type="text/css" />-->
     <!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->
 
diff --git a/vue/src/App.vue b/vue/src/App.vue
index 6a13cb9d..82ed3257 100644
--- a/vue/src/App.vue
+++ b/vue/src/App.vue
@@ -42,5 +42,10 @@
     },
 
   }
+	
+	localStorage.setItem('config_ip',window.SITE_CONFIG['config_ip'])
+	localStorage.setItem('config_auth_port',window.SITE_CONFIG['config_auth_port'])
+	localStorage.setItem('config_public_port',window.SITE_CONFIG['config_public_port'])
+	localStorage.setItem('config_backend_port',window.SITE_CONFIG['config_backend_port'])
 </script>
 
diff --git a/vue/src/views/newJit/baseData/excludePartCfgs/index.vue b/vue/src/views/newJit/baseData/excludePartCfgs/index.vue
index 397d2b4a..92899991 100644
--- a/vue/src/views/newJit/baseData/excludePartCfgs/index.vue
+++ b/vue/src/views/newJit/baseData/excludePartCfgs/index.vue
@@ -151,7 +151,7 @@ export default {
     };
   },
   created() {
-		debugger
+		//debugger
 		console.log("进入excludePartCfgs模块");
 
     this.getList();
@@ -193,7 +193,7 @@ export default {
 			//debugger
       this.isLoading = true;
 			console.log(JSON.stringify(this.inputParam))
-			debugger
+			//debugger
       this.$axios
 				.gets("/api/newjit/exclude-part-cfg/getlist", this.inputParam)
 				//.posts("/api/newjit/exclude-part-cfg/get-list", this.inputParam) 
@@ -301,12 +301,12 @@ export default {
         type: "warning",
       })
         .then(() => {
-					debugger
+					//debugger
 					var arrStr = params.join();
 							this.$axios
 									  .deletes("/api/newjit/exclude-part-cfg/delete/" + arrStr)
 									  .then((response) => {
-											debugger
+											//debugger
 									    if (response.status)
 											{
 												this.$notify({
@@ -336,7 +336,7 @@ export default {
 		 */
     async handleExport() {
       this.isLoading = true;
-			debugger
+			//debugger
 			this.$axios
 				.BolbGets("/api/newjit/exclude-part-cfg/export", this.inputParam)
 			  .then((res) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
index 123c628b..92469343 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
@@ -1,53 +1,30 @@
 <!--重新打印门板模块-->
 <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-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item>
+						<el-col :span="12">
+							<el-form-item prop="billNum" label="装箱单号">
+								<el-input v-model="listQuery.billNum" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="partType" label="零件类型">
+								<el-input v-model="listQuery.partType" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="HostSN">
-                <el-input
-                  v-model="listQuery.HostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-           <!-- <el-col class="line" :span="2">-</el-col>
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="HostSN">
+								<el-input v-model="listQuery.HostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<!-- <el-col class="line" :span="2">-</el-col>
             <el-col :span="11">
               <el-form-item prop="endHostSN">
                 <el-input
@@ -61,9 +38,9 @@
               </el-form-item>
             </el-col>
             -->
-          </el-form-item>
+					</el-form-item>
 
-          <!-- <el-form-item label="底盘号码">
+					<!-- <el-form-item label="底盘号码">
             <el-col :span="11">
               <el-form-item prop="Vin">
                 <el-input
@@ -75,8 +52,8 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item> -->
-            <!-- </el-col> -->
-           <!--  <el-col class="line" :span="2">-</el-col>
+					<!-- </el-col> -->
+					<!--  <el-col class="line" :span="2">-</el-col>
             <el-col :span="11">
               <el-form-item prop="endVin">
                 <el-input
@@ -90,724 +67,693 @@
               </el-form-item>
             </el-col>
             -->
-          <!-- </el-form-item> -->
+					<!-- </el-form-item> -->
 
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
+					<el-form-item label="打印日期">
+						<el-date-picker v-model="PrintTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+					</el-form-item>
 
-          <el-form-item >
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底盘号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
-              ></el-table-column>
-              <el-table-column
-                prop="topBoxPositionNum"
-                label="上箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="topSAPMaterialNum"
-                label="上箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="topMaterialDescription"
-                label="上箱位 物料描述"
-              ></el-table-column>
-              <el-table-column
-                prop="belowBoxPositionNum"
-                label="下箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowSAPMaterialNum"
-                label="下箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowMaterialDescription "
-                label="下箱位 物料描述"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
+					<el-form-item>
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
+						<el-button class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleUpdate()">重打</el-button>
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px"></el-table-column>
+				<el-table-column type="expand" prop="details" label="详表">
+					<template slot-scope="scope">
+						<el-table :data="scope.row.details">
+							<el-table-column prop="knr" label="KNR订单号"></el-table-column>
+							<el-table-column prop="vin" label="底盘号"></el-table-column>
+							<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
+							<el-table-column prop="vehicleModel_DoorPlankCode" label="车型门板代码"></el-table-column>
+							<el-table-column prop="topBoxPositionNum" label="上箱位号"></el-table-column>
+							<el-table-column prop="topSAPMaterialNum" label="上箱位 SAP物料号"></el-table-column>
+							<el-table-column prop="topMaterialDescription" label="上箱位 物料描述"></el-table-column>
+							<el-table-column prop="belowBoxPositionNum" label="下箱位号"></el-table-column>
+							<el-table-column prop="belowSAPMaterialNum" label="下箱位 SAP物料号"></el-table-column>
+							<el-table-column prop="belowMaterialDescription " label="下箱位 物料描述"></el-table-column>
+						</el-table>
+					</template>
+				</el-table-column>
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</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 { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
 
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  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为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
-      tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
+	export default {
+		name: "M100Online-MB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosMB: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			const validVersion = (rule, value, callback) => {
+				let numberReg = /^\d{6}$/;
+				if (!numberReg.test(value)) {
+					callback(new Error("只能为6位数字！"));
+				} else {
+					callback();
+				}
+			};
+			return {
+				crmType: "M100Online-MB",
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "",
+					productLine: "",
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					billNum: undefined,
+					partType: undefined,
+					Vin: undefined,
+					HostSN: undefined,
+					beginPrintDate: undefined,
+					endPrintDate: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					Vin: undefined,
+					HostSN: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					Vin: undefined,
+					HostSN: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		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为页面上部标签高度
+				//this.tableHeight = offsetHei -260
+			});
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosMB: {
+				handler(newVal) {
+					console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = element.PrintType;
+							this.customerInfo.productLine = element.ProductLine;
+						});
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "装箱单号",
+					prop: "billNum",
+					width: 140
+				});
+				tempsTabs.push({
+					label: "单据顺号",
+					prop: "billSerialNum",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "起始顺序号",
+					prop: "beginHostSN",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "结束顺序号",
+					prop: "endHostSN",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "左或右",
+					prop: "billLocation",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "供应商厂家代码",
+					prop: "providerCode",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "零件类型",
+					prop: "partType",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "器具容量",
+					prop: "capacity",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "打印日期",
+					prop: "printDate",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "打印类型",
+					prop: "printType",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "生产线",
+					prop: "productLine",
+					width: 120,
+				});
 
-      tempsTabs.push({
-        label: "起始底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "结束底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
+				tempsTabs.push({
+					label: "起始底盘号",
+					prop: "beginVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "结束底盘号",
+					prop: "endVin",
+					width: 160,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+			handleRowClick(row, column, event) {
+				this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+			exChange(row, rowList) {
+				//this.listLoading = true;
 
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      if (this.listQuery.Vin != "") {
-        this.listQuery.Vin = this.listQuery.Vin;
-      }
-      if (this.listQuery.HostSN != "") {
-        this.listQuery.HostSN = this.listQuery.HostSN;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          
-          response.items.forEach((item)=>{
-            if(item.printType == 0)
-            {
-              item.printType = "正常打印";
-            }
-            else if(item.printType == 1)
-            {
-              item.printType = "重打";
-            }
-            else
-            {
-              item.printType = "补打";
-            }
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			//门板
+			getList(data) {
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQuery.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQuery.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.billNum != "") {
+					this.listQuery.billNum = this.listQuery.billNum;
+				}
+				if (this.listQuery.Vin != "") {
+					this.listQuery.Vin = this.listQuery.Vin;
+				}
+				if (this.listQuery.HostSN != "") {
+					this.listQuery.HostSN = this.listQuery.HostSN;
+				}
+				this.listQuery.partType = this.listQuery.partType;
+				var getdate5 = JSON.stringify(this.PrintTimeValue);
+				if (getdate5 != "[]") {
+					this.listQuery.beginPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[0] || undefined :
+						undefined;
+					this.listQuery.endPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[1] || undefined :
+						undefined;
+				} else {
+					this.listQuery.beginPrintDate = undefined;
+					this.listQuery.endPrintDate = undefined;
+				}
+				if (this.customerInfo.productLine != "") {
+					this.listQuery.ProductLine = this.customerInfo.productLine;
+				}
+				console.log(JSON.stringify(this.listQuery));
+				this.$axios
+					.posts(
+						"/api/newjit/MenBanPackingList/MenBanPackingList-List",
+						this.listQuery
+					)
+					.then((response) => {
 
-          });
-          this.list = response.items;
-          this.totalCount = response.totalCount;
+						response.items.forEach((item) => {
+							if (item.printType == 0) {
+								item.printType = "正常打印";
+							} else if (item.printType == 1) {
+								item.printType = "重打";
+							} else {
+								item.printType = "补打";
+							}
 
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      var MBVin1 = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        MBVin1.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          MBVin1.push(id);
-        });
-        myalert = "选中项";
-      }
-        // let MBVin1 = this.multipleSelection[0].id;
-    //    let MBId = MBVin1;
-    //     var params = {
-    //       printType: 1,
-    //       productLine: this.customerInfo.productLine,
-    //       reportIdList: MBId,
-    //     };
+						});
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//重新打印-门板
+			handleUpdate(row) {
+				var MBVin1 = [];
+				let myalert = ""; //声明变量，其变量必须在此声明后使用
+				if (row) {
+					//单行
+					MBVin1.push(row.id);
+					myalert = row.name;
+				} else {
+					//多选
+					this.multipleSelection.forEach((element) => {
+						let id = element.id;
+						MBVin1.push(id);
+					});
+					myalert = "选中项";
+				}
+				// let MBVin1 = this.multipleSelection[0].id;
+				//    let MBId = MBVin1;
+				//     var params = {
+				//       printType: 1,
+				//       productLine: this.customerInfo.productLine,
+				//       reportIdList: MBId,
+				//     };
 				// debugger //重新打印
-    //     console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-    //     this.$axios
-    //       .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-    //       .then((response) => {
-    //         //alert(response.status);
-    //         const index = this.list.indexOf(row);
-    //         if (response.status === false) {
-    //           this.$message({
-    //             message: response.message,
-    //             type: "error",
-    //           });
-    //           return;
-    //         } else if (response.status === true) {
-    //           this.fileQuery.dataname = JSON.stringify(response.item);
-    //           console.log(
-    //             "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-    //               JSON.stringify(this.fileQuery.dataname)
-    //           );
-    //           this.$axios
-    //             .posts(
-    //               "/Handlers/Handler1.ashx?report=menban",
-    //               qs.stringify(this.fileQuery)
-    //             )
-    //             .then((response) => {
-    //               this.printpdf(response); //打印我文件流
-    //             });
-    //            this.getList();
-    //         }
-    //       })
-    //       .catch(() => {});
-		
-		debugger //重新打印
-        var params = MBVin1; //选中的门板ID列表
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/load-menban-report", params)
-          .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-               this.getList();
-            }
-          })
-          .catch(() => {});		
+				//     console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+				//     this.$axios
+				//       .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
+				//       .then((response) => {
+				//         //alert(response.status);
+				//         const index = this.list.indexOf(row);
+				//         if (response.status === false) {
+				//           this.$message({
+				//             message: response.message,
+				//             type: "error",
+				//           });
+				//           return;
+				//         } else if (response.status === true) {
+				//           this.fileQuery.dataname = JSON.stringify(response.item);
+				//           console.log(
+				//             "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+				//               JSON.stringify(this.fileQuery.dataname)
+				//           );
+				//           this.$axios
+				//             .posts(
+				//               "/Handlers/Handler1.ashx?report=menban",
+				//               qs.stringify(this.fileQuery)
+				//             )
+				//             .then((response) => {
+				//               this.printpdf(response); //打印我文件流
+				//             });
+				//            this.getList();
+				//         }
+				//       })
+				//       .catch(() => {});
+
+				//debugger //重新打印
+				var params = MBVin1; //选中的门板ID列表
+				console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+				this.$axios
+					.posts("/api/newjit/bill-m100/load-menban-report", params)
+					.then((response) => {
+						//alert(response.status);
+						const index = this.list.indexOf(row);
+						if (response.status === false) {
+							this.$message({
+								message: response.message,
+								type: "error",
+							});
+							return;
+						} else if (response.status === true) {
+							this.fileQuery.dataname = JSON.stringify(response.item);
+							console.log(
+								"门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+								JSON.stringify(this.fileQuery.dataname)
+							);
+							this.$axios
+								.posts(
+									"/Handlers/Handler1.ashx?report=menban",
+									qs.stringify(this.fileQuery)
+								)
+								.then((response) => {
+									this.printpdf(response); //打印我文件流
+								});
+							this.getList();
+						}
+					})
+					.catch(() => {});
 
 
 
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/MenBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
+			},
+			//作废操作，支持批量操作-门板
+			handleDelete(row) {
+				//批量删除
+				var params = [];
+				let myalert = ""; //声明变量，其变量必须在此声明后使用
+				if (row) {
+					//单行
+					params.push(row.id);
+					myalert = row.name;
+				} else {
+					//多选
+					this.multipleSelection.forEach((element) => {
+						let id = element.id;
+						params.push(id);
+					});
+					myalert = "选中项";
+				}
+				this.$confirm("是否作废" + myalert + "?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+					.then(() => {
+						this.$axios
+							.posts("/api/newjit/MenBanPackingList/delete", params)
+							.then((response) => {
+								const index = this.list.indexOf(row);
+								this.$notify({
+									title: "成功",
+									message: "作废成功",
+									type: "success",
+									duration: 2000,
+								});
+								this.getList();
+							});
+					})
+					.catch(() => {
+						this.$message({
+							type: "info",
+							message: "已取消操作",
+						});
+					});
+			},
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.PrintTimeValue = [];
+				this.handleQuery();
+				this.getProductLine();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+			selectValue(params) {
+				//版本下拉选择
+				this.versionValue = params.value;
+				this.getList();
+			},
 
-    selectOptionsChange(item) {
-      this.getList();
-    },
+			selectOptionsChange(item) {
+				this.getList();
+			},
 
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || 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];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || 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];
+			},
+			//门板
+			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);
-    },
+			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);
+			},
 
-    closeDialog() {},
-  },
-};
+			closeDialog() {},
+		},
+	};
 </script>
 
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
+	@import "../../../pg-fis/styles/crmtable.scss";
+
+	.divider1 {
+		margin: 0;
+	}
 
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
 
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
index c704b3be..a5c4d7ba 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
@@ -1,55 +1,32 @@
 <!--总成模块信息管理页-->
 <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-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item>
+						<el-col :span="12">
+							<el-form-item prop="billNum" label="装箱单号">
+								<el-input v-model="listQuery.billNum" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="partType" label="零件类型">
+								<el-input v-model="listQuery.partType" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="HostSN">
-                <el-input
-                  v-model="listQuery.HostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="HostSN">
+								<el-input v-model="listQuery.HostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <!-- <el-form-item label="底盘号码">
+					<!-- <el-form-item label="底盘号码">
             <el-col :span="11">
               <el-form-item prop="Vin">
                 <el-input
@@ -65,761 +42,731 @@
          
           </el-form-item> -->
 
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
+					<el-form-item label="打印日期">
+						<el-date-picker v-model="PrintTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+					</el-form-item>
 
-          <el-form-item style="margin-top: -20px">
-            <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
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-			  style="visibility: collapse;"
-              >打印当前页</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdateall()"
-              >打印全部</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode"
-                label="柱护板零件号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode2"
-                label="柱护板零件号2"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
+					<el-form-item style="margin-top: -20px">
+						<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 class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleUpdate()" style="visibility: collapse;">打印当前页</el-button>
+						<el-button class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleUpdateall()">打印全部</el-button>
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px"></el-table-column>
+				<el-table-column type="expand" prop="details" label="详表">
+					<template slot-scope="scope">
+						<el-table :data="scope.row.details">
+							<el-table-column prop="knr" label="KNR订单号"></el-table-column>
+							<el-table-column prop="vin" label="底牌号"></el-table-column>
+							<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
+							<el-table-column prop="partCode" label="柱护板零件号"></el-table-column>
+							<el-table-column prop="partCode2" label="柱护板零件号2"></el-table-column>
+						</el-table>
+					</template>
+				</el-table-column>
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</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 { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
 
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "1",
-        productLine: "",
-        partType: "",
-		fwStation: ""
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        HostSN: undefined,
-        Vin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        HostSN: undefined,
-        Vin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  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为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = "1";
-            this.customerInfo.productLine = element.ProductLine;
-			this.customerInfo.fwStation = element.fwStation;
-          });
-          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
-      tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "起始底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "结束底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date); //alert("ifr.src:"+JSON.stringify(ifr.src))
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
+	export default {
+		name: "M100Online-MB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosZHB: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			const validVersion = (rule, value, callback) => {
+				let numberReg = /^\d{6}$/;
+				if (!numberReg.test(value)) {
+					callback(new Error("只能为6位数字！"));
+				} else {
+					callback();
+				}
+			};
+			return {
+				crmType: "M100Online-MB",
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "1",
+					productLine: "",
+					partType: "",
+					fwStation: ""
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					billNum: undefined,
+					partType: undefined,
+					Vin: undefined,
+					HostSN: undefined,
+					beginPrintDate: undefined,
+					endPrintDate: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					HostSN: undefined,
+					Vin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					HostSN: undefined,
+					Vin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		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为页面上部标签高度
+				//this.tableHeight = offsetHei -260
+			});
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosZHB: {
+				handler(newVal) {
+					console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = "1";
+							this.customerInfo.productLine = element.ProductLine;
+							this.customerInfo.fwStation = element.fwStation;
+						});
+						console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "装箱单号",
+					prop: "billNum",
+					width: 140
+				});
+				tempsTabs.push({
+					label: "单据顺号",
+					prop: "billSerialNum",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "起始顺序号",
+					prop: "beginHostSN",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "结束顺序号",
+					prop: "endHostSN",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "零件类型",
+					prop: "partType",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "左或右",
+					prop: "billLocation",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "器具容量",
+					prop: "capacity",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "打印日期",
+					prop: "printDate",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "打印类型",
+					prop: "printType",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "生产线",
+					prop: "productLine",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "起始底盘号",
+					prop: "beginVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "结束底盘号",
+					prop: "endVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "供应商厂家代码",
+					prop: "providerCode",
+					width: 150,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date); //alert("ifr.src:"+JSON.stringify(ifr.src))
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+			handleRowClick(row, column, event) {
+				this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+			exChange(row, rowList) {
+				//this.listLoading = true;
 
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      if (this.listQuery.HostSN != "") {
-        this.listQuery.HostSN = this.listQuery.HostSN;
-      }
-      if (this.listQuery.Vin != "") {
-        this.listQuery.Vin = this.listQuery.Vin;
-      }
-      //this.listQuery.partType = this.listQuery.partType;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-      if (this.customerInfo.fwStation != "") {
-        this.listQuery.fwStation = this.customerInfo.fwStation;
-      }
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			//门板
+			getList(data) {
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQuery.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQuery.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.billNum != "") {
+					this.listQuery.billNum = this.listQuery.billNum;
+				}
+				if (this.listQuery.HostSN != "") {
+					this.listQuery.HostSN = this.listQuery.HostSN;
+				}
+				if (this.listQuery.Vin != "") {
+					this.listQuery.Vin = this.listQuery.Vin;
+				}
+				//this.listQuery.partType = this.listQuery.partType;
+				var getdate5 = JSON.stringify(this.PrintTimeValue);
+				if (getdate5 != "[]") {
+					this.listQuery.beginPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[0] || undefined :
+						undefined;
+					this.listQuery.endPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[1] || undefined :
+						undefined;
+				} else {
+					this.listQuery.beginPrintDate = undefined;
+					this.listQuery.endPrintDate = undefined;
+				}
+				if (this.customerInfo.productLine != "") {
+					this.listQuery.ProductLine = this.customerInfo.productLine;
+				}
+				if (this.customerInfo.fwStation != "") {
+					this.listQuery.fwStation = this.customerInfo.fwStation;
+				}
 
 
-      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          response.items.forEach((item) => {
-            if (item.printType == 0) {
-              item.printType = "正常打印";
-            } else if (item.printType == 1) {
-              item.printType = "重打";
-            } else {
-              item.printType = "补打";
-            }
-          });
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].id;
-        let ZHBId = [beginVin1];
-        var params = {
-          printType: "1",
-          productLine: this.customerInfo.productLine,
-		  fwStation: this.customerInfo.fwStation,
-          reportIdList: ZHBId,
-          partType: this.multipleSelection[0].partType,
-          dataResultType: "2",
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          //.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-		  .posts("/api/newjit/bill-m100/load-zhuhuban-report", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
+				console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
+				this.$axios
+					.posts(
+						"/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
+						this.listQuery
+					)
+					.then((response) => {
+						response.items.forEach((item) => {
+							if (item.printType == 0) {
+								item.printType = "正常打印";
+							} else if (item.printType == 1) {
+								item.printType = "重打";
+							} else {
+								item.printType = "补打";
+							}
+						});
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//重新打印-门板
+			handleUpdate(row) {
+				this.isEdit = true;
+				if (this.multipleSelection.length != 1) {
+					this.$message({
+						message: "重新打印必须选择单行，不能多选！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//this.fetchData(this.multipleSelection[0].id);
+					//重新打印方法
+					let beginVin1 = this.multipleSelection[0].id;
+					let ZHBId = [beginVin1];
+					var params = {
+						printType: "1",
+						productLine: this.customerInfo.productLine,
+						fwStation: this.customerInfo.fwStation,
+						reportIdList: ZHBId,
+						partType: this.multipleSelection[0].partType,
+						dataResultType: "2",
+					};
+					console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+					this.$axios
+						//.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+						.posts("/api/newjit/bill-m100/load-zhuhuban-report", params)
+						.then((response) => {
+							console.log("柱护版-打印返回的状态：" + response.status);
+							const index = this.list.indexOf(row);
+							if (response.status === false) {
+								this.$message({
+									message: response.message,
+									type: "error",
+								});
+								return;
+							} else if (response.status === true) {
+								this.fileQuery.dataname = JSON.stringify(response.item);
+								console.log(
+									"柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+									JSON.stringify(this.fileQuery.dataname)
+								);
 
-              debugger
-              let partNum = 0;
-              if(params.partType == "A上C上")
-              {
-                partNum = 1;
-              }
-              else if(params.partType == "B柱下")
-              {
-                partNum = 2;
-              }
-              else if(params.partType == "A柱下A中")
-              {
-                partNum = 3;
-              }
-              else if(params.partType == "B柱上")
-              {
-                partNum = 4;
-              }
-              else if(params.partType == "D柱")
-              {
-                partNum = 5;
-              }
-              else if(params.partType == "后轮上装饰板")
-              {
-                partNum = 6;
-              }
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report="+partNum+"&returnfile=0",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-              this.getList();
-            }
-          })
-          .catch(() => {});
-      }
+								//debugger
+								let partNum = 0;
+								if (params.partType == "A上C上") {
+									partNum = 1;
+								} else if (params.partType == "B柱下") {
+									partNum = 2;
+								} else if (params.partType == "A柱下A中") {
+									partNum = 3;
+								} else if (params.partType == "B柱上") {
+									partNum = 4;
+								} else if (params.partType == "D柱") {
+									partNum = 5;
+								} else if (params.partType == "后轮上装饰板") {
+									partNum = 6;
+								}
+								this.$axios
+									.posts(
+										"/Handlers/Handler1.ashx?report=" + partNum + "&returnfile=0",
+										qs.stringify(this.fileQuery)
+									)
+									.then((response) => {
+										this.printpdf(response); //打印我文件流
+									});
+								this.getList();
+							}
+						})
+						.catch(() => {});
+				}
 
-    },
-    handleUpdateall(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        debugger;
-        let beginVin1 = this.multipleSelection[0].id;
-        let ZHBId = [beginVin1];
-        var params = {
-          printType: "1",
-          productLine: this.customerInfo.productLine,
-		  fwStation: this.customerInfo.fwStation,
-          reportIdList: ZHBId,
-          //partType: this.multipleSelection[0].partType,
-          dataResultType: "1",
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-		let _this = this;
-        this.$axios
-          //.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-		  .posts("/api/newjit/bill-m100/load-zhuhuban-report", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-              this.getList();
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
+			},
+			handleUpdateall(row) {
+				this.isEdit = true;
+				if (this.multipleSelection.length != 1) {
+					this.$message({
+						message: "重新打印必须选择单行，不能多选！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//this.fetchData(this.multipleSelection[0].id);
+					//重新打印方法
+					debugger;
+					let beginVin1 = this.multipleSelection[0].id;
+					let ZHBId = [beginVin1];
+					var params = {
+						printType: "1",
+						productLine: this.customerInfo.productLine,
+						fwStation: this.customerInfo.fwStation,
+						reportIdList: ZHBId,
+						//partType: this.multipleSelection[0].partType,
+						dataResultType: "1",
+					};
+					console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+					let _this = this;
+					this.$axios
+						//.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+						.posts("/api/newjit/bill-m100/load-zhuhuban-report", params)
+						.then((response) => {
+							console.log("柱护版-打印返回的状态：" + response.status);
+							const index = this.list.indexOf(row);
+							if (response.status === false) {
+								this.$message({
+									message: response.message,
+									type: "error",
+								});
+								return;
+							} else if (response.status === true) {
+								this.fileQuery.dataname = JSON.stringify(response.item);
+								console.log(
+									"柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+									JSON.stringify(this.fileQuery.dataname)
+								);
+								this.$axios
+									.posts(
+										"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
+										qs.stringify(this.fileQuery)
+									)
+									.then((response) => {
+										this.printpdf(response); //打印我文件流
+									});
+								this.getList();
+							}
+						})
+						.catch(() => {});
+				}
+			},
+			//作废操作，支持批量操作-门板
+			handleDelete(row) {
+				//批量删除
+				var params = [];
+				let myalert = ""; //声明变量，其变量必须在此声明后使用
+				if (row) {
+					//单行
+					params.push(row.id);
+					myalert = row.name;
+				} else {
+					//多选
+					this.multipleSelection.forEach((element) => {
+						let id = element.id;
+						params.push(id);
+					});
+					myalert = "选中项";
+				}
+				this.$confirm("是否作废" + myalert + "?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+					.then(() => {
+						this.$axios
+							.posts("/api/newjit/ZhuHuBanPackingList/delete", params)
+							.then((response) => {
+								const index = this.list.indexOf(row);
+								this.$notify({
+									title: "成功",
+									message: "作废成功",
+									type: "success",
+									duration: 2000,
+								});
+								this.getList();
+							});
+					})
+					.catch(() => {
+						this.$message({
+							type: "info",
+							message: "已取消操作",
+						});
+					});
+			},
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.PrintTimeValue = [];
+				this.handleQuery();
+				this.getProductLine();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+			selectValue(params) {
+				//版本下拉选择
+				this.versionValue = params.value;
+				this.getList();
+			},
 
-    selectOptionsChange(item) {
-      this.getList();
-    },
+			selectOptionsChange(item) {
+				this.getList();
+			},
 
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || 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];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || 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];
+			},
+			//门板
+			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);
-    },
+			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);
+			},
 
-    closeDialog() {},
-  },
-};
+			closeDialog() {},
+		},
+	};
 </script>
 
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
+	@import "../../../pg-fis/styles/crmtable.scss";
+
+	.divider1 {
+		margin: 0;
+	}
 
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
 
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
index c51e713b..3875bc3b 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -1,55 +1,32 @@
 <!--总成模块信息管理页-->
 <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-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item>
+						<el-col :span="12">
+							<el-form-item prop="billNum" label="装箱单号">
+								<el-input v-model="listQuery.billNum" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="partType" label="零件类型">
+								<el-input v-model="listQuery.partType" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="HostSN">
-                <el-input
-                  v-model="listQuery.HostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="HostSN">
+								<el-input v-model="listQuery.HostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <!-- <el-form-item label="底盘号码">
+					<!-- <el-form-item label="底盘号码">
             <el-col :span="11">
               <el-form-item prop="Vin">
                 <el-input
@@ -65,827 +42,768 @@
            
           </el-form-item> -->
 
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
+					<el-form-item label="打印日期">
+						<el-date-picker v-model="PrintTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+					</el-form-item>
+
+					<el-form-item>
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
 
-          <el-form-item >
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
+						<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click="print()">作废(支持批量)</el-button>
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px"></el-table-column>
+				<el-table-column type="expand" prop="details" label="详表">
+					<template slot-scope="scope">
+						<el-table :data="scope.row.details">
+							<el-table-column prop="knr" label="KNR订单号"></el-table-column>
+							<el-table-column prop="vin" label="底盘号"></el-table-column>
+							<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
+							<el-table-column prop="vehicleModel_DoorPlankCode" label="车型门板代码"></el-table-column>
+							<el-table-column prop="topBoxPositionNum" label="上箱位号"></el-table-column>
+							<el-table-column prop="topSAPMaterialNum" label="上箱位 SAP物料号"></el-table-column>
+							<el-table-column prop="topMaterialDescription" label="上箱位 物料描述"></el-table-column>
+							<el-table-column prop="belowBoxPositionNum" label="下箱位号"></el-table-column>
+							<el-table-column prop="belowSAPMaterialNum" label="下箱位 SAP物料号"></el-table-column>
+							<el-table-column prop="belowMaterialDescription " label="下箱位 物料描述"></el-table-column>
+						</el-table>
+					</template>
+				</el-table-column>
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</div>
 
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="print()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底盘号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
-              ></el-table-column>
-              <el-table-column
-                prop="topBoxPositionNum"
-                label="上箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="topSAPMaterialNum"
-                label="上箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="topMaterialDescription"
-                label="上箱位 物料描述"
-              ></el-table-column>
-              <el-table-column
-                prop="belowBoxPositionNum"
-                label="下箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowSAPMaterialNum"
-                label="下箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowMaterialDescription "
-                label="下箱位 物料描述"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-    
-    <div>
-      <el-dialog
-        title="作废信息"
-        append-to-body="true"
-        :visible.sync="dialogTableVisible"
-      >
-        <el-table :data="zflist" class="dialogDiv">
-          <el-table-column
-            property="billNum"
-            label="装箱单号"
-            width="105"
-          ></el-table-column>
-          <el-table-column
-            property="billSerialNum"
-            label="单据顺号"
-            width="95"
-          ></el-table-column>
-          <el-table-column
-            property="billLocation"
-            label="左或右"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="providerCode"
-            label="供应商厂家代码"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="partType"
-            label="零件类型"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="capacity"
-            label="器具容量"
-            width="110"
-          ></el-table-column>
-          <el-table-column
-            property="printDate"
-            label="打印日期"
-            width="90"
-          ></el-table-column>
-        </el-table>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogTableVisible = false"
-            >取消</el-button
-          >
-          <el-button type="primary" @click="handleDelete">确 认</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
+		<div>
+			<el-dialog title="作废信息" append-to-body="true" :visible.sync="dialogTableVisible">
+				<el-table :data="zflist" class="dialogDiv">
+					<el-table-column property="billNum" label="装箱单号" width="105"></el-table-column>
+					<el-table-column property="billSerialNum" label="单据顺号" width="95"></el-table-column>
+					<el-table-column property="billLocation" label="左或右" width="100"></el-table-column>
+					<el-table-column property="providerCode" label="供应商厂家代码" width="100"></el-table-column>
+					<el-table-column property="partType" label="零件类型" width="100"></el-table-column>
+					<el-table-column property="capacity" label="器具容量" width="110"></el-table-column>
+					<el-table-column property="printDate" label="打印日期" width="90"></el-table-column>
+				</el-table>
+				<div slot="footer" class="dialog-footer">
+					<el-button type="text" @click="dialogTableVisible = false">取消</el-button>
+					<el-button type="primary" @click="handleDelete">确 认</el-button>
+				</div>
+			</el-dialog>
+		</div>
+	</div>
 </template>
 
 <script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
+
+	export default {
+		name: "M100Online-MB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosMB: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			const validVersion = (rule, value, callback) => {
+				let numberReg = /^\d{6}$/;
+				if (!numberReg.test(value)) {
+					callback(new Error("只能为6位数字！"));
+				} else {
+					callback();
+				}
+			};
+			return {
+				crmType: "M100Online-MB",
+				dialogTableVisible: false,
+				zflist: null,
+				zuofei: [],
+				getRowKeys:
+
 
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      dialogTableVisible: false,
-      zflist: null,
-      zuofei: [],
-      getRowKeys:
-      
-      
-      (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        Vin: undefined,
-        HostSN: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  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为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 150 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 115 });
-      tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 115 });
-      tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
+					(row) => {
+						return row.id; //这里看这一行中需要根据哪个属性值是id
+					},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "",
+					productLine: "",
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					billNum: undefined,
+					partType: undefined,
+					Vin: undefined,
+					HostSN: undefined,
+					beginPrintDate: undefined,
+					endPrintDate: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					Vin: undefined,
+					HostSN: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					Vin: undefined,
+					HostSN: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		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为页面上部标签高度
+				//this.tableHeight = offsetHei -260
+			});
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosMB: {
+				handler(newVal) {
+					console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = element.PrintType;
+							this.customerInfo.productLine = element.ProductLine;
+						});
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "装箱单号",
+					prop: "billNum",
+					width: 150
+				});
+				tempsTabs.push({
+					label: "单据顺号",
+					prop: "billSerialNum",
+					width: 115
+				});
+				tempsTabs.push({
+					label: "起始顺序号",
+					prop: "beginHostSN",
+					width: 115
+				});
+				tempsTabs.push({
+					label: "结束顺序号",
+					prop: "endHostSN",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "左或右",
+					prop: "billLocation",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "供应商厂家代码",
+					prop: "providerCode",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "零件类型",
+					prop: "partType",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "器具容量",
+					prop: "capacity",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "打印日期",
+					prop: "printDate",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "打印类型",
+					prop: "printType",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "生产线",
+					prop: "productLine",
+					width: 120,
+				});
 
-      tempsTabs.push({
-        label: "起始底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "结束底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
+				tempsTabs.push({
+					label: "起始底盘号",
+					prop: "beginVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "结束底盘号",
+					prop: "endVin",
+					width: 160,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+			handleRowClick(row, column, event) {
+				this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+			exChange(row, rowList) {
+				//this.listLoading = true;
 
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      if (this.listQuery.Vin != "") {
-        this.listQuery.Vin = this.listQuery.Vin;
-      }
-      if (this.listQuery.HostSN != "") {
-        this.listQuery.HostSN = this.listQuery.HostSN;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			//门板
+			getList(data) {
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQuery.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQuery.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.billNum != "") {
+					this.listQuery.billNum = this.listQuery.billNum;
+				}
+				if (this.listQuery.Vin != "") {
+					this.listQuery.Vin = this.listQuery.Vin;
+				}
+				if (this.listQuery.HostSN != "") {
+					this.listQuery.HostSN = this.listQuery.HostSN;
+				}
+				this.listQuery.partType = this.listQuery.partType;
+				var getdate5 = JSON.stringify(this.PrintTimeValue);
+				if (getdate5 != "[]") {
+					this.listQuery.beginPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[0] || undefined :
+						undefined;
+					this.listQuery.endPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[1] || undefined :
+						undefined;
+				} else {
+					this.listQuery.beginPrintDate = undefined;
+					this.listQuery.endPrintDate = undefined;
+				}
+				if (this.customerInfo.productLine != "") {
+					this.listQuery.ProductLine = this.customerInfo.productLine;
+				}
 
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          response.items.forEach((item) => {
-            if (item.printType == 0) {
-              item.printType = "正常打印";
-            } else if (item.printType == 1) {
-              item.printType = "重打";
-            } else {
-              item.printType = "补打";
-            }
-          });
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let Vin1 = this.multipleSelection[0].Vin;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          Vin: Vin1,
-        };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-          .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    print(row) {
-      var params = [];
-      if (row) {
-        //单行
-        params.push(row.id);
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-      }
-      this.zuofei = params;
+				console.log(JSON.stringify(this.listQuery));
+				this.$axios
+					.posts(
+						"/api/newjit/MenBanPackingList/MenBanPackingList-List",
+						this.listQuery
+					)
+					.then((response) => {
+						response.items.forEach((item) => {
+							if (item.printType == 0) {
+								item.printType = "正常打印";
+							} else if (item.printType == 1) {
+								item.printType = "重打";
+							} else {
+								item.printType = "补打";
+							}
+						});
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//重新打印-门板
+			handleUpdate(row) {
+				this.isEdit = true;
+				if (this.multipleSelection.length != 1) {
+					this.$message({
+						message: "重新打印必须选择单行，不能多选！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//this.fetchData(this.multipleSelection[0].id);
+					//重新打印方法
+					let Vin1 = this.multipleSelection[0].Vin;
+					var params = {
+						printType: 1,
+						productLine: this.customerInfo.productLine,
+						Vin: Vin1,
+					};
+					console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+					this.$axios
+						.posts("/api/newjit/bill-m100/print-menban-packing-list", params)
+						.then((response) => {
+							//alert(response.status);
+							const index = this.list.indexOf(row);
+							if (response.status === false) {
+								this.$message({
+									message: response.message,
+									type: "error",
+								});
+								return;
+							} else if (response.status === true) {
+								this.fileQuery.dataname = JSON.stringify(response.item);
+								console.log(
+									"门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+									JSON.stringify(this.fileQuery.dataname)
+								);
+								this.$axios
+									.posts(
+										"/Handlers/Handler1.ashx?report=menban",
+										qs.stringify(this.fileQuery)
+									)
+									.then((response) => {
+										this.printpdf(response); //打印我文件流
+									});
+							}
+						})
+						.catch(() => {});
+				}
+			},
+			print(row) {
+				var params = [];
+				if (row) {
+					//单行
+					params.push(row.id);
+				} else {
+					//多选
+					this.multipleSelection.forEach((element) => {
+						let id = element.id;
+						params.push(id);
+					});
+				}
+				this.zuofei = params;
 
-      this.dialogTableVisible = true;
-      this.$axios
-        .posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
-        .then((response) => {
-          //alert(response.status);
-          const index = this.list.indexOf(row);
-          if (response.status === false) {
-            this.$message({
-              message: response.message,
-              type: "error",
-            });
-            return;
-          } else {
-            this.fileQuery.dataname = JSON.stringify(response);
-            this.zflist = response;
-            console.log(
-              "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                JSON.stringify(this.fileQuery.dataname)
-            );
-          }
-        })
-        .catch(() => {});
-    },
+				this.dialogTableVisible = true;
+				this.$axios
+					.posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
+					.then((response) => {
+						//alert(response.status);
+						const index = this.list.indexOf(row);
+						if (response.status === false) {
+							this.$message({
+								message: response.message,
+								type: "error",
+							});
+							return;
+						} else {
+							this.fileQuery.dataname = JSON.stringify(response);
+							this.zflist = response;
+							console.log(
+								"门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+								JSON.stringify(this.fileQuery.dataname)
+							);
+						}
+					})
+					.catch(() => {});
+			},
 
-    //作废详情页确认按钮
-    handleDelete() {
-      //debugger;
-      let params = this.zuofei;
+			//作废详情页确认按钮
+			handleDelete() {
+				//debugger;
+				let params = this.zuofei;
 
-      this.$axios
-        .posts("/api/newjit/MenBanPackingList/scrap", params)
-        .then((response) => {
-          console.log(
-            "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-              JSON.stringify(response)
-          );
-          this.$notify({
-            title: "成功",
-            message: "作废成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.getList();
-        });
-      this.dialogTableVisible = false;
-      
-    },
+				this.$axios
+					.posts("/api/newjit/MenBanPackingList/scrap", params)
+					.then((response) => {
+						console.log(
+							"门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+							JSON.stringify(response)
+						);
+						this.$notify({
+							title: "成功",
+							message: "作废成功",
+							type: "success",
+							duration: 2000,
+						});
+						this.getList();
+					});
+				this.dialogTableVisible = false;
 
-    //作废操作，支持批量操作-门板
-    // handleDelete(row) {
-    //   //批量删除
-    //   var params = [];
-    //   let myalert = ""; //声明变量，其变量必须在此声明后使用
-    //   let myalertcount = [];
-    //   if (row) {
-    //     //单行
-    //     params.push(row.id);
-    //     myalert = row.name;
-    //   } else {
-    //     //多选
-    //     this.multipleSelection.forEach((element) => {
-    //       let id = element.id;
-    //       params.push(id);
-    //     });
-    //     myalert = "选中项";
-    //   }
-    //   console.log("作废查询参数：" + JSON.stringify(params));
-    //   this.$axios
-    //     .posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
-    //     .then((response) => {
-    //       //alert(response.status);
-    //       const index = this.list.indexOf(row);
-    //       if (response.status === false) {
-    //         this.$message({
-    //           message: response.message,
-    //           type: "error",
-    //         });
-    //         return;
-    //       } else {
-    //         this.fileQuery.dataname = JSON.stringify(response);
-    //         response.forEach((itemsss) => {
-    //           myalertcount.push(itemsss.billNum);
-    //         });
-    //         console.log(
-    //           "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-    //             JSON.stringify(this.fileQuery.dataname)
-    //         );
-    //         this.$confirm(
-    //           "是否作废选中的" + response.length + "条记录?",
-    //           "提示",
-    //           {
-    //             confirmButtonText: "确定",
-    //             cancelButtonText: "取消",
-    //             type: "warning",
-    //           }
-    //         )
-    //           .then(() => {
-    //             this.$axios
-    //               .posts("/api/newjit/MenBanPackingList/scrap", params)
-    //               .then((response) => {
-    //                 const index = this.list.indexOf(row);
-    //                 this.$notify({
-    //                   title: "成功",
-    //                   message: "作废成功",
-    //                   type: "success",
-    //                   duration: 2000,
-    //                 });
-    //                 this.getList();
-    //               });
-    //           })
-    //           .catch(() => {
-    //             this.$message({
-    //               type: "info",
-    //               message: "已取消操作",
-    //             });
-    //           });
-    //       }
-    //     })
-    //     .catch(() => {});
-    // },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
+			},
 
-    selectOptionsChange(item) {
-      this.getList();
-    },
+			//作废操作，支持批量操作-门板
+			// handleDelete(row) {
+			//   //批量删除
+			//   var params = [];
+			//   let myalert = ""; //声明变量，其变量必须在此声明后使用
+			//   let myalertcount = [];
+			//   if (row) {
+			//     //单行
+			//     params.push(row.id);
+			//     myalert = row.name;
+			//   } else {
+			//     //多选
+			//     this.multipleSelection.forEach((element) => {
+			//       let id = element.id;
+			//       params.push(id);
+			//     });
+			//     myalert = "选中项";
+			//   }
+			//   console.log("作废查询参数：" + JSON.stringify(params));
+			//   this.$axios
+			//     .posts("/api/newjit/MenBanPackingList/get-all-del-List", params)
+			//     .then((response) => {
+			//       //alert(response.status);
+			//       const index = this.list.indexOf(row);
+			//       if (response.status === false) {
+			//         this.$message({
+			//           message: response.message,
+			//           type: "error",
+			//         });
+			//         return;
+			//       } else {
+			//         this.fileQuery.dataname = JSON.stringify(response);
+			//         response.forEach((itemsss) => {
+			//           myalertcount.push(itemsss.billNum);
+			//         });
+			//         console.log(
+			//           "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+			//             JSON.stringify(this.fileQuery.dataname)
+			//         );
+			//         this.$confirm(
+			//           "是否作废选中的" + response.length + "条记录?",
+			//           "提示",
+			//           {
+			//             confirmButtonText: "确定",
+			//             cancelButtonText: "取消",
+			//             type: "warning",
+			//           }
+			//         )
+			//           .then(() => {
+			//             this.$axios
+			//               .posts("/api/newjit/MenBanPackingList/scrap", params)
+			//               .then((response) => {
+			//                 const index = this.list.indexOf(row);
+			//                 this.$notify({
+			//                   title: "成功",
+			//                   message: "作废成功",
+			//                   type: "success",
+			//                   duration: 2000,
+			//                 });
+			//                 this.getList();
+			//               });
+			//           })
+			//           .catch(() => {
+			//             this.$message({
+			//               type: "info",
+			//               message: "已取消操作",
+			//             });
+			//           });
+			//       }
+			//     })
+			//     .catch(() => {});
+			// },
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.PrintTimeValue = [];
+				this.handleQuery();
+				this.getProductLine();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+			selectValue(params) {
+				//版本下拉选择
+				this.versionValue = params.value;
+				this.getList();
+			},
 
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || 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];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
+			selectOptionsChange(item) {
+				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);
-    },
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || 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];
+			},
+			//门板
+			handleFilter() {
+				this.page = 1;
+				this.getList();
+			},
 
-    closeDialog() {},
-  },
-};
+			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);
+			},
+
+			closeDialog() {},
+		},
+	};
 </script>
 
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-.dialogDiv {
-   max-height:300px;
-   overflow: auto;
-}
-</style>
+	@import "../../../pg-fis/styles/crmtable.scss";
+
+	.divider1 {
+		margin: 0;
+	}
+
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
 
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
 
+	.dialogDiv {
+		max-height: 300px;
+		overflow: auto;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
index a9ea89f1..30c0d7aa 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
@@ -1,55 +1,32 @@
 <!--总成模块信息管理页-->
 <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-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item>
+						<el-col :span="12">
+							<el-form-item prop="billNum" label="装箱单号">
+								<el-input v-model="listQuery.billNum" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="partType" label="零件类型">
+								<el-input v-model="listQuery.partType" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="HostSN">
-                <el-input
-                  v-model="listQuery.HostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="HostSN">
+								<el-input v-model="listQuery.HostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <!-- <el-form-item label="底盘号码">
+					<!-- <el-form-item label="底盘号码">
             <el-col :span="11">
               <el-form-item prop="beginVin">
                 <el-input
@@ -77,820 +54,770 @@
             </el-col>
           </el-form-item> -->
 
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
-
-          <el-form-item >
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
+					<el-form-item label="打印日期">
+						<el-date-picker v-model="PrintTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+					</el-form-item>
 
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click=" print()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode"
-                label="柱护板零件号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode2"
-                label="柱护板零件号2"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-    <div >
-      <el-dialog
-        title="作废信息"
-        append-to-body="true"
+					<el-form-item>
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
 
-
-        :visible.sync="dialogTableVisible"
-      >
-        <el-table :data="zflist" class="dialogDiv">
-          <el-table-column
-            property="billNum"
-            label="装箱单号"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="billSerialNum"
-            label="单据顺号"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="billLocation"
-            label="左或右"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="providerCode"
-            label="供应商厂家代码"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="partType"
-            label="零件类型"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="capacity"
-            label="器具容量"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            property="printDate"
-            label="打印日期"
-            width="100"
-          ></el-table-column>
-        </el-table>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogTableVisible = false"
-            >取消</el-button
-          >
-          <el-button type="primary" @click="handleDelete">确 认</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
+						<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click=" print()">作废(支持批量)</el-button>
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px"></el-table-column>
+				<el-table-column type="expand" prop="details" label="详表">
+					<template slot-scope="scope">
+						<el-table :data="scope.row.details">
+							<el-table-column prop="knr" label="KNR订单号"></el-table-column>
+							<el-table-column prop="vin" label="底牌号"></el-table-column>
+							<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
+							<el-table-column prop="partCode" label="柱护板零件号"></el-table-column>
+							<el-table-column prop="partCode2" label="柱护板零件号2"></el-table-column>
+						</el-table>
+					</template>
+				</el-table-column>
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</div>
+		<div>
+			<el-dialog title="作废信息" append-to-body="true" :visible.sync="dialogTableVisible">
+				<el-table :data="zflist" class="dialogDiv">
+					<el-table-column property="billNum" label="装箱单号" width="100"></el-table-column>
+					<el-table-column property="billSerialNum" label="单据顺号" width="100"></el-table-column>
+					<el-table-column property="billLocation" label="左或右" width="100"></el-table-column>
+					<el-table-column property="providerCode" label="供应商厂家代码" width="100"></el-table-column>
+					<el-table-column property="partType" label="零件类型" width="100"></el-table-column>
+					<el-table-column property="capacity" label="器具容量" width="100"></el-table-column>
+					<el-table-column property="printDate" label="打印日期" width="100"></el-table-column>
+				</el-table>
+				<div slot="footer" class="dialog-footer">
+					<el-button type="text" @click="dialogTableVisible = false">取消</el-button>
+					<el-button type="primary" @click="handleDelete">确 认</el-button>
+				</div>
+			</el-dialog>
+		</div>
+	</div>
 </template>
 
 <script>
-import Pagination from "@/components/Pagination";
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import importExcel from "@/components/ImportExcel-vw";
-import Lockr from "lockr";
-import { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
+
+	export default {
+		name: "M100Online-MB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosZHB: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			const validVersion = (rule, value, callback) => {
+				let numberReg = /^\d{6}$/;
+				if (!numberReg.test(value)) {
+					callback(new Error("只能为6位数字！"));
+				} else {
+					callback();
+				}
+			};
+			return {
+				crmType: "M100Online-MB",
+				dialogTableVisible: false,
+				zuofei: [],
+				zflist: null,
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "1",
+					productLine: "",
+					fwStation: ""
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					billNum: undefined,
+					partType: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginPrintDate: undefined,
+					endPrintDate: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		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为页面上部标签高度
+				//this.tableHeight = offsetHei -260
+			});
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosZHB: {
+				handler(newVal) {
+					console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = "1";
+							this.customerInfo.productLine = element.ProductLine;
+							this.customerInfo.fwStation = element.fwStation;
+						});
+						console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "装箱单号",
+					prop: "billNum",
+					width: 140
+				});
+				//tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
+				tempsTabs.push({
+					label: "起始顺序号",
+					prop: "beginHostSN",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "结束顺序号",
+					prop: "endHostSN",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "左或右",
+					prop: "billLocation",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "供应商厂家代码",
+					prop: "providerCode",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "零件类型",
+					prop: "partType",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "器具容量",
+					prop: "capacity",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "打印日期",
+					prop: "printDate",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "打印类型",
+					prop: "printType",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "生产线",
+					prop: "productLine",
+					width: 120,
+				});
 
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      dialogTableVisible: false,
-      zuofei: [],
-      zflist: null,
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "1",
-        productLine: "",
-        fwStation: ""
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  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为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = "1";
-            this.customerInfo.productLine = element.ProductLine;
-			this.customerInfo.fwStation = element.fwStation;
-          });
-          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      //tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 });
-      tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
+				tempsTabs.push({
+					label: "起始底盘号",
+					prop: "beginVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "结束底盘号",
+					prop: "endVin",
+					width: 160,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				alert("ifr.src:" + JSON.stringify(ifr.src));
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+			handleRowClick(row, column, event) {
+				this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+			exChange(row, rowList) {
+				//this.listLoading = true;
 
-      tempsTabs.push({
-        label: "起始底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "结束底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      alert("ifr.src:" + JSON.stringify(ifr.src));
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			//门板
+			getList(data) {
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQuery.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQuery.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.billNum != "") {
+					this.listQuery.billNum = this.listQuery.billNum;
+				}
+				this.listQuery.partType = this.listQuery.partType;
+				this.listQuery.beginVin = this.listQuery.beginVin;
+				this.listQuery.endVin = this.listQuery.endVin;
+				this.listQuery.beginHostSN = this.listQuery.beginHostSN;
+				this.listQuery.endHostSN = this.listQuery.endHostSN;
+				var getdate5 = JSON.stringify(this.PrintTimeValue);
+				if (getdate5 != "[]") {
+					this.listQuery.beginPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[0] || undefined :
+						undefined;
+					this.listQuery.endPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[1] || undefined :
+						undefined;
+				} else {
+					this.listQuery.beginPrintDate = undefined;
+					this.listQuery.endPrintDate = undefined;
+				}
+				if (this.customerInfo.productLine != "") {
+					this.listQuery.ProductLine = this.customerInfo.productLine;
+				}
+				if (this.customerInfo.fwStation != "") {
+					this.listQuery.fwStation = this.customerInfo.fwStation;
+				}
 
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
-	  if (this.customerInfo.fwStation != "") {
-	    this.listQuery.fwStation = this.customerInfo.fwStation;
-	  }
+				console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
+				this.$axios
+					.posts(
+						"/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
+						this.listQuery
+					)
+					.then((response) => {
+						response.items.forEach((item) => {
+							if (item.printType == 0) {
+								item.printType = "正常打印";
+							} else if (item.printType == 1) {
+								item.printType = "重打";
+							} else {
+								item.printType = "补打";
+							}
+						});
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//重新打印-门板
+			handleUpdate(row) {
+				this.isEdit = true;
+				if (this.multipleSelection.length != 1) {
+					this.$message({
+						message: "重新打印必须选择单行，不能多选！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//this.fetchData(this.multipleSelection[0].id);
+					//重新打印方法
+					let beginVin1 = this.multipleSelection[0].beginVin1;
+					let endVin1 = this.multipleSelection[0].endVin1;
+					var params = {
+						printType: "1",
+						productLine: this.customerInfo.productLine,
+						fwStation: this.customerInfo.fwStation,
+						beginVin: beginVin1,
+						endVin: endVin1,
+					};
+					console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+					let _this = this;
+					this.$axios
+						.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+						.then((response) => {
+							console.log("柱护版-打印返回的状态：" + response.status);
+							const index = this.list.indexOf(row);
+							if (response.status === false) {
+								this.$message({
+									message: response.message,
+									type: "error",
+								});
+								return;
+							} else if (response.status === true) {
+								this.fileQuery.dataname = JSON.stringify(response.item);
+								console.log(
+									"柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+									JSON.stringify(this.fileQuery.dataname)
+								);
+								this.$axios
+									.posts(
+										"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
+										qs.stringify(this.fileQuery)
+									)
+									.then((response) => {
+										this.printpdf(response); //打印我文件流
+									});
+							}
+						})
+						.catch(() => {});
+				}
+			},
+			print(row) {
+				var params = [];
+				if (row) {
+					//单行
+					params.push(row.id);
+				} else {
+					//多选
+					this.multipleSelection.forEach((element) => {
+						let id = element.id;
+						params.push(id);
+					});
+				}
+				this.zuofei = params;
 
-      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          response.items.forEach((item) => {
-            if (item.printType == 0) {
-              item.printType = "正常打印";
-            } else if (item.printType == 1) {
-              item.printType = "重打";
-            } else {
-              item.printType = "补打";
-            }
-          });
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: "1",
-          productLine: this.customerInfo.productLine,
-		  fwStation: this.customerInfo.fwStation,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-		let _this = this;
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    print(row) {
-      var params = [];
-      if (row) {
-        //单行
-        params.push(row.id);
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-      }
-      this.zuofei = params;
+				this.dialogTableVisible = true;
+				this.$axios
+					.posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
+					.then((response) => {
+						//alert(response.status);
+						const index = this.list.indexOf(row);
+						if (response.status === false) {
+							this.$message({
+								message: response.message,
+								type: "error",
+							});
+							return;
+						} else {
+							this.fileQuery.dataname = JSON.stringify(response);
+							this.zflist = response;
+							console.log(
+								"柱护板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+								JSON.stringify(this.fileQuery.dataname)
+							);
+						}
+					})
+					.catch(() => {});
+			},
+			//作废详情页确认按钮
+			handleDelete() {
+				//debugger;
+				let params = this.zuofei;
 
-      this.dialogTableVisible = true;
-      this.$axios
-        .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
-        .then((response) => {
-          //alert(response.status);
-          const index = this.list.indexOf(row);
-          if (response.status === false) {
-            this.$message({
-              message: response.message,
-              type: "error",
-            });
-            return;
-          } else {
-            this.fileQuery.dataname = JSON.stringify(response);
-            this.zflist = response;
-            console.log(
-              "柱护板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                JSON.stringify(this.fileQuery.dataname)
-            );
-          }
-        })
-        .catch(() => {});
-    },
-    //作废详情页确认按钮
-    handleDelete() {
-      //debugger;
-      let params = this.zuofei;
+				this.$axios
+					.posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
+					.then((response) => {
+						console.log(
+							"门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+							JSON.stringify(response)
+						);
+						this.$notify({
+							title: "成功",
+							message: "作废成功",
+							type: "success",
+							duration: 2000,
+						});
+						this.getList();
+					});
+				this.dialogTableVisible = false;
 
-      this.$axios
-        .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
-        .then((response) => {
-          console.log(
-            "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-              JSON.stringify(response)
-          );
-          this.$notify({
-            title: "成功",
-            message: "作废成功",
-            type: "success",
-            duration: 2000,
-          });
-          this.getList();
-        });
-      this.dialogTableVisible = false;
-      
-    },
-    //作废操作，支持批量操作-门板
-    // handleDelete(row) {
-    //   //批量删除
-    //  var params = [];
-    //   let myalert = ""; //声明变量，其变量必须在此声明后使用
-    //   let myalertcount = [];
-    //   if (row) {
-    //     //单行
-    //     params.push(row.id);
-    //     myalert = row.name;
-    //   } else {
-    //     //多选
-    //     this.multipleSelection.forEach((element) => {
-    //       let id = element.id;
-    //       params.push(id);
-    //     });
-    //     myalert = "选中项";
-    //   }
-    //   console.log("作废查询参数：" + JSON.stringify(params));
-    //   this.$axios
-    //     .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
-    //     .then((response) => {
-    //       //alert(response.status);
-    //       const index = this.list.indexOf(row);
-    //       if (response.status === false) {
-    //         this.$message({
-    //           message: response.message,
-    //           type: "error",
-    //         });
-    //         return;
-    //       } else {
-    //         this.fileQuery.dataname = JSON.stringify(response);
-    //         response.forEach((itemsss) => {
-    //           myalertcount.push(itemsss.billNum);
-    //         });
-    //         console.log(
-    //           "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-    //             JSON.stringify(this.fileQuery.dataname)
-    //         );
-    //         this.$confirm(
-    //           "是否作废选中的" + response.length + "条记录?",
-    //           "提示",
-    //           {
-    //             confirmButtonText: "确定",
-    //             cancelButtonText: "取消",
-    //             type: "warning",
-    //           }
-    //         )
-    //           .then(() => {
-    //             this.$axios
-    //               .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
-    //               .then((response) => {
-    //                 const index = this.list.indexOf(row);
-    //                 this.$notify({
-    //                   title: "成功",
-    //                   message: "作废成功",
-    //                   type: "success",
-    //                   duration: 2000,
-    //                 });
-    //                 this.getList();
-    //               });
-    //           })
-    //           .catch(() => {
-    //             this.$message({
-    //               type: "info",
-    //               message: "已取消操作",
-    //             });
-    //           });
-    //       }
-    //     })
-        
-        
-    //     .catch(() => {});
-    // },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
+			},
+			//作废操作，支持批量操作-门板
+			// handleDelete(row) {
+			//   //批量删除
+			//  var params = [];
+			//   let myalert = ""; //声明变量，其变量必须在此声明后使用
+			//   let myalertcount = [];
+			//   if (row) {
+			//     //单行
+			//     params.push(row.id);
+			//     myalert = row.name;
+			//   } else {
+			//     //多选
+			//     this.multipleSelection.forEach((element) => {
+			//       let id = element.id;
+			//       params.push(id);
+			//     });
+			//     myalert = "选中项";
+			//   }
+			//   console.log("作废查询参数：" + JSON.stringify(params));
+			//   this.$axios
+			//     .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params)
+			//     .then((response) => {
+			//       //alert(response.status);
+			//       const index = this.list.indexOf(row);
+			//       if (response.status === false) {
+			//         this.$message({
+			//           message: response.message,
+			//           type: "error",
+			//         });
+			//         return;
+			//       } else {
+			//         this.fileQuery.dataname = JSON.stringify(response);
+			//         response.forEach((itemsss) => {
+			//           myalertcount.push(itemsss.billNum);
+			//         });
+			//         console.log(
+			//           "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+			//             JSON.stringify(this.fileQuery.dataname)
+			//         );
+			//         this.$confirm(
+			//           "是否作废选中的" + response.length + "条记录?",
+			//           "提示",
+			//           {
+			//             confirmButtonText: "确定",
+			//             cancelButtonText: "取消",
+			//             type: "warning",
+			//           }
+			//         )
+			//           .then(() => {
+			//             this.$axios
+			//               .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
+			//               .then((response) => {
+			//                 const index = this.list.indexOf(row);
+			//                 this.$notify({
+			//                   title: "成功",
+			//                   message: "作废成功",
+			//                   type: "success",
+			//                   duration: 2000,
+			//                 });
+			//                 this.getList();
+			//               });
+			//           })
+			//           .catch(() => {
+			//             this.$message({
+			//               type: "info",
+			//               message: "已取消操作",
+			//             });
+			//           });
+			//       }
+			//     })
 
-    selectOptionsChange(item) {
-      this.getList();
-    },
 
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || 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];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
+			//     .catch(() => {});
+			// },
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.PrintTimeValue = [];
+				this.handleQuery();
+				this.getProductLine();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+			selectValue(params) {
+				//版本下拉选择
+				this.versionValue = params.value;
+				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);
-    },
+			selectOptionsChange(item) {
+				this.getList();
+			},
 
-    closeDialog() {},
-  },
-};
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || 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];
+			},
+			//门板
+			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);
+			},
+
+			closeDialog() {},
+		},
+	};
 </script>
 
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-.dialogDiv {
-            max-height:300px;
-            overflow: auto;
-        }
-</style>
+	@import "../../../pg-fis/styles/crmtable.scss";
+
+	.divider1 {
+		margin: 0;
+	}
+
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
 
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
 
+	.dialogDiv {
+		max-height: 300px;
+		overflow: auto;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
index f8000a3b..ac419475 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
@@ -1,736 +1,693 @@
 <!--总成模块信息管理页-->
 <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-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-					
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="beginHostSN">
+								<el-input v-model="listQuery.beginHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endHostSN">
+								<el-input v-model="listQuery.endHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
+					<el-form-item label="底盘号码">
+						<el-col :span="11">
+							<el-form-item prop="beginVin">
+								<el-input v-model="listQuery.beginVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endVin">
+								<el-input v-model="listQuery.endVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
 					<el-form-item label="上线日期">
-					  <el-date-picker
-					    v-model="listQuery.onlineTimeValue"
-					    size="small"
-					    style="width: 380px"
-					    value-format="yyyy-MM-dd HH:mm:ss"
-					    type="datetimerange"
-					    :default-time="['00:00:00', '23:59:59']"
-					    range-separator="-"
-					    start-placeholder="开始日期"
-					    end-placeholder="结束日期"
-					  ></el-date-picker>
+						<el-date-picker v-model="listQuery.onlineTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" :default-time="['00:00:00', '23:59:59']" range-separator="-" start-placeholder="开始日期"
+						 end-placeholder="结束日期"></el-date-picker>
 					</el-form-item>
 
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleReplenishPrint()"
-              >补打(支持多选)</el-button
-            >
-
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px" sortable="false"></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"
-
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
+					<el-form-item>
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
+						<el-button class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleReplenishPrint()">补打(支持多选)</el-button>
+
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px" sortable="false"></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" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</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 { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-budaMB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-
-        return [];
-      },
-    },
-  },
-  data() {
-
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  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为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = 2; //2时补打
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 80 });
-      tempsTabs.push({
-        label: "底盘号",
-        prop: "vin",
-        width: 160,
-
-      });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 100,
-
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 150,
-
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 100,
-
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 100,
-
-      });
-
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 80,
-
-      });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 80,
-
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 80,
-
-      });
-			tempsTabs.push({
-			  label: "R100上线时间",
-			  prop: "r100OnlineTime",
-			  width: 150,
-			
-			});
-			tempsTabs.push({
-			  label: "R100接收时间",
-			  prop: "r100ReceiveTime",
-			  width: 150,
-			
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
+
+	export default {
+		name: "M100Online-budaMB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosMB: {
+				type: Array,
+				default: () => {
+
+					return [];
+				},
+			},
+		},
+		data() {
+
+			return {
+				crmType: "M100Online-MB",
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "",
+					productLine: "",
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					beginVin: undefined,
+					endVin: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					OnlineTimeBegin: undefined,
+					OnlineTimeEnd: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		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为页面上部标签高度
+				//this.tableHeight = offsetHei -260
 			});
-      return tempsTabs;
-    },
-
-
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-		
-		/**
-		 * DataGrid只展开当前行
-		 * @param {Object} row
-		 * @param {Object} rowList
-		 */
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-		
-    /**
-		 * 取列表数据
-		 * @param {Object} data
-		 */
-    getList(data) {
-
-      this.listLoading = true;
-			let inputParam = {};
-      if (data != undefined) {
-        inputParam.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        inputParam.SkipCount = (this.page - 1) * 15;
-      }
-      inputParam.vinBegin = this.listQuery.beginVin;
-      inputParam.vinEnd = this.listQuery.endVin;
-      inputParam.hostSNBegin = this.listQuery.beginHostSN;
-      inputParam.hostSNEnd = this.listQuery.endHostSN;
-			
-			if (this.listQuery.onlineTimeValue !== undefined) {
-			  inputParam.onlineTimeBegin = this.listQuery.onlineTimeValue[0];
-			  inputParam.onlineTimeEnd = this.listQuery.onlineTimeValue[1];
-			}
-
-      if (this.customerInfo.productLine != "") {
-        inputParam.productLine = this.customerInfo.productLine;
-      }
-
-      console.log('replenish-print-list方法输入参数：' + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets(
-          "/api/newjit/bill-m100/replenish-print-list",
-          inputParam
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //补打-门板
-    handleReplenishPrint() {
-
-      this.isEdit = true;
-      if (this.multipleSelection == null || this.multipleSelection.length == 0) {
-        this.$message({
-          message: "请选择要补打的单据！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //补打方法
-        let beginVin1 = this.multipleSelection[0].vin;
-        let endVin1 = this.multipleSelection[this.multipleSelection.length -1].vin;
-        var params = {
-          printType: 2,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-					m100IdList: []
-        };
-				this.multipleSelection.forEach(itm => {
-					params.m100IdList.push(itm.id);
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosMB: {
+				handler(newVal) {
+
+					console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = 2; //2时补打
+							this.customerInfo.productLine = element.ProductLine;
+						});
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "大众顺序号",
+					prop: "hostSN",
+					width: 80
+				});
+				tempsTabs.push({
+					label: "底盘号",
+					prop: "vin",
+					width: 160,
+
+				});
+				tempsTabs.push({
+					label: "KNR",
+					prop: "knr",
+					width: 100,
+
+				});
+				tempsTabs.push({
+					label: "M100上线时间",
+					prop: "onlineTime",
+					width: 150,
+
+				});
+				tempsTabs.push({
+					label: "M100接收时间",
+					prop: "receiveTime",
+					width: 150,
+
+				});
+				tempsTabs.push({
+					label: "车型代码",
+					prop: "vehicleModelCode",
+					width: 100,
+
+				});
+				tempsTabs.push({
+					label: "版本",
+					prop: "version",
+					width: 100,
+
 				});
-				
-        console.log("门板补打输入参数：" + JSON.stringify(params));
-		debugger //补打
-        // this.$axios
-        //   .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-        //   .then((response) => {
-
-        //     if (response.status === false) {
-        //       this.$message({
-        //         message: response.message,
-        //         type: "error",
-        //       });
-        //       return;
-        //     } else if (response.status === true) {
-        //       this.fileQuery.dataname = JSON.stringify(response.item);
-        //       console.log(
-        //         "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-        //           JSON.stringify(this.fileQuery.dataname)
-        //       );
-        //       this.$axios
-        //         .posts(
-        //           "/Handlers/Handler1.ashx?report=menban",
-        //           qs.stringify(this.fileQuery)
-        //         )
-        //         .then((response) => {
-        //           this.printpdf(response); //打印我文件流
-								// 	this.getList(); //刷新列表
-        //         });
-        //     }
-        //   })
-        //   .catch(() => {});
-		this.private_printMenBan(params);
-      }
-    },
-
-	/**
-	 * 保存、加载、打印门板
-	 */
-	private_printMenBan(input)
-	{
-		debugger
-		this.$axios
-		  .posts(
-			"/api/newjit/bill-m100/save-menban-report",
-			input
-		  )
-		  .then((response) => {
-			console.log("保存门板报表");
-			console.log(response);
-			console.log(response.status);
-			if (response.status === false) {
-			  this.$message({
-				message: response.message,
-				type: "error",
-			  });
-			  return;
-			} else if (response.status === true) {
-						let loadInput = response.item;
-						//-------------------------------------------
-						this.$axios
-							.posts(
-							"/api/newjit/bill-m100/load-menban-report",
-							loadInput
-							)
-							.then((response) => {
+
+				tempsTabs.push({
+					label: "产线",
+					prop: "productLine",
+					width: 80,
+
+				});
+				tempsTabs.push({
+					label: "状态",
+					prop: "billStatus",
+					width: 80,
+
+				});
+
+				tempsTabs.push({
+					label: "备注",
+					prop: "remark",
+					width: 80,
+
+				});
+				tempsTabs.push({
+					label: "R100上线时间",
+					prop: "r100OnlineTime",
+					width: 150,
+
+				});
+				tempsTabs.push({
+					label: "R100接收时间",
+					prop: "r100ReceiveTime",
+					width: 150,
+
+				});
+				return tempsTabs;
+			},
+
+
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+
+			/**
+			 * DataGrid只展开当前行
+			 * @param {Object} row
+			 * @param {Object} rowList
+			 */
+			exChange(row, rowList) {
+				//this.listLoading = true;
+
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+
+			/**
+			 * 取列表数据
+			 * @param {Object} data
+			 */
+			getList(data) {
+
+				this.listLoading = true;
+				let inputParam = {};
+				if (data != undefined) {
+					inputParam.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					inputParam.SkipCount = (this.page - 1) * 15;
+				}
+				inputParam.vinBegin = this.listQuery.beginVin;
+				inputParam.vinEnd = this.listQuery.endVin;
+				inputParam.hostSNBegin = this.listQuery.beginHostSN;
+				inputParam.hostSNEnd = this.listQuery.endHostSN;
+
+				if (this.listQuery.onlineTimeValue !== undefined) {
+					inputParam.onlineTimeBegin = this.listQuery.onlineTimeValue[0];
+					inputParam.onlineTimeEnd = this.listQuery.onlineTimeValue[1];
+				}
+
+				if (this.customerInfo.productLine != "") {
+					inputParam.productLine = this.customerInfo.productLine;
+				}
+
+				console.log('replenish-print-list方法输入参数：' + JSON.stringify(this.listQuery));
+				this.$axios
+					.gets(
+						"/api/newjit/bill-m100/replenish-print-list",
+						inputParam
+					)
+					.then((response) => {
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//补打-门板
+			handleReplenishPrint() {
+
+				this.isEdit = true;
+				if (this.multipleSelection == null || this.multipleSelection.length == 0) {
+					this.$message({
+						message: "请选择要补打的单据！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//补打方法
+					let beginVin1 = this.multipleSelection[0].vin;
+					let endVin1 = this.multipleSelection[this.multipleSelection.length - 1].vin;
+					var params = {
+						printType: 2,
+						productLine: this.customerInfo.productLine,
+						beginVin: beginVin1,
+						endVin: endVin1,
+						m100IdList: []
+					};
+					this.multipleSelection.forEach(itm => {
+						params.m100IdList.push(itm.id);
+					});
+
+					console.log("门板补打输入参数：" + JSON.stringify(params));
+					//debugger //补打
+					// this.$axios
+					//   .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
+					//   .then((response) => {
+
+					//     if (response.status === false) {
+					//       this.$message({
+					//         message: response.message,
+					//         type: "error",
+					//       });
+					//       return;
+					//     } else if (response.status === true) {
+					//       this.fileQuery.dataname = JSON.stringify(response.item);
+					//       console.log(
+					//         "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+					//           JSON.stringify(this.fileQuery.dataname)
+					//       );
+					//       this.$axios
+					//         .posts(
+					//           "/Handlers/Handler1.ashx?report=menban",
+					//           qs.stringify(this.fileQuery)
+					//         )
+					//         .then((response) => {
+					//           this.printpdf(response); //打印我文件流
+					// 	this.getList(); //刷新列表
+					//         });
+					//     }
+					//   })
+					//   .catch(() => {});
+					this.private_printMenBan(params);
+				}
+			},
+
+			/**
+			 * 保存、加载、打印门板
+			 */
+			private_printMenBan(input) {
+				//debugger
+				this.$axios
+					.posts(
+						"/api/newjit/bill-m100/save-menban-report",
+						input
+					)
+					.then((response) => {
+						console.log("保存门板报表");
+						console.log(response);
+						console.log(response.status);
+						if (response.status === false) {
+							this.$message({
+								message: response.message,
+								type: "error",
+							});
+							return;
+						} else if (response.status === true) {
+							let loadInput = response.item;
+							//-------------------------------------------
+							this.$axios
+								.posts(
+									"/api/newjit/bill-m100/load-menban-report",
+									loadInput
+								)
+								.then((response) => {
 									console.log("加载门板报表");
 									console.log(response);
 									console.log(response.status);
 									if (response.status === false) {
 										this.$message({
-										message: response.message,
-										type: "error",
+											message: response.message,
+											type: "error",
 										});
 										return;
 									} else if (response.status === true) {
 										//传给grid++接口json数据，得到返回的文件base64
 										//this.fileQuery.report = "menban";
 										this.fileQuery.dataname = JSON.stringify(
-										response.item
+											response.item
 										);
 										//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.formLoading = false;
-											this.isDisable = false;
-											this.printpdf(response); //打印我文件流
-										})
-										.catch((error) => {
-											this.formLoading = false;
-											this.isDisable = false;
-										});
+											.posts(
+												"/Handlers/Handler1.ashx?report=menban",
+												qs.stringify(this.fileQuery)
+											)
+											.then((response) => {
+												console.log("获取文件base64编码");
+												console.log(response);
+												this.formLoading = false;
+												this.isDisable = false;
+												this.printpdf(response); //打印我文件流
+											})
+											.catch((error) => {
+												this.formLoading = false;
+												this.isDisable = false;
+											});
 									}
-							});
-						//-------------------------------------------
-			}
-		  });
-	},
-
-
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-			this.listQuery.OnlineTimeValue = [];
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-
-    /** DataGrid格式化显示字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || 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] || "--";
-    },
-
-    /**
-		 * 搜索按钮单击事件
-		 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-		/**
-		 * DataGrid列排序事件（未使用）
-		 * @param {Object} data
-		 */
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-		
-		/**
-		 * DataGrid多选触发事件
-		 * @param {Object} val
-		 */
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 
-		 * DataGrid通过回调控制style 
-		 */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** DataGrid通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-		
-		/**
-		 * DataGrid行单击事件
-		 * @param {Object} row
-		 * @param {Object} column
-		 * @param {Object} event
-		 */
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
+								});
+							//-------------------------------------------
+						}
+					});
+			},
+
+
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.listQuery.OnlineTimeValue = [];
+				this.handleQuery();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+
+			/** DataGrid格式化显示字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || 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] || "--";
+			},
+
+			/**
+			 * 搜索按钮单击事件
+			 */
+			handleFilter() {
+				this.page = 1;
+				this.getList();
+			},
+
+			/**
+			 * DataGrid列排序事件（未使用）
+			 * @param {Object} data
+			 */
+			sortChange(data) {
+				const {
+					prop,
+					order
+				} = data;
+				if (!prop || !order) {
+					this.handleFilter();
+					return;
+				}
+				this.listQuery.Sorting = prop + " " + order;
+				this.handleFilter();
+			},
+
+			/**
+			 * DataGrid多选触发事件
+			 * @param {Object} val
+			 */
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			/** 
+			 * DataGrid通过回调控制style 
+			 */
+			cellStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (column.property === "qty") {
+					return {
+						textAlign: "right"
+					};
+				} else {
+					return {
+						textAlign: "left"
+					};
+				}
+			},
+			/** DataGrid通过回调控制表头style */
+			headerRowStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (column.property === "qty") {
+					return {
+						textAlign: "right",
+						background: "#FAFAFA"
+					};
+				} else {
+					return {
+						textAlign: "left",
+						background: "#FAFAFA"
+					};
+				}
+			},
+
+			/**
+			 * DataGrid行单击事件
+			 * @param {Object} row
+			 * @param {Object} column
+			 * @param {Object} event
+			 */
+			handleRowClick(row, column, event) {
+				//this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+
+			closeDialog() {},
+		},
+	};
 </script>
 
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
+	@import "../../../pg-fis/styles/crmtable.scss";
+
+	.divider1 {
+		margin: 0;
+	}
+
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
+
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
index 24e4f077..823d5b30 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
@@ -1,765 +1,719 @@
 <!--补打柱护板-->
 <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-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
-					
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="beginHostSN">
+								<el-input v-model="listQuery.beginHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endHostSN">
+								<el-input v-model="listQuery.endHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
+					<el-form-item label="底盘号码">
+						<el-col :span="11">
+							<el-form-item prop="beginVin">
+								<el-input v-model="listQuery.beginVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2" style="width: 12px; text-align: center">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endVin">
+								<el-input v-model="listQuery.endVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
+
 					<el-form-item label="上线日期">
-					  <el-date-picker
-					    v-model="listQuery.onlineTimeValue"
-					    size="small"
-					    style="width: 380px"
-					    value-format="yyyy-MM-dd HH:mm:ss"
-					    type="datetimerange"
-					    :default-time="['00:00:00', '23:59:59']"
-					    range-separator="-"
-					    start-placeholder="开始日期"
-					    end-placeholder="结束日期"
-					  ></el-date-picker>
+						<el-date-picker v-model="listQuery.onlineTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" :default-time="['00:00:00', '23:59:59']" range-separator="-" start-placeholder="开始日期"
+						 end-placeholder="结束日期"></el-date-picker>
 					</el-form-item>
 
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleReplenishPrint()"
-              >补打(支持多选)</el-button
-            >
-
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightZHB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px" sortable="false"></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"
-
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
+					<el-form-item>
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
+						<el-button class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleReplenishPrint()">补打(支持多选)</el-button>
+
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightZHB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px" sortable="false"></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" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</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 { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-
-export default {
-  name: "M100Online-budaZHB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-
-        return [];
-      },
-    },
-  },
-  data() {
-
-    return {
-      crmType: "M100Online-ZHB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-        fwStation: ""
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightZHB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  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为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-				debugger
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = 2; //2时补打
-            this.customerInfo.productLine = element.ProductLine;
-			this.customerInfo.fwStation = element.fwStation;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 80 });
-      tempsTabs.push({
-        label: "底盘号",
-        prop: "vin",
-        width: 160,
-
-      });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 100,
-
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 150,
-
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 100,
-
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 100,
-
-      });
-
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 80,
-
-      });
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "printBillNum",
-        width: 110,
-
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 80,
-
-      });
-			tempsTabs.push({
-			  label: "R100上线时间",
-			  prop: "r100OnlineTime",
-			  width: 150,
-			
-			});
-			tempsTabs.push({
-			  label: "R100接收时间",
-			  prop: "r100ReceiveTime",
-			  width: 150,
-			
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
+
+	export default {
+		name: "M100Online-budaZHB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosZHB: {
+				type: Array,
+				default: () => {
+
+					return [];
+				},
+			},
+		},
+		data() {
+
+			return {
+				crmType: "M100Online-ZHB",
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "",
+					productLine: "",
+					fwStation: ""
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					beginVin: undefined,
+					endVin: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					OnlineTimeBegin: undefined,
+					OnlineTimeEnd: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightZHB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		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为页面上部标签高度
+				//this.tableHeight = offsetHei -260
 			});
-      return tempsTabs;
-    },
-
-
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-		
-		/**
-		 * DataGrid只展开当前行
-		 * @param {Object} row
-		 * @param {Object} rowList
-		 */
-    exChange(row, rowList) {
-      //this.listLoading = true;
-
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-		
-    /**
-		 * 取列表数据
-		 * @param {Object} data
-		 */
-    getList(data) {
-			//debugger
-      this.listLoading = true;
-			let inputParam = {};
-      if (data != undefined) {
-        inputParam.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        inputParam.SkipCount = (this.page - 1) * 15;
-      }
-      inputParam.vinBegin = this.listQuery.beginVin;
-      inputParam.vinEnd = this.listQuery.endVin;
-      inputParam.hostSNBegin = this.listQuery.beginHostSN;
-      inputParam.hostSNEnd = this.listQuery.endHostSN;
-			
-			if (this.listQuery.onlineTimeValue !== undefined) {
-			  inputParam.onlineTimeBegin = this.listQuery.onlineTimeValue[0];
-			  inputParam.onlineTimeEnd = this.listQuery.onlineTimeValue[1];
-			}
-
-      if (this.customerInfo.productLine != "") {
-        inputParam.productLine = this.customerInfo.productLine;
-      }
-      if (this.customerInfo.fwStation != "") {
-        inputParam.fwStation = this.customerInfo.fwStation;
-      }
-
-      console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery));
-      this.$axios
-        .gets(
-          "/api/newjit/bill-m100/replenish-print-zhb-list",
-          inputParam
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //补打-柱护板
-    handleReplenishPrint() {
-			debugger
-      this.isEdit = true;
-      if (this.multipleSelection == null || this.multipleSelection.length == 0) {
-        this.$message({
-          message: "请选择要补打的单据！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //补打方法
-        let beginVin1 = this.multipleSelection[0].vin;
-        let endVin1 = this.multipleSelection[this.multipleSelection.length -1].vin;
-        var params = {
-          printType: 2,
-          productLine: this.customerInfo.productLine,
-		  fwStation: this.customerInfo.fwStation,
-          beginVin: beginVin1,
-          endVin: endVin1,
-					m100IdList: []
-        };
-				this.multipleSelection.forEach(itm => {
-					params.m100IdList.push(itm.id);
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosZHB: {
+				handler(newVal) {
+					//debugger
+					console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = 2; //2时补打
+							this.customerInfo.productLine = element.ProductLine;
+							this.customerInfo.fwStation = element.fwStation;
+						});
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "大众顺序号",
+					prop: "hostSN",
+					width: 80
+				});
+				tempsTabs.push({
+					label: "底盘号",
+					prop: "vin",
+					width: 160,
+
+				});
+				tempsTabs.push({
+					label: "KNR",
+					prop: "knr",
+					width: 100,
+
+				});
+				tempsTabs.push({
+					label: "M100上线时间",
+					prop: "onlineTime",
+					width: 150,
+
+				});
+				tempsTabs.push({
+					label: "M100接收时间",
+					prop: "receiveTime",
+					width: 150,
+
+				});
+				tempsTabs.push({
+					label: "车型代码",
+					prop: "vehicleModelCode",
+					width: 100,
+
+				});
+				tempsTabs.push({
+					label: "版本",
+					prop: "version",
+					width: 100,
+
+				});
+
+				tempsTabs.push({
+					label: "产线",
+					prop: "productLine",
+					width: 80,
+
+				});
+				tempsTabs.push({
+					label: "柱护板状态",
+					prop: "printBillNum",
+					width: 110,
+
+				});
+
+				tempsTabs.push({
+					label: "备注",
+					prop: "remark",
+					width: 80,
+
+				});
+				tempsTabs.push({
+					label: "R100上线时间",
+					prop: "r100OnlineTime",
+					width: 150,
+
+				});
+				tempsTabs.push({
+					label: "R100接收时间",
+					prop: "r100ReceiveTime",
+					width: 150,
+
+				});
+				return tempsTabs;
+			},
+
+
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
 				});
-				
-        console.log("柱护板补打输入参数：" + JSON.stringify(params));
-       //  this.$axios
-       //    .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-       //    .then((response) => {
-
-       //      if (response.status === false) {
-       //        this.$message({
-       //          message: response.message,
-       //          type: "error",
-       //        });
-       //        return;
-       //      } else if (response.status === true) {
-       //        this.fileQuery.dataname = JSON.stringify(response.item);
-							
-       //        console.log(
-       //          "柱护板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-       //            JSON.stringify(this.fileQuery.dataname)
-       //        );
-							
-       //        this.$axios
-       //          .posts(
-       //            "/Handlers/Handler1.ashx?report=zhuhuban_" + this.customerInfo.productLine + '-' + this.customerInfo.fwStation,
-       //            qs.stringify(this.fileQuery)
-       //          )
-       //          .then((response) => {
-       //            this.printpdf(response); //打印我文件流
-							// 		this.getList(); //刷新列表
-       //          });
-       //      }
-       //    })
-       //    .catch(() => {});
-			 this.private_printZhuHuBan(params);
-      }
-    },
-
-	/**
-	 * 保存、加载、打印柱护板
-	 */
-	private_printZhuHuBan(input)
-	{
-		debugger
-		//门板
-		//传递大众顺序号起止
-		let _this = this;
-		this.$axios
-		  .posts(
-			"/api/newjit/bill-m100/save-zhuhuban-report",
-			input
-		  )
-		  .then((response) => {
-			console.log("保存柱护板报表");
-			console.log(response);
-			console.log(response.status);
-			if (response.status === false) {
-			  this.$message({
-				message: response.message,
-				type: "error",
-			  });
-			  return;
-			} else if (response.status === true) {
-				let loadInput = {};
-				loadInput.dataResultType = "1"; //全部打印
-				loadInput.reportIdList = response.item;
-				
-				// //--------------------------------------
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+
+			/**
+			 * DataGrid只展开当前行
+			 * @param {Object} row
+			 * @param {Object} rowList
+			 */
+			exChange(row, rowList) {
+				//this.listLoading = true;
+
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+
+			/**
+			 * 取列表数据
+			 * @param {Object} data
+			 */
+			getList(data) {
+				//debugger
+				this.listLoading = true;
+				let inputParam = {};
+				if (data != undefined) {
+					inputParam.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					inputParam.SkipCount = (this.page - 1) * 15;
+				}
+				inputParam.vinBegin = this.listQuery.beginVin;
+				inputParam.vinEnd = this.listQuery.endVin;
+				inputParam.hostSNBegin = this.listQuery.beginHostSN;
+				inputParam.hostSNEnd = this.listQuery.endHostSN;
+
+				if (this.listQuery.onlineTimeValue !== undefined) {
+					inputParam.onlineTimeBegin = this.listQuery.onlineTimeValue[0];
+					inputParam.onlineTimeEnd = this.listQuery.onlineTimeValue[1];
+				}
+
+				if (this.customerInfo.productLine != "") {
+					inputParam.productLine = this.customerInfo.productLine;
+				}
+				if (this.customerInfo.fwStation != "") {
+					inputParam.fwStation = this.customerInfo.fwStation;
+				}
+
+				console.log('取柱护板补打列表replenish-print-zhb-list方法输入参数：' + JSON.stringify(this.listQuery));
+				this.$axios
+					.gets(
+						"/api/newjit/bill-m100/replenish-print-zhb-list",
+						inputParam
+					)
+					.then((response) => {
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//补打-柱护板
+			handleReplenishPrint() {
+				//debugger
+				this.isEdit = true;
+				if (this.multipleSelection == null || this.multipleSelection.length == 0) {
+					this.$message({
+						message: "请选择要补打的单据！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//补打方法
+					let beginVin1 = this.multipleSelection[0].vin;
+					let endVin1 = this.multipleSelection[this.multipleSelection.length - 1].vin;
+					var params = {
+						printType: 2,
+						productLine: this.customerInfo.productLine,
+						fwStation: this.customerInfo.fwStation,
+						beginVin: beginVin1,
+						endVin: endVin1,
+						m100IdList: []
+					};
+					this.multipleSelection.forEach(itm => {
+						params.m100IdList.push(itm.id);
+					});
+
+					console.log("柱护板补打输入参数：" + JSON.stringify(params));
+					//  this.$axios
+					//    .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+					//    .then((response) => {
+
+					//      if (response.status === false) {
+					//        this.$message({
+					//          message: response.message,
+					//          type: "error",
+					//        });
+					//        return;
+					//      } else if (response.status === true) {
+					//        this.fileQuery.dataname = JSON.stringify(response.item);
+
+					//        console.log(
+					//          "柱护板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+					//            JSON.stringify(this.fileQuery.dataname)
+					//        );
+
+					//        this.$axios
+					//          .posts(
+					//            "/Handlers/Handler1.ashx?report=zhuhuban_" + this.customerInfo.productLine + '-' + this.customerInfo.fwStation,
+					//            qs.stringify(this.fileQuery)
+					//          )
+					//          .then((response) => {
+					//            this.printpdf(response); //打印我文件流
+					// 		this.getList(); //刷新列表
+					//          });
+					//      }
+					//    })
+					//    .catch(() => {});
+					this.private_printZhuHuBan(params);
+				}
+			},
+
+			/**
+			 * 保存、加载、打印柱护板
+			 */
+			private_printZhuHuBan(input) {
+				//debugger
 				//门板
 				//传递大众顺序号起止
+				let _this = this;
 				this.$axios
-				  .posts(
-					"/api/newjit/bill-m100/load-zhuhuban-report",
-					loadInput
-				  )
-				  .then((response) => {
-					console.log("加载柱护板报表");
-					console.log(response);
-					console.log(response.status);
-					if (response.status === false) {
-					  this.$message({
-						message: response.message,
-						type: "error",
-					  });
-					  return;
-					} else if (response.status === true) {
-							  //传给grid++接口json数据，得到返回的文件base64
-							  //this.fileQuery.report = "menban";
-							  this.fileQuery.dataname = JSON.stringify(
-								response.item
-							  );
-								
-							  //this.fileQuery.dataname = "";
-							  console.log("打印json");
-							  console.log(this.fileQuery.dataname);
-							  this.$axios
+					.posts(
+						"/api/newjit/bill-m100/save-zhuhuban-report",
+						input
+					)
+					.then((response) => {
+						console.log("保存柱护板报表");
+						console.log(response);
+						console.log(response.status);
+						if (response.status === false) {
+							this.$message({
+								message: response.message,
+								type: "error",
+							});
+							return;
+						} else if (response.status === true) {
+							let loadInput = {};
+							loadInput.dataResultType = "1"; //全部打印
+							loadInput.reportIdList = response.item;
+
+							// //--------------------------------------
+							//门板
+							//传递大众顺序号起止
+							this.$axios
 								.posts(
-								  //"/Handlers/Handler1.ashx?report=zhuhuban",
-								  "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
-								  qs.stringify(this.fileQuery)
+									"/api/newjit/bill-m100/load-zhuhuban-report",
+									loadInput
 								)
 								.then((response) => {
-								  console.log("获取文件base64编码");
-								  console.log(response);
-								  this.formLoading = false;
-								  this.isDisable = false;
-								  this.printpdf(response); //打印我文件流
-								})
-								.catch((error) => {
-								  this.formLoading = false;
-								  this.isDisable = false;
+									console.log("加载柱护板报表");
+									console.log(response);
+									console.log(response.status);
+									if (response.status === false) {
+										this.$message({
+											message: response.message,
+											type: "error",
+										});
+										return;
+									} else if (response.status === true) {
+										//传给grid++接口json数据，得到返回的文件base64
+										//this.fileQuery.report = "menban";
+										this.fileQuery.dataname = JSON.stringify(
+											response.item
+										);
+
+										//this.fileQuery.dataname = "";
+										console.log("打印json");
+										console.log(this.fileQuery.dataname);
+										this.$axios
+											.posts(
+												//"/Handlers/Handler1.ashx?report=zhuhuban",
+												"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
+												qs.stringify(this.fileQuery)
+											)
+											.then((response) => {
+												console.log("获取文件base64编码");
+												console.log(response);
+												this.formLoading = false;
+												this.isDisable = false;
+												this.printpdf(response); //打印我文件流
+											})
+											.catch((error) => {
+												this.formLoading = false;
+												this.isDisable = false;
+											});
+									}
 								});
+							//--------------------------------------
+						}
+					});
+			},
+
+
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.listQuery.OnlineTimeValue = [];
+				this.handleQuery();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+
+			/** DataGrid格式化显示字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property === "printBillNum") {
+
+					if (row[column.property] != null && row[column.property].length > 0) {
+						return "柱护板已打印"
+					} else {
+						return "柱护板未打印"
 					}
-				  });
-				//--------------------------------------
-			}
-		  });
-	},
-	
-
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-			this.listQuery.OnlineTimeValue = [];
-      this.handleQuery();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-
-    /** DataGrid格式化显示字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-			if (column.property === "printBillNum") {
-				
-				if (row[column.property] != null && row[column.property].length > 0)
-				{
-					return "柱护板已打印"
 				}
-				else
-				{
-					return "柱护板未打印"
+
+				if (column.property == "printDate" || 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] || "--";
+			},
+
+			/**
+			 * 搜索按钮单击事件
+			 */
+			handleFilter() {
+				this.page = 1;
+				this.getList();
+			},
+
+			/**
+			 * DataGrid列排序事件（未使用）
+			 * @param {Object} data
+			 */
+			sortChange(data) {
+				const {
+					prop,
+					order
+				} = data;
+				if (!prop || !order) {
+					this.handleFilter();
+					return;
+				}
+				this.listQuery.Sorting = prop + " " + order;
+				this.handleFilter();
+			},
+
+			/**
+			 * DataGrid多选触发事件
+			 * @param {Object} val
+			 */
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			/** 
+			 * DataGrid通过回调控制style 
+			 */
+			cellStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (column.property === "qty") {
+					return {
+						textAlign: "right"
+					};
+				} else {
+					return {
+						textAlign: "left"
+					};
 				}
-			}	
-			
-      if (column.property == "printDate" || 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] || "--";
-    },
-
-    /**
-		 * 搜索按钮单击事件
-		 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
-
-		/**
-		 * DataGrid列排序事件（未使用）
-		 * @param {Object} data
-		 */
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-		
-		/**
-		 * DataGrid多选触发事件
-		 * @param {Object} val
-		 */
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 
-		 * DataGrid通过回调控制style 
-		 */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** DataGrid通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.property === "qty") {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-		
-		/**
-		 * DataGrid行单击事件
-		 * @param {Object} row
-		 * @param {Object} column
-		 * @param {Object} event
-		 */
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-
-    closeDialog() {},
-  },
-};
+			},
+			/** DataGrid通过回调控制表头style */
+			headerRowStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (column.property === "qty") {
+					return {
+						textAlign: "right",
+						background: "#FAFAFA"
+					};
+				} else {
+					return {
+						textAlign: "left",
+						background: "#FAFAFA"
+					};
+				}
+			},
+
+			/**
+			 * DataGrid行单击事件
+			 * @param {Object} row
+			 * @param {Object} column
+			 * @param {Object} event
+			 */
+			handleRowClick(row, column, event) {
+				//this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+
+			closeDialog() {},
+		},
+	};
 </script>
 
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
-
-
+	@import "../../../pg-fis/styles/crmtable.scss";
+
+	.divider1 {
+		margin: 0;
+	}
+
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
+
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detail.vue b/vue/src/views/pg-fis/basedate/m100Online/detail.vue
index 8ea20fdc..af35068f 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detail.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detail.vue
@@ -1,31 +1,13 @@
 <!--M100上线信息-明细数据-->
 <template>
-  <div class="cr-body-content">
-    <!--表格渲染-->
-    <el-table
-      ref="multipleTable"
-      v-loading="listLoading"
-      element-loading-text="拼命加载中..."
-      element-loading-spinner="el-icon-loading"
-      class="cr-table"
-      :data="list"
-      :height="tableHeight"
-      :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
-      size="small"
-      stripe
-      border
-      highlight-current-row
-      style="width: 100%"
-      @sort-change="sortChange"
-      @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      :row-key="getRowKeys"
-      :expand-row-keys="expands"
-      @expand-change="exChange"
-    >
-      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
-      <!-- <el-table-column
+	<div class="cr-body-content">
+		<!--表格渲染-->
+		<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+		 class="cr-table" :data="list" :height="tableHeight" :cell-style="cellStyle" :header-cell-style="headerRowStyle" size="small"
+		 stripe border highlight-current-row style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectionChange"
+		 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+			<!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+			<!-- <el-table-column
         prop="总成名称"
         label="erpAssemblyName"
         sortable
@@ -42,316 +24,325 @@
             class="two-list"
       </el-table-column> -->
 
-      <el-table-column type="expand" prop="details">
-        <template slot-scope="scope">
-          <el-table :data="scope.row.details">
-            <el-table-column
-              prop="partCode"
-              label="客户零件代码"
-            ></el-table-column>
-            <el-table-column
-              prop="partNum"
-              label="客户零件数量"
-            ></el-table-column>
-            <el-table-column prop="description" label="描述"></el-table-column>
-            <el-table-column prop="isKey" label="是否Key件">
-              <template slot-scope="scope">
-                <span v-if="scope.row.isKey == true">
-                  <span style="color: #00b46d">是</span>
-                </span>
-                <span v-else>
-                  <span style="color: #d75c89">否</span>
-                </span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-for="(item, index) in getDefaultField"
-        :key="index"
-        :prop="item.prop"
-        :label="item.label"
-        :min-width="item.width"
-        :formatter="fieldFormatter"
-        sortable="custom"
-        show-overflow-tooltip
-        :gutter="0"
-      >
-        <template slot="header" slot-scope="scope">
-          {{ scope.column.label }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="erpAssemblyVersion"
-        label="总成版本号"
-        sortable
-        width="360"
-      >
-      </el-table-column>
-    </el-table>
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-    </div>
-  </div>
+			<el-table-column type="expand" prop="details">
+				<template slot-scope="scope">
+					<el-table :data="scope.row.details">
+						<el-table-column prop="partCode" label="客户零件代码"></el-table-column>
+						<el-table-column prop="partNum" label="客户零件数量"></el-table-column>
+						<el-table-column prop="description" label="描述"></el-table-column>
+						<el-table-column prop="isKey" label="是否Key件">
+							<template slot-scope="scope">
+								<span v-if="scope.row.isKey == true">
+									<span style="color: #00b46d">是</span>
+								</span>
+								<span v-else>
+									<span style="color: #d75c89">否</span>
+								</span>
+							</template>
+						</el-table-column>
+					</el-table>
+				</template>
+			</el-table-column>
+			<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+			 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+				<template slot="header" slot-scope="scope">
+					{{ scope.column.label }}
+				</template>
+			</el-table-column>
+			<el-table-column prop="erpAssemblyVersion" label="总成版本号" sortable width="360">
+			</el-table-column>
+		</el-table>
+		<div class="table-footer">
+			<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+			<pagination v-show="totalCount > 0" :total="totalCount" :page.sync="page" :limit.sync="listQuery.MaxResultCount"
+			 @pagination="getList" />
+		</div>
+	</div>
 </template>
 
 <script>
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-import permission from "@/directive/permission/index.js";
-import CRMTableHead from "../../components/CRMTableHead";
-import { downloadFile } from "@/utils/crmindex.js";
-import Detail from "./detail";
+	import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+	import permission from "@/directive/permission/index.js";
+	import CRMTableHead from "../../components/CRMTableHead";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import Detail from "./detail";
 
-export default {
-  name: "sendUnsettledDiffReport",
-  components: { Pagination, CRMTableHead, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfos: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    return {
-      crmType: "stockFisDiffReport",
-      rules: {
-        //前端定义的规则，后端也有验证
-        erpMaterialCode: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-      },
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      searchContent: "", // 输入内容
-      customerInfo: {
-        parentId: "",
-		billId: ""
-      },
-      form: {
-        dicDetailID: "",
-        customerId: "",
-        projectId: "",
-      },
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      formLoading: false,
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
-        SkipCount: 0,
-        MaxResultCount: 15,
-        id: "",
-      },
-      page: 1,
-      dialogFormVisible: false,
-      multipleSelection: [],
-      formTitle: "",
-      drawer: false,
-      showExcelImport: false,
-      tableHeight: document.documentElement.clientHeight - 30,
-      isEdit: false,
-    };
-  },
-  mounted() {
-    var self = this;
-    window.onresize = function () {
-      var offsetHei = document.documentElement.clientHeight;
-      self.tableHeight = offsetHei - 30;
-    };
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfos: {
-      handler(newVal) {
-				debugger
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.parentId = element.ParentId;
-			this.customerInfo.billId = element.BillId;
-          });
-          if (this.customerInfo.parentId != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    /** 列表字段 */
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({
-        label: "总成编号",
-        prop: "erpAssemblyCode",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "总成名称",
-        prop: "erpAssemblyName",
-        width: 160,
-      });
-      // tempsTabs.push({
-      //   label: "总成版本号",
-      //   prop: "erpAssemblyName",
-      //   width: 160,
-      // });
-      return tempsTabs;
-    },
-  },
-  methods: {
-    exChange(row, rowList) {
-      this.loading = true;
+	export default {
+		name: "sendUnsettledDiffReport",
+		components: {
+			Pagination,
+			CRMTableHead,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfos: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			return {
+				crmType: "stockFisDiffReport",
+				rules: {
+					//前端定义的规则，后端也有验证
+					erpMaterialCode: [{
+						required: true,
+						message: "必须输入！",
+						trigger: "blur"
+					}, ],
+				},
+				expands: [], //只展开一行放入当前行id
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				searchContent: "", // 输入内容
+				customerInfo: {
+					parentId: "",
+					billId: ""
+				},
+				form: {
+					dicDetailID: "",
+					customerId: "",
+					projectId: "",
+				},
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				formLoading: false,
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					Filters: [{
+							logic: 0,
+							column: "Enabled",
+							action: 0,
+							value: "true",
+						}, //默认查询可用的
+					],
+					SkipCount: 0,
+					MaxResultCount: 15,
+					id: "",
+				},
+				page: 1,
+				dialogFormVisible: false,
+				multipleSelection: [],
+				formTitle: "",
+				drawer: false,
+				showExcelImport: false,
+				tableHeight: document.documentElement.clientHeight - 30,
+				isEdit: false,
+			};
+		},
+		mounted() {
+			var self = this;
+			window.onresize = function() {
+				var offsetHei = document.documentElement.clientHeight;
+				self.tableHeight = offsetHei - 30;
+			};
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfos: {
+				handler(newVal) {
+					//debugger
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.parentId = element.ParentId;
+							this.customerInfo.billId = element.BillId;
+						});
+						if (this.customerInfo.parentId != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			/** 列表字段 */
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "总成编号",
+					prop: "erpAssemblyCode",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "总成名称",
+					prop: "erpAssemblyName",
+					width: 160,
+				});
+				// tempsTabs.push({
+				//   label: "总成版本号",
+				//   prop: "erpAssemblyName",
+				//   width: 160,
+				// });
+				return tempsTabs;
+			},
+		},
+		methods: {
+			exChange(row, rowList) {
+				this.loading = true;
 
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      return row[column.property] || "--";
-    },
-    importExcelData() {
-      //关闭导入窗体时调用
-      this.showExcelImport = false;
-      this.getList();
-    },
-    getList() {
-      this.listLoading = true;
-      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
-      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId, billId: this.customerInfo.billId  };
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
-        .then((response) => {
-          this.list = response;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "partCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 6,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-    resetQuery() {},
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				return row[column.property] || "--";
+			},
+			importExcelData() {
+				//关闭导入窗体时调用
+				this.showExcelImport = false;
+				this.getList();
+			},
+			getList() {
+				this.listLoading = true;
+				console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+				//alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+				let vehicleAssemblyId = {
+					vehicleAssemblyId: this.customerInfo.parentId,
+					billId: this.customerInfo.billId
+				};
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
+					.then((response) => {
+						this.list = response;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			/** 筛选操作 */
+			handleFilter() {
+				this.page = 1;
+				this.getList();
+				this.listQuery.Filters = [];
+				if (this.searchContent != "") {
+					var column = "partCode";
+					let filter = {
+						logic: 0,
+						column: column,
+						action: 6,
+						value: this.searchContent,
+					};
+					this.listQuery.Filters.push(filter);
+				}
+				this.getList();
+			},
+			resetQuery() {},
 
-    sortChange(data) {
-      const { prop, order } = data;
-      if (!prop || !order) {
-        this.handleFilter();
-        return;
-      }
-      this.listQuery.Sorting = prop + " " + order;
-      this.handleFilter();
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    /** 通过回调控制style */
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right" };
-      } else {
-        return { textAlign: "left" };
-      }
-    },
-    /** 通过回调控制表头style */
-    headerRowStyle({ row, column, rowIndex, columnIndex }) {
-      if (
-        column.property === "fisQty" ||
-        column.property === "diffQty" ||
-        column.property === "stockQty"
-      ) {
-        return { textAlign: "right", background: "#FAFAFA" };
-      } else {
-        return { textAlign: "left", background: "#FAFAFA" };
-      }
-    },
-    handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-  },
-};
+			sortChange(data) {
+				const {
+					prop,
+					order
+				} = data;
+				if (!prop || !order) {
+					this.handleFilter();
+					return;
+				}
+				this.listQuery.Sorting = prop + " " + order;
+				this.handleFilter();
+			},
+			handleSelectionChange(val) {
+				this.multipleSelection = val;
+			},
+			/** 通过回调控制style */
+			cellStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (
+					column.property === "fisQty" ||
+					column.property === "diffQty" ||
+					column.property === "stockQty"
+				) {
+					return {
+						textAlign: "right"
+					};
+				} else {
+					return {
+						textAlign: "left"
+					};
+				}
+			},
+			/** 通过回调控制表头style */
+			headerRowStyle({
+				row,
+				column,
+				rowIndex,
+				columnIndex
+			}) {
+				if (
+					column.property === "fisQty" ||
+					column.property === "diffQty" ||
+					column.property === "stockQty"
+				) {
+					return {
+						textAlign: "right",
+						background: "#FAFAFA"
+					};
+				} else {
+					return {
+						textAlign: "left",
+						background: "#FAFAFA"
+					};
+				}
+			},
+			handleRowClick(row, column, event) {
+				//this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+		},
+	};
 </script>
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-</style>
-
+	@import "../../../pg-fis/styles/crmtable.scss";
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
index b6d520e5..c4cb08f9 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
@@ -1,765 +1,683 @@
 <!--总成模块信息管理页-->
 <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-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item>
+						<el-col :span="12">
+							<el-form-item prop="billNum" label="装箱单号">
+								<el-input v-model="listQuery.billNum" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="partType" label="零件类型">
+								<el-input v-model="listQuery.partType" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="beginHostSN">
+								<el-input v-model="listQuery.beginHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endHostSN">
+								<el-input v-model="listQuery.endHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+					<el-form-item label="底盘号码">
+						<el-col :span="11">
+							<el-form-item prop="beginVin">
+								<el-input v-model="listQuery.beginVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endVin">
+								<el-input v-model="listQuery.endVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
+					<el-form-item label="打印日期">
+						<el-date-picker v-model="PrintTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+					</el-form-item>
 
-          <el-form-item style="margin-top: -20px">
-            <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
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打(只支持单选)</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="handleDelete()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
-              ></el-table-column>
-              <el-table-column
-                prop="topBoxPositionNum"
-                label="上箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="topSAPMaterialNum"
-                label="上箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="topMaterialDescription"
-                label="上箱位 物料描述"
-              ></el-table-column>
-              <el-table-column
-                prop="belowBoxPositionNum"
-                label="下箱位号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowSAPMaterialNum"
-                label="下箱位 SAP物料号"
-              ></el-table-column>
-              <el-table-column
-                prop="belowMaterialDescription "
-                label="下箱位 物料描述"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
+					<el-form-item style="margin-top: -20px">
+						<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 class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleUpdate()">重打(只支持单选)</el-button>
+						<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete()">作废(支持批量)</el-button>
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px"></el-table-column>
+				<el-table-column type="expand" prop="details" label="详表">
+					<template slot-scope="scope">
+						<el-table :data="scope.row.details">
+							<el-table-column prop="knr" label="KNR订单号"></el-table-column>
+							<el-table-column prop="vin" label="底牌号"></el-table-column>
+							<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
+							<el-table-column prop="vehicleModel_DoorPlankCode" label="车型门板代码"></el-table-column>
+							<el-table-column prop="topBoxPositionNum" label="上箱位号"></el-table-column>
+							<el-table-column prop="topSAPMaterialNum" label="上箱位 SAP物料号"></el-table-column>
+							<el-table-column prop="topMaterialDescription" label="上箱位 物料描述"></el-table-column>
+							<el-table-column prop="belowBoxPositionNum" label="下箱位号"></el-table-column>
+							<el-table-column prop="belowSAPMaterialNum" label="下箱位 SAP物料号"></el-table-column>
+							<el-table-column prop="belowMaterialDescription " label="下箱位 物料描述"></el-table-column>
+						</el-table>
+					</template>
+				</el-table-column>
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</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 { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
 
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosMB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  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为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosMB: {
-      handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = element.PrintType;
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
+	export default {
+		name: "M100Online-MB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosMB: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			const validVersion = (rule, value, callback) => {
+				let numberReg = /^\d{6}$/;
+				if (!numberReg.test(value)) {
+					callback(new Error("只能为6位数字！"));
+				} else {
+					callback();
+				}
+			};
+			return {
+				crmType: "M100Online-MB",
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "",
+					productLine: "",
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					billNum: undefined,
+					partType: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginPrintDate: undefined,
+					endPrintDate: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		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为页面上部标签高度
+				//this.tableHeight = offsetHei -260
+			});
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosMB: {
+				handler(newVal) {
+					console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = element.PrintType;
+							this.customerInfo.productLine = element.ProductLine;
+						});
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "装箱单号",
+					prop: "billNum",
+					width: 140
+				});
+				tempsTabs.push({
+					label: "单据顺号",
+					prop: "billSerialNum",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "左或右",
+					prop: "billLocation",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "供应商厂家代码",
+					prop: "providerCode",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "零件类型",
+					prop: "partType",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "器具容量",
+					prop: "capacity",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "打印日期",
+					prop: "printDate",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "打印类型",
+					prop: "printType",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "生产线",
+					prop: "productLine",
+					width: 120,
+				});
 
-      tempsTabs.push({
-        label: "起底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "止底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
+				tempsTabs.push({
+					label: "起底盘号",
+					prop: "beginVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "止底盘号",
+					prop: "endVin",
+					width: 160,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+			handleRowClick(row, column, event) {
+				this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+			exChange(row, rowList) {
+				//this.listLoading = true;
 
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			//门板
+			getList(data) {
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQuery.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQuery.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.billNum != "") {
+					this.listQuery.billNum = this.listQuery.billNum;
+				}
+				this.listQuery.partType = this.listQuery.partType;
+				this.listQuery.beginVin = this.listQuery.beginVin;
+				this.listQuery.endVin = this.listQuery.endVin;
+				this.listQuery.beginHostSN = this.listQuery.beginHostSN;
+				this.listQuery.endHostSN = this.listQuery.endHostSN;
+				var getdate5 = JSON.stringify(this.PrintTimeValue);
+				if (getdate5 != "[]") {
+					this.listQuery.beginPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[0] || undefined :
+						undefined;
+					this.listQuery.endPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[1] || undefined :
+						undefined;
+				} else {
+					this.listQuery.beginPrintDate = undefined;
+					this.listQuery.endPrintDate = undefined;
+				}
+				if (this.customerInfo.productLine != "") {
+					this.listQuery.ProductLine = this.customerInfo.productLine;
+				}
 
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
-          .then((response) => {
-            //alert(response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/MenBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
+				console.log(JSON.stringify(this.listQuery));
+				this.$axios
+					.posts(
+						"/api/newjit/MenBanPackingList/MenBanPackingList-List",
+						this.listQuery
+					)
+					.then((response) => {
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//重新打印-门板
+			handleUpdate(row) {
+				this.isEdit = true;
+				if (this.multipleSelection.length != 1) {
+					this.$message({
+						message: "重新打印必须选择单行，不能多选！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//this.fetchData(this.multipleSelection[0].id);
+					//重新打印方法
+					let beginVin1 = this.multipleSelection[0].beginVin1;
+					let endVin1 = this.multipleSelection[0].endVin1;
+					var params = {
+						printType: 1,
+						productLine: this.customerInfo.productLine,
+						beginVin: beginVin1,
+						endVin: endVin1,
+					};
+					console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+					this.$axios
+						.posts("/api/newjit/bill-m100/print-menban-packing-list", params)
+						.then((response) => {
+							//alert(response.status);
+							const index = this.list.indexOf(row);
+							if (response.status === false) {
+								this.$message({
+									message: response.message,
+									type: "error",
+								});
+								return;
+							} else if (response.status === true) {
+								this.fileQuery.dataname = JSON.stringify(response.item);
+								console.log(
+									"门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+									JSON.stringify(this.fileQuery.dataname)
+								);
+								this.$axios
+									.posts(
+										"/Handlers/Handler1.ashx?report=menban",
+										qs.stringify(this.fileQuery)
+									)
+									.then((response) => {
+										this.printpdf(response); //打印我文件流
+									});
+							}
+						})
+						.catch(() => {});
+				}
+			},
+			//作废操作，支持批量操作-门板
+			handleDelete(row) {
+				//批量删除
+				var params = [];
+				let myalert = ""; //声明变量，其变量必须在此声明后使用
+				if (row) {
+					//单行
+					params.push(row.id);
+					myalert = row.name;
+				} else {
+					//多选
+					this.multipleSelection.forEach((element) => {
+						let id = element.id;
+						params.push(id);
+					});
+					myalert = "选中项";
+				}
+				this.$confirm("是否作废" + myalert + "?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+					.then(() => {
+						this.$axios
+							.posts("/api/newjit/MenBanPackingList/delete", params)
+							.then((response) => {
+								const index = this.list.indexOf(row);
+								this.$notify({
+									title: "成功",
+									message: "作废成功",
+									type: "success",
+									duration: 2000,
+								});
+								this.getList();
+							});
+					})
+					.catch(() => {
+						this.$message({
+							type: "info",
+							message: "已取消操作",
+						});
+					});
+			},
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.PrintTimeValue = [];
+				this.handleQuery();
+				this.getProductLine();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+			selectValue(params) {
+				//版本下拉选择
+				this.versionValue = params.value;
+				this.getList();
+			},
 
-    selectOptionsChange(item) {
-      this.getList();
-    },
+			selectOptionsChange(item) {
+				this.getList();
+			},
 
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || 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];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || 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];
+			},
+			//门板
+			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);
-    },
+			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);
+			},
 
-    closeDialog() {},
-  },
-};
+			closeDialog() {},
+		},
+	};
 </script>
 
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
+	@import "../../../pg-fis/styles/crmtable.scss";
 
+	.divider1 {
+		margin: 0;
+	}
 
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
+
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
index 824d06c1..bfba0086 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
@@ -1,747 +1,681 @@
 <!--总成模块信息管理页-->
 <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-form-item>
-            <el-col :span="12">
-              <el-form-item prop="billNum" label="装箱单号">
-                <el-input
-                  v-model="listQuery.billNum"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="partType" label="零件类型">
-                <el-input
-                  v-model="listQuery.partType"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+	<div class="cr-body-content">
+		<div ref="box">
+			<flexbox class="content-header">
+				<el-form :model="listQuery" ref="queryForm" v-show="showSearch" :inline="true">
+					<el-form-item>
+						<el-col :span="12">
+							<el-form-item prop="billNum" label="装箱单号">
+								<el-input v-model="listQuery.billNum" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="partType" label="零件类型">
+								<el-input v-model="listQuery.partType" placeholder="" clearable size="small" style="width: 140px" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="大众顺序号">
-            <el-col :span="11">
-              <el-form-item prop="beginHostSN">
-                <el-input
-                  v-model="listQuery.beginHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endHostSN">
-                <el-input
-                  v-model="listQuery.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 170px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+					<el-form-item label="大众顺序号">
+						<el-col :span="11">
+							<el-form-item prop="beginHostSN">
+								<el-input v-model="listQuery.beginHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endHostSN">
+								<el-input v-model="listQuery.endHostSN" placeholder="" clearable size="small" style="width: 170px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="底盘号码">
-            <el-col :span="11">
-              <el-form-item prop="beginVin">
-                <el-input
-                  v-model="listQuery.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col class="line" :span="2">-</el-col>
-            <el-col :span="11">
-              <el-form-item prop="endVin">
-                <el-input
-                  v-model="listQuery.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 140px"
-                  @keyup.enter.native="handleQuery"
-                />
-              </el-form-item>
-            </el-col>
-          </el-form-item>
+					<el-form-item label="底盘号码">
+						<el-col :span="11">
+							<el-form-item prop="beginVin">
+								<el-input v-model="listQuery.beginVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+						<el-col class="line" :span="2">-</el-col>
+						<el-col :span="11">
+							<el-form-item prop="endVin">
+								<el-input v-model="listQuery.endVin" placeholder="" clearable size="small" style="width: 140px"
+								 @keyup.enter.native="handleQuery" />
+							</el-form-item>
+						</el-col>
+					</el-form-item>
 
-          <el-form-item label="打印日期">
-            <el-date-picker
-              v-model="PrintTimeValue"
-              size="small"
-              style="width: 380px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-            ></el-date-picker>
-          </el-form-item>
+					<el-form-item label="打印日期">
+						<el-date-picker v-model="PrintTimeValue" size="small" style="width: 380px" value-format="yyyy-MM-dd HH:mm:ss"
+						 type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+					</el-form-item>
 
-          <el-form-item style="margin-top: -20px">
-            <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
-              class="filter-item"
-              size="mini"
-              type="success"
-              icon="el-icon-s-shop"
-              @click="handleUpdate()"
-              >重打(只支持单选)</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              size="mini"
-              @click="handleDelete()"
-              >作废(支持批量)</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </flexbox>
-      <el-table
-        ref="multipleTable"
-        v-loading="listLoading"
-        element-loading-text="拼命加载中..."
-        element-loading-spinner="el-icon-loading"
-        class="cr-table"
-        :data="list"
-        :height="tableHeightMB"
-        :cell-style="cellStyle"
-        :header-cell-style="headerRowStyle"
-        size="small"
-        stripe
-        border
-        highlight-current-row
-        style="width: 100%; margin-top: -25px"
-        @selection-change="handleSelectionChange"
-        @row-click="handleRowClick"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        @expand-change="exChange"
-      >
-        <el-table-column type="selection" width="44px"></el-table-column>
-        <el-table-column type="expand" prop="details" label="详表">
-          <template slot-scope="scope">
-            <el-table :data="scope.row.details">
-              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
-              <el-table-column prop="vin" label="底牌号"></el-table-column>
-              <el-table-column
-                prop="hostSN"
-                label="大众顺序号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode"
-                label="柱护板零件号"
-              ></el-table-column>
-              <el-table-column
-                prop="partCode2"
-                label="柱护板零件号2"
-              ></el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in getDefaultField"
-          :key="index"
-          :prop="item.prop"
-          :label="item.label"
-          :min-width="item.width"
-          :formatter="fieldFormatter"
-          sortable="custom"
-          show-overflow-tooltip
-          :gutter="0"
-        >
-          <template slot="header" slot-scope="scope">
-            {{ scope.column.label }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="table-footer">
-        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-        <pagination
-          v-show="totalCount > 0"
-          :total="totalCount"
-          style="margin-bottom: -5px; float: right"
-          :page.sync="page"
-          :limit.sync="listQuery.MaxResultCount"
-          @pagination="getList"
-        />
-      </div>
-    </div>
-  </div>
+					<el-form-item style="margin-top: -20px">
+						<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 class="filter-item" size="mini" type="success" icon="el-icon-s-shop" @click="handleUpdate()">重打(只支持单选)</el-button>
+						<el-button class="filter-item" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete()">作废(支持批量)</el-button>
+					</el-form-item>
+				</el-form>
+			</flexbox>
+			<el-table ref="multipleTable" v-loading="listLoading" element-loading-text="拼命加载中..." element-loading-spinner="el-icon-loading"
+			 class="cr-table" :data="list" :height="tableHeightMB" :cell-style="cellStyle" :header-cell-style="headerRowStyle"
+			 size="small" stripe border highlight-current-row style="width: 100%; margin-top: -25px" @selection-change="handleSelectionChange"
+			 @row-click="handleRowClick" :row-key="getRowKeys" :expand-row-keys="expands" @expand-change="exChange">
+				<el-table-column type="selection" width="44px"></el-table-column>
+				<el-table-column type="expand" prop="details" label="详表">
+					<template slot-scope="scope">
+						<el-table :data="scope.row.details">
+							<el-table-column prop="knr" label="KNR订单号"></el-table-column>
+							<el-table-column prop="vin" label="底牌号"></el-table-column>
+							<el-table-column prop="hostSN" label="大众顺序号"></el-table-column>
+							<el-table-column prop="partCode" label="柱护板零件号"></el-table-column>
+							<el-table-column prop="partCode2" label="柱护板零件号2"></el-table-column>
+						</el-table>
+					</template>
+				</el-table-column>
+				<el-table-column v-for="(item, index) in getDefaultField" :key="index" :prop="item.prop" :label="item.label"
+				 :min-width="item.width" :formatter="fieldFormatter" sortable="custom" show-overflow-tooltip :gutter="0">
+					<template slot="header" slot-scope="scope">
+						{{ scope.column.label }}
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="table-footer">
+				<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+				<pagination v-show="totalCount > 0" :total="totalCount" style="margin-bottom: -5px; float: right" :page.sync="page"
+				 :limit.sync="listQuery.MaxResultCount" @pagination="getList" />
+			</div>
+		</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 { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
 
-export default {
-  name: "M100Online-MB",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
-  directives: { permission },
-  filters: {
-    IsCustomerSignFilter(status) {
-      //翻译是否签字
-      const statusMap = {
-        true: "是",
-        false: "否",
-      };
-      return statusMap[status];
-    },
-  },
-  props: {
-    customerInfosZHB: {
-      type: Array,
-      default: () => {
-        return [];
-      },
-    },
-  },
-  data() {
-    const validVersion = (rule, value, callback) => {
-      let numberReg = /^\d{6}$/;
-      if (!numberReg.test(value)) {
-        callback(new Error("只能为6位数字！"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      crmType: "M100Online-MB",
-      getRowKeys: (row) => {
-        return row.id; //这里看这一行中需要根据哪个属性值是id
-      },
-      expands: [], //只展开一行放入当前行id
-      PrintTimeValue: [],
-      activeNames: ["1"],
-      multipleSelection: [],
-      valueSelect: "",
-      customerInfos: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: true,
-      customerInfo: {
-        printType: "1",
-        productLine: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        billNum: undefined,
-        partType: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginPrintDate: undefined,
-        endPrintDate: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false,
-      tableHeight: document.documentElement.clientHeight - 335,
-      tableHeightMB: document.documentElement.clientHeight - 300,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  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为页面上部标签高度
-      //this.tableHeight = offsetHei -260
-    });
-  },
-  created() {
-    this.getList();
-  },
-  watch: {
-    customerInfosZHB: {
-      handler(newVal) {
-        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
-        if (newVal == "" || newVal == "undefined") {
-          //TODO
-        } else {
-          newVal.forEach((element) => {
-            this.customerInfo.printType = "1";
-            this.customerInfo.productLine = element.ProductLine;
-          });
-          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
-          if (this.customerInfo.productLine != "") {
-            this.getList();
-          }
-        }
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
-      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
-      tempsTabs.push({
-        label: "左或右",
-        prop: "billLocation",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "供应商厂家代码",
-        prop: "providerCode",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "零件类型",
-        prop: "partType",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "器具容量",
-        prop: "capacity",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "打印日期",
-        prop: "printDate",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "打印类型",
-        prop: "printType",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "生产线",
-        prop: "productLine",
-        width: 120,
-      });
+	export default {
+		name: "M100Online-MB",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail
+		},
+		directives: {
+			permission
+		},
+		filters: {
+			IsCustomerSignFilter(status) {
+				//翻译是否签字
+				const statusMap = {
+					true: "是",
+					false: "否",
+				};
+				return statusMap[status];
+			},
+		},
+		props: {
+			customerInfosZHB: {
+				type: Array,
+				default: () => {
+					return [];
+				},
+			},
+		},
+		data() {
+			const validVersion = (rule, value, callback) => {
+				let numberReg = /^\d{6}$/;
+				if (!numberReg.test(value)) {
+					callback(new Error("只能为6位数字！"));
+				} else {
+					callback();
+				}
+			};
+			return {
+				crmType: "M100Online-MB",
+				getRowKeys: (row) => {
+					return row.id; //这里看这一行中需要根据哪个属性值是id
+				},
+				expands: [], //只展开一行放入当前行id
+				PrintTimeValue: [],
+				activeNames: ["1"],
+				multipleSelection: [],
+				valueSelect: "",
+				customerInfos: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: true,
+				customerInfo: {
+					printType: "1",
+					productLine: "",
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					billNum: undefined,
+					partType: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginPrintDate: undefined,
+					endPrintDate: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false,
+				tableHeight: document.documentElement.clientHeight - 335,
+				tableHeightMB: document.documentElement.clientHeight - 300,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		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为页面上部标签高度
+				//this.tableHeight = offsetHei -260
+			});
+		},
+		created() {
+			this.getList();
+		},
+		watch: {
+			customerInfosZHB: {
+				handler(newVal) {
+					console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
+					if (newVal == "" || newVal == "undefined") {
+						//TODO
+					} else {
+						newVal.forEach((element) => {
+							this.customerInfo.printType = "1";
+							this.customerInfo.productLine = element.ProductLine;
+						});
+						console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
+						if (this.customerInfo.productLine != "") {
+							this.getList();
+						}
+					}
+				},
+				immediate: true,
+			},
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "装箱单号",
+					prop: "billNum",
+					width: 140
+				});
+				tempsTabs.push({
+					label: "单据顺号",
+					prop: "billSerialNum",
+					width: 120
+				});
+				tempsTabs.push({
+					label: "左或右",
+					prop: "billLocation",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "供应商厂家代码",
+					prop: "providerCode",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "零件类型",
+					prop: "partType",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "器具容量",
+					prop: "capacity",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "打印日期",
+					prop: "printDate",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "打印类型",
+					prop: "printType",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "生产线",
+					prop: "productLine",
+					width: 120,
+				});
 
-      tempsTabs.push({
-        label: "起底盘号",
-        prop: "beginVin",
-        width: 160,
-      });
-      tempsTabs.push({
-        label: "止底盘号",
-        prop: "endVin",
-        width: 160,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-    },
-    handleRowClick(row, column, event) {
-      this.$refs.multipleTable.clearSelection();
-      this.$refs.multipleTable.toggleRowSelection(row);
-    },
-    exChange(row, rowList) {
-      //this.listLoading = true;
+				tempsTabs.push({
+					label: "起底盘号",
+					prop: "beginVin",
+					width: 160,
+				});
+				tempsTabs.push({
+					label: "止底盘号",
+					prop: "endVin",
+					width: 160,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				alert("ifr.src:" + JSON.stringify(ifr.src))
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+			},
+			handleRowClick(row, column, event) {
+				this.$refs.multipleTable.clearSelection();
+				this.$refs.multipleTable.toggleRowSelection(row);
+			},
+			exChange(row, rowList) {
+				//this.listLoading = true;
 
-      var that = this;
-      if (rowList.length) {
-        that.expands = [];
-        if (row) {
-          that.expands.push(row.id); // 只展开当前行id
-        }
-      } else {
-        that.expands = [];
-      }
-    },
-    //门板
-    getList(data) {
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQuery.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQuery.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.billNum != "") {
-        this.listQuery.billNum = this.listQuery.billNum;
-      }
-      this.listQuery.partType = this.listQuery.partType;
-      this.listQuery.beginVin = this.listQuery.beginVin;
-      this.listQuery.endVin = this.listQuery.endVin;
-      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
-      this.listQuery.endHostSN = this.listQuery.endHostSN;
-      var getdate5 = JSON.stringify(this.PrintTimeValue);
-      if (getdate5 != "[]") {
-        this.listQuery.beginPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[0] || undefined
-          : undefined;
-        this.listQuery.endPrintDate = this.PrintTimeValue
-          ? this.PrintTimeValue[1] || undefined
-          : undefined;
-      } else {
-        this.listQuery.beginPrintDate = undefined;
-        this.listQuery.endPrintDate = undefined;
-      }
-      if (this.customerInfo.productLine != "") {
-        this.listQuery.ProductLine = this.customerInfo.productLine;
-      }
+				var that = this;
+				if (rowList.length) {
+					that.expands = [];
+					if (row) {
+						that.expands.push(row.id); // 只展开当前行id
+					}
+				} else {
+					that.expands = [];
+				}
+			},
+			//门板
+			getList(data) {
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQuery.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQuery.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.billNum != "") {
+					this.listQuery.billNum = this.listQuery.billNum;
+				}
+				this.listQuery.partType = this.listQuery.partType;
+				this.listQuery.beginVin = this.listQuery.beginVin;
+				this.listQuery.endVin = this.listQuery.endVin;
+				this.listQuery.beginHostSN = this.listQuery.beginHostSN;
+				this.listQuery.endHostSN = this.listQuery.endHostSN;
+				var getdate5 = JSON.stringify(this.PrintTimeValue);
+				if (getdate5 != "[]") {
+					this.listQuery.beginPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[0] || undefined :
+						undefined;
+					this.listQuery.endPrintDate = this.PrintTimeValue ?
+						this.PrintTimeValue[1] || undefined :
+						undefined;
+				} else {
+					this.listQuery.beginPrintDate = undefined;
+					this.listQuery.endPrintDate = undefined;
+				}
+				if (this.customerInfo.productLine != "") {
+					this.listQuery.ProductLine = this.customerInfo.productLine;
+				}
 
-      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
-      this.$axios
-        .posts(
-          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
-          this.listQuery
-        )
-        .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
-          setTimeout(() => {
-            //大数据量加载时
-            this.listLoading = false;
-          }, 500);
-        })
-        .catch(() => {
-          this.listLoading = false;
-        });
-    },
-    //重新打印-门板
-    handleUpdate(row) {
-      this.isEdit = true;
-      if (this.multipleSelection.length != 1) {
-        this.$message({
-          message: "重新打印必须选择单行，不能多选！",
-          type: "warning",
-        });
-        return;
-      } else {
-        //this.fetchData(this.multipleSelection[0].id);
-        //重新打印方法
-        let beginVin1 = this.multipleSelection[0].beginVin1;
-        let endVin1 = this.multipleSelection[0].endVin1;
-        var params = {
-          printType: 1,
-          productLine: this.customerInfo.productLine,
-          beginVin: beginVin1,
-          endVin: endVin1,
-        };
-        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
-				let _this = this;
-        this.$axios
-          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
-          .then((response) => {
-            console.log("柱护版-打印返回的状态：" + response.status);
-            const index = this.list.indexOf(row);
-            if (response.status === false) {
-              this.$message({
-                message: response.message,
-                type: "error",
-              });
-              return;
-            } else if (response.status === true) {
-              this.fileQuery.dataname = JSON.stringify(response.item);
-              console.log(
-                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
-                  JSON.stringify(this.fileQuery.dataname)
-              );
-              this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
-                  qs.stringify(this.fileQuery)
-                )
-                .then((response) => {
-                  this.printpdf(response); //打印我文件流
-                });
-            }
-          })
-          .catch(() => {});
-      }
-    },
-    //作废操作，支持批量操作-门板
-    handleDelete(row) {
-      //批量删除
-      var params = [];
-      let myalert = ""; //声明变量，其变量必须在此声明后使用
-      if (row) {
-        //单行
-        params.push(row.id);
-        myalert = row.name;
-      } else {
-        //多选
-        this.multipleSelection.forEach((element) => {
-          let id = element.id;
-          params.push(id);
-        });
-        myalert = "选中项";
-      }
-      this.$confirm("是否作废" + myalert + "?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$axios
-            .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
-            .then((response) => {
-              const index = this.list.indexOf(row);
-              this.$notify({
-                title: "成功",
-                message: "作废成功",
-                type: "success",
-                duration: 2000,
-              });
-              this.getList();
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消操作",
-          });
-        });
-    },
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 重置按钮操作 */
-    resetQuery(refName) {
-      this.$refs[refName].resetFields();
-      this.PrintTimeValue = [];
-      this.handleQuery();
-      this.getProductLine();
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.listQuery.SkipCount = 1;
-      //this.getList();
-    },
-    selectValue(params) {
-      //版本下拉选择
-      this.versionValue = params.value;
-      this.getList();
-    },
+				console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
+				this.$axios
+					.posts(
+						"/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
+						this.listQuery
+					)
+					.then((response) => {
+						this.list = response.items;
+						this.totalCount = response.totalCount;
+						setTimeout(() => {
+							//大数据量加载时
+							this.listLoading = false;
+						}, 500);
+					})
+					.catch(() => {
+						this.listLoading = false;
+					});
+			},
+			//重新打印-门板
+			handleUpdate(row) {
+				this.isEdit = true;
+				if (this.multipleSelection.length != 1) {
+					this.$message({
+						message: "重新打印必须选择单行，不能多选！",
+						type: "warning",
+					});
+					return;
+				} else {
+					//this.fetchData(this.multipleSelection[0].id);
+					//重新打印方法
+					let beginVin1 = this.multipleSelection[0].beginVin1;
+					let endVin1 = this.multipleSelection[0].endVin1;
+					var params = {
+						printType: 1,
+						productLine: this.customerInfo.productLine,
+						beginVin: beginVin1,
+						endVin: endVin1,
+					};
+					console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+					let _this = this;
+					this.$axios
+						.posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+						.then((response) => {
+							console.log("柱护版-打印返回的状态：" + response.status);
+							const index = this.list.indexOf(row);
+							if (response.status === false) {
+								this.$message({
+									message: response.message,
+									type: "error",
+								});
+								return;
+							} else if (response.status === true) {
+								this.fileQuery.dataname = JSON.stringify(response.item);
+								console.log(
+									"柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+									JSON.stringify(this.fileQuery.dataname)
+								);
+								this.$axios
+									.posts(
+										"/Handlers/Handler1.ashx?report=zhuhuban_" + _this.customerInfo.productLine + '-' + _this.customerInfo.fwStation,
+										qs.stringify(this.fileQuery)
+									)
+									.then((response) => {
+										this.printpdf(response); //打印我文件流
+									});
+							}
+						})
+						.catch(() => {});
+				}
+			},
+			//作废操作，支持批量操作-门板
+			handleDelete(row) {
+				//批量删除
+				var params = [];
+				let myalert = ""; //声明变量，其变量必须在此声明后使用
+				if (row) {
+					//单行
+					params.push(row.id);
+					myalert = row.name;
+				} else {
+					//多选
+					this.multipleSelection.forEach((element) => {
+						let id = element.id;
+						params.push(id);
+					});
+					myalert = "选中项";
+				}
+				this.$confirm("是否作废" + myalert + "?", "提示", {
+						confirmButtonText: "确定",
+						cancelButtonText: "取消",
+						type: "warning",
+					})
+					.then(() => {
+						this.$axios
+							.posts("/api/newjit/ZhuHuBanPackingList/delete", params)
+							.then((response) => {
+								const index = this.list.indexOf(row);
+								this.$notify({
+									title: "成功",
+									message: "作废成功",
+									type: "success",
+									duration: 2000,
+								});
+								this.getList();
+							});
+					})
+					.catch(() => {
+						this.$message({
+							type: "info",
+							message: "已取消操作",
+						});
+					});
+			},
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 重置按钮操作 */
+			resetQuery(refName) {
+				this.$refs[refName].resetFields();
+				this.PrintTimeValue = [];
+				this.handleQuery();
+				this.getProductLine();
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.listQuery.SkipCount = 1;
+				//this.getList();
+			},
+			selectValue(params) {
+				//版本下拉选择
+				this.versionValue = params.value;
+				this.getList();
+			},
 
-    selectOptionsChange(item) {
-      this.getList();
-    },
+			selectOptionsChange(item) {
+				this.getList();
+			},
 
-    /** 刷新列表 */
-    handleHandle(data) {
-      if (data.type !== "edit") {
-        this.getList();
-      }
-    },
-    /** 格式化字段 */
-    fieldFormatter(row, column) {
-      if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property == "printDate" || 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];
-    },
-    //门板
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-    },
+			/** 刷新列表 */
+			handleHandle(data) {
+				if (data.type !== "edit") {
+					this.getList();
+				}
+			},
+			/** 格式化字段 */
+			fieldFormatter(row, column) {
+				if (column.property === "billStatus") {
+					return {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property == "printDate" || 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];
+			},
+			//门板
+			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);
-    },
+			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);
+			},
 
-    closeDialog() {},
-  },
-};
+			closeDialog() {},
+		},
+	};
 </script>
 
 
 
 <style lang="scss" scoped>
-@import "../../../pg-fis/styles/crmtable.scss";
-.divider1 {
-  margin: 0;
-}
-.divider2 {
-  margin: 10px;
-  margin-bottom: 20px;
-  width: 95%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
+	@import "../../../pg-fis/styles/crmtable.scss";
 
+	.divider1 {
+		margin: 0;
+	}
 
+	.divider2 {
+		margin: 10px;
+		margin-bottom: 20px;
+		width: 95%;
+	}
+
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index e359e29c..5691bb48 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -898,7 +898,7 @@ export default {
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
-						debugger
+						//debugger
           }, 500);
         })
         .catch(() => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 746b4c28..17900d25 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -1,2055 +1,1857 @@
 <!--日常打印M100信息模块-->
 <!--日常打印M100信息模块-->
 <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
-                v-for="item in productTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="productLine">
-            <el-select
-              v-model="listQuery.productLine"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="item in PLChildList"
-                :key="item.id"
-                :label="item.productLineName"
-                :value="item.productLineCode"
-              />
-            </el-select>
-          </el-form-item>
-		  
-          <el-form-item label="大众工位" prop="fwStation" v-show="this.listQuery.productType === 2">
-            <el-select
-              v-model="listQuery.fwStation"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 15px"
-			  @change="fwStation_selectChange"
-            >
-              <el-option
-                v-for="item in fwStationList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              icon="el-icon-refresh"
-              size="mini"
-              @click="resetQuery('queryForm')"
-              >重置</el-button
-            >
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              style="margin-left: 15px"
-              @click="handleDownload()"
-              >导出(Excel)
-            </el-button>
-            <el-button
-              ref="btn1"
-              type="primary"
-              size="mini"
-              style="margin-left: 15px"
-              @click="print()"
-              >打印门板发货排序单
-            </el-button>
-						
-            <el-button
-              v-show="false"
-              @click="drawerMBPrint = true"
-              size="mini"
-              type="warning"
-              plain
-            >
-              <strong>重新打印门板</strong></el-button
-            >
-            <el-button
-              v-show="false"
-              @click="drawerbudaMBPrint = true"
-              size="mini"
-              type="warning"
-              plain
-            >
-              <strong>门板补打</strong></el-button
-            >
-            <el-button
-              v-show="false"
-              @click="drawerMBDelete = true"
-              size="mini"
-              type="danger"
-              plain
-              ><strong>门板作废</strong></el-button
-            >
-
-            <el-button
-              v-show="this.listQuery.productType === 2"
-              @click="drawerZHBPrint = true"
-              size="mini"
-              type="warning"
-              plain
-            >
-              <strong>重新打印柱护板</strong></el-button
-            >
-						
-						
-			<el-button
-				v-show="this.listQuery.productType === 2"
-				@click="drawerbudaZHBPrint = true"
-				size="mini"
-				type="warning"
-				plain
-			>
-				<strong>柱护板补打</strong></el-button
-			>
-						
-						
-            <el-button
-              v-show="this.listQuery.productType === 2"
-              @click="drawerZHBDelete = true"
-              size="mini"
-              type="danger"
-              plain
-              ><strong>柱护板作废</strong></el-button
-            >
-            <!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
+	<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 v-for="item in productTypeList" :key="item.id" :label="item.name" :value="item.id" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="" prop="productLine">
+						<el-select v-model="listQuery.productLine" clearable placeholder="请选择" size="medium" style="margin-right: 15px"
+						 @change="valueselectChange">
+							<el-option v-for="item in PLChildList" :key="item.id" :label="item.productLineName" :value="item.productLineCode" />
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="大众工位" prop="fwStation" v-show="this.listQuery.productType === 2">
+						<el-select v-model="listQuery.fwStation" clearable placeholder="请选择" size="medium" style="margin-right: 15px"
+						 @change="fwStation_selectChange">
+							<el-option v-for="item in fwStationList" :key="item.id" :label="item.name" :value="item.id" />
+						</el-select>
+					</el-form-item>
+
+					<el-form-item>
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="handleFilter">搜索</el-button>
+						<el-button icon="el-icon-refresh" size="mini" @click="resetQuery('queryForm')">重置</el-button>
+						<el-button type="warning" plain icon="el-icon-download" size="mini" style="margin-left: 15px" @click="handleDownload()">导出(Excel)
+						</el-button>
+						<el-button ref="btn1" type="primary" size="mini" style="margin-left: 15px" @click="print()">打印门板发货排序单
+						</el-button>
+
+						<el-button v-show="false" @click="drawerMBPrint = true" size="mini" type="warning" plain>
+							<strong>重新打印门板</strong></el-button>
+						<el-button v-show="false" @click="drawerbudaMBPrint = true" size="mini" type="warning" plain>
+							<strong>门板补打</strong></el-button>
+						<el-button v-show="false" @click="drawerMBDelete = true" size="mini" type="danger" plain><strong>门板作废</strong></el-button>
+
+						<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBPrint = true" size="mini" type="warning"
+						 plain>
+							<strong>重新打印柱护板</strong></el-button>
+
+
+						<el-button v-show="this.listQuery.productType === 2" @click="drawerbudaZHBPrint = true" size="mini" type="warning"
+						 plain>
+							<strong>柱护板补打</strong></el-button>
+
+
+						<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBDelete = true" size="mini" type="danger"
+						 plain><strong>柱护板作废</strong></el-button>
+						<!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
               >测试</el-button
             >2Z
             <el-button plain @click="open"> 不会自动关闭 </el-button> -->
-          </el-form-item>
-          <el-form-item>
-            <div id="app">
-              <div
-                style="
+					</el-form-item>
+					<el-form-item>
+						<div id="app">
+							<div style="
                   border: solid 1px darkgray;
                   border-radius: 5px;
                   margin: 5px;
                   padding: 5px;
-                "
-              >
-                <span ref="sp01">{{ content01 }}</span>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span ref="sp05">{{ content05 }}</span>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span ref="sp07">{{ content07 }}</span>
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <span ref="sp08">{{ content08 }}</span>
-              </div>
-            </div>
-          </el-form-item>
-
-          <!-- </el-row> -->
-        </el-form>
-      </flexbox>
-    </div>
-    <!--门板重打-->
-    <el-drawer
-      title="门板重新打印"
-      :visible.sync="drawerMBPrint"
-      direction="rtl"
-      size="65%"
-    >
-      <RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
-    </el-drawer>
-    <!--门板补打-->
-    <el-drawer
-      title="门板补打"
-      :visible.sync="drawerbudaMBPrint"
-      direction="rtl"
-      size="65%"
-    >
-      <budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
-    </el-drawer>
-    <!--门板作废-->
-    <el-drawer
-      title="门板作废"
-      :visible.sync="drawerMBDelete"
-      direction="rtl"
-      @open="opens()"
-      size="65%"
-    >
-      <ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
-    </el-drawer>
-    <!--柱护板重打-->
-    <el-drawer
-      title="柱护板重新打印"
-      :visible.sync="drawerZHBPrint"
-      direction="rtl"
-      size="65%"
-    >
-      <RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
-    </el-drawer>
-		
-		
+                ">
+								<span ref="sp01">{{ content01 }}</span>
+								&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+								<span ref="sp05">{{ content05 }}</span>
+								&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+								<span ref="sp07">{{ content07 }}</span>
+								&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+								<span ref="sp08">{{ content08 }}</span>
+							</div>
+						</div>
+					</el-form-item>
+
+					<!-- </el-row> -->
+				</el-form>
+			</flexbox>
+		</div>
+		<!--门板重打-->
+		<el-drawer title="门板重新打印" :visible.sync="drawerMBPrint" direction="rtl" size="65%">
+			<RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
+		</el-drawer>
+		<!--门板补打-->
+		<el-drawer title="门板补打" :visible.sync="drawerbudaMBPrint" direction="rtl" size="65%">
+			<budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
+		</el-drawer>
+		<!--门板作废-->
+		<el-drawer title="门板作废" :visible.sync="drawerMBDelete" direction="rtl" @open="opens()" size="65%">
+			<ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
+		</el-drawer>
+		<!--柱护板重打-->
+		<el-drawer title="柱护板重新打印" :visible.sync="drawerZHBPrint" direction="rtl" size="65%">
+			<RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
+		</el-drawer>
+
+
 		<!--柱护板补打-->
-		<el-drawer
-		  title="柱护板补打"
-		  :visible.sync="drawerbudaZHBPrint"
-		  direction="rtl"
-		  size="65%"
-		>
-		  <budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB>
+		<el-drawer title="柱护板补打" :visible.sync="drawerbudaZHBPrint" direction="rtl" size="65%">
+			<budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB>
 		</el-drawer>
-		
-		
-		
-    <!--柱护板重打和作废-->
-    <el-drawer
-      title="柱护板作废"
-      :visible.sync="drawerZHBDelete"
-      direction="rtl"
-      size="65%"
-    >
-      <ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
-    </el-drawer>
-
-    <div class="l-table" style="margin-top: -15px">
-      <!--表格渲染-->
-      <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)">{{
+
+
+
+		<!--柱护板重打和作废-->
+		<el-drawer title="柱护板作废" :visible.sync="drawerZHBDelete" direction="rtl" size="65%">
+			<ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
+		</el-drawer>
+
+		<div class="l-table" style="margin-top: -15px">
+			<!--表格渲染-->
+			<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>
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        width="700px"
-        @close="closeDialog"
-      >
-        <el-form
-          ref="form"
-          :inline="true"
-          :model="form"
-          :rules="rules"
-          size="small"
-          label-width="120px"
-        >
-          <el-row>
-            <el-col :span="24">
-              <el-row>
-                <el-col :md="10" :xs="24">
-                  <el-form-item
-                    label="要打印数量:"
-                    prop="printNum"
-                    v-show="this.listQuery.productType === 1"
-                  >
-                    <el-input-number
-                      v-model="printNum"
-                      :min="1"
-                      :step="1"
-                      @change="valueNumChange"
-                    ></el-input-number>
-                  </el-form-item>
-                </el-col>
-                <el-col :md="10" :xs="24">
-                  <el-form-item
-                    label="产线:"
-                    prop="printNum"
-                    v-show="this.listQuery.productType === 1"
-                  >
-                    {{ this.productName }}
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-row>
-                  <el-col :md="10" :xs="24">
-                    <el-form-item
-                      label="要打印数量:"
-                      prop="printNumZHB"
-                      v-show="this.listQuery.productType === 2"
-                    >
-                      <el-input-number
-                        v-model="printNumZHB"
-                        :min="1"
-                        :step="1"
-                        @change="valueNumChangeZHB"
-                      ></el-input-number>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :md="10" :xs="24">
-                    <el-form-item
-                      label="产线:"
-                      v-show="this.listQuery.productType === 2"
-                    >
-                      {{ this.productName }}
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-row>
-              <el-form-item
-                label="大众顺序号:"
-                prop="beginHostSN"
-                v-show="isShowHostSN"
-              >
-                <el-input
-                  v-model.number="form.beginHostSN"
-                  placeholder=""
-                  clearable
-                  type="number"
-                  size="small"
-                  style="width: 240px"
-                  @change="beginHostSNChange"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endHostSN"
-                  placeholder=""
-                  clearable
-                  :disabled="true"
-                  size="small"
-                  style="width: 240px;"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
-                <el-input
-                  v-model="form.beginVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 240px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="dialogFormVisible = false"
-            >取消</el-button
-          >
-          <el-button
-            v-loading="formLoading"
-            type="primary"
-            :disabled="isDisable"
-            @click="save"
-            v-debounce="debounceClick"
-            >确认</el-button
-          >
-        </div>
-      </el-dialog>
-    </div>
-
-    <div class="table-footer">
-      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
-      <pagination
-        v-show="totalCount > 0"
-        :total="totalCount"
-        style="float: right"
-        :page.sync="page"
-        :limit.sync="listQuery.MaxResultCount"
-        @pagination="getList"
-      />
-      <!-- 抽屉控件 -->
-      <el-drawer
-        title="信息详细页"
-        size="75%"
-        direction="rtl"
-        :visible.sync="drawer"
-        :before-close="handleDrawerClose"
-      >
-        <div>
-          <Detail
-            v-bind:customerInfos="customerInfos"
-            style="margin-top: -35px"
-          ></Detail>
-        </div>
-      </el-drawer>
-    </div>
-  </div>
+					</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>
+			<el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" :title="formTitle" width="700px" @close="closeDialog">
+				<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="120px">
+					<el-row>
+						<el-col :span="24">
+							<el-row>
+								<el-col :md="10" :xs="24">
+									<el-form-item label="要打印数量:" prop="printNum" v-show="this.listQuery.productType === 1">
+										<el-input-number v-model="printNum" :min="1" :step="1" @change="valueNumChange"></el-input-number>
+									</el-form-item>
+								</el-col>
+								<el-col :md="10" :xs="24">
+									<el-form-item label="产线:" prop="printNum" v-show="this.listQuery.productType === 1">
+										{{ this.productName }}
+									</el-form-item>
+								</el-col>
+							</el-row>
+							<el-row>
+								<el-row>
+									<el-col :md="10" :xs="24">
+										<el-form-item label="要打印数量:" prop="printNumZHB" v-show="this.listQuery.productType === 2">
+											<el-input-number v-model="printNumZHB" :min="1" :step="1" @change="valueNumChangeZHB"></el-input-number>
+										</el-form-item>
+									</el-col>
+									<el-col :md="10" :xs="24">
+										<el-form-item label="产线:" v-show="this.listQuery.productType === 2">
+											{{ this.productName }}
+										</el-form-item>
+									</el-col>
+								</el-row>
+							</el-row>
+							<el-form-item label="大众顺序号:" prop="beginHostSN" v-show="isShowHostSN">
+								<el-input v-model.number="form.beginHostSN" placeholder="" clearable type="number" size="small" style="width: 240px"
+								 @change="beginHostSNChange" />
+								<label class="label1">-</label>
+								<el-input v-model="form.endHostSN" placeholder="" clearable :disabled="true" size="small" style="width: 240px;" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="24">
+							<el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
+								<el-input v-model="form.beginVin" placeholder="" clearable size="small" style="width: 240px" />
+								<label class="label1">-</label>
+								<el-input v-model="form.endVin" placeholder="" clearable size="small" style="width: 240px" />
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-form>
+
+				<div slot="footer" class="dialog-footer">
+					<el-button type="text" @click="dialogFormVisible = false">取消</el-button>
+					<el-button v-loading="formLoading" type="primary" :disabled="isDisable" @click="save" v-debounce="debounceClick">确认</el-button>
+				</div>
+			</el-dialog>
+		</div>
+
+		<div class="table-footer">
+			<!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+			<pagination v-show="totalCount > 0" :total="totalCount" style="float: right" :page.sync="page" :limit.sync="listQuery.MaxResultCount"
+			 @pagination="getList" />
+			<!-- 抽屉控件 -->
+			<el-drawer title="信息详细页" size="75%" direction="rtl" :visible.sync="drawer" :before-close="handleDrawerClose">
+				<div>
+					<Detail v-bind:customerInfos="customerInfos" style="margin-top: -35px"></Detail>
+				</div>
+			</el-drawer>
+		</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 { mapGetters } from "vuex";
-import moment from "moment";
-import Detail from "./detail.vue";
-import MBDetail from "./detailMB.vue";
-import ZHBDetail from "./detailZHB.vue";
-import { downloadFile } from "@/utils/crmindex.js";
-import qs from "qs";
-import RepetitionMB from "./RepetitionMB.vue";
-import budaMB from "./budaMB.vue";
-import budaZHB from "./budaZHB.vue";
-import RepetitionZHB from "./RepetitionZHB.vue";
-import ScrapMB from "./ScrapMB.vue";
-import ScrapZHB from "./ScrapZHB.vue";
-import { forEach } from "jszip/lib/object";
-
-export default {
-  name: "M100Online",
-  components: {
-    Pagination,
-    CRMTableHead,
-    importExcel,
-    Detail,
-    MBDetail,
-    ZHBDetail,
-    RepetitionMB,
-    RepetitionZHB,
-    ScrapMB,
-    ScrapZHB,
-    budaMB,
-		budaZHB
-  },
-  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 {
-      content01: "",
-      content05: "",
-      content07: "",
-      content08: "",
-      // minute01: this.timeoutMinutes,
-      // minute05: this.timeoutMinutes,
-      // lastTime01: "14:00",
-      // lastTime05: "14:40",
-      crmType: "M100Online",
-      //productLineList:null,
-      isDisable: false,
-      drawerMBPrint: false,
-      drawerbudaMBPrint: false,
-			drawerbudaZHBPrint: false, //显示补打柱护板
-      drawerMBDelete: false,
-      drawerZHBPrint: false,
-      drawerZHBDelete: false,
-      activeNames: ["1"],
-      printNum: "12",
-      printNumZHB: "24",
-      rules: {
-        erpAssemblyName: [
-          { required: true, message: "必须输入！", trigger: "blur" },
-        ],
-        beginHostSN: [
-          { required: true, message: "必须输入数字！", trigger: "number" },
-        ],
-      },
-      billState: [
-        { id: 2, name: "未打印" },
-        { id: 3, name: "已打印" },
-      ],
-      valueSelect: "",
-      productName: "",
-      customerInfos: [],
-      customerInfosMB: [],
-      customerInfosZHB: [],
-      dialogOptions: [],
-      versionValue: "",
-      searchContent: "", // 输入内容
-      showExcelImport: false,
-      form: {},
-      drawer: false,
-      list: null,
-      totalCount: 0,
-      listLoading: false,
-      listLoaddingPrint: true,
-      customerInfo: {
-        bomId: "",
-      },
-      // 高级搜索
-      filterObj: {
-        type: Object,
-        default: () => {
-          return {};
-        },
-      },
-      listQuery: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1, //1:门板；2:柱护板
-		fwStation : "BA2", //大众工位
-        ProductLine: undefined,
-        Version: undefined,
-        printBillNum: undefined,
-        serialNumBegin: undefined,
-        serialNumEnd: undefined,
-        HostSNBegin: undefined,
-        HostSNEnd: undefined,
-        KNRBegin: undefined,
-        KNREnd: undefined,
-        VINBegin: undefined,
-        VINEnd: undefined,
-        OnlineTimeValue: [],
-        OnlineTimeBegin: undefined,
-        OnlineTimeEnd: undefined,
-        ReceiveTimeValue: [],
-        ReceiveTimeBegin: undefined,
-        ReceiveTimeEnd: undefined,
-        billStatus: undefined,
-        state: [],
-      },
-      listQueryList: {
-        SkipCount: 0,
-        MaxResultCount: 15,
-        ProductLine: undefined,
-        BillStatus: undefined,
-        CanNotPrint: false,
-        ZHBBillStatus: undefined,
-      },
-      listExportQuery: {
-        erpAssemblyCode: undefined,
-        erpAssemblyName: undefined,
-      },
-      listPLQuery: {
-        BillType: 2,
-        //UserId: this.userinfo.UserId,
-      },
-      hostSNQuery: {
-        productLine: undefined,
-      },
-      hostCheckQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      hostPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      vinPrintQuery: {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      },
-      fileQuery: {
-        dataname: undefined,
-      },
-      form: {
-        details: [],
-      },
-      page: 1,
-      // 显示搜索条件
-      showSearch: true,
-      drawer: false,
-      dialogFormVisible: false,
-      formTitle: "",
-      isEdit: false,
-      formLoading: false, //关闭窗口
-      tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight: 250,
-      details: [], //修改子表数据源
-      PLList: [], //产线下拉
-      PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
-      fwStationList: [
-        { id: "BA2", name: "BA2" },
-        { id: "BA5", name: "BA5" }
-      ],
-      isShowHostSN: false,
-      isShowVin: false,
-      isShowState: true,
-    };
-  },
-  mounted() {
-    this.setTableHeight()
-
-    let timer = setInterval(() => {
-      this.open();
-    }, 5000);
-  },
-  created() {
-    this.billState.forEach((element, index) => {
-      if (index === 0) {
-        this.listQuery.state.push(element.id);
-      }
-    });
-    this.getProductLine();
-  },
-  computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      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: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "printBillNum",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 120,
-      });
-      return tempsTabs;
-    },
-    ...mapGetters(["userInfo"]), //获取当前用户信息
-  },
-  methods: {
-    setTableHeight(){
-      this.$nextTick(() => {
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 67 - 79 - 10; //57为footer高度，79为页面上部标签高度
-        //this.tableHeight = offsetHei -260
-      });
-    },
-    opens() {
-
-      this.getList();
-    },
-    open() {
-      // let productLineList = [];
-      // //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" );
-      // productLineList.forEach(element => {
-      //   element=this.listQuery.productLine;
-      // });
-	  
-      //let productLineList = { productLineList: [this.listQuery.productLine] };
-      this.$refs.sp01.Visible = false;
-      this.$refs.sp05.Visible = false;
-      this.$refs.sp07.Visible = false;
-      this.$refs.sp08.Visible = false;
-
-      let productLineListMain = { productLineList: [] };
-
-      this.PLChildList.forEach((itm) => {
-        productLineListMain.productLineList.push(itm.productLineCode);
-      });
-
-      console.log(
-        "门版-主界面传过来的值：" + JSON.stringify(productLineListMain)
-      );
-      this.$axios
-        .posts(
-          "/api/newjit/bill-m100/product-line-timeout-remind",
-          productLineListMain
-        )
-        .then((response) => {
-          if (response.status == false) {
-            this.$message({
-              message: response.message,
-              type: "warning",
-            });
-            return;
-          } else {
-            console.log(
-              "超时提醒-接口传过来的值：" + JSON.stringify(response.item)
-            );
-
-            if (response.item !== null) {
-              response.item.forEach((JKITEM) => {
-                if (JKITEM.productLine == "01") {
-                  this.$refs.sp01.Visible = true;
-                  this.content01 =
-                    "大众一厂已经" +
-                    JKITEM.timeoutMinutes +
-                    "分钟没收到报文\xa0\xa0\xa0\xa0";
-                  if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                    //写提示信息
-                    console.log(
-                      "222222222222222222222222222222222222222222222222-1"
-                    );
-                    this.$refs.sp01.style.color = "red";
-                    this.$refs.sp01.style.fontWeight = "bold";
-                  } else {
-                    this.$refs.sp01.style.color = "green";
-                  }
-                }
-                if (JKITEM.productLine == "02") {
-                  this.$refs.sp05.Visible = true;
-                  this.content05 =
-                    "大众二厂已经" +
-                    JKITEM.timeoutMinutes +
-                    "分钟没收到报文\xa0\xa0\xa0\xa0";
-                  if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                    //写提示信息
-                    console.log(
-                      "222222222222222222222222222222222222222222222222-2"
-                    );
-                    this.setTableHeight()
-                    this.$refs.sp05.style.color = "red";
-                    this.$refs.sp05.style.fontWeight = "bold";
-                  } else {
-                    this.$refs.sp05.style.color = "green";
-                  }
-                }
-                // if (JKITEM.productLine == "05") {
-                //   this.$refs.sp05.Visible = true;
-                //   this.content05 =
-                //     "05生产线已经" +
-                //     JKITEM.timeoutMinutes +
-                //     "分钟没收到报文\xa0\xa0\xa0\xa0";
-                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                //     //写提示信息
-                //     console.log(
-                //       "222222222222222222222222222222222222222222222222"
-                //     );
-                //     this.$refs.sp05.style.color = "red";
-                //     this.$refs.sp05.style.fontWeight = "bold";
-                //   } else {
-                //     this.$refs.sp05.style.color = "green";
-                //   }
-                // }
-                // if (JKITEM.productLine == "07") {
-                //   this.$refs.sp07.Visible = true;
-                //   this.content07 =
-                //     "07生产线已经" +
-                //     JKITEM.timeoutMinutes +
-                //     "分钟没收到报文\xa0\xa0\xa0\xa0";
-                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                //     //写提示信息
-                //     console.log(
-                //       "222222222222222222222222222222222222222222222222"
-                //     );
-                //     this.$refs.sp07.style.color = "red";
-                //     this.$refs.sp07.style.fontWeight = "bold";
-                //   } else {
-                //     this.$refs.sp07.style.color = "green";
-                //   }
-                // }
-                // if (JKITEM.productLine == "08") {
-                //   this.$refs.sp08.Visible = true;
-                //   this.content08 =
-                //     JKITEM.productLine +
-                //     "生产线已经" +
-                //     JKITEM.timeoutMinutes +
-                //     "分钟没收到报文";
-                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                //     //写提示信息
-                //     console.log(
-                //       "222222222222222222222222222222222222222222222222"
-                //     );
-                //     this.$refs.sp08.style.color = "red";
-                //     this.$refs.sp08.style.fontWeight = "bold";
-                //   } else {
-                //     this.$refs.sp08.style.color = "green";
-                //   }
-                // }
-              });
-            } else {
-              this.$message({
-                message: "获取接口数据",
-                type: "warning",
-              });
-              return;
-            }
-          }
-        });
-    },
-    debounceClick() {
-      console.log("2秒内点击无数次，都只会触发一次");
-    },
-    //大众顺序号起止事件改变
-    beginHostSNChange(val) {
-      if (this.listQuery.productType === 1) {
-        this.form.endHostSN =
-          parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
-      } else if (this.listQuery.productType === 2) {
-        this.form.endHostSN =
-          parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
-      }
-    },
-    //门板打印数量更改
-    valueNumChange(val) {
-      this.printNum = val;
-      if (val == 12) {
-        //默认值是12
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              //门板
-              this.form.endHostSN = parseInt(response.item) + 11;
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else {
-        //起止顺序号默认数量不为12
-        this.form.endHostSN =
-          parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
-      }
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
-      //   .then((response) => {
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (val == 12) {
-      //         //门板
-      //         this.form.endHostSN = parseInt(response.item) + 11;
-      //       } else {
-      //         this.form.endHostSN =
-      //           parseInt(response.item) + parseInt(this.printNum) - 1;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   });
-    },
-    //柱护板打印更改
-    valueNumChangeZHB(val) {
-      this.printNumZHB = val;
-      if (val == 12) {
-        //默认值是12
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              //门板
-              this.form.endHostSN = parseInt(response.item) + 11;
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else {
-        //起止顺序号默认数量不为12
-        this.form.endHostSN =
-          parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
-      }
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
-      //   .then((response) => {
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (val == 24) {
-      //         //柱护板
-      //         this.form.endHostSN = parseInt(response.item) + 23;
-      //       } else {
-      //         this.form.endHostSN =
-      //           parseInt(response.item) + this.printNumZHB - 1;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   });
-    },
-    //抽屉
-    handleDrawerOpen(param) {
-		debugger
-      this.drawer = true;
-      //console.log(510)
-      //console.log(param)
-      var parentId = param.assemblyID; //主键id
-      this.customerInfos = [
-        {
-          ParentId: parentId,
-		  BillId: param.id
-        },
-      ];
-    },
-		
-    handleDrawerClose(done) {
-      done();
-    },
-
-    fetchData(id) {
-      //循环动态
-      this.$axios
-        .gets("/api/newjit/assembly-cfg-erp/" + id)
-        .then((response) => {
-          this.form = response.item;
-          //this.details = response.item.details;
-          //console.log(this.details);
-        });
-    },
-    /** 导出功能 */
-    handleDownload() {
-      this.listLoading = true;
-      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
-      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
-      console.log(JSON.stringify(this.listQuery));
-      this.$axios
-        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
-        .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.OnlineTimeValue = [];
-      this.listQuery.ReceiveTimeValue = [];
-      this.listQuery.state = [];
-      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 { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
-      }
-      if (column.property === "zHBBillStatus") {
-        return { 1: "未匹配", 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(data) {
-
-      this.listLoading = true;
-      if (data != undefined) {
-        this.listQueryList.SkipCount = (this.page - 1) * data.limit;
-      } else {
-        this.listQueryList.SkipCount = (this.page - 1) * 15;
-      }
-      if (this.listQuery.productType === 2) {
-        this.listQueryList.ZHBBillStatus = 2;
-      } else {
-        this.listQueryList.ZHBBillStatus = 0;
-      }
-      if (this.listQuery.productType === 2) {
-        this.listQuery.ZHBBillStatus = 2;
-      } else {
-        this.listQuery.ZHBBillStatus = 0;
-      }
-      this.listQueryList.BillStatus = 2; //状态
-      this.listQueryList.ProductLine = this.listQuery.productLine; //产线
-      this.listQueryList.CanNotPrint = false; //不可打印
-	  this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5
-      console.log(
-        "日常打印M100查询条件：" + JSON.stringify(this.listQueryList)
-      );
-      //this.click();
-      this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQueryList)
-        .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(val) {
-      this.$forceUpdate();
-      this.customerInfosMB = [];
-      this.customerInfosZHB = [];
-      if (this.listQuery.productType === 1) {
-        //把产线值传到子组件
-        this.customerInfosMB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-			fwStation: this.listQuery.fwStation
-          },
-        ];
-      }
-      if (this.listQuery.productType === 2) {
-        //把产线值传到子组件
-        this.customerInfosZHB = [
-          {
-            PrintType: 1,
-            ProductLine: val,
-            fwStation: this.listQuery.fwStation
-          },
-        ];
-      }
-    },
-	fwStation_selectChange(val) {
-	  this.$forceUpdate();
-      if (this.listQuery.productType === 1) {
-        //把产线值传到子组件
-        this.customerInfosMB = [
-          {
-            PrintType: 1,
-            ProductLine: this.listQuery.productLine,
-			fwStation: val
-          },
-        ];
-      }
-      if (this.listQuery.productType === 2) {
-        //把产线值传到子组件
-        this.customerInfosZHB = [
-          {
-            PrintType: 1,
-            ProductLine: this.listQuery.productLine,
-			fwStation: val
-          }
-        ];
-      }
-	},
-	
-	
-    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);
-    },
-
-    closeDialog() {},
-    /**打印 */
-    print() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 0);
-      this.hostPrintQuery.printType = 0;
-      this.vinPrintQuery.printType = 0;
-	  
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      (this.printNum = "12"),
-        (this.printNumZHB = "24"),
-		
-		
-      this.hostSNQuery.productLine = this.listQuery.productLine;
-	  this.hostSNQuery.fwStation = this.listQuery.fwStation
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-	  this.hostPrintQuery.fwStation = this.listQuery.fwStation;
-	  
-      //后端服务更改了 前端跟着更改成以下方式
-      if (this.listQuery.productType === 1) {
-        //门板
-        this.hostSNQuery.isZhuHuBan = "0";
-        console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn3",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item.beginHostSN);
-			  this.printNum = parseInt(response.item.count);
-              if (this.listQuery.productType === 1) {
-                this.form.endHostSN = parseInt(response.item.beginHostSN) + parseInt(response.item.count) - 1;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else if (this.listQuery.productType === 2) {
-        //柱护板
-        this.hostSNQuery.isZhuHuBan = "1";
-        console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
-		
-		//调用 get-zhuhuban-vin-num 服务 赋值给	this.printNumZHB---------------------------------
-		this.$axios
-		  .gets(
-		    "/api/newjit/bill-m100/get-zhuhuban-vin-num",
-		    this.hostSNQuery
-		  )
-		  .then((response) => {
-		    console.log("获取柱护板打印数量");
-		    console.log(response.item);
-		    if (response.item !== null) {
-		      this.printNumZHB = parseInt(response.item);
-			  
-			  //this.form.endHostSN = this.form.beginHostSN + this.printNumZHB - 1;
-			  this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
-		    } else {
-		      this.$message({
-		        message: "获取柱护板打印数量失败，返回空",
-		        type: "warning",
-		      });
-		      return;
-		    }
-		  });
-		//---------------------------------------------------------------------------------------
-		
-
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            console.log("获取hostsn大众顺序号起始");
-            console.log(response.item);
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                //this.form.endHostSN = parseInt(response.item) + 23;
-				this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
-              }
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      }
-      if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") {
-        this.productName = "";
-        switch (this.listQuery.productLine) {
-          case "00":
-            this.productName = "全部门板";
-            break;
-        }
-
-        this.formTitle = "打印-门板发货排序单";
-      } else {
-        this.productName = "";
-        switch (this.listQuery.productLine) {
-          case "01":
-            this.productName = "大众一厂";
-            break;
-          case "02":
-            this.productName = "大众二厂";
-            break;
-        }
-        this.formTitle = "打印-柱护板发货排序单";
-      }
-      //this.formTitle = "打印";
-      this.dialogFormVisible = true;
-      this.form = {
-        beginHostSN: "",
-        endHostSN: "",
-      };
-      this.isShowHostSN = true;
-      this.isShowVin = false;
-    },
-    /**重打 */
-    rePrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 1);
-      this.hostPrintQuery.printType = 1;
-      this.vinPrintQuery.printType = 1;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      this.formTitle = "重打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-	  this.hostPrintQuery.fwStation = this.listQuery.fwStation;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    /**补打 */
-    makeUpPrint() {
-      (this.hostPrintQuery = {
-        printType: undefined, //0:打印;1:重打;2:补打;
-        productLine: undefined,
-        beginHostSN: undefined,
-        endHostSN: undefined,
-        beginVin: undefined,
-        endVin: undefined,
-      }),
-        (this.hostCheckQuery.printType = 2);
-      this.hostPrintQuery.printType = 2;
-      this.vinPrintQuery.printType = 2;
-      if (
-        this.listQuery.productLine === "" ||
-        this.listQuery.productLine === undefined
-      ) {
-        this.$message({
-          message: "请选择生产线",
-          type: "error",
-        });
-        return;
-      }
-      this.formTitle = "补打";
-      this.hostPrintQuery.productLine = this.listQuery.productLine;
-	  this.hostPrintQuery.fwStation = this.listQuery.fwStation;
-      this.dialogFormVisible = true;
-      this.form = {
-        beginVin: "",
-        endVin: "",
-      };
-      this.isShowHostSN = false;
-      this.isShowVin = true;
-    },
-    save() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          //this.listLoaddingPrint = true;
-          if (this.isShowHostSN === true) {
-            if (this.form.beginHostSN === "") { // || this.form.endHostSN === ""
-              this.$message({
-                message: "请输入完整的顺序号起始范围",
-                type: "error",
-              });
-              return;
-            } else {
-              if (this.listQuery.productType === 1) {
-                //门板
-                if (
-                  parseInt(this.form.endHostSN) -
-                    parseInt(this.form.beginHostSN) < 0
-                ) {
-                  this.$message({
-                    message: "起止大众顺序号相减不能为零！",
-                    type: "error",
-                  });
-                  return;
-                }
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                // if (
-                //   parseInt(this.form.endHostSN) -
-                //     parseInt(this.form.beginHostSN) >
-                //   23
-                // ) {
-                //   this.$message({
-                //     message:
-                //       "最多只能打印24个顺序号，终止顺序号不能大于" +
-                //       (parseInt(this.form.beginHostSN) + 23),
-                //     type: "error",
-                //   });
-                //   return;
-                // }
-              }
-            }
-          }
-          if (this.isShowVin === true) {
-            if (this.form.beginVin === "" || this.form.endVin === "") {
-              this.$message({
-                message: "请输入完整的底盘号起始范围",
-                type: "error",
-              });
-              return;
-            }
-          }
-          /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
-          if (
-            this.formTitle === "打印-门板发货排序单" ||
-            this.formTitle === "打印-柱护板发货排序单"
-          ) {
-            this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
-            this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
-
-            if (this.listQuery.productType === 1) {
-              //门板-打印
-              this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
-              this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
-              this.hostCheckQuery.productLine = this.listQuery.productLine;
-              this.isDisable = true;
-              console.log(
-                "检查柱护板-hostCheckQuery" +
-                  JSON.stringify(this.hostCheckQuery)
-              );
-              this.$axios
-                .posts(
-                  "/api/newjit/bill-m100/check-mb-hostsn-break-num",
-                  this.hostCheckQuery
-                )
-                .then((response) => {
-                  console.log("检查门板-大众顺序号是否断号");
-                  // this.isDisable = true;
-                  // setTimeout(() => {
-                  //   this.isDisable = false;
-                  // }, 1000);
-
-                  if (response.item.length > 0) {
-                    //有断号
-                    this.$confirm(
-                      "本次打印存在断号是否继续?" + response.item,
-                      "提示",
-                      {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      }
-                    )
-                      .then(() => {
-                        //门板
-                        //传递大众顺序号起止
-						this.private_printMenBan();
-                      })
-                      .catch(() => {
-                        this.isDisable = false;
-                      });
-                  } else {
-                    //无断号
-                    //门板
-                    //传递大众顺序号起止
-					this.private_printMenBan();
-                  }
-                });
-            } else if (this.listQuery.productType === 2) {
-              //柱门板
-              this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
-              this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
-              this.hostCheckQuery.productLine = this.listQuery.productLine;
-			  this.hostCheckQuery.fwStation = this.listQuery.fwStation;
-              this.isDisable = true;
-              this.$axios
-                .posts(
-                  "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
-                  this.hostCheckQuery
-                )
-                .then((response) => {
-                  console.log("检查门板-大众顺序号是否断号");
-                  // this.isDisable = true;
-                  // setTimeout(() => {
-                  //   this.isDisable = false;
-                  // }, 1000);
-                  if (response.item.length > 0) {
-                    //有断号
-                    this.$confirm(
-                      "本次打印存在断号是否继续?" + response.item,
-                      "提示",
-                      {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      }
-                    )
-                      .then(() => {
-                        //门板
-                        //传递大众顺序号起止
-						this.private_printZhuHuBan(true);
-                      })
-                      .catch(() => {
-                        this.isDisable = false;
-                      });
-                  } else {
-                    //无断号
-                    //门板
-                    //传递大众顺序号起止
-					this.private_printZhuHuBan(true);
-                  }
-                });
-              //柱护板
-
-
-            }
-          } else {
-            /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
-            this.hostPrintQuery.beginVin = this.form.beginVin;
-            this.hostPrintQuery.endVin = this.form.endVin;
-            //判断productType类型
-            if (this.listQuery.productType === 1) {
-				//门板
-				//传递底盘号起止
-				this.private_printMenBan();
-            } else if (this.listQuery.productType === 2) {
-				//柱护板
-				//传递底盘号起止
-				this.private_printZhuHuBan(true);
-            }
-          }
-        }
-      });
-    },
-    
-	/**
-	 * 保存、加载、打印门板
-	 */
-	private_printMenBan()
-	{
-		this.$axios
-		  .posts(
-			"/api/newjit/bill-m100/save-menban-report",
-			this.hostPrintQuery
-		  )
-		  .then((response) => {
-			console.log("保存门板报表");
-			console.log(response);
-			console.log(response.status);
-			if (response.status === false) {
-			  this.$message({
-				message: response.message,
-				type: "error",
-			  });
-			  return;
-			} else if (response.status === true) {
-						let loadInput = response.item;
-						//-------------------------------------------
+	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 {
+		mapGetters
+	} from "vuex";
+	import moment from "moment";
+	import Detail from "./detail.vue";
+	import MBDetail from "./detailMB.vue";
+	import ZHBDetail from "./detailZHB.vue";
+	import {
+		downloadFile
+	} from "@/utils/crmindex.js";
+	import qs from "qs";
+	import RepetitionMB from "./RepetitionMB.vue";
+	import budaMB from "./budaMB.vue";
+	import budaZHB from "./budaZHB.vue";
+	import RepetitionZHB from "./RepetitionZHB.vue";
+	import ScrapMB from "./ScrapMB.vue";
+	import ScrapZHB from "./ScrapZHB.vue";
+	import {
+		forEach
+	} from "jszip/lib/object";
+
+	export default {
+		name: "M100Online",
+		components: {
+			Pagination,
+			CRMTableHead,
+			importExcel,
+			Detail,
+			MBDetail,
+			ZHBDetail,
+			RepetitionMB,
+			RepetitionZHB,
+			ScrapMB,
+			ScrapZHB,
+			budaMB,
+			budaZHB
+		},
+		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 {
+				content01: "",
+				content05: "",
+				content07: "",
+				content08: "",
+				// minute01: this.timeoutMinutes,
+				// minute05: this.timeoutMinutes,
+				// lastTime01: "14:00",
+				// lastTime05: "14:40",
+				crmType: "M100Online",
+				//productLineList:null,
+				isDisable: false,
+				drawerMBPrint: false,
+				drawerbudaMBPrint: false,
+				drawerbudaZHBPrint: false, //显示补打柱护板
+				drawerMBDelete: false,
+				drawerZHBPrint: false,
+				drawerZHBDelete: false,
+				activeNames: ["1"],
+				printNum: "12",
+				printNumZHB: "24",
+				rules: {
+					erpAssemblyName: [{
+						required: true,
+						message: "必须输入！",
+						trigger: "blur"
+					}, ],
+					beginHostSN: [{
+						required: true,
+						message: "必须输入数字！",
+						trigger: "number"
+					}, ],
+				},
+				billState: [{
+						id: 2,
+						name: "未打印"
+					},
+					{
+						id: 3,
+						name: "已打印"
+					},
+				],
+				valueSelect: "",
+				productName: "",
+				customerInfos: [],
+				customerInfosMB: [],
+				customerInfosZHB: [],
+				dialogOptions: [],
+				versionValue: "",
+				searchContent: "", // 输入内容
+				showExcelImport: false,
+				form: {},
+				drawer: false,
+				list: null,
+				totalCount: 0,
+				listLoading: false,
+				listLoaddingPrint: true,
+				customerInfo: {
+					bomId: "",
+				},
+				// 高级搜索
+				filterObj: {
+					type: Object,
+					default: () => {
+						return {};
+					},
+				},
+				listQuery: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					productType: 1, //1:门板；2:柱护板
+					fwStation: "BA2", //大众工位
+					ProductLine: undefined,
+					Version: undefined,
+					printBillNum: undefined,
+					serialNumBegin: undefined,
+					serialNumEnd: undefined,
+					HostSNBegin: undefined,
+					HostSNEnd: undefined,
+					KNRBegin: undefined,
+					KNREnd: undefined,
+					VINBegin: undefined,
+					VINEnd: undefined,
+					OnlineTimeValue: [],
+					OnlineTimeBegin: undefined,
+					OnlineTimeEnd: undefined,
+					ReceiveTimeValue: [],
+					ReceiveTimeBegin: undefined,
+					ReceiveTimeEnd: undefined,
+					billStatus: undefined,
+					state: [],
+				},
+				listQueryList: {
+					SkipCount: 0,
+					MaxResultCount: 15,
+					ProductLine: undefined,
+					BillStatus: undefined,
+					CanNotPrint: false,
+					ZHBBillStatus: undefined,
+				},
+				listExportQuery: {
+					erpAssemblyCode: undefined,
+					erpAssemblyName: undefined,
+				},
+				listPLQuery: {
+					BillType: 2,
+					//UserId: this.userinfo.UserId,
+				},
+				hostSNQuery: {
+					productLine: undefined,
+				},
+				hostCheckQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				hostPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				vinPrintQuery: {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				},
+				fileQuery: {
+					dataname: undefined,
+				},
+				form: {
+					details: [],
+				},
+				page: 1,
+				// 显示搜索条件
+				showSearch: true,
+				drawer: false,
+				dialogFormVisible: false,
+				formTitle: "",
+				isEdit: false,
+				formLoading: false, //关闭窗口
+				tableHeight: document.documentElement.clientHeight - 335,
+				detailTableHeight: 250,
+				details: [], //修改子表数据源
+				PLList: [], //产线下拉
+				PLChildList: [], //筛选后产线下拉
+				productTypeList: [{
+						id: 1,
+						name: "门板"
+					},
+					{
+						id: 2,
+						name: "柱护板"
+					},
+				],
+				fwStationList: [{
+						id: "BA2",
+						name: "BA2"
+					},
+					{
+						id: "BA5",
+						name: "BA5"
+					}
+				],
+				isShowHostSN: false,
+				isShowVin: false,
+				isShowState: true,
+			};
+		},
+		mounted() {
+			this.setTableHeight()
+
+			let timer = setInterval(() => {
+				this.open();
+			}, 5000);
+		},
+		created() {
+			this.billState.forEach((element, index) => {
+				if (index === 0) {
+					this.listQuery.state.push(element.id);
+				}
+			});
+			this.getProductLine();
+		},
+		computed: {
+			getDefaultField() {
+				var tempsTabs = [];
+				tempsTabs.push({
+					label: "流水号",
+					prop: "serialNum",
+					width: 100
+				});
+				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: "M100上线时间",
+					prop: "onlineTime",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "M100接收时间",
+					prop: "receiveTime",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "车型代码",
+					prop: "vehicleModelCode",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "版本",
+					prop: "version",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "R100上线时间",
+					prop: "r100OnlineTime",
+					width: 150,
+				});
+				tempsTabs.push({
+					label: "R100接收时间",
+					prop: "r100ReceiveTime",
+					width: 180,
+				});
+				tempsTabs.push({
+					label: "产线",
+					prop: "productLine",
+					width: 120,
+				});
+				tempsTabs.push({
+					label: "状态",
+					prop: "billStatus",
+					width: 120,
+				});
+
+				tempsTabs.push({
+					label: "柱护板状态",
+					prop: "printBillNum",
+					width: 120,
+				});
+
+				tempsTabs.push({
+					label: "备注",
+					prop: "remark",
+					width: 120,
+				});
+				return tempsTabs;
+			},
+			...mapGetters(["userInfo"]), //获取当前用户信息
+		},
+		methods: {
+			setTableHeight() {
+				this.$nextTick(() => {
+					var offsetHei = document.documentElement.clientHeight;
+					//console.log(offsetHei);
+					let boxH = this.$refs.box.offsetHeight;
+					this.tableHeight = offsetHei - boxH - 67 - 79 - 10; //57为footer高度，79为页面上部标签高度
+					//this.tableHeight = offsetHei -260
+				});
+			},
+			opens() {
+
+				this.getList();
+			},
+			open() {
+				// let productLineList = [];
+				// //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" );
+				// productLineList.forEach(element => {
+				//   element=this.listQuery.productLine;
+				// });
+
+				//let productLineList = { productLineList: [this.listQuery.productLine] };
+				if (this.$refs && this.$refs.sp01) {
+					this.$refs.sp01.Visible = false;
+					this.$refs.sp05.Visible = false;
+					this.$refs.sp07.Visible = false;
+					this.$refs.sp08.Visible = false;
+				}
+
+
+				let productLineListMain = {
+					productLineList: []
+				};
+
+				this.PLChildList.forEach((itm) => {
+					productLineListMain.productLineList.push(itm.productLineCode);
+				});
+
+				// console.log(
+				//   "门版-主界面传过来的值：" + JSON.stringify(productLineListMain)
+				// );
+				this.$axios
+					.posts(
+						"/api/newjit/bill-m100/product-line-timeout-remind",
+						productLineListMain
+					)
+					.then((response) => {
+						if (response.status == false) {
+							this.$message({
+								message: response.message,
+								type: "warning",
+							});
+							return;
+						} else {
+							// console.log(
+							//   "超时提醒-接口传过来的值：" + JSON.stringify(response.item)
+							// );
+
+							if (response.item !== null) {
+								response.item.forEach((JKITEM) => {
+									if (JKITEM.productLine == "01") {
+										this.$refs.sp01.Visible = true;
+										this.content01 =
+											"大众一厂已经" +
+											JKITEM.timeoutMinutes +
+											"分钟没收到报文\xa0\xa0\xa0\xa0";
+										if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+											//写提示信息
+											// console.log(
+											//   "222222222222222222222222222222222222222222222222-1"
+											// );
+											this.$refs.sp01.style.color = "red";
+											this.$refs.sp01.style.fontWeight = "bold";
+										} else {
+											this.$refs.sp01.style.color = "green";
+										}
+									}
+									if (JKITEM.productLine == "02") {
+										this.$refs.sp05.Visible = true;
+										this.content05 =
+											"大众二厂已经" +
+											JKITEM.timeoutMinutes +
+											"分钟没收到报文\xa0\xa0\xa0\xa0";
+										if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+											//写提示信息
+											// console.log(
+											//   "222222222222222222222222222222222222222222222222-2"
+											// );
+											this.setTableHeight()
+											this.$refs.sp05.style.color = "red";
+											this.$refs.sp05.style.fontWeight = "bold";
+										} else {
+											this.$refs.sp05.style.color = "green";
+										}
+									}
+									// if (JKITEM.productLine == "05") {
+									//   this.$refs.sp05.Visible = true;
+									//   this.content05 =
+									//     "05生产线已经" +
+									//     JKITEM.timeoutMinutes +
+									//     "分钟没收到报文\xa0\xa0\xa0\xa0";
+									//   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+									//     //写提示信息
+									//     console.log(
+									//       "222222222222222222222222222222222222222222222222"
+									//     );
+									//     this.$refs.sp05.style.color = "red";
+									//     this.$refs.sp05.style.fontWeight = "bold";
+									//   } else {
+									//     this.$refs.sp05.style.color = "green";
+									//   }
+									// }
+									// if (JKITEM.productLine == "07") {
+									//   this.$refs.sp07.Visible = true;
+									//   this.content07 =
+									//     "07生产线已经" +
+									//     JKITEM.timeoutMinutes +
+									//     "分钟没收到报文\xa0\xa0\xa0\xa0";
+									//   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+									//     //写提示信息
+									//     console.log(
+									//       "222222222222222222222222222222222222222222222222"
+									//     );
+									//     this.$refs.sp07.style.color = "red";
+									//     this.$refs.sp07.style.fontWeight = "bold";
+									//   } else {
+									//     this.$refs.sp07.style.color = "green";
+									//   }
+									// }
+									// if (JKITEM.productLine == "08") {
+									//   this.$refs.sp08.Visible = true;
+									//   this.content08 =
+									//     JKITEM.productLine +
+									//     "生产线已经" +
+									//     JKITEM.timeoutMinutes +
+									//     "分钟没收到报文";
+									//   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+									//     //写提示信息
+									//     console.log(
+									//       "222222222222222222222222222222222222222222222222"
+									//     );
+									//     this.$refs.sp08.style.color = "red";
+									//     this.$refs.sp08.style.fontWeight = "bold";
+									//   } else {
+									//     this.$refs.sp08.style.color = "green";
+									//   }
+									// }
+								});
+							} else {
+								this.$message({
+									message: "获取接口数据",
+									type: "warning",
+								});
+								return;
+							}
+						}
+					});
+			},
+			debounceClick() {
+				console.log("2秒内点击无数次，都只会触发一次");
+			},
+			//大众顺序号起止事件改变
+			beginHostSNChange(val) {
+				if (this.listQuery.productType === 1) {
+					this.form.endHostSN =
+						parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
+				} else if (this.listQuery.productType === 2) {
+					this.form.endHostSN =
+						parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
+				}
+			},
+			//门板打印数量更改
+			valueNumChange(val) {
+				this.printNum = val;
+				if (val == 12) {
+					//默认值是12
+					this.$axios
+						.gets(
+							"/api/newjit/bill-m100/get-print-start-hostsn2",
+							this.hostSNQuery
+						)
+						.then((response) => {
+							if (response.item !== null) {
+								this.form.beginHostSN = parseInt(response.item);
+								//门板
+								this.form.endHostSN = parseInt(response.item) + 11;
+							} else {
+								this.$message({
+									message: "获取不到大众顺序号",
+									type: "warning",
+								});
+								return;
+							}
+						});
+				} else {
+					//起止顺序号默认数量不为12
+					this.form.endHostSN =
+						parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
+				}
+				// this.$axios
+				//   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
+				//   .then((response) => {
+				//     if (response.item !== null) {
+				//       this.form.beginHostSN = parseInt(response.item);
+				//       if (val == 12) {
+				//         //门板
+				//         this.form.endHostSN = parseInt(response.item) + 11;
+				//       } else {
+				//         this.form.endHostSN =
+				//           parseInt(response.item) + parseInt(this.printNum) - 1;
+				//       }
+				//     } else {
+				//       this.$message({
+				//         message: "获取不到大众顺序号",
+				//         type: "warning",
+				//       });
+				//       return;
+				//     }
+				//   });
+			},
+			//柱护板打印更改
+			valueNumChangeZHB(val) {
+				this.printNumZHB = val;
+				if (val == 12) {
+					//默认值是12
+					this.$axios
+						.gets(
+							"/api/newjit/bill-m100/get-print-start-hostsn2",
+							this.hostSNQuery
+						)
+						.then((response) => {
+							if (response.item !== null) {
+								this.form.beginHostSN = parseInt(response.item);
+								//门板
+								this.form.endHostSN = parseInt(response.item) + 11;
+							} else {
+								this.$message({
+									message: "获取不到大众顺序号",
+									type: "warning",
+								});
+								return;
+							}
+						});
+				} else {
+					//起止顺序号默认数量不为12
+					this.form.endHostSN =
+						parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
+				}
+				// this.$axios
+				//   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
+				//   .then((response) => {
+				//     if (response.item !== null) {
+				//       this.form.beginHostSN = parseInt(response.item);
+				//       if (val == 24) {
+				//         //柱护板
+				//         this.form.endHostSN = parseInt(response.item) + 23;
+				//       } else {
+				//         this.form.endHostSN =
+				//           parseInt(response.item) + this.printNumZHB - 1;
+				//       }
+				//     } else {
+				//       this.$message({
+				//         message: "获取不到大众顺序号",
+				//         type: "warning",
+				//       });
+				//       return;
+				//     }
+				//   });
+			},
+			//抽屉
+			handleDrawerOpen(param) {
+				debugger
+				this.drawer = true;
+				//console.log(510)
+				//console.log(param)
+				var parentId = param.assemblyID; //主键id
+				this.customerInfos = [{
+					ParentId: parentId,
+					BillId: param.id
+				}, ];
+			},
+
+			handleDrawerClose(done) {
+				done();
+			},
+
+			fetchData(id) {
+				//循环动态
+				this.$axios
+					.gets("/api/newjit/assembly-cfg-erp/" + id)
+					.then((response) => {
+						this.form = response.item;
+						//this.details = response.item.details;
+						//console.log(this.details);
+					});
+			},
+			/** 导出功能 */
+			handleDownload() {
+				this.listLoading = true;
+				this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+				this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+				console.log(JSON.stringify(this.listQuery));
+				this.$axios
+					.posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
+					.then((res) => {
+						let filename = res.item;
 						this.$axios
-							.posts(
-							"/api/newjit/bill-m100/load-menban-report",
-							loadInput
-							)
+							.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.OnlineTimeValue = [];
+				this.listQuery.ReceiveTimeValue = [];
+				this.listQuery.state = [];
+				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 {
+						1: "未匹配",
+						2: "未打印",
+						3: "已打印"
+					} [row[column.property]];
+				}
+				if (column.property === "zHBBillStatus") {
+					return {
+						1: "未匹配",
+						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(data) {
+
+				this.listLoading = true;
+				if (data != undefined) {
+					this.listQueryList.SkipCount = (this.page - 1) * data.limit;
+				} else {
+					this.listQueryList.SkipCount = (this.page - 1) * 15;
+				}
+				if (this.listQuery.productType === 2) {
+					this.listQueryList.ZHBBillStatus = 2;
+				} else {
+					this.listQueryList.ZHBBillStatus = 0;
+				}
+				if (this.listQuery.productType === 2) {
+					this.listQuery.ZHBBillStatus = 2;
+				} else {
+					this.listQuery.ZHBBillStatus = 0;
+				}
+				this.listQueryList.BillStatus = 2; //状态
+				this.listQueryList.ProductLine = this.listQuery.productLine; //产线
+				this.listQueryList.CanNotPrint = false; //不可打印
+				this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5
+				console.log(
+					"日常打印M100查询条件：" + JSON.stringify(this.listQueryList)
+				);
+				//this.click();
+				this.$axios
+					.gets("/api/newjit/bill-m100/list", this.listQueryList)
+					.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(val) {
+				this.$forceUpdate();
+				this.customerInfosMB = [];
+				this.customerInfosZHB = [];
+				if (this.listQuery.productType === 1) {
+					//把产线值传到子组件
+					this.customerInfosMB = [{
+						PrintType: 1,
+						ProductLine: val,
+						fwStation: this.listQuery.fwStation
+					}, ];
+				}
+				if (this.listQuery.productType === 2) {
+					//把产线值传到子组件
+					this.customerInfosZHB = [{
+						PrintType: 1,
+						ProductLine: val,
+						fwStation: this.listQuery.fwStation
+					}, ];
+				}
+			},
+			fwStation_selectChange(val) {
+				this.$forceUpdate();
+				if (this.listQuery.productType === 1) {
+					//把产线值传到子组件
+					this.customerInfosMB = [{
+						PrintType: 1,
+						ProductLine: this.listQuery.productLine,
+						fwStation: val
+					}, ];
+				}
+				if (this.listQuery.productType === 2) {
+					//把产线值传到子组件
+					this.customerInfosZHB = [{
+						PrintType: 1,
+						ProductLine: this.listQuery.productLine,
+						fwStation: val
+					}];
+				}
+			},
+
+
+			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);
+			},
+
+			closeDialog() {},
+			/**打印 */
+			print() {
+				(this.hostPrintQuery = {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				}),
+				(this.hostCheckQuery.printType = 0);
+				this.hostPrintQuery.printType = 0;
+				this.vinPrintQuery.printType = 0;
+
+				if (
+					this.listQuery.productLine === "" ||
+					this.listQuery.productLine === undefined
+				) {
+					this.$message({
+						message: "请选择生产线",
+						type: "warning",
+					});
+					return;
+				}
+				(this.printNum = "12"),
+				(this.printNumZHB = "24"),
+
+
+				this.hostSNQuery.productLine = this.listQuery.productLine;
+				this.hostSNQuery.fwStation = this.listQuery.fwStation
+				this.hostPrintQuery.productLine = this.listQuery.productLine;
+				this.hostPrintQuery.fwStation = this.listQuery.fwStation;
+
+				//后端服务更改了 前端跟着更改成以下方式
+				if (this.listQuery.productType === 1) {
+					//门板
+					this.hostSNQuery.isZhuHuBan = "0";
+					console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+					this.$axios
+						.gets(
+							"/api/newjit/bill-m100/get-print-start-hostsn3",
+							this.hostSNQuery
+						)
+						.then((response) => {
+							console.log("获取hostsn大众顺序号起始");
+							console.log(response.item);
+							if (response.item !== null) {
+								this.form.beginHostSN = parseInt(response.item.beginHostSN);
+								this.printNum = parseInt(response.item.count);
+								if (this.listQuery.productType === 1) {
+									this.form.endHostSN = parseInt(response.item.beginHostSN) + parseInt(response.item.count) - 1;
+								} else if (this.listQuery.productType === 2) {
+									//柱护板
+									this.form.endHostSN = parseInt(response.item) + 23;
+								}
+							} else {
+								this.$message({
+									message: "获取不到大众顺序号",
+									type: "warning",
+								});
+								return;
+							}
+						});
+				} else if (this.listQuery.productType === 2) {
+					//柱护板
+					this.hostSNQuery.isZhuHuBan = "1";
+					console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+
+					//调用 get-zhuhuban-vin-num 服务 赋值给	this.printNumZHB---------------------------------
+					this.$axios
+						.gets(
+							"/api/newjit/bill-m100/get-zhuhuban-vin-num",
+							this.hostSNQuery
+						)
+						.then((response) => {
+							console.log("获取柱护板打印数量");
+							console.log(response.item);
+							if (response.item !== null) {
+								this.printNumZHB = parseInt(response.item);
+
+								//this.form.endHostSN = this.form.beginHostSN + this.printNumZHB - 1;
+								this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
+							} else {
+								this.$message({
+									message: "获取柱护板打印数量失败，返回空",
+									type: "warning",
+								});
+								return;
+							}
+						});
+					//---------------------------------------------------------------------------------------
+
+
+					this.$axios
+						.gets(
+							"/api/newjit/bill-m100/get-print-start-hostsn2",
+							this.hostSNQuery
+						)
+						.then((response) => {
+							console.log("获取hostsn大众顺序号起始");
+							console.log(response.item);
+							if (response.item !== null) {
+								this.form.beginHostSN = parseInt(response.item);
+								if (this.listQuery.productType === 1) {
+									//门板
+									this.form.endHostSN = parseInt(response.item) + 11;
+								} else if (this.listQuery.productType === 2) {
+									//柱护板
+									//this.form.endHostSN = parseInt(response.item) + 23;
+									this.form.endHostSN = parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
+								}
+							} else {
+								this.$message({
+									message: "获取不到大众顺序号",
+									type: "warning",
+								});
+								return;
+							}
+						});
+				}
+				if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") {
+					this.productName = "";
+					switch (this.listQuery.productLine) {
+						case "00":
+							this.productName = "全部门板";
+							break;
+					}
+
+					this.formTitle = "打印-门板发货排序单";
+				} else {
+					this.productName = "";
+					switch (this.listQuery.productLine) {
+						case "01":
+							this.productName = "大众一厂";
+							break;
+						case "02":
+							this.productName = "大众二厂";
+							break;
+					}
+					this.formTitle = "打印-柱护板发货排序单";
+				}
+				//this.formTitle = "打印";
+				this.dialogFormVisible = true;
+				this.form = {
+					beginHostSN: "",
+					endHostSN: "",
+				};
+				this.isShowHostSN = true;
+				this.isShowVin = false;
+			},
+			/**重打 */
+			rePrint() {
+				(this.hostPrintQuery = {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				}),
+				(this.hostCheckQuery.printType = 1);
+				this.hostPrintQuery.printType = 1;
+				this.vinPrintQuery.printType = 1;
+				if (
+					this.listQuery.productLine === "" ||
+					this.listQuery.productLine === undefined
+				) {
+					this.$message({
+						message: "请选择生产线",
+						type: "warning",
+					});
+					return;
+				}
+				this.formTitle = "重打";
+				this.hostPrintQuery.productLine = this.listQuery.productLine;
+				this.hostPrintQuery.fwStation = this.listQuery.fwStation;
+				this.dialogFormVisible = true;
+				this.form = {
+					beginVin: "",
+					endVin: "",
+				};
+				this.isShowHostSN = false;
+				this.isShowVin = true;
+			},
+			/**补打 */
+			makeUpPrint() {
+				(this.hostPrintQuery = {
+					printType: undefined, //0:打印;1:重打;2:补打;
+					productLine: undefined,
+					beginHostSN: undefined,
+					endHostSN: undefined,
+					beginVin: undefined,
+					endVin: undefined,
+				}),
+				(this.hostCheckQuery.printType = 2);
+				this.hostPrintQuery.printType = 2;
+				this.vinPrintQuery.printType = 2;
+				if (
+					this.listQuery.productLine === "" ||
+					this.listQuery.productLine === undefined
+				) {
+					this.$message({
+						message: "请选择生产线",
+						type: "error",
+					});
+					return;
+				}
+				this.formTitle = "补打";
+				this.hostPrintQuery.productLine = this.listQuery.productLine;
+				this.hostPrintQuery.fwStation = this.listQuery.fwStation;
+				this.dialogFormVisible = true;
+				this.form = {
+					beginVin: "",
+					endVin: "",
+				};
+				this.isShowHostSN = false;
+				this.isShowVin = true;
+			},
+			save() {
+				this.$refs.form.validate((valid) => {
+					if (valid) {
+						//this.listLoaddingPrint = true;
+						if (this.isShowHostSN === true) {
+							if (this.form.beginHostSN === "") { // || this.form.endHostSN === ""
+								this.$message({
+									message: "请输入完整的顺序号起始范围",
+									type: "error",
+								});
+								return;
+							} else {
+								if (this.listQuery.productType === 1) {
+									//门板
+									if (
+										parseInt(this.form.endHostSN) -
+										parseInt(this.form.beginHostSN) < 0
+									) {
+										this.$message({
+											message: "起止大众顺序号相减不能为零！",
+											type: "error",
+										});
+										return;
+									}
+								} else if (this.listQuery.productType === 2) {
+									//柱护板
+									// if (
+									//   parseInt(this.form.endHostSN) -
+									//     parseInt(this.form.beginHostSN) >
+									//   23
+									// ) {
+									//   this.$message({
+									//     message:
+									//       "最多只能打印24个顺序号，终止顺序号不能大于" +
+									//       (parseInt(this.form.beginHostSN) + 23),
+									//     type: "error",
+									//   });
+									//   return;
+									// }
+								}
+							}
+						}
+						if (this.isShowVin === true) {
+							if (this.form.beginVin === "" || this.form.endVin === "") {
+								this.$message({
+									message: "请输入完整的底盘号起始范围",
+									type: "error",
+								});
+								return;
+							}
+						}
+						/**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
+						if (
+							this.formTitle === "打印-门板发货排序单" ||
+							this.formTitle === "打印-柱护板发货排序单"
+						) {
+							this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
+							this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
+
+							if (this.listQuery.productType === 1) {
+								//门板-打印
+								this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
+								this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
+								this.hostCheckQuery.productLine = this.listQuery.productLine;
+								this.isDisable = true;
+								console.log(
+									"检查柱护板-hostCheckQuery" +
+									JSON.stringify(this.hostCheckQuery)
+								);
+								this.$axios
+									.posts(
+										"/api/newjit/bill-m100/check-mb-hostsn-break-num",
+										this.hostCheckQuery
+									)
+									.then((response) => {
+										console.log("检查门板-大众顺序号是否断号");
+										// this.isDisable = true;
+										// setTimeout(() => {
+										//   this.isDisable = false;
+										// }, 1000);
+
+										if (response.item.length > 0) {
+											//有断号
+											this.$confirm(
+													"本次打印存在断号是否继续?" + response.item,
+													"提示", {
+														confirmButtonText: "确定",
+														cancelButtonText: "取消",
+														type: "warning",
+													}
+												)
+												.then(() => {
+													//门板
+													//传递大众顺序号起止
+													this.private_printMenBan();
+												})
+												.catch(() => {
+													this.isDisable = false;
+												});
+										} else {
+											//无断号
+											//门板
+											//传递大众顺序号起止
+											this.private_printMenBan();
+										}
+									});
+							} else if (this.listQuery.productType === 2) {
+								//柱门板
+								this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
+								this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
+								this.hostCheckQuery.productLine = this.listQuery.productLine;
+								this.hostCheckQuery.fwStation = this.listQuery.fwStation;
+								this.isDisable = true;
+								this.$axios
+									.posts(
+										"/api/newjit/bill-m100/check-zhb-hostsn-break-num",
+										this.hostCheckQuery
+									)
+									.then((response) => {
+										console.log("检查门板-大众顺序号是否断号");
+										// this.isDisable = true;
+										// setTimeout(() => {
+										//   this.isDisable = false;
+										// }, 1000);
+										if (response.item.length > 0) {
+											//有断号
+											this.$confirm(
+													"本次打印存在断号是否继续?" + response.item,
+													"提示", {
+														confirmButtonText: "确定",
+														cancelButtonText: "取消",
+														type: "warning",
+													}
+												)
+												.then(() => {
+													//门板
+													//传递大众顺序号起止
+													this.private_printZhuHuBan(true);
+												})
+												.catch(() => {
+													this.isDisable = false;
+												});
+										} else {
+											//无断号
+											//门板
+											//传递大众顺序号起止
+											this.private_printZhuHuBan(true);
+										}
+									});
+								//柱护板
+
+
+							}
+						} else {
+							/**接口1获取打印数据，接口2获得grid++模板的base64编码 */
+							this.hostPrintQuery.beginVin = this.form.beginVin;
+							this.hostPrintQuery.endVin = this.form.endVin;
+							//判断productType类型
+							if (this.listQuery.productType === 1) {
+								//门板
+								//传递底盘号起止
+								this.private_printMenBan();
+							} else if (this.listQuery.productType === 2) {
+								//柱护板
+								//传递底盘号起止
+								this.private_printZhuHuBan(true);
+							}
+						}
+					}
+				});
+			},
+
+			/**
+			 * 保存、加载、打印门板
+			 */
+			private_printMenBan() {
+				this.$axios
+					.posts(
+						"/api/newjit/bill-m100/save-menban-report",
+						this.hostPrintQuery
+					)
+					.then((response) => {
+						console.log("保存门板报表");
+						console.log(response);
+						console.log(response.status);
+						if (response.status === false) {
+							this.$message({
+								message: response.message,
+								type: "error",
+							});
+							return;
+						} else if (response.status === true) {
+							let loadInput = response.item;
+							//-------------------------------------------
+							this.$axios
+								.posts(
+									"/api/newjit/bill-m100/load-menban-report",
+									loadInput
+								)
+								.then((response) => {
 									console.log("加载门板报表");
 									console.log(response);
 									console.log(response.status);
 									if (response.status === false) {
 										this.$message({
-										message: response.message,
-										type: "error",
+											message: response.message,
+											type: "error",
 										});
 										return;
 									} else if (response.status === true) {
 										//传给grid++接口json数据，得到返回的文件base64
 										//this.fileQuery.report = "menban";
 										this.fileQuery.dataname = JSON.stringify(
-										response.item
+											response.item
 										);
 										//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.formLoading = false;
-											this.isDisable = false;
-											this.printpdf(response); //打印我文件流
-										})
-										.catch((error) => {
-											this.formLoading = false;
-											this.isDisable = false;
-										});
+											.posts(
+												"/Handlers/Handler1.ashx?report=menban",
+												qs.stringify(this.fileQuery)
+											)
+											.then((response) => {
+												console.log("获取文件base64编码");
+												console.log(response);
+												this.formLoading = false;
+												this.isDisable = false;
+												this.printpdf(response); //打印我文件流
+											})
+											.catch((error) => {
+												this.formLoading = false;
+												this.isDisable = false;
+											});
 									}
-							});
-						//-------------------------------------------
-			}
-		  });
-	},
-	
-	/**
-	 * 保存、加载、打印柱护板
-	 */
-	private_printZhuHuBan(isSelAll = true)
-	{
-		//门板
-		//传递大众顺序号起止
-		this.$axios
-		  .posts(
-			"/api/newjit/bill-m100/save-zhuhuban-report",
-			this.hostPrintQuery
-		  )
-		  .then((response) => {
-			console.log("保存柱护板报表");
-			console.log(response);
-			console.log(response.status);
-			if (response.status === false) {
-			  this.$message({
-				message: response.message,
-				type: "error",
-			  });
-			  return;
-			} else if (response.status === true) {
-				let loadInput = {};
-				loadInput.dataResultType = (isSelAll == true) ? "1" : "2";
-				loadInput.reportIdList = response.item;
-        loadInput.productLine = this.hostPrintQuery.productLine
-				//--------------------------------------
+								});
+							//-------------------------------------------
+						}
+					});
+			},
+
+			/**
+			 * 保存、加载、打印柱护板
+			 */
+			private_printZhuHuBan(isSelAll = true) {
 				//门板
 				//传递大众顺序号起止
 				this.$axios
-				  .posts(
-					"/api/newjit/bill-m100/load-zhuhuban-report",
-					loadInput
-				  )
-				  .then((response) => {
-					console.log("加载柱护板报表");
-					console.log(response);
-					console.log(response.status);
-					if (response.status === false) {
-					  this.$message({
-						message: response.message,
-						type: "error",
-					  });
-					  return;
-					} else if (response.status === true) {
-							  //传给grid++接口json数据，得到返回的文件base64
-							  //this.fileQuery.report = "menban";
-							  this.fileQuery.dataname = JSON.stringify(
-								response.item
-							  );
-							  //this.fileQuery.dataname = "";
-							  console.log("打印json");
-							  console.log(this.fileQuery.dataname);
-							  
-							  let reporturl = "/Handlers/Handler1.ashx?report=zhuhuban_" + this.hostPrintQuery.productLine + '-' + this.hostPrintQuery.fwStation; //zhuhuban_01-BA2
-							  
-							  this.$axios
+					.posts(
+						"/api/newjit/bill-m100/save-zhuhuban-report",
+						this.hostPrintQuery
+					)
+					.then((response) => {
+						console.log("保存柱护板报表");
+						console.log(response);
+						console.log(response.status);
+						if (response.status === false) {
+							this.$message({
+								message: response.message,
+								type: "error",
+							});
+							return;
+						} else if (response.status === true) {
+							let loadInput = {};
+							loadInput.dataResultType = (isSelAll == true) ? "1" : "2";
+							loadInput.reportIdList = response.item;
+							loadInput.productLine = this.hostPrintQuery.productLine
+							//--------------------------------------
+							//门板
+							//传递大众顺序号起止
+							this.$axios
 								.posts(
-								  reporturl, //"/Handlers/Handler1.ashx?report=zhuhuban",
-								  qs.stringify(this.fileQuery)
+									"/api/newjit/bill-m100/load-zhuhuban-report",
+									loadInput
 								)
 								.then((response) => {
-								  console.log("获取文件base64编码");
-								  console.log(response);
-								  this.formLoading = false;
-								  this.isDisable = false;
-								  this.printpdf(response); //打印我文件流
-								})
-								.catch((error) => {
-								  this.formLoading = false;
-								  this.isDisable = false;
+									console.log("加载柱护板报表");
+									console.log(response);
+									console.log(response.status);
+									if (response.status === false) {
+										this.$message({
+											message: response.message,
+											type: "error",
+										});
+										return;
+									} else if (response.status === true) {
+										//传给grid++接口json数据，得到返回的文件base64
+										//this.fileQuery.report = "menban";
+										this.fileQuery.dataname = JSON.stringify(
+											response.item
+										);
+										//this.fileQuery.dataname = "";
+										console.log("打印json");
+										console.log(this.fileQuery.dataname);
+
+										let reporturl = "/Handlers/Handler1.ashx?report=zhuhuban_" + this.hostPrintQuery.productLine + '-' + this.hostPrintQuery
+											.fwStation; //zhuhuban_01-BA2
+
+										this.$axios
+											.posts(
+												reporturl, //"/Handlers/Handler1.ashx?report=zhuhuban",
+												qs.stringify(this.fileQuery)
+											)
+											.then((response) => {
+												console.log("获取文件base64编码");
+												console.log(response);
+												this.formLoading = false;
+												this.isDisable = false;
+												this.printpdf(response); //打印我文件流
+											})
+											.catch((error) => {
+												this.formLoading = false;
+												this.isDisable = false;
+											});
+									}
 								});
-					}
-				  });
-				//--------------------------------------
-			}
-		  });
-	},
-	
-	//获取所有产线
-    getProductLine() {
-		
-	  if (this.userInfo == null || this.userInfo.userId == null) //设置默认值，调试时使用
-	  {
-		  this.listPLQuery.UserId = 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA';
-	  }
-	  else
-	  {
-		  this.listPLQuery.UserId = this.userInfo.userId;
-	  }
-	  
-      console.log(
-        "this.listPLQuery.UserId::" + this.listPLQuery.UserId
-      );
-      this.$axios
-        .gets("/api/newjit/product-line/list", this.listPLQuery)
-        .then((response) => {
-          //console.log(response);
-          this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
-            return a.productLineCode - b.productLineCode;
-          });
-          this.listQuery.productLine = this.PLChildList[0].productLineCode;
-          if (this.listQuery.productLine != "") {
-            //把产线值传到子组件
-            this.customerInfosMB = [
-              {
-                PrintType: 1,
-                ProductLine: this.PLChildList[0].productLineCode,
-              },
-            ];
-          }
-          this.getList();
-          //console.log(this.PLList)
-        })
-        .catch(() => {});
-    },
-    //产线类型变更
-    ptypeselectChange() {
-      this.$forceUpdate();
-      //console.log(this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      //console.log(this.PLList)
-      this.setTableHeight()
-      //变更打印按钮文字
-      if (this.listQuery.productType === 1) {
-        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
-        this.listQuery.state.push(this.billState[0].id);
-        this.isShowState = true;
-		
-      } else if (this.listQuery.productType === 2) {
-        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
-        this.listQuery.state = [];
-        this.isShowState = false;
-      }
-      
-      if (this.listQuery.productType === 2) {
-        this.listQueryList.ZHBBillStatus = 2;
-      } else {
-        this.listQueryList.ZHBBillStatus = 0;
-      }
-    },
-	
-    /*单据状态变更 */
-    checkedListChange(index) {
-      if (this.listQuery.state.length <= 1) {
-        this.listQuery.state.push(this.billState[index].id);
-      } else {
-        this.listQuery.state = [];
-        this.listQuery.state.push(this.billState[index].id);
-      }
-    },
-    /**解析文件流 */
-    getUrl() {
-      //dataResult.data是后台返回的流
-      let pdfUrl = window.URL.createObjectURL(
-        new Blob([dataResult.data], { type: `application/pdf` })
-      );
-      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
-      const link = document.createElement("a");
-      link.href = pdfUrl;
-      link.setAttribute("download", "下载的文件名");
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-    },
-    //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob(dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
-      var n = bstr.length;
-      var u8arr = new Uint8Array(n);
-      while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-      }
-      return new Blob([u8arr], { type: "application/pdf" });
-    },
-    doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow;
-      setTimeout(() => {
-        // window.print()
-        ordonnance.print();
-        this.pdfLoading = false;
-      }, 100);
-    },
-    printpdf(dataResult) {
-      //打印功能，dataResult是后台返回的base64
-      let blob = this.dataURLtoBlob(dataResult);
-      var date = new Date().getTime();
-      var ifr = document.createElement("iframe");
-      ifr.style.frameborder = "no";
-      ifr.style.display = "none";
-      ifr.style.pageBreakBefore = "always";
-      ifr.setAttribute("id", "printPdf" + date);
-      ifr.setAttribute("name", "printPdf" + date);
-      ifr.src = window.URL.createObjectURL(blob);
-      document.body.appendChild(ifr);
-      this.doPrint("printPdf" + date);
-      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
-      this.dialogFormVisible = false;
-      this.getList();
-    },
-    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;
-    },
-  },
-};
+							//--------------------------------------
+						}
+					});
+			},
+
+			//获取所有产线
+			getProductLine() {
+
+				if (this.userInfo == null || this.userInfo.userId == null) //设置默认值，调试时使用
+				{
+					this.listPLQuery.UserId = 'AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA';
+				} else {
+					this.listPLQuery.UserId = this.userInfo.userId;
+				}
+
+				console.log(
+					"this.listPLQuery.UserId::" + this.listPLQuery.UserId
+				);
+				this.$axios
+					.gets("/api/newjit/product-line/list", this.listPLQuery)
+					.then((response) => {
+						//console.log(response);
+						this.PLList = response.item;
+						this.PLChildList = this.PLList.filter(
+							(u) => u.productType === parseInt(this.listQuery.productType)
+						).sort((a, b) => {
+							return a.productLineCode - b.productLineCode;
+						});
+						this.listQuery.productLine = this.PLChildList[0].productLineCode;
+						if (this.listQuery.productLine != "") {
+							//把产线值传到子组件
+							this.customerInfosMB = [{
+								PrintType: 1,
+								ProductLine: this.PLChildList[0].productLineCode,
+							}, ];
+						}
+						this.getList();
+						//console.log(this.PLList)
+					})
+					.catch(() => {});
+			},
+			//产线类型变更
+			ptypeselectChange() {
+				this.$forceUpdate();
+				//console.log(this.listQuery.productType);
+				this.listQuery.productLine = "";
+				this.PLChildList = this.PLList.filter(
+					(u) => u.productType === parseInt(this.listQuery.productType)
+				).sort((a, b) => {
+					return a.productLineCode - b.productLineCode;
+				});
+				//console.log(this.PLList)
+				this.setTableHeight()
+				//变更打印按钮文字
+				if (this.listQuery.productType === 1) {
+					this.$refs.btn1.$el.innerText = "打印门板发货排序单";
+					this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
+					this.$refs.btn3.$el.innerText = "补打门板发货排序单";
+					this.listQuery.state.push(this.billState[0].id);
+					this.isShowState = true;
+
+				} else if (this.listQuery.productType === 2) {
+					this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
+					this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
+					this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+					this.listQuery.state = [];
+					this.isShowState = false;
+				}
+
+				if (this.listQuery.productType === 2) {
+					this.listQueryList.ZHBBillStatus = 2;
+				} else {
+					this.listQueryList.ZHBBillStatus = 0;
+				}
+			},
+
+			/*单据状态变更 */
+			checkedListChange(index) {
+				if (this.listQuery.state.length <= 1) {
+					this.listQuery.state.push(this.billState[index].id);
+				} else {
+					this.listQuery.state = [];
+					this.listQuery.state.push(this.billState[index].id);
+				}
+			},
+			/**解析文件流 */
+			getUrl() {
+				//dataResult.data是后台返回的流
+				let pdfUrl = window.URL.createObjectURL(
+					new Blob([dataResult.data], {
+						type: `application/pdf`
+					})
+				);
+				const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
+				const link = document.createElement("a");
+				link.href = pdfUrl;
+				link.setAttribute("download", "下载的文件名");
+				document.body.appendChild(link);
+				link.click();
+				document.body.removeChild(link);
+			},
+			//base64转化成流，dataurl是后台返回的base64
+			dataURLtoBlob(dataurl) {
+				var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+				var n = bstr.length;
+				var u8arr = new Uint8Array(n);
+				while (n--) {
+					u8arr[n] = bstr.charCodeAt(n);
+				}
+				return new Blob([u8arr], {
+					type: "application/pdf"
+				});
+			},
+			doPrint(val) {
+				var ordonnance = document.getElementById(val).contentWindow;
+				setTimeout(() => {
+					// window.print()
+					ordonnance.print();
+					this.pdfLoading = false;
+				}, 100);
+			},
+			printpdf(dataResult) {
+				//打印功能，dataResult是后台返回的base64
+				let blob = this.dataURLtoBlob(dataResult);
+				var date = new Date().getTime();
+				var ifr = document.createElement("iframe");
+				ifr.style.frameborder = "no";
+				ifr.style.display = "none";
+				ifr.style.pageBreakBefore = "always";
+				ifr.setAttribute("id", "printPdf" + date);
+				ifr.setAttribute("name", "printPdf" + date);
+				ifr.src = window.URL.createObjectURL(blob);
+				document.body.appendChild(ifr);
+				this.doPrint("printPdf" + date);
+				window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+				this.dialogFormVisible = false;
+				this.getList();
+			},
+			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 "../../../pg-fis/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%;
-}
-.label1 {
-  margin-left: 5px;
-  margin-right: 5px;
-}
-</style>
+	@import "../../../pg-fis/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%;
+	}
 
+	.label1 {
+		margin-left: 5px;
+		margin-right: 5px;
+	}
+</style>
diff --git a/vue/src/views/pg-fis/basedate/partSwitch/index.vue b/vue/src/views/pg-fis/basedate/partSwitch/index.vue
index 536241cf..fcd3eb8e 100644
--- a/vue/src/views/pg-fis/basedate/partSwitch/index.vue
+++ b/vue/src/views/pg-fis/basedate/partSwitch/index.vue
@@ -186,7 +186,7 @@
 			});
 		},
 		created() {
-			debugger
+			//debugger
 			this.getList();
 			
 		},
diff --git a/vue/src/views/pg-fis/basedate/productLine/index.vue b/vue/src/views/pg-fis/basedate/productLine/index.vue
index abfce137..3dc47729 100644
--- a/vue/src/views/pg-fis/basedate/productLine/index.vue
+++ b/vue/src/views/pg-fis/basedate/productLine/index.vue
@@ -936,7 +936,7 @@ export default {
             "/api/newjit/product-line-authority/do-authority",this.saveQuery
           )
           .then((response) => {
-            debugger
+            //debugger
             console.log(response);
             this.dialogFormVisible = false;
             this.getList();
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index.vue b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
index 450d14aa..28998288 100644
--- a/vue/src/views/pg-fis/basedate/repeatR100/index.vue
+++ b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
@@ -811,7 +811,7 @@ this.$axios
     },
       //产线类型变更
     ptypeselectChange() {
-      debugger
+      //debugger
       this.$forceUpdate();
       //console.log("222222222222222222222222222222222222222222"+this.listQuery.productType);
       this.listQuery.productLine = "";
diff --git a/vue/static/config.js b/vue/static/config.js
index 9908aa24..64061fef 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -2,11 +2,17 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-		ip: 'http://127.0.0.1', //?? two
-		auth_port: '8066',
-		public_port: '8092',
-		// backend_port: '8092',
-		backend_port: '44344', //?? three
+		// ip: 'http://127.0.0.1', //?? two
+		// auth_port: '8066',
+		// public_port: '8092',
+		// // backend_port: '8092',
+		// backend_port: '44344', //?? three
+		
+		ip: localStorage.getItem('config_ip'),
+		auth_port: localStorage.getItem('config_auth_port'),
+		public_port: localStorage.getItem('config_public_port'),
+		backend_port: localStorage.getItem('config_backend_port'),
+		
     },
     basic: {},
     upload: {
@@ -36,17 +42,21 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
       
-			ip: 'http://192.168.7.21',
-			//ip: "http://222.169.228.163",
+			// ip: 'http://192.168.7.21',
+			// //ip: "http://222.169.228.163",
 			
-			auth_port: '8066',
-			public_port: '8092',
-			backend_port: '8092',
+			// auth_port: '8066',
+			// public_port: '8092',
+			// backend_port: '8092',
 			
-			// auth_port: "7696",
-			// public_port: "7692",
-			// backend_port: "7692",
+			// // auth_port: "7696",
+			// // public_port: "7692",
+			// // backend_port: "7692",
 			
+			ip: localStorage.getItem('config_ip'),
+			auth_port: localStorage.getItem('config_auth_port'),
+			public_port: localStorage.getItem('config_public_port'),
+			backend_port: localStorage.getItem('config_backend_port'),
     },
     basic: {},
     upload: {