From 2623661cb6581e4bd111763b7522fad06c921a36 Mon Sep 17 00:00:00 2001
From: "hongrui.an" <297504645@qq.com>
Date: Mon, 4 Aug 2025 17:29:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AFpc=E3=80=91?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/public/config.js                          |    5 +
 vue/public/index.html                         |    1 +
 vue/src/axios/index.js                        |   13 +-
 vue/src/router/index.js                       |    4 +-
 vue/src/utils/crmindex.js                     |    3 +-
 .../views/pg-fis/basedate/m100BIll/index.vue  |    2 +-
 .../basedate/m100Online/RepetitionMB.vue      |    2 +-
 .../pg-fis/basedate/m100Online/ScrapMB.vue    |    2 +-
 .../pg-fis/basedate/m100Online/detailMB.vue   |    2 +-
 .../pg-fis/basedate/m100Online/index.vue      |    2 +-
 .../m100Online/normalPritIndex copy.vue       | 1993 +++++++++++++++++
 .../basedate/m100Online/normalPritIndex.vue   | 1058 +++------
 .../pg-fis/basedate/r100Online/index.vue      |    2 +-
 .../pg-fis/basedate/repeatR100/index.vue      |    2 +-
 .../views/pg-fis/basedate/select/detailMB.vue |    2 +-
 .../views/pg-fis/basedate/select/index.vue    |    2 +-
 .../pg-fis/basedate/weldingAssembly/index.vue |    2 +-
 .../ux/billManage/SettleDoorPanel/index.vue   |    2 +-
 vue/static/config.js                          |    4 +-
 19 files changed, 2300 insertions(+), 803 deletions(-)
 create mode 100644 vue/public/config.js
 create mode 100644 vue/src/views/pg-fis/basedate/m100Online/normalPritIndex copy.vue

diff --git a/vue/public/config.js b/vue/public/config.js
new file mode 100644
index 0000000..cf6cd67
--- /dev/null
+++ b/vue/public/config.js
@@ -0,0 +1,5 @@
+let sysConfig = {
+    authApi:'http://192.168.1.228:8066',
+    baseApi:'http://192.168.1.228:8092',
+    m100FleshTime:60000
+}
\ No newline at end of file
diff --git a/vue/public/index.html b/vue/public/index.html
index 5917c13..cabb99a 100644
--- a/vue/public/index.html
+++ b/vue/public/index.html
@@ -6,6 +6,7 @@
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <script type="text/javascript" src="config.js"></script>
     <title><%= webpackConfig.name %></title>
 <!--    <link rel="stylesheet" href="./css/style.css" type="text/css" />-->
     <!-- <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css"> -->
diff --git a/vue/src/axios/index.js b/vue/src/axios/index.js
index f020c7f..a8ab873 100644
--- a/vue/src/axios/index.js
+++ b/vue/src/axios/index.js
@@ -16,8 +16,8 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
 //TODO:配置读取
 axios.defaults.headers['Accept-Language'] = "zh-Hans"
 
-
-axios.defaults.baseURL = config.base.ip + ':' + config.base.backend_port
+axios.defaults.baseURL = sysConfig.baseApi
+// axios.defaults.baseURL = config.base.ip + ':' + config.base.backend_port
 //axios.defaults.baseURL = 'http://localhost:44344'; //?? 登录调试
 
 
@@ -304,7 +304,8 @@ export default {
   },
   instancePosts(url, params) { // 登录
     var instance = axios.create({
-      baseURL: config.base.ip + ':' + config.base.auth_port
+      baseURL: sysConfig.authApi
+      // baseURL: config.base.ip + ':' + config.base.auth_port
     })
     if (params.tenant && params.tenant.trim() != '') {
       url = url + "?__tenant=" + params.tenant
@@ -342,7 +343,8 @@ export default {
   },
   getUserInfo(url) { // 获取用户信息
     var instance = axios.create({
-      baseURL: config.base.ip + ':' + config.base.auth_port
+      baseURL: sysConfig.authApi
+      // baseURL: config.base.ip + ':' + config.base.auth_port
     })
     instance.defaults.headers.Authorization = 'Bearer ' + getToken()
     return new Promise((resolve, reject) => {
@@ -364,7 +366,8 @@ export default {
   },
   getPermissions(url, params) {
     var instance = axios.create({
-      baseURL: config.base.ip + ':' + config.base.backend_port
+      baseURL: sysConfig.baseApi
+      // baseURL: config.base.ip + ':' + config.base.backend_port
     })
     instance.defaults.headers.Authorization = 'Bearer ' + getToken()
     return new Promise((resolve, reject) => {
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 7753e71..2f9d1c2 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -64,10 +64,10 @@ export const constantRoutes = [
   },
   {
     path: '/login',
-    //component: () => import('@/views/login/index'),
+    component: () => import('@/views/login/index'),
 	  //component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
 	  //component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
-	  component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+	  // component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
     hidden: true
   },
   {
diff --git a/vue/src/utils/crmindex.js b/vue/src/utils/crmindex.js
index d98729b..08ed94b 100644
--- a/vue/src/utils/crmindex.js
+++ b/vue/src/utils/crmindex.js
@@ -400,7 +400,8 @@ export function parseTime(time, cFormat) {
 }
 
 export function downloadFileHttpRequest(apiurl,attachment){
-  let baseURL =config.base.ip + ':' + config.base.backend_port
+  let baseURL =sysConfig.baseApi
+  // let baseURL =config.base.ip + ':' + config.base.backend_port
 
   function createObjectURL(object) { 
     return (window.URL) ? window.URL.createObjectURL(object) : window.webkitURL.createObjectURL(object); 
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
index f3d83df..7f50f49 100644
--- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板 -->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
index 2d235e9..5d720dd 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
@@ -1,4 +1,4 @@
-<!--重新打印门板模块-->
+<!--重新打印门板模块 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
index 22a0146..40a9327 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
index 929265a..4f28950 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index da45289..f812c2c 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板?-->
 
 <!--
 此
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex copy.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex copy.vue
new file mode 100644
index 0000000..9a22c3e
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex copy.vue	
@@ -0,0 +1,1993 @@
+<!--日常打印M100信息模块-->
+<template>
+  <div class="cr-body-content normalPritIndexPage">
+    <div ref="box">
+      <div class="content-header" id="normalPritIndex-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 prop="productLine">
+            <el-select
+              v-model="listQuery.productLine"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 10px"
+              @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 
+            prop="GroupName" 
+            v-show="this.listQuery.productType == 2"
+          >
+            <el-select
+              v-model="listQuery.GroupName"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 10px"
+              @change="valueselectChange"
+            >
+              <el-option
+                v-for="(item,key) in PLChildGroupList"
+                :key="key"
+                :label="item"
+                :value="item"
+              />
+            </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="drawerbudaMBPrint = 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="drawerbudaZHBPrint = true"
+							size="mini"
+							type="warning"
+							plain
+						>
+							<strong>柱护板补打</strong></el-button
+						>
+						
+						
+            <el-button
+              v-show="this.listQuery.productType === 2"
+              @click="drawerZHBDelete = true"
+              size="mini"
+              type="danger"
+              plain
+              ><strong>柱护板作废</strong></el-button
+            >
+            <!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
+              >测试</el-button
+            >2Z
+            <el-button plain @click="open"> 不会自动关闭 </el-button> -->
+          </el-form-item>
+
+          <el-form-item>
+            <div class="tipper" v-if="tipper != ''" v-html="tipper"></div>
+            <!-- <div class="tipper">
+              <span ref="sp01">{{ content01 }}</span>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <span ref="sp05">{{ content05 }}</span>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <span ref="sp07">{{ content07 }}</span>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <span ref="sp08">{{ content08 }}</span>
+            </div> -->
+          </el-form-item>
+          <!-- </el-row> -->
+        </el-form>
+      </div>
+    </div>
+    <!--门板重打-->
+    <el-drawer
+      title="门板重新打印"
+      :visible.sync="drawerMBPrint"
+      direction="rtl"
+      size="900px"
+    >
+      <RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
+    </el-drawer>
+    <!--门板补打-->
+    <el-drawer
+      v-if="drawerbudaMBPrint"
+      title="门板补打"
+      :visible.sync="drawerbudaMBPrint"
+      direction="rtl"
+      size="900px"
+    >
+      <budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
+    </el-drawer>
+    <!--门板作废-->
+    <el-drawer
+      title="门板作废"
+      :visible.sync="drawerMBDelete"
+      direction="rtl"
+      @open="opens()"
+      size="900px"
+    >
+      <ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
+    </el-drawer>
+    <!--柱护板重打-->
+    <el-drawer
+      title="柱护板重新打印"
+      :visible.sync="drawerZHBPrint"
+      direction="rtl"
+      size="1000px"
+    >
+      <RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
+    </el-drawer>
+		
+		<!--柱护板补打-->
+		<el-drawer
+      v-if="drawerbudaZHBPrint"
+		  title="柱护板补打"
+		  :visible.sync="drawerbudaZHBPrint"
+		  direction="rtl"
+		  size="900px"
+		>
+		  <budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB>
+		</el-drawer>
+		
+    <!--柱护板重打和作废-->
+    <el-drawer
+      title="柱护板作废"
+      :visible.sync="drawerZHBDelete"
+      direction="rtl"
+      size="900px"
+    >
+      <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 :span="24">
+                  <el-form-item
+                    label="打印组类别:"
+                    prop="printNum"
+                    v-show="this.listQuery.productType === 1"
+                  >
+                    {{ this.getPrintProductName(1) }}
+                  </el-form-item>
+                </el-col>
+                <el-col :span="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-row>
+              <el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item
+                      label="打印组类别:"
+                      v-show="this.listQuery.productType === 2"
+                    >
+                      {{ this.getPrintProductName(2) }}
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="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-row>
+              </el-row>
+              <el-form-item
+                label="大众顺序号:"
+                prop="beginHostSN"
+                v-show="isShowHostSN"
+              >
+                <el-input
+                  v-model.number="form.beginHostSN"
+                  placeholder=""
+                  clearable
+                  type="number"
+                  size="small"
+                  style="width: 240px"
+                  @change="beginHostSNChange"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endHostSN"
+                  placeholder=""
+                  clearable
+                  :disabled="true"
+                  size="small"
+                  style="width: 240px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="底盘号:" prop="VIN" v-show="isShowVin">
+                <el-input
+                  v-model="form.beginVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 240px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="dialogFormVisible = false"
+            >取消</el-button
+          >
+          <el-button
+            v-loading="formLoading"
+            type="primary"
+            :disabled="isDisable"
+            @click="save"
+            >确认</el-button
+          >
+            <!-- v-debounce="debounceClick" -->
+        </div>
+      </el-dialog>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        style="float: right"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <div>
+          <Detail
+            v-bind:customerInfos="customerInfos"
+            style="margin-top: -35px"
+          ></Detail>
+        </div>
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import { mapGetters } from "vuex";
+import moment from "moment";
+import Detail from "./detail.vue";
+import MBDetail from "./detailMB.vue";
+import ZHBDetail from "./detailZHB.vue";
+import { downloadFile } from "@/utils/crmindex.js";
+import qs from "qs";
+import RepetitionMB from "./RepetitionMB.vue";
+import budaMB from "./budaMB.vue";
+import budaZHB from "./budaZHB.vue";
+import RepetitionZHB from "./RepetitionZHB.vue";
+import ScrapMB from "./ScrapMB.vue";
+import ScrapZHB from "./ScrapZHB.vue";
+import { forEach } from "jszip/lib/object";
+
+export default {
+  name: "M100Online",
+  components: {
+    Pagination,
+    CRMTableHead,
+    importExcel,
+    Detail,
+    MBDetail,
+    ZHBDetail,
+    RepetitionMB,
+    RepetitionZHB,
+    ScrapMB,
+    ScrapZHB,
+    budaMB,
+		budaZHB
+  },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      tipper:"",
+      // content01: "",
+      // content05: "",
+      // content07: "",
+      // content08: "",
+      // minute01: this.timeoutMinutes,
+      // minute05: this.timeoutMinutes,
+      // lastTime01: "14:00",
+      // lastTime05: "14:40",
+      crmType: "M100Online",
+      //productLineList:null,
+      isDisable: false,
+      drawerMBPrint: false,
+      drawerbudaMBPrint: false,
+			drawerbudaZHBPrint: false, //显示补打柱护板
+      drawerMBDelete: false,
+      drawerZHBPrint: false,
+      drawerZHBDelete: false,
+      activeNames: ["1"],
+      printNum: "12",
+      printNumZHB: "24",
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+        beginHostSN: [
+          { required: true, message: "必须输入数字！", trigger: "number" },
+        ],
+      },
+      billState: [
+        { id: 2, name: "未打印" },
+        { id: 3, name: "已打印" },
+      ],
+      valueSelect: "",
+      productName: "",
+      customerInfos: [],
+      customerInfosMB: [],
+      customerInfosZHB: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: false,
+      listLoaddingPrint: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        productType: 1, //1:门板；2:柱护板
+        ProductLine: undefined,
+        GroupName:undefined,//仅在柱护板时候显示
+        Version: undefined,
+        printBillNum: undefined,
+        serialNumBegin: undefined,
+        serialNumEnd: undefined,
+        HostSNBegin: undefined,
+        HostSNEnd: undefined,
+        KNRBegin: undefined,
+        KNREnd: undefined,
+        VINBegin: undefined,
+        VINEnd: undefined,
+        OnlineTimeValue: [],
+        OnlineTimeBegin: undefined,
+        OnlineTimeEnd: undefined,
+        ReceiveTimeValue: [],
+        ReceiveTimeBegin: undefined,
+        ReceiveTimeEnd: undefined,
+        billStatus: undefined,
+        state: [],
+      },
+      listQueryList: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        ProductLine: undefined,
+        BillStatus: undefined,
+        CanNotPrint: false,
+        ZHBBillStatus: undefined,
+        GroupName:undefined,
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+        GroupName: undefined
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+        GroupName:undefined
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+        GroupName: 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: [], //筛选后产线下拉
+      PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
+      productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
+      isShowHostSN: false,
+      isShowVin: false,
+      isShowState: true,
+    };
+  },
+  mounted() {
+    let _this = this
+    window.addEventListener('resize',function(){
+      _this.changeMainTableHeight()
+    })
+    this.getPLChildGroupList()
+    let timer = setInterval(() => {
+      this.open();
+    }, 5000);
+  },
+  created() {
+    this.billState.forEach((element, index) => {
+      if (index === 0) {
+        this.listQuery.state.push(element.id);
+      }
+    });
+    this.getProductLine();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+      // tempsTabs.push({
+      //   label: "底盘号",
+      //   prop: "vin",
+      //   width: 130,
+      // });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100上线时间",
+        prop: "onlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100接收时间",
+        prop: "receiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100上线时间",
+        prop: "r100OnlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100接收时间",
+        prop: "r100ReceiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "状态",
+        prop: "billStatus",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "柱护板状态",
+        prop: "printBillNum",
+        width: 120,
+      });
+
+      tempsTabs.push({
+        label: "备注",
+        prop: "remark",
+        width: 120,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    // 更改主表格高度
+    changeMainTableHeight(){
+      this.$nextTick(()=>{
+        var offsetHei = document.documentElement.clientHeight;
+        // let boxH = this.$refs.box.offsetHeight;
+        let headerH = document.getElementById("normalPritIndex-content-header").clientHeight
+        let footerH = this.totalCount > 0 ? 67 : 0 //footer高度
+        this.tableHeight = offsetHei - headerH - 67 - 79; //79为页面上部标签高度
+        //this.tableHeight = offsetHei -260
+      })
+    },
+    opens() {
+      this.getList();
+    },
+    open() {
+      // let productLineList = [];
+      // productLineList.forEach(element => {
+      //   element=this.listQuery.productLine;
+      // });
+
+      //let productLineList = { productLineList: [this.listQuery.productLine] };
+      // this.$refs.sp01.Visible = false;
+      // this.$refs.sp05.Visible = false;
+      // this.$refs.sp07.Visible = false;
+      // this.$refs.sp08.Visible = false;
+
+      let productLineListMain = { productLineList: [] };
+
+      this.PLChildList.forEach((itm) => {
+        productLineListMain.productLineList.push(itm.productLineCode);
+      });
+
+      console.log("门版-主界面传过来的值：" + JSON.stringify(productLineListMain));
+      this.$axios
+        .posts(
+          "/api/newjit/bill-m100/product-line-timeout-remind",
+          productLineListMain
+        )
+        .then((response) => {
+          if (response.status == false) {
+            this.$message({
+              message: response.message,
+              type: "warning",
+            });
+            return;
+          } else {
+            console.log("超时提醒-接口传过来的值：" + JSON.stringify(response.item));
+
+            if (response.item !== null) {
+              this.tipper = ""
+              response.item.forEach((JKITEM) => {
+                let _item = ""
+                let _style = ""
+                if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+                    //写提示信息
+                    _style = "color:red;font-weight:bold"
+                    // this.$refs.sp01.style.color = "red";
+                    // this.$refs.sp01.style.fontWeight = "bold";
+                  } else {
+                    _style = "color:green"
+                    // this.$refs.sp01.style.color = "green";
+                  }
+                  _item = `<span style=${_style}>${JKITEM.productLine}生产线已经${JKITEM.timeoutMinutes}分钟没收到报文\xa0\xa0\xa0\xa0</span>`
+                  this.tipper += _item
+                // if (JKITEM.productLine == "01") {
+                //   this.$refs.sp01.Visible = true;
+                //   this.content01 =
+                //     "01生产线已经" +
+                //     JKITEM.timeoutMinutes +
+                //     "分钟没收到报文\xa0\xa0\xa0\xa0";
+                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+                //     //写提示信息
+                //     this.$refs.sp01.style.color = "red";
+                //     this.$refs.sp01.style.fontWeight = "bold";
+                //   } else {
+                //     this.$refs.sp01.style.color = "green";
+                //   }
+                // }
+                // if (JKITEM.productLine == "05") {
+                //   this.$refs.sp05.Visible = true;
+                //   this.content05 =
+                //     "05生产线已经" +
+                //     JKITEM.timeoutMinutes +
+                //     "分钟没收到报文\xa0\xa0\xa0\xa0";
+                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+                //     //写提示信息
+                //     this.$refs.sp05.style.color = "red";
+                //     this.$refs.sp05.style.fontWeight = "bold";
+                //   } else {
+                //     this.$refs.sp05.style.color = "green";
+                //   }
+                // }
+                // if (JKITEM.productLine == "07") {
+                //   this.$refs.sp07.Visible = true;
+                //   this.content07 =
+                //     "07生产线已经" +
+                //     JKITEM.timeoutMinutes +
+                //     "分钟没收到报文\xa0\xa0\xa0\xa0";
+                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+                //     //写提示信息
+                //     this.$refs.sp07.style.color = "red";
+                //     this.$refs.sp07.style.fontWeight = "bold";
+                //   } else {
+                //     this.$refs.sp07.style.color = "green";
+                //   }
+                // }
+                // if (JKITEM.productLine == "08") {
+                //   this.$refs.sp08.Visible = true;
+                //   this.content08 =
+                //     JKITEM.productLine +
+                //     "生产线已经" +
+                //     JKITEM.timeoutMinutes +
+                //     "分钟没收到报文";
+                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
+                //     //写提示信息
+                //     this.$refs.sp08.style.color = "red";
+                //     this.$refs.sp08.style.fontWeight = "bold";
+                //   } else {
+                //     this.$refs.sp08.style.color = "green";
+                //   }
+                // }
+              });
+            } else {
+              this.$message({
+                message: "获取接口数据",
+                type: "warning",
+              });
+              return;
+            }
+          }
+          this.changeMainTableHeight()
+        });
+    },
+    debounceClick() {
+      console.log("2秒内点击无数次，都只会触发一次");
+    },
+    //大众顺序号起止事件改变
+    beginHostSNChange(val) {
+      if (this.listQuery.productType === 1) {
+        this.form.endHostSN =
+          parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
+      } else if (this.listQuery.productType === 2) {
+        this.form.endHostSN =
+          parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
+      }
+    },
+    //门板打印数量更改
+    valueNumChange(val) {
+      this.printNum = val;
+      if (val == 12) {
+        //默认值是12
+        this.$axios
+          .gets(
+            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            this.hostSNQuery
+          )
+          .then((response) => {
+            if (response.item !== null) {
+              this.form.beginHostSN = parseInt(response.item);
+              //门板
+              this.form.endHostSN = parseInt(response.item) + 11;
+            } else {
+              this.$message({
+                message: "获取不到大众顺序号",
+                type: "warning",
+              });
+              return;
+            }
+          });
+      } else {
+        //起止顺序号默认数量不为12
+        this.form.endHostSN =
+          parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
+      }
+      // this.$axios
+      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
+      //   .then((response) => {
+      //     if (response.item !== null) {
+      //       this.form.beginHostSN = parseInt(response.item);
+      //       if (val == 12) {
+      //         //门板
+      //         this.form.endHostSN = parseInt(response.item) + 11;
+      //       } else {
+      //         this.form.endHostSN =
+      //           parseInt(response.item) + parseInt(this.printNum) - 1;
+      //       }
+      //     } else {
+      //       this.$message({
+      //         message: "获取不到大众顺序号",
+      //         type: "warning",
+      //       });
+      //       return;
+      //     }
+      //   });
+    },
+    //柱护板打印更改
+    valueNumChangeZHB(val) {
+      this.printNumZHB = val;
+      if (val == 12) {
+        //默认值是12
+        this.$axios
+          .gets(
+            "/api/newjit/bill-m100/get-print-start-hostsn2",
+            this.hostSNQuery
+          )
+          .then((response) => {
+            if (response.item !== null) {
+              this.form.beginHostSN = parseInt(response.item);
+              //门板
+              this.form.endHostSN = parseInt(response.item) + 11;
+            } else {
+              this.$message({
+                message: "获取不到大众顺序号",
+                type: "warning",
+              });
+              return;
+            }
+          });
+      } else {
+        //起止顺序号默认数量不为12
+        this.form.endHostSN =
+          parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
+      }
+      // this.$axios
+      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
+      //   .then((response) => {
+      //     if (response.item !== null) {
+      //       this.form.beginHostSN = parseInt(response.item);
+      //       if (val == 24) {
+      //         //柱护板
+      //         this.form.endHostSN = parseInt(response.item) + 23;
+      //       } else {
+      //         this.form.endHostSN =
+      //           parseInt(response.item) + this.printNumZHB - 1;
+      //       }
+      //     } else {
+      //       this.$message({
+      //         message: "获取不到大众顺序号",
+      //         type: "warning",
+      //       });
+      //       return;
+      //     }
+      //   });
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      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;
+        });
+    },
+    /** 导出功能 assembly-cfg-erp/export */
+    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/bill-m100/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 = [];
+      }
+      let obj = {};
+      obj.partCode = "";
+      obj.partName = "";
+      obj.partNum = "";
+      obj.isKey = false;
+      obj.description = "";
+      this.form.details.push(obj);
+    },
+    handleDeleteDetails(index) {
+      this.form.details.splice(index, 1);
+    },
+
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "billStatus") {
+        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
+      }
+      if (column.property === "zHBBillStatus") {
+        return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
+      }
+      if (column.property == "onlineTime" || column.property == "receiveTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList(data) {
+      this.listLoading = true;
+      if (data != undefined) {
+        this.listQueryList.SkipCount = (this.page - 1) * data.limit;
+      } else {
+        this.listQueryList.SkipCount = (this.page - 1) * 15;
+      }
+      if (this.listQuery.productType === 2) {
+        this.listQueryList.ZHBBillStatus = 2;
+      } else {
+        this.listQueryList.ZHBBillStatus = 0;
+      }
+      if (this.listQuery.productType === 2) {
+        this.listQuery.ZHBBillStatus = 2;
+      } else {
+        this.listQuery.ZHBBillStatus = 0;
+      }
+      this.listQueryList.BillStatus = 2; //状态
+      this.listQueryList.ProductLine = this.listQuery.productLine; //产线
+      this.listQueryList.CanNotPrint = false; //不可打印
+      this.listQueryList.GroupName = this.listQuery.GroupName
+      console.log("日常打印M100查询条件：" + JSON.stringify(this.listQueryList));
+      //this.click();
+      this.$axios
+        .gets("/api/newjit/bill-m100/list", this.listQueryList)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+      this.changeMainTableHeight()
+    },
+
+    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) => {
+          if (partCode !== "" && partCode !== undefined) {
+            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: this.listQuery.productLine,
+          },
+        ];
+      }
+      if (this.listQuery.productType === 2) {
+        //把产线值传到子组件
+        this.customerInfosZHB = [
+          {
+            PrintType: 1,
+            ProductLine: this.listQuery.productLine,
+            GroupName:this.listQuery.GroupName
+          },
+        ];
+      }
+    },
+    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() {},
+    // 获取打印模板弹窗的产线名称
+    getPrintProductName(type){
+      // 门板
+      let _name = ""
+      let _productLineName = ""
+      this.PLChildList.forEach(item=>{
+        if(item.productLineCode == this.listQuery.productLine){
+          _productLineName = item.productLineName
+        }
+      })
+      if(type == 1){
+        _name = this.productTypeList[0].name + ': ' + _productLineName
+      }
+      // 柱护板
+      else if(type == 2){
+        _name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.GroupName + ')'
+      }
+      return _name
+    },
+    /**打印 */
+    print() {
+      (this.hostPrintQuery = {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+        GroupName: undefined,
+      }),
+      (this.hostCheckQuery.printType = 0);
+      this.hostPrintQuery.printType = 0;
+      this.vinPrintQuery.printType = 0;
+      if (this.listQuery.productLine === "" ||this.listQuery.productLine === undefined) {
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
+      }
+      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
+        this.$message({
+          message: "请选择生产线",
+          type: "warning",
+        });
+        return;
+      }
+      (this.printNum = "12"),
+        (this.printNumZHB = "24"),
+        (this.hostSNQuery.productLine = this.listQuery.productLine);
+      this.hostPrintQuery.productLine = this.listQuery.productLine;
+      this.hostPrintQuery.GroupName = this.listQuery.GroupName;
+      this.hostSNQuery.GroupName = this.listQuery.GroupName
+      
+      //后端服务更改了 前端跟着更改成以下方式
+      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大众顺序号起始",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大众顺序号起始");
+            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;
+      }
+      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === 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;
+      }
+      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === 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;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        
+        if (valid) {
+          //this.listLoaddingPrint = true;
+          if (this.isShowHostSN === true) {
+            if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
+              this.$message({
+                message: "请输入完整的顺序号起始范围",
+                type: "error",
+              });
+              return;
+            } else {
+              if (this.listQuery.productType === 1) {
+                //门板
+                if (
+                  parseInt(this.form.endHostSN) -
+                    parseInt(this.form.beginHostSN) <=
+                  0
+                ) {
+                  this.$message({
+                    message: "起止大众顺序号相减不能为零！",
+                    type: "error",
+                  });
+                  return;
+                }
+              } else if (this.listQuery.productType === 2) {
+                //柱护板
+                if (
+                  parseInt(this.form.endHostSN) -
+                    parseInt(this.form.beginHostSN) >
+                  23
+                ) {
+                  this.$message({
+                    message:
+                      "最多只能打印24个顺序号，终止顺序号不能大于" +
+                      (parseInt(this.form.beginHostSN) + 23),
+                    type: "error",
+                  });
+                  return;
+                }
+              }
+            }
+          }
+          if (this.isShowVin === true) {
+            if (this.form.beginVin === "" || this.form.endVin === "") {
+              this.$message({
+                message: "请输入完整的底盘号起始范围",
+                type: "error",
+              });
+              return;
+            }
+          }
+          /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
+          if (
+            this.formTitle === "打印-门板发货排序单" ||
+            this.formTitle === "打印-柱护板发货排序单"
+          ) {
+            this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
+            this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
+
+            if (this.listQuery.productType === 1) {
+              //门板-打印
+              this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
+              this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
+              this.hostCheckQuery.productLine = this.listQuery.productLine;
+              this.hostCheckQuery.GroupName = undefined
+              this.isDisable = true;
+              console.log(
+                "检查门板-hostCheckQuery" +
+                  JSON.stringify(this.hostCheckQuery)
+              );
+              this.$axios
+                .posts(
+                  "/api/newjit/bill-m100/check-mb-hostsn-break-num",
+                  this.hostCheckQuery
+                )
+                .then((response) => {
+                  console.log("检查门板-大众顺序号是否断号");
+                  // this.isDisable = true;
+                  // setTimeout(() => {
+                  //   this.isDisable = false;
+                  // }, 1000);
+
+                  if (response.item.length > 0) {
+                    //有断号
+                    this.$confirm(
+                      "本次打印存在断号是否继续?" + response.item,
+                      "提示",
+                      {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning",
+                      }
+                    )
+                      .then(() => {
+                        //门板
+                        //传递大众顺序号起止
+						this.private_printMenBan();
+                      })
+                      .catch(() => {
+                        this.isDisable = false;
+                      });
+                  } else {
+                    //无断号
+                    //门板
+                    //传递大众顺序号起止
+					this.private_printMenBan();
+                  }
+                });
+            } else if (this.listQuery.productType === 2) {
+              //柱护板
+              this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
+              this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
+              this.hostCheckQuery.productLine = this.listQuery.productLine;
+              this.hostCheckQuery.GroupName = this.listQuery.GroupName
+              this.isDisable = true;
+              this.$axios
+                .posts(
+                  "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
+                  this.hostCheckQuery
+                )
+                .then((response) => {
+                  console.log("检查门板-大众顺序号是否断号");
+                  // this.isDisable = true;
+                  // setTimeout(() => {
+                  //   this.isDisable = false;
+                  // }, 1000);
+                  if (response.item.length > 0) {
+                    //有断号
+                    this.$confirm(
+                      "本次打印存在断号是否继续?" + response.item,
+                      "提示",
+                      {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning",
+                      }
+                    )
+                      .then(() => {
+                        //门板
+                        //传递大众顺序号起止
+						this.private_printZhuHuBan(true);
+                      })
+                      .catch(() => {
+                        this.isDisable = false;
+                      });
+                  } else {
+                    //无断号
+                    //门板
+                    //传递大众顺序号起止
+					this.private_printZhuHuBan(true);
+                  }
+                });
+              //柱护板
+
+
+            }
+          } else {
+            /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
+            this.hostPrintQuery.beginVin = this.form.beginVin;
+            this.hostPrintQuery.endVin = this.form.endVin;
+            //判断productType类型
+            if (this.listQuery.productType === 1) {
+				//门板
+				//传递底盘号起止
+				this.private_printMenBan();
+            } else if (this.listQuery.productType === 2) {
+				//柱护板
+				//传递底盘号起止
+				this.private_printZhuHuBan(true);
+            }
+          }
+        }
+      });
+    },
+    
+	/**
+	 * 保存、加载、打印门板
+	 */
+	private_printMenBan()
+	{
+		this.$axios
+		  .posts(
+			"/api/newjit/bill-m100/save-menban-report",
+			this.hostPrintQuery
+		  )
+		  .then((response) => {
+			console.log("保存门板报表");
+			if (response.status === false) {
+			  this.$message({
+				message: response.message,
+				type: "error",
+			  });
+			  return;
+			} else if (response.status === true) {
+						let loadInput = response.item;
+						//-------------------------------------------
+						this.$axios
+							.posts(
+							"/api/newjit/bill-m100/load-menban-report",
+							loadInput
+							)
+							.then((response) => {
+									console.log("加载门板报表");
+									if (response.status === false) {
+										this.$message({
+										message: response.message,
+										type: "error",
+										});
+										return;
+									} else if (response.status === true) {
+										//传给grid++接口json数据，得到返回的文件base64
+										//this.fileQuery.report = "menban";
+										this.fileQuery.dataname = JSON.stringify(
+										response.item
+										);
+										//this.fileQuery.dataname = "";
+										console.log("打印json");
+										this.$axios
+										.posts(
+											"/Handlers/Handler1.ashx?report=menban",
+											qs.stringify(this.fileQuery)
+										)
+										.then((response) => {
+											console.log("获取文件base64编码");
+											this.formLoading = false;
+											this.isDisable = false;
+											this.printpdf(response); //打印我文件流
+										})
+										.catch((error) => {
+											this.formLoading = false;
+											this.isDisable = false;
+										});
+									}
+							});
+						//-------------------------------------------
+			}
+		  });
+	},
+	
+	/**
+	 * 保存、加载、打印柱护板
+	 */
+	private_printZhuHuBan(isSelAll = true)
+	{
+		//门板  /api/newjit/bill-m100/save-zhuhuban-report
+		//传递大众顺序号起止
+		this.$axios
+		  .posts(
+			"/api/newjit/bill-m100/save-group-zhuhuban-report",
+			this.hostPrintQuery
+		  )
+		  .then((response) => {
+			console.log("保存柱护板报表");
+			if (response.status === false) {
+			  this.$message({
+				message: response.message,
+				type: "error",
+			  });
+			  return;
+			} else if (response.status === true) {
+				let loadInput = {};
+				loadInput.dataResultType = (isSelAll == true) ? "1" : "2";
+				loadInput.reportIdList = response.item;
+				//--------------------------------------
+				//门板
+				//传递大众顺序号起止
+				this.$axios
+				  .posts(
+					"/api/newjit/bill-m100/load-zhuhuban-report",
+					loadInput
+				  )
+				  .then((response) => {
+					console.log("加载柱护板报表");
+					if (response.status === false) {
+					  this.$message({
+						message: response.message,
+						type: "error",
+					  });
+					  return;
+					} else if (response.status === true) {
+							  //传给grid++接口json数据，得到返回的文件base64
+							  //this.fileQuery.report = "menban";
+							  this.fileQuery.dataname = JSON.stringify(
+								response.item
+							  );
+							  //this.fileQuery.dataname = "";
+							  console.log("打印json");
+							  this.$axios
+								.posts(
+								  "/Handlers/Handler1.ashx?report=zhuhuban",
+								  qs.stringify(this.fileQuery)
+								)
+								.then((response) => {
+								  console.log("获取文件base64编码");
+								  this.formLoading = false;
+								  this.isDisable = false;
+								  this.printpdf(response); //打印我文件流
+								})
+								.catch((error) => {
+								  this.formLoading = false;
+								  this.isDisable = false;
+								});
+					}
+				  });
+				//--------------------------------------
+			}
+		  });
+	},
+	
+	//获取所有产线
+    getProductLine() {
+      this.listPLQuery.UserId = this.userInfo.userId;
+      // console.log(
+      //   "this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId" +
+      //     this.listPLQuery.UserId
+      // );
+      this.$axios
+        .gets("/api/newjit/product-line/list", this.listPLQuery)
+        .then((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();
+        })
+        .catch(() => {});
+    },
+    //产线类型变更
+    ptypeselectChange() {
+      this.$forceUpdate();
+      this.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
+      this.listQuery.productLine = this.PLChildList[0].productLineCode;
+      this.listQuery.GroupName = this.listQuery.productType == '1' ? undefined : this.PLChildGroupList[0]
+      this.changeMainTableHeight()
+      this.valueselectChange()
+      //变更打印按钮文字
+      if (this.listQuery.productType === 1) {
+        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
+        this.listQuery.state.push(this.billState[0].id);
+        this.isShowState = true;
+      } else if (this.listQuery.productType === 2) {
+        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+        this.listQuery.state = [];
+        this.isShowState = false;
+      }
+      if (this.listQuery.productType === 2) {
+        this.listQueryList.ZHBBillStatus = 2;
+      } else {
+        this.listQueryList.ZHBBillStatus = 0;
+      }
+    },
+    /*单据状态变更 */
+    checkedListChange(index) {
+      if (this.listQuery.state.length <= 1) {
+        this.listQuery.state.push(this.billState[index].id);
+      } else {
+        this.listQuery.state = [];
+        this.listQuery.state.push(this.billState[index].id);
+      }
+    },
+    /**解析文件流 */
+    getUrl() {
+      //dataResult.data是后台返回的流
+      let pdfUrl = window.URL.createObjectURL(
+        new Blob([dataResult.data], { type: `application/pdf` })
+      );
+      const fname = item.name + str + "_" + lists[1] + lists[2]; // 下载文件的名字
+      const link = document.createElement("a");
+      link.href = pdfUrl;
+      link.setAttribute("download", "下载的文件名");
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+    },
+    //base64转化成流，dataurl是后台返回的base64
+    dataURLtoBlob(dataurl) {
+      var bstr = atob(dataurl.substring(dataurl.indexOf(",") + 1));
+      var n = bstr.length;
+      var u8arr = new Uint8Array(n);
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+      }
+      return new Blob([u8arr], { type: "application/pdf" });
+    },
+    doPrint(val) {
+      var ordonnance = document.getElementById(val).contentWindow;
+      setTimeout(() => {
+        // window.print()
+        ordonnance.print();
+        this.pdfLoading = false;
+      }, 100);
+    },
+    printpdf(dataResult) {
+      //打印功能，dataResult是后台返回的base64
+      let blob = this.dataURLtoBlob(dataResult);
+      var date = new Date().getTime();
+      var ifr = document.createElement("iframe");
+      ifr.style.frameborder = "no";
+      ifr.style.display = "none";
+      ifr.style.pageBreakBefore = "always";
+      ifr.setAttribute("id", "printPdf" + date);
+      ifr.setAttribute("name", "printPdf" + date);
+      ifr.src = window.URL.createObjectURL(blob);
+      document.body.appendChild(ifr);
+      this.doPrint("printPdf" + date);
+      window.URL.revokeObjectURL(ifr.src); // 释放URL 对象
+      this.dialogFormVisible = false;
+      this.getList();
+    },
+    httpPost(URL, PARAMS) {
+      var temp = document.createElement("form");
+      temp.action = URL;
+      temp.method = "post";
+      temp.style.display = "none";
+
+      for (var x in PARAMS) {
+        var opt = document.createElement("textarea");
+        opt.name = x;
+        opt.value = PARAMS[x];
+        temp.appendChild(opt);
+      }
+
+      document.body.appendChild(temp);
+      temp.submit();
+
+      return temp;
+    },
+
+    // 获取PLChildGroupList
+    getPLChildGroupList(){
+      this.$axios
+        .gets(
+          "/api/newjit/print-template-configuration/list",
+        )
+        .then((response) => {
+          if (response.item !== null) {
+            this.PLChildGroupList= response.item;
+          }
+        });
+    },
+  },
+};
+</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;
+}
+.tipper{
+  border: solid 1px #ddd;
+  border-radius: 5px;
+  display: inline-block;
+  padding: 10px;
+  line-height: 20px;
+}
+</style>
+
+
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 9a22c3e..5bbe33d 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -1,4 +1,4 @@
-<!--日常打印M100信息模块-->
+<!--日常打印M100信息模块pg-m100normal-print-->
 <template>
   <div class="cr-body-content normalPritIndexPage">
     <div ref="box">
@@ -9,24 +9,6 @@
           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 prop="productLine">
             <el-select
               v-model="listQuery.productLine"
@@ -34,7 +16,7 @@
               placeholder="请选择"
               size="medium"
               style="margin-right: 10px"
-              @change="valueselectChange"
+              @change="productLineChange"
             >
               <el-option
                 v-for="item in PLChildList"
@@ -44,41 +26,12 @@
               />
             </el-select>
           </el-form-item>
-          <!-- 柱护板时候显示 -->
-          <el-form-item 
-            prop="GroupName" 
-            v-show="this.listQuery.productType == 2"
-          >
-            <el-select
-              v-model="listQuery.GroupName"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 10px"
-              @change="valueselectChange"
-            >
-              <el-option
-                v-for="(item,key) in PLChildGroupList"
-                :key="key"
-                :label="item"
-                :value="item"
-              />
-            </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
+              @click="handleFilter"
+              >刷新</el-button
             >
             <el-button
               type="warning"
@@ -95,109 +48,43 @@
               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="drawerbudaMBPrint = true"
-              size="mini"
-              type="warning"
-              plain
-            >
-              <strong>门板补打</strong></el-button
-            >
+              <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="drawerbudaZHBPrint = true"
-							size="mini"
-							type="warning"
-							plain
-						>
-							<strong>柱护板补打</strong></el-button
-						>
-						
-						
-            <el-button
-              v-show="this.listQuery.productType === 2"
-              @click="drawerZHBDelete = true"
-              size="mini"
-              type="danger"
-              plain
-              ><strong>柱护板作废</strong></el-button
             >
-            <!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
-              >测试</el-button
-            >2Z
-            <el-button plain @click="open"> 不会自动关闭 </el-button> -->
+              <strong>作废</strong>
+            </el-button>
           </el-form-item>
-
           <el-form-item>
             <div class="tipper" v-if="tipper != ''" v-html="tipper"></div>
-            <!-- <div class="tipper">
-              <span ref="sp01">{{ content01 }}</span>
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              <span ref="sp05">{{ content05 }}</span>
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              <span ref="sp07">{{ content07 }}</span>
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              <span ref="sp08">{{ content08 }}</span>
-            </div> -->
           </el-form-item>
-          <!-- </el-row> -->
         </el-form>
       </div>
     </div>
-    <!--门板重打-->
+    <!--重打-->
     <el-drawer
-      title="门板重新打印"
+      title="重新打印"
       :visible.sync="drawerMBPrint"
       direction="rtl"
       size="900px"
     >
       <RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
     </el-drawer>
-    <!--门板补打-->
+    <!--作废-->
     <el-drawer
-      v-if="drawerbudaMBPrint"
-      title="门板补打"
-      :visible.sync="drawerbudaMBPrint"
-      direction="rtl"
-      size="900px"
-    >
-      <budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
-    </el-drawer>
-    <!--门板作废-->
-    <el-drawer
-      title="门板作废"
+      title="作废"
       :visible.sync="drawerMBDelete"
       direction="rtl"
       @open="opens()"
@@ -205,36 +92,6 @@
     >
       <ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
     </el-drawer>
-    <!--柱护板重打-->
-    <el-drawer
-      title="柱护板重新打印"
-      :visible.sync="drawerZHBPrint"
-      direction="rtl"
-      size="1000px"
-    >
-      <RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
-    </el-drawer>
-		
-		<!--柱护板补打-->
-		<el-drawer
-      v-if="drawerbudaZHBPrint"
-		  title="柱护板补打"
-		  :visible.sync="drawerbudaZHBPrint"
-		  direction="rtl"
-		  size="900px"
-		>
-		  <budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB>
-		</el-drawer>
-		
-    <!--柱护板重打和作废-->
-    <el-drawer
-      title="柱护板作废"
-      :visible.sync="drawerZHBDelete"
-      direction="rtl"
-      size="900px"
-    >
-      <ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
-    </el-drawer>
 
     <div class="l-table" style="margin-top: -10px">
       <!--表格渲染-->
@@ -243,19 +100,20 @@
         v-loading="listLoading"
         element-loading-text="拼命加载中..."
         element-loading-spinner="el-icon-loading"
-        class="cr-table"
+        class="cr-table m100MainTable"
         :data="list"
         :height="tableHeight"
         :cell-style="cellStyle"
         :header-cell-style="headerRowStyle"
         size="small"
-        stripe
-        border
+        :border="true"
         highlight-current-row
         style="width: 100%"
         @sort-change="sortChange"
         @selection-change="handleSelectionChange"
         @row-click="handleRowClick"
+        :row-style="setRowStyle"
+        :row-class-name="tableRowClassName"
       >
         <el-table-column
           label="底盘号"
@@ -271,7 +129,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-for="(item, index) in getDefaultField"
+          v-for="(item, index) in tableColums_main"
           :key="index"
           :prop="item.prop"
           :label="item.label"
@@ -285,6 +143,30 @@
             {{ scope.column.label }}
           </template>
         </el-table-column>
+        <!-- 明细 -->
+        <!-- <el-table-column
+          label="明细—id"
+          sortable="custom"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            {{scope.row.billM100Parts[0].id }}
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column
+          v-for="(item, index) in tableColums_detail"
+          :key="'detal-'+index"
+          :label="item.label"
+          sortable="custom"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            {{scope.row[item.index].prop }}
+          </template>
+        </el-table-column> -->
+        
       </el-table>
     </div>
     <div>
@@ -309,8 +191,6 @@
                 <el-col :span="24">
                   <el-form-item
                     label="打印组类别:"
-                    prop="printNum"
-                    v-show="this.listQuery.productType === 1"
                   >
                     {{ this.getPrintProductName(1) }}
                   </el-form-item>
@@ -319,7 +199,6 @@
                   <el-form-item
                     label="要打印数量:"
                     prop="printNum"
-                    v-show="this.listQuery.productType === 1"
                   >
                     <el-input-number
                       v-model="printNum"
@@ -331,30 +210,6 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-row>
-                  <el-col :span="24">
-                    <el-form-item
-                      label="打印组类别:"
-                      v-show="this.listQuery.productType === 2"
-                    >
-                      {{ this.getPrintProductName(2) }}
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="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-row>
               </el-row>
               <el-form-item
                 label="大众顺序号:"
@@ -416,7 +271,6 @@
             @click="save"
             >确认</el-button
           >
-            <!-- v-debounce="debounceClick" -->
         </div>
       </el-dialog>
     </div>
@@ -430,6 +284,7 @@
         :page.sync="page"
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
+        :layout="'total, prev, pager, next'"
       />
       <!-- 抽屉控件 -->
       <el-drawer
@@ -464,11 +319,7 @@ import ZHBDetail from "./detailZHB.vue";
 import { downloadFile } from "@/utils/crmindex.js";
 import qs from "qs";
 import RepetitionMB from "./RepetitionMB.vue";
-import budaMB from "./budaMB.vue";
-import budaZHB from "./budaZHB.vue";
-import RepetitionZHB from "./RepetitionZHB.vue";
 import ScrapMB from "./ScrapMB.vue";
-import ScrapZHB from "./ScrapZHB.vue";
 import { forEach } from "jszip/lib/object";
 
 export default {
@@ -481,11 +332,7 @@ export default {
     MBDetail,
     ZHBDetail,
     RepetitionMB,
-    RepetitionZHB,
     ScrapMB,
-    ScrapZHB,
-    budaMB,
-		budaZHB
   },
   directives: { permission },
   filters: {
@@ -509,26 +356,12 @@ export default {
     };
     return {
       tipper:"",
-      // content01: "",
-      // content05: "",
-      // content07: "",
-      // content08: "",
-      // minute01: this.timeoutMinutes,
-      // minute05: this.timeoutMinutes,
-      // lastTime01: "14:00",
-      // lastTime05: "14:40",
       crmType: "M100Online",
-      //productLineList:null,
       isDisable: false,
       drawerMBPrint: false,
-      drawerbudaMBPrint: false,
-			drawerbudaZHBPrint: false, //显示补打柱护板
       drawerMBDelete: false,
-      drawerZHBPrint: false,
-      drawerZHBDelete: false,
       activeNames: ["1"],
       printNum: "12",
-      printNumZHB: "24",
       rules: {
         erpAssemblyName: [
           { required: true, message: "必须输入！", trigger: "blur" },
@@ -545,7 +378,6 @@ export default {
       productName: "",
       customerInfos: [],
       customerInfosMB: [],
-      customerInfosZHB: [],
       dialogOptions: [],
       versionValue: "",
       searchContent: "", // 输入内容
@@ -553,9 +385,9 @@ export default {
       form: {},
       drawer: false,
       list: null,
+      // M110List:null,
       totalCount: 0,
       listLoading: false,
-      listLoaddingPrint: true,
       customerInfo: {
         bomId: "",
       },
@@ -568,8 +400,7 @@ export default {
       },
       listQuery: {
         SkipCount: 0,
-        MaxResultCount: 15,
-        productType: 1, //1:门板；2:柱护板
+        MaxResultCount: 200,
         ProductLine: undefined,
         GroupName:undefined,//仅在柱护板时候显示
         Version: undefined,
@@ -593,7 +424,7 @@ export default {
       },
       listQueryList: {
         SkipCount: 0,
-        MaxResultCount: 15,
+        MaxResultCount: 200,
         ProductLine: undefined,
         BillStatus: undefined,
         CanNotPrint: false,
@@ -606,7 +437,6 @@ export default {
       },
       listPLQuery: {
         BillType: 2,
-        //UserId: this.userinfo.UserId,
       },
       hostSNQuery: {
         productLine: undefined,
@@ -658,13 +488,27 @@ export default {
       PLList: [], //产线下拉
       PLChildList: [], //筛选后产线下拉
       PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
       isShowHostSN: false,
       isShowVin: false,
       isShowState: true,
+      //table主表列信息
+      tableColums_main:[
+        { label: "流水号", prop: "serialNum", width: 100 },
+        { label: "大众顺序号", prop: "hostSN", width: 120 },
+        { label: "KNR", prop: "knr", width: 150 },
+        { label: "M100上线时间",prop: "onlineTime", width: 150 },
+        { label: "M100接收时间", prop: "receiveTime",  width: 180 },
+        { label: "车型代码", prop: "vehicleModelCode", width: 120 },
+        { label: "版本", prop: "version", width: 150 },
+        { label: "R100上线时间", prop: "r100OnlineTime", width: 150 },
+        { label: "R100接收时间", prop: "r100ReceiveTime", width: 180 },
+        { label: "产线", prop: "productLine", width: 120 },
+        { label: "状态", prop: "billStatus", width: 120 },
+        { label: "柱护板状态", prop: "printBillNum",width: 120},
+        { label: "备注", prop: "remark", width: 120 },
+      ],
+      //table子表列信息
+      tableColums_detail:[],
     };
   },
   mounted() {
@@ -686,74 +530,23 @@ export default {
     this.getProductLine();
   },
   computed: {
-    getDefaultField() {
-      var tempsTabs = [];
-      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
-      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
-      // tempsTabs.push({
-      //   label: "底盘号",
-      //   prop: "vin",
-      //   width: 130,
-      // });
-      tempsTabs.push({
-        label: "KNR",
-        prop: "knr",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100上线时间",
-        prop: "onlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "M100接收时间",
-        prop: "receiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "车型代码",
-        prop: "vehicleModelCode",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "版本",
-        prop: "version",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100上线时间",
-        prop: "r100OnlineTime",
-        width: 150,
-      });
-      tempsTabs.push({
-        label: "R100接收时间",
-        prop: "r100ReceiveTime",
-        width: 180,
-      });
-      tempsTabs.push({
-        label: "产线",
-        prop: "productLine",
-        width: 120,
-      });
-      tempsTabs.push({
-        label: "状态",
-        prop: "billStatus",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "printBillNum",
-        width: 120,
-      });
-
-      tempsTabs.push({
-        label: "备注",
-        prop: "remark",
-        width: 120,
-      });
-      return tempsTabs;
-    },
+    // getDefaultField() {
+    //   var tempsTabs = [];
+    //   tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
+    //   tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+    //   tempsTabs.push({ label: "KNR", prop: "knr", width: 150 });
+    //   tempsTabs.push({ label: "M100上线时间",prop: "onlineTime", width: 150 });
+    //   tempsTabs.push({ label: "M100接收时间", prop: "receiveTime",  width: 180 });
+    //   tempsTabs.push({ label: "车型代码", prop: "vehicleModelCode", width: 120 });
+    //   tempsTabs.push({ label: "版本", prop: "version", width: 150 });
+    //   tempsTabs.push({ label: "R100上线时间", prop: "r100OnlineTime", width: 150 });
+    //   tempsTabs.push({ label: "R100接收时间", prop: "r100ReceiveTime", width: 180 });
+    //   tempsTabs.push({ label: "产线", prop: "productLine", width: 120 });
+    //   tempsTabs.push({ label: "状态", prop: "billStatus", width: 120 });
+    //   tempsTabs.push({ label: "柱护板状态", prop: "printBillNum",width: 120});
+    //   tempsTabs.push({ label: "备注", prop: "remark", width: 120 });
+    //   return tempsTabs;
+    // },
     ...mapGetters(["userInfo"]), //获取当前用户信息
   },
   methods: {
@@ -772,23 +565,10 @@ export default {
       this.getList();
     },
     open() {
-      // let productLineList = [];
-      // productLineList.forEach(element => {
-      //   element=this.listQuery.productLine;
-      // });
-
-      //let productLineList = { productLineList: [this.listQuery.productLine] };
-      // this.$refs.sp01.Visible = false;
-      // this.$refs.sp05.Visible = false;
-      // this.$refs.sp07.Visible = false;
-      // this.$refs.sp08.Visible = false;
-
       let productLineListMain = { productLineList: [] };
-
       this.PLChildList.forEach((itm) => {
         productLineListMain.productLineList.push(itm.productLineCode);
       });
-
       console.log("门版-主界面传过来的值：" + JSON.stringify(productLineListMain));
       this.$axios
         .posts(
@@ -813,71 +593,11 @@ export default {
                 if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
                     //写提示信息
                     _style = "color:red;font-weight:bold"
-                    // this.$refs.sp01.style.color = "red";
-                    // this.$refs.sp01.style.fontWeight = "bold";
                   } else {
                     _style = "color:green"
-                    // this.$refs.sp01.style.color = "green";
                   }
                   _item = `<span style=${_style}>${JKITEM.productLine}生产线已经${JKITEM.timeoutMinutes}分钟没收到报文\xa0\xa0\xa0\xa0</span>`
                   this.tipper += _item
-                // if (JKITEM.productLine == "01") {
-                //   this.$refs.sp01.Visible = true;
-                //   this.content01 =
-                //     "01生产线已经" +
-                //     JKITEM.timeoutMinutes +
-                //     "分钟没收到报文\xa0\xa0\xa0\xa0";
-                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                //     //写提示信息
-                //     this.$refs.sp01.style.color = "red";
-                //     this.$refs.sp01.style.fontWeight = "bold";
-                //   } else {
-                //     this.$refs.sp01.style.color = "green";
-                //   }
-                // }
-                // if (JKITEM.productLine == "05") {
-                //   this.$refs.sp05.Visible = true;
-                //   this.content05 =
-                //     "05生产线已经" +
-                //     JKITEM.timeoutMinutes +
-                //     "分钟没收到报文\xa0\xa0\xa0\xa0";
-                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                //     //写提示信息
-                //     this.$refs.sp05.style.color = "red";
-                //     this.$refs.sp05.style.fontWeight = "bold";
-                //   } else {
-                //     this.$refs.sp05.style.color = "green";
-                //   }
-                // }
-                // if (JKITEM.productLine == "07") {
-                //   this.$refs.sp07.Visible = true;
-                //   this.content07 =
-                //     "07生产线已经" +
-                //     JKITEM.timeoutMinutes +
-                //     "分钟没收到报文\xa0\xa0\xa0\xa0";
-                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                //     //写提示信息
-                //     this.$refs.sp07.style.color = "red";
-                //     this.$refs.sp07.style.fontWeight = "bold";
-                //   } else {
-                //     this.$refs.sp07.style.color = "green";
-                //   }
-                // }
-                // if (JKITEM.productLine == "08") {
-                //   this.$refs.sp08.Visible = true;
-                //   this.content08 =
-                //     JKITEM.productLine +
-                //     "生产线已经" +
-                //     JKITEM.timeoutMinutes +
-                //     "分钟没收到报文";
-                //   if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) {
-                //     //写提示信息
-                //     this.$refs.sp08.style.color = "red";
-                //     this.$refs.sp08.style.fontWeight = "bold";
-                //   } else {
-                //     this.$refs.sp08.style.color = "green";
-                //   }
-                // }
               });
             } else {
               this.$message({
@@ -895,15 +615,10 @@ export default {
     },
     //大众顺序号起止事件改变
     beginHostSNChange(val) {
-      if (this.listQuery.productType === 1) {
-        this.form.endHostSN =
-          parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
-      } else if (this.listQuery.productType === 2) {
-        this.form.endHostSN =
-          parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
-      }
+      this.form.endHostSN =
+      parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
     },
-    //门板打印数量更改
+    //打印数量更改
     valueNumChange(val) {
       this.printNum = val;
       if (val == 12) {
@@ -916,7 +631,6 @@ export default {
           .then((response) => {
             if (response.item !== null) {
               this.form.beginHostSN = parseInt(response.item);
-              //门板
               this.form.endHostSN = parseInt(response.item) + 11;
             } else {
               this.$message({
@@ -931,75 +645,6 @@ export default {
         this.form.endHostSN =
           parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1;
       }
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
-      //   .then((response) => {
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (val == 12) {
-      //         //门板
-      //         this.form.endHostSN = parseInt(response.item) + 11;
-      //       } else {
-      //         this.form.endHostSN =
-      //           parseInt(response.item) + parseInt(this.printNum) - 1;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   });
-    },
-    //柱护板打印更改
-    valueNumChangeZHB(val) {
-      this.printNumZHB = val;
-      if (val == 12) {
-        //默认值是12
-        this.$axios
-          .gets(
-            "/api/newjit/bill-m100/get-print-start-hostsn2",
-            this.hostSNQuery
-          )
-          .then((response) => {
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              //门板
-              this.form.endHostSN = parseInt(response.item) + 11;
-            } else {
-              this.$message({
-                message: "获取不到大众顺序号",
-                type: "warning",
-              });
-              return;
-            }
-          });
-      } else {
-        //起止顺序号默认数量不为12
-        this.form.endHostSN =
-          parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1;
-      }
-      // this.$axios
-      //   .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery)
-      //   .then((response) => {
-      //     if (response.item !== null) {
-      //       this.form.beginHostSN = parseInt(response.item);
-      //       if (val == 24) {
-      //         //柱护板
-      //         this.form.endHostSN = parseInt(response.item) + 23;
-      //       } else {
-      //         this.form.endHostSN =
-      //           parseInt(response.item) + this.printNumZHB - 1;
-      //       }
-      //     } else {
-      //       this.$message({
-      //         message: "获取不到大众顺序号",
-      //         type: "warning",
-      //       });
-      //       return;
-      //     }
-      //   });
     },
     //抽屉
     handleDrawerOpen(param) {
@@ -1021,7 +666,6 @@ export default {
         .gets("/api/newjit/assembly-cfg-erp/" + id)
         .then((response) => {
           this.form = response.item;
-          //this.details = response.item.details;
         });
     },
     /** 导出功能 assembly-cfg-erp/export */
@@ -1088,7 +732,6 @@ export default {
     importExcelData() {
       //关闭导入窗体时调用
       this.showExcelImport = false;
-      //this.getList();
     },
 
     /** 刷新列表 */
@@ -1141,27 +784,34 @@ export default {
       } else {
         this.listQueryList.SkipCount = (this.page - 1) * 15;
       }
-      if (this.listQuery.productType === 2) {
-        this.listQueryList.ZHBBillStatus = 2;
-      } else {
-        this.listQueryList.ZHBBillStatus = 0;
-      }
-      if (this.listQuery.productType === 2) {
-        this.listQuery.ZHBBillStatus = 2;
-      } else {
-        this.listQuery.ZHBBillStatus = 0;
-      }
+      this.listQueryList.ZHBBillStatus = 0;
+      this.listQuery.ZHBBillStatus = 0;
       this.listQueryList.BillStatus = 2; //状态
       this.listQueryList.ProductLine = this.listQuery.productLine; //产线
       this.listQueryList.CanNotPrint = false; //不可打印
       this.listQueryList.GroupName = this.listQuery.GroupName
       console.log("日常打印M100查询条件：" + JSON.stringify(this.listQueryList));
-      //this.click();
       this.$axios
-        .gets("/api/newjit/bill-m100/list", this.listQueryList)
+        .gets("/api/newjit/bill-m100/list2", this.listQueryList)
         .then((response) => {
-          this.list = response.items;
-          this.totalCount = response.totalCount;
+          // this.tableColums_detail = []
+          // response.billM100s[0].billM100Parts.forEach((item,index)=>{
+          //   for(let i in item){
+          //     if(i == 'partCode'){
+          //       this.tableColums_detail.push(
+          //         { label: index+'-'+i, prop: i,index:index},
+          //       )
+          //     }
+          //   }
+          // })
+          // console.log(888,this.tableColums_detail)
+          // console.log('_100Data',_100Data)
+          this.list = response.billM100s;
+          let _M110Row = response.bill_M110s[0]
+          _M110Row.isM110Data = true
+          this.list.push(_M110Row)
+          // this.M110List = response.bill_M110s;
+          this.totalCount = response.m100_TotalCount;
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
@@ -1186,8 +836,6 @@ export default {
           } else {
             this.list = response.item.details;
           }
-          //alert(JSON.stringify(response.Items))
-          //this.totalCount = response.totalCount;
           setTimeout(() => {
             //大数据量加载时
             this.listLoading = false;
@@ -1198,32 +846,18 @@ export default {
         });
     },
     // 向子组件更新值
-    valueselectChange(val) {
+    productLineChange(val) {
       this.$forceUpdate();
       this.customerInfosMB = [];
-      this.customerInfosZHB = [];
-      if (this.listQuery.productType === 1) {
-        //把产线值传到子组件
-        this.customerInfosMB = [
-          {
-            PrintType: 1,
-            ProductLine: this.listQuery.productLine,
-          },
-        ];
-      }
-      if (this.listQuery.productType === 2) {
-        //把产线值传到子组件
-        this.customerInfosZHB = [
-          {
-            PrintType: 1,
-            ProductLine: this.listQuery.productLine,
-            GroupName:this.listQuery.GroupName
-          },
-        ];
-      }
+      //把产线值传到子组件
+      this.customerInfosMB = [
+        {
+          PrintType: 1,
+          ProductLine: this.listQuery.productLine,
+        },
+      ];
+      this.handleFilter()
     },
-    handleImportSAP() {},
-
     handleFilter() {
       this.page = 1;
       this.getList();
@@ -1240,6 +874,21 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+    // m110固定底部
+    setRowStyle({ row }) {
+      //当有 totalDemandText属性时
+      return row.isM110Data ? {
+          background: "#fbc4c4", fontWeight: "bold", position: "-webkit-sticky", position: "sticky",
+          bottom: row.isFixed ? '40px' : 0
+      } : {}
+    },
+    tableRowClassName({ row }){
+      if(row.isM110Data){
+        return 'isM110DataRow'
+      }else{
+        return ''
+      }
+    },
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (column.property === "qty") {
@@ -1257,29 +906,19 @@ export default {
       }
     },
     handleRowClick(row, column, event) {
-      //this.$refs.multipleTable.clearSelection();
       this.$refs.multipleTable.toggleRowSelection(row);
     },
 
     closeDialog() {},
     // 获取打印模板弹窗的产线名称
     getPrintProductName(type){
-      // 门板
-      let _name = ""
       let _productLineName = ""
       this.PLChildList.forEach(item=>{
         if(item.productLineCode == this.listQuery.productLine){
           _productLineName = item.productLineName
         }
       })
-      if(type == 1){
-        _name = this.productTypeList[0].name + ': ' + _productLineName
-      }
-      // 柱护板
-      else if(type == 2){
-        _name = this.productTypeList[1].name + ': ' + _productLineName + ' (' + this.listQuery.GroupName + ')'
-      }
-      return _name
+      return _productLineName
     },
     /**打印 */
     print() {
@@ -1302,112 +941,56 @@ export default {
         });
         return;
       }
-      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
-      (this.printNum = "12"),
-        (this.printNumZHB = "24"),
-        (this.hostSNQuery.productLine = this.listQuery.productLine);
+      (this.hostSNQuery.productLine = this.listQuery.productLine);
       this.hostPrintQuery.productLine = this.listQuery.productLine;
       this.hostPrintQuery.GroupName = this.listQuery.GroupName;
       this.hostSNQuery.GroupName = this.listQuery.GroupName
-      
-      //后端服务更改了 前端跟着更改成以下方式
-      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大众顺序号起始",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大众顺序号起始");
-            if (response.item !== null) {
-              this.form.beginHostSN = parseInt(response.item);
-              if (this.listQuery.productType === 1) {
-                //门板
-                this.form.endHostSN = parseInt(response.item) + 11;
-              } else if (this.listQuery.productType === 2) {
-                //柱护板
-                this.form.endHostSN = parseInt(response.item) + 23;
+      // 获取数量
+      this.listLoading = true
+      this.$axios.gets("/api/newjit/dic/list?dicTypeName=零件大类")
+        .then(res=>{
+          let _currentLines = res.item.filter(item=>item.dicItemSort2 == this.listQuery.productLine)
+          if(_currentLines && _currentLines.length > 0){
+            this.printNum = _currentLines[0].dicItemSort9
+          }
+          //后端服务更改了 前端跟着更改成以下方式
+          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大众顺序号起始",response.item);
+              if (response.item !== null) {
+                this.form.beginHostSN = parseInt(response.item);
+                this.form.endHostSN = parseInt(response.item) + (Number(this.printNum) - 1);
+              } else {
+                this.$message({
+                  message: "获取不到大众顺序号",
+                  type: "warning",
+                });
+                return;
               }
-            } 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;
+            });
+          if (this.$refs.btn1.$el.innerText === "打印发货排序单") {
+            this.formTitle = "打印-发货排序单";
+          } else {
+            this.formTitle = "打印-柱护板发货排序单";
+          }
+          this.dialogFormVisible = true;
+          this.form = {
+            beginHostSN: "",
+            endHostSN: "",
+          };
+          this.isShowHostSN = true;
+          this.isShowVin = false;
+          this.listLoading = false
+        })
+        .catch(err=>{
+          this.listLoading = false
+        })
     },
     /**重打 */
     rePrint() {
@@ -1432,13 +1015,6 @@ export default {
         });
         return;
       }
-      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
       this.formTitle = "重打";
       this.hostPrintQuery.productLine = this.listQuery.productLine;
       this.dialogFormVisible = true;
@@ -1472,13 +1048,6 @@ export default {
         });
         return;
       }
-      if(this.listQuery.productType == '2' && (this.listQuery.GroupName === "" || this.listQuery.GroupName === undefined)){
-        this.$message({
-          message: "请选择生产线",
-          type: "warning",
-        });
-        return;
-      }
       this.formTitle = "补打";
       this.hostPrintQuery.productLine = this.listQuery.productLine;
       this.dialogFormVisible = true;
@@ -1493,7 +1062,6 @@ export default {
       this.$refs.form.validate((valid) => {
         
         if (valid) {
-          //this.listLoaddingPrint = true;
           if (this.isShowHostSN === true) {
             if (this.form.beginHostSN === "" || this.form.endHostSN === "") {
               this.$message({
@@ -1502,34 +1070,16 @@ export default {
               });
               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 (
+                parseInt(this.form.endHostSN) -
+                  parseInt(this.form.beginHostSN) <=
+                0
+              ) {
+                this.$message({
+                  message: "起止大众顺序号相减不能为零！",
+                  type: "error",
+                });
+                return;
               }
             }
           }
@@ -1544,130 +1094,71 @@ export default {
           }
           /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */
           if (
-            this.formTitle === "打印-门板发货排序单" ||
+            this.formTitle === "打印-发货排序单" ||
             this.formTitle === "打印-柱护板发货排序单"
           ) {
             this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN);
             this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN);
 
-            if (this.listQuery.productType === 1) {
-              //门板-打印
-              this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
-              this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
-              this.hostCheckQuery.productLine = this.listQuery.productLine;
-              this.hostCheckQuery.GroupName = undefined
-              this.isDisable = true;
-              console.log(
-                "检查门板-hostCheckQuery" +
-                  JSON.stringify(this.hostCheckQuery)
-              );
-              this.$axios
-                .posts(
-                  "/api/newjit/bill-m100/check-mb-hostsn-break-num",
-                  this.hostCheckQuery
-                )
-                .then((response) => {
-                  console.log("检查门板-大众顺序号是否断号");
-                  // this.isDisable = true;
-                  // setTimeout(() => {
-                  //   this.isDisable = false;
-                  // }, 1000);
-
-                  if (response.item.length > 0) {
-                    //有断号
-                    this.$confirm(
-                      "本次打印存在断号是否继续?" + response.item,
-                      "提示",
-                      {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      }
-                    )
-                      .then(() => {
-                        //门板
-                        //传递大众顺序号起止
-						this.private_printMenBan();
-                      })
-                      .catch(() => {
-                        this.isDisable = false;
-                      });
-                  } else {
-                    //无断号
-                    //门板
-                    //传递大众顺序号起止
-					this.private_printMenBan();
-                  }
-                });
-            } else if (this.listQuery.productType === 2) {
-              //柱护板
-              this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
-              this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
-              this.hostCheckQuery.productLine = this.listQuery.productLine;
-              this.hostCheckQuery.GroupName = this.listQuery.GroupName
-              this.isDisable = true;
-              this.$axios
-                .posts(
-                  "/api/newjit/bill-m100/check-zhb-hostsn-break-num",
-                  this.hostCheckQuery
-                )
-                .then((response) => {
-                  console.log("检查门板-大众顺序号是否断号");
-                  // this.isDisable = true;
-                  // setTimeout(() => {
-                  //   this.isDisable = false;
-                  // }, 1000);
-                  if (response.item.length > 0) {
-                    //有断号
-                    this.$confirm(
-                      "本次打印存在断号是否继续?" + response.item,
-                      "提示",
-                      {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      }
-                    )
-                      .then(() => {
-                        //门板
-                        //传递大众顺序号起止
-						this.private_printZhuHuBan(true);
-                      })
-                      .catch(() => {
-                        this.isDisable = false;
-                      });
-                  } else {
-                    //无断号
-                    //门板
-                    //传递大众顺序号起止
-					this.private_printZhuHuBan(true);
-                  }
-                });
-              //柱护板
-
+            //打印
+            this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN);
+            this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN);
+            this.hostCheckQuery.productLine = this.listQuery.productLine;
+            this.hostCheckQuery.GroupName = undefined
+            this.isDisable = true;
+            console.log(
+              "检查-hostCheckQuery" +
+                JSON.stringify(this.hostCheckQuery)
+            );
+            this.$axios
+              .posts(
+                "/api/newjit/bill-m100/check-mb-hostsn-break-num",
+                this.hostCheckQuery
+              )
+              .then((response) => {
+                console.log("检查-大众顺序号是否断号");
+                // this.isDisable = true;
+                // setTimeout(() => {
+                //   this.isDisable = false;
+                // }, 1000);
 
-            }
+                if (response.item.length > 0) {
+                  //有断号
+                  this.$confirm(
+                    "本次打印存在断号是否继续?" + response.item,
+                    "提示",
+                    {
+                      confirmButtonText: "确定",
+                      cancelButtonText: "取消",
+                      type: "warning",
+                    }
+                  )
+                    .then(() => {
+                      //传递大众顺序号起止
+                      this.private_printMenBan();
+                    })
+                    .catch(() => {
+                      this.isDisable = false;
+                    });
+                } else {
+                  //无断号
+                  //传递大众顺序号起止
+                  this.private_printMenBan();
+                }
+              });
           } else {
             /**接口1获取打印数据，接口2获得grid++模板的base64编码 */
             this.hostPrintQuery.beginVin = this.form.beginVin;
             this.hostPrintQuery.endVin = this.form.endVin;
-            //判断productType类型
-            if (this.listQuery.productType === 1) {
-				//门板
-				//传递底盘号起止
-				this.private_printMenBan();
-            } else if (this.listQuery.productType === 2) {
-				//柱护板
-				//传递底盘号起止
-				this.private_printZhuHuBan(true);
-            }
+            //传递底盘号起止
+            this.private_printMenBan();
           }
         }
       });
     },
     
 	/**
-	 * 保存、加载、打印门板
+	 * 保存、加载、打印
 	 */
 	private_printMenBan()
 	{
@@ -1677,7 +1168,7 @@ export default {
 			this.hostPrintQuery
 		  )
 		  .then((response) => {
-			console.log("保存门板报表");
+			console.log("保存报表");
 			if (response.status === false) {
 			  this.$message({
 				message: response.message,
@@ -1693,7 +1184,7 @@ export default {
 							loadInput
 							)
 							.then((response) => {
-									console.log("加载门板报表");
+									console.log("加载报表");
 									if (response.status === false) {
 										this.$message({
 										message: response.message,
@@ -1735,7 +1226,7 @@ export default {
 	 */
 	private_printZhuHuBan(isSelAll = true)
 	{
-		//门板  /api/newjit/bill-m100/save-zhuhuban-report
+		//  /api/newjit/bill-m100/save-zhuhuban-report
 		//传递大众顺序号起止
 		this.$axios
 		  .posts(
@@ -1755,7 +1246,6 @@ export default {
 				loadInput.dataResultType = (isSelAll == true) ? "1" : "2";
 				loadInput.reportIdList = response.item;
 				//--------------------------------------
-				//门板
 				//传递大众顺序号起止
 				this.$axios
 				  .posts(
@@ -1811,9 +1301,7 @@ export default {
         .gets("/api/newjit/product-line/list", this.listPLQuery)
         .then((response) => {
           this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
+          this.PLChildList = this.PLList.sort((a, b) => {
             return a.productLineCode - b.productLineCode;
           });
           this.listQuery.productLine = this.PLChildList[0].productLineCode;
@@ -1831,37 +1319,37 @@ export default {
         .catch(() => {});
     },
     //产线类型变更
-    ptypeselectChange() {
-      this.$forceUpdate();
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      this.listQuery.productLine = this.PLChildList[0].productLineCode;
-      this.listQuery.GroupName = this.listQuery.productType == '1' ? undefined : this.PLChildGroupList[0]
-      this.changeMainTableHeight()
-      this.valueselectChange()
-      //变更打印按钮文字
-      if (this.listQuery.productType === 1) {
-        this.$refs.btn1.$el.innerText = "打印门板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打门板发货排序单";
-        this.listQuery.state.push(this.billState[0].id);
-        this.isShowState = true;
-      } else if (this.listQuery.productType === 2) {
-        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
-        this.listQuery.state = [];
-        this.isShowState = false;
-      }
-      if (this.listQuery.productType === 2) {
-        this.listQueryList.ZHBBillStatus = 2;
-      } else {
-        this.listQueryList.ZHBBillStatus = 0;
-      }
-    },
+    // ptypeselectChange() {
+    //   this.$forceUpdate();
+    //   // this.PLChildList = this.PLList.filter(
+    //   //   (u) => u.productType === parseInt(this.listQuery.productType)
+    //   // ).sort((a, b) => {
+    //   //   return a.productLineCode - b.productLineCode;
+    //   // });
+    //   this.listQuery.productLine = this.PLChildList[0].productLineCode;
+    //   this.listQuery.GroupName = this.listQuery.productType == '1' ? undefined : this.PLChildGroupList[0]
+    //   this.changeMainTableHeight()
+    //   this.valueselectChange()
+    //   //变更打印按钮文字
+    //   // if (this.listQuery.productType === 1) {
+    //     this.$refs.btn1.$el.innerText = "打印门板发货排序单";
+    //     this.$refs.btn2.$el.innerText = "重新打印门板发货排序单";
+    //     this.$refs.btn3.$el.innerText = "补打门板发货排序单";
+    //     this.listQuery.state.push(this.billState[0].id);
+    //     this.isShowState = true;
+    //   // } else if (this.listQuery.productType === 2) {
+    //   //   this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
+    //   //   this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
+    //   //   this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+    //   //   this.listQuery.state = [];
+    //   //   this.isShowState = false;
+    //   // }
+    //   // if (this.listQuery.productType === 2) {
+    //   //   this.listQueryList.ZHBBillStatus = 2;
+    //   // } else {
+    //     this.listQueryList.ZHBBillStatus = 0;
+    //   // }
+    // },
     /*单据状态变更 */
     checkedListChange(index) {
       if (this.listQuery.state.length <= 1) {
@@ -1988,6 +1476,12 @@ export default {
   padding: 10px;
   line-height: 20px;
 }
+::v-deep .el-table.m100MainTable tr td{
+  background-color:#e7fff0
+}
+::v-deep .el-table .isM110DataRow td{
+  background-color:#fbc4c4 !important
+}
 </style>
 
 
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue
index 436ef01..dec40f6 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index.vue b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
index 5a4b033..103ab17 100644
--- a/vue/src/views/pg-fis/basedate/repeatR100/index.vue
+++ b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
@@ -1,4 +1,4 @@
-<!--重复报文信息页-->
+<!--重复报文信息页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/select/detailMB.vue b/vue/src/views/pg-fis/basedate/select/detailMB.vue
index 490cb21..d29c1b5 100644
--- a/vue/src/views/pg-fis/basedate/select/detailMB.vue
+++ b/vue/src/views/pg-fis/basedate/select/detailMB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index 603f8b2..c32ce3c 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -1,4 +1,4 @@
-<!--M100查询模块-->
+<!--M100查询模块 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
index c89f773..420ba32 100644
--- a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--总成模块信息管理页 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue
index c810301..032b99e 100644
--- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue
+++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue
@@ -1,4 +1,4 @@
-<!--准时化结算门板价格差异-->
+<!--准时化结算门板价格差异 todo-an:门板-->
 <template>
   <div class="cr-body-content">
     <!--功能栏-->
diff --git a/vue/static/config.js b/vue/static/config.js
index 458b276..39ca798 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -3,11 +3,11 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
 		// ip: 'http://192.168.0.140',
-		ip: 'http://127.0.0.1', //?? two//客户
+		ip: 'http://192.168.1.228', //?? two//客户
 		auth_port: '8066',
 		public_port: '8092',
 		// backend_port: '8092',
-		backend_port: '44344', //?? three//客户
+		backend_port: '8092', //?? three//客户
     },
     basic: {},
     upload: {

From dde1f33ff881de2f048704c2ffea98daf3f3e581 Mon Sep 17 00:00:00 2001
From: "hongrui.an" <297504645@qq.com>
Date: Tue, 5 Aug 2025 17:29:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AFpc=E3=80=91?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/public/config.js                          |    2 +-
 .../pg-fis/basedate/m100BIll/index copy.vue   | 1505 +++++++++++++++
 .../basedate/m100Online/RepetitionMB.vue      |   22 +-
 .../pg-fis/basedate/m100Online/ScrapMB.vue    |   22 +-
 .../pg-fis/basedate/m100Online/detailMB.vue   |    2 +-
 .../pg-fis/basedate/m100Online/index.vue      |    2 +-
 .../pg-fis/basedate/r100Online/index copy.vue |  829 ++++++++
 .../pg-fis/basedate/r100Online/index.vue      |   43 +-
 .../pg-fis/basedate/repeatR100/index copy.vue |  941 +++++++++
 .../pg-fis/basedate/repeatR100/index.vue      |   75 +-
 .../views/pg-fis/basedate/select/detailMB.vue |   16 +-
 .../pg-fis/basedate/select/index copy.vue     | 1690 +++++++++++++++++
 .../views/pg-fis/basedate/select/index.vue    |  997 +---------
 .../basedate/weldingAssembly/index copy.vue   |  880 +++++++++
 .../pg-fis/basedate/weldingAssembly/index.vue |   42 +-
 .../ux/billManage/SettleDoorPanel/index.vue   |    6 +-
 16 files changed, 5917 insertions(+), 1157 deletions(-)
 create mode 100644 vue/src/views/pg-fis/basedate/m100BIll/index copy.vue
 create mode 100644 vue/src/views/pg-fis/basedate/r100Online/index copy.vue
 create mode 100644 vue/src/views/pg-fis/basedate/repeatR100/index copy.vue
 create mode 100644 vue/src/views/pg-fis/basedate/select/index copy.vue
 create mode 100644 vue/src/views/pg-fis/basedate/weldingAssembly/index copy.vue

diff --git a/vue/public/config.js b/vue/public/config.js
index cf6cd67..e0b0e5b 100644
--- a/vue/public/config.js
+++ b/vue/public/config.js
@@ -1,5 +1,5 @@
 let sysConfig = {
     authApi:'http://192.168.1.228:8066',
     baseApi:'http://192.168.1.228:8092',
-    m100FleshTime:60000
+    m100PrintFreshTime:60000
 }
\ No newline at end of file
diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index copy.vue b/vue/src/views/pg-fis/basedate/m100BIll/index copy.vue
new file mode 100644
index 0000000..804e1c6
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/m100BIll/index copy.vue	
@@ -0,0 +1,1505 @@
+<!--总成模块信息管理页 pg-M100BIll -->
+<template>
+  <div class="cr-body-content">
+    <div ref="box">
+    <flexbox class="content-header" >
+      <el-form
+        :model="listQuery"
+        ref="queryForm"
+        v-show="showSearch"
+        :inline="true"
+      >
+      <!-- <el-row> -->
+        <el-form-item label="生产线:" prop="productType">
+          <el-select
+            v-model="listQuery.productType"
+            clearable
+            placeholder="请选择"
+            size="medium"
+            style="margin-right: 15px"
+            @change="ptypeselectChange"
+          >
+            <el-option
+                v-for="item in productTypeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id" />  
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="productLine">
+          <el-select
+            v-model="listQuery.productLine"
+            clearable
+            placeholder="请选择"
+            size="medium"
+            style="margin-right: 15px"
+            @change="valueselectChange"
+          >
+          <el-option
+            v-for="item in PLChildList"
+            :key="item.id"
+            :label="item.productLineName"
+            :value="item.productLineCode"/>
+          </el-select>
+        </el-form-item>
+
+          <el-form-item label="版本:" prop="Version">
+            <el-input
+              v-model="listQuery.Version"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+      <!-- </el-row> -->
+      <!-- <el-row> -->
+        <el-form-item label="大众顺序号:" prop="HostSNBegin">
+          <el-input
+            v-model="listQuery.HostSNBegin"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="-" prop="HostSNEnd">
+          <el-input
+            v-model="listQuery.HostSNEnd"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="KNR:" prop="KNRBegin" >
+          <el-input
+            v-model="listQuery.KNRBegin"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="-" prop="KNREnd">
+          <el-input
+            v-model="listQuery.KNREnd"
+            placeholder=""
+            clearable
+            size="small"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+      <!-- </el-row> -->
+      <!-- <el-row> -->
+        <el-form-item label="底盘号:" prop="VINBegin">
+          <el-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" :default-time="['00:00:00','23:59:59']"
+            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" :default-time="['00:00:00','23:59:59']"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+
+        <el-form-item >
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleFilter"
+            >搜索</el-button
+          >
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="resetQuery('queryForm')"
+            >重置</el-button
+          >
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            style="margin-left: 15px"
+            @click="handleDownload()"
+            >导出(Excel)
+          </el-button>
+        </el-form-item>
+      <!-- </el-row> -->
+        <!-- <el-divider class="divider1" ></el-divider> -->
+        <el-form-item style="margin-bottom: 0px;margin-top: -1px">
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="primary"
+            icon="el-icon-plus"
+            @click="handleCreate"
+            >新增
+          </el-button>
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            @click="handleUpdate"
+            >修改
+          </el-button>
+          <el-button
+            class="filter-item"
+            size="mini"
+            type="primary"
+            icon="el-icon-delete"
+            @click="handleDelete"
+            >删除
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </flexbox>
+    </div>
+    <div class="l-table" style="margin-top: -9px">
+      <!--表格渲染-->
+      <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>
+
+      <!--表单渲染-->
+      <el-dialog
+        :visible.sync="dialogFormVisible"
+        :close-on-click-modal="false"
+        :title="formTitle"
+        width="1000px"
+      >
+        <el-form
+          ref="form"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          size="small"
+          label-width="120px"
+        >
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="KNR:" prop="knr" required >
+                <el-select
+                  style="width: 350px"
+                  v-model="form.knr"
+                  placeholder="请选择添加M100信息对应的KNR号"
+                  filterable
+                  :disabled="false"
+                  @change="getVModel"
+                >
+                  <el-option
+                    v-for="item in KNRlist"
+                    :key="item.knr"
+                    :label="item.knr"
+                    :value="item.knr"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="车型:" prop="vehicleModelCode" required >
+                <el-select
+                  style="width: 350px"
+                  v-model="form.vehicleModelCode"
+                  :disabled="false"
+                  @change="vMchange"
+                >
+                  <el-option
+                    v-for="item in vehicleModelList"
+                    :key="item.id"
+                    :label="item.dicItemName"
+                    :value="item.dicItemCode"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="底盘号:"  prop="vin" required >
+                <el-input
+                  style="width: 350px"
+                  v-model="form.vin"
+                  :disabled="false"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="大众顺序号:"  prop="hostSN" required >
+                <el-input
+                  style="width: 350px"
+                  v-model="form.hostSN"
+                  :disabled="false"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="上线日期:" prop="onlineTime" required>
+              <el-date-picker
+                v-model="form.onlineTime"
+                style="width: 350px"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择时间"
+                :disabled="false"
+              >
+              </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <div style="border:1px solid #E4E4E4;width:94%">
+                <el-row>
+                  <div style="background:#F1F1F1;width:100%;height:30px;line-height:31px;">
+                    <label style="margin-left:15px">ERP总成</label>
+                  </div>
+                </el-row>
+                <el-row>
+                  <el-table
+                    ref="LeftDetialTable"
+                    v-loading="listLoading"
+                    element-loading-text="拼命加载中..."
+                    element-loading-spinner="el-icon-loading"
+                    class="cr-table"
+                    :data="form.leftdetails"
+                    :height="detailTableHeight"
+                    :cell-style="cellStyle"
+                    :header-cell-style="headerRowStyle"
+                    size="small"
+                    stripe
+                    border
+                    highlight-current-row
+                    style="width: 95%;margin:10px"
+                    @row-click="handleLeftRowClick"
+                    @selection-change="handleLeftSelectionChange"
+                  >
+                    <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+                    <el-table-column prop="erpAssemblyCode" label="ERP总成编号" width="150px" > 
+                      <template slot-scope="scope">
+                        <el-input v-model="scope.row.erpAssemblyCode" size="mini" style="width:135px"></el-input>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="erpAssemblyName" label="ERP总成名称">
+                      <template slot-scope="scope">
+                        <el-input v-model="scope.row.erpAssemblyName" size="mini"></el-input>
+                      </template> 
+                    </el-table-column>
+                    <el-table-column  width="35px"> 
+                      <template slot="header">
+                        <el-button @click="handleAddLeftDetails" icon="el-icon-plus" type="text"></el-button>
+                      </template>
+                      <template slot-scope="scope">
+                        <el-button @click="handleLeftDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-row>
+                <!-- <el-divider class="divider2"  content-position="left">添加ERP总成</el-divider>
+                <el-row>
+                  <el-form-item label="ERP总成编码:" prop="erpAssemblyCode"  >
+                    <el-input
+                      style="width: 315px"
+                      v-model="form.erpAssemblyCode"
+                      :disabled="isEdit"
+                      placeholder="请输入总成编码"
+                    />
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="ERP总成名称:" prop="erpAssemblyName"  >
+                    <el-input
+                      style="width: 315px"
+                      v-model="form.erpAssemblyName"
+                      :disabled="isEdit"
+                      placeholder="请输入总成名称"
+                    />
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="车型:" prop="vehicleModel"  >
+                    <el-select
+                      style="width: 315px"
+                      v-model="form.vehicleModel"
+                      :disabled="isEdit"
+                      placeholder="请输入总成名称"
+                    >
+                      <el-option
+                        v-for="item in vehicleModelList"
+                        :key="item.id"
+                        :label="item.dicItemName"
+                        :value="item.dicItemCode"/>
+                    </el-select>
+                  </el-form-item>
+                </el-row>
+                <div style="text-align:center;margin: 0px;margin-bottom: 15px;">
+                  <el-button type="primary" @click="leftclick">添加总成</el-button>
+                </div> -->
+              </div>
+            </el-col>
+            <el-col :span="12">
+              <div style="border:1px solid #E4E4E4;width:94%">
+                <el-row>
+                  <div style="background:#F1F1F1;width:100%;height:30px;line-height:31px;">
+                    <label style="margin-left:15px">ERP结算件</label>
+                  </div>
+                </el-row>
+                <el-row>
+                  <el-table
+                    ref="DetialTable"
+                    v-loading="listLoading"
+                    element-loading-text="拼命加载中..."
+                    element-loading-spinner="el-icon-loading"
+                    class="cr-table"
+                    :data="form.rightdetails"
+                    :height="detailTableHeight"
+                    :cell-style="cellStyle"
+                    :header-cell-style="headerRowStyle"
+                    size="small"
+                    stripe
+                    border
+                    highlight-current-row
+                    style="width: 95%;margin:10px"
+                  >
+                    <!-- <el-table-column type="selection" width="44px"></el-table-column> -->
+                    <el-table-column prop="partCode" label="客户零件代码" width="150px" > 
+                      <template slot-scope="scope">
+                        <el-input v-model="scope.row.partCode" size="mini" style="width:135px"></el-input>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="description" label="客户零件名称">
+                      <template slot-scope="scope">
+                        <el-input v-model="scope.row.description" size="mini"></el-input>
+                      </template> 
+                    </el-table-column>
+                    <el-table-column prop="partNum" label="客户零件数量" width="120px" >
+                      <template slot-scope="scope">
+                        <el-input-number v-model="scope.row.partNum" :min="1"  size="mini" style="width:100px"></el-input-number>
+                      </template>
+                    </el-table-column>
+                    <el-table-column width="35px"> 
+                      <template slot="header">
+                        <el-button @click="handleAddRightDetails" icon="el-icon-plus" type="text"></el-button>
+                      </template>
+                      <template slot-scope="scope">
+                        <el-button @click="handleRightDeleteDetails(scope.$index, scope.row)" icon="el-icon-minus" type="text"></el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-row>
+                <!-- <el-divider class="divider2"  content-position="left">添加ERP结算件</el-divider>
+                <el-row>
+                  <el-form-item label="客户零件代码:" prop="customerPartCode"  >
+                    <el-input
+                      style="width: 315px"
+                      v-model="form.customerPartCode"
+                      :disabled="isEdit"
+                      placeholder="请输入客户零件代码"
+                    />
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="客户零件名称:" prop="customerPartName"  >
+                    <el-input
+                      style="width: 315px"
+                      v-model="form.customerPartName"
+                      :disabled="isEdit"
+                      placeholder="请输入总成名称"
+                    />
+                  </el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="数量:" prop="partQty"  >
+                    <el-input-number
+                      style="width: 315px"
+                      v-model="form.partQty"
+                      :disabled="isEdit"
+                      :min="1"
+                    />
+                  </el-form-item>
+                </el-row>
+                <div style="text-align:center;margin: 0px;margin-bottom: 15px;">
+                  <el-button type="primary">添加零件</el-button>
+                </div> -->
+              </div>
+            </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"
+        :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 moment from "moment";
+import { mapGetters } from 'vuex';
+import Detail from "./detail.vue";
+import { downloadFile } from "@/utils/crmindex.js";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "m100Bill",
+  components: { Pagination, CRMTableHead, importExcel, Detail },
+  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: "m100Bill",
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      valueSelect: "",
+      customerInfos: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        productType: 1,
+        ProductLine: undefined,
+        version:undefined,
+        HostSNBegin:undefined,
+        HostSNEnd:undefined,
+        KNRBegin:undefined,
+        KNREnd:undefined,
+        VINBegin:undefined,
+        VINEnd:undefined,
+        OnlineTimeValue:undefined,
+        OnlineTimeBegin:undefined,
+        OnlineTimeEnd:undefined,
+        ReceiveTimeValue:undefined,
+        ReceiveTimeBegin:undefined,
+        ReceiveTimeEnd:undefined,
+
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery:{
+        BillType: 2,
+        //UserId: "00000000-0000-0000-0000-000000000000",
+      },
+      knrQuery:{ 
+        knr: undefined,
+      },
+      form:
+      {
+        leftdetails:[],
+        rightdetails:[],
+      },
+      saveform:{
+        m100Bill:
+        {
+          knr:undefined,
+          vehicleModelCode:undefined,
+          vin:undefined,
+          hostSN:undefined,
+          onlineTime:undefined,
+          billStatus:2,
+          billM100Parts:[],
+        },
+        erpAssemblyList:
+        [
+          // {
+          //   erpAssemblyCode:undefined,
+          //   erpAssemblyName:undefined,
+          //   vehicleModel:undefined,
+          //   //isCover: true,
+          //   details: undefined,
+          //     // {
+          //     //   partCode: undefined,
+          //     //   partNum: 1,
+          //     //   description: undefined,
+          //     //   isKey: false
+          //     // }
+          // },
+        ]
+        
+        // #region
+        /*
+        
+        */
+       //  #endregion
+      },
+      rightAlldetails:[],
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      bomUnit,
+      multipleSelection: [],
+      multipLeLeftSelection:[],
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      detailTableHeight:250,
+      //details:[], //修改子表数据源
+      PLList:[],//产线下拉
+      PLChildList:[],//筛选后产线下拉
+      vehicleModelQuery:{
+        dicTypeName:"派格车型",
+      },
+      vehicleModelList:[],//车型list
+	    productTypeList:[{id:1,name:'门板'},{id:2,name:'柱护板'}],
+      gettime:"",
+      KNRlist:null,
+    };
+  },
+  mounted() {
+    this.$nextTick(() => { 
+        var offsetHei = document.documentElement.clientHeight;
+        //console.log(offsetHei);
+        let boxH = this.$refs.box.offsetHeight;
+        this.tableHeight = offsetHei - boxH - 57 - 79;//57为footer高度，79为页面上部标签高度
+        //console.log(this.$refs.box.offsetHeight);
+        //console.log(this.tableHeight);
+    });
+  },
+  created() {
+    //this.getKNRList();
+    this.getProductLine();
+    //this.getList();
+    //console.log(this.userInfo);
+  },
+  computed: {
+    getDefaultField() {
+      
+      var tempsTabs = [];
+      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 130,
+      });
+      // tempsTabs.push({
+      //   label: "底盘号",
+      //   prop: "vin",
+      //   width: 130,
+      // });
+      tempsTabs.push({
+        label: "上线时间",
+        prop: "onlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "接收时间",
+        prop: "receiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "采集点",
+        prop: "collectionPoint",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "文件名称",
+        prop: "fileName",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 120,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(['userInfo'])//获取当前用户信息
+  },
+  methods: {
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      //console.log(param)
+      var parentId = param.assemblyID; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    getCurrentTime() {
+        //获取当前时间并打印
+        var _this = this;
+        let yy = new Date().getFullYear();
+        let month =  new Date().getMonth()+1;
+        let mm = month<10 ? '0'+month : month;
+        let dd = new Date().getDate()<10 ? '0'+new Date().getDate() : new Date().getDate();
+        let hh = new Date().getHours()<10 ? '0'+new Date().getHours() : new Date().getHours();
+        let mf = new Date().getMinutes()<10 ? '0'+new Date().getMinutes() : new Date().getMinutes();
+        let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds();
+        _this.gettime = yy+'-'+mm+'-'+dd+' '+hh+':'+mf+':'+ss;
+    },
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.saveform.m100Bill.hostSN = this.form.hostSN;
+          this.saveform.m100Bill.knr = this.form.knr;
+          this.saveform.m100Bill.vin = this.form.vin;
+          this.saveform.m100Bill.onlineTime = this.form.onlineTime;
+          this.saveform.m100Bill.vehicleModelCode = this.form.vehicleModelCode;
+          this.getCurrentTime();
+          this.saveform.m100Bill.description = "无";
+          this.saveform.m100Bill.receiveTime = this.gettime;
+          //判断最后一次右侧数据rightdetails是否在右侧全部数据rightAlldetails中
+          this.form.rightdetails.forEach(element => {
+            var tlist = this.rightAlldetails.filter(u => u.erpAssemblyCode === element.erpAssemblyCode && u.partCode === element.partCode 
+                                          && u.partName === element.partName && u.partNum === element.partNum);
+            if(tlist.length === 0)
+            {
+              this.rightAlldetails.push(element);
+            }
+          });
+
+          //this.saveform.erpAssemblyList.details = {};
+          //console.log("当前左侧数据");
+          //console.log(this.form.leftdetails);
+          //console.log("当前右侧显示数据");
+          //console.log(this.form.rightdetails);
+          //console.log("当前右侧全部数据");
+          //console.log(this.rightAlldetails);
+
+          /**左右关联拼接最终erpAssemblyList格式 */
+          this.form.leftdetails.forEach((element,i) => {
+            var templist = this.rightAlldetails.filter(u => u.erpAssemblyCode === element.erpAssemblyCode);
+            let obj = {};
+            obj.erpAssemblyCode = element.erpAssemblyCode;
+            obj.erpAssemblyName = element.erpAssemblyName;
+            obj.vehicleModel = element.vehicleModel;
+            obj.details = [];
+
+            templist.forEach(detail => {
+              if(detail.partCode !== "" && detail.partCode !== undefined)
+              {
+                obj.details.push(detail);
+              }
+            });
+            this.saveform.erpAssemblyList.push(obj);
+          });
+
+          //console.log(this.saveform);
+          console.log("保存参数:" + JSON.stringify(this.saveform));
+          this.formLoading = true;
+          if (this.isEdit) {
+            //修改
+            this.$axios
+              .puts("/api/newjit/new-m100/" + this.multipleSelection[0].id,this.saveform)
+              .then((response) => {
+                console.log(response);
+                this.formLoading = false;
+                this.$notify({
+                  title: "成功",
+                  message: "更新成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.dialogFormVisible = false;
+                this.getList();
+              })
+              .catch(() => {
+                this.formLoading = false;
+                console.log("error");
+                this.saveform = {
+                  m100Bill:
+                  {
+                    knr:undefined,
+                    vehicleModelCode:undefined,
+                    vin:undefined,
+                    hostSN:undefined,
+                    onlineTime:undefined,
+                    billStatus:2,
+                    billM100Parts:[],
+                  },
+                  erpAssemblyList:[],
+                };
+                this.dialogFormVisible = false;
+                this.getList();
+              });
+          } else {
+            //insert添加
+            console.log(JSON.stringify(this.saveform));
+            this.$axios
+              .posts("/api/newjit/new-m100", this.saveform)
+              .then((response) => {
+                this.formLoading = false;
+                this.$notify({
+                  title: "成功",
+                  message: "新增成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.dialogFormVisible = false;
+                this.getList();
+              })
+              .catch(() => {
+                this.formLoading = false;
+                this.saveform = {
+                  m100Bill:
+                  {
+                    knr:undefined,
+                    vehicleModelCode:undefined,
+                    vin:undefined,
+                    hostSN:undefined,
+                    onlineTime:undefined,
+                    billStatus:2,
+                    billM100Parts:[],
+                  },
+                  erpAssemblyList:[],
+                };
+              });
+          }
+        }
+      });
+    },
+    /** 新增 */
+    handleCreate() {
+      this.getKNRList();
+      if (this.$refs["form"] !== undefined) {
+        this.$nextTick(() => {
+          this.$refs["form"].resetFields();
+        });
+      }
+      this.formTitle = "新增";
+      this.isEdit = false;
+      this.form = {};
+      this.rightAlldetails = [];
+      this.saveform = {
+        m100Bill:
+        {
+          knr:undefined,
+          vehicleModelCode:undefined,
+          vin:undefined,
+          hostSN:undefined,
+          onlineTime:undefined,
+          billStatus:2,
+          billM100Parts:[],
+        },
+        erpAssemblyList:[],
+      };
+      //this.details = [];
+      this.getvehicleModel();
+      this.dialogFormVisible = true;
+    },
+    /** 修改 */
+    handleUpdate(row) {
+      this.getKNRList();
+      this.formTitle = "修改";
+      this.isEdit = true;
+      this.rightAlldetails = [];
+      this.saveform = {
+        m100Bill:
+        {
+          knr:undefined,
+          vehicleModelCode:undefined,
+          vin:undefined,
+          hostSN:undefined,
+          onlineTime:undefined,
+          billStatus:2,
+          billM100Parts:[],
+        },
+        erpAssemblyList:[],
+      };
+      //this.details = [];
+      this.getvehicleModel();
+        if (this.multipleSelection.length != 1) {
+          this.$message({
+            message: "编辑必须选择单行",
+            type: "warning",
+          });
+          return;
+        } else {
+          this.fetchData(this.multipleSelection[0].id);
+          this.dialogFormVisible = true;
+        }
+    },
+    /** 删除 */
+    handleDelete(row) {
+      if (this.multipleSelection.length != 1) {
+          this.$message({
+            message: "编辑必须选择单行",
+            type: "warning",
+          });
+          return;
+      }
+        // this.$alert("暂时不支持批量删除", "提示", {
+        //   confirmButtonText: "确定",
+        //   callback: (action) => {
+        //     //
+        //   },
+        // });  
+        this.$confirm("是否删除底盘号" + this.multipleSelection[0].vin + "的数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          this.$axios
+            .deletes("/api/newjit/new-m100/"+ this.multipleSelection[0].id)
+            .then((response) => {
+              const index = this.list.indexOf(this.multipleSelection[0]);
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    fetchData(id) {
+      //循环动态
+      this.$axios
+        .gets("/api/newjit/new-m100/" + id)
+        .then((response) => {
+          //console.log(response);
+          this.form = response.item.m100Bill;
+          this.form.rightdetails = [];
+          this.form.leftdetails = response.item.erpAssemblyList;
+          response.item.erpAssemblyList.forEach((element,i) => {
+            element.details.forEach(item => {
+              item.erpAssemblyCode = element.erpAssemblyCode;
+              this.rightAlldetails.push(item);
+              if( i === 0 )
+              {
+                this.form.rightdetails.push(item);
+              }
+            });
+            //console.log(this.rightAlldetails);
+            //console.log(this.form.rightdetails);
+          });
+        });
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+      console.log(JSON.stringify(this.listExportQuery));
+      this.$axios
+        .posts("/api/newjit/new-m100/export", this.listExportQuery)
+        .then((res) => {
+          let filename = res.item;
+          this.$axios
+            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
+            .then((response) => {
+              if (filename.indexOf("_") != -1) {
+                let downName =
+                  filename.slice(0, filename.lastIndexOf("_")) +
+                  filename.slice(filename.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, filename);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+      this.listLoading = false;
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.$refs[refName].resetFields();
+      this.listQuery.OnlineTimeValue = [];
+      this.listQuery.ReceiveTimeValue = [];
+      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();
+      }
+    },
+
+    /**左增加 */
+    handleAddLeftDetails() {
+      this.$forceUpdate();
+      if (this.form.leftdetails === undefined) {
+        this.form.leftdetails = [];
+        //console.log(679);
+      }
+      let obj = {};
+      obj.erpAssemblyCode = "";
+      obj.erpAssemblyName = "";
+      obj.vehicleModel = this.form.vehicleModelCode;
+
+      //console.log(this.form.leftdetails);
+      this.form.leftdetails.push(obj);
+      //console.log(688);
+    },
+    /**右增加 */
+    handleAddRightDetails() {
+      this.$forceUpdate();
+      let obj = {};
+      //判断是否选择了左侧的数据
+      //console.log(this.multipLeLeftSelection);
+      if(this.multipLeLeftSelection.length !== 1)
+      {
+        this.$message({
+            message: "必须选择单行总成",
+            type: "warning",
+          });
+          return;
+      }
+      else
+      {
+        // if (this.form.rightdetails === undefined) {
+        //   this.form.rightdetails = [];
+        //   this.form.rightdetails.erpAssemblyCode = this.multipLeLeftSelection[0].erpAssemblyCode;
+        //   //console.log(679);
+        // }
+      }
+      obj.erpAssemblyCode = this.multipLeLeftSelection[0].erpAssemblyCode;
+      obj.partCode = "";
+      obj.description = "";
+      obj.partNum= 1;
+
+      //console.log(this.form.rightdetails);
+      this.form.rightdetails.push(obj);
+      //console.log(688);
+    },
+    /**左侧删除 */
+    handleLeftDeleteDetails(index,row){
+      this.form.leftdetails.splice(index, 1);
+      this.rightAlldetails = this. rightAlldetails.filter(u => u.erpAssemblyCode !== row.erpAssemblyCode);
+      //console.log(693);
+    },
+    /**右侧删除 */
+    handleRightDeleteDetails(index,row){
+      this.form.rightdetails.splice(index, 1);
+      this.rightAlldetails.forEach((element,i) => {
+        if(element === row)
+        {
+          //console.log("右侧删除");
+          this.rightAlldetails.splice(i, 1);
+          //console.log(this.rightAlldetails);
+          return;
+        }
+      });
+      // .filter(u => u.erpAssemblyCode !== row.erpAssemblyCode && u.partCode !== row.partCode 
+      //                                             && u.partName !== row.partName && u.partNum !== row.partNum);
+                                          
+      //console.log(693);
+    },
+
+    /** 格式化字段 */
+    fieldFormatter(row, column) {
+      if (column.property === "billStatus") {
+        return { 0: "未生效", 2: "已生效", 3: "已发布" }[row[column.property]];
+      }
+      if (column.property == "onlineTime" || column.property == "receiveTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList(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];
+      }
+      this.$axios
+        .gets("/api/newjit/new-m100/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+
+    getKNRList() {
+      var lq = {};
+      var tlist = [];
+      this.$axios
+        .gets("/api/newjit/bill-r100/list", lq)
+        .then((response) => {
+          this.KNRlist = response.items;
+          console.log("获取R100的KNR信息");
+          console.log(this.KNRlist);
+        })
+        .catch(() => {
+          console.log("error");
+        });
+    },
+    getVModel()
+    {
+      this.form.vehicleModelCode = this.KNRlist.filter(u => u.knr === this.form.knr)[0].vehicleModelCode;
+      this.knrQuery.knr = this.form.knr;
+      this.form.rightdetails = [];
+      this.$axios
+        .gets("/api/newjit/new-m100/get-erp-assembly-list", this.knrQuery)
+        .then((response) => {
+          if(response.status === true)
+          {
+            this.KNREClist = response.item;
+            //console.log("获取KNR的总成信息");
+            //console.log(this.KNREClist);
+            this.form.leftdetails = response.item;
+            this.$forceUpdate();
+            response.item.forEach((element,i) => {
+              element.details.forEach(detail => {
+                detail.erpAssemblyCode = element.erpAssemblyCode;
+                this.rightAlldetails.push(detail);
+                if( i === 0 )
+                {
+                  this.form.rightdetails.push(detail);
+                }
+              });
+            });
+          }
+          else
+          {
+            console.log("接口返回结果为错误");
+          }
+        })
+        .catch(() => {
+          console.log("error");
+        });
+    },
+    vMchange()
+    {
+      this.$forceUpdate();
+    },
+
+    valueselectChange(){this.$forceUpdate();},
+    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;
+      //console.log(this.multipleSelection);
+    },
+    handleLeftSelectionChange(val)
+    {
+      // console.log("左改变");
+      // console.log(val);
+      // this.multipLeLeftSelection = [];
+      // this.multipLeLeftSelection.push(val);
+      // console.log(this.multipLeLeftSelection);
+    },
+    /** 通过回调控制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);
+    },
+    /**左点击*/
+    handleLeftRowClick(row, column, event) {
+      this.$forceUpdate();
+      //console.log("左点击");
+      this.$refs.LeftDetialTable.clearSelection();
+      this.$refs.LeftDetialTable.toggleRowSelection(row);
+      this.multipLeLeftSelection = [];
+      this.multipLeLeftSelection.push(row);
+      if(this.form.rightdetails === undefined)
+      {
+        this.form.rightdetails = []
+      }
+      if(this.form.rightdetails.length > 0)
+      {
+        var templist = this.rightAlldetails.filter(u => u.erpAssemblyCode === this.form.rightdetails[0].erpAssemblyCode);
+        this.form.rightdetails.forEach(element => {
+          var temp = templist.filter(u => u.erpAssemblyCode === element.erpAssemblyCode && u.partCode === element.partCode 
+                            && u.partName === element.partName && u.partNum === element.partNum);
+          if(temp.length >= 1)
+          {
+            //console.log("判定包含");
+            //console.log(templist);
+            //console.log(element);
+          }
+          else
+          {
+            //console.log("判定不包含");
+            //console.log(element);
+            this.rightAlldetails.push(element);
+          }
+        });
+      }
+      else
+      {
+        var templist = [];
+      }
+      //.log("右侧全数据");
+      //console.log(this.rightAlldetails);
+      this.form.rightdetails = this.rightAlldetails.filter(u => u.erpAssemblyCode === this.multipLeLeftSelection[0].erpAssemblyCode);
+      //console.log("右侧数据");
+      //console.log(this.form.rightdetails);
+    },
+    //获取所有产线
+    getProductLine()
+    {
+      this.listPLQuery.UserId = this.userInfo.userId;
+      this.$axios
+          .gets(
+            "/api/newjit/product-line/list",this.listPLQuery
+          )
+          .then((response) => {
+            //console.log(response);
+            this.PLList = response.item;
+            this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
+            this.listQuery.productLine = this.PLChildList[0].productLineCode;
+            this.getList();
+            
+            //console.log(this.PLList);
+          })
+          .catch(() => {
+          });
+    },
+    //产线类型变更
+    ptypeselectChange()
+    {
+      this.$forceUpdate();
+      this.listQuery.productLine = "";
+      //console.log(this.listQuery.productType);
+      //console.log(this.PLChildList)
+      this.PLChildList = this.PLList.filter(u => u.productType === parseInt(this.listQuery.productType)).sort((a,b)=>{return a.productLineCode-b.productLineCode});
+      //console.log(this.PLList)
+      //console.log(this.listQuery.productType)
+      //console.log(this.PLChildList)
+    },
+    //获取车型
+    getvehicleModel()
+    {
+      this.$axios
+          .gets(
+            "/api/newjit/dic/list",this.vehicleModelQuery
+          )
+          .then((response) => {
+            //console.log(response);
+            this.vehicleModelList = response.item;
+            //console.log()
+          })
+          .catch(() => {
+          });
+    },
+    leftclick()
+    {
+      this.$forceUpdate();
+      let obj = {};
+      obj.erpAssemblyCode = this.form.erpAssemblyCode;
+      obj.erpAssemblyName = this.form.erpAssemblyName;
+      obj.vehicleModel = this.form.vehicleModelCode;
+      
+      if (this.form.leftdetails === undefined) {
+        this.form.leftdetails = [];
+      }
+      this.form.leftdetails.push(obj);
+    },
+    rightclick(){},
+  },
+};
+</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%;
+}
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
index 5d720dd..4d8b344 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue
@@ -1,4 +1,4 @@
-<!--重新打印门板模块 todo-an:门板-->
+<!--重新打印模块-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
@@ -164,7 +164,7 @@
               ></el-table-column>
               <el-table-column
                 prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
+                label="车型代码"
               ></el-table-column>
               <el-table-column
                 prop="topBoxPositionNum"
@@ -366,7 +366,7 @@ export default {
   watch: {
     customerInfosMB: {
       handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+        console.log("接收的父组件的值：" + JSON.stringify(newVal));
         if (newVal == "" || newVal == "undefined") {
           //TODO
         } else {
@@ -491,7 +491,6 @@ export default {
         that.expands = [];
       }
     },
-    //门板
     getList(data) {
       this.listLoading = true;
       if (data != undefined) {
@@ -559,7 +558,7 @@ export default {
           this.listLoading = false;
         });
     },
-    //重新打印-门板
+    //重新打印
     handleUpdate(row) {
       var MBVin1 = [];
       let myalert = ""; //声明变量，其变量必须在此声明后使用
@@ -583,7 +582,7 @@ export default {
     //       reportIdList: MBId,
     //     };
 				// debugger //重新打印
-    //     console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+    //     console.log("打印-主界面传过来的值：" + JSON.stringify(params));
     //     this.$axios
     //       .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
     //       .then((response) => {
@@ -598,7 +597,7 @@ export default {
     //         } else if (response.status === true) {
     //           this.fileQuery.dataname = JSON.stringify(response.item);
     //           console.log(
-    //             "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+    //             "调用Handlers/Handler1.ashx?report=menban传的值：" +
     //               JSON.stringify(this.fileQuery.dataname)
     //           );
     //           this.$axios
@@ -615,8 +614,8 @@ export default {
     //       .catch(() => {});
 		
 		debugger //重新打印
-        var params = MBVin1; //选中的门板ID列表
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+        var params = MBVin1; //选中的ID列表
+        console.log("打印-主界面传过来的值：" + JSON.stringify(params));
         this.$axios
           .posts("/api/newjit/bill-m100/load-menban-report", params)
           .then((response) => {
@@ -631,7 +630,7 @@ export default {
             } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                "调用Handlers/Handler1.ashx?report=menban传的值：" +
                   JSON.stringify(this.fileQuery.dataname)
               );
               this.$axios
@@ -650,7 +649,7 @@ export default {
 
 
     },
-    //作废操作，支持批量操作-门板
+    //作废操作，支持批量操作
     handleDelete(row) {
       //批量删除
       var params = [];
@@ -748,7 +747,6 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    //门板
     handleFilter() {
       this.page = 1;
       this.getList();
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
index 40a9327..5e4b6dc 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页 todo-an:门板-->
+<!--总成模块信息管理页-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
@@ -138,7 +138,7 @@
               ></el-table-column>
               <el-table-column
                 prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
+                label="车型代码"
               ></el-table-column>
               <el-table-column
                 prop="topBoxPositionNum"
@@ -398,7 +398,7 @@ export default {
   watch: {
     customerInfosMB: {
       handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+        console.log("接收的父组件的值：" + JSON.stringify(newVal));
         if (newVal == "" || newVal == "undefined") {
           //TODO
         } else {
@@ -523,7 +523,6 @@ export default {
         that.expands = [];
       }
     },
-    //门板
     getList(data) {
       this.listLoading = true;
       if (data != undefined) {
@@ -584,7 +583,7 @@ export default {
           this.listLoading = false;
         });
     },
-    //重新打印-门板
+    //重新打印
     handleUpdate(row) {
       this.isEdit = true;
       if (this.multipleSelection.length != 1) {
@@ -602,7 +601,7 @@ export default {
           productLine: this.customerInfo.productLine,
           Vin: Vin1,
         };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+        console.log("打印-主界面传过来的值：" + JSON.stringify(params));
         this.$axios
           .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
           .then((response) => {
@@ -617,7 +616,7 @@ export default {
             } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                "调用Handlers/Handler1.ashx?report=menban传的值：" +
                   JSON.stringify(this.fileQuery.dataname)
               );
               this.$axios
@@ -663,7 +662,7 @@ export default {
             this.fileQuery.dataname = JSON.stringify(response);
             this.zflist = response;
             console.log(
-              "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+              "调用Handlers/Handler1.ashx?report=menban传的值：" +
                 JSON.stringify(this.fileQuery.dataname)
             );
           }
@@ -680,7 +679,7 @@ export default {
         .posts("/api/newjit/MenBanPackingList/scrap", params)
         .then((response) => {
           console.log(
-            "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+            "调用Handlers/Handler1.ashx?report=menban传的值：" +
               JSON.stringify(response)
           );
           this.$notify({
@@ -695,7 +694,7 @@ export default {
       
     },
 
-    //作废操作，支持批量操作-门板
+    //作废操作，支持批量操作
     // handleDelete(row) {
     //   //批量删除
     //   var params = [];
@@ -731,7 +730,7 @@ export default {
     //           myalertcount.push(itemsss.billNum);
     //         });
     //         console.log(
-    //           "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+    //           "调用Handlers/Handler1.ashx?report=menban传的值：" +
     //             JSON.stringify(this.fileQuery.dataname)
     //         );
     //         this.$confirm(
@@ -822,7 +821,6 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    //门板
     handleFilter() {
       this.page = 1;
       this.getList();
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
index 4f28950..929265a 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页 todo-an:门板-->
+<!--总成模块信息管理页-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue
index f812c2c..da45289 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页 todo-an:门板?-->
+<!--总成模块信息管理页-->
 
 <!--
 此
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index copy.vue b/vue/src/views/pg-fis/basedate/r100Online/index copy.vue
new file mode 100644
index 0000000..7c5c173
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/r100Online/index copy.vue	
@@ -0,0 +1,829 @@
+<!--总成模块信息管理页 pg-R100Online-->
+<template>
+  <div class="cr-body-content">
+    <div ref="box">
+      <flexbox class="content-header">
+        <el-form
+          :model="listQuery"
+          ref="queryForm"
+          v-show="showSearch"
+          :inline="true"
+        >
+          <!-- <el-row> -->
+          <el-form-item label="生产线:" prop="productType">
+            <el-select
+              v-model="listQuery.productType"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="ptypeselectChange"
+            >
+              <el-option
+                v-for="item in productTypeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="productLine">
+            <el-select
+              v-model="listQuery.productLine"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="valueselectChange"
+            >
+              <el-option
+                v-for="item in PLChildList"
+                :key="item.id"
+                :label="item.productLineName"
+                :value="item.productLineCode"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="版本:" prop="Version">
+            <el-input
+              v-model="listQuery.Version"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <el-form-item label="大众顺序号:" prop="HostSNBegin">
+            <el-input
+              v-model="listQuery.HostSNBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="HostSNEnd">
+            <el-input
+              v-model="listQuery.HostSNEnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="KNR:" prop="KNRBegin">
+            <el-input
+              v-model="listQuery.KNRBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="-" prop="KNREnd">
+            <el-input
+              v-model="listQuery.KNREnd"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- </el-row> -->
+          <!-- <el-row> -->
+          <!-- <el-form-item label="底盘号:" prop="VINBegin">
+          <el-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" :default-time="['00:00:00','23:59:59']"
+              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" :default-time="['00:00:00','23:59:59']"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="单据状态" prop="State">
+            <el-checkbox-group v-model="listQuery.state">
+              <el-checkbox
+                v-for="(item, index) in billState"
+                :key="item.id"
+                :label="item.id"
+                @change="checkedListChange(index)"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+
+          <el-form-item style="margin:0">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleFilter"
+              >搜索</el-button
+            >
+            <el-button
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery('queryForm')"
+              >重置</el-button
+            >
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              style="margin-left: 15px"
+              @click="handleDownload()"
+              >导出(Excel)
+            </el-button>
+            <el-button
+              type="primary"
+              size="mini"
+              style="margin-left: 15px"
+              @click="SAPExport()"
+              >导出Excel（用于SAP导入）
+            </el-button>
+          </el-form-item>
+          <!-- </el-row> -->
+        </el-form>
+      </flexbox>
+    </div>
+    <div class="l-table" 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%;margin-top:30px"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="KNR"
+          prop="knr"
+          sortable="custom"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.knr
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+          
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+        <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 { downloadFile } from "@/utils/crmindex.js";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "R100Online",
+  components: { Pagination, CRMTableHead, importExcel, Detail },
+  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: "R100Online",
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      billState: [
+        { id: 2, name: "未导出" },
+        { id: 3, name: "已导出" },
+      ],
+      valueSelect: "",
+      customerInfos: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        productType: 1,
+        ProductLine: undefined,
+        Version: undefined,
+        HostSNBegin: undefined,
+        HostSNBegin: undefined,
+        KNRBegin: undefined,
+        KNREnd: undefined,
+        //VINBegin:undefined,
+        VINEnd: undefined,
+        OnlineTimeValue: [],
+        OnlineTimeBegin: undefined,
+        OnlineTimeEnd: undefined,
+        ReceiveTimeValue: [],
+        ReceiveTimeBegin: undefined,
+        ReceiveTimeEnd: undefined,
+        billStatus: undefined,
+        state: [],
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery: {
+        BillType: 1,
+        //UserId: "00000000-0000-0000-0000-000000000000",
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      bomUnit,
+      multipleSelection: [],
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLChildList: [], //筛选后产线下拉
+      productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
+    };
+  },
+  mounted() {
+    this.getList();
+    this.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+      //console.log(this.$refs.box.offsetHeight);
+      //console.log(this.tableHeight);
+    });
+  },
+  created() {
+    this.billState.forEach((element, index) => {
+      if (index === 0) {
+        this.listQuery.state.push(element.id);
+      }
+    });
+    this.getProductLine();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120});
+      // tempsTabs.push({
+      //   label: "底盘号",
+      //   prop: "vin",
+      //   width: 130,
+      // });
+      // tempsTabs.push({
+      //   label: "KNR",
+      //   prop: "knr",
+      //   width: 150,
+      // });
+      tempsTabs.push({
+        label: "单据状态",
+        prop: "billStatus",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "上线时间",
+        prop: "onlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "接收时间",
+        prop: "receiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "总成编号",
+        prop: "erpAssemblyCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "总成名称",
+        prop: "erpAssemblyName",
+        width: 400,
+      });
+      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;
+      var parentId = param.assemblyID; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+      console.log(JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/newjit/bill-r100/export-erp-assembly-code", 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 { 0: "未匹配", 2: "未导出", 3: "已导出" }[row[column.property]];
+      }
+      if (column.property == "onlineTime" || column.property == "receiveTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      return row[column.property] || "--";
+    },
+    roleFilter(type) {
+      return projectTypeKeyValue[type];
+    },
+    getList(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-r100/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() {
+      this.$forceUpdate();
+    },
+    handleImportSAP() {},
+
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+    },
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    SAPExport() {
+      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/bill-r100/export-erp-assembly-code", 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;
+    },
+    //获取所有产线
+    getProductLine() {
+      this.listPLQuery.UserId = this.userInfo.userId;
+      this.$axios
+        .gets("/api/newjit/product-line/list", this.listPLQuery)
+        .then((response) => {
+          //console.log(response);
+          this.PLList = response.item;
+          this.PLChildList = this.PLList.filter(
+            (u) => u.productType === parseInt(this.listQuery.productType)
+          ).sort((a, b) => {
+            return a.productLineCode - b.productLineCode;
+          });
+          this.listQuery.productLine = this.PLChildList[0].productLineCode;
+          this.getList();
+          //console.log(this.PLList)
+        })
+        .catch(() => {});
+    },
+    //产线类型变更
+    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)
+    },
+    /*单据状态变更 */
+    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);
+      }
+    },
+  },
+};
+</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%;
+}
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue
index dec40f6..9275aba 100644
--- a/vue/src/views/pg-fis/basedate/r100Online/index.vue
+++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页 todo-an:门板-->
+<!--总成模块信息管理页 pg-R100Online-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
@@ -9,25 +9,7 @@
           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-form-item label="生产线:" prop="productLine">
             <el-select
               v-model="listQuery.productLine"
               clearable
@@ -357,7 +339,6 @@ export default {
       listQuery: {
         SkipCount: 0,
         MaxResultCount: 15,
-        productType: 1,
         ProductLine: undefined,
         Version: undefined,
         HostSNBegin: undefined,
@@ -400,10 +381,6 @@ export default {
       detailTableHeight: 250,
       details: [], //修改子表数据源
       PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
     };
   },
   mounted() {
@@ -766,9 +743,7 @@ export default {
         .then((response) => {
           //console.log(response);
           this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
+          this.PLChildList = this.PLList.sort((a, b) => {
             return a.productLineCode - b.productLineCode;
           });
           this.listQuery.productLine = this.PLChildList[0].productLineCode;
@@ -777,18 +752,6 @@ export default {
         })
         .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)
-    },
     /*单据状态变更 */
     checkedListChange(index) {
       if (this.listQuery.state.length <= 1) {
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index copy.vue b/vue/src/views/pg-fis/basedate/repeatR100/index copy.vue
new file mode 100644
index 0000000..a5bd6b2
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/repeatR100/index copy.vue	
@@ -0,0 +1,941 @@
+<!--重复报文信息页 pg-repeatR100-->
+<template>
+  <div class="cr-body-content">
+    <div ref="box">
+      <flexbox class="content-header">
+        <el-form
+          :model="listQuery"
+          ref="queryForm"
+          v-show="showSearch"
+          :inline="true"
+        >
+          <!-- <el-form-item label="数据采集点" prop="productType">
+      <el-checkbox v-model="listQuery.checked1" >M100</el-checkbox>
+      <el-checkbox v-model="listQuery.checked2" >R100</el-checkbox>
+        </el-form-item> -->
+          <el-form-item label="数据采集点" prop="State" >
+            <el-checkbox-group v-model="listQuery.state">
+              <el-checkbox
+                v-for="(item, index) in billState"
+                :key="item.id"
+                :label="item.id"
+                @change="checkedListChange(index)"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+
+          <el-form-item label="生产线:" 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.productLineCode"
+                :label="item.productLineName"
+                :value="item.productLineCode"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="起始顺序号" prop="HostSNBegin">
+            <el-input
+              v-model="listQuery.HostSNBegin"
+              placeholder="起始顺序号"
+              clearable
+              size="small"
+              style="width: 120px"
+              @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: 120px"
+              @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-form-item label="底盘号:" prop="VINBegin">
+                <el-input
+                  v-model="listQuery.VINBegin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 200px"
+                  @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: 200px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
+           <el-form-item label="车型代码" prop="vehicleModelCode">
+        <el-select
+          v-model="listQuery.vehicleModelCode"
+          clearable
+          placeholder="请选择"
+          size="medium"
+          style="margin-right: 15px"
+          @change="valueselectChange1"
+        >
+          <el-option
+            v-for="item in vehicleModelList"
+            :key="item.id"
+            :label="item.dicItemName"
+            :value="item.dicItemCode"/>
+        </el-select>
+      </el-form-item>
+
+            <!-- <el-select
+              v-model="listQuery.VehicleModelCode"
+              placeholder="请输入总成名称"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            /> -->
+
+          <el-form-item label="版本" prop="Version">
+            <el-input
+              v-model="listQuery.Version"
+              placeholder="请输入总成名称"
+              clearable
+              size="small"
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="上线日期">
+            <el-date-picker
+              v-model="OnlineTimeValue"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="接收日期">
+            <el-date-picker
+              v-model="ReceiveTimeValue"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+
+          <!-- <el-form-item label="单据状态" prop="BillStatus">
+          <el-select
+            v-model="listQuery.BillStatus"
+            placeholder="请选择"
+            style="width: 200px"
+          >
+            <el-option label="未领取生产任务" :value="1"></el-option>
+            <el-option label="已领取生产任务" :value="2"></el-option>
+            <el-option label="完成生产任务" :value="3"></el-option>
+          </el-select>
+        </el-form-item> -->
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleFilter"
+              >搜索</el-button
+            >
+            <el-button
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery('queryForm')"
+              >重置</el-button
+            >
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              style="margin-left: 15px"
+              @click="handleDownload()"
+              >导出(Excel)查询信息
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </flexbox>
+    </div>
+    <div class="l-table">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <el-table-column
+          label="底盘号"
+          prop="vin "
+          sortable="custom"
+          align="center"
+          fixed
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.vin
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 导入Excel组件 -->
+      <importExcel
+        ref="importexcel"
+        :show="showExcelImport"
+        :crmType="crmType"
+        @close="importExcelData"
+      />
+    </div>
+    <!-- 抽屉控件 -->
+    <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>
+</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 { mapGetters } from "vuex";
+import Lockr from "lockr";
+import moment from "moment";
+import message_table from "../../components/mixins/message_table";
+import Detail from "./detail.vue";
+import { downloadFile } from "@/utils/crmindex.js";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "RepeatM100",
+  components: { Pagination, CRMTableHead, importExcel, Detail },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  mixins: [message_table],
+  data() {
+    return {
+      crmType: "bomdatabase",
+      customerInfos: [],
+      billState: [
+        { id: 2, name: "R100" },
+        { id: 3, name: "M100" },
+      ],
+      isVINShowState:false,
+      OnlineTimeValue: [],
+      ReceiveTimeValue: [],
+      versionValue: "",
+      customerInfosMB:[],
+      customerInfosZHB:[],
+      versionList: [], //版本列表
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        
+        productType: 1, //1:门板；2:柱护板
+        ProductLine: undefined,
+        checked1:true,
+        checked2:true,
+        SkipCount: 0,
+        MaxResultCount: 15,
+        HostSNBegin: undefined,
+        HostSNEnd: undefined,
+        VIN: undefined,
+        VINBegin: undefined,
+        VINEnd: undefined,
+        OnlineTimeBegin: undefined,
+        OnlineTimeEnd: undefined,
+        ReceiveTimeBegin: undefined,
+        ReceiveTimeEnd: undefined,
+        VehicleModelCode: undefined,
+        Version: undefined,
+        KNR: undefined,
+        state: [],
+
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+       vehicleModelQuery:{
+        dicTypeName:"派格车型",
+      },
+      page: 1,
+      // 显示搜索条件
+        // VehicleModelCodelist:[
+        //   {id: 1, name: "C8"},
+        //   {id: 2, name: "B8L"},
+        //   {id: 3, name: "CC"},
+        //   {id: 4, name: "BSMV"},
+        //   {id: 5, name: "B9"},
+        //    {id: 6, name: "Q5"},
+        // ],
+        productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
+      showSearch: true,
+      bomUnit,
+      PLList: [],
+      PLChildList: [], //筛选后产线下拉
+      multipleSelection: [],
+      drawer: false,
+      isShowState: true,
+      dialogTableVisible: false,
+      vehicleModelList:[],//车型list
+      //tableHeight: document.documentElement.clientHeight - 260,
+    };
+  },
+  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为页面上部标签高度
+    });
+  },
+  created() {
+    //this.getList();
+    this.billState.forEach((element, index) => {
+      if (index === 0) {
+        this.listQuery.state.push(element.id);
+      }
+    });
+    this.getvehicleModel();
+    this.getProductLine();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "流水号", prop: "serialNum", width: 100 });
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "底盘号",
+        prop: "vin",
+        width: 130,
+      });
+      tempsTabs.push({
+        label: "上线时间",
+        prop: "onlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "接收时间",
+        prop: "receiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "产线",
+        prop: "productLine",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "数据采集点",
+        prop: "",
+        width: 150,
+      });
+
+      tempsTabs.push({ label: "单据状态", prop: "billStatus", width: 120 });
+      tempsTabs.push({
+        label: "车型名称",
+        prop: "vehicleModelName",
+        width: 120,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+       ss(data) {
+      //alert(data);
+      //版本下拉选择
+      this.valueSelect = data;
+      this.getList();
+    },
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //传入的是总成id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      // if (this.OnlineTimeValue != []) {
+      //   this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
+      //   this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
+      // }
+      // if (this.ReceiveTimeValue != []) {
+      //   this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
+      //   this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
+      // }
+      if (this.OnlineTimeValue != []) {
+        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue
+          ? this.OnlineTimeValue[0] || undefined
+          : undefined;
+        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue
+          ? this.OnlineTimeValue[1] || undefined
+          : undefined;
+      }
+      if (this.ReceiveTimeValue != []) {
+        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue
+          ? this.ReceiveTimeValue[0] || undefined
+          : undefined;
+
+        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue
+          ? this.ReceiveTimeValue[1] || undefined
+          : undefined;
+      }
+      console.log("重复报文导出条件：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .posts("/api/newjit/repeat-m100/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;
+            })
+            .catch(() => {
+              this.listLoading = 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);
+      }
+      if(this.listQuery.state[0]=="3")
+      {
+        this.isVINShowState = true;
+      }
+      else
+      {
+        this.isVINShowState = false;
+      }
+    },
+    /** 重置按钮操作 */
+    resetQuery(refName) {
+      this.OnlineTimeValue = [];
+      this.ReceiveTimeValue = [];
+      this.listQuery.state = [];
+      this.$refs[refName].resetFields();
+      this.handleQuery();
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.listQuery.SkipCount = 1;
+      //this.getList();
+      // this.getListM100();
+      //  this.getListR100();
+    },
+    selectValue(params) {
+      //版本下拉选择
+      this.versionValue = params.value;
+      this.getList();
+      // this.getListM100();
+      //  this.getListR100();
+    },
+
+    selectOptionsChange(item) {
+      this.getList();
+      // this.getListM100();
+      //  this.getListR100();
+    },
+    importExcelData() {
+      //关闭导入窗体时调用
+      this.showExcelImport = false;
+      //this.getList();
+    },
+
+    /** 刷新列表 */
+    handleHandle(data) {
+      if (data.type !== "edit") {
+        this.getList();
+        // this.getListM100();
+        //  this.getListR100();
+      }
+    },
+    /** 格式化字段 */
+    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.OnlineTimeValue != []) {
+        this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
+        this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
+      }
+      //  if (this.valueSelect != "") {
+      //   this.listQuery.VehicleModelCode = this.valueSelect;
+      // } else {
+      //   this.listQuery.VehicleModelCode = "";
+      // }
+      if (this.ReceiveTimeValue != []) {
+        this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
+        this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
+      }
+    
+if(this.listQuery.state[0] == "2")
+{
+  this.dialogTableVisible = false;
+  console.log("555555555555555555555555555555"+JSON.stringify(this.listQuery));
+    this.$axios
+        .gets("/api/newjit/repeat-r100/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+}
+else
+{
+  this.dialogTableVisible = true;
+this.$axios
+        .gets("/api/newjit/repeat-m100/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+}
+
+    //  if (this.billState=== 2) {
+       
+    //   this.$axios
+    //     .gets("/api/newjit/repeat-r100/list", this.listQuery)
+    //     .then((response) => {
+    //       this.list = response.items;
+    //       this.totalCount = response.totalCount;
+    //       setTimeout(() => {
+    //         //大数据量加载时
+    //         this.listLoading = false;
+    //       }, 500);
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    //  }
+    //  else if(this.billState === 3){
+     
+    //   this.$axios
+    //     .gets("/api/newjit/repeat-m100/list", this.listQuery)
+    //     .then((response) => {
+    //       this.list = response.items;
+    //       this.totalCount = response.totalCount;
+    //       setTimeout(() => {
+    //         //大数据量加载时
+    //         this.listLoading = false;
+    //       }, 500);
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    //  }
+  //}
+    
+   
+    },
+    // 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.OnlineTimeValue != []) {
+    //     this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0];
+    //     this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1];
+    //   }
+    //   if (this.ReceiveTimeValue != []) {
+    //     this.listQuery.ReceiveTimeBegin = this.ReceiveTimeValue[0];
+    //     this.listQuery.ReceiveTimeEnd = this.ReceiveTimeValue[1];
+    //   }
+    //    if (this.listQuery.state !== undefined) {
+    //     this.listQuery.billStatus = this.listQuery.state[0];
+    //   }
+    //    //this.listQueryList.ProductLine = this.listQuery.productLine;
+    //   this.$axios
+    //     .gets("/api/newjit/repeat-m100/list", this.listQuery)
+    //     .then((response) => {
+    //       this.list = response.items;
+    //       this.totalCount = response.totalCount;
+    //       setTimeout(() => {
+    //         //大数据量加载时
+    //         this.listLoading = false;
+    //       }, 500);
+    //     })
+    //     .catch(() => {
+    //       this.listLoading = false;
+    //     });
+    // },
+    handleFilter() {
+     this.dialogTableVisible = false;
+      this.page = 1;
+      this.getList();
+      // this.getListM100();
+      //  this.getListR100();
+    },
+      //产线类型变更
+    ptypeselectChange() {
+      debugger
+      this.$forceUpdate();
+      //console.log("222222222222222222222222222222222222222222"+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)
+      },
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    getProductLine() {
+      //debugger
+      //console.log(JSON.stringify(this.userInfo));
+      this.listPLQuery.UserId = this.userInfo.userId;
+      console.log("this.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserIdthis.listPLQuery.UserId"+this.listPLQuery.UserId);
+      this.$axios
+        .gets("/api/newjit/product-line/list", this.listPLQuery)
+        .then((response) => {
+          
+          //console.log("获取产线数据："+JSON.stringify(response.item));
+          this.PLList = response.item;
+          
+          this.PLChildList = this.PLList.filter(
+            (u) => u.productType === parseInt(this.listQuery.productType)
+          ).sort((a, b) => {
+            return a.productLineCode - b.productLineCode;
+          });
+          console.log("2222222获取产线数据："+JSON.stringify(this.PLChildList));
+          this.listQuery.productLine = this.PLChildList[0].productLineCode;
+          if (this.listQuery.productLine != "") {
+            //把产线值传到子组件
+            this.customerInfosMB = [
+              {
+                PrintType: 1,
+                ProductLine: this.PLChildList[0].productLineCode,
+              },
+            ];
+          }
+           this.getList();
+          // this.getListM100();
+          // this.getListR100();
+          //console.log(this.PLList)
+        })
+        .catch(() => {});
+    },
+     valueselectChange1(){},
+
+     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,
+          },
+        ];
+      }
+    },
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+     getvehicleModel()
+    {
+      this.$axios
+          .gets(
+            "/api/newjit/dic/list",this.vehicleModelQuery
+          )
+          .then((response) => {
+            //console.log(response);
+            this.vehicleModelList = response.item;
+            //console.log()
+          })
+          .catch(() => {
+          });
+    },
+    /** 通过回调控制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);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../../pg-fis/styles/crmtable.scss";
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/repeatR100/index.vue b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
index 103ab17..104d63a 100644
--- a/vue/src/views/pg-fis/basedate/repeatR100/index.vue
+++ b/vue/src/views/pg-fis/basedate/repeatR100/index.vue
@@ -1,4 +1,4 @@
-<!--重复报文信息页 todo-an:门板-->
+<!--重复报文信息页 pg-repeatR100-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
@@ -9,10 +9,6 @@
           v-show="showSearch"
           :inline="true"
         >
-          <!-- <el-form-item label="数据采集点" prop="productType">
-      <el-checkbox v-model="listQuery.checked1" >M100</el-checkbox>
-      <el-checkbox v-model="listQuery.checked2" >R100</el-checkbox>
-        </el-form-item> -->
           <el-form-item label="数据采集点" prop="State" >
             <el-checkbox-group v-model="listQuery.state">
               <el-checkbox
@@ -25,25 +21,7 @@
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-
-          <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-form-item label="生产线:" prop="productLine">
             <el-select
               v-model="listQuery.productLine"
               clearable
@@ -383,8 +361,6 @@ export default {
         },
       },
       listQuery: {
-        
-        productType: 1, //1:门板；2:柱护板
         ProductLine: undefined,
         checked1:true,
         checked2:true,
@@ -422,10 +398,6 @@ export default {
         //   {id: 5, name: "B9"},
         //    {id: 6, name: "Q5"},
         // ],
-        productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
       showSearch: true,
       bomUnit,
       PLList: [],
@@ -809,19 +781,6 @@ this.$axios
       // this.getListM100();
       //  this.getListR100();
     },
-      //产线类型变更
-    ptypeselectChange() {
-      debugger
-      this.$forceUpdate();
-      //console.log("222222222222222222222222222222222222222222"+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)
-      },
     sortChange(data) {
       const { prop, order } = data;
       if (!prop || !order) {
@@ -843,9 +802,7 @@ this.$axios
           //console.log("获取产线数据："+JSON.stringify(response.item));
           this.PLList = response.item;
           
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
+          this.PLChildList = this.PLList.sort((a, b) => {
             return a.productLineCode - b.productLineCode;
           });
           console.log("2222222获取产线数据："+JSON.stringify(this.PLChildList));
@@ -872,24 +829,14 @@ this.$axios
       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,
-          },
-        ];
-      }
+      //把产线值传到子组件
+      this.customerInfosMB = [
+        {
+          PrintType: 1,
+          ProductLine: val,
+        },
+      ];
+      
     },
 
     handleSelectionChange(val) {
diff --git a/vue/src/views/pg-fis/basedate/select/detailMB.vue b/vue/src/views/pg-fis/basedate/select/detailMB.vue
index d29c1b5..81faf3d 100644
--- a/vue/src/views/pg-fis/basedate/select/detailMB.vue
+++ b/vue/src/views/pg-fis/basedate/select/detailMB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页 todo-an:门板-->
+<!--总成模块信息管理页-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
@@ -170,7 +170,7 @@
               ></el-table-column>
               <el-table-column
                 prop="vehicleModel_DoorPlankCode"
-                label="车型门板代码"
+                label="车型代码"
               ></el-table-column>
               <el-table-column
                 prop="topBoxPositionNum"
@@ -378,7 +378,7 @@ export default {
   watch: {
     customerInfosMB: {
       handler(newVal) {
-        console.log("门板-接收的父组件的值：" + JSON.stringify(newVal));
+        console.log("接收的父组件的值：" + JSON.stringify(newVal));
         if (newVal == "" || newVal == "undefined") {
           //TODO
         } else {
@@ -501,7 +501,6 @@ export default {
         that.expands = [];
       }
     },
-    //门板
     getList(data) {
       this.listLoading = true;
       if (data != undefined) {
@@ -551,7 +550,7 @@ export default {
           this.listLoading = false;
         });
     },
-    //重新打印-门板
+    //重新打印
     handleUpdate(row) {
       this.isEdit = true;
       if (this.multipleSelection.length != 1) {
@@ -571,7 +570,7 @@ export default {
           beginVin: beginVin1,
           endVin: endVin1,
         };
-        console.log("门板打印-主界面传过来的值：" + JSON.stringify(params));
+        console.log("打印-主界面传过来的值：" + JSON.stringify(params));
         this.$axios
           .posts("/api/newjit/bill-m100/print-menban-packing-list", params)
           .then((response) => {
@@ -586,7 +585,7 @@ export default {
             } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
-                "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +
+                "调用Handlers/Handler1.ashx?report=menban传的值：" +
                   JSON.stringify(this.fileQuery.dataname)
               );
               this.$axios
@@ -602,7 +601,7 @@ export default {
           .catch(() => {});
       }
     },
-    //作废操作，支持批量操作-门板
+    //作废操作，支持批量操作
     handleDelete(row) {
       //批量删除
       var params = [];
@@ -700,7 +699,6 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
-    //门板
     handleFilter() {
       this.page = 1;
       this.getList();
diff --git a/vue/src/views/pg-fis/basedate/select/index copy.vue b/vue/src/views/pg-fis/basedate/select/index copy.vue
new file mode 100644
index 0000000..603f8b2
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/select/index copy.vue	
@@ -0,0 +1,1690 @@
+<!--M100查询模块-->
+<template>
+  <div class="cr-body-content">
+    <div ref="box">
+      <flexbox class="content-header">
+        <el-form
+          :model="listQuery"
+          ref="queryForm"
+          v-show="showSearch"
+          :inline="true"
+        >
+          <el-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: 10px"
+              @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 
+            prop="GroupName" 
+            v-show="listQuery.productType == 2"
+          >
+            <el-select
+              v-model="listQuery.GroupName"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 10px"
+            >
+              <el-option
+                v-for="(item,key) in PLChildGroupList"
+                :key="key"
+                :label="item"
+                :value="item"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="版本:" prop="Version">
+            <el-input
+              v-model="listQuery.Version"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 200px"
+              @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: 200px"
+              @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: 200px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <!-- <el-row> -->
+          <el-form-item label="大众顺序号:" prop="hostSN">
+            <el-input
+              v-model="listQuery.HostSNBegin"
+              placeholder=""
+              clearable
+              size="small"
+              style="width: 200px"
+              @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: 200px"
+              @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: 200px"
+              @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: 200px"
+              @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: 200px"
+              @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: 200px"
+              @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"
+              :default-time="['00:00:00', '23:59:59']"
+              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"
+              :default-time="['00:00:00', '23:59:59']"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="单据状态" prop="State" v-show="isShowState">
+            <el-checkbox-group v-model="listQuery.state">
+              <el-checkbox
+                v-for="(item, index) in billState"
+                :key="item.id"
+                :label="item.id"
+                @change="checkedListChange(index)"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+
+          <el-form-item >
+            <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: 200px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endHostSN"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 200px"
+                />
+              </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: 200px"
+                />
+                <label class="label1">-</label>
+                <el-input
+                  v-model="form.endVin"
+                  placeholder=""
+                  clearable
+                  size="small"
+                  style="width: 200px"
+                />
+              </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="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 {
+      chkindex: 0, //复选按钮选择索引
+      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,
+        GroupName:undefined,//仅在柱护板时候显示
+        Version: undefined,
+        printBillNum: undefined,
+        serialNumBegin: undefined,
+        serialNumEnd: undefined,
+        HostSNBegin: undefined,
+        HostSNEnd: undefined,
+        KNRBegin: undefined,
+        KNREnd: undefined,
+        VINBegin: undefined,
+        VINEnd: undefined,
+        OnlineTimeValue: [],
+        OnlineTimeBegin: undefined,
+        OnlineTimeEnd: undefined,
+        ReceiveTimeValue: [],
+        ReceiveTimeBegin: undefined,
+        ReceiveTimeEnd: undefined,
+        billStatus: undefined,
+        state: [],
+        ZHBBillStatus: undefined,
+        Description:undefined
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery: {
+        BillType: 2,
+        //UserId: this.userinfo.UserId,
+      },
+      hostSNQuery: {
+        productLine: undefined,
+      },
+      hostCheckQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      hostPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      vinPrintQuery: {
+        printType: undefined, //0:打印;1:重打;2:补打;
+        productLine: undefined,
+        beginHostSN: undefined,
+        endHostSN: undefined,
+        beginVin: undefined,
+        endVin: undefined,
+      },
+      fileQuery: {
+        dataname: undefined,
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      bomUnit,
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      PLList: [], //产线下拉
+      PLChildList: [], //筛选后产线下拉
+      PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
+      productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
+      isShowHostSN: false,
+      isShowVin: false,
+      isShowState: true,
+    };
+  },
+  mounted() {
+    let _this = this
+    window.addEventListener('resize',function(){
+      _this.changeMainTableHeight()
+    })
+    this.getPLChildGroupList()
+  },
+  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: "printBillNum",
+        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: "description",
+        width: 120,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    // 更改主表格高度
+    changeMainTableHeight(){
+      this.$nextTick(()=>{
+        var offsetHei = document.documentElement.clientHeight;
+        //console.log(offsetHei);
+        let boxH = this.$refs.box.offsetHeight;
+        this.tableHeight = offsetHei - boxH - 37 - 79; //57为footer高度，79为页面上部标签高度
+        //this.tableHeight = offsetHei -260
+      })
+    },
+    // 获取PLChildGroupList
+    getPLChildGroupList(){
+      this.$axios
+        .gets(
+          "/api/newjit/print-template-configuration/list",
+        )
+        .then((response) => {
+          if (response.item !== null) {
+            this.PLChildGroupList= response.item;
+          }
+        });
+    },
+    //抽屉
+    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);
+        });
+    },
+    /** 导出功能 assembly-cfg-erp/export*/
+    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/bill-m100/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 === "printBillNum"){
+        let value = row[column.property]
+        if(value!=null&&value.length > 0){
+          return "柱护板已打印";
+        }
+        else{
+          return "柱护板未打印";
+        }
+      }
+      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");
+      }
+      if (column.property === "canNotPrint") {
+        return { true: "是", false: "否" }[row[column.property]];
+      }
+      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.chkindex == 2) {
+        //不可打印
+        this.listQuery.canNotPrint = true;
+        this.listQuery.billStatus = null;
+        this.listQuery.ZHBBillStatus = null;
+      } else {
+        this.listQuery.canNotPrint = null;
+        if (this.listQuery.state !== undefined) {
+          this.listQuery.billStatus = this.listQuery.state[0];
+        }
+
+        if (this.listQuery.productType === 2) {
+          this.listQuery.ZHBBillStatus = this.listQuery.billStatus;
+        } else {
+          this.listQuery.ZHBBillStatus = null;
+        }
+      }
+
+      console.log("M100查询条件：" + JSON.stringify(this.listQuery));
+      this.$axios
+        .gets("/api/newjit/bill-m100/list", this.listQuery)
+        .then((response) => {
+          this.list = response.items;
+          this.totalCount = response.totalCount;
+          console.log("M100结果：" + JSON.stringify(this.list));
+          setTimeout(() => {
+            //大数据量加载时
+            this.listLoading = false;
+          }, 500);
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+        
+      this.changeMainTableHeight()
+    },
+
+    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 if (response.status === true) {
+                          //传给grid++接口json数据，得到返回的文件base64
+                          //this.fileQuery.report = "menban";
+                          this.fileQuery.dataname = JSON.stringify(
+                            response.item
+                          );
+                          //this.fileQuery.dataname = "";
+                          console.log("打印json");
+                          console.log(this.fileQuery.dataname);
+                          this.$axios
+                            .posts(
+                              "/Handlers/Handler1.ashx?report=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 if (response.status === true) {
+                          //传给grid++接口json数据，得到返回的文件base64
+                          //this.fileQuery.report = "menban";
+                          this.fileQuery.dataname = JSON.stringify(
+                            response.item
+                          );
+                          //this.fileQuery.dataname = "";
+                          console.log("打印json");
+                          console.log(this.fileQuery.dataname);
+                          this.$axios
+                            .posts(
+                              "/Handlers/Handler1.ashx?report=zhuhuban",
+                              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 if (response.status === true) {
+                      //传给grid++接口json数据，得到返回的文件base64
+                      //this.fileQuery.report = "menban";
+                      this.fileQuery.dataname = JSON.stringify(response.item);
+                      //this.fileQuery.dataname = "";
+                      console.log("打印json");
+                      console.log(this.fileQuery.dataname);
+                      this.$axios
+                        .posts(
+                          "/Handlers/Handler1.ashx?report=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 if (response.status === true) {
+                      //传给grid++接口json数据，得到返回的文件base64
+                      //this.fileQuery.report = "menban";
+                      this.fileQuery.dataname = JSON.stringify(response.item);
+                      //this.fileQuery.dataname = "";
+                      console.log("打印json");
+                      console.log(this.fileQuery.dataname);
+                      this.$axios
+                        .posts(
+                          "/Handlers/Handler1.ashx?report=zhuhuban",
+                          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 if (response.status === true) {
+                //传给grid++接口json数据，得到返回的文件base64
+                //this.fileQuery.report = "menban";
+                this.fileQuery.dataname = JSON.stringify(response.item);
+                //this.fileQuery.dataname = "";
+                console.log("打印json");
+                console.log(this.fileQuery.dataname);
+                this.$axios
+                  .posts(
+                    "/Handlers/Handler1.ashx?report=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 if (response.status === true) {
+                //传给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.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
+      this.listQuery.productLine = this.PLChildList[0].productLineCode;
+      this.changeMainTableHeight()
+      //console.log(this.PLList)
+      //变更打印按钮文字
+      if (this.listQuery.productType === 1) {
+        this.listQuery.GroupName = undefined
+        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.listQuery.GroupName = this.PLChildGroupList[0]
+        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
+        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
+        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
+        this.listQuery.state = [];
+        this.isShowState = false;
+      }
+    },
+    /*单据状态变更 */
+    checkedListChange(index) {
+      this.chkindex = 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/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index c32ce3c..20752ad 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -1,4 +1,4 @@
-<!--M100查询模块 todo-an:门板-->
+<!--M100查询模块 select-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
@@ -7,33 +7,14 @@
           :model="listQuery"
           ref="queryForm"
           v-show="showSearch"
-          :inline="true"
-        >
-          <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">
+          :inline="true">
+          <el-form-item label="生产线:" prop="productLine">
             <el-select
               v-model="listQuery.productLine"
               clearable
               placeholder="请选择"
               size="medium"
               style="margin-right: 10px"
-              @change="valueselectChange"
             >
               <el-option
                 v-for="item in PLChildList"
@@ -43,27 +24,6 @@
               />
             </el-select>
           </el-form-item>
-          <!-- 柱护板时候显示 -->
-          <el-form-item 
-            prop="GroupName" 
-            v-show="listQuery.productType == 2"
-          >
-            <el-select
-              v-model="listQuery.GroupName"
-              clearable
-              placeholder="请选择"
-              size="medium"
-              style="margin-right: 10px"
-            >
-              <el-option
-                v-for="(item,key) in PLChildGroupList"
-                :key="key"
-                :label="item"
-                :value="item"
-              />
-            </el-select>
-          </el-form-item>
-
           <el-form-item label="版本:" prop="Version">
             <el-input
               v-model="listQuery.Version"
@@ -74,7 +34,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <!-- </el-row> -->
           <el-form-item label="流水号:" prop="serialNumBegin">
             <el-input
               v-model="listQuery.serialNumBegin"
@@ -95,7 +54,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <!-- <el-row> -->
           <el-form-item label="大众顺序号:" prop="hostSN">
             <el-input
               v-model="listQuery.HostSNBegin"
@@ -137,8 +95,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
           <el-form-item label="底盘号:" prop="VINBegin">
             <el-input
               v-model="listQuery.VINBegin"
@@ -173,8 +129,6 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <!-- </el-row> -->
-          <!-- <el-row> -->
           <el-form-item label="接收日期">
             <el-date-picker
               v-model="listQuery.ReceiveTimeValue"
@@ -226,30 +180,9 @@
               >导出(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
@@ -301,81 +234,6 @@
         </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: 200px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endHostSN"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 200px"
-                />
-              </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: 200px"
-                />
-                <label class="label1">-</label>
-                <el-input
-                  v-model="form.endVin"
-                  placeholder=""
-                  clearable
-                  size="small"
-                  style="width: 200px"
-                />
-              </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;"-->
@@ -409,12 +267,8 @@
 <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";
 
@@ -437,37 +291,13 @@ 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 {
       chkindex: 0, //复选按钮选择索引
       crmType: "select",
-      drawerZHB: false,
-      drawerMB: false,
       activeNames: ["1"],
       rules: {
         erpAssemblyName: [
@@ -481,8 +311,6 @@ export default {
       ],
       valueSelect: "",
       customerInfos: [],
-      customerInfosMB: [],
-      customerInfosZHB: [],
       dialogOptions: [],
       versionValue: "",
       searchContent: "", // 输入内容
@@ -505,9 +333,7 @@ export default {
       listQuery: {
         SkipCount: 0,
         MaxResultCount: 15,
-        productType: 1, //1:门板；2:柱护板
         ProductLine: undefined,
-        GroupName:undefined,//仅在柱护板时候显示
         Version: undefined,
         printBillNum: undefined,
         serialNumBegin: undefined,
@@ -526,7 +352,6 @@ export default {
         ReceiveTimeEnd: undefined,
         billStatus: undefined,
         state: [],
-        ZHBBillStatus: undefined,
         Description:undefined
       },
       listExportQuery: {
@@ -535,7 +360,6 @@ export default {
       },
       listPLQuery: {
         BillType: 2,
-        //UserId: this.userinfo.UserId,
       },
       hostSNQuery: {
         productLine: undefined,
@@ -575,7 +399,6 @@ export default {
       showSearch: true,
       bomUnit,
       drawer: false,
-      dialogFormVisible: false,
       formTitle: "",
       isEdit: false,
       formLoading: false,
@@ -584,11 +407,6 @@ export default {
       details: [], //修改子表数据源
       PLList: [], //产线下拉
       PLChildList: [], //筛选后产线下拉
-      PLChildGroupList: [], //筛选生产线为柱护板下拉后的第三个下拉位
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
       isShowHostSN: false,
       isShowVin: false,
       isShowState: true,
@@ -599,7 +417,6 @@ export default {
     window.addEventListener('resize',function(){
       _this.changeMainTableHeight()
     })
-    this.getPLChildGroupList()
   },
   created() {
     this.billState.forEach((element, index) => {
@@ -614,11 +431,6 @@ export default {
       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",
@@ -654,11 +466,6 @@ export default {
         prop: "billStatus",
         width: 120,
       });
-      tempsTabs.push({
-        label: "柱护板状态",
-        prop: "printBillNum",
-        width: 120,
-      });
       tempsTabs.push({
         label: "不可打印",
         prop: "canNotPrint",
@@ -694,23 +501,9 @@ export default {
         //this.tableHeight = offsetHei -260
       })
     },
-    // 获取PLChildGroupList
-    getPLChildGroupList(){
-      this.$axios
-        .gets(
-          "/api/newjit/print-template-configuration/list",
-        )
-        .then((response) => {
-          if (response.item !== null) {
-            this.PLChildGroupList= response.item;
-          }
-        });
-    },
     //抽屉
     handleDrawerOpen(param) {
       this.drawer = true;
-      //console.log(510)
-      //console.log(param)
       var parentId = param.assemblyID; //主键id
       this.customerInfos = [
         {
@@ -721,16 +514,6 @@ export default {
     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);
-        });
-    },
     /** 导出功能 assembly-cfg-erp/export*/
     handleDownload() {
       this.listLoading = true;
@@ -740,6 +523,7 @@ export default {
       this.$axios
         .posts("/api/newjit/bill-m100/export", this.listQuery)
         .then((res) => {
+          this.handleFilter()
           let filename = res.item;
           this.$axios
             .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
@@ -766,8 +550,10 @@ export default {
               }
               this.listLoading = false;
             });
-        });
-      this.listLoading = false;
+        })
+        .catch(err=>{
+          this.handleFilter()
+        })
     },
     /** 重置按钮操作 */
     resetQuery(refName) {
@@ -783,60 +569,8 @@ export default {
       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 === "printBillNum"){
-        let value = row[column.property]
-        if(value!=null&&value.length > 0){
-          return "柱护板已打印";
-        }
-        else{
-          return "柱护板未打印";
-        }
-      }
       if (column.property === "billStatus") {
         return { 1: "未匹配", 2: "未打印", 3: "已打印" }[row[column.property]];
       }
@@ -875,18 +609,11 @@ export default {
         //不可打印
         this.listQuery.canNotPrint = true;
         this.listQuery.billStatus = null;
-        this.listQuery.ZHBBillStatus = null;
       } else {
         this.listQuery.canNotPrint = null;
         if (this.listQuery.state !== undefined) {
           this.listQuery.billStatus = this.listQuery.state[0];
         }
-
-        if (this.listQuery.productType === 2) {
-          this.listQuery.ZHBBillStatus = this.listQuery.billStatus;
-        } else {
-          this.listQuery.ZHBBillStatus = null;
-        }
       }
 
       console.log("M100查询条件：" + JSON.stringify(this.listQuery));
@@ -907,59 +634,6 @@ export default {
         
       this.changeMainTableHeight()
     },
-
-    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();
@@ -996,529 +670,6 @@ export default {
       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 if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=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 if (response.status === true) {
-                          //传给grid++接口json数据，得到返回的文件base64
-                          //this.fileQuery.report = "menban";
-                          this.fileQuery.dataname = JSON.stringify(
-                            response.item
-                          );
-                          //this.fileQuery.dataname = "";
-                          console.log("打印json");
-                          console.log(this.fileQuery.dataname);
-                          this.$axios
-                            .posts(
-                              "/Handlers/Handler1.ashx?report=zhuhuban",
-                              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 if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=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 if (response.status === true) {
-                      //传给grid++接口json数据，得到返回的文件base64
-                      //this.fileQuery.report = "menban";
-                      this.fileQuery.dataname = JSON.stringify(response.item);
-                      //this.fileQuery.dataname = "";
-                      console.log("打印json");
-                      console.log(this.fileQuery.dataname);
-                      this.$axios
-                        .posts(
-                          "/Handlers/Handler1.ashx?report=zhuhuban",
-                          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 if (response.status === true) {
-                //传给grid++接口json数据，得到返回的文件base64
-                //this.fileQuery.report = "menban";
-                this.fileQuery.dataname = JSON.stringify(response.item);
-                //this.fileQuery.dataname = "";
-                console.log("打印json");
-                console.log(this.fileQuery.dataname);
-                this.$axios
-                  .posts(
-                    "/Handlers/Handler1.ashx?report=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 if (response.status === true) {
-                //传给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;
@@ -1527,55 +678,28 @@ export default {
         .then((response) => {
           //console.log(response);
           this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
+          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,
-              },
-            ];
-          }
+          // 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.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      this.listQuery.productLine = this.PLChildList[0].productLineCode;
-      this.changeMainTableHeight()
-      //console.log(this.PLList)
-      //变更打印按钮文字
-      if (this.listQuery.productType === 1) {
-        this.listQuery.GroupName = undefined
-        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.listQuery.GroupName = this.PLChildGroupList[0]
-        this.$refs.btn1.$el.innerText = "打印柱护板发货排序单";
-        this.$refs.btn2.$el.innerText = "重新打印柱护板发货排序单";
-        this.$refs.btn3.$el.innerText = "补打柱护板发货排序单";
-        this.listQuery.state = [];
-        this.isShowState = false;
-      }
-    },
     /*单据状态变更 */
     checkedListChange(index) {
       this.chkindex = index;
@@ -1587,72 +711,6 @@ export default {
         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>
@@ -1662,17 +720,6 @@ export default {
 <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;
 }
diff --git a/vue/src/views/pg-fis/basedate/weldingAssembly/index copy.vue b/vue/src/views/pg-fis/basedate/weldingAssembly/index copy.vue
new file mode 100644
index 0000000..afc3ba4
--- /dev/null
+++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index copy.vue	
@@ -0,0 +1,880 @@
+<!--总成模块信息管理页 pg-weldingAssembly-->
+<template>
+  <div class="cr-body-content">
+    <div ref="box">
+      <flexbox class="content-header">
+        <el-form
+          :model="listQuery"
+          ref="queryForm"
+          v-show="showSearch"
+          :inline="true"
+        >
+          <!-- <el-row> -->
+          <el-form-item label="生产线:" prop="productType">
+            <el-select
+              v-model="listQuery.productType"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="ptypeselectChange"
+            >
+              <el-option
+                v-for="item in productTypeList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="productLine">
+            <el-select
+              v-model="listQuery.productLine"
+              clearable
+              placeholder="请选择"
+              size="medium"
+              style="margin-right: 15px"
+              @change="valueselectChange"
+            >
+              <el-option
+                v-for="item in PLChildList"
+                :key="item.id"
+                :label="item.productLineName"
+                :value="item.productLineCode"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="版本:" prop="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" :default-time="['00:00:00','23:59:59']"
+              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" :default-time="['00:00:00','23:59:59']"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="对比状态" prop="State">
+            <el-checkbox-group v-model="listQuery.cstate">
+              <el-checkbox
+                v-for="item in compareState"
+                :key="item.id"
+                :label="item.id"
+              >
+                {{ item.name }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+
+          <el-form-item >
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleFilter"
+              >搜索</el-button
+            >
+            <el-button
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery('queryForm')"
+              >重置</el-button
+            >
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              style="margin-left: 15px"
+              @click="handleDownload()"
+              >导出焊装总成对比(Excel)
+            </el-button>
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              style="margin-left: 15px"
+              @click="handleDownloadCSV()"
+              >导出焊装总成对比(CSV)
+            </el-button>
+          </el-form-item>
+          <!-- </el-row> -->
+        </el-form>
+      </flexbox>
+    </div>
+    <div class="l-table" style="margin-top:-20px">
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="listLoading"
+        element-loading-text="拼命加载中..."
+        element-loading-spinner="el-icon-loading"
+        class="cr-table"
+        :data="list"
+        :height="tableHeight"
+        :cell-style="cellStyle"
+        :header-cell-style="headerRowStyle"
+        size="small"
+        stripe
+        border
+        highlight-current-row
+        style="width: 100%"
+        @sort-change="sortChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+      >
+        <!-- <el-table-column
+          label="底盘号"
+          prop="vin "
+          sortable="custom"
+          align="center"
+          
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span class="link-type" @click="handleDrawerOpen(scope.row)">{{
+              scope.row.vin
+            }}</span>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          v-for="(item, index) in getDefaultField"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :min-width="item.width"
+          :formatter="fieldFormatter"
+          sortable="custom"
+          show-overflow-tooltip
+          :gutter="0"
+        >
+          <template slot="header" slot-scope="scope">
+            {{ scope.column.label }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="table-footer">
+      <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+      <pagination
+        v-show="totalCount > 0"
+        :total="totalCount"
+        :page.sync="page"
+        :limit.sync="listQuery.MaxResultCount"
+        @pagination="getList"
+      />
+      <!-- 抽屉控件 -->
+      <el-drawer
+        title="信息详细页"
+        size="75%"
+        direction="rtl"
+        :visible.sync="drawer"
+        :before-close="handleDrawerClose"
+      >
+      </el-drawer>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/Pagination";
+import permission from "@/directive/permission/index.js";
+import CRMTableHead from "../../components/CRMTableHead";
+import importExcel from "@/components/ImportExcel-vw";
+import Lockr from "lockr";
+import { mapGetters } from "vuex";
+import moment from "moment";
+import { downloadFile } from "@/utils/crmindex.js";
+
+//组件计量单位
+const bomUnit = [
+  { key: 0, display_name: "PC" },
+  { key: 1, display_name: "TON" },
+  { key: 2, display_name: "Other" },
+];
+
+const projectTypeKeyValue = bomUnit.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name;
+  return acc;
+}, {});
+
+export default {
+  name: "WeldingAssembly",
+  components: { Pagination, CRMTableHead, importExcel },
+  directives: { permission },
+  filters: {
+    IsCustomerSignFilter(status) {
+      //翻译是否签字
+      const statusMap = {
+        true: "是",
+        false: "否",
+      };
+      return statusMap[status];
+    },
+  },
+  data() {
+    const validVersion = (rule, value, callback) => {
+      let numberReg = /^\d{6}$/;
+      if (!numberReg.test(value)) {
+        callback(new Error("只能为6位数字！"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      crmType: "WeldingAssembly",
+      rules: {
+        erpAssemblyName: [
+          { required: true, message: "必须输入！", trigger: "blur" },
+        ],
+      },
+      compareState: [
+        { id: 0, name: "有焊装无总装" },
+        { id: 1, name: "有焊装有总装" },
+      ],
+      valueSelect: "",
+      customerInfos: [],
+      dialogOptions: [],
+      versionValue: "",
+      searchContent: "", // 输入内容
+      showExcelImport: false,
+      form: {},
+      drawer: false,
+      list: null,
+      totalCount: 0,
+      listLoading: true,
+      customerInfo: {
+        bomId: "",
+      },
+      // 高级搜索
+      filterObj: {
+        type: Object,
+        default: () => {
+          return {};
+        },
+      },
+      listQuery: {
+        SkipCount: 0,
+        MaxResultCount: 15,
+        productType: 1,
+        ProductLine: undefined,
+        version: undefined,
+        serialNumBegin: undefined,
+        serialNumEnd: undefined,
+        HostSNBegin: undefined,
+        HostSNEnd: undefined,
+        KNRBegin: undefined,
+        KNREnd: undefined,
+        VINBegin: undefined,
+        VINEnd: undefined,
+        OnlineTimeValue: undefined,
+        OnlineTimeBegin: undefined,
+        OnlineTimeEnd: undefined,
+        ReceiveTimeValue: undefined,
+        ReceiveTimeBegin: undefined,
+        ReceiveTimeEnd: undefined,
+        HasR100NotHasM100: undefined, //有焊装无总装
+        HasR100HasM100: undefined, //有焊装有总装
+        cstate: [],
+      },
+      listExportQuery: {
+        erpAssemblyCode: undefined,
+        erpAssemblyName: undefined,
+      },
+      listPLQuery: {
+        BillType: 1,
+        //UserId: "00000000-0000-0000-0000-000000000000",
+      },
+      form: {
+        details: [],
+      },
+      page: 1,
+      // 显示搜索条件
+      showSearch: true,
+      bomUnit,
+      multipleSelection: [],
+      drawer: false,
+      dialogFormVisible: false,
+      formTitle: "",
+      isEdit: false,
+      formLoading: false,
+      tableHeight: document.documentElement.clientHeight - 335,
+      detailTableHeight: 250,
+      details: [], //修改子表数据源
+      billStatus: [],
+      PLChildList: [], //筛选后产线下拉
+      productTypeList: [
+        { id: 1, name: "门板" },
+        { id: 2, name: "柱护板" },
+      ],
+    };
+  },
+  mounted() {
+    this.getList();
+    this.$nextTick(() => {
+      var offsetHei = document.documentElement.clientHeight;
+      //console.log(offsetHei);
+      let boxH = this.$refs.box.offsetHeight;
+      this.tableHeight = offsetHei - boxH - 57 - 79; //57为footer高度，79为页面上部标签高度
+      //console.log(this.$refs.box.offsetHeight);
+      //console.log(this.tableHeight);
+    });
+  },
+  created() {
+    this.compareState.forEach((element, index) => {
+      this.listQuery.cstate.push(element.id);
+    });
+    this.getProductLine();
+  },
+  computed: {
+    getDefaultField() {
+      var tempsTabs = [];
+      tempsTabs.push({ label: "大众顺序号", prop: "hostSN", width: 120 });
+      // tempsTabs.push({
+      //   label: "底盘号",
+      //   prop: "vin",
+      //   width: 130,
+      // });
+      tempsTabs.push({
+        label: "KNR",
+        prop: "knr",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100单据状态",
+        prop: "r100BillStatus",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100上线时间",
+        prop: "r100OnlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "R100接收时间",
+        prop: "r100ReceiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "车型代码",
+        prop: "vehicleModelCode",
+        width: 120,
+      });
+      tempsTabs.push({
+        label: "版本",
+        prop: "version",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100流水号",
+        prop: "serialNum",
+        width: 130,
+      });
+      tempsTabs.push({
+        label: "M100底盘号",
+        prop: "Vin",
+        width: 130,
+      });
+      tempsTabs.push({
+        label: "M100上线时间",
+        prop: "m100OnlineTime",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "M100接收时间",
+        prop: "m100ReceiveTime",
+        width: 180,
+      });
+      tempsTabs.push({
+        label: "M100单据状态",
+        prop: "m100BillStatus",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "总成编号",
+        prop: "r100ErpAssemblyCode",
+        width: 150,
+      });
+      tempsTabs.push({
+        label: "总成名称",
+        prop: "r100ErpAssemblyName",
+        width: 180,
+      });
+      return tempsTabs;
+    },
+    ...mapGetters(["userInfo"]), //获取当前用户信息
+  },
+  methods: {
+    //抽屉
+    handleDrawerOpen(param) {
+      this.drawer = true;
+      var parentId = param.id; //主键id
+      this.customerInfos = [
+        {
+          ParentId: parentId,
+        },
+      ];
+    },
+    handleDrawerClose(done) {
+      done();
+    },
+    /** 导出功能 */
+    handleDownload() {
+      this.listLoading = true;
+      this.listExportQuery.erpAssemblyCode = this.listQuery.ErpAssemblyCode;
+      this.listExportQuery.erpAssemblyName = this.listQuery.ErpAssemblyName;
+      console.log(JSON.stringify(this.listExportQuery));
+      this.$axios
+        .posts("/api/newjit/r100-m100-compare/export", this.listExportQuery)
+        .then((res) => {
+          let filename = res.item;
+          this.$axios
+            .BolbGets("/api/newjit/exclude-part-cfg/download/" + filename)
+            .then((response) => {
+              if (filename.indexOf("_") != -1) {
+                let downName =
+                  filename.slice(0, filename.lastIndexOf("_")) +
+                  filename.slice(filename.lastIndexOf("."));
+                downloadFile(response, downName);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              } else {
+                downloadFile(response, filename);
+                this.$notify({
+                  title: "成功",
+                  message: "数据-导出成功！",
+                  type: "success",
+                  duration: 2000,
+                });
+              }
+              this.listLoading = false;
+            });
+        });
+      this.listLoading = false;
+    },
+    /** 导出功能 */
+    handleDownloadCSV() {
+      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/r100-m100-compare/export-CSV", 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.billType = undefined;
+      this.listQuery.productLine = undefined;
+      this.listQuery.Version = undefined;
+      this.listQuery.serialNumBegin = undefined;
+      this.listQuery.serialNumEnd = undefined;
+      this.listQuery.HostSNBegin = undefined;
+      this.listQuery.HostSNEnd = undefined;
+      this.listQuery.KNRBegin = undefined;
+      this.listQuery.KNREnd = undefined;
+      this.listQuery.VINBegin = undefined;
+      this.listQuery.VINEnd = undefined;
+      this.listQuery.OnlineTimeValue = [];
+      this.listQuery.OnlineTimeBegin = undefined;
+      this.listQuery.OnlineTimeEnd = undefined;
+      this.listQuery.ReceiveTimeValue = [];
+      this.listQuery.ReceiveTimeBegin = undefined;
+      this.listQuery.ReceiveTimeEnd = undefined;
+      this.listQuery.cstate = [];
+      this.handleQuery();
+      this.getProductLine();
+    },
+    /** 搜索按钮操作 */
+    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 == "onlineTime" || column.property == "receiveTime") {
+        var date = row[column.property];
+        if (date == undefined) {
+          return "";
+        }
+        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+      }
+      if (
+        column.property == "r100BillStatus" ||
+        column.property == "m100BillStatus"
+      ) {
+        return { 1: "未匹配", 2: "未打印", 3: "已发布" }[row[column.property]];
+      }
+      return row[column.property] || "--"; //|| "--"加上后会掩盖m100单据状态为0不显示
+    },
+    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];
+      }
+
+      this.listQuery.HasR100NotHasM100 = false;
+      this.listQuery.HasR100HasM100 = false;
+
+      if (
+        this.listQuery.cstate !== undefined &&
+        this.listQuery.cstate.length > 0
+      ) {
+        //console.log(this.listQuery.cstate)
+        this.listQuery.cstate.forEach((element) => {
+          //console.log(element)
+          if (element === 0) {
+            this.listQuery.HasR100NotHasM100 = true;
+          }
+          if (element === 1) {
+            this.listQuery.HasR100HasM100 = true;
+          }
+        });
+      }
+      this.$axios
+        .gets("/api/newjit/r100-m100-compare/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() {
+      this.$forceUpdate();
+    },
+    handleImportSAP() {},
+
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+    },
+
+    sortChange(data) {
+      const { prop, order } = data;
+      if (!prop || !order) {
+        this.handleFilter();
+        return;
+      }
+      this.listQuery.Sorting = prop + " " + order;
+      this.handleFilter();
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    /** 通过回调控制style */
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right" };
+      } else {
+        return { textAlign: "left" };
+      }
+    },
+    /** 通过回调控制表头style */
+    headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "qty") {
+        return { textAlign: "right", background: "#FAFAFA" };
+      } else {
+        return { textAlign: "left", background: "#FAFAFA" };
+      }
+    },
+    handleRowClick(row, column, event) {
+      this.$refs.multipleTable.clearSelection();
+      this.$refs.multipleTable.toggleRowSelection(row);
+    },
+    SAPExport() {},
+    //获取所有产线
+    getProductLine() {
+      this.listPLQuery.UserId = this.userInfo.userId;
+      this.$axios
+        .gets("/api/newjit/product-line/list", this.listPLQuery)
+        .then((response) => {
+          //console.log(response);
+          this.PLList = response.item;
+          this.PLChildList = this.PLList.filter(
+            (u) => u.productType === parseInt(this.listQuery.productType)
+          ).sort((a, b) => {
+            return a.productLineCode - b.productLineCode;
+          });
+          this.listQuery.productLine = this.PLChildList[0].productLineCode;
+          this.getList();
+        })
+        .catch(() => {});
+    },
+    //产线类型变更
+    ptypeselectChange() {
+      //console.log(this.listQuery.productType);
+      this.listQuery.productLine = "";
+      this.PLChildList = this.PLList.filter(
+        (u) => u.productType === parseInt(this.listQuery.productType)
+      ).sort((a, b) => {
+        return a.productLineCode - b.productLineCode;
+      });
+      //console.log(this.PLList);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+@import "../../../ux/styles/crmtable.scss";
+
+// /*表格全选框去除空框*/
+// .el-table >>> .DisabledSelection .cell .el-checkbox__inner {
+//   display: none;
+//   position: relative;
+// }
+// /*表格全选框改为：选择*/
+// .el-table >>> .DisabledSelection .cell:before {
+//   content: "是否Key件";
+//   position: absolute;
+//   left: 7px;
+// }
+.divider1 {
+  margin: 0;
+}
+.divider2 {
+  margin: 10px;
+  margin-bottom: 20px;
+  width: 95%;
+}
+</style>
+
diff --git a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
index 420ba32..1446a65 100644
--- a/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
+++ b/vue/src/views/pg-fis/basedate/weldingAssembly/index.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页 todo-an:门板-->
+<!--总成模块信息管理页 pg-weldingAssembly-->
 <template>
   <div class="cr-body-content">
     <div ref="box">
@@ -9,25 +9,7 @@
           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-form-item label="生产线:" prop="productLine">
             <el-select
               v-model="listQuery.productLine"
               clearable
@@ -371,7 +353,6 @@ export default {
       listQuery: {
         SkipCount: 0,
         MaxResultCount: 15,
-        productType: 1,
         ProductLine: undefined,
         version: undefined,
         serialNumBegin: undefined,
@@ -418,10 +399,6 @@ export default {
       details: [], //修改子表数据源
       billStatus: [],
       PLChildList: [], //筛选后产线下拉
-      productTypeList: [
-        { id: 1, name: "门板" },
-        { id: 2, name: "柱护板" },
-      ],
     };
   },
   mounted() {
@@ -828,9 +805,7 @@ export default {
         .then((response) => {
           //console.log(response);
           this.PLList = response.item;
-          this.PLChildList = this.PLList.filter(
-            (u) => u.productType === parseInt(this.listQuery.productType)
-          ).sort((a, b) => {
+          this.PLChildList = this.PLList.sort((a, b) => {
             return a.productLineCode - b.productLineCode;
           });
           this.listQuery.productLine = this.PLChildList[0].productLineCode;
@@ -838,17 +813,6 @@ export default {
         })
         .catch(() => {});
     },
-    //产线类型变更
-    ptypeselectChange() {
-      //console.log(this.listQuery.productType);
-      this.listQuery.productLine = "";
-      this.PLChildList = this.PLList.filter(
-        (u) => u.productType === parseInt(this.listQuery.productType)
-      ).sort((a, b) => {
-        return a.productLineCode - b.productLineCode;
-      });
-      //console.log(this.PLList);
-    },
   },
 };
 </script>
diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue
index 032b99e..102275f 100644
--- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue
+++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue
@@ -1,4 +1,4 @@
-<!--准时化结算门板价格差异 todo-an:门板-->
+<!--准时化结算门板价格差异-->
 <template>
   <div class="cr-body-content">
     <!--功能栏-->
@@ -1014,7 +1014,7 @@ export default {
             this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型
           }
           console.log(
-            "大众准时化结算门板价格差异比对报表-导出条件：" +
+            "大众准时化结算价格差异比对报表-导出条件：" +
               JSON.stringify(this.listExportQuery)
           );
           this.$axios
@@ -1168,7 +1168,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众准时化结算门板价格差异比对报表";
+      this.listQuery.name = "大众准时化结算价格差异比对报表";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)