diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index e5bf88ec..d5f65438 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -18,6 +18,7 @@ import vwNoBarcodeRouter from './modules/vwKBNoBarcodedata'
 import JobTimeDataRouter from './modules/jobtimedata'
 //import newjitRouter from './modules/newjit-basedata'
 import pgfis from './modules/fis'
+import pgfisPrint from './modules/fisprint'
 
 /**
  * Note: sub-menu only appear when route children.length >= 1
@@ -85,7 +86,7 @@ export const constantRoutes = [
     children: [
       {
         path: 'dashboard',
-        component: () => import('@/views/pg-fis/basedate/m100Online'),
+        component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
         name: 'Dashboard',
         meta: {
           title: '系统首页',
@@ -168,14 +169,15 @@ export const asyncRoutes = [
   /** when your routing map is too long, you can split it into small modules **/
   managerRouter,//系统首页
   personRouter,//系统管理
-  basedataRouter,//基础数据维护
-  vwFisDataRouter,//结算与开票数据导入
-  billdataRouter,//销售结算与开票报表
+  //basedataRouter,//基础数据维护
+  //vwFisDataRouter,//结算与开票数据导入
+  //billdataRouter,//销售结算与开票报表
   //businessdataRouter,
-  wheeldataRouter,//大众看板和备件
+  //wheeldataRouter,//大众看板和备件
+  pgfisPrint,//排序单打印
   pgfis,//派格fis
-  JobTimeDataRouter,//后台作业监控
- 
+  //JobTimeDataRouter,//后台作业监控
+
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }
 
diff --git a/vue/src/router/modules/fis.js b/vue/src/router/modules/fis.js
index 81cdba28..c736d05d 100644
--- a/vue/src/router/modules/fis.js
+++ b/vue/src/router/modules/fis.js
@@ -66,16 +66,36 @@ const pgfis = {
                 icon: '客户零件'
             }
         },
-        {
-            path: '/pg-M100Online',
-            component: () => import('@/views/pg-fis/basedate/m100Online'),
-            name: 'pg-M100Online',//命名路由
-            meta: {
-                title: 'M100上线信息',
-                roles: ['SettleAccount.Reports'],
-                icon: '客户零件'
-            }
-        },
+        // {
+        //     path: '/pg-M100Online',
+        //     component: () => import('@/views/pg-fis/basedate/m100Online'),
+        //     name: 'pg-M100Online',//命名路由
+        //     meta: {
+        //         title: 'M100上线信息',
+        //         roles: ['SettleAccount.Reports'],
+        //         icon: '客户零件'
+        //     }
+        // },
+        // {
+        //     path: '/pg-m100normal-print',
+        //     component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+        //     name: 'pg-M100Online',//命名路由
+        //     meta: {
+        //         title: '日常打印M100信息',
+        //         //roles: ['SettleAccount.Reports'],
+        //         icon: '客户零件'
+        //     }
+        // },
+        // {
+        //     path: '/select',
+        //     component: () => import('@/views/pg-fis/basedate/select'),
+        //     name: 'select',//命名路由
+        //     meta: {
+        //         title: 'M100查询',
+        //         roles: ['SettleAccount.Reports'],
+        //         icon: '客户零件'
+        //     }
+        // },
         {
             path: '/pg-R100Online',
             component: () => import('@/views/pg-fis/basedate/r100Online'),
diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
new file mode 100644
index 00000000..27f82b43
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
@@ -0,0 +1,704 @@
+<!--总成模块信息管理页-->
+<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="HostSN">
+                <el-input
+                  v-model="listQuery.HostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 170px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+          </el-form-item>
+
+          <el-form-item label="底盘号码">
+            <el-col :span="11">
+              <el-form-item prop="Vin">
+                <el-input
+                  v-model="listQuery.Vin"
+                  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-form-item>
+        </el-form>
+      </flexbox>
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeightMB"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%; margin-top: -25px"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+        :row-key="getRowKeys"
+        :expand-row-keys="expands"
+        @expand-change="exChange"
+      >
+        <el-table-column type="selection" width="44px"></el-table-column>
+        <el-table-column type="expand" prop="details" label="详表">
+          <template slot-scope="scope">
+            <el-table :data="scope.row.details">
+              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
+              <el-table-column prop="vin" label="底牌号"></el-table-column>
+              <el-table-column
+                prop="hostSN"
+                label="大众顺序号"
+              ></el-table-column>
+              <el-table-column
+                prop="partCode"
+                label="柱护板零件号"
+              ></el-table-column>
+              <el-table-column
+                prop="partCode2"
+                label="柱护板零件号2"
+              ></el-table-column>
+            </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="table-footer">
+        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+        <pagination
+          v-show="totalCount > 0"
+          :total="totalCount"
+          style="margin-bottom: -5px; float: right"
+          :page.sync="page"
+          :limit.sync="listQuery.MaxResultCount"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import { mapGetters } from "vuex";
+import moment from "moment";
+import Detail from "./detail.vue";
+import { downloadFile } from "@/utils/crmindex.js";
+import qs from "qs";
+
+export default {
+  name: "M100Online-MB",
+  components: { Pagination, CRMTableHead, importExcel, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfosZHB: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      crmType: "M100Online-MB",
+      getRowKeys: (row) => {
+        return row.id; //这里看这一行中需要根据哪个属性值是id
+      },
+      expands: [], //只展开一行放入当前行id
+      PrintTimeValue: [],
+      activeNames: ["1"],
+      multipleSelection: [],
+      valueSelect: "",
+      customerInfos: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        printType: "1",
+        productLine: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        billNum: undefined,
+        partType: undefined,
+        Vin: undefined,
+        HostSN: undefined,
+        beginPrintDate: undefined,
+        endPrintDate: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        HostSN: undefined,
+        Vin: undefined,
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        HostSN: undefined,
+        Vin: undefined,
+      },
+      fileQuery: {
+        dataname: undefined,
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      tableHeightMB: document.documentElement.clientHeight - 300,
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLList: [], //产线下拉
+      isShowHostSN: false,
+      isShowVin: false,
+      isShowState: true,
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+      //this.tableHeight = offsetHei -260
+    });
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfosZHB: {
+      handler(newVal) {
+        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.printType = "1";
+            this.customerInfo.productLine = element.ProductLine;
+          });
+          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
+          if (this.customerInfo.productLine != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
+      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
+      tempsTabs.push({
+        label: "左或右",
+        prop: "billLocation",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "供应商厂家代码",
+        prop: "providerCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "零件类型",
+        prop: "partType",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "器具容量",
+        prop: "capacity",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "打印日期",
+        prop: "printDate",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "打印类型",
+        prop: "printType",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "生产线",
+        prop: "productLine",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "底盘号",
+        prop: "Vin",
+        width: 160,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    exChange(row, rowList) {
+      //this.listLoading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    //门板
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.billNum != "") {
+        this.listQuery.billNum = this.listQuery.billNum;
+      }
+      if (this.listQuery.HostSN != "") {
+        this.listQuery.HostSN = this.listQuery.HostSN;
+      }
+      if (this.listQuery.Vin != "") {
+        this.listQuery.Vin = this.listQuery.Vin;
+      }
+      this.listQuery.partType = this.listQuery.partType;
+      var getdate5 = JSON.stringify(this.PrintTimeValue);
+      if (getdate5 != "[]") {
+        this.listQuery.beginPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[0] || undefined
+          : undefined;
+        this.listQuery.endPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[1] || undefined
+          : undefined;
+      } else {
+        this.listQuery.beginPrintDate = undefined;
+        this.listQuery.endPrintDate = undefined;
+      }
+      if (this.customerInfo.productLine != "") {
+        this.listQuery.ProductLine = this.customerInfo.productLine;
+      }
+
+      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    //重新打印-门板
+    handleUpdate(row) {
+      this.isEdit = true;
+      if (this.multipleSelection.length != 1) {
+        this.$message({
+          message: "重新打印必须选择单行，不能多选！",
+          type: "warning",
+        });
+        return;
+      } else {
+        //this.fetchData(this.multipleSelection[0].id);
+        //重新打印方法
+        let beginVin1 = this.multipleSelection[0].id;
+        let ZHBId = [beginVin1];
+        var params = {
+          printType: "1",
+          productLine: this.customerInfo.productLine,
+          reportIdList: ZHBId,
+        };
+        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+        this.$axios
+          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+          .then((response) => {
+            console.log("柱护版-打印返回的状态：" + response.status);
+            const index = this.list.indexOf(row);
+            if (response.status === false) {
+              this.$message({
+                message: response.message,
+                type: "error",
+              });
+              return;
+            } else {
+              this.fileQuery.dataname = JSON.stringify(response.item);
+              console.log(
+                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
+              this.$axios
+                .posts(
+                  "/Handlers/Handler1.ashx?report=zhuhuban",
+                  qs.stringify(this.fileQuery)
+                )
+                .then((response) => {
+                  this.printpdf(response); //打印我文件流
+                });
+            }
+          })
+          .catch(() => {});
+      }
+    },
+    //作废操作，支持批量操作-门板
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否作废" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "作废成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + id)
+        .then((response) => {
+          this.form = response.item;
+          //this.details = response.item.details;
+          //console.log(this.details);
+        });
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.$refs[refName].resetFields();
+      this.PrintTimeValue = [];
+      this.handleQuery();
+      this.getProductLine();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.listQuery.SkipCount = 1;
+      //this.getList();
+    },
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+
+    selectOptionsChange(item) {
+      this.getList();
+    },
+
+    /** 刷新列表 */
+    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/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
new file mode 100644
index 00000000..93058c13
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -0,0 +1,723 @@
+<!--总成模块信息管理页-->
+<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="HostSN">
+                <el-input
+                  v-model="listQuery.HostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 170px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+           
+          </el-form-item>
+
+          <el-form-item label="底盘号码">
+            <el-col :span="11">
+              <el-form-item prop="Vin">
+                <el-input
+                  v-model="listQuery.Vin"
+                  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"
+              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,
+        Vin: undefined,
+        HostSN: undefined,
+        beginPrintDate: undefined,
+        endPrintDate: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        Vin: undefined,
+        HostSN: undefined,
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        Vin: undefined,
+        HostSN: undefined,
+      },
+      fileQuery: {
+        dataname: undefined,
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      tableHeightMB: document.documentElement.clientHeight - 300,
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLList: [], //产线下拉
+      isShowHostSN: false,
+      isShowVin: false,
+      isShowState: true,
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+      //this.tableHeight = offsetHei -260
+    });
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfosMB: {
+      handler(newVal) {
+        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.printType = element.PrintType;
+            this.customerInfo.productLine = element.ProductLine;
+          });
+          if (this.customerInfo.productLine != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
+      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
+      tempsTabs.push({
+        label: "左或右",
+        prop: "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: "Vin",
+        width: 160,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    exChange(row, rowList) {
+      //this.listLoading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    //门板
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.billNum != "") {
+        this.listQuery.billNum = this.listQuery.billNum;
+      }
+      if (this.listQuery.Vin != "") {
+        this.listQuery.Vin = this.listQuery.Vin;
+      }
+      if (this.listQuery.HostSN != "") {
+        this.listQuery.HostSN = this.listQuery.HostSN;
+      }
+      this.listQuery.partType = this.listQuery.partType;
+      var getdate5 = JSON.stringify(this.PrintTimeValue);
+      if (getdate5 != "[]") {
+        this.listQuery.beginPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[0] || undefined
+          : undefined;
+        this.listQuery.endPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[1] || undefined
+          : undefined;
+      } else {
+        this.listQuery.beginPrintDate = undefined;
+        this.listQuery.endPrintDate = undefined;
+      }
+      if (this.customerInfo.productLine != "") {
+        this.listQuery.ProductLine = this.customerInfo.productLine;
+      }
+
+      console.log(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    //重新打印-门板
+    handleUpdate(row) {
+      this.isEdit = true;
+      if (this.multipleSelection.length != 1) {
+        this.$message({
+          message: "重新打印必须选择单行，不能多选！",
+          type: "warning",
+        });
+        return;
+      } else {
+        //this.fetchData(this.multipleSelection[0].id);
+        //重新打印方法
+        let Vin1 = this.multipleSelection[0].Vin;
+        var params = {
+          printType: 1,
+          productLine: this.customerInfo.productLine,
+          Vin: Vin1,
+        };
+        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+        this.$axios
+          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
+          .then((response) => {
+            //alert(response.status);
+            const index = this.list.indexOf(row);
+            if (response.status === false) {
+              this.$message({
+                message: response.message,
+                type: "error",
+              });
+              return;
+            } else {
+              this.fileQuery.dataname = JSON.stringify(response.item);
+              console.log(
+                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
+              this.$axios
+                .posts(
+                  "/Handlers/Handler1.ashx?report=menban",
+                  qs.stringify(this.fileQuery)
+                )
+                .then((response) => {
+                  this.printpdf(response); //打印我文件流
+                });
+            }
+          })
+          .catch(() => {});
+      }
+    },
+    //作废操作，支持批量操作-门板
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否作废" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/newjit/MenBanPackingList/scrap", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "作废成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    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/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
new file mode 100644
index 00000000..882c3fde
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
@@ -0,0 +1,739 @@
+<!--总成模块信息管理页-->
+<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"
+              type="danger"
+              icon="el-icon-delete"
+              size="mini"
+              @click="handleDelete()"
+              >作废(支持批量)</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </flexbox>
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeightMB"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%; margin-top: -25px"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+        :row-key="getRowKeys"
+        :expand-row-keys="expands"
+        @expand-change="exChange"
+      >
+        <el-table-column type="selection" width="44px"></el-table-column>
+        <el-table-column type="expand" prop="details" label="详表">
+          <template slot-scope="scope">
+            <el-table :data="scope.row.details">
+              <el-table-column prop="knr" label="KNR订单号"></el-table-column>
+              <el-table-column prop="vin" label="底牌号"></el-table-column>
+              <el-table-column
+                prop="hostSN"
+                label="大众顺序号"
+              ></el-table-column>
+              <el-table-column
+                prop="partCode"
+                label="柱护板零件号"
+              ></el-table-column>
+              <el-table-column
+                prop="partCode2"
+                label="柱护板零件号2"
+              ></el-table-column>
+            </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="table-footer">
+        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+        <pagination
+          v-show="totalCount > 0"
+          :total="totalCount"
+          style="margin-bottom: -5px; float: right"
+          :page.sync="page"
+          :limit.sync="listQuery.MaxResultCount"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import { mapGetters } from "vuex";
+import moment from "moment";
+import Detail from "./detail.vue";
+import { downloadFile } from "@/utils/crmindex.js";
+import qs from "qs";
+
+export default {
+  name: "M100Online-MB",
+  components: { Pagination, CRMTableHead, importExcel, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfosZHB: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      crmType: "M100Online-MB",
+      getRowKeys: (row) => {
+        return row.id; //这里看这一行中需要根据哪个属性值是id
+      },
+      expands: [], //只展开一行放入当前行id
+      PrintTimeValue: [],
+      activeNames: ["1"],
+      multipleSelection: [],
+      valueSelect: "",
+      customerInfos: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        printType: "1",
+        productLine: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        billNum: undefined,
+        partType: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginPrintDate: undefined,
+        endPrintDate: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      fileQuery: {
+        dataname: undefined,
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      tableHeightMB: document.documentElement.clientHeight - 300,
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLList: [], //产线下拉
+      isShowHostSN: false,
+      isShowVin: false,
+      isShowState: true,
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+      //this.tableHeight = offsetHei -260
+    });
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfosZHB: {
+      handler(newVal) {
+        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.printType = "1";
+            this.customerInfo.productLine = element.ProductLine;
+          });
+          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
+          if (this.customerInfo.productLine != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
+      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
+      tempsTabs.push({
+        label: "左或右",
+        prop: "billLocation",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "供应商厂家代码",
+        prop: "providerCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "零件类型",
+        prop: "partType",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "器具容量",
+        prop: "capacity",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "打印日期",
+        prop: "printDate",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "打印类型",
+        prop: "printType",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "生产线",
+        prop: "productLine",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "起底盘号",
+        prop: "beginVin",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "止底盘号",
+        prop: "endVin",
+        width: 160,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    exChange(row, rowList) {
+      //this.listLoading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    //门板
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.billNum != "") {
+        this.listQuery.billNum = this.listQuery.billNum;
+      }
+      this.listQuery.partType = this.listQuery.partType;
+      this.listQuery.beginVin = this.listQuery.beginVin;
+      this.listQuery.endVin = this.listQuery.endVin;
+      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
+      this.listQuery.endHostSN = this.listQuery.endHostSN;
+      var getdate5 = JSON.stringify(this.PrintTimeValue);
+      if (getdate5 != "[]") {
+        this.listQuery.beginPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[0] || undefined
+          : undefined;
+        this.listQuery.endPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[1] || undefined
+          : undefined;
+      } else {
+        this.listQuery.beginPrintDate = undefined;
+        this.listQuery.endPrintDate = undefined;
+      }
+      if (this.customerInfo.productLine != "") {
+        this.listQuery.ProductLine = this.customerInfo.productLine;
+      }
+
+      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    //重新打印-门板
+    handleUpdate(row) {
+      this.isEdit = true;
+      if (this.multipleSelection.length != 1) {
+        this.$message({
+          message: "重新打印必须选择单行，不能多选！",
+          type: "warning",
+        });
+        return;
+      } else {
+        //this.fetchData(this.multipleSelection[0].id);
+        //重新打印方法
+        let beginVin1 = this.multipleSelection[0].beginVin1;
+        let endVin1 = this.multipleSelection[0].endVin1;
+        var params = {
+          printType: "1",
+          productLine: this.customerInfo.productLine,
+          beginVin: beginVin1,
+          endVin: endVin1,
+        };
+        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+        this.$axios
+          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+          .then((response) => {
+            console.log("柱护版-打印返回的状态：" + response.status);
+            const index = this.list.indexOf(row);
+            if (response.status === false) {
+              this.$message({
+                message: response.message,
+                type: "error",
+              });
+              return;
+            } else {
+              this.fileQuery.dataname = JSON.stringify(response.item);
+              console.log(
+                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
+              this.$axios
+                .posts(
+                  "/Handlers/Handler1.ashx?report=zhuhuban",
+                  qs.stringify(this.fileQuery)
+                )
+                .then((response) => {
+                  this.printpdf(response); //打印我文件流
+                });
+            }
+          })
+          .catch(() => {});
+      }
+    },
+    //作废操作，支持批量操作-门板
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否作废" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/newjit/ZhuHuBanPackingList/scrap", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "作废成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    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-old.vue b/vue/src/views/pg-fis/basedate/m100Online/index-old.vue
new file mode 100644
index 00000000..3430678d
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/index-old.vue
@@ -0,0 +1,1641 @@
+<!--总成模块信息管理页-->
+<template>
+  <div class="cr-body-content">
+    <div ref="box">
+      <flexbox class="content-header">
+        <el-form
+          :model="listQuery"
+          ref="queryForm"
+          v-show="showSearch"
+          :inline="true"
+        >
+          <!-- <el-row> -->
+          <el-form-item label="生产线:" prop="productType">
+            <el-select
+              v-model="listQuery.productType"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="ptypeselectChange"
+            >
+              <el-option
+                v-for="item in productTypeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="productLine">
+            <el-select
+              v-model="listQuery.productLine"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="valueselectChange"
+            >
+              <el-option
+                v-for="item in PLChildList"
+                :key="item.id"
+                :label="item.productLineName"
+                :value="item.productLineCode"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-collapse accordion>
+            <el-collapse-item>
+              <template slot="title">
+                其他搜索条件(单击折叠或伸展)<i class="header-icon el-icon-info"></i>
+              </template>
+              <el-form-item label="版本:" prop="Version">
+                <el-input
+                  v-model="listQuery.Version"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <!-- </el-row> -->
+              <el-form-item label="流水号:" prop="serialNumBegin">
+                <el-input
+                  v-model="listQuery.serialNumBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="-" prop="serialNumEnd">
+                <el-input
+                  v-model="listQuery.serialNumEnd"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <!-- <el-row> -->
+              <el-form-item label="大众顺序号:" prop="HostSNBegin">
+                <el-input
+                  v-model="listQuery.HostSNBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="-" prop="HostSNEnd">
+                <el-input
+                  v-model="listQuery.HostSNEnd"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
+              <el-form-item label="KNR:" prop="KNRBegin">
+                <el-input
+                  v-model="listQuery.KNRBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="-" prop="KNREnd">
+                <el-input
+                  v-model="listQuery.KNREnd"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <!-- </el-row> -->
+              <!-- <el-row> -->
+              <el-form-item label="底盘号:" prop="VINBegin">
+                <el-input
+                  v-model="listQuery.VINBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="-" prop="VINEnd">
+                <el-input
+                  v-model="listQuery.VINEnd"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
+              <el-form-item label="上线日期">
+                <el-date-picker
+                  v-model="listQuery.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-collapse-item>
+          </el-collapse>
+          <el-form-item style="margin-top: -10px">
+            <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>
+    <!--门板重打和作废-->
+    <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"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="底盘号"
+          prop="vin "
+          sortable="custom"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.vin
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div>
+      <el-dialog
+        :visible.sync="dialogFormVisible"
+        :close-on-click-modal="false"
+        :title="formTitle"
+        width="700px"
+        @close="closeDialog"
+      >
+        <el-form
+          ref="form"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          size="small"
+          label-width="120px"
+        >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label="大众顺序号:"
+                prop="beginHostSN"
+                v-show="isShowHostSN"
+              >
+                <el-input
+                  v-model="form.beginHostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endHostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
+                <el-input
+                  v-model="form.beginVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="dialogFormVisible = false"
+            >取消</el-button
+          >
+          <el-button v-loading="formLoading" type="primary" @click="save"
+            >确认</el-button
+          >
+        </div>
+      </el-dialog>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        style="margin-bottom: -5px; float: right"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import { mapGetters } from "vuex";
+import moment from "moment";
+import Detail from "./detail.vue";
+import MBDetail from "./detailMB.vue";
+import ZHBDetail from "./detailZHB.vue";
+import { downloadFile } from "@/utils/crmindex.js";
+import qs from "qs";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "M100Online",
+  components: {
+    Pagination,
+    CRMTableHead,
+    importExcel,
+    Detail,
+    MBDetail,
+    ZHBDetail,
+  },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      crmType: "M100Online",
+      drawerZHB: false,
+      drawerMB: false,
+      activeNames: ["1"],
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      billState: [
+        { id: 2, name: "已匹配" },
+        { id: 3, name: "已打印" },
+      ],
+      valueSelect: "",
+      customerInfos: [],
+      customerInfosMB: [],
+      customerInfosZHB: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        productType: 1, //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: [],
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      vinPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      fileQuery: {
+        dataname: undefined,
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      bomUnit,
+      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,
+    };
+  },
+  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.billState.forEach((element, index) => {
+      if (index === 0) {
+        this.listQuery.state.push(element.id);
+      }
+    });
+    this.getProductLine();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+      // tempsTabs.push({
+      //   label: "底盘号",
+      //   prop: "vin",
+      //   width: 130,
+      // });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100上线时间",
+        prop: "onlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100接收时间",
+        prop: "receiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100上线时间",
+        prop: "r100OnlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100接收时间",
+        prop: "r100ReceiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "状态",
+        prop: "billStatus",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "备注",
+        prop: "remark",
+        width: 120,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      //console.log(510)
+      //console.log(param)
+      var parentId = param.assemblyID; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + id)
+        .then((response) => {
+          this.form = response.item;
+          //this.details = response.item.details;
+          //console.log(this.details);
+        });
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+      console.log(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
+        .then((res) => {
+          let filename = res.item;
+          this.$axios
+            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
+            .then((response) => {
+              if (filename.indexOf("_") != -1) {
+                let downName =
+                  filename.slice(0, filename.lastIndexOf("_")) +
+                  filename.slice(filename.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, filename);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+      this.listLoading = false;
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.$refs[refName].resetFields();
+      this.listQuery.OnlineTimeValue = [];
+      this.listQuery.ReceiveTimeValue = [];
+      this.listQuery.state = [];
+      this.handleQuery();
+      this.getProductLine();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.listQuery.SkipCount = 1;
+      //this.getList();
+    },
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      //this.getList();
+    },
+
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+
+    handleAddDetails() {
+      if (this.form.details === undefined) {
+        this.form.details = [];
+        //console.log(679);
+      }
+      let obj = {};
+      obj.partCode = "";
+      obj.partName = "";
+      obj.partNum = "";
+      obj.isKey = false;
+      obj.description = "";
+
+      //console.log(this.form.details);
+      this.form.details.push(obj);
+      //console.log(688);
+    },
+    handleDeleteDetails(index) {
+      this.form.details.splice(index, 1);
+      //console.log(693);
+    },
+
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "billStatus") {
+        return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
+      }
+      if (column.property == "onlineTime" || column.property == "receiveTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.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) {
+        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
+      }
+      if (this.listQuery.state !== undefined) {
+        this.listQuery.billStatus = this.listQuery.state[0];
+      }
+      this.$axios
+        .gets("/api/newjit/bill-m100/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    getDetialList(partCode) {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
+        .then((response) => {
+          //console.log(partCode)
+          if (partCode !== "" && partCode !== undefined) {
+            //console.log(partCode)
+            this.list = response.item.details.filter(
+              (u) => u.partCode === partCode
+            );
+          } else {
+            this.list = response.item.details;
+          }
+          //alert(JSON.stringify(response.Items))
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    valueselectChange(val) {
+      this.$forceUpdate();
+      this.customerInfosMB = [];
+      this.customerInfosZHB = [];
+      if (this.listQuery.productType === 1) {
+        //把产线值传到子组件
+        this.customerInfosMB = [
+          {
+            PrintType: 1,
+            ProductLine: val,
+          },
+        ];
+      }
+      if (this.listQuery.productType === 2) {
+        //把产线值传到子组件
+        this.customerInfosZHB = [
+          {
+            PrintType: 1,
+            ProductLine: val,
+          },
+        ];
+      }
+    },
+    handleImportSAP() {},
+
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+
+    closeDialog() {},
+    /**打印 */
+    print() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 0);
+      this.hostPrintQuery.printType = 0;
+      this.vinPrintQuery.printType = 0;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
+      }
+      this.hostSNQuery.productLine = this.listQuery.productLine;
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      //后端服务更改了 前端跟着更改成以下方式
+      if (this.listQuery.productType === 1) {
+        //门板
+        this.hostSNQuery.isZhuHuBan = "0";
+        console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+        this.$axios
+          .gets(
+            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            this.hostSNQuery
+          )
+          .then((response) => {
+            console.log("获取hostsn大众顺序号起始");
+            console.log(response.item);
+            if (response.item !== null) {
+              this.form.beginHostSN = parseInt(response.item);
+              if (this.listQuery.productType === 1) {
+                //门板
+                this.form.endHostSN = parseInt(response.item) + 11;
+              } else if (this.listQuery.productType === 2) {
+                //柱护板
+                this.form.endHostSN = parseInt(response.item) + 23;
+              }
+            } else {
+              this.$message({
+                message: "获取不到大众顺序号",
+                type: "warning",
+              });
+              return;
+            }
+          });
+      } else if (this.listQuery.productType === 2) {
+        //柱护板
+        this.hostSNQuery.isZhuHuBan = "1";
+        console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+        this.$axios
+          .gets(
+            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            this.hostSNQuery
+          )
+          .then((response) => {
+            console.log("获取hostsn大众顺序号起始");
+            console.log(response.item);
+            if (response.item !== null) {
+              this.form.beginHostSN = parseInt(response.item);
+              if (this.listQuery.productType === 1) {
+                //门板
+                this.form.endHostSN = parseInt(response.item) + 11;
+              } else if (this.listQuery.productType === 2) {
+                //柱护板
+                this.form.endHostSN = parseInt(response.item) + 23;
+              }
+            } else {
+              this.$message({
+                message: "获取不到大众顺序号",
+                type: "warning",
+              });
+              return;
+            }
+          });
+      }
+
+      // this.$axios
+      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery)
+      //   .then((response) => {
+      //     console.log("获取hostsn大众顺序号起始");
+      //     console.log(response.item);
+      //     if (response.item !== null) {
+      //       this.form.beginHostSN = parseInt(response.item);
+      //       if (this.listQuery.productType === 1) {
+      //         //门板
+      //         this.form.endHostSN = parseInt(response.item) + 11;
+      //       } else if (this.listQuery.productType === 2) {
+      //         //柱护板
+      //         this.form.endHostSN = parseInt(response.item) + 23;
+      //       }
+      //     } else {
+      //       this.$message({
+      //         message: "获取不到大众顺序号",
+      //         type: "warning",
+      //       });
+      //       return;
+      //     }
+      //   })
+      //   .catch(() => {});
+      this.formTitle = "打印";
+      this.dialogFormVisible = true;
+      this.form = {
+        beginHostSN: "",
+        endHostSN: "",
+      };
+      this.isShowHostSN = true;
+      this.isShowVin = false;
+    },
+    /**重打 */
+    rePrint() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 1);
+      this.hostPrintQuery.printType = 1;
+      this.vinPrintQuery.printType = 1;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
+      }
+      this.formTitle = "重打";
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      this.dialogFormVisible = true;
+      this.form = {
+        beginVin: "",
+        endVin: "",
+      };
+      this.isShowHostSN = false;
+      this.isShowVin = true;
+    },
+    /**补打 */
+    makeUpPrint() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 2);
+      this.hostPrintQuery.printType = 2;
+      this.vinPrintQuery.printType = 2;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "error",
+        });
+        return;
+      }
+      this.formTitle = "补打";
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      this.dialogFormVisible = true;
+      this.form = {
+        beginVin: "",
+        endVin: "",
+      };
+      this.isShowHostSN = false;
+      this.isShowVin = true;
+    },
+    /**保存*/
+    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
+            ) {
+              this.$message({
+                message: "起止大众顺序号相减不能为零！",
+                type: "error",
+              });
+              return;
+            }
+          } else if (this.listQuery.productType === 2) {
+            //柱护板
+            if (
+              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) >
+              23
+            ) {
+              this.$message({
+                message:
+                  "最多只能打印24个顺序号，终止顺序号不能大于" +
+                  (parseInt(this.form.beginHostSN) + 23),
+                type: "error",
+              });
+              return;
+            }
+          }
+        }
+      }
+      if (this.isShowVin === true) {
+        if (this.form.beginVin === "" || this.form.endVin === "") {
+          this.$message({
+            message: "请输入完整的底盘号起始范围",
+            type: "error",
+          });
+          return;
+        }
+      }
+      /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
+      if (this.formTitle === "打印") {
+        this.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) {
+                    //柱护板
+                    //传递大众顺序号起止
+                    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(
+                          "/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) {
+                //柱护板
+                //传递大众顺序号起止
+                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(() => {
+                    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) {
+          //门板
+          //传递底盘号起止
+          this.$axios
+            .posts(
+              "/api/newjit/bill-m100/print-menban-packing-list",
+              this.hostPrintQuery
+            )
+            .then((response) => {
+              console.log(
+                "重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
+              );
+              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) {
+          //柱护板
+          //传递底盘号起止
+          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 = "zhuhuban";
+                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;
+            });
+        }
+      }
+    },
+    //获取所有产线
+    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;
+          if (this.listQuery.productLine != "") {
+            //把产线值传到子组件
+            this.customerInfosMB = [
+              {
+                PrintType: 1,
+                ProductLine: this.PLChildList[0].productLineCode,
+              },
+            ];
+          }
+          this.getList();
+          //console.log(this.PLList)
+        })
+        .catch(() => {});
+    },
+    //产线类型变更
+    ptypeselectChange() {
+      this.$forceUpdate();
+      //console.log(this.listQuery.productType);
+      this.listQuery.productLine = "";
+      this.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
+      //console.log(this.PLList)
+      //变更打印按钮文字
+      if (this.listQuery.productType === 1) {
+        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
+        this.listQuery.state.push(this.billState[0].id);
+        this.isShowState = true;
+      } else if (this.listQuery.productType === 2) {
+        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+        this.listQuery.state = [];
+        this.isShowState = false;
+      }
+    },
+    /*单据状态变更 */
+    checkedListChange(index) {
+      if (this.listQuery.state.length <= 1) {
+        this.listQuery.state.push(this.billState[index].id);
+      } else {
+        this.listQuery.state = [];
+        this.listQuery.state.push(this.billState[index].id);
+      }
+    },
+    /**解析文件流 */
+    getUrl() {
+      //dataResult.data是后台返回的流
+      let pdfUrl = window.URL.createObjectURL(
+        new Blob([dataResult.data], { type: `application/pdf` })
+      );
+      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
+      const link = document.createElement("a");
+      link.href = pdfUrl;
+      link.setAttribute("download", "下载的文件名");
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+    },
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+    },
+    httpPost(URL, PARAMS) {
+      var temp = document.createElement("form");
+      temp.action = URL;
+      temp.method = "post";
+      temp.style.display = "none";
+
+      for (var x in PARAMS) {
+        var opt = document.createElement("textarea");
+        opt.name = x;
+        opt.value = PARAMS[x];
+        temp.appendChild(opt);
+      }
+
+      document.body.appendChild(temp);
+      temp.submit();
+
+      return temp;
+    },
+  },
+};
+</script>
+
+
+
+<style lang="scss" scoped>
+@import "../../../pg-fis/styles/crmtable.scss";
+
+// /*表格全选框去除空框*/
+// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
+//   display: none;
+//   position: relative;
+// }
+// /*表格全选框改为：选择*/
+// .el-table >>> .DisabledSelection .cell:before {
+//   content: "是否Key件";
+//   position: absolute;
+//   left: 7px;
+// }
+.divider1 {
+  margin: 0;
+}
+.divider2 {
+  margin: 10px;
+  margin-bottom: 20px;
+  width: 95%;
+}
+.label1 {
+  margin-left: 5px;
+  margin-right: 5px;
+}
+</style>
+
+
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index 3430678d..542659d9 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -45,12 +45,12 @@
             </el-select>
           </el-form-item>
 
-          <el-collapse accordion>
-            <el-collapse-item>
-              <template slot="title">
+          <!-- <el-collapse accordion>
+            <el-collapse-item> -->
+              <!-- <template slot="title">
                 其他搜索条件(单击折叠或伸展)<i class="header-icon el-icon-info"></i>
-              </template>
-              <el-form-item label="版本:" prop="Version">
+              </template> -->
+              <!-- <el-form-item label="版本:" prop="Version">
                 <el-input
                   v-model="listQuery.Version"
                   placeholder=""
@@ -59,9 +59,9 @@
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
                 />
-              </el-form-item>
+              </el-form-item> -->
               <!-- </el-row> -->
-              <el-form-item label="流水号:" prop="serialNumBegin">
+              <!-- <el-form-item label="流水号:" prop="serialNumBegin">
                 <el-input
                   v-model="listQuery.serialNumBegin"
                   placeholder=""
@@ -70,8 +70,8 @@
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
                 />
-              </el-form-item>
-              <el-form-item label="-" prop="serialNumEnd">
+              </el-form-item> -->
+              <!-- <el-form-item label="-" prop="serialNumEnd">
                 <el-input
                   v-model="listQuery.serialNumEnd"
                   placeholder=""
@@ -80,9 +80,9 @@
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
                 />
-              </el-form-item>
+              </el-form-item> -->
               <!-- <el-row> -->
-              <el-form-item label="大众顺序号:" prop="HostSNBegin">
+              <!-- <el-form-item label="大众顺序号:" prop="HostSNBegin">
                 <el-input
                   v-model="listQuery.HostSNBegin"
                   placeholder=""
@@ -101,9 +101,9 @@
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
                 />
-              </el-form-item>
+              </el-form-item> -->
 
-              <el-form-item label="KNR:" prop="KNRBegin">
+              <!-- <el-form-item label="KNR:" prop="KNRBegin">
                 <el-input
                   v-model="listQuery.KNRBegin"
                   placeholder=""
@@ -122,10 +122,10 @@
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
                 />
-              </el-form-item>
+              </el-form-item> -->
               <!-- </el-row> -->
               <!-- <el-row> -->
-              <el-form-item label="底盘号:" prop="VINBegin">
+              <!-- <el-form-item label="底盘号:" prop="VINBegin">
                 <el-input
                   v-model="listQuery.VINBegin"
                   placeholder=""
@@ -144,9 +144,9 @@
                   style="width: 240px"
                   @keyup.enter.native="handleQuery"
                 />
-              </el-form-item>
+              </el-form-item> -->
 
-              <el-form-item label="上线日期">
+              <!-- <el-form-item label="上线日期">
                 <el-date-picker
                   v-model="listQuery.OnlineTimeValue"
                   size="small"
@@ -157,10 +157,10 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                 ></el-date-picker>
-              </el-form-item>
+              </el-form-item> -->
               <!-- </el-row> -->
               <!-- <el-row> -->
-              <el-form-item label="接收日期">
+              <!-- <el-form-item label="接收日期">
                 <el-date-picker
                   v-model="listQuery.ReceiveTimeValue"
                   size="small"
@@ -171,8 +171,8 @@
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                 ></el-date-picker>
-              </el-form-item>
-              <el-form-item label="单据状态" prop="State" v-show="isShowState">
+              </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"
@@ -183,9 +183,9 @@
                     {{ item.name }}
                   </el-checkbox>
                 </el-checkbox-group>
-              </el-form-item>
-            </el-collapse-item>
-          </el-collapse>
+              </el-form-item> -->
+            <!-- </el-collapse-item>
+          </el-collapse> -->
           <el-form-item style="margin-top: -10px">
             <el-button
               type="primary"
@@ -233,22 +233,40 @@
               @click="makeUpPrint()"
               >补打门板发货排序单
             </el-button>
-            <!-- margin-left: 550px; -->
             <el-button
+              ref="btn4"
+              type="primary"
+              v-show="this.listQuery.productType === 1"
+              size="mini"
+              style="margin-left: 15px"
+              @click="drawerMB = true"
+              >门板重打和作废
+            </el-button>
+            <el-button
+              ref="btn5"
+              type="primary"
+              v-show="this.listQuery.productType === 2"
+              size="mini"
+              style="margin-left: 15px"
+              @click="drawerMB = true"
+              >柱护板重打和作废
+            </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
+            > -->
+            <!-- <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> -->
@@ -543,7 +561,7 @@ export default {
         ReceiveTimeValue: [],
         ReceiveTimeBegin: undefined,
         ReceiveTimeEnd: undefined,
-        billStatus: undefined,
+        billStatus: 1,
         state: [],
       },
       listExportQuery: {
@@ -846,7 +864,7 @@ export default {
         this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
         this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
       }
-      if (this.listQuery.state !== undefined) {
+      if (this.listQuery.state == 1) {
         this.listQuery.billStatus = this.listQuery.state[0];
       }
       this.$axios
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
new file mode 100644
index 00000000..ed353a88
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -0,0 +1,1652 @@
+<!--正常打印页-->
+<template>
+  <div class="cr-body-content">
+    <div ref="box">
+      <flexbox class="content-header">
+        <el-form
+          :model="listQuery"
+          ref="queryForm"
+          v-show="showSearch"
+          :inline="true"
+        >
+          <!-- <el-row> -->
+          <el-form-item label="生产线:" prop="productType">
+            <el-select
+              v-model="listQuery.productType"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="ptypeselectChange"
+            >
+              <el-option
+                v-for="item in productTypeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="productLine">
+            <el-select
+              v-model="listQuery.productLine"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="valueselectChange"
+            >
+              <el-option
+                v-for="item in PLChildList"
+                :key="item.id"
+                :label="item.productLineName"
+                :value="item.productLineCode"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleFilter"
+              >搜索</el-button
+            >
+            <el-button
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery('queryForm')"
+              >重置</el-button
+            >
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              style="margin-left: 15px"
+              @click="handleDownload()"
+              >导出(Excel)
+            </el-button>
+            <el-button
+              ref="btn1"
+              type="primary"
+              size="mini"
+              style="margin-left: 15px"
+              @click="print()"
+              >打印门板发货排序单
+            </el-button>
+            <el-button
+              v-show="this.listQuery.productType === 1"
+              @click="drawerMBPrint = true"
+              size="mini"
+              type="warning"
+              plain
+            >
+              <strong>重新打印门板</strong></el-button
+            >
+            <el-button
+              v-show="this.listQuery.productType === 1"
+              @click="drawerMBDelete = true"
+              size="mini"
+              type="danger"
+              plain
+              ><strong>门板作废</strong></el-button
+            >
+
+            <el-button
+              v-show="this.listQuery.productType === 2"
+              @click="drawerZHBPrint = true"
+              size="mini"
+              type="warning"
+              plain
+            >
+              <strong>重新打印柱护板</strong></el-button
+            >
+            <el-button
+              v-show="this.listQuery.productType === 2"
+              @click="drawerZHBDelete = true"
+              size="mini"
+              type="danger"
+              plain
+              ><strong>柱护板作废</strong></el-button
+            >
+          </el-form-item>
+
+          <!-- </el-row> -->
+        </el-form>
+      </flexbox>
+    </div>
+    <!--门板重打-->
+    <el-drawer
+      title="门板重新打印"
+      :visible.sync="drawerMBPrint"
+      direction="rtl"
+      size="65%"
+    >
+      <RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
+    </el-drawer>
+      <!--门板作废-->
+    <el-drawer
+      title="门板作废"
+      :visible.sync="drawerMBDelete"
+      direction="rtl"
+      size="65%"
+    >
+      <ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
+    </el-drawer>
+    <!--柱护板重打-->
+    <el-drawer
+      title="柱护板重新打印"
+      :visible.sync="drawerZHBPrint"
+      direction="rtl"
+      size="65%"
+    >
+      <RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
+    </el-drawer>
+    <!--柱护板重打和作废-->
+    <el-drawer
+      title="柱护板作废"
+      :visible.sync="drawerZHBDelete"
+      direction="rtl"
+      size="65%"
+    >
+      <ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
+    </el-drawer>
+
+    <div class="l-table" style="margin-top: -10px">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="底盘号"
+          prop="vin "
+          sortable="custom"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.vin
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div>
+      <el-dialog
+        :visible.sync="dialogFormVisible"
+        :close-on-click-modal="false"
+        :title="formTitle"
+        width="700px"
+        @close="closeDialog"
+      >
+        <el-form
+          ref="form"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          size="small"
+          label-width="120px"
+        >
+          <el-row>
+            <el-col :span="24">
+              <el-row>
+                <el-col :md="10" :xs="24">
+                  <el-form-item
+                    label="要打印数量:"
+                    prop="printNum"
+                    v-show="this.listQuery.productType === 1"
+                  >
+                    <el-input-number
+                      v-model="printNum"
+                      :min="1"
+                      :step="1"
+                      @change="valueNumChange"
+                    ></el-input-number>
+                  </el-form-item>
+                </el-col>
+                <el-col :md="10" :xs="24">
+                  <el-form-item
+                    label="产线:"
+                    prop="printNum"
+                    v-show="this.listQuery.productType === 1"
+                  >
+                    {{ this.productName }}
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-row>
+                  <el-col :md="10" :xs="24">
+                    <el-form-item
+                      label="要打印数量:"
+                      prop="printNumZHB"
+                      v-show="this.listQuery.productType === 2"
+                    >
+                      <el-input-number
+                        v-model="printNumZHB"
+                        :min="1"
+                        :step="1"
+                        @change="valueNumChangeZHB"
+                      ></el-input-number>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :md="10" :xs="24">
+                    <el-form-item
+                      label="产线:"
+                      v-show="this.listQuery.productType === 2"
+                    >
+                      {{ this.productName }}
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-row>
+              <el-form-item
+                label="大众顺序号1:"
+                prop="beginHostSN"
+                v-show="isShowHostSN"
+              >
+                <el-input
+                  v-model="form.beginHostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endHostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
+                <el-input
+                  v-model="form.beginVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="dialogFormVisible = false"
+            >取消</el-button
+          >
+          <el-button v-loading="formLoading" type="primary" @click="save"
+            >确认</el-button
+          >
+        </div>
+      </el-dialog>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        style="margin-bottom: -5px; float: right"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import { mapGetters } from "vuex";
+import moment from "moment";
+import Detail from "./detail.vue";
+import MBDetail from "./detailMB.vue";
+import ZHBDetail from "./detailZHB.vue";
+import { downloadFile } from "@/utils/crmindex.js";
+import qs from "qs";
+import RepetitionMB from './RepetitionMB.vue'
+import RepetitionZHB from './RepetitionZHB.vue'
+import ScrapMB from './ScrapMB.vue'
+import ScrapZHB from './ScrapZHB.vue'
+
+export default {
+  name: "M100Online",
+  components: {
+    Pagination,
+    CRMTableHead,
+    importExcel,
+    Detail,
+    MBDetail,
+    ZHBDetail,
+    RepetitionMB,
+    RepetitionZHB,
+    ScrapMB,
+    ScrapZHB
+  },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      crmType: "M100Online",
+      drawerMBPrint: false,
+      drawerMBDelete: false,
+      drawerZHBPrint: false,
+      drawerZHBDelete: false,
+      activeNames: ["1"],
+      printNum: "12",
+      printNumZHB: "24",
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      billState: [
+        { id: 2, name: "已匹配" },
+        { id: 3, name: "已打印" },
+      ],
+      valueSelect: "",
+      productName: "",
+      customerInfos: [],
+      customerInfosMB: [],
+      customerInfosZHB: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        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: [],
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      vinPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      fileQuery: {
+        dataname: undefined,
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLList: [], //产线下拉
+      PLChildList: [], //筛选后产线下拉
+      productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
+      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 - 67 - 79; //57为footer高度，79为页面上部标签高度
+      //this.tableHeight = offsetHei -260
+    });
+  },
+  created() {
+    this.billState.forEach((element, index) => {
+      if (index === 0) {
+        this.listQuery.state.push(element.id);
+      }
+    });
+    this.getProductLine();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+      // tempsTabs.push({
+      //   label: "底盘号",
+      //   prop: "vin",
+      //   width: 130,
+      // });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100上线时间",
+        prop: "onlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100接收时间",
+        prop: "receiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100上线时间",
+        prop: "r100OnlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100接收时间",
+        prop: "r100ReceiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "状态",
+        prop: "billStatus",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "备注",
+        prop: "remark",
+        width: 120,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //门板打印数量更改
+    valueNumChange(val) {
+      this.printNum = val;
+      this.$axios
+        .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
+        .then((response) => {
+          if (response.item !== null) {
+            this.form.beginHostSN = parseInt(response.item);
+            if (val == 12) {
+              //门板
+              this.form.endHostSN = parseInt(response.item) + 11;
+            } else {
+              this.form.endHostSN = parseInt(response.item) + this.printNum - 1;
+            }
+          } else {
+            this.$message({
+              message: "获取不到大众顺序号",
+              type: "warning",
+            });
+            return;
+          }
+        });
+    },
+    //柱护板打印更改
+    valueNumChangeZHB(val) {
+      this.printNumZHB = val;
+      this.$axios
+        .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
+        .then((response) => {
+          if (response.item !== null) {
+            this.form.beginHostSN = parseInt(response.item);
+            if (val == 24) {
+              //柱护板
+              this.form.endHostSN = parseInt(response.item) + 23;
+            } else {
+              this.form.endHostSN =
+                parseInt(response.item) + this.printNumZHB - 1;
+            }
+          } else {
+            this.$message({
+              message: "获取不到大众顺序号",
+              type: "warning",
+            });
+            return;
+          }
+        });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      //console.log(510)
+      //console.log(param)
+      var parentId = param.assemblyID; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + id)
+        .then((response) => {
+          this.form = response.item;
+          //this.details = response.item.details;
+          //console.log(this.details);
+        });
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+      console.log(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
+        .then((res) => {
+          let filename = res.item;
+          this.$axios
+            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
+            .then((response) => {
+              if (filename.indexOf("_") != -1) {
+                let downName =
+                  filename.slice(0, filename.lastIndexOf("_")) +
+                  filename.slice(filename.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, filename);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+      this.listLoading = false;
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.$refs[refName].resetFields();
+      this.listQuery.OnlineTimeValue = [];
+      this.listQuery.ReceiveTimeValue = [];
+      this.listQuery.state = [];
+      this.handleQuery();
+      this.getProductLine();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.listQuery.SkipCount = 1;
+      //this.getList();
+    },
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      //this.getList();
+    },
+
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+
+    handleAddDetails() {
+      if (this.form.details === undefined) {
+        this.form.details = [];
+        //console.log(679);
+      }
+      let obj = {};
+      obj.partCode = "";
+      obj.partName = "";
+      obj.partNum = "";
+      obj.isKey = false;
+      obj.description = "";
+
+      //console.log(this.form.details);
+      this.form.details.push(obj);
+      //console.log(688);
+    },
+    handleDeleteDetails(index) {
+      this.form.details.splice(index, 1);
+      //console.log(693);
+    },
+
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "billStatus") {
+        return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
+      }
+      if (column.property == "onlineTime" || column.property == "receiveTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.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) {
+        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
+      }
+      if (this.listQuery.state !== undefined) {
+        this.listQuery.billStatus = this.listQuery.state[0];
+      }
+      this.$axios
+        .gets("/api/newjit/bill-m100/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    getDetialList(partCode) {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
+        .then((response) => {
+          //console.log(partCode)
+          if (partCode !== "" && partCode !== undefined) {
+            //console.log(partCode)
+            this.list = response.item.details.filter(
+              (u) => u.partCode === partCode
+            );
+          } else {
+            this.list = response.item.details;
+          }
+          //alert(JSON.stringify(response.Items))
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    valueselectChange(val) {
+      this.$forceUpdate();
+      this.customerInfosMB = [];
+      this.customerInfosZHB = [];
+      if (this.listQuery.productType === 1) {
+        //把产线值传到子组件
+        this.customerInfosMB = [
+          {
+            PrintType: 1,
+            ProductLine: val,
+          },
+        ];
+      }
+      if (this.listQuery.productType === 2) {
+        //把产线值传到子组件
+        this.customerInfosZHB = [
+          {
+            PrintType: 1,
+            ProductLine: val,
+          },
+        ];
+      }
+    },
+    handleImportSAP() {},
+
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+
+    closeDialog() {},
+    /**打印 */
+    print() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 0);
+      this.hostPrintQuery.printType = 0;
+      this.vinPrintQuery.printType = 0;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
+      }
+      this.hostSNQuery.productLine = this.listQuery.productLine;
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      //后端服务更改了 前端跟着更改成以下方式
+      if (this.listQuery.productType === 1) {
+        //门板
+        this.hostSNQuery.isZhuHuBan = "0";
+        console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+        this.$axios
+          .gets(
+            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            this.hostSNQuery
+          )
+          .then((response) => {
+            console.log("获取hostsn大众顺序号起始");
+            console.log(response.item);
+            if (response.item !== null) {
+              this.form.beginHostSN = parseInt(response.item);
+              if (this.listQuery.productType === 1) {
+                this.form.endHostSN = parseInt(response.item) + 11;
+              } else if (this.listQuery.productType === 2) {
+                //柱护板
+                this.form.endHostSN = parseInt(response.item) + 23;
+              }
+            } else {
+              this.$message({
+                message: "获取不到大众顺序号",
+                type: "warning",
+              });
+              return;
+            }
+          });
+      } else if (this.listQuery.productType === 2) {
+        //柱护板
+        this.hostSNQuery.isZhuHuBan = "1";
+        console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+        this.$axios
+          .gets(
+            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            this.hostSNQuery
+          )
+          .then((response) => {
+            console.log("获取hostsn大众顺序号起始");
+            console.log(response.item);
+            if (response.item !== null) {
+              this.form.beginHostSN = parseInt(response.item);
+              if (this.listQuery.productType === 1) {
+                //门板
+                this.form.endHostSN = parseInt(response.item) + 11;
+              } else if (this.listQuery.productType === 2) {
+                //柱护板
+                this.form.endHostSN = parseInt(response.item) + 23;
+              }
+            } else {
+              this.$message({
+                message: "获取不到大众顺序号",
+                type: "warning",
+              });
+              return;
+            }
+          });
+      }
+      if (this.$refs.btn1.$el.innerText === "打印门板发货排序单") {
+        this.productName = "";
+        switch (this.listQuery.productLine) {
+          case "01":
+            this.productName = "总装-01";
+            break;
+          case "05":
+            this.productName = "总装-05";
+            break;
+          case "07":
+            this.productName = "总装-07";
+            break;
+          case "08":
+            this.productName = "总装-08";
+            break;
+        }
+
+        this.formTitle = "打印-门板发货排序单";
+      } else {
+        this.productName = "";
+        switch (this.listQuery.productLine) {
+          case "08":
+            this.productName = "总装-柱护板";
+            break;
+        }
+        this.formTitle = "打印-柱护板发货排序单";
+      }
+      //this.formTitle = "打印";
+      this.dialogFormVisible = true;
+      this.form = {
+        beginHostSN: "",
+        endHostSN: "",
+      };
+      this.isShowHostSN = true;
+      this.isShowVin = false;
+    },
+    /**重打 */
+    rePrint() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 1);
+      this.hostPrintQuery.printType = 1;
+      this.vinPrintQuery.printType = 1;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
+      }
+      this.formTitle = "重打";
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      this.dialogFormVisible = true;
+      this.form = {
+        beginVin: "",
+        endVin: "",
+      };
+      this.isShowHostSN = false;
+      this.isShowVin = true;
+    },
+    /**补打 */
+    makeUpPrint() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 2);
+      this.hostPrintQuery.printType = 2;
+      this.vinPrintQuery.printType = 2;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "error",
+        });
+        return;
+      }
+      this.formTitle = "补打";
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      this.dialogFormVisible = true;
+      this.form = {
+        beginVin: "",
+        endVin: "",
+      };
+      this.isShowHostSN = false;
+      this.isShowVin = true;
+    },
+    /**保存*/
+    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
+            ) {
+              this.$message({
+                message: "起止大众顺序号相减不能为零！",
+                type: "error",
+              });
+              return;
+            }
+          } else if (this.listQuery.productType === 2) {
+            //柱护板
+            if (
+              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) >
+              23
+            ) {
+              this.$message({
+                message:
+                  "最多只能打印24个顺序号，终止顺序号不能大于" +
+                  (parseInt(this.form.beginHostSN) + 23),
+                type: "error",
+              });
+              return;
+            }
+          }
+        }
+      }
+      if (this.isShowVin === true) {
+        if (this.form.beginVin === "" || this.form.endVin === "") {
+          this.$message({
+            message: "请输入完整的底盘号起始范围",
+            type: "error",
+          });
+          return;
+        }
+      }
+      /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
+      if (
+        this.formTitle === "打印-门板发货排序单" ||
+        this.formTitle === "打印-柱护板发货排序单"
+      ) {
+        this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
+        this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
+
+        if (this.listQuery.productType === 1) {
+          //门板-打印
+          this.$axios
+            .posts(
+              "/api/newjit/bill-m100/check-mb-hostsn-break-num",
+              this.hostCheckQuery
+            )
+            .then((response) => {
+              console.log("检查门板-大众顺序号是否断号");
+              response.item = ["断号1", "断号2"];
+              if (response.item.length > 0) {
+                //有断号
+                this.$confirm(
+                  "本次打印存在断号是否继续?" + response.item,
+                  "提示",
+                  {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                  }
+                )
+                  .then(() => {
+                    //门板
+                    //传递大众顺序号起止
+                    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); //打印我文件流
+                            });
+                        }
+                      });
+                  })
+                  .catch(() => {});
+              } //无断号
+              else {
+                //门板
+                //传递大众顺序号起止
+                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) {
+          //柱护板
+          this.$axios
+            .posts(
+              "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
+              this.hostCheckQuery
+            )
+            .then((response) => {
+              console.log("检查柱护板-大众顺序号是否断号");
+              response.item = ["断号1", "断号2"];
+              if (response.item.length > 0) {
+                //有断号
+                this.$confirm(
+                  "本次打印存在断号是否继续?" + response.item,
+                  "提示",
+                  {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                  }
+                )
+                  .then(() => {
+                    //门板
+                    //传递大众顺序号起止
+                    this.$axios
+                      .posts(
+                        "/api/newjit/bill-m100/print-zhuhuban-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); //打印我文件流
+                            });
+                        }
+                      });
+                  })
+                  .catch(() => {});
+              } //无断号
+              else {
+                //门板
+                //传递大众顺序号起止
+                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=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 {
+        /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
+        this.hostPrintQuery.beginVin = this.form.beginVin;
+        this.hostPrintQuery.endVin = this.form.endVin;
+        //判断productType类型
+        if (this.listQuery.productType === 1) {
+          //门板
+          //传递底盘号起止
+          this.$axios
+            .posts(
+              "/api/newjit/bill-m100/print-menban-packing-list",
+              this.hostPrintQuery
+            )
+            .then((response) => {
+              console.log(
+                "重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
+              );
+              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) {
+          //柱护板
+          //传递底盘号起止
+          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 = "zhuhuban";
+                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;
+            });
+        }
+      }
+    },
+    //获取所有产线
+    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;
+          if (this.listQuery.productLine != "") {
+            //把产线值传到子组件
+            this.customerInfosMB = [
+              {
+                PrintType: 1,
+                ProductLine: this.PLChildList[0].productLineCode,
+              },
+            ];
+          }
+          this.getList();
+          //console.log(this.PLList)
+        })
+        .catch(() => {});
+    },
+    //产线类型变更
+    ptypeselectChange() {
+      this.$forceUpdate();
+      //console.log(this.listQuery.productType);
+      this.listQuery.productLine = "";
+      this.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
+      //console.log(this.PLList)
+      //变更打印按钮文字
+      if (this.listQuery.productType === 1) {
+        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
+        this.listQuery.state.push(this.billState[0].id);
+        this.isShowState = true;
+      } else if (this.listQuery.productType === 2) {
+        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+        this.listQuery.state = [];
+        this.isShowState = false;
+      }
+    },
+    /*单据状态变更 */
+    checkedListChange(index) {
+      if (this.listQuery.state.length <= 1) {
+        this.listQuery.state.push(this.billState[index].id);
+      } else {
+        this.listQuery.state = [];
+        this.listQuery.state.push(this.billState[index].id);
+      }
+    },
+    /**解析文件流 */
+    getUrl() {
+      //dataResult.data是后台返回的流
+      let pdfUrl = window.URL.createObjectURL(
+        new Blob([dataResult.data], { type: `application/pdf` })
+      );
+      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
+      const link = document.createElement("a");
+      link.href = pdfUrl;
+      link.setAttribute("download", "下载的文件名");
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+    },
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+    },
+    httpPost(URL, PARAMS) {
+      var temp = document.createElement("form");
+      temp.action = URL;
+      temp.method = "post";
+      temp.style.display = "none";
+
+      for (var x in PARAMS) {
+        var opt = document.createElement("textarea");
+        opt.name = x;
+        opt.value = PARAMS[x];
+        temp.appendChild(opt);
+      }
+
+      document.body.appendChild(temp);
+      temp.submit();
+
+      return temp;
+    },
+  },
+};
+</script>
+
+
+
+<style lang="scss" scoped>
+@import "../../../pg-fis/styles/crmtable.scss";
+
+// /*表格全选框去除空框*/
+// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
+//   display: none;
+//   position: relative;
+// }
+// /*表格全选框改为：选择*/
+// .el-table >>> .DisabledSelection .cell:before {
+//   content: "是否Key件";
+//   position: absolute;
+//   left: 7px;
+// }
+.divider1 {
+  margin: 0;
+}
+.divider2 {
+  margin: 10px;
+  margin-bottom: 20px;
+  width: 95%;
+}
+.label1 {
+  margin-left: 5px;
+  margin-right: 5px;
+}
+</style>
+
+
diff --git a/vue/src/views/pg-fis/basedate/select/detail.vue b/vue/src/views/pg-fis/basedate/select/detail.vue
new file mode 100644
index 00000000..8f84588e
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/select/detail.vue
@@ -0,0 +1,354 @@
+<!--M100上线信息-明细数据-->
+<template>
+  <div class="cr-body-content">
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="listLoading"
+      element-loading-text="拼命加载中..."
+      element-loading-spinner="el-icon-loading"
+      class="cr-table"
+      :data="list"
+      :height="tableHeight"
+      :cell-style="cellStyle"
+      :header-cell-style="headerRowStyle"
+      size="small"
+      stripe
+      border
+      highlight-current-row
+      style="width: 100%"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+      :row-key="getRowKeys"
+      :expand-row-keys="expands"
+      @expand-change="exChange"
+    >
+      <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+      <!-- <el-table-column
+        prop="总成名称"
+        label="erpAssemblyName"
+        sortable
+        width="180"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="erpAssemblyVersion"
+        label="总成版本号"
+        sortable
+        width="180"
+      >
+              style="width: calc(100% - 47px)"
+            class="two-list"
+      </el-table-column> -->
+
+      <el-table-column type="expand" prop="details">
+        <template slot-scope="scope">
+          <el-table :data="scope.row.details">
+            <el-table-column
+              prop="partCode"
+              label="客户零件代码"
+            ></el-table-column>
+            <el-table-column
+              prop="partNum"
+              label="客户零件数量"
+            ></el-table-column>
+            <el-table-column prop="description" label="描述"></el-table-column>
+            <el-table-column prop="isKey" label="是否Key件">
+              <template slot-scope="scope">
+                <span v-if="scope.row.isKey == true">
+                  <span style="color: #00b46d">是</span>
+                </span>
+                <span v-else>
+                  <span style="color: #d75c89">否</span>
+                </span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-for="(item, index) in getDefaultField"
+        :key="index"
+        :prop="item.prop"
+        :label="item.label"
+        :min-width="item.width"
+        :formatter="fieldFormatter"
+        sortable="custom"
+        show-overflow-tooltip
+        :gutter="0"
+      >
+        <template slot="header" slot-scope="scope">
+          {{ scope.column.label }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="erpAssemblyVersion"
+        label="总成版本号"
+        sortable
+        width="360"
+      >
+      </el-table-column>
+    </el-table>
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import { downloadFile } from "@/utils/crmindex.js";
+import Detail from "./detail";
+
+export default {
+  name: "sendUnsettledDiffReport",
+  components: { Pagination, CRMTableHead, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      crmType: "stockFisDiffReport",
+      rules: {
+        //前端定义的规则，后端也有验证
+        erpMaterialCode: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      expands: [], //只展开一行放入当前行id
+      getRowKeys: (row) => {
+        return row.id; //这里看这一行中需要根据哪个属性值是id
+      },
+      searchContent: "", // 输入内容
+      customerInfo: {
+        parentId: "",
+      },
+      form: {
+        dicDetailID: "",
+        customerId: "",
+        projectId: "",
+      },
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      formLoading: false,
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        Filters: [
+          {
+            logic: 0,
+            column: "Enabled",
+            action: 0,
+            value: "true",
+          }, //默认查询可用的
+        ],
+        SkipCount: 0,
+        MaxResultCount: 15,
+        id: "",
+      },
+      page: 1,
+      dialogFormVisible: false,
+      multipleSelection: [],
+      formTitle: "",
+      drawer: false,
+      showExcelImport: false,
+      tableHeight: document.documentElement.clientHeight - 30,
+      isEdit: false,
+    };
+  },
+  mounted() {
+    var self = this;
+    window.onresize = function () {
+      var offsetHei = document.documentElement.clientHeight;
+      self.tableHeight = offsetHei - 30;
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfos: {
+      handler(newVal) {
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.parentId = element.ParentId;
+          });
+          if (this.customerInfo.parentId != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    /** 列表字段 */
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({
+        label: "总成编号",
+        prop: "erpAssemblyCode",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "总成名称",
+        prop: "erpAssemblyName",
+        width: 160,
+      });
+      // tempsTabs.push({
+      //   label: "总成版本号",
+      //   prop: "erpAssemblyName",
+      //   width: 160,
+      // });
+      return tempsTabs;
+    },
+  },
+  methods: {
+    exChange(row, rowList) {
+      this.loading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      return row[column.property] || "--";
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      this.getList();
+    },
+    getList() {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      //alert("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      let vehicleAssemblyId = { vehicleAssemblyId: this.customerInfo.parentId };
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-vehicle/list", vehicleAssemblyId)
+        .then((response) => {
+          this.list = response;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /** 筛选操作 */
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+      this.listQuery.Filters = [];
+      if (this.searchContent != "") {
+        var column = "partCode";
+        let filter = {
+          logic: 0,
+          column: column,
+          action: 6,
+          value: this.searchContent,
+        };
+        this.listQuery.Filters.push(filter);
+      }
+      this.getList();
+    },
+    resetQuery() {},
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (
+        column.property === "fisQty" ||
+        column.property === "diffQty" ||
+        column.property === "stockQty"
+      ) {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../../pg-fis/styles/crmtable.scss";
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/select/detailMB.vue b/vue/src/views/pg-fis/basedate/select/detailMB.vue
new file mode 100644
index 00000000..70716a7f
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/select/detailMB.vue
@@ -0,0 +1,765 @@
+<!--总成模块信息管理页-->
+<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) {
+        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.printType = element.PrintType;
+            this.customerInfo.productLine = element.ProductLine;
+          });
+          if (this.customerInfo.productLine != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
+      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
+      tempsTabs.push({
+        label: "左或右",
+        prop: "billLocation",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "供应商厂家代码",
+        prop: "providerCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "零件类型",
+        prop: "partType",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "器具容量",
+        prop: "capacity",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "打印日期",
+        prop: "printDate",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "打印类型",
+        prop: "printType",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "生产线",
+        prop: "productLine",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "起底盘号",
+        prop: "beginVin",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "止底盘号",
+        prop: "endVin",
+        width: 160,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    exChange(row, rowList) {
+      //this.listLoading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    //门板
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.billNum != "") {
+        this.listQuery.billNum = this.listQuery.billNum;
+      }
+      this.listQuery.partType = this.listQuery.partType;
+      this.listQuery.beginVin = this.listQuery.beginVin;
+      this.listQuery.endVin = this.listQuery.endVin;
+      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
+      this.listQuery.endHostSN = this.listQuery.endHostSN;
+      var getdate5 = JSON.stringify(this.PrintTimeValue);
+      if (getdate5 != "[]") {
+        this.listQuery.beginPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[0] || undefined
+          : undefined;
+        this.listQuery.endPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[1] || undefined
+          : undefined;
+      } else {
+        this.listQuery.beginPrintDate = undefined;
+        this.listQuery.endPrintDate = undefined;
+      }
+      if (this.customerInfo.productLine != "") {
+        this.listQuery.ProductLine = this.customerInfo.productLine;
+      }
+
+      console.log(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/newjit/MenBanPackingList/MenBanPackingList-List",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    //重新打印-门板
+    handleUpdate(row) {
+      this.isEdit = true;
+      if (this.multipleSelection.length != 1) {
+        this.$message({
+          message: "重新打印必须选择单行，不能多选！",
+          type: "warning",
+        });
+        return;
+      } else {
+        //this.fetchData(this.multipleSelection[0].id);
+        //重新打印方法
+        let beginVin1 = this.multipleSelection[0].beginVin1;
+        let endVin1 = this.multipleSelection[0].endVin1;
+        var params = {
+          printType: 1,
+          productLine: this.customerInfo.productLine,
+          beginVin: beginVin1,
+          endVin: endVin1,
+        };
+        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+        this.$axios
+          .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
+          .then((response) => {
+            //alert(response.status);
+            const index = this.list.indexOf(row);
+            if (response.status === false) {
+              this.$message({
+                message: response.message,
+                type: "error",
+              });
+              return;
+            } else {
+              this.fileQuery.dataname = JSON.stringify(response.item);
+              console.log(
+                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
+              this.$axios
+                .posts(
+                  "/Handlers/Handler1.ashx?report=menban",
+                  qs.stringify(this.fileQuery)
+                )
+                .then((response) => {
+                  this.printpdf(response); //打印我文件流
+                });
+            }
+          })
+          .catch(() => {});
+      }
+    },
+    //作废操作，支持批量操作-门板
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否作废" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/newjit/MenBanPackingList/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "作废成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + id)
+        .then((response) => {
+          this.form = response.item;
+          //this.details = response.item.details;
+          //console.log(this.details);
+        });
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.$refs[refName].resetFields();
+      this.PrintTimeValue = [];
+      this.handleQuery();
+      this.getProductLine();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.listQuery.SkipCount = 1;
+      //this.getList();
+    },
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+
+    selectOptionsChange(item) {
+      this.getList();
+    },
+
+    /** 刷新列表 */
+    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/select/detailZHB.vue b/vue/src/views/pg-fis/basedate/select/detailZHB.vue
new file mode 100644
index 00000000..88022322
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/select/detailZHB.vue
@@ -0,0 +1,746 @@
+<!--总成模块信息管理页-->
+<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="partCode"
+                label="柱护板零件号"
+              ></el-table-column>
+              <el-table-column
+                prop="partCode2"
+                label="柱护板零件号2"
+              ></el-table-column>
+            </el-table>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="table-footer">
+        <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+        <pagination
+          v-show="totalCount > 0"
+          :total="totalCount"
+          style="margin-bottom: -5px; float: right"
+          :page.sync="page"
+          :limit.sync="listQuery.MaxResultCount"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import { mapGetters } from "vuex";
+import moment from "moment";
+import Detail from "./detail.vue";
+import { downloadFile } from "@/utils/crmindex.js";
+import qs from "qs";
+
+export default {
+  name: "M100Online-MB",
+  components: { Pagination, CRMTableHead, importExcel, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  props: {
+    customerInfosZHB: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      crmType: "M100Online-MB",
+      getRowKeys: (row) => {
+        return row.id; //这里看这一行中需要根据哪个属性值是id
+      },
+      expands: [], //只展开一行放入当前行id
+      PrintTimeValue: [],
+      activeNames: ["1"],
+      multipleSelection: [],
+      valueSelect: "",
+      customerInfos: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        printType: "1",
+        productLine: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        billNum: undefined,
+        partType: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginPrintDate: undefined,
+        endPrintDate: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      fileQuery: {
+        dataname: undefined,
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      tableHeightMB: document.documentElement.clientHeight - 300,
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLList: [], //产线下拉
+      isShowHostSN: false,
+      isShowVin: false,
+      isShowState: true,
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+      //this.tableHeight = offsetHei -260
+    });
+  },
+  created() {
+    this.getList();
+  },
+  watch: {
+    customerInfosZHB: {
+      handler(newVal) {
+        console.log("柱护板-接收的父组件的值：" + JSON.stringify(newVal));
+        if (newVal == "" || newVal == "undefined") {
+          //TODO
+        } else {
+          newVal.forEach((element) => {
+            this.customerInfo.printType = "1";
+            this.customerInfo.productLine = element.ProductLine;
+          });
+          console.log("柱护板监控传值：" + JSON.stringify(this.customerInfo));
+          if (this.customerInfo.productLine != "") {
+            this.getList();
+          }
+        }
+      },
+      immediate: true,
+    },
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 });
+      tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 });
+      tempsTabs.push({
+        label: "左或右",
+        prop: "billLocation",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "供应商厂家代码",
+        prop: "providerCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "零件类型",
+        prop: "partType",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "器具容量",
+        prop: "capacity",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "打印日期",
+        prop: "printDate",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "打印类型",
+        prop: "printType",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "生产线",
+        prop: "productLine",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "起底盘号",
+        prop: "beginVin",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "止底盘号",
+        prop: "endVin",
+        width: 160,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);alert("ifr.src:"+JSON.stringify(ifr.src))
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    exChange(row, rowList) {
+      //this.listLoading = true;
+
+      var that = this;
+      if (rowList.length) {
+        that.expands = [];
+        if (row) {
+          that.expands.push(row.id); // 只展开当前行id
+        }
+      } else {
+        that.expands = [];
+      }
+    },
+    //门板
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.listQuery.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQuery.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.billNum != "") {
+        this.listQuery.billNum = this.listQuery.billNum;
+      }
+      this.listQuery.partType = this.listQuery.partType;
+      this.listQuery.beginVin = this.listQuery.beginVin;
+      this.listQuery.endVin = this.listQuery.endVin;
+      this.listQuery.beginHostSN = this.listQuery.beginHostSN;
+      this.listQuery.endHostSN = this.listQuery.endHostSN;
+      var getdate5 = JSON.stringify(this.PrintTimeValue);
+      if (getdate5 != "[]") {
+        this.listQuery.beginPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[0] || undefined
+          : undefined;
+        this.listQuery.endPrintDate = this.PrintTimeValue
+          ? this.PrintTimeValue[1] || undefined
+          : undefined;
+      } else {
+        this.listQuery.beginPrintDate = undefined;
+        this.listQuery.endPrintDate = undefined;
+      }
+      if (this.customerInfo.productLine != "") {
+        this.listQuery.ProductLine = this.customerInfo.productLine;
+      }
+
+      console.log("柱护板-列表查询条件：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts(
+          "/api/newjit/ZhuHuBanPackingList/ZhuHuBanPackingList-List",
+          this.listQuery
+        )
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    //重新打印-门板
+    handleUpdate(row) {
+      this.isEdit = true;
+      if (this.multipleSelection.length != 1) {
+        this.$message({
+          message: "重新打印必须选择单行，不能多选！",
+          type: "warning",
+        });
+        return;
+      } else {
+        //this.fetchData(this.multipleSelection[0].id);
+        //重新打印方法
+        let beginVin1 = this.multipleSelection[0].beginVin1;
+        let endVin1 = this.multipleSelection[0].endVin1;
+        var params = {
+          printType: "1",
+          productLine: this.customerInfo.productLine,
+          beginVin: beginVin1,
+          endVin: endVin1,
+        };
+        console.log("柱护版-主界面传过来的值：" + JSON.stringify(params));
+        this.$axios
+          .posts("/api/newjit/bill-m100/print-zhuhuban-packing-list", params)
+          .then((response) => {
+            console.log("柱护版-打印返回的状态：" + response.status);
+            const index = this.list.indexOf(row);
+            if (response.status === false) {
+              this.$message({
+                message: response.message,
+                type: "error",
+              });
+              return;
+            } else {
+              this.fileQuery.dataname = JSON.stringify(response.item);
+              console.log(
+                "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
+                  JSON.stringify(this.fileQuery.dataname)
+              );
+              this.$axios
+                .posts(
+                  "/Handlers/Handler1.ashx?report=zhuhuban",
+                  qs.stringify(this.fileQuery)
+                )
+                .then((response) => {
+                  this.printpdf(response); //打印我文件流
+                });
+            }
+          })
+          .catch(() => {});
+      }
+    },
+    //作废操作，支持批量操作-门板
+    handleDelete(row) {
+      //批量删除
+      var params = [];
+      let myalert = ""; //声明变量，其变量必须在此声明后使用
+      if (row) {
+        //单行
+        params.push(row.id);
+        myalert = row.name;
+      } else {
+        //多选
+        this.multipleSelection.forEach((element) => {
+          let id = element.id;
+          params.push(id);
+        });
+        myalert = "选中项";
+      }
+      this.$confirm("是否作废" + myalert + "?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$axios
+            .posts("/api/newjit/ZhuHuBanPackingList/delete", params)
+            .then((response) => {
+              const index = this.list.indexOf(row);
+              this.$notify({
+                title: "成功",
+                message: "作废成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消操作",
+          });
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + id)
+        .then((response) => {
+          this.form = response.item;
+          //this.details = response.item.details;
+          //console.log(this.details);
+        });
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.$refs[refName].resetFields();
+      this.PrintTimeValue = [];
+      this.handleQuery();
+      this.getProductLine();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.listQuery.SkipCount = 1;
+      //this.getList();
+    },
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+
+    selectOptionsChange(item) {
+      this.getList();
+    },
+
+    /** 刷新列表 */
+    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/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
new file mode 100644
index 00000000..a7b2e2b3
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -0,0 +1,1569 @@
+<!--总成模块信息管理页-->
+<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-collapse accordion>
+            
+              <el-form-item label="版本:" prop="Version">
+                <el-input
+                  v-model="listQuery.Version"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <!-- </el-row> -->
+              <el-form-item label="流水号:" prop="serialNumBegin">
+                <el-input
+                  v-model="listQuery.serialNumBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="-" prop="serialNumEnd">
+                <el-input
+                  v-model="listQuery.serialNumEnd"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <!-- <el-row> -->
+              <el-form-item label="大众顺序号:" prop="HostSNBegin">
+                <el-input
+                  v-model="listQuery.HostSNBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="-" prop="HostSNEnd">
+                <el-input
+                  v-model="listQuery.HostSNEnd"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
+              <el-form-item label="KNR:" prop="KNRBegin">
+                <el-input
+                  v-model="listQuery.KNRBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="-" prop="KNREnd">
+                <el-input
+                  v-model="listQuery.KNREnd"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <!-- </el-row> -->
+              <!-- <el-row> -->
+              <el-form-item label="底盘号:" prop="VINBegin">
+                <el-input
+                  v-model="listQuery.VINBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="-" prop="VINEnd">
+                <el-input
+                  v-model="listQuery.VINEnd"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
+              <el-form-item label="上线日期">
+                <el-date-picker
+                  v-model="listQuery.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-collapse>
+          <el-form-item style="margin-top: -10px">
+            <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-row> -->
+        </el-form>
+      </flexbox>
+    </div>
+    <!--门板重打和作废-->
+    <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"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="底盘号"
+          prop="vin "
+          sortable="custom"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.vin
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div>
+      <el-dialog
+        :visible.sync="dialogFormVisible"
+        :close-on-click-modal="false"
+        :title="formTitle"
+        width="700px"
+        @close="closeDialog"
+      >
+        <el-form
+          ref="form"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          size="small"
+          label-width="120px"
+        >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item
+                label="大众顺序号:"
+                prop="beginHostSN"
+                v-show="isShowHostSN"
+              >
+                <el-input
+                  v-model="form.beginHostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endHostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
+                <el-input
+                  v-model="form.beginVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="dialogFormVisible = false"
+            >取消</el-button
+          >
+          <el-button v-loading="formLoading" type="primary" @click="save"
+            >确认</el-button
+          >
+        </div>
+      </el-dialog>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        style="margin-bottom: -5px; float: right"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import Detail from "./detail.vue";
+import MBDetail from "./detailMB.vue";
+import ZHBDetail from "./detailZHB.vue";
+import { mapGetters } from "vuex";
+import moment from "moment";
+
+import { downloadFile } from "@/utils/crmindex.js";
+import qs from "qs";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "select",
+  components: {
+    Pagination,
+    CRMTableHead,
+    importExcel,
+    Detail,
+    MBDetail,
+    ZHBDetail,
+  },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      crmType: "select",
+      drawerZHB: false,
+      drawerMB: false,
+      activeNames: ["1"],
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      billState: [
+        { id: 2, name: "未打印" },
+        { id: 3, name: "已打印" },
+        { id: 4, name: "不可打印" },
+      ],
+      valueSelect: "",
+      customerInfos: [],
+      customerInfosMB: [],
+      customerInfosZHB: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        productType: 1, //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: [],
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      vinPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      fileQuery: {
+        dataname: undefined,
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      bomUnit,
+      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,
+    };
+  },
+  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.billState.forEach((element, index) => {
+      if (index === 0) {
+        this.listQuery.state.push(element.id);
+      }
+    });
+    this.getProductLine();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+      // tempsTabs.push({
+      //   label: "底盘号",
+      //   prop: "vin",
+      //   width: 130,
+      // });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100上线时间",
+        prop: "onlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100接收时间",
+        prop: "receiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "状态",
+        prop: "billStatus",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "不可打印",
+        prop: "CanNotPrint",
+        width: 120,
+      });
+       tempsTabs.push({
+        label: "R100上线时间",
+        prop: "r100OnlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100接收时间",
+        prop: "r100ReceiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "备注",
+        prop: "remark",
+        width: 120,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      //console.log(510)
+      //console.log(param)
+      var parentId = param.assemblyID; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + id)
+        .then((response) => {
+          this.form = response.item;
+          //this.details = response.item.details;
+          //console.log(this.details);
+        });
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+      console.log(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/newjit/assembly-cfg-erp/export", this.listQuery)
+        .then((res) => {
+          let filename = res.item;
+          this.$axios
+            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
+            .then((response) => {
+              if (filename.indexOf("_") != -1) {
+                let downName =
+                  filename.slice(0, filename.lastIndexOf("_")) +
+                  filename.slice(filename.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, filename);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+      this.listLoading = false;
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.$refs[refName].resetFields();
+      this.listQuery.OnlineTimeValue = [];
+      this.listQuery.ReceiveTimeValue = [];
+      this.listQuery.state = [];
+      this.handleQuery();
+      this.getProductLine();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.listQuery.SkipCount = 1;
+      //this.getList();
+    },
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+    },
+
+    selectOptionsChange(item) {
+      this.getList();
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      //this.getList();
+    },
+
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+      }
+    },
+
+    handleAddDetails() {
+      if (this.form.details === undefined) {
+        this.form.details = [];
+        //console.log(679);
+      }
+      let obj = {};
+      obj.partCode = "";
+      obj.partName = "";
+      obj.partNum = "";
+      obj.isKey = false;
+      obj.description = "";
+
+      //console.log(this.form.details);
+      this.form.details.push(obj);
+      //console.log(688);
+    },
+    handleDeleteDetails(index) {
+      this.form.details.splice(index, 1);
+      //console.log(693);
+    },
+
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "billStatus") {
+        return { 1: "未匹配", 2: "已匹配", 3: "已打印" }[row[column.property]];
+      }
+      if (column.property == "onlineTime" || column.property == "receiveTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.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) {
+        this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1];
+      }
+      if (this.listQuery.state !== undefined) {
+        this.listQuery.billStatus = this.listQuery.state[0];
+      }
+      this.$axios
+        .gets("/api/newjit/bill-m100/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    getDetialList(partCode) {
+      this.listLoading = true;
+      console.log("详表条件：" + JSON.stringify(this.customerInfo.parentId));
+      this.$axios
+        .gets("/api/newjit/assembly-cfg-erp/" + this.customerInfo.parentId)
+        .then((response) => {
+          //console.log(partCode)
+          if (partCode !== "" && partCode !== undefined) {
+            //console.log(partCode)
+            this.list = response.item.details.filter(
+              (u) => u.partCode === partCode
+            );
+          } else {
+            this.list = response.item.details;
+          }
+          //alert(JSON.stringify(response.Items))
+          //this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    valueselectChange(val) {
+      this.$forceUpdate();
+      this.customerInfosMB = [];
+      this.customerInfosZHB = [];
+      if (this.listQuery.productType === 1) {
+        //把产线值传到子组件
+        this.customerInfosMB = [
+          {
+            PrintType: 1,
+            ProductLine: val,
+          },
+        ];
+      }
+      if (this.listQuery.productType === 2) {
+        //把产线值传到子组件
+        this.customerInfosZHB = [
+          {
+            PrintType: 1,
+            ProductLine: val,
+          },
+        ];
+      }
+    },
+    handleImportSAP() {},
+
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+    },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+
+    closeDialog() {},
+    /**打印 */
+    print() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 0);
+      this.hostPrintQuery.printType = 0;
+      this.vinPrintQuery.printType = 0;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
+      }
+      this.hostSNQuery.productLine = this.listQuery.productLine;
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      //后端服务更改了 前端跟着更改成以下方式
+      if (this.listQuery.productType === 1) {
+        //门板
+        this.hostSNQuery.isZhuHuBan = "0";
+        console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+        this.$axios
+          .gets(
+            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            this.hostSNQuery
+          )
+          .then((response) => {
+            console.log("获取hostsn大众顺序号起始");
+            console.log(response.item);
+            if (response.item !== null) {
+              this.form.beginHostSN = parseInt(response.item);
+              if (this.listQuery.productType === 1) {
+                //门板
+                this.form.endHostSN = parseInt(response.item) + 11;
+              } else if (this.listQuery.productType === 2) {
+                //柱护板
+                this.form.endHostSN = parseInt(response.item) + 23;
+              }
+            } else {
+              this.$message({
+                message: "获取不到大众顺序号",
+                type: "warning",
+              });
+              return;
+            }
+          });
+      } else if (this.listQuery.productType === 2) {
+        //柱护板
+        this.hostSNQuery.isZhuHuBan = "1";
+        console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
+        this.$axios
+          .gets(
+            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            this.hostSNQuery
+          )
+          .then((response) => {
+            console.log("获取hostsn大众顺序号起始");
+            console.log(response.item);
+            if (response.item !== null) {
+              this.form.beginHostSN = parseInt(response.item);
+              if (this.listQuery.productType === 1) {
+                //门板
+                this.form.endHostSN = parseInt(response.item) + 11;
+              } else if (this.listQuery.productType === 2) {
+                //柱护板
+                this.form.endHostSN = parseInt(response.item) + 23;
+              }
+            } else {
+              this.$message({
+                message: "获取不到大众顺序号",
+                type: "warning",
+              });
+              return;
+            }
+          });
+      }
+
+      // this.$axios
+      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn", this.hostSNQuery)
+      //   .then((response) => {
+      //     console.log("获取hostsn大众顺序号起始");
+      //     console.log(response.item);
+      //     if (response.item !== null) {
+      //       this.form.beginHostSN = parseInt(response.item);
+      //       if (this.listQuery.productType === 1) {
+      //         //门板
+      //         this.form.endHostSN = parseInt(response.item) + 11;
+      //       } else if (this.listQuery.productType === 2) {
+      //         //柱护板
+      //         this.form.endHostSN = parseInt(response.item) + 23;
+      //       }
+      //     } else {
+      //       this.$message({
+      //         message: "获取不到大众顺序号",
+      //         type: "warning",
+      //       });
+      //       return;
+      //     }
+      //   })
+      //   .catch(() => {});
+      this.formTitle = "打印";
+      this.dialogFormVisible = true;
+      this.form = {
+        beginHostSN: "",
+        endHostSN: "",
+      };
+      this.isShowHostSN = true;
+      this.isShowVin = false;
+    },
+    /**重打 */
+    rePrint() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 1);
+      this.hostPrintQuery.printType = 1;
+      this.vinPrintQuery.printType = 1;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
+      }
+      this.formTitle = "重打";
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      this.dialogFormVisible = true;
+      this.form = {
+        beginVin: "",
+        endVin: "",
+      };
+      this.isShowHostSN = false;
+      this.isShowVin = true;
+    },
+    /**补打 */
+    makeUpPrint() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      }),
+        (this.hostCheckQuery.printType = 2);
+      this.hostPrintQuery.printType = 2;
+      this.vinPrintQuery.printType = 2;
+      if (
+        this.listQuery.productLine === "" ||
+        this.listQuery.productLine === undefined
+      ) {
+        this.$message({
+          message: "请选择生产线",
+          type: "error",
+        });
+        return;
+      }
+      this.formTitle = "补打";
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      this.dialogFormVisible = true;
+      this.form = {
+        beginVin: "",
+        endVin: "",
+      };
+      this.isShowHostSN = false;
+      this.isShowVin = true;
+    },
+    /**保存*/
+    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
+            ) {
+              this.$message({
+                message: "起止大众顺序号相减不能为零！",
+                type: "error",
+              });
+              return;
+            }
+          } else if (this.listQuery.productType === 2) {
+            //柱护板
+            if (
+              parseInt(this.form.endHostSN) - parseInt(this.form.beginHostSN) >
+              23
+            ) {
+              this.$message({
+                message:
+                  "最多只能打印24个顺序号，终止顺序号不能大于" +
+                  (parseInt(this.form.beginHostSN) + 23),
+                type: "error",
+              });
+              return;
+            }
+          }
+        }
+      }
+      if (this.isShowVin === true) {
+        if (this.form.beginVin === "" || this.form.endVin === "") {
+          this.$message({
+            message: "请输入完整的底盘号起始范围",
+            type: "error",
+          });
+          return;
+        }
+      }
+      /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
+      if (this.formTitle === "打印") {
+        this.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) {
+                    //柱护板
+                    //传递大众顺序号起止
+                    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(
+                          "/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) {
+                //柱护板
+                //传递大众顺序号起止
+                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(() => {
+                    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) {
+          //门板
+          //传递底盘号起止
+          this.$axios
+            .posts(
+              "/api/newjit/bill-m100/print-menban-packing-list",
+              this.hostPrintQuery
+            )
+            .then((response) => {
+              console.log(
+                "重新或补打打印门板装箱单" + JSON.stringify(this.hostPrintQuery)
+              );
+              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) {
+          //柱护板
+          //传递底盘号起止
+          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 = "zhuhuban";
+                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;
+            });
+        }
+      }
+    },
+    //获取所有产线
+    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;
+          if (this.listQuery.productLine != "") {
+            //把产线值传到子组件
+            this.customerInfosMB = [
+              {
+                PrintType: 1,
+                ProductLine: this.PLChildList[0].productLineCode,
+              },
+            ];
+          }
+          this.getList();
+          //console.log(this.PLList)
+        })
+        .catch(() => {});
+    },
+    //产线类型变更
+    ptypeselectChange() {
+      this.$forceUpdate();
+      //console.log(this.listQuery.productType);
+      this.listQuery.productLine = "";
+      this.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
+      //console.log(this.PLList)
+      //变更打印按钮文字
+      if (this.listQuery.productType === 1) {
+        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
+        this.listQuery.state.push(this.billState[0].id);
+        this.isShowState = true;
+      } else if (this.listQuery.productType === 2) {
+        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+        this.listQuery.state = [];
+        this.isShowState = false;
+      }
+    },
+    /*单据状态变更 */
+    checkedListChange(index) {
+      if (this.listQuery.state.length <= 1) {
+        this.listQuery.state.push(this.billState[index].id);
+      } else {
+        this.listQuery.state = [];
+        this.listQuery.state.push(this.billState[index].id);
+      }
+    },
+    /**解析文件流 */
+    getUrl() {
+      //dataResult.data是后台返回的流
+      let pdfUrl = window.URL.createObjectURL(
+        new Blob([dataResult.data], { type: `application/pdf` })
+      );
+      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
+      const link = document.createElement("a");
+      link.href = pdfUrl;
+      link.setAttribute("download", "下载的文件名");
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+    },
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+    },
+    httpPost(URL, PARAMS) {
+      var temp = document.createElement("form");
+      temp.action = URL;
+      temp.method = "post";
+      temp.style.display = "none";
+
+      for (var x in PARAMS) {
+        var opt = document.createElement("textarea");
+        opt.name = x;
+        opt.value = PARAMS[x];
+        temp.appendChild(opt);
+      }
+
+      document.body.appendChild(temp);
+      temp.submit();
+
+      return temp;
+    },
+  },
+};
+</script>
+
+
+
+<style lang="scss" scoped>
+@import "../../../pg-fis/styles/crmtable.scss";
+
+// /*表格全选框去除空框*/
+// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
+//   display: none;
+//   position: relative;
+// }
+// /*表格全选框改为：选择*/
+// .el-table >>> .DisabledSelection .cell:before {
+//   content: "是否Key件";
+//   position: absolute;
+//   left: 7px;
+// }
+.divider1 {
+  margin: 0;
+}
+.divider2 {
+  margin: 10px;
+  margin-bottom: 20px;
+  width: 95%;
+}
+.label1 {
+  margin-left: 5px;
+  margin-right: 5px;
+}
+</style>
+
+
diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
index 632ee8b7..8cbf03e3 100644
--- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
+++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue
@@ -380,12 +380,28 @@
                 v-model="formCount.materialCode"
                 type="textarea"
                 style="width: 450px"
-                :rows="4"
+                :rows="6"
                 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"
+                type="textarea"
+                style="width: 450px"
+                :rows="6"
+                placeholder="多个厂内零件号，请以回车换行形式添加！"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
@@ -507,6 +523,7 @@ export default {
         settledate: "",
         materialCode: "",
         sapMaterialCode: "",
+        sapCode: "",
         chassisNumber: "",
         kennCode: "",
         version: "",
@@ -532,10 +549,12 @@ export default {
         materialGroup: undefined,
         begin: undefined,
         end: undefined,
+        sapCode: undefined
       },
       listQuery: {
         taskId: "",
         name: "",
+        type:""
       },
       page: 1,
       JobversionValue: "",
@@ -577,6 +596,7 @@ export default {
     this.getAllVersionList();
     this.getMaterialGroup();
     this.getList();
+    this.getJobVersionInfo();
     // this.getCurrentMonthFirst();
     // this.getCurrentMonthLast();
   },
@@ -588,7 +608,11 @@ export default {
     /* 主表头 */
     getDefaultField() {
       var tempsTabs = [];
-
+tempsTabs.push({
+        label: "版本号",
+        prop: "type",
+        width: 85,
+      });
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
@@ -608,6 +632,11 @@ export default {
         label: "创建时间",
         prop: "createdAt",
         width: 150,
+      });
+       tempsTabs.push({
+        label: "说明",
+        prop: "remark",
+        width: 220,
       });
       // tempsTabs.push({
       //   label: "操作名称",
@@ -743,35 +772,10 @@ export default {
           this.listExportQuery.matialCode = this.formCount.materialCode
             ? this.formCount.materialCode
             : undefined;
-          // if (this.formCount.materialCode != "") {
-          //   this.listExportQuery.matialCode = this.formCount.materialCode; //物料号
-          // }
-          // if (this.formCount.kennCode != "") {
-          //   this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
-          // }
-          // var getdate5 = JSON.stringify(this.datetime5);
-          // if (getdate5 != "[]") {
-          //   alert(this.datetime5[0]);
-          //   this.listExportQuery.begin = this.datetime5
-          //     ? this.datetime5[0] || undefined
-          //     : undefined;
-          //   this.listExportQuery.end = this.datetime5
-          //     ? this.datetime5[1] || undefined
-          //     : undefined;
-          // }
-          // if (this.startTime != "") {
-          //   this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
-          // }
-          // if (this.endTime != "") {
-          //   this.listExportQuery.cp7end = this.endTime; //CP5结束日期
-          // }
-          // if (this.formCount.chassisNumber != "") {
-          //   this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
-          // }
-          // if (this.formCount.materialGroupValue != "") {
-          //   this.listExportQuery.materialGroup =
-          //     this.formCount.materialGroupValue; //物料组车型
-          // }
+          //厂内零件号
+          this.listExportQuery.sapCode = this.formCount.sapCode
+            ? this.formCount.sapCode
+            : undefined;
           console.log(
             "发票与结算核对汇总-导出条件：" +
               JSON.stringify(this.listExportQuery)
diff --git a/vue/static/config.js b/vue/static/config.js
index da90e7f0..92b67e09 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -37,7 +37,7 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
       ip: 'http://192.168.0.140',
-      //ip: 'http://192.168.0.214',
+      //ip: 'http://192.168.0.62',
       //ip: 'http://149.223.116.5',
       //ip: 'http://114.116.225.148',
       //ip: 'http://10.123.148.162',