From 260782883613c577c0e19bd7318f363f3847f958 Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Sat, 18 Dec 2021 17:27:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=9D=BF=E3=80=81=E6=9F=B1=E6=8A=A4?=
 =?UTF-8?q?=E6=9D=BF=E7=9A=84=E9=87=8D=E6=89=93=E5=92=8C=E4=BD=9C=E5=BA=9F?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/components/CreateCom/Job-Select.vue   |   64 +
 vue/src/components/PasteExcel/index.vue       |   12 +-
 vue/src/router/index.js                       |    2 +-
 .../views/pg-fis/basedate/m100BIll/index.vue  |   18 +-
 .../pg-fis/basedate/m100Online/detailMB.vue   |  764 +++++++
 .../pg-fis/basedate/m100Online/detailZHB.vue  |  764 +++++++
 .../pg-fis/basedate/m100Online/index.vue      | 1521 +++++++-------
 .../pg-fis/basedate/r100Online/index.vue      |  510 ++---
 .../pg-fis/basedate/repeatR100/index.vue      |    8 +-
 .../pg-fis/basedate/unknownAssembly/index.vue | 1819 +++++++++--------
 .../pg-fis/basedate/weldingAssembly/index.vue |  600 +++---
 .../InvoiceSettledDetailDiff/index.vue        |  339 ++-
 12 files changed, 4148 insertions(+), 2273 deletions(-)
 create mode 100644 vue/src/components/CreateCom/Job-Select.vue
 create mode 100644 vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
 create mode 100644 vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue

diff --git a/vue/src/components/CreateCom/Job-Select.vue b/vue/src/components/CreateCom/Job-Select.vue
new file mode 100644
index 00000000..d088f156
--- /dev/null
+++ b/vue/src/components/CreateCom/Job-Select.vue
@@ -0,0 +1,64 @@
+<template>
+  <el-select
+    v-model="dataValue"
+    style="width: 200px"
+    placeholder="请选择版本"
+    @change="valueChange"
+  >
+    <el-option
+      v-for="item in options"
+      :key="item.value"
+      :label="item.label"
+      :value="item.value"
+    />
+  </el-select>
+</template>
+<script type="text/javascript">
+import stringMixin from "./stringMixin";
+
+export default {
+  name: "JobSelect",
+  components: {},
+  props: {
+    options: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      dataValue: "",
+    };
+  },
+  created() {},
+  watch: {
+    options: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          //加上默认初始值
+          this.dataValue = this.options[0].value;
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {},
+  methods: {
+    // 输入的值
+    valueChange(val) {
+      /** 回调筛选数据 */
+      this.$emit("value-change", {
+        index: this.index,
+        value: val,
+        data: this.options,
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/vue/src/components/PasteExcel/index.vue b/vue/src/components/PasteExcel/index.vue
index 948922cf..efb85e6b 100644
--- a/vue/src/components/PasteExcel/index.vue
+++ b/vue/src/components/PasteExcel/index.vue
@@ -4,7 +4,11 @@
       <div class="book">
         <el-input type="text" v-model="paster" @paste.native="pasteMe" />
         <el-table :data="tableData">
-          <el-table-column prop="name" label="单据号" width="120">
+          <el-table-column
+            prop="name"
+            label="说明：只支持从Excel上粘贴复制，不支持手输！"
+            width="120"
+          >
           </el-table-column>
         </el-table>
       </div>
@@ -30,7 +34,11 @@ export default {
       loading: false,
       paster: "",
       pasterValue: "",
-      tableData: [],
+      tableData: [
+        {
+          name: "单据号",
+        },
+      ],
     };
   },
   methods: {
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 5bc90fcf..08ed61be 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -173,7 +173,7 @@ export const asyncRoutes = [
   billdataRouter,//销售结算与开票报表
   //businessdataRouter,
   wheeldataRouter,//大众看板和备件
-  //pgfis,//派格fis
+  pgfis,//派格fis
   JobTimeDataRouter,//后台作业监控
  
   // 404 page must be placed at the end !!!
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
index bf9606fe..b6b49c9a 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@@ -76,7 +76,7 @@
           />
         </el-form-item>
 
-        <el-form-item label="KNR:" prop="KNRBegin">
+        <el-form-item label="KNR:" prop="KNRBegin" >
           <el-input
             v-model="listQuery.KNRBegin"
             placeholder=""
@@ -133,7 +133,7 @@
         </el-form-item>
       <!-- </el-row> -->
       <!-- <el-row> -->
-        <el-form-item label="接收日期">
+        <el-form-item label="接收日期" style="margin-top: -15px">
           <el-date-picker
             v-model="listQuery.ReceiveTimeValue"
             size="small"
@@ -146,7 +146,7 @@
           ></el-date-picker>
         </el-form-item>
 
-        <el-form-item style="margin: 0px">
+        <el-form-item style="margin-top: -15px">
           <el-button
             type="primary"
             icon="el-icon-search"
@@ -172,7 +172,7 @@
         </el-form-item>
       <!-- </el-row> -->
         <el-divider class="divider1" ></el-divider>
-        <el-form-item style="margin-bottom: 0px;margin-top: 10px">
+        <el-form-item style="margin-bottom: 0px;margin-top: -1px">
           <el-button
             class="filter-item"
             size="mini"
@@ -201,7 +201,7 @@
       </el-form>
     </flexbox>
     </div>
-    <div class="l-table">
+    <div class="l-table" style="margin-top: -9px">
       <!--表格渲染-->
       <el-table
         ref="multipleTable"
@@ -1235,9 +1235,13 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+        if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if(this.listQuery.OnlineTimeValue!== undefined)
       {
         this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
new file mode 100644
index 00000000..27f3c849
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
@@ -0,0 +1,764 @@
+<!--总成模块信息管理页-->
+<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>
+
+          <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-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>
+</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-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) {
+        //alert(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;
+
+      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;
+      }
+
+      alert(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/newjit1/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 {
+              let dataname = JSON.stringify(response.item);
+              this.$axios
+                .posts(
+                  "/Handlers/Handler1.ashx?report=menban",
+                  qs.stringify(dataname)
+                )
+                .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 = "选中项";
+      }
+      alert(params);
+      this.$confirm("是否作废" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/newjit1/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();
+    },
+
+    /** 刷新列表 */
+    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;
+}
+</style>
+
+
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
new file mode 100644
index 00000000..c4d12799
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
@@ -0,0 +1,764 @@
+<!--总成模块信息管理页-->
+<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>
+
+          <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-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>
+</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-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: "",
+        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) {
+        //alert(JSON.stringify(newVal))
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.printType = element.PrintType;
+            this.customerInfo.productLine = element.ProductLine;
+          });alert(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);
+      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;
+      }
+
+      alert(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/newjit1/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: this.customerInfo.printType,
+          productLine: this.customerInfo.productLine,
+          beginVin: beginVin1,
+          endVin: endVin1,
+        };
+        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+        this.$axios
+          .posts("/api/newjit/bill-m100/print-zhuhuban-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 {
+              let dataname = JSON.stringify(response.item);
+              this.$axios
+                .posts(
+                  "/Handlers/Handler1.ashx?report=menban",
+                  qs.stringify(dataname)
+                )
+                .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 = "选中项";
+      }
+      alert(params);
+      this.$confirm("是否作废" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/newjit1/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();
+    },
+
+    /** 刷新列表 */
+    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;
+}
+</style>
+
+
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index e76658c1..32e1f6ba 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -2,230 +2,274 @@
 <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
+      <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>
+                :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="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- </el-row> -->
-        <el-form-item label="流水号:" prop="serialNumBegin">
-          <el-input
-            v-model="listQuery.serialNumBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="serialNumEnd">
-          <el-input
-            v-model="listQuery.serialNumEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- <el-row> -->
-        <el-form-item label="大众顺序号:" prop="HostSNBegin">
-          <el-input
-            v-model="listQuery.HostSNBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="HostSNEnd">
-          <el-input
-            v-model="listQuery.HostSNEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+          <el-form-item label="版本:" prop="Version">
+            <el-input
+              v-model="listQuery.Version"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- </el-row> -->
+          <el-form-item label="流水号:" prop="serialNumBegin">
+            <el-input
+              v-model="listQuery.serialNumBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="serialNumEnd">
+            <el-input
+              v-model="listQuery.serialNumEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- <el-row> -->
+          <el-form-item label="大众顺序号:" prop="HostSNBegin">
+            <el-input
+              v-model="listQuery.HostSNBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="HostSNEnd">
+            <el-input
+              v-model="listQuery.HostSNEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
-        <el-form-item label="KNR:" prop="KNRBegin">
-          <el-input
-            v-model="listQuery.KNRBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="KNREnd">
-          <el-input
-            v-model="listQuery.KNREnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="底盘号:" prop="VINBegin">
-          <el-input
-            v-model="listQuery.VINBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="VINEnd">
-          <el-input
-            v-model="listQuery.VINEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+          <el-form-item label="KNR:" prop="KNRBegin">
+            <el-input
+              v-model="listQuery.KNRBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="KNREnd">
+            <el-input
+              v-model="listQuery.KNREnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <el-form-item label="底盘号:" prop="VINBegin">
+            <el-input
+              v-model="listQuery.VINBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="VINEnd">
+            <el-input
+              v-model="listQuery.VINEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
-        <el-form-item label="上线日期">
-          <el-date-picker
-            v-model="listQuery.OnlineTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="接收日期">
-          <el-date-picker
-            v-model="listQuery.ReceiveTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="单据状态" prop="State" v-show="isShowState">
-          <el-checkbox-group  v-model="listQuery.state">
-            <el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id"  @change="checkedListChange(index)">
-              {{ item.name }}
-            </el-checkbox>
-          </el-checkbox-group>
-        </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"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <el-form-item label="接收日期">
+            <el-date-picker
+              v-model="listQuery.ReceiveTimeValue"
+              size="small"
+              style="width: 380px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="单据状态" prop="State" v-show="isShowState">
+            <el-checkbox-group v-model="listQuery.state">
+              <el-checkbox
+                v-for="(item, index) in billState"
+                :key="item.id"
+                :label="item.id"
+                @change="checkedListChange(index)"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
 
-        <el-form-item style="margin: 0px">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)
-          </el-button>
-          <el-button
-            ref='btn1'
-            type="primary"
-            size="mini"
-            style="margin-left: 15px"
-            @click="print()"
-            >打印门板发货排序单
-          </el-button>
-          <el-button
-            ref='btn2'
-            type="primary"
-            size="mini"
-            style="margin-left: 15px"
-            @click="rePrint()"
-            >重新打印门板发货排序单
-          </el-button>
-          <el-button
-            ref='btn3'
-            type="primary"
-            size="mini"
-            style="margin-left: 15px"
-            @click="makeUpPrint()"
-            >补打门板发货排序单
-          </el-button>
-        </el-form-item>
-      <!-- </el-row> -->
-      </el-form>
-    </flexbox>
+          <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
+              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
+              ref="btn2"
+              type="primary"
+              size="mini"
+              style="margin-left: 15px"
+              @click="rePrint()"
+              >重新打印门板发货排序单
+            </el-button>
+            <el-button
+              ref="btn3"
+              type="primary"
+              size="mini"
+              style="margin-left: 15px"
+              @click="makeUpPrint()"
+              >补打门板发货排序单
+            </el-button>
+            <!-- margin-left: 550px; -->
+            <el-button
+              type="text"
+              v-show="this.listQuery.productType === 1"
+              @click="drawerMB = true"
+              style="color: #e6a23c; fontweight: bold; font-size: 15pt"
+            >
+              <strong>门板重打和作废</strong></el-button
+            >
+            <el-button
+              type="text"
+              v-show="this.listQuery.productType === 2"
+              @click="drawerZHB = true"
+              style="color: #f56c6c; fontweight: bold; font-size: 15pt"
+              ><strong>柱护板重打和作废</strong></el-button
+            >
+          </el-form-item>
+          <!-- </el-row> -->
+        </el-form>
+      </flexbox>
     </div>
-    <div class="l-table">
+    <!--门板重打和作废-->
+    <el-drawer
+      title="门板作废和重打"
+      :visible.sync="drawerMB"
+      direction="rtl"
+      size="65%"
+    >
+      <MBDetail 
+      v-bind:customerInfosMB="customerInfosMB"></MBDetail>
+    </el-drawer>
+    <!--柱护板重打和作废-->
+    <el-drawer
+      title="柱护板作废和重打"
+      :visible.sync="drawerZHB"
+      direction="rtl"
+      size="65%"
+    >
+      <ZHBDetail  
+      v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
+    </el-drawer>
+
+    <div class="l-table" style="margin-top: -30px">
       <!--表格渲染-->
       <el-table
         ref="multipleTable"
@@ -246,13 +290,11 @@
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
       >
-        
         <el-table-column
           label="底盘号"
           prop="vin "
           sortable="custom"
           align="center"
-          
           width="180px"
         >
           <template slot-scope="scope">
@@ -277,7 +319,6 @@
           </template>
         </el-table-column>
       </el-table>
-
     </div>
     <div>
       <el-dialog
@@ -285,7 +326,7 @@
         :close-on-click-modal="false"
         :title="formTitle"
         width="700px"
-        @close='closeDialog'
+        @close="closeDialog"
       >
         <el-form
           ref="form"
@@ -297,7 +338,11 @@
         >
           <el-row>
             <el-col :span="24">
-              <el-form-item label="大众顺序号:" prop="beginHostSN" v-show="isShowHostSN">
+              <el-form-item
+                label="大众顺序号:"
+                prop="beginHostSN"
+                v-show="isShowHostSN"
+              >
                 <el-input
                   v-model="form.beginHostSN"
                   placeholder=""
@@ -305,7 +350,7 @@
                   size="small"
                   style="width: 240px"
                 />
-                <label class = "label1" >-</label>
+                <label class="label1">-</label>
                 <el-input
                   v-model="form.endHostSN"
                   placeholder=""
@@ -316,7 +361,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          
+
           <el-row>
             <el-col :span="24">
               <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
@@ -327,19 +372,19 @@
                   size="small"
                   style="width: 240px"
                 />
-                <label class = "label1" >-</label>
+                <label class="label1">-</label>
                 <el-input
-                    v-model="form.endVin"
-                    placeholder=""
-                    clearable
-                    size="small"
-                    style="width: 240px"
-                  />
+                  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
@@ -356,6 +401,7 @@
       <pagination
         v-show="totalCount > 0"
         :total="totalCount"
+        style="margin-bottom: -5px; float: right"
         :page.sync="page"
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
@@ -385,11 +431,13 @@ 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 { 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 qs from "qs";
 
 //组件计量单位
 const bomUnit = [
@@ -398,7 +446,6 @@ const bomUnit = [
   { key: 2, display_name: "Other" },
 ];
 
-
 const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
   acc[cur.key] = cur.display_name;
   return acc;
@@ -406,7 +453,14 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 
 export default {
   name: "M100Online",
-  components: { Pagination, CRMTableHead, importExcel, Detail },
+  components: {
+    Pagination,
+    CRMTableHead,
+    importExcel,
+    Detail,
+    MBDetail,
+    ZHBDetail,
+  },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -429,17 +483,22 @@ export default {
     };
     return {
       crmType: "M100Online",
+      drawerZHB: false,
+      drawerMB: false,
+      activeNames: ["1"],
       rules: {
         erpAssemblyName: [
           { required: true, message: "必须输入！", trigger: "blur" },
         ],
       },
-      billState:[
-        {id:2,name:"已匹配"},
-        {id:3,name:"已导出"}
+      billState: [
+        { id: 2, name: "已匹配" },
+        { id: 3, name: "已打印" },
       ],
       valueSelect: "",
       customerInfos: [],
+      customerInfosMB: [],
+      customerInfosZHB: [],
       dialogOptions: [],
       versionValue: "",
       searchContent: "", // 输入内容
@@ -462,105 +521,102 @@ export default {
       listQuery: {
         SkipCount: 0,
         MaxResultCount: 15,
-        productType: 1,//1:门板；2:柱护板
+        productType: 1, //1:门板；2:柱护板
         ProductLine: undefined,
-        Version: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:[],
-
+        Version: 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: [],
       },
       listExportQuery: {
         erpAssemblyCode: undefined,
         erpAssemblyName: undefined,
       },
-      listPLQuery:{
+      listPLQuery: {
         BillType: 2,
         //UserId: this.userinfo.UserId,
       },
-      hostSNQuery:{
-        productLine:undefined,
+      hostSNQuery: {
+        productLine: undefined,
       },
-      hostCheckQuery:{
-        printType: undefined,//0:打印;1:重打;2:补打;
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
         productLine: undefined,
         beginHostSN: undefined,
         endHostSN: undefined,
         beginVin: undefined,
-        endVin: undefined
+        endVin: undefined,
       },
-      hostPrintQuery:{
-        printType: undefined,//0:打印;1:重打;2:补打;
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
         productLine: undefined,
         beginHostSN: undefined,
         endHostSN: undefined,
         beginVin: undefined,
-        endVin: undefined
+        endVin: undefined,
       },
-      vinPrintQuery:{
-        printType: undefined,//0:打印;1:重打;2:补打;
+      vinPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
         productLine: undefined,
         beginHostSN: undefined,
         endHostSN: undefined,
         beginVin: undefined,
-        endVin: undefined
+        endVin: undefined,
       },
-      fileQuery:{
-        dataname:undefined,
+      fileQuery: {
+        dataname: undefined,
       },
-      form:{
-        details:[]
+      form: {
+        details: [],
       },
       page: 1,
       // 显示搜索条件
       showSearch: true,
       bomUnit,
-      multipleSelection: [],
       drawer: false,
       dialogFormVisible: false,
       formTitle: "",
       isEdit: false,
       formLoading: false,
       tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight:250,
-      details:[], //修改子表数据源
-      PLList:[],//产线下拉
-      PLChildList:[],//筛选后产线下拉
-	    productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
-      isShowHostSN : false,
-      isShowVin : false,
-      isShowState:true,
-      
-
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLList: [], //产线下拉
+      PLChildList: [], //筛选后产线下拉
+      productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
+      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为页面上部标签高度
-        //console.log(this.$refs.box.offsetHeight);
-        //console.log(this.tableHeight);
+    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.billState.forEach((element,index) => {
-      if(index === 0)
-      {
+    this.billState.forEach((element, index) => {
+      if (index === 0) {
         this.listQuery.state.push(element.id);
       }
     });
@@ -568,7 +624,6 @@ export default {
   },
   computed: {
     getDefaultField() {
-      
       var tempsTabs = [];
       tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
       tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
@@ -617,6 +672,12 @@ export default {
         prop: "productLine",
         width: 120,
       });
+      tempsTabs.push({
+        label: "状态",
+        prop: "billStatus",
+        width: 120,
+      });
+
       tempsTabs.push({
         label: "备注",
         prop: "remark",
@@ -624,7 +685,7 @@ export default {
       });
       return tempsTabs;
     },
-    ...mapGetters(['userInfo'])//获取当前用户信息
+    ...mapGetters(["userInfo"]), //获取当前用户信息
   },
   methods: {
     //抽屉
@@ -642,6 +703,7 @@ export default {
     handleDrawerClose(done) {
       done();
     },
+
     fetchData(id) {
       //循环动态
       this.$axios
@@ -742,7 +804,7 @@ export default {
       this.form.details.push(obj);
       //console.log(688);
     },
-    handleDeleteDetails(index){
+    handleDeleteDetails(index) {
       this.form.details.splice(index, 1);
       //console.log(693);
     },
@@ -750,7 +812,7 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "billStatus") {
-        return { 1: "未匹配", 2: "已匹配", 3: "已发布" }[row[column.property]];
+        return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
       }
       if (column.property == "onlineTime" || column.property == "receiveTime") {
         var date = row[column.property];
@@ -764,21 +826,22 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if(this.listQuery.OnlineTimeValue!== undefined)
-      {
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.OnlineTimeValue !== undefined) {
         this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
         this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
       }
-      if(this.listQuery.ReceiveTimeValue!== undefined)
-      {
+      if (this.listQuery.ReceiveTimeValue !== undefined) {
         this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
         this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
       }
-      if(this.listQuery.state!== undefined)
-      {
+      if (this.listQuery.state !== undefined) {
         this.listQuery.billStatus = this.listQuery.state[0];
       }
       this.$axios
@@ -796,7 +859,6 @@ export default {
         });
     },
 
-    
     getDetialList(partCode) {
       this.listLoading = true;
       console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
@@ -804,13 +866,12 @@ export default {
         .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
         .then((response) => {
           //console.log(partCode)
-          if(partCode !== "" && partCode !== undefined)
-          {
+          if (partCode !== "" && partCode !== undefined) {
             //console.log(partCode)
-            this.list = response.item.details.filter(u => u.partCode === partCode);
-          }
-          else
-          {
+            this.list = response.item.details.filter(
+              (u) => u.partCode === partCode
+            );
+          } else {
             this.list = response.item.details;
           }
           //alert(JSON.stringify(response.Items))
@@ -825,17 +886,36 @@ export default {
         });
     },
 
-    valueselectChange(){
+    valueselectChange(val) {
       this.$forceUpdate();
-      
+      this.customerInfosMB = [];
+      this.customerInfosZHB = [];
+      if (this.listQuery.productType === 1) {
+        //把产线值传到子组件
+        this.customerInfosMB = [
+          {
+            PrintType: 1,
+            ProductLine: val,
+          },
+        ];
+      }
+      if (this.listQuery.productType === 2) {
+        alert(val);
+        //把产线值传到子组件
+        this.customerInfosZHB = [
+          {
+            PrintType: 2,
+            ProductLine: val,
+          },
+        ];
+      }
     },
-    handleImportSAP(){},
+    handleImportSAP() {},
 
     handleFilter() {
       this.page = 1;
       this.getList();
     },
-
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -868,420 +948,395 @@ export default {
       this.$refs.multipleTable.clearSelection();
       this.$refs.multipleTable.toggleRowSelection(row);
     },
-    
-    closeDialog(){
-    },
+
+    closeDialog() {},
     /**打印 */
-    print()
-    {
-      this.hostPrintQuery = {
-        printType: undefined,//0:打印;1:重打;2:补打;
+    print() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
         productLine: undefined,
         beginHostSN: undefined,
         endHostSN: undefined,
         beginVin: undefined,
-        endVin: undefined
-      },
-      this.hostCheckQuery.printType = 0;
+        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;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
       }
       this.hostSNQuery.productLine = this.listQuery.productLine;
       this.hostPrintQuery.productLine = this.listQuery.productLine;
       this.$axios
-        .gets(
-          "/api/newjit/bill-m100/get-print-start-hostsn",this.hostSNQuery
-        )
+        .gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery)
         .then((response) => {
           console.log("获取hostsn大众顺序号起始");
           console.log(response.item);
-          if(response.item !== null)
-          {
+          if (response.item !== null) {
             this.form.beginHostSN = parseInt(response.item);
-            if(this.listQuery.productType === 1)//门板
-            {
+            if (this.listQuery.productType === 1) {
+              //门板
               this.form.endHostSN = parseInt(response.item) + 11;
-            }
-            else if(this.listQuery.productType === 2)//柱护板
-            {
+            } else if (this.listQuery.productType === 2) {
+              //柱护板
               this.form.endHostSN = parseInt(response.item) + 23;
             }
-            
-          }
-          else
-          {
+          } else {
             this.$message({
               message: "获取不到大众顺序号",
               type: "warning",
             });
             return;
           }
-          
-
         })
-        .catch(() => {
-        });
+        .catch(() => {});
       this.formTitle = "打印";
       this.dialogFormVisible = true;
-      this.form = 
-      {
-        beginHostSN:"",
-        endHostSN:"",
+      this.form = {
+        beginHostSN: "",
+        endHostSN: "",
       };
       this.isShowHostSN = true;
       this.isShowVin = false;
     },
     /**重打 */
-    rePrint()
-    {
-      this.hostPrintQuery = {
-        printType: undefined,//0:打印;1:重打;2:补打;
+    rePrint() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
         productLine: undefined,
         beginHostSN: undefined,
         endHostSN: undefined,
         beginVin: undefined,
-        endVin: undefined
-      },
-      this.hostCheckQuery.printType = 1;
+        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;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
       }
       this.formTitle = "重打";
       this.hostPrintQuery.productLine = this.listQuery.productLine;
       this.dialogFormVisible = true;
-      this.form = 
-      {
-        beginVin:"",
-        endVin:""
+      this.form = {
+        beginVin: "",
+        endVin: "",
       };
       this.isShowHostSN = false;
       this.isShowVin = true;
     },
     /**补打 */
-    makeUpPrint()
-    {
-      this.hostPrintQuery = {
-        printType: undefined,//0:打印;1:重打;2:补打;
+    makeUpPrint() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
         productLine: undefined,
         beginHostSN: undefined,
         endHostSN: undefined,
         beginVin: undefined,
-        endVin: undefined
-      },
-      this.hostCheckQuery.printType = 2;
+        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;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "error",
+        });
+        return;
       }
       this.formTitle = "补打";
       this.hostPrintQuery.productLine = this.listQuery.productLine;
       this.dialogFormVisible = true;
-      this.form = 
-      {
-        beginVin:"",
-        endVin:""
+      this.form = {
+        beginVin: "",
+        endVin: "",
       };
       this.isShowHostSN = false;
       this.isShowVin = true;
     },
     /**保存*/
-    save()
-    {
-      if(this.isShowHostSN === true)
-      {
-        if(this.form.beginHostSN === "" || this.form.endHostSN === "")
-        {
+    save() {
+      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)
-            {
+        } 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)
-            {
+          } 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",
+                message:
+                  "最多只能打印24个顺序号，终止顺序号不能大于" +
+                  (parseInt(this.form.beginHostSN) + 23),
+                type: "error",
               });
               return;
             }
           }
-          
         }
-
       }
-      if(this.isShowVin === true)
-      {
-        if(this.form.beginVin === "" || this.form.endVin === "")
-        {
+      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.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN );
-        this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN );
+      if (this.formTitle === "打印") {
+        this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
+        this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
         //验证是否断号
         this.$axios
-              .posts(
-                "/api/newjit/bill-m100/check-hostsn-break-num",this.hostCheckQuery
-              )
-              .then((response) => {
-                console.log("检查hostsn大众顺序号是否断号");
-                console.log(response);
-                if(response.item.length > 0)
-                {
-                  this.$confirm("本次打印存在断号是否继续?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                  })
-                  .then(() => {
-                    //判断productType类型
-                    if(this.listQuery.productType === 1)//门板
-                    {
-                      //传递大众顺序号起止
-                      this.$axios
-                        .posts(
-                          "/api/newjit/bill-m100/print-menban-packing-list",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
-                          {
-                            //传给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=menban",qs.stringify(this.fileQuery))
-                              .then((response) => {
-                                console.log("获取文件base64编码");
-                                console.log(response);
-                                this.printpdf(response);//打印我文件流
-                              })
-                          }
-                        })
-                      
-                    }
-                    else if(this.listQuery.productType === 2)//柱护板
-                    {
-                      //传递大众顺序号起止
+          .posts(
+            "/api/newjit/bill-m100/check-hostsn-break-num",
+            this.hostCheckQuery
+          )
+          .then((response) => {
+            console.log("检查hostsn大众顺序号是否断号");
+            console.log(response);
+            if (response.item.length > 0) {
+              this.$confirm("本次打印存在断号是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+              })
+                .then(() => {
+                  //判断productType类型
+                  if (this.listQuery.productType === 1) {
+                    //门板
+                    //传递大众顺序号起止
+                    this.$axios
+                      .posts(
+                        "/api/newjit/bill-m100/print-menban-packing-list",
+                        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 {
+                          //传给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=menban",
+                              qs.stringify(this.fileQuery)
+                            )
+                            .then((response) => {
+                              console.log("获取文件base64编码");
+                              console.log(response);
+                              this.printpdf(response); //打印我文件流
+                            });
+                        }
+                      });
+                  } else if (this.listQuery.productType === 2) {
+                    //柱护板
+                    //传递大众顺序号起止
+                    this.$axios
+                      .posts(
+                        "/api/newjit/bill-m100/print-zhuhuban-packing-list",
+                        this.hostPrintQuery
+                      )
+                      .then((response) => {
+                        console.log("打印柱护板装箱单");
+                        console.log(response);
+                        if (response.status === false) {
+                          this.$message({
+                            message: response.message,
+                            type: "error",
+                          });
+                          return;
+                        } else {
+                          //传给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",
+                              qs.stringify(this.fileQuery)
+                            )
+                            .then((response) => {
+                              console.log("获取文件base64编码");
+                              console.log(response);
+                              this.printpdf(response); //打印我文件流
+                            });
+                        }
+                      });
+                  }
+                })
+                .catch(() => {});
+            } //无断号
+            else {
+              //判断productType类型
+              if (this.listQuery.productType === 1) {
+                //门板
+                //传递大众顺序号起止
+                this.$axios
+                  .posts(
+                    "/api/newjit/bill-m100/print-menban-packing-list",
+                    this.hostPrintQuery
+                  )
+                  .then((response) => {
+                    console.log("打印门板装箱单");
+                    console.log(response);
+                    if (response.status === false) {
+                      this.$message({
+                        message: response.message,
+                        type: "error",
+                      });
+                      return;
+                    } else {
+                      //传给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/print-zhuhuban-packing-list",this.hostPrintQuery
+                          "/Handlers/Handler1.ashx?report=menban",
+                          qs.stringify(this.fileQuery)
                         )
                         .then((response) => {
-                          console.log("打印柱护板装箱单");
+                          console.log("获取文件base64编码");
                           console.log(response);
-                          if(response.status === false)
-                          {
-                              this.$message({
-                                message: response.message,
-                                type: "error",
-                              });
-                              return;
-                          }
-                          else
-                          {
-                            //传给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",qs.stringify(this.fileQuery))
-                              .then((response) => {
-                                console.log("获取文件base64编码");
-                                console.log(response);
-                                this.printpdf(response);//打印我文件流
-                              })
-                          }
-                        })
+                          this.printpdf(response); //打印我文件流
+                        });
                     }
                   })
                   .catch(() => {
+                    this.$message({
+                      message: response.message,
+                      type: "error",
+                    });
+                    return;
                   });
-                }
-                else//无断号
-                {
-                  //判断productType类型
-                    if(this.listQuery.productType === 1)//门板
-                    {
-                      //传递大众顺序号起止
-                      this.$axios
-                        .posts(
-                          "/api/newjit/bill-m100/print-menban-packing-list",this.hostPrintQuery
-                        )
-                        .then((response) => {
-                          console.log("打印门板装箱单");
-                          console.log(response);
-                          if(response.status === false)
-                          {
-                              this.$message({
-                                message: response.message,
-                                type: "error",
-                              });
-                              return;
-                          }
-                          else
-                          {
-                            //传给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=menban",qs.stringify(this.fileQuery))
-                              .then((response) => {
-                                console.log("获取文件base64编码");
-                                console.log(response);
-                                this.printpdf(response);//打印我文件流
-                              })
-                          }
-                        })
-                        .catch(() => {
-                          this.$message({
-                                message: response.message,
-                                type: "error",
-                              });
-                              return;
-                        });
-                      
-                    }
-                    else if(this.listQuery.productType === 2)//柱护板
-                    {
-                      //传递大众顺序号起止
+              } else if (this.listQuery.productType === 2) {
+                //柱护板
+                //传递大众顺序号起止
+                this.$axios
+                  .posts(
+                    "/api/newjit/bill-m100/print-zhuhuban-packing-list",
+                    this.hostPrintQuery
+                  )
+                  .then((response) => {
+                    console.log("打印柱护板装箱单");
+                    console.log(response);
+                    if (response.status === false) {
+                      this.$message({
+                        message: response.message,
+                        type: "error",
+                      });
+                      return;
+                    } else {
+                      //传给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/print-zhuhuban-packing-list",this.hostPrintQuery
+                          "/Handlers/Handler1.ashx?report=zhuhuban",
+                          qs.stringify(this.fileQuery)
                         )
                         .then((response) => {
-                          console.log("打印柱护板装箱单");
+                          console.log("获取文件base64编码");
                           console.log(response);
-                          if(response.status === false)
-                          {
-                              this.$message({
-                                message: response.message,
-                                type: "error",
-                              });
-                              return;
-                          }
-                          else
-                          {
-                            //传给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",qs.stringify(this.fileQuery))
-                              .then((response) => {
-                                console.log("获取文件base64编码");
-                                console.log(response);
-                                this.printpdf(response);//打印我文件流
-                              })
-                          }
-                        })
-                        .catch(() => {
-                          this.$message({
-                                message: response.message,
-                                type: "error",
-                              });
-                              return;
+                          this.printpdf(response); //打印我文件流
                         });
                     }
-                }
-                
-              })
-        
-      }
-      /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
-      else
-      {
+                  })
+                  .catch(() => {
+                    this.$message({
+                      message: response.message,
+                      type: "error",
+                    });
+                    return;
+                  });
+              }
+            }
+          });
+      } else {
+        /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
         this.hostPrintQuery.beginVin = this.form.beginVin;
         this.hostPrintQuery.endVin = this.form.endVin;
         //判断productType类型
-        if(this.listQuery.productType === 1)//门板
-        {
+        if (this.listQuery.productType === 1) {
+          //门板
           //传递底盘号起止
           this.$axios
             .posts(
-              "/api/newjit/bill-m100/print-menban-packing-list",this.hostPrintQuery
+              "/api/newjit/bill-m100/print-menban-packing-list",
+              this.hostPrintQuery
             )
             .then((response) => {
               console.log("重新或补打打印门板装箱单");
               console.log(response);
-              if(response.status === false)
-              {
-                  this.$message({
-                    message: response.message,
-                    type: "error",
-                  });
-                  return;
-              }
-              else
-              {
+              if (response.status === false) {
+                this.$message({
+                  message: response.message,
+                  type: "error",
+                });
+                return;
+              } else {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "menban";
                 this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1289,44 +1344,42 @@ export default {
                 console.log("打印json");
                 console.log(this.fileQuery.dataname);
                 this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=menban",qs.stringify(this.fileQuery))
-                .then((response) => {
-                  console.log("获取文件base64编码");
-                  console.log(response);
-                  this.printpdf(response);//打印我文件流
-                 })
+                  .posts(
+                    "/Handlers/Handler1.ashx?report=menban",
+                    qs.stringify(this.fileQuery)
+                  )
+                  .then((response) => {
+                    console.log("获取文件base64编码");
+                    console.log(response);
+                    this.printpdf(response); //打印我文件流
+                  });
               }
-              
             })
-          .catch(() => {
-            this.$message({
-              message: response.message,
-              type: "error",
+            .catch(() => {
+              this.$message({
+                message: response.message,
+                type: "error",
               });
               return;
-          });
-        }
-        else if(this.listQuery.productType === 2)//柱护板
-        {
+            });
+        } else if (this.listQuery.productType === 2) {
+          //柱护板
           //传递底盘号起止
           this.$axios
             .posts(
-              "/api/newjit/bill-m100/print-zhuhuban-packing-list",this.hostPrintQuery
+              "/api/newjit/bill-m100/print-zhuhuban-packing-list",
+              this.hostPrintQuery
             )
             .then((response) => {
               console.log("打印柱护板装箱单");
               console.log(response);
-              if(response.status === false)
-              {
-                  this.$message({
-                    message: response.message,
-                    type: "error",
-                  });
-                  return;
-              }
-              else
-              {
+              if (response.status === false) {
+                this.$message({
+                  message: response.message,
+                  type: "error",
+                });
+                return;
+              } else {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "zhuhuban";
                 this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1334,155 +1387,162 @@ export default {
                 console.log("打印json");
                 console.log(this.fileQuery.dataname);
                 this.$axios
-                .posts(
-                  "/Handlers/Handler1.ashx?report=zhuhuban",qs.stringify(this.fileQuery))
-                .then((response) => {
-                  console.log("获取文件base64编码");
-                  console.log(response);
-                  this.printpdf(response);//打印我文件流
-                 })
+                  .posts(
+                    "/Handlers/Handler1.ashx?report=zhuhuban",
+                    qs.stringify(this.fileQuery)
+                  )
+                  .then((response) => {
+                    console.log("获取文件base64编码");
+                    console.log(response);
+                    this.printpdf(response); //打印我文件流
+                  });
               }
             })
-          .catch(() => {
-            this.$message({
-              message: response.message,
-              type: "error",
+            .catch(() => {
+              this.$message({
+                message: response.message,
+                type: "error",
               });
               return;
-          });
+            });
         }
       }
     },
     //获取所有产线
-    getProductLine()
-    {
+    getProductLine() {
       this.listPLQuery.UserId = this.userInfo.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;
-            this.getList();
-            //console.log(this.PLList)
-          })
-          .catch(() => {
+        .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()
-    {
+    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});
+      this.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
       //console.log(this.PLList)
       //变更打印按钮文字
-      if(this.listQuery.productType === 1)
-      {
+      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)
-      {
+      } 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;
       }
-      
     },
     /*单据状态变更 */
-    checkedListChange(index)
-    {
-      if(this.listQuery.state.length <= 1)
-      {
+    checkedListChange(index) {
+      if (this.listQuery.state.length <= 1) {
         this.listQuery.state.push(this.billState[index].id);
-      }
-      else
-      {
+      } else {
         this.listQuery.state = [];
         this.listQuery.state.push(this.billState[index].id);
       }
     },
     /**解析文件流 */
-    getUrl()
-    {
+    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');
+      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','下载的文件名');
+      link.setAttribute("download", "下载的文件名");
       document.body.appendChild(link);
       link.click();
-      document.body.removeChild(link)
+      document.body.removeChild(link);
     },
     //base64转化成流，dataurl是后台返回的base64
-    dataURLtoBlob (dataurl) {
-      var bstr = atob(dataurl.substring(dataurl.indexOf(',') + 1));
+    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' });
+      return new Blob([u8arr], { type: "application/pdf" });
     },
     doPrint(val) {
-      var ordonnance = document.getElementById(val).contentWindow
+      var ordonnance = document.getElementById(val).contentWindow;
       setTimeout(() => {
         // window.print()
-        ordonnance.print()
-        this.pdfLoading = false
-      }, 100)
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
     },
-    printpdf(dataResult)
-    {
+    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 对象
+      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;
     },
     httpPost(URL, PARAMS) {
-					var temp = document.createElement("form");
-					temp.action = URL;
-					temp.method = "post";
-					temp.style.display = "none";
+      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);
-					}
+      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();
+      document.body.appendChild(temp);
+      temp.submit();
 
-					return temp;
-			}
+      return temp;
+    },
   },
 };
 </script>
 
 
+
 <style lang="scss" scoped>
 @import "../../../pg-fis/styles/crmtable.scss";
 
@@ -1497,17 +1557,18 @@ export default {
 //   position: absolute;
 //   left: 7px;
 // }
-.divider1{
-  margin: 0 ;
+.divider1 {
+  margin: 0;
 }
-.divider2{
+.divider2 {
   margin: 10px;
-  margin-bottom: 20px ;
+  margin-bottom: 20px;
   width: 95%;
 }
-.label1{
+.label1 {
   margin-left: 5px;
   margin-right: 5px;
 }
 </style>
 
+
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue
index 4071dd13..01b67e69 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@@ -2,103 +2,105 @@
 <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
+      <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>
+                :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="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="大众顺序号:" prop="HostSNBegin">
-          <el-input
-            v-model="listQuery.HostSNBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="HostSNEnd">
-          <el-input
-            v-model="listQuery.HostSNEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+          <el-form-item label="版本:" prop="Version">
+            <el-input
+              v-model="listQuery.Version"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <el-form-item label="大众顺序号:" prop="HostSNBegin">
+            <el-input
+              v-model="listQuery.HostSNBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="HostSNEnd">
+            <el-input
+              v-model="listQuery.HostSNEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
-        <el-form-item label="KNR:" prop="KNRBegin">
-          <el-input
-            v-model="listQuery.KNRBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="KNREnd">
-          <el-input
-            v-model="listQuery.KNREnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <!-- <el-form-item label="底盘号:" prop="VINBegin">
+          <el-form-item label="KNR:" prop="KNRBegin">
+            <el-input
+              v-model="listQuery.KNRBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="KNREnd">
+            <el-input
+              v-model="listQuery.KNREnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <!-- <el-form-item label="底盘号:" prop="VINBegin">
           <el-input
             v-model="listQuery.VINBegin"
             placeholder=""
@@ -119,76 +121,81 @@
           />
         </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"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="接收日期">
-          <el-date-picker
-            v-model="listQuery.ReceiveTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="单据状态" prop="State">
-          <el-checkbox-group  v-model="listQuery.state" >
-            <el-checkbox v-for="(item, index) in billState" :key="item.id" :label="item.id"  @change="checkedListChange(index)">
-              {{ item.name }}
-            </el-checkbox>
-          </el-checkbox-group>
-        </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"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <el-form-item label="接收日期">
+            <el-date-picker
+              v-model="listQuery.ReceiveTimeValue"
+              size="small"
+              style="width: 380px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="单据状态" prop="State">
+            <el-checkbox-group v-model="listQuery.state">
+              <el-checkbox
+                v-for="(item, index) in billState"
+                :key="item.id"
+                :label="item.id"
+                @change="checkedListChange(index)"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
 
-        <el-form-item style="margin: 0px">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出(Excel)
-          </el-button>
-          <el-button
-            type="primary"
-            size="mini"
-            style="margin-left: 15px"
-            @click="SAPExport()"
-            >导出Excel（用于SAP导入）
-          </el-button>
-        </el-form-item>
-      <!-- </el-row> -->
-      </el-form>
-    </flexbox>
+          <el-form-item style="margin:0">
+            <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
+              type="primary"
+              size="mini"
+              style="margin-left: 15px"
+              @click="SAPExport()"
+              >导出Excel（用于SAP导入）
+            </el-button>
+          </el-form-item>
+          <!-- </el-row> -->
+        </el-form>
+      </flexbox>
     </div>
-    <div class="l-table">
+    <div class="l-table" style="margin-top:-30px">
       <!--表格渲染-->
       <el-table
         ref="multipleTable"
@@ -209,13 +216,11 @@
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
       >
-        
         <el-table-column
           label="KNR"
           prop="knr"
           sortable="custom"
           align="center"
-          
           width="180px"
         >
           <template slot-scope="scope">
@@ -240,7 +245,6 @@
           </template>
         </el-table-column>
       </el-table>
-
     </div>
 
     <div class="table-footer">
@@ -277,7 +281,7 @@ 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 { mapGetters } from "vuex";
 import moment from "moment";
 import Detail from "./detail.vue";
 import { downloadFile } from "@/utils/crmindex.js";
@@ -289,7 +293,6 @@ const bomUnit = [
   { key: 2, display_name: "Other" },
 ];
 
-
 const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
   acc[cur.key] = cur.display_name;
   return acc;
@@ -297,7 +300,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 
 export default {
   name: "R100Online",
-  components: { Pagination, CRMTableHead, importExcel , Detail},
+  components: { Pagination, CRMTableHead, importExcel, Detail },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -325,9 +328,9 @@ export default {
           { required: true, message: "必须输入！", trigger: "blur" },
         ],
       },
-      billState:[
-        {id:2,name:"已匹配"},
-        {id:3,name:"已导出"}
+      billState: [
+        { id: 2, name: "已匹配" },
+        { id: 3, name: "已导出" },
       ],
       valueSelect: "",
       customerInfos: [],
@@ -355,33 +358,32 @@ export default {
         MaxResultCount: 15,
         productType: 1,
         ProductLine: undefined,
-        Version:undefined,
-        HostSNBegin:undefined,
-        HostSNBegin:undefined,
-        KNRBegin:undefined,
-        KNREnd:undefined,
+        Version: undefined,
+        HostSNBegin: undefined,
+        HostSNBegin: undefined,
+        KNRBegin: undefined,
+        KNREnd: undefined,
         //VINBegin:undefined,
-        VINEnd:undefined,
-        OnlineTimeValue:[],
-        OnlineTimeBegin:undefined,
-        OnlineTimeEnd:undefined,
-        ReceiveTimeValue:[],
-        ReceiveTimeBegin:undefined,
-        ReceiveTimeEnd:undefined,
-        billStatus:undefined,
-        state:[],
-
+        VINEnd: undefined,
+        OnlineTimeValue: [],
+        OnlineTimeBegin: undefined,
+        OnlineTimeEnd: undefined,
+        ReceiveTimeValue: [],
+        ReceiveTimeBegin: undefined,
+        ReceiveTimeEnd: undefined,
+        billStatus: undefined,
+        state: [],
       },
       listExportQuery: {
         erpAssemblyCode: undefined,
         erpAssemblyName: undefined,
       },
-      listPLQuery:{
+      listPLQuery: {
         BillType: 1,
         //UserId: "00000000-0000-0000-0000-000000000000",
       },
-      form:{
-        details:[]
+      form: {
+        details: [],
       },
       page: 1,
       // 显示搜索条件
@@ -394,26 +396,28 @@ export default {
       isEdit: false,
       formLoading: false,
       tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight:250,
-      details:[], //修改子表数据源
-      PLChildList:[],//筛选后产线下拉
-	    productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLChildList: [], //筛选后产线下拉
+      productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
     };
   },
   mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-        //console.log(this.$refs.box.offsetHeight);
-        //console.log(this.tableHeight);
+    this.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+      //console.log(this.$refs.box.offsetHeight);
+      //console.log(this.tableHeight);
     });
   },
   created() {
-    this.billState.forEach((element,index) => {
-      if(index === 0)
-      {
+    this.billState.forEach((element, index) => {
+      if (index === 0) {
         this.listQuery.state.push(element.id);
       }
     });
@@ -421,7 +425,6 @@ export default {
   },
   computed: {
     getDefaultField() {
-      
       var tempsTabs = [];
       tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
       // tempsTabs.push({
@@ -473,6 +476,11 @@ export default {
         label: "产线",
         prop: "productLine",
         width: 120,
+      });
+        tempsTabs.push({
+        label: "状态",
+        prop: "billStatus",
+        width: 120,
       });
       tempsTabs.push({
         label: "备注",
@@ -481,7 +489,7 @@ export default {
       });
       return tempsTabs;
     },
-    ...mapGetters(['userInfo'])//获取当前用户信息
+    ...mapGetters(["userInfo"]), //获取当前用户信息
   },
   methods: {
     //抽屉
@@ -587,7 +595,7 @@ export default {
       this.form.details.push(obj);
       //console.log(688);
     },
-    handleDeleteDetails(index){
+    handleDeleteDetails(index) {
       this.form.details.splice(index, 1);
       //console.log(693);
     },
@@ -595,7 +603,7 @@ export default {
     /** 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "billStatus") {
-        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
+        return { 0: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
       }
       if (column.property == "onlineTime" || column.property == "receiveTime") {
         var date = row[column.property];
@@ -609,21 +617,22 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if(this.listQuery.OnlineTimeValue!== undefined)
-      {
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.OnlineTimeValue !== undefined) {
         this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
         this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
       }
-      if(this.listQuery.ReceiveTimeValue!== undefined)
-      {
+      if (this.listQuery.ReceiveTimeValue !== undefined) {
         this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
         this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
       }
-      if(this.listQuery.state!== undefined)
-      {
+      if (this.listQuery.state !== undefined) {
         this.listQuery.billStatus = this.listQuery.state[0];
       }
       this.$axios
@@ -641,7 +650,6 @@ export default {
         });
     },
 
-    
     getDetialList(partCode) {
       this.listLoading = true;
       console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
@@ -649,13 +657,12 @@ export default {
         .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
         .then((response) => {
           //console.log(partCode)
-          if(partCode !== "" && partCode !== undefined)
-          {
+          if (partCode !== "" && partCode !== undefined) {
             //console.log(partCode)
-            this.list = response.item.details.filter(u => u.partCode === partCode);
-          }
-          else
-          {
+            this.list = response.item.details.filter(
+              (u) => u.partCode === partCode
+            );
+          } else {
             this.list = response.item.details;
           }
           //alert(JSON.stringify(response.Items))
@@ -670,8 +677,10 @@ export default {
         });
     },
 
-    valueselectChange(){this.$forceUpdate();},
-    handleImportSAP(){},
+    valueselectChange() {
+      this.$forceUpdate();
+    },
+    handleImportSAP() {},
 
     handleFilter() {
       this.page = 1;
@@ -710,44 +719,43 @@ export default {
       this.$refs.multipleTable.clearSelection();
       this.$refs.multipleTable.toggleRowSelection(row);
     },
-    SAPExport(){},
+    SAPExport() {},
     //获取所有产线
-    getProductLine()
-    {
+    getProductLine() {
       this.listPLQuery.UserId = this.userInfo.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;
-            this.getList();
-            //console.log(this.PLList)
-          })
-          .catch(() => {
+        .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;
+          this.getList();
+          //console.log(this.PLList)
+        })
+        .catch(() => {});
     },
     //产线类型变更
-    ptypeselectChange()
-    {
+    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});
+      this.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
       //console.log(this.PLList)
     },
     /*单据状态变更 */
-    checkedListChange(index)
-    {
-      if(this.listQuery.state.length <= 1)
-      {
+    checkedListChange(index) {
+      if (this.listQuery.state.length <= 1) {
         this.listQuery.state.push(this.billState[index].id);
-      }
-      else
-      {
+      } else {
         this.listQuery.state = [];
         this.listQuery.state.push(this.billState[index].id);
       }
@@ -771,12 +779,12 @@ export default {
 //   position: absolute;
 //   left: 7px;
 // }
-.divider1{
-  margin: 0 ;
+.divider1 {
+  margin: 0;
 }
-.divider2{
+.divider2 {
   margin: 10px;
-  margin-bottom: 20px ;
+  margin-bottom: 20px;
   width: 95%;
 }
 </style>
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index.vue b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
index 62ffdd05..5bb9dd60 100644
--- a/vue/src/views/pg-fis/basedate/repeatR100/index.vue
+++ b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
@@ -513,9 +513,13 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+        if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.OnlineTimeValue != []) {
         this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
         this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
index 47633f45..d5ca59b3 100644
--- a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue
@@ -2,172 +2,173 @@
 <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="KNR:" prop="KNRBegin">
-          <el-input
-            v-model="listQuery.KNRBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="KNREnd">
-          <el-input
-            v-model="listQuery.KNREnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+      <flexbox class="content-header">
+        <el-form
+          :model="listQuery"
+          ref="queryForm"
+          v-show="showSearch"
+          :inline="true"
+        >
+          <el-form-item label="KNR:" prop="KNRBegin">
+            <el-input
+              v-model="listQuery.KNRBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="KNREnd">
+            <el-input
+              v-model="listQuery.KNREnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
-        <el-form-item label="底盘号:" prop="VINBegin">
-          <el-input
-            v-model="listQuery.VINBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="VINEnd">
-          <el-input
-            v-model="listQuery.VINEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+          <el-form-item label="底盘号:" prop="VINBegin">
+            <el-input
+              v-model="listQuery.VINBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="VINEnd">
+            <el-input
+              v-model="listQuery.VINEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
+          <el-form-item label="车型代码" prop="VehicleModelCode">
+            <el-select
+              v-model="listQuery.vehicleModelCode"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="valueselectChange"
+            >
+              <el-option
+                v-for="item in vehicleModelList"
+                :key="item.id"
+                :label="item.dicItemName"
+                :value="item.dicItemCode"
+              />
+            </el-select>
+          </el-form-item>
 
-        <el-form-item label="车型代码" prop="VehicleModelCode">
-          <el-select
-            v-model="listQuery.vehicleModelCode"
-            clearable
-            placeholder="请选择"
-            size="medium"
-            style="margin-right: 15px"
-            @change="valueselectChange"
-          >
-            <el-option
-              v-for="item in vehicleModelList"
-              :key="item.id"
-              :label="item.dicItemName"
-              :value="item.dicItemCode"/>
-          </el-select>
-        </el-form-item>
+          <el-form-item label="版本" prop="Version">
+            <el-input
+              v-model="listQuery.Version"
+              placeholder="请输入版本"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
-        <el-form-item label="版本" prop="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder="请输入版本"
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+          <el-form-item label="上线日期">
+            <el-date-picker
+              v-model="OnlineTimeValue"
+              size="small"
+              style="width: 380px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
 
-        <el-form-item label="上线日期">
-          <el-date-picker
-            v-model="OnlineTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
+          <el-form-item>
+            <el-button
+              class="filter-item"
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              :loading="buttonLoading"
+              @click="handleUpdate()"
+              >重新解析(批量操作)
+            </el-button>
+          </el-form-item>
 
-        <el-form-item>
-          <el-button
-            class="filter-item"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            :loading="buttonLoading"
-            @click="handleUpdate()"
-            >重新解析(批量操作)
-          </el-button>
-        </el-form-item>
-        
-        <el-form-item>
-          <el-button
-            class="addAssy"
-            size="mini"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleCreate"
-            >添加总成
-          </el-button>
-        </el-form-item>
+          <el-form-item>
+            <el-button
+              class="addAssy"
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              @click="handleCreate"
+              >添加总成
+            </el-button>
+          </el-form-item>
 
-        <el-form-item label="扫描点" prop="ScanPoint">
-          <el-select
-            v-model="listQuery.ScanPoint"
-            placeholder="请选择"
-            style="width: 200px"
-            clearable
-          >
-            <el-option
-              v-for="item in ScanPointList"
-              :key="item.id"
-              :label="item.label"
-              :value="item.id"/>
-          </el-select>
-        </el-form-item>
+          <el-form-item label="扫描点" prop="ScanPoint">
+            <el-select
+              v-model="listQuery.ScanPoint"
+              placeholder="请选择"
+              style="width: 200px"
+              clearable
+            >
+              <el-option
+                v-for="item in ScanPointList"
+                :key="item.id"
+                :label="item.label"
+                :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-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleFilter"
+              >搜索</el-button
+            >
+            <el-button
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery('queryForm')"
+              >重置</el-button
+            >
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              style="margin-left: 15px"
+              @click="handleDownload()"
+              >导出(Excel)
+            </el-button>
 
-          <el-button
-            class="filter-item"
-            plain
-            size="mini"
-            type="success"
-            icon="el-icon-check"
-            :loading="button2Loading"
-            @click="handleUpdateAll()"
-            >重新解析(执行全部)
-          </el-button>
-        </el-form-item>
-      </el-form>
-    </flexbox>
+            <el-button
+              class="filter-item"
+              plain
+              size="mini"
+              type="success"
+              icon="el-icon-check"
+              :loading="button2Loading"
+              @click="handleUpdateAll()"
+              >重新解析(执行全部)
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </flexbox>
     </div>
     <div class="l-table">
       <!--表格渲染-->
@@ -184,7 +185,7 @@
         size="small"
         stripe
         highlight-current-row
-        style="width: 100%"
+        style="width: 100%;margin-top: -25px"
         @sort-change="sortChange"
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
@@ -198,9 +199,9 @@
           width="180px"
         >
           <template slot-scope="scope">
-              <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
-                scope.row.vin
-              }}</span>
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.vin
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -256,98 +257,200 @@
         </div>
       </el-drawer>
     </div>
-      
-      <!--添加总成-->
-      <el-dialog
-        :visible.sync="dialogFormVisible"
-        :close-on-click-modal="false"
-        :title="formTitle"
-        append-to-body
-        width="1000px"
-      >
-        <div style="width:980px;height:600px">
-          <el-row>
-            <el-col :span="8">
-              <div style="border:1px;width:280px">
-                <el-row>
-                  <div class="app">
-                      <!-- handleCurrentChange -->
-                    <el-table border style="margin:0px;width:280px;" height="260px" ref="asTable" :data="erpAssemblyCfgList" highlight-current-row @row-click="rowClickass" @select="selectAss">
-                        <el-table-column type="selection" width="40px"></el-table-column>
-                        <el-table-column prop="erpAssemblyCode" label="总成编号" align="center" width="178px"></el-table-column>
-                        <!-- 添加删除按钮 -->
-                        <el-table-column align="center" width="61px">
-                          <!-- type="button" :render-header="renderHeader" -->
-                          <!-- <template slot="header" slot-scope="scope">
+
+    <!--添加总成-->
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      :close-on-click-modal="false"
+      :title="formTitle"
+      append-to-body
+      width="1000px"
+    >
+      <div style="width: 980px; height: 600px">
+        <el-row>
+          <el-col :span="8">
+            <div style="border: 1px; width: 280px">
+              <el-row>
+                <div class="app">
+                  <!-- handleCurrentChange -->
+                  <el-table
+                    border
+                    style="margin: 0px; width: 280px"
+                    height="260px"
+                    ref="asTable"
+                    :data="erpAssemblyCfgList"
+                    highlight-current-row
+                    @row-click="rowClickass"
+                    @select="selectAss"
+                  >
+                    <el-table-column
+                      type="selection"
+                      width="40px"
+                    ></el-table-column>
+                    <el-table-column
+                      prop="erpAssemblyCode"
+                      label="总成编号"
+                      align="center"
+                      width="178px"
+                    ></el-table-column>
+                    <!-- 添加删除按钮 -->
+                    <el-table-column align="center" width="61px">
+                      <!-- type="button" :render-header="renderHeader" -->
+                      <!-- <template slot="header" slot-scope="scope">
                             <el-button @click="addzc(scope.$index,scope.row)" icon="el-icon-plus">
                             </el-button>
                           </template> -->
-                          <template slot-scope="scope">
-                            <el-button @click="delzc(scope.$index,scope.row)" icon="el-icon-minus" size="mini" align="left">
-                            </el-button>
-                          </template>
-                        </el-table-column>
-                    </el-table>
-                  </div>
-                </el-row>
-                <el-row>
-                  <div style="width:280px;border:1px" >
-                    <el-divider content-position="center">添加Erp总成</el-divider>
-                    <el-form style="border:1px" :label-position="labelPosition" label-width="100px" :model="assly" ref="assly" border>
-                      <el-form-item label="Erp总成编码" style="height:40px;width:280px">
-                        <el-input v-model="assly.erpAssemblyCode" clearable placeholder="请输入Erp总成编码"></el-input>
-                      </el-form-item>
-                      <el-form-item label="Erp总成名称" style="height:40px;width:280px">
-                        <el-input v-model="assly.erpAssemblyName" clearable placeholder="请输入Erp总成名称"></el-input>
-                      </el-form-item>
-                      <el-form-item label="车型" style="height:40px;">
-                        <!-- <el-input v-model="assly.carModel" clearable></el-input> -->
-                        <el-select v-model="assly.carModel" clearable placeholder="请选择车型">
-                          <el-option
-                            v-for="item in vehicleModelList"
-                            :key="item.id"
-                            :label="item.dicItemName"
-                            :value="item.dicItemCode"/>
-                        </el-select>
-                      </el-form-item>
-                      <el-form-item>
-                        <el-button type="primary" @click="submitAssyForm('assly')">添加</el-button>
-                      </el-form-item>
-                    </el-form>
-                  </div>
-                </el-row>
-              </div>
-            </el-col>
-            <el-col :span="7">
-              <div style="border:1px;height:570px;width:270px">
-                <el-table :data="tempdetails" ref="leftTable" height="550" stripe border highlight-current-row @row-click="rowClickLeft" @select="selectLeft" @select-all="selectLeftAll">
-                  <el-table-column type="selection" width="40px"></el-table-column>
-                  <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
-                  <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
-                </el-table>
-              </div>
-            </el-col>
-            <el-col :span="2">
-              <!-- 左右穿梭按钮 -->
-              <div align="center" style="height:570px;width:70px">
-                <el-row style="line-height: 300px;">
-                  <el-button @click="btnleftclick()" icon="el-icon-caret-left"></el-button>
-                </el-row>
-                <el-row>
-                  <el-button @click="btnrightclick()" icon="el-icon-caret-right"></el-button>
-                </el-row>
-              </div>
-            </el-col>
-            <el-col :span="7">
-              <div style="border:1px;height:570px;width:270px">
-                <el-table :data="data2" ref="rightTable" height="550" stripe border highlight-current-row @row-click="rowClickRight" @select="selectRight" @select-all="selectRightAll">
-                  <el-table-column type="selection" width="40px"></el-table-column>
-                  <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
-                  <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
-                </el-table>
-              </div>
-            </el-col>
-                <!-- <el-table-transfer
+                      <template slot-scope="scope">
+                        <el-button
+                          @click="delzc(scope.$index, scope.row)"
+                          icon="el-icon-minus"
+                          size="mini"
+                          align="left"
+                        >
+                        </el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </el-row>
+              <el-row>
+                <div style="width: 280px; border: 1px">
+                  <el-divider content-position="center">添加Erp总成</el-divider>
+                  <el-form
+                    style="border: 1px"
+                    :label-position="labelPosition"
+                    label-width="100px"
+                    :model="assly"
+                    ref="assly"
+                    border
+                  >
+                    <el-form-item
+                      label="Erp总成编码"
+                      style="height: 40px; width: 280px"
+                    >
+                      <el-input
+                        v-model="assly.erpAssemblyCode"
+                        clearable
+                        placeholder="请输入Erp总成编码"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item
+                      label="Erp总成名称"
+                      style="height: 40px; width: 280px"
+                    >
+                      <el-input
+                        v-model="assly.erpAssemblyName"
+                        clearable
+                        placeholder="请输入Erp总成名称"
+                      ></el-input>
+                    </el-form-item>
+                    <el-form-item label="车型" style="height: 40px">
+                      <!-- <el-input v-model="assly.carModel" clearable></el-input> -->
+                      <el-select
+                        v-model="assly.carModel"
+                        clearable
+                        placeholder="请选择车型"
+                      >
+                        <el-option
+                          v-for="item in vehicleModelList"
+                          :key="item.id"
+                          :label="item.dicItemName"
+                          :value="item.dicItemCode"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                      <el-button type="primary" @click="submitAssyForm('assly')"
+                        >添加</el-button
+                      >
+                    </el-form-item>
+                  </el-form>
+                </div>
+              </el-row>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <div style="border: 1px; height: 570px; width: 270px">
+              <el-table
+                :data="tempdetails"
+                ref="leftTable"
+                height="550"
+                stripe
+                border
+                highlight-current-row
+                @row-click="rowClickLeft"
+                @select="selectLeft"
+                @select-all="selectLeftAll"
+              >
+                <el-table-column
+                  type="selection"
+                  width="40px"
+                ></el-table-column>
+                <el-table-column
+                  prop="partCode"
+                  label="结算件代码"
+                  width="150px"
+                  align="center"
+                ></el-table-column>
+                <el-table-column
+                  prop="partNum"
+                  label="数量"
+                  width="78px"
+                  align="center"
+                ></el-table-column>
+              </el-table>
+            </div>
+          </el-col>
+          <el-col :span="2">
+            <!-- 左右穿梭按钮 -->
+            <div align="center" style="height: 570px; width: 70px">
+              <el-row style="line-height: 300px">
+                <el-button
+                  @click="btnleftclick()"
+                  icon="el-icon-caret-left"
+                ></el-button>
+              </el-row>
+              <el-row>
+                <el-button
+                  @click="btnrightclick()"
+                  icon="el-icon-caret-right"
+                ></el-button>
+              </el-row>
+            </div>
+          </el-col>
+          <el-col :span="7">
+            <div style="border: 1px; height: 570px; width: 270px">
+              <el-table
+                :data="data2"
+                ref="rightTable"
+                height="550"
+                stripe
+                border
+                highlight-current-row
+                @row-click="rowClickRight"
+                @select="selectRight"
+                @select-all="selectRightAll"
+              >
+                <el-table-column
+                  type="selection"
+                  width="40px"
+                ></el-table-column>
+                <el-table-column
+                  prop="partCode"
+                  label="结算件代码"
+                  width="150px"
+                  align="center"
+                ></el-table-column>
+                <el-table-column
+                  prop="partNum"
+                  label="数量"
+                  width="78px"
+                  align="center"
+                ></el-table-column>
+              </el-table>
+            </div>
+          </el-col>
+          <!-- <el-table-transfer
                     leftTitle="结算件"
                     rightTitle="未知总成"
                     :columns='columns'
@@ -360,43 +463,56 @@
                         </div>
                     </template>
                 </el-table-transfer> -->
-                <!-- 可以使用插槽获取到列信息和行信息，从而进行数据的处理 -->
-              <!-- <el-col :span="17"></el-col> -->
-          </el-row>
-          
-          <div slot="footer" class="dialog-footer" align="right" style="width:950px">
-            <el-button :loading="formLoading" type="primary" @click="save">确认</el-button>
-          </div>
-        </div>
-        
-      </el-dialog>
+          <!-- 可以使用插槽获取到列信息和行信息，从而进行数据的处理 -->
+          <!-- <el-col :span="17"></el-col> -->
+        </el-row>
 
-      <!-- 移动数量窗体 -->
-      <el-dialog 
-        :visible.sync="dialogNumVisible"
-        :close-on-click-modal="false"
-        :title="numTitle"
-        append-to-body
-        width="570px"
-      >
-        <div>
-          <el-form :model="numFormData" ref="numFormData" label-width="100px" class="num-ruleForm">
-            <el-form-item
-              label="数量"
-              prop="num"
-              :rules="[
-                { required: true, message: '数量不能为空且至少为1'},
-              ]"
-            >
-              <el-input type="text" v-model="numFormData.num"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button :loading="formLoading" type="primary" @click="saveNum()">确认</el-button>
-          <el-button type="text" @click="dialogNumVisible = false">取消</el-button>
+        <div
+          slot="footer"
+          class="dialog-footer"
+          align="right"
+          style="width: 950px"
+        >
+          <el-button :loading="formLoading" type="primary" @click="save"
+            >确认</el-button
+          >
         </div>
-      </el-dialog>
+      </div>
+    </el-dialog>
+
+    <!-- 移动数量窗体 -->
+    <el-dialog
+      :visible.sync="dialogNumVisible"
+      :close-on-click-modal="false"
+      :title="numTitle"
+      append-to-body
+      width="570px"
+    >
+      <div>
+        <el-form
+          :model="numFormData"
+          ref="numFormData"
+          label-width="100px"
+          class="num-ruleForm"
+        >
+          <el-form-item
+            label="数量"
+            prop="num"
+            :rules="[{ required: true, message: '数量不能为空且至少为1' }]"
+          >
+            <el-input type="text" v-model="numFormData.num"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="formLoading" type="primary" @click="saveNum()"
+          >确认</el-button
+        >
+        <el-button type="text" @click="dialogNumVisible = false"
+          >取消</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -422,7 +538,7 @@ const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
 
 export default {
   name: "UnknownAssembly",
-  components: { Pagination, CRMTableHead, importExcel, Detail},
+  components: { Pagination, CRMTableHead, importExcel, Detail },
   directives: { permission },
   filters: {
     IsCustomerSignFilter(status) {
@@ -451,15 +567,15 @@ export default {
         ],
       },
       valueSelect: "",
-      OnlineTimeValue: [],//上线时间
+      OnlineTimeValue: [], //上线时间
       customerInfos: [],
       dialogOptions: [],
       versionValue: "",
-      asTemp:[],//总成编号点击缓存
-      rightRowTemp: [],//右侧移动点击缓存
-      leftRowTemp: [],//左侧移动点击缓存
-      selectioned:'',//单选中的值
-      carModels:[],//车型下拉框数据源
+      asTemp: [], //总成编号点击缓存
+      rightRowTemp: [], //右侧移动点击缓存
+      leftRowTemp: [], //左侧移动点击缓存
+      selectioned: "", //单选中的值
+      carModels: [], //车型下拉框数据源
       currentRow: "",
       versionList: [], //版本列表
       searchContent: "", // 输入内容
@@ -489,9 +605,9 @@ export default {
         ScanPoint: undefined,
       },
       listUnknownAssemblyQuery: {
-        billId:'',
+        billId: "",
         //apply:"",
-        vin:'',
+        vin: "",
       },
       page: 1,
       // 显示搜索条件
@@ -505,8 +621,8 @@ export default {
       numTitle: "",
       isEdit: false,
       formLoading: false,
-      buttonLoading:false,
-      button2Loading:false,
+      buttonLoading: false,
+      button2Loading: false,
       //dialogFormVisible: false,
       tableHeight: document.documentElement.clientHeight - 220,
       //columns: [
@@ -515,60 +631,63 @@ export default {
       //      ],
       // data1: [
       // ],
-      
-      numFormData:{
-        num: 1
+
+      numFormData: {
+        num: 1,
       },
-      zcCode:[],
+      zcCode: [],
       /*最终提交缓存*/
-      tempAssCfgList: [
-      ],
+      tempAssCfgList: [],
       /*右侧数据源*/
       data2: [],
       /*中间数据源*/
-      tempdetails:[
-            //{
-              // partCode: "1",
-              // partNum: 0,
-              // isKey: true
-            //}
+      tempdetails: [
+        //{
+        // partCode: "1",
+        // partNum: 0,
+        // isKey: true
+        //}
       ],
       /*左侧总成数据源*/
       erpAssemblyCfgList: [],
-        // {
-        //   erpAssemblyCode: "string",
-        //   erpAssemblyName: "string",
-        //   isCover: true,
-        //   carModel: "",
-        //   previousVersionId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-        //   details: [
-        //     {
-        //       partCode: "string",
-        //       partNum: 0,
-        //       description: "string",
-        //       isKey: true
-        //     }
-        //   ]
-        // }
-      labelPosition: 'left',
+      // {
+      //   erpAssemblyCode: "string",
+      //   erpAssemblyName: "string",
+      //   isCover: true,
+      //   carModel: "",
+      //   previousVersionId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+      //   details: [
+      //     {
+      //       partCode: "string",
+      //       partNum: 0,
+      //       description: "string",
+      //       isKey: true
+      //     }
+      //   ]
+      // }
+      labelPosition: "left",
       assly: {
-        erpAssemblyCode: '',
-        erpAssemblyName: '',
-        carModel: ''
+        erpAssemblyCode: "",
+        erpAssemblyName: "",
+        carModel: "",
       },
-      vehicleModelQuery:{
-        dicTypeName:"派格车型",
+      vehicleModelQuery: {
+        dicTypeName: "派格车型",
       },
-      vehicleModelList:[],//车型list
-      ScanPointList:[{id:"0",label:" "},{id:"R100",label:"R100"},{id:"M100",label:"M100"}]
-      };
+      vehicleModelList: [], //车型list
+      ScanPointList: [
+        { id: "0", label: " " },
+        { id: "R100", label: "R100" },
+        { id: "M100", label: "M100" },
+      ],
+    };
   },
   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.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
     });
   },
   created() {
@@ -645,37 +764,36 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-      })
-        .then(() => {
-          this.button2Loading = true;
-          this.$axios
-            .posts("/api/newjit/unknown-assembly/to-parse", params)
-            .then((response) => {
-              if (response.status == true) {
-                this.$notify({
-                  title: "成功",
-                  message: "操作成功！",
-                  type: "success",
-                  duration: 2000,
-                });
-                this.button2Loading = false;
-                this.getList();
-              } else {
-                this.button2Loading = false;
-                this.$message({
-                  type: "warning",
-                  message: response.message,
-                });
-              }
-            })
-            .catch(() => {
+      }).then(() => {
+        this.button2Loading = true;
+        this.$axios
+          .posts("/api/newjit/unknown-assembly/to-parse", params)
+          .then((response) => {
+            if (response.status == true) {
+              this.$notify({
+                title: "成功",
+                message: "操作成功！",
+                type: "success",
+                duration: 2000,
+              });
+              this.button2Loading = false;
+              this.getList();
+            } else {
               this.button2Loading = false;
               this.$message({
-                  type: "warning",
-                  message: response.message,
-                });
+                type: "warning",
+                message: response.message,
+              });
+            }
+          })
+          .catch(() => {
+            this.button2Loading = false;
+            this.$message({
+              type: "warning",
+              message: response.message,
             });
-        })
+          });
+      });
     },
     /** 重新计算总成 */
     handleUpdate(row) {
@@ -726,9 +844,9 @@ export default {
           .catch(() => {
             this.buttonLoading = false;
             this.$message({
-                type: "warning",
-                message: response.message,
-              });
+              type: "warning",
+              message: response.message,
+            });
           });
       }
     },
@@ -819,7 +937,7 @@ export default {
         this.rightRowTemp = [];
         this.assly = {};
         this.tempdetails = [];
-        this.erpAssemblyCfgList =[];
+        this.erpAssemblyCfgList = [];
         this.tempAssCfgList = [];
         this.asTemp = [];
         this.getUnknownAssemblyList();
@@ -851,16 +969,20 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
       if (this.OnlineTimeValue != []) {
-        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0]//this.OnlineTimeValue
-          // ? this.OnlineTimeValue[0] || ""
-          // : "";
-        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1]//this.OnlineTimeValue
-          // ? this.OnlineTimeValue[1] || ""
-          // : "";
+        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0]; //this.OnlineTimeValue
+        // ? this.OnlineTimeValue[0] || ""
+        // : "";
+        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1]; //this.OnlineTimeValue
+        // ? this.OnlineTimeValue[1] || ""
+        // : "";
       }
       this.$axios
         .gets("/api/newjit/unknown-assembly/list", this.listQuery)
@@ -913,11 +1035,11 @@ export default {
       this.$refs.multipleTable.toggleRowSelection(row);
     },
     /* 获取车型数据源 */
-    getCarModel(){
+    getCarModel() {
       this.$axios
-        .gets("/api/newjit/dic/list"+"?dicTypeName=车型")
+        .gets("/api/newjit/dic/list" + "?dicTypeName=车型")
         .then((response) => {
-          console.log("this is response.items",response.item);
+          console.log("this is response.items", response.item);
           this.carModels = response.item;
           setTimeout(() => {
             //大数据量加载时
@@ -927,119 +1049,116 @@ export default {
         .catch(() => {
           this.listLoading = false;
         });
-        //console.log("this is carModels",this.carModels);
+      //console.log("this is carModels",this.carModels);
     },
     /* 加号按钮添加事件 */
-    addzc()
-    {
+    addzc() {
       //todo 添加总成左侧的 加号按钮 待做
-      alert("1")
+      alert("1");
     },
     /* 减号按钮删除事件 */
-    delzc(index)
-    {
+    delzc(index) {
       this.erpAssemblyCfgList.splice(index, 1);
       console.log(this.erpAssemblyCfgList);
     },
     /* 添加总成最终提交的数据事件*/
     save() {
       //if(this.data2.length ===0){
-        if(this.data2.length !==0)
-        {
-          this.$message({
-              message: "还有结算价代码尚未匹配",
-              type: "error",
-            });
-          return;
-        }
-        this.formLoading = true;
+      if (this.data2.length !== 0) {
+        this.$message({
+          message: "还有结算价代码尚未匹配",
+          type: "error",
+        });
+        return;
+      }
+      this.formLoading = true;
 
-        var lastSubmit = {
-            billId:this.listUnknownAssemblyQuery.billId,
-            scanPoint: "M100",
-            erpAssemblyCfgList:[]
-        };
-        lastSubmit.erpAssemblyCfgList = this.tempAssCfgList;
+      var lastSubmit = {
+        billId: this.listUnknownAssemblyQuery.billId,
+        scanPoint: "M100",
+        erpAssemblyCfgList: [],
+      };
+      lastSubmit.erpAssemblyCfgList = this.tempAssCfgList;
 
-        //#region 
-        // var lastSubmitt = [];
-        // console.log("flag")
-        // this.tempAssCfgList.forEach(element => {
-        //   element.details.forEach(element1 => {
-        //     lastSubmitt.push({
-        //       erpAssemblyCode: element.erpAssemblyCode,
-        //       erpAssemblyName: element.erpAssemblyName,
-        //       isCover: false,
-        //       previousVersionId:"f7d45dba-3164-4a91-b477-3c568c81e6a0",
-        //       vehicleModel: element.vehicleModel,
-        //       details:{
-        //         partCode:element1.partCode,
-        //         partNum:element1.partNum,
-        //         description:element1.description,
-        //         isKey: true,
-        //       }
-        //     })
-        //   });
-        // });
-        // console.log("this is lastSubmitt:",lastSubmitt)
-        // var lastSubmit = [];
-        // lastSubmitt.forEach(element => {
-        //   lastSubmit.push({
-        //     billID:this.listUnknownAssemblyQuery.billId,
-        //     scanPoint: "M100",
-        //     erpAssemblyCfgList:[{
-        //       erpAssemblyCode: element.erpAssemblyCode,
-        //       erpAssemblyName: element.erpAssemblyName,
-        //       isCover: false,
-        //       previousVersionId: null,
-        //       vehicleModel: element.vehicleModel,
-        //       details:element.details
-        //     }]
-        //   })
-        // });
-        // console.log("this is lastSubmit:",lastSubmit)
-        //#endregion
+      //#region
+      // var lastSubmitt = [];
+      // console.log("flag")
+      // this.tempAssCfgList.forEach(element => {
+      //   element.details.forEach(element1 => {
+      //     lastSubmitt.push({
+      //       erpAssemblyCode: element.erpAssemblyCode,
+      //       erpAssemblyName: element.erpAssemblyName,
+      //       isCover: false,
+      //       previousVersionId:"f7d45dba-3164-4a91-b477-3c568c81e6a0",
+      //       vehicleModel: element.vehicleModel,
+      //       details:{
+      //         partCode:element1.partCode,
+      //         partNum:element1.partNum,
+      //         description:element1.description,
+      //         isKey: true,
+      //       }
+      //     })
+      //   });
+      // });
+      // console.log("this is lastSubmitt:",lastSubmitt)
+      // var lastSubmit = [];
+      // lastSubmitt.forEach(element => {
+      //   lastSubmit.push({
+      //     billID:this.listUnknownAssemblyQuery.billId,
+      //     scanPoint: "M100",
+      //     erpAssemblyCfgList:[{
+      //       erpAssemblyCode: element.erpAssemblyCode,
+      //       erpAssemblyName: element.erpAssemblyName,
+      //       isCover: false,
+      //       previousVersionId: null,
+      //       vehicleModel: element.vehicleModel,
+      //       details:element.details
+      //     }]
+      //   })
+      // });
+      // console.log("this is lastSubmit:",lastSubmit)
+      //#endregion
 
-        this.$axios
-          .posts(
-            "/api/newjit/unknown-assembly/add-assembly",
-            lastSubmit
-          )
-          .then((response) => {
-            if(response.status === true){
-              this.dialogFormVisible = false;
-              this.leftRowTemp = [];
-              this.rightRowTemp = [];
-              this.tempAssCfgList = [];
-              this.tempdetails = [];
-              this.erpAssemblyCfgList =[];
-              this.asTemp = [];
-              
-              this.$notify({
-                    title: "成功",
-                    message: "添加总成成功！",
-                    type: "success",
-                    duration: 2000,
-                  });
-            }
-          })
-          .catch(() => {
-            //this.listLoading = false;
-          });
+      this.$axios
+        .posts("/api/newjit/unknown-assembly/add-assembly", lastSubmit)
+        .then((response) => {
+          if (response.status === true) {
+            this.dialogFormVisible = false;
+            this.leftRowTemp = [];
+            this.rightRowTemp = [];
+            this.tempAssCfgList = [];
+            this.tempdetails = [];
+            this.erpAssemblyCfgList = [];
+            this.asTemp = [];
+
+            this.$notify({
+              title: "成功",
+              message: "添加总成成功！",
+              type: "success",
+              duration: 2000,
+            });
+          }
+        })
+        .catch(() => {
+          //this.listLoading = false;
+        });
       // }
       // else{
       //   alert("未知零件未分配完，请确认！")
       // }
     },
     /* 获取未知总成零件数据源 */
-    getUnknownAssemblyList(){
-      this.listUnknownAssemblyQuery.billId=this.multipleSelection[0].id;
+    getUnknownAssemblyList() {
+      this.listUnknownAssemblyQuery.billId = this.multipleSelection[0].id;
       //console.log(this.listUnknownAssemblyQuery);
       this.$axios
-          .gets(
-            "/api/newjit/unknown-assembly/"+this.listUnknownAssemblyQuery.billId
-          ).then((response) => {
-          this.data2 = response.item.unknownAssemblyParts.filter(u => u.partType === "1" || u.partType === null);
+        .gets(
+          "/api/newjit/unknown-assembly/" + this.listUnknownAssemblyQuery.billId
+        )
+        .then((response) => {
+          this.data2 = response.item.unknownAssemblyParts.filter(
+            (u) => u.partType === "1" || u.partType === null
+          );
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
@@ -1047,22 +1166,24 @@ export default {
         })
         .catch(() => {
           this.listLoading = false;
-        })
+        });
     },
     /* 获取总成零件数据源*/
-    getZcCode(){
+    getZcCode() {
       this.zcCode = [];
-      this.listUnknownAssemblyQuery.vin=this.multipleSelection[0].vin;
+      this.listUnknownAssemblyQuery.vin = this.multipleSelection[0].vin;
       //console.log(this.listUnknownAssemblyQuery.vin);
       this.$axios
         .gets(
-          "/api/newjit/unknown-assembly/get-erp-assembly-code"+"?vin="+this.listUnknownAssemblyQuery.vin
-        ).then((response) => {
+          "/api/newjit/unknown-assembly/get-erp-assembly-code" +
+            "?vin=" +
+            this.listUnknownAssemblyQuery.vin
+        )
+        .then((response) => {
           console.log(response.item);
-          if(response.item.length !== 0){
+          if (response.item.length !== 0) {
             console.log("has no ASSCode");
-          }
-          else{
+          } else {
             response.item.forEach((zccode) => {
               this.erpAssemblyCfgList.push({
                 erpAssemblyCode: zccode,
@@ -1075,443 +1196,514 @@ export default {
                     partCode: "",
                     partNum: 0,
                     description: "",
-                    isKey: false
-                  }
-                ]
-              })
+                    isKey: false,
+                  },
+                ],
+              });
             });
           }
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
           }, 500);
-        })
+        });
     },
     /* 添加总成提交方法 */
     submitAssyForm(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            if(this.assly.erpAssemblyCode !== ""){
-              this.erpAssemblyCfgList.push({
-                erpAssemblyCode: this.assly.erpAssemblyCode,
-                erpAssemblyName: this.assly.erpAssemblyName,
-                carModel: this.assly.carModel,
-                isCover: false,
-                previousVersionId: null,
-                details: []
-              })
-              console.log(this.erpAssemblyCfgList);
-              this.assly.erpAssemblyCode = '';
-              this.assly.erpAssemblyName = '';
-              this.assly.carModel = '';
-            }
-            else{
-              alert("请先填写Erp总成信息！")
-            }
-          } 
-          else {
-            console.log('error submit!!');
-            return false;
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.assly.erpAssemblyCode !== "") {
+            this.erpAssemblyCfgList.push({
+              erpAssemblyCode: this.assly.erpAssemblyCode,
+              erpAssemblyName: this.assly.erpAssemblyName,
+              carModel: this.assly.carModel,
+              isCover: false,
+              previousVersionId: null,
+              details: [],
+            });
+            console.log(this.erpAssemblyCfgList);
+            this.assly.erpAssemblyCode = "";
+            this.assly.erpAssemblyName = "";
+            this.assly.carModel = "";
+          } else {
+            alert("请先填写Erp总成信息！");
           }
-        });
-      },
-    btnleftclick(){
-      if(this.asTemp.length === 0){
-        alert("请先选择总成编号！")
-      }
-      else{
-        if(this.rightRowTemp.length === 0){
-          alert("请先选择需移动的零件")
+        } else {
+          console.log("error submit!!");
+          return false;
         }
-        else if(this.rightRowTemp.length === 1 && parseInt(this.rightRowTemp[0].partNum) !== 1){
+      });
+    },
+    btnleftclick() {
+      if (this.asTemp.length === 0) {
+        alert("请先选择总成编号！");
+      } else {
+        if (this.rightRowTemp.length === 0) {
+          alert("请先选择需移动的零件");
+        } else if (
+          this.rightRowTemp.length === 1 &&
+          parseInt(this.rightRowTemp[0].partNum) !== 1
+        ) {
           this.numFormData.num = parseInt(this.rightRowTemp[0].partNum);
           this.dialogNumVisible = true;
-          this.numTitle = "输入移动结算件数量"
-        }
-        else{
+          this.numTitle = "输入移动结算件数量";
+        } else {
           console.log("R->F");
-            this.rightRowTemp.forEach(item => {
-              this.numFormData.num = item.partNum;
+          this.rightRowTemp.forEach((item) => {
+            this.numFormData.num = item.partNum;
             //if(this.numFormData.num <= item.partNum && this.numFormData.num > 0){
 
-              //数据插入最终缓存
-              if(this.tempAssCfgList.length !== 0){
-                console.log("second")
-                var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-                if(rfMove.length !== 0){
-                  var sameDetail = rfMove[0].details.filter(u=>u.partCode === item.partCode);
-                  if(sameDetail.length !== 0){
-                    sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
-                  }
-                  else{
-                    rfMove[0].details.push({
-                      description: item.description,
-                      isKey: false,
-                      partCode: item.partCode,
-                      partNum: this.numFormData.num,//移动框输入的数量
-                    })
-                  }
-                }
-                else{
-                  console.log("加进去了")
-                  this.tempAssCfgList.push({
-                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                  isCover: false,
-                  previousVersionId: this.asTemp[0].previousVersionId,
-                  vehicleModel: this.asTemp[0].carModel,
-                  details:[{
+            //数据插入最终缓存
+            if (this.tempAssCfgList.length !== 0) {
+              console.log("second");
+              var rfMove = this.tempAssCfgList.filter(
+                (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
+              );
+              if (rfMove.length !== 0) {
+                var sameDetail = rfMove[0].details.filter(
+                  (u) => u.partCode === item.partCode
+                );
+                if (sameDetail.length !== 0) {
+                  sameDetail[0].partNum =
+                    parseInt(sameDetail[0].partNum) +
+                    parseInt(this.numFormData.num);
+                } else {
+                  rfMove[0].details.push({
                     description: item.description,
                     isKey: false,
                     partCode: item.partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  }]
-                })
+                    partNum: this.numFormData.num, //移动框输入的数量
+                  });
                 }
-              }
-              else{
-                console.log("first")
+              } else {
+                console.log("加进去了");
                 this.tempAssCfgList.push({
                   erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
                   erpAssemblyName: this.asTemp[0].erpAssemblyName,
                   isCover: false,
                   previousVersionId: this.asTemp[0].previousVersionId,
-                  details:[{
+                  vehicleModel: this.asTemp[0].carModel,
+                  details: [
+                    {
+                      description: item.description,
+                      isKey: false,
+                      partCode: item.partCode,
+                      partNum: this.numFormData.num, //移动框输入的数量
+                    },
+                  ],
+                });
+              }
+            } else {
+              console.log("first");
+              this.tempAssCfgList.push({
+                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
+                erpAssemblyName: this.asTemp[0].erpAssemblyName,
+                isCover: false,
+                previousVersionId: this.asTemp[0].previousVersionId,
+                details: [
+                  {
                     description: item.description,
                     isKey: false,
                     partCode: item.partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  }]
-                })
-              }
+                    partNum: this.numFormData.num, //移动框输入的数量
+                  },
+                ],
+              });
+            }
 
-              console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-              //数据插入中间数据源
-              var judge = this.tempdetails.filter(u=>u.partCode === item.partCode);
-              if(judge.length === 1){
-                var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-                this.tempdetails.filter(u=>u.partCode === item.partCode)[0].partNum = t;
-              }
-              else{
-                this.tempdetails.push({
-                  description: item.description,
-                  isKey: false,
-                  partCode: item.partCode,
-                  partNum: parseInt(this.numFormData.num),//移动框输入的数量
-                })
-              }
-              /* 右侧数据移动 */
-              var delid = this.data2.filter(u=>u.partCode === item.partCode)[0]
-              var n1 = parseInt(this.numFormData.num);
-              var n2 = parseInt(delid.partNum);
-              if(n1 === n2){
-                this.data2 = this.data2.filter(u=>u.partCode !== item.partCode);
-                this.rightRowTemp = [];
-              }
-              else{
-                this.data2.filter(u=>u.partCode === item.partCode)[0].partNum =  delid.partNum - this.numFormData.num;
-                item.partNum = n2 - n1;
-              }
-            });
-            
-            //}
+            console.log("this is tempAssCfgList 最终数据", this.tempAssCfgList);
+            //数据插入中间数据源
+            var judge = this.tempdetails.filter(
+              (u) => u.partCode === item.partCode
+            );
+            if (judge.length === 1) {
+              var t =
+                parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
+              this.tempdetails.filter(
+                (u) => u.partCode === item.partCode
+              )[0].partNum = t;
+            } else {
+              this.tempdetails.push({
+                description: item.description,
+                isKey: false,
+                partCode: item.partCode,
+                partNum: parseInt(this.numFormData.num), //移动框输入的数量
+              });
+            }
+            /* 右侧数据移动 */
+            var delid = this.data2.filter(
+              (u) => u.partCode === item.partCode
+            )[0];
+            var n1 = parseInt(this.numFormData.num);
+            var n2 = parseInt(delid.partNum);
+            if (n1 === n2) {
+              this.data2 = this.data2.filter(
+                (u) => u.partCode !== item.partCode
+              );
+              this.rightRowTemp = [];
+            } else {
+              this.data2.filter(
+                (u) => u.partCode === item.partCode
+              )[0].partNum = delid.partNum - this.numFormData.num;
+              item.partNum = n2 - n1;
+            }
+          });
+
+          //}
         }
       }
     },
-    btnrightclick(){
-      if(this.asTemp.length === 0){
-        alert("请先选择总成编号！")
-      }
-      else{
-        if(this.leftRowTemp.length === 0){
-        alert("请先选择需移动的零件")
-        }
-        else if(this.leftRowTemp.length === 1 && parseInt(this.leftRowTemp[0].partNum) !== 1){
+    btnrightclick() {
+      if (this.asTemp.length === 0) {
+        alert("请先选择总成编号！");
+      } else {
+        if (this.leftRowTemp.length === 0) {
+          alert("请先选择需移动的零件");
+        } else if (
+          this.leftRowTemp.length === 1 &&
+          parseInt(this.leftRowTemp[0].partNum) !== 1
+        ) {
           this.numFormData.num = parseInt(this.leftRowTempnpm[0].partNum);
           this.dialogNumVisible = true;
-          this.numTitle = "输入移动结算件数量"
-        }
-        else{
+          this.numTitle = "输入移动结算件数量";
+        } else {
           console.log("F->R");
-          this.leftRowTemp.forEach(item => {
+          this.leftRowTemp.forEach((item) => {
             this.numFormData.num = item.partNum;
             //if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
-              
-              //数据插入最终缓存
-              console.log("移除或删除")
-              var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-              var samedetail = frMove[0].details.filter(u=>u.partCode === item.partCode);
-              if(samedetail.length !== 0){
-                if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
-                  frMove[0].details = frMove[0].details.filter(u=>u.partCode !== item.partCode);
-                }
-                else{
-                  samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
-                }
-              }
-              else if(samedetail.length !== 0){
-                alert("没有数据!");
-              }
 
-              console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-              
-              //数据插入右侧数据源
-              var judge = this.data2.filter(u=>u.partCode === item.partCode);
-              if(judge.length === 1){
-                var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-                this.data2.filter(u=>u.partCode === item.partCode)[0].partNum = t;
-              }
-              else{
-                  this.data2.push({
-                    description: item.description,
-                    isKey: false,
-                    partCode: item.partCode,
-                    partNum: parseInt(this.numFormData.num),//移动框输入的数量
-                })
-              }
-              /* 中间数据移动 */
-              var delid = this.tempdetails.filter(u=>u.partCode === item.partCode)[0];
-              console.log(this.tempdetails);
-              var n1 = parseInt(this.numFormData.num);
-              var n2 = parseInt(delid.partNum);
-              if(n1 === n2){
-                this.tempdetails = this.tempdetails.filter(u=>u.partCode !== item.partCode);
-                this.leftRowTemp = [];
-              }
-              else{
-                this.tempdetails.filter(u=>u.partCode === item.partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
-                item.partNum = n2 - n1;
+            //数据插入最终缓存
+            console.log("移除或删除");
+            var frMove = this.tempAssCfgList.filter(
+              (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
+            );
+            var samedetail = frMove[0].details.filter(
+              (u) => u.partCode === item.partCode
+            );
+            if (samedetail.length !== 0) {
+              if (
+                parseInt(samedetail[0].partNum) ===
+                parseInt(this.numFormData.num)
+              ) {
+                frMove[0].details = frMove[0].details.filter(
+                  (u) => u.partCode !== item.partCode
+                );
+              } else {
+                samedetail[0].partNum =
+                  parseInt(samedetail[0].partNum) -
+                  parseInt(this.numFormData.num);
               }
+            } else if (samedetail.length !== 0) {
+              alert("没有数据!");
+            }
+
+            console.log("this is tempAssCfgList 最终数据", this.tempAssCfgList);
+
+            //数据插入右侧数据源
+            var judge = this.data2.filter((u) => u.partCode === item.partCode);
+            if (judge.length === 1) {
+              var t =
+                parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
+              this.data2.filter(
+                (u) => u.partCode === item.partCode
+              )[0].partNum = t;
+            } else {
+              this.data2.push({
+                description: item.description,
+                isKey: false,
+                partCode: item.partCode,
+                partNum: parseInt(this.numFormData.num), //移动框输入的数量
+              });
+            }
+            /* 中间数据移动 */
+            var delid = this.tempdetails.filter(
+              (u) => u.partCode === item.partCode
+            )[0];
+            console.log(this.tempdetails);
+            var n1 = parseInt(this.numFormData.num);
+            var n2 = parseInt(delid.partNum);
+            if (n1 === n2) {
+              this.tempdetails = this.tempdetails.filter(
+                (u) => u.partCode !== item.partCode
+              );
+              this.leftRowTemp = [];
+            } else {
+              this.tempdetails.filter(
+                (u) => u.partCode === item.partCode
+              )[0].partNum =
+                parseInt(delid.partNum) - parseInt(this.numFormData.num);
+              item.partNum = n2 - n1;
+            }
             //}
           });
-            
         }
       }
     },
     /* 保存数量事件 */
-    saveNum(){
-      if(this.asTemp.length !== 0){
+    saveNum() {
+      if (this.asTemp.length !== 0) {
         //判断中间选中移动还是右侧选中移动
         /*   左侧移动到右侧   */
-        if(this.leftRowTemp.length !== 0){
+        if (this.leftRowTemp.length !== 0) {
           console.log("F->R");
-          if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
-            
+          if (
+            this.numFormData.num <= this.leftRowTemp[0].partNum &&
+            this.numFormData.num > 0
+          ) {
             //数据插入最终缓存
-            console.log("移除或删除")
-            var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-            var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-            if(samedetail.length !== 0){
-              if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
-                frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
-              }
-              else{
-                samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
+            console.log("移除或删除");
+            var frMove = this.tempAssCfgList.filter(
+              (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
+            );
+            var samedetail = frMove[0].details.filter(
+              (u) => u.partCode === this.leftRowTemp[0].partCode
+            );
+            if (samedetail.length !== 0) {
+              if (
+                parseInt(samedetail[0].partNum) ===
+                parseInt(this.numFormData.num)
+              ) {
+                frMove[0].details = frMove[0].details.filter(
+                  (u) => u.partCode !== this.leftRowTemp[0].partCode
+                );
+              } else {
+                samedetail[0].partNum =
+                  parseInt(samedetail[0].partNum) -
+                  parseInt(this.numFormData.num);
               }
-            }
-            else if(samedetail.length !== 0){
+            } else if (samedetail.length !== 0) {
               alert("没有数据!");
             }
 
-            console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
-            
+            console.log("this is tempAssCfgList 最终数据", this.tempAssCfgList);
+
             //数据插入右侧数据源
-            var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
-            if(judge.length === 1){
-              var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
-            }
-            else{
-                this.data2.push({
-                  description: this.leftRowTemp[0].description,
-                  isKey: false,
-                  partCode: this.leftRowTemp[0].partCode,
-                  partNum: parseInt(this.numFormData.num),//移动框输入的数量
-              })
+            var judge = this.data2.filter(
+              (u) => u.partCode === this.leftRowTemp[0].partCode
+            );
+            if (judge.length === 1) {
+              var t =
+                parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
+              this.data2.filter(
+                (u) => u.partCode === this.leftRowTemp[0].partCode
+              )[0].partNum = t;
+            } else {
+              this.data2.push({
+                description: this.leftRowTemp[0].description,
+                isKey: false,
+                partCode: this.leftRowTemp[0].partCode,
+                partNum: parseInt(this.numFormData.num), //移动框输入的数量
+              });
             }
             /* 中间数据移动 */
-            var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
+            var delid = this.tempdetails.filter(
+              (u) => u.partCode === this.leftRowTemp[0].partCode
+            )[0];
             var n1 = parseInt(this.numFormData.num);
             var n2 = parseInt(delid.partNum);
-            if(n1 === n2){
-              this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
+            if (n1 === n2) {
+              this.tempdetails = this.tempdetails.filter(
+                (u) => u.partCode !== this.leftRowTemp[0].partCode
+              );
               this.leftRowTemp = [];
-            }
-            else{
-              this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
+            } else {
+              this.tempdetails.filter(
+                (u) => u.partCode === this.leftRowTemp[0].partCode
+              )[0].partNum =
+                parseInt(delid.partNum) - parseInt(this.numFormData.num);
               this.leftRowTemp[0].partNum = n2 - n1;
             }
-          }
-          else if(this.numFormData.num == 0){
+          } else if (this.numFormData.num == 0) {
             alert("输入数字不能为0！");
-          }
-          else{
+          } else {
             alert("输入不正确,请确认！");
           }
-        }
+        } else if (this.rightRowTemp.length !== 0) {
         /*   右侧移动到左侧   */
-        else if(this.rightRowTemp.length !== 0){
           console.log("R->F");
-          if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
-
+          if (
+            this.numFormData.num <= this.rightRowTemp[0].partNum &&
+            this.numFormData.num > 0
+          ) {
             //数据插入最终缓存
-            if(this.tempAssCfgList.length !== 0){
-              console.log("second")
-              var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-              if(rfMove.length !== 0){
-                var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-                if(sameDetail.length !== 0){
-                  sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
-                }
-                else{
+            if (this.tempAssCfgList.length !== 0) {
+              console.log("second");
+              var rfMove = this.tempAssCfgList.filter(
+                (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
+              );
+              if (rfMove.length !== 0) {
+                var sameDetail = rfMove[0].details.filter(
+                  (u) => u.partCode === this.rightRowTemp[0].partCode
+                );
+                if (sameDetail.length !== 0) {
+                  sameDetail[0].partNum =
+                    parseInt(sameDetail[0].partNum) +
+                    parseInt(this.numFormData.num);
+                } else {
                   rfMove[0].details.push({
                     description: this.rightRowTemp[0].description,
                     isKey: false,
                     partCode: this.rightRowTemp[0].partCode,
-                    partNum: this.numFormData.num,//移动框输入的数量
-                  })
+                    partNum: this.numFormData.num, //移动框输入的数量
+                  });
                 }
-              }
-              else{
-                console.log("加进去了")
+              } else {
+                console.log("加进去了");
                 this.tempAssCfgList.push({
-                erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
-                erpAssemblyName: this.asTemp[0].erpAssemblyName,
-                vehicleModel: this.asTemp[0].carModel,
-                isCover: false,
-                previousVersionId: this.asTemp[0].previousVersionId,
-                details:[{
-                  description: this.rightRowTemp[0].description,
-                  isKey: false,
-                  partCode: this.rightRowTemp[0].partCode,
-                  partNum: this.numFormData.num,//移动框输入的数量
-                }]
-              })
+                  erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
+                  erpAssemblyName: this.asTemp[0].erpAssemblyName,
+                  vehicleModel: this.asTemp[0].carModel,
+                  isCover: false,
+                  previousVersionId: this.asTemp[0].previousVersionId,
+                  details: [
+                    {
+                      description: this.rightRowTemp[0].description,
+                      isKey: false,
+                      partCode: this.rightRowTemp[0].partCode,
+                      partNum: this.numFormData.num, //移动框输入的数量
+                    },
+                  ],
+                });
               }
-            }
-            else{
-              console.log("first")
+            } else {
+              console.log("first");
               this.tempAssCfgList.push({
                 erpAssemblyCode: this.asTemp[0].erpAssemblyCode,
                 erpAssemblyName: this.asTemp[0].erpAssemblyName,
                 isCover: false,
                 previousVersionId: this.asTemp[0].previousVersionId,
                 vehicleModel: this.asTemp[0].carModel,
-                details:[{
-                  description: this.rightRowTemp[0].description,
-                  isKey: false,
-                  partCode: this.rightRowTemp[0].partCode,
-                  partNum: this.numFormData.num,//移动框输入的数量
-                }]
-              })
+                details: [
+                  {
+                    description: this.rightRowTemp[0].description,
+                    isKey: false,
+                    partCode: this.rightRowTemp[0].partCode,
+                    partNum: this.numFormData.num, //移动框输入的数量
+                  },
+                ],
+              });
             }
 
-            console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
+            console.log("this is tempAssCfgList 最终数据", this.tempAssCfgList);
             //数据插入中间数据源
-            var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
-            if(judge.length === 1){
-              var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-              this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
-            }
-            else{
+            var judge = this.tempdetails.filter(
+              (u) => u.partCode === this.rightRowTemp[0].partCode
+            );
+            if (judge.length === 1) {
+              var t =
+                parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
+              this.tempdetails.filter(
+                (u) => u.partCode === this.rightRowTemp[0].partCode
+              )[0].partNum = t;
+            } else {
               this.tempdetails.push({
                 description: this.rightRowTemp[0].description,
                 isKey: false,
                 partCode: this.rightRowTemp[0].partCode,
-                partNum: parseInt(this.numFormData.num),//移动框输入的数量
-              })
+                partNum: parseInt(this.numFormData.num), //移动框输入的数量
+              });
             }
             /* 右侧数据移动 */
-            var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
+            var delid = this.data2.filter(
+              (u) => u.id === this.rightRowTemp[0].id
+            )[0];
             var n1 = parseInt(this.numFormData.num);
             var n2 = parseInt(delid.partNum);
-            if(n1 === n2){
-              this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
+            if (n1 === n2) {
+              this.data2 = this.data2.filter(
+                (u) => u.id !== this.rightRowTemp[0].id
+              );
               this.rightRowTemp = [];
-            }
-            else{
-              this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum =  delid.partNum - this.numFormData.num;
+            } else {
+              this.data2.filter(
+                (u) => u.id === this.rightRowTemp[0].id
+              )[0].partNum = delid.partNum - this.numFormData.num;
               this.rightRowTemp[0].partNum = n2 - n1;
             }
-          }
-          else if(this.numFormData.num == 0){
+          } else if (this.numFormData.num == 0) {
             alert("输入数字不能为0！");
-          }
-          else{
+          } else {
             alert("输入不正确,请确认！");
           }
         }
         this.dialogNumVisible = false;
-      }
-      else{
-        alert("请先选择总成编号！")
+      } else {
+        alert("请先选择总成编号！");
       }
       this.dialogNumVisible = false;
     },
     /* 总成编号选中事件 */
     rowClickass(row) {
-      this.asTemp=[];
-      this.tempdetails=[];
+      this.asTemp = [];
+      this.tempdetails = [];
       this.$refs.asTable.clearSelection();
       this.$refs.asTable.toggleRowSelection(row);
       this.asTemp.push(row);
-      
-      if(this.asTemp[0].details.length !== 0){
+
+      if (this.asTemp[0].details.length !== 0) {
         //选中插入中间数据源
         this.tempdetails.push({
           isKey: false,
           partCode: this.asTemp[0].details[0].partCode,
           partNum: this.asTemp[0].details[0].partNum,
-          vehicleModel:this.asTemp[0].details[0].carModel,
-        })
+          vehicleModel: this.asTemp[0].details[0].carModel,
+        });
       }
       //二次选中插入最终提交中的details
-      var judgeSec = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode)
-      console.log("this is judgeSec:",judgeSec);
-      if(judgeSec.length !== 0){
-        console.log("this is judgeSec[0].details:",judgeSec[0].details);
-        judgeSec[0].details.forEach(element => {
-            this.tempdetails.push(element)
+      var judgeSec = this.tempAssCfgList.filter(
+        (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
+      );
+      console.log("this is judgeSec:", judgeSec);
+      if (judgeSec.length !== 0) {
+        console.log("this is judgeSec[0].details:", judgeSec[0].details);
+        judgeSec[0].details.forEach((element) => {
+          this.tempdetails.push(element);
         });
       }
-      console.log("this is this.tempdetails",this.tempdetails);
-      console.log("this is asTemp",this.asTemp);
+      console.log("this is this.tempdetails", this.tempdetails);
+      console.log("this is asTemp", this.asTemp);
     },
     /* 总成编号复选框单选事件 */
     selectAss(selection, row) {
-      this.asTemp=[]; //清空已选
+      this.asTemp = []; //清空已选
       this.tempdetails = [];
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
+      console.log(
+        "当用户手动勾选数据行的 Checkbox 时触发的事件",
+        selection,
+        row
+      );
       // 选择项大于1时
       if (selection.length > 1) {
-      let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.asTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+        let del_row = selection.shift();
+        // console.log('把数组的第一个元素从其中删除后', selection);
+        this.$refs.asTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
       }
-      this.asTemp.push(selection[0])
-      console.log('当用户手动勾选数据行', this.asTemp)
+      this.asTemp.push(selection[0]);
+      console.log("当用户手动勾选数据行", this.asTemp);
 
-      if(this.asTemp[0].details.length !== 0){
+      if (this.asTemp[0].details.length !== 0) {
         //选中插入中间数据源
         this.tempdetails.push({
           isKey: false,
           partCode: this.asTemp[0].details[0].partCode,
           partNum: this.asTemp[0].details[0].partNum,
-          vehicleModel:this.asTemp[0].details[0].carModel,
-        })
+          vehicleModel: this.asTemp[0].details[0].carModel,
+        });
       }
 
       //二次选中插入最终提交中的details
-      var judgeSec = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode)
-      console.log("this is judgeSec:",judgeSec);
-      if(judgeSec.length !== 0){
-        console.log("this is judgeSec[0].details:",judgeSec[0].details);
-        judgeSec[0].details.forEach(element => {
-            this.tempdetails.push(element)
+      var judgeSec = this.tempAssCfgList.filter(
+        (u) => u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode
+      );
+      console.log("this is judgeSec:", judgeSec);
+      if (judgeSec.length !== 0) {
+        console.log("this is judgeSec[0].details:", judgeSec[0].details);
+        judgeSec[0].details.forEach((element) => {
+          this.tempdetails.push(element);
         });
       }
-      console.log("this is this.tempdetails",this.tempdetails);
-      console.log("this is asTemp",this.asTemp);
+      console.log("this is this.tempdetails", this.tempdetails);
+      console.log("this is asTemp", this.asTemp);
     },
     /* 右侧数据选中事件 */
     rowClickRight(row) {
@@ -1529,70 +1721,73 @@ export default {
     },
     /* 右侧复选框单选事件 */
     selectRight(selection, row) {
-      this.rightRowTemp=[]; //清空已选
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
+      this.rightRowTemp = []; //清空已选
+      console.log(
+        "当用户手动勾选数据行的 Checkbox 时触发的事件",
+        selection,
+        row
+      );
       // 选择项大于1时
       // if (selection.length > 1) {
       // let del_row = selection.shift();
       // // console.log('把数组的第一个元素从其中删除后', selection);
       // this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
       // }
-      selection.forEach(item => {
+      selection.forEach((item) => {
         this.rightRowTemp.push(item);
       });
-      console.log('当用户手动勾选数据行', this.rightRowTemp)
+      console.log("当用户手动勾选数据行", this.rightRowTemp);
     },
     /* 右侧复选框全选事件 */
     selectRightAll(selection) {
-      this.rightRowTemp=[]; //清空已选
-      console.log('当用户手动勾选全选 Checkbox 时触发的事件', selection)
-      selection.forEach(item => {
+      this.rightRowTemp = []; //清空已选
+      console.log("当用户手动勾选全选 Checkbox 时触发的事件", selection);
+      selection.forEach((item) => {
         this.rightRowTemp.push(item);
       });
-      console.log('当用户手动勾选全选', this.rightRowTemp)
+      console.log("当用户手动勾选全选", this.rightRowTemp);
     },
     /* 左侧复选框单选事件 */
     selectLeft(selection, row) {
-      this.leftRowTemp=[]; //清空已选
-      console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
+      this.leftRowTemp = []; //清空已选
+      console.log(
+        "当用户手动勾选数据行的 Checkbox 时触发的事件",
+        selection,
+        row
+      );
       // // 选择项大于1时
       // if (selection.length > 1) {
       // let del_row = selection.shift();
       // // console.log('把数组的第一个元素从其中删除后', selection);
       // this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
       // }
-      selection.forEach(item => {
+      selection.forEach((item) => {
         this.leftRowTemp.push(item);
       });
-      console.log('当用户手动勾选数据行', this.leftRowTemp)
+      console.log("当用户手动勾选数据行", this.leftRowTemp);
     },
     /* 左侧复选框全选事件 */
     selectLeftAll(selection) {
-      this.leftRowTemp=[]; //清空已选
-      console.log('当用户手动勾选全选 Checkbox 时触发的事件', selection)
-      selection.forEach(item => {
+      this.leftRowTemp = []; //清空已选
+      console.log("当用户手动勾选全选 Checkbox 时触发的事件", selection);
+      selection.forEach((item) => {
         this.leftRowTemp.push(item);
       });
-      console.log('当用户手动勾选全选', this.leftRowTemp)
+      console.log("当用户手动勾选全选", this.leftRowTemp);
     },
-    getvehicleModel()
-    {
+    getvehicleModel() {
       this.$axios
-          .gets(
-            "/api/newjit/dic/list",this.vehicleModelQuery
-          )
-          .then((response) => {
-            //console.log(response);
-            this.vehicleModelList = response.item;
-            //console.log()
-          })
-          .catch(() => {
-          });
+        .gets("/api/newjit/dic/list", this.vehicleModelQuery)
+        .then((response) => {
+          //console.log(response);
+          this.vehicleModelList = response.item;
+          //console.log()
+        })
+        .catch(() => {});
     },
-    valueselectChange(){},
+    valueselectChange() {},
   },
 };
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
index b63d4594..82d2b9e6 100644
--- a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
@@ -2,215 +2,221 @@
 <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
+      <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>
+                :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="Version">
-          <el-input
-            v-model="listQuery.Version"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- </el-row> -->
-        <el-form-item label="流水号:" prop="serialNumBegin">
-          <el-input
-            v-model="listQuery.serialNumBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="serialNumEnd">
-          <el-input
-            v-model="listQuery.serialNumEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- <el-row> -->
-        <el-form-item label="大众顺序号:" prop="HostSNBegin">
-          <el-input
-            v-model="listQuery.HostSNBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="HostSNEnd">
-          <el-input
-            v-model="listQuery.HostSNEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+          <el-form-item label="版本:" prop="Version">
+            <el-input
+              v-model="listQuery.Version"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- </el-row> -->
+          <el-form-item label="流水号:" prop="serialNumBegin">
+            <el-input
+              v-model="listQuery.serialNumBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="serialNumEnd">
+            <el-input
+              v-model="listQuery.serialNumEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- <el-row> -->
+          <el-form-item label="大众顺序号:" prop="HostSNBegin">
+            <el-input
+              v-model="listQuery.HostSNBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="HostSNEnd">
+            <el-input
+              v-model="listQuery.HostSNEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
-        <el-form-item label="KNR:" prop="KNRBegin">
-          <el-input
-            v-model="listQuery.KNRBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="KNREnd">
-          <el-input
-            v-model="listQuery.KNREnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="底盘号:" prop="VINBegin">
-          <el-input
-            v-model="listQuery.VINBegin"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="-" prop="VINEnd ">
-          <el-input
-            v-model="listQuery.VINEnd"
-            placeholder=""
-            clearable
-            size="small"
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
+          <el-form-item label="KNR:" prop="KNRBegin">
+            <el-input
+              v-model="listQuery.KNRBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="KNREnd">
+            <el-input
+              v-model="listQuery.KNREnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <el-form-item label="底盘号:" prop="VINBegin">
+            <el-input
+              v-model="listQuery.VINBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="VINEnd ">
+            <el-input
+              v-model="listQuery.VINEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
-        <el-form-item label="上线日期">
-          <el-date-picker
-            v-model="listQuery.OnlineTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-      <!-- </el-row> -->
-      <!-- <el-row> -->
-        <el-form-item label="接收日期">
-          <el-date-picker
-            v-model="listQuery.ReceiveTimeValue"
-            size="small"
-            style="width: 380px"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="对比状态" prop="State">
-          <el-checkbox-group  v-model="listQuery.cstate" >
-            <el-checkbox v-for="item in compareState" :key="item.id" :label="item.id">
-              {{ item.name }}
-            </el-checkbox>
-          </el-checkbox-group>
-        </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"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <el-form-item label="接收日期">
+            <el-date-picker
+              v-model="listQuery.ReceiveTimeValue"
+              size="small"
+              style="width: 380px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="对比状态" prop="State">
+            <el-checkbox-group v-model="listQuery.cstate">
+              <el-checkbox
+                v-for="item in compareState"
+                :key="item.id"
+                :label="item.id"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
 
-        <el-form-item style="margin: 0px">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleFilter"
-            >搜索</el-button
-          >
-          <el-button
-            icon="el-icon-refresh"
-            size="mini"
-            @click="resetQuery('queryForm')"
-            >重置</el-button
-          >
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownload()"
-            >导出焊装总成对比(Excel)
-          </el-button>
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            style="margin-left: 15px"
-            @click="handleDownloadCSV()"
-            >导出焊装总成对比(CSV)
-          </el-button>
-        </el-form-item>
-      <!-- </el-row> -->
-      </el-form>
-    </flexbox>
+          <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
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              style="margin-left: 15px"
+              @click="handleDownload()"
+              >导出焊装总成对比(Excel)
+            </el-button>
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              style="margin-left: 15px"
+              @click="handleDownloadCSV()"
+              >导出焊装总成对比(CSV)
+            </el-button>
+          </el-form-item>
+          <!-- </el-row> -->
+        </el-form>
+      </flexbox>
     </div>
-    <div class="l-table">
+    <div class="l-table" style="margin-top:-20px">
       <!--表格渲染-->
       <el-table
         ref="multipleTable"
@@ -231,7 +237,6 @@
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
       >
-        
         <!-- <el-table-column
           label="底盘号"
           prop="vin "
@@ -262,7 +267,6 @@
           </template>
         </el-table-column>
       </el-table>
-
     </div>
 
     <div class="table-footer">
@@ -293,7 +297,7 @@ 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 { mapGetters } from "vuex";
 import moment from "moment";
 import { downloadFile } from "@/utils/crmindex.js";
 
@@ -304,7 +308,6 @@ const bomUnit = [
   { key: 2, display_name: "Other" },
 ];
 
-
 const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
   acc[cur.key] = cur.display_name;
   return acc;
@@ -340,9 +343,9 @@ export default {
           { required: true, message: "必须输入！", trigger: "blur" },
         ],
       },
-      compareState:[
-        {id:0,name:"有焊装无总装"},
-        {id:1,name:"有焊装有总装"}
+      compareState: [
+        { id: 0, name: "有焊装无总装" },
+        { id: 1, name: "有焊装有总装" },
       ],
       valueSelect: "",
       customerInfos: [],
@@ -370,36 +373,35 @@ export default {
         MaxResultCount: 15,
         productType: 1,
         ProductLine: undefined,
-        version:undefined,
-        serialNumBegin:undefined,
-        serialNumEnd:undefined,
-        HostSNBegin:undefined,
-        HostSNEnd:undefined,
-        KNRBegin:undefined,
-        KNREnd:undefined,
-        VINBegin:undefined,
-        VINEnd:undefined,
-        OnlineTimeValue:undefined,
-        OnlineTimeBegin:undefined,
-        OnlineTimeEnd:undefined,
-        ReceiveTimeValue:undefined,
-        ReceiveTimeBegin:undefined,
-        ReceiveTimeEnd:undefined,
-        HasR100NotHasM100:undefined,//有焊装无总装
-        HasR100HasM100:undefined,//有焊装有总装
-        cstate:[],
-
+        version: undefined,
+        serialNumBegin: undefined,
+        serialNumEnd: undefined,
+        HostSNBegin: undefined,
+        HostSNEnd: undefined,
+        KNRBegin: undefined,
+        KNREnd: undefined,
+        VINBegin: undefined,
+        VINEnd: undefined,
+        OnlineTimeValue: undefined,
+        OnlineTimeBegin: undefined,
+        OnlineTimeEnd: undefined,
+        ReceiveTimeValue: undefined,
+        ReceiveTimeBegin: undefined,
+        ReceiveTimeEnd: undefined,
+        HasR100NotHasM100: undefined, //有焊装无总装
+        HasR100HasM100: undefined, //有焊装有总装
+        cstate: [],
       },
       listExportQuery: {
         erpAssemblyCode: undefined,
         erpAssemblyName: undefined,
       },
-      listPLQuery:{
+      listPLQuery: {
         BillType: 1,
         //UserId: "00000000-0000-0000-0000-000000000000",
       },
-      form:{
-        details:[]
+      form: {
+        details: [],
       },
       page: 1,
       // 显示搜索条件
@@ -412,32 +414,34 @@ export default {
       isEdit: false,
       formLoading: false,
       tableHeight: document.documentElement.clientHeight - 335,
-      detailTableHeight:250,
-      details:[], //修改子表数据源
-      billStatus:[],
-      PLChildList:[],//筛选后产线下拉
-	    productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}]
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      billStatus: [],
+      PLChildList: [], //筛选后产线下拉
+      productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
     };
   },
   mounted() {
-    this.$nextTick(() => { 
-        var offsetHei = document.documentElement.clientHeight;
-        //console.log(offsetHei);
-        let boxH = this.$refs.box.offsetHeight;
-        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
-        //console.log(this.$refs.box.offsetHeight);
-        //console.log(this.tableHeight);
+    this.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+      //console.log(this.$refs.box.offsetHeight);
+      //console.log(this.tableHeight);
     });
   },
   created() {
-    this.compareState.forEach((element,index) => {
+    this.compareState.forEach((element, index) => {
       this.listQuery.cstate.push(element.id);
     });
     this.getProductLine();
   },
   computed: {
     getDefaultField() {
-      
       var tempsTabs = [];
       tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
       // tempsTabs.push({
@@ -512,7 +516,7 @@ export default {
       });
       return tempsTabs;
     },
-    ...mapGetters(['userInfo'])//获取当前用户信息
+    ...mapGetters(["userInfo"]), //获取当前用户信息
   },
   methods: {
     //抽屉
@@ -671,7 +675,7 @@ export default {
       this.form.details.push(obj);
       //console.log(688);
     },
-    handleDeleteDetails(index){
+    handleDeleteDetails(index) {
       this.form.details.splice(index, 1);
       //console.log(693);
     },
@@ -685,47 +689,50 @@ export default {
         }
         return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
-      if(column.property == "r100BillStatus" || column.property == "m100BillStatus")
-      {
+      if (
+        column.property == "r100BillStatus" ||
+        column.property == "m100BillStatus"
+      ) {
         return { 1: "未匹配", 2: "已匹配", 3: "已发布" }[row[column.property]];
       }
-      return row[column.property] || "--";//|| "--"加上后会掩盖m100单据状态为0不显示
+      return row[column.property] || "--"; //|| "--"加上后会掩盖m100单据状态为0不显示
     },
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    getList() {
+    getList(data) {
       this.listLoading = true;
-      this.listQuery.SkipCount = (this.page - 1) * 10;
-      if(this.listQuery.OnlineTimeValue!== undefined)
-      {
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.OnlineTimeValue !== undefined) {
         this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0];
         this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1];
       }
-      if(this.listQuery.ReceiveTimeValue!== undefined)
-      {
+      if (this.listQuery.ReceiveTimeValue !== undefined) {
         this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
         this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
       }
-      
+
       this.listQuery.HasR100NotHasM100 = false;
       this.listQuery.HasR100HasM100 = false;
 
-      if(this.listQuery.cstate!== undefined && this.listQuery.cstate.length > 0)
-      {
-      //console.log(this.listQuery.cstate)
-        this.listQuery.cstate.forEach(element => {
+      if (
+        this.listQuery.cstate !== undefined &&
+        this.listQuery.cstate.length > 0
+      ) {
+        //console.log(this.listQuery.cstate)
+        this.listQuery.cstate.forEach((element) => {
           //console.log(element)
-          if(element === 0)
-          {
+          if (element === 0) {
             this.listQuery.HasR100NotHasM100 = true;
           }
-          if(element === 1)
-          {
+          if (element === 1) {
             this.listQuery.HasR100HasM100 = true;
           }
         });
-         
       }
       this.$axios
         .gets("/api/newjit/r100-m100-compare/list", this.listQuery)
@@ -742,7 +749,6 @@ export default {
         });
     },
 
-    
     getDetialList(partCode) {
       this.listLoading = true;
       console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
@@ -750,13 +756,12 @@ export default {
         .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
         .then((response) => {
           //console.log(partCode)
-          if(partCode !== "" && partCode !== undefined)
-          {
+          if (partCode !== "" && partCode !== undefined) {
             //console.log(partCode)
-            this.list = response.item.details.filter(u => u.partCode === partCode);
-          }
-          else
-          {
+            this.list = response.item.details.filter(
+              (u) => u.partCode === partCode
+            );
+          } else {
             this.list = response.item.details;
           }
           //alert(JSON.stringify(response.Items))
@@ -771,8 +776,10 @@ export default {
         });
     },
 
-    valueselectChange(){this.$forceUpdate();},
-    handleImportSAP(){},
+    valueselectChange() {
+      this.$forceUpdate();
+    },
+    handleImportSAP() {},
 
     handleFilter() {
       this.page = 1;
@@ -811,31 +818,34 @@ export default {
       this.$refs.multipleTable.clearSelection();
       this.$refs.multipleTable.toggleRowSelection(row);
     },
-    SAPExport(){},
+    SAPExport() {},
     //获取所有产线
-    getProductLine()
-    {
+    getProductLine() {
       this.listPLQuery.UserId = this.userInfo.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;
-            this.getList();
-          })
-          .catch(() => {
+        .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;
+          this.getList();
+        })
+        .catch(() => {});
     },
     //产线类型变更
-    ptypeselectChange()
-    {
+    ptypeselectChange() {
       //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});
+      this.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
       //console.log(this.PLList);
     },
   },
@@ -857,12 +867,12 @@ export default {
 //   position: absolute;
 //   left: 7px;
 // }
-.divider1{
-  margin: 0 ;
+.divider1 {
+  margin: 0;
 }
-.divider2{
+.divider2 {
   margin: 10px;
-  margin-bottom: 20px ;
+  margin-bottom: 20px;
   width: 95%;
 }
 </style>
diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
index 3bbcffec..293bb2b5 100644
--- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
+++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue
@@ -5,6 +5,12 @@
     <!-- 搜索 -->
     <div style="float: left">
       <flexbox class="content-header">
+        <JobSelectVerson
+          :options="JobVersionList"
+          style="width: 150px; margin-left: -10px"
+          class="search-container"
+          @value-change="JobVersionValue"
+        ></JobSelectVerson>
         <el-button
           class="filter-item"
           size="mini"
@@ -455,85 +461,96 @@
           </el-col>
         </el-row>
 
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="KEEN号" />
-          </el-col>
-          <el-col :md="18" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="kennCode">
-              <el-input
-                type="textarea"
-                v-model="formCount.kennCode"
-                style="width: 380px"
-                placeholder="KEEN号用逗号分隔！"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :md="2" :xs="24">
-            <el-tooltip
-              content="一键复制粘贴"
-              placement="bottom"
-              effect="light"
-            >
-              <el-button
-                type="primary"
-                icon="el-icon-edit"
-                circle
-                @click="showModal = true"
-              ></el-button>
-            </el-tooltip>
-          </el-col>
-        </el-row>
+        <el-collapse v-model="activeNames">
+          <el-collapse-item name="1">
+            <template slot="title">
+              其他搜索条件(单击折叠或伸展)<i
+                class="header-icon el-icon-info"
+                style="color: #37b328"
+              ></i>
+            </template>
+            <el-row>
+              <el-col :md="4" :xs="24">
+                <el-form-item label="KEEN号" />
+              </el-col>
+              <el-col :md="18" :xs="24" style="margin-left: -80px">
+                <el-form-item prop="kennCode">
+                  <el-input
+                    type="textarea"
+                    v-model="formCount.kennCode"
+                    style="width: 380px"
+                    :rows="4"
+                    placeholder="请输入正确的KENN号！"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :md="2" :xs="24">
+                <el-tooltip
+                  content="一键复制粘贴"
+                  placement="bottom"
+                  effect="light"
+                >
+                  <el-button
+                    type="primary"
+                    icon="el-icon-edit"
+                    circle
+                    @click="kennBtn"
+                  ></el-button>
+                </el-tooltip>
+              </el-col>
+            </el-row>
 
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="底盘号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="chassisNumber">
-              <el-input
-                v-model="formCount.chassisNumber"
-                style="width: 450px"
-                type="textarea"
-                placeholder="只支持粘贴，不支持手输！"
-                @paste.native="pasteExcelTochassisNumber"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+            <el-row>
+              <el-col :md="4" :xs="24">
+                <el-form-item label="底盘号" />
+              </el-col>
+              <el-col :md="20" :xs="24" style="margin-left: -80px">
+                <el-form-item prop="chassisNumber">
+                  <el-input
+                    v-model="formCount.chassisNumber"
+                    style="width: 450px"
+                    type="textarea"
+                    :rows="4"
+                    placeholder="请输入正确底盘号！"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
 
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="客户零件号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="materialCode">
-              <el-input
-                v-model="formCount.materialCode"
-                style="width: 450px"
-                type="textarea"
-                placeholder="只支持粘贴，不支持手输！"
-                @paste.native="pasteExcelTomaterialCode"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :md="4" :xs="24">
-            <el-form-item label="厂内零件号" />
-          </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="sapCode">
-              <el-input
-                v-model="formCount.sapCode"
-                style="width: 450px"
-                type="textarea"
-                placeholder="只支持粘贴，不支持手输！"
-                @paste.native="pasteExcelTosapCode"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+            <el-row>
+              <el-col :md="4" :xs="24">
+                <el-form-item label="客户零件号" />
+              </el-col>
+              <el-col :md="20" :xs="24" style="margin-left: -80px">
+                <el-form-item prop="materialCode">
+                  <el-input
+                    v-model="formCount.materialCode"
+                    style="width: 450px"
+                    type="textarea"
+                    :rows="4"
+                    placeholder="请输入正确的客户零件号！"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :md="4" :xs="24">
+                <el-form-item label="厂内零件号" />
+              </el-col>
+              <el-col :md="20" :xs="24" style="margin-left: -80px">
+                <el-form-item prop="sapCode">
+                  <el-input
+                    v-model="formCount.sapCode"
+                    style="width: 450px"
+                    type="textarea"
+                    :rows="4"
+                    placeholder="请输入正确厂内零件号！"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-collapse-item>
+        </el-collapse>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
@@ -585,15 +602,17 @@ import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
 import PasteExcel from "@/components/PasteExcel/index.vue";
+import JobSelectVerson from "@/components/CreateCom/Job-Select.vue";
 
 export default {
   name: "InvoiceSettledDetailDiff",
-  components: { Pagination, CRMTableHead, PasteExcel },
+  components: { Pagination, CRMTableHead, PasteExcel, JobSelectVerson },
   directives: { permission },
 
   data() {
     return {
       crmType: "backJob",
+      activeNames: ["1"],
       tableData: [
         {
           name: "KEEN号",
@@ -601,6 +620,8 @@ export default {
       ],
       paster: "",
       pasterValue: "",
+      JobVersionList: [],
+      JobVersionValue: "",
       rules: {
         versionValue: [
           { required: true, message: "必须输入！", trigger: "change" },
@@ -728,6 +749,8 @@ export default {
         name: "",
       },
       page: 1,
+      JobversionValue: "",
+      JobversionValueVerson: "",
       dialogFormVisible: false,
       multipleSelection: [],
       tableHeight: document.documentElement.clientHeight - 260,
@@ -765,6 +788,7 @@ export default {
     this.getAllVersionList();
     this.getMaterialGroup();
     this.getList();
+    this.getJobVersionInfo();
     // this.getCurrentMonthFirst();
     // this.getCurrentMonthLast();
   },
@@ -811,14 +835,39 @@ export default {
     },
   },
   methods: {
+    getJobVersionInfo() {
+      //取版本列表信息
+      //this.listLoading = true;
+      this.listQuery.SkipCount = (this.page - 1) * 1000;
+      this.$axios
+        .posts("/api/settleaccount/Job/versionlist", this.listQuery)
+        .then((response) => {
+          this.JobVersionList = [];
+          response.forEach((element) => {
+            let options = {};
+            options.value = element;
+            options.label = element;
+            this.JobVersionList.push(options);
+          });
+          if (JSON.stringify(this.JobVersionList) != "[]") {
+            //因版本下拉有默认值，所以详表要自动绑定子表数据
+            this.JobversionValue = this.JobVersionList[0].value;
+            this.JobversionValueVerson = this.JobVersionList[0].label;
+            this.getList();
+          }
+        })
+        .catch(() => {
+          //this.listLoading = false;
+        });
+    },
     submiteBillNo() {
       var getkeenCodeNo = this.pasterValue.substring(
         0,
         this.pasterValue.length - 1
       );
       this.dataKenCode = getkeenCodeNo;
-      this.formCount.kennCode=this.dataKenCode;
-      this.showModal=false;
+      this.formCount.kennCode = this.dataKenCode;
+      this.showModal = false;
     },
     pasteMe(e) {
       let source = e.clipboardData.getData("Text");
@@ -840,7 +889,6 @@ export default {
           console.log(this.tableData);
         }
       }
-      alert(JSON.stringify(this.pasterValue));
     },
     //如果是要获得粘贴excel的内容，需要把粘贴的内容转换成二维数组
     pasteExcelToKennCode(e) {
@@ -858,7 +906,6 @@ export default {
           }
         }
       }
-      //alert(this.dataKenCode.trimEnd(","));
     },
     valueChange(data) {
       this.getmaterialGroupValue = "";
@@ -868,56 +915,6 @@ export default {
         this.getmaterialGroupValue.length - 1
       );
     },
-
-    pasteExcelTochassisNumber(e) {
-      let source = e.clipboardData.getData("Text");
-      // 首先对源头进行解析
-      let rows = source.split("\r\n"); // 拆成很多行
-      this.datachassisNumber = "";
-      for (let i = 0; i < rows.length; i++) {
-        if (rows[i] != "") {
-          // 如果某一行不是空，再按列拆分
-          let columns = rows[i].split("\t"); // 已经按列划分
-
-          for (let j = 0; j < columns.length; j++) {
-            this.datachassisNumber += columns[j] + ",";
-          }
-        }
-      }
-    },
-    pasteExcelTomaterialCode(e) {
-      let source = e.clipboardData.getData("Text");
-      // 首先对源头进行解析
-      let rows = source.split("\r\n"); // 拆成很多行
-      this.datamaterialCode = "";
-      for (let i = 0; i < rows.length; i++) {
-        if (rows[i] != "") {
-          // 如果某一行不是空，再按列拆分
-          let columns = rows[i].split("\t"); // 已经按列划分
-
-          for (let j = 0; j < columns.length; j++) {
-            this.datamaterialCode += columns[j] + ",";
-          }
-        }
-      }
-    },
-
-    pasteExcelTosapCode(e) {
-      let source = e.clipboardData.getData("Text");
-      // 首先对源头进行解析
-      let rows = source.split("\r\n"); // 拆成很多行
-      this.datasapCode = "";
-      for (let i = 0; i < rows.length; i++) {
-        if (rows[i] != "") {
-          // 如果某一行不是空，再按列拆分
-          let columns = rows[i].split("\t"); // 已经按列划分
-
-          for (let j = 0; j < columns.length; j++) {
-            this.datasapCode += columns[j] + ",";
-          }
-        }
-      }
-    },
     getdateValue(val) {
       this.startTime = val;
       this.getbalanceIndexData();
@@ -1008,18 +1005,10 @@ export default {
           this.formLoading = true;
           this.listExportQuery.version = this.formCount.versionValue; //版本
           if (this.formCount.materialCode != "") {
-            var getmaterialCode = this.datamaterialCode.substring(
-              0,
-              this.datamaterialCode.length - 1
-            );
-            this.listExportQuery.materialCode = getmaterialCode; //物料号
+            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
           }
           if (this.formCount.sapCode != "") {
-            var getsapCode = this.datasapCode.substring(
-              0,
-              this.datasapCode.length - 1
-            );
-            this.listExportQuery.sapCode = getsapCode; //厂内物料号
+            this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号
           }
           if (this.formCount.kennCode != "") {
             this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
@@ -1035,11 +1024,7 @@ export default {
             : undefined;
           this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
           if (this.formCount.chassisNumber != "") {
-            var getchassisNumber = this.datachassisNumber.substring(
-              0,
-              this.datachassisNumber.length - 1
-            );
-            this.listExportQuery.chassisNumber = getchassisNumber; //底盘号
+            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
           }
           // if (this.formCount.materialGroupValue != "") {
           //   this.listExportQuery.materialGroup =
@@ -1053,31 +1038,31 @@ export default {
             "大众发票与结算核对明细表-导出条件：" +
               JSON.stringify(this.listExportQuery)
           );
-          // this.formLoading = false;
-          // this.dialogFormVisible = false;
-          this.$axios
-            .gets(
-              "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
-              this.listExportQuery
-            )
-            .then((res) => {
-              let taskid = res;
-              if (Number.isInteger(taskid)) {
-                this.$notify({
-                  title: "成功",
-                  message: "任务生成成功！任务号:" + taskid,
-                  type: "success",
-                  duration: 2000,
-                });
-              }
-              this.getList();
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            })
-            .catch(() => {
-              this.formLoading = false;
-              this.dialogFormVisible = false;
-            });
+          this.formLoading = false;
+          this.dialogFormVisible = false;
+          // this.$axios
+          //   .gets(
+          //     "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
+          //     this.listExportQuery
+          //   )
+          //   .then((res) => {
+          //     let taskid = res;
+          //     if (Number.isInteger(taskid)) {
+          //       this.$notify({
+          //         title: "成功",
+          //         message: "任务生成成功！任务号:" + taskid,
+          //         type: "success",
+          //         duration: 2000,
+          //       });
+          //     }
+          //     this.getList();
+          //     this.formLoading = false;
+          //     this.dialogFormVisible = false;
+          //   })
+          //   .catch(() => {
+          //     this.formLoading = false;
+          //     this.dialogFormVisible = false;
+          //   });
         }
       });
     },
@@ -1095,7 +1080,15 @@ export default {
       this.cp5endTime = "";
       this.dialogFormVisible = true;
     },
-
+    kennBtn() {
+      this.paster = "";
+      this.showModal = true;
+      this.tableData = [
+        {
+          name: "KEEN号",
+        },
+      ];
+    },
     filterHandler(value, row, column) {
       const property = column["property"];
       return row[property] === value;