diff --git a/src/api/sjzx/jcsj.js b/src/api/sjzx/jcsj.js
index dc84752..7d4bf27 100644
--- a/src/api/sjzx/jcsj.js
+++ b/src/api/sjzx/jcsj.js
@@ -36,7 +36,9 @@ export function uploadBom(data) {
 }
 
 export function getListBom(data) {return request({url: '/dmBom/getListBom', method: 'post', data})}
+export function getListBomRealy(data) {return request({url: '/dmBom/getListBomRealy', method: 'post', data})}
 export function addListBom(data) {return request({url: '/dmBom/addListBom', method: 'post', data})}
+export function saveListBom(data) {return request({url: '/dmBom/saveListBom', method: 'post', data})}
 
 
 export function getBcLQlList(data) {return request({url: '/dmBclqmxp/getBcLQlList', method: 'post', data})}
diff --git a/src/plugins/vxe-table/formatter/index.js b/src/plugins/vxe-table/formatter/index.js
index 89ae3b9..c2afee8 100644
--- a/src/plugins/vxe-table/formatter/index.js
+++ b/src/plugins/vxe-table/formatter/index.js
@@ -11,7 +11,12 @@ import XEUtils from 'xe-utils'
  * flag: 是否触发更新
  */
 VXETable.formats.add('dictFormat',({cellValue, column},dictCode,startWith, flag = false) => {
+  console.log(1)
   const dict=window.localStorage.getItem(dictCode);
+  if(dictCode='CLlQ'){
+    console.log(dict)
+  }
+
   if (!dict){
     return cellValue;
   }
@@ -25,8 +30,10 @@ VXETable.formats.add('dictFormat',({cellValue, column},dictCode,startWith, flag
       return dictItem.bm.startsWith(startWith)
     });
   }
+
   for (const item of dictItems) {
-    if (item.bm===cellValue){
+
+    if (item.bm===cellValue){4
       return item.bmsm
     }
   }
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index cf465fc..a2f0ba4 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -62,7 +62,7 @@ const actions = {
         //   node.url = "/" + node.system_code.toLowerCase() + "/" + node.url
         // }
         node.path = node.parent_id ? node.url : '/scgl/' + node.url
-          console.log(node)
+          //console.log(node)
         node.component = node.component_path ?
                                     myComponent :
                                     Layout,
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index d2c211b..ba8e1e5 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -47,6 +47,8 @@ export default {
     initDict(){
       dictALL().then(res=>{
         const dictItems=res.data;
+        console.log("1")
+        console.log(dictItems)
         for (const dictCode in dictItems) {
           //commit('SET_DICT',dictCode,dictItems[dictCode]);
           window.localStorage.setItem(dictCode,JSON.stringify(dictItems[dictCode]))
diff --git a/src/views/sjzx/bclqCX.vue b/src/views/sjzx/bclqCX.vue
index bf1d6e5..c181c21 100644
--- a/src/views/sjzx/bclqCX.vue
+++ b/src/views/sjzx/bclqCX.vue
@@ -190,15 +190,15 @@ export default {
         },
 
 
-        { field: 'dcZlZ', title: '组立', width: 100,editRender: { name: 'input' },
+        { field: 'dcZlZ', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'lqlbZ', title: '领取类别', width: 100,editRender: { name: 'input' },
+        { field: 'lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zzcjZ', title: '加工跨', width: 100,editRender: { name: 'input' },
+        { field: 'zzcjZ', title: '加工跨', width: 100,formatter: ['dictFormat','QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
diff --git a/src/views/sjzx/bomcx.vue b/src/views/sjzx/bomcx.vue
new file mode 100644
index 0000000..8b66b22
--- /dev/null
+++ b/src/views/sjzx/bomcx.vue
@@ -0,0 +1,874 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="65px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <el-select v-model="queryParam.dcch" filterable  placeholder="工程编号" @change="czbhChange" >
+                <el-option
+                  v-for="item in dictData.cbbm"
+                  :key="item.cbbm"
+                  :label="item.cbbm"
+                  :value="item.cbbm">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="状态:">
+            <el-select v-model="queryParam.zt"  placeholder="状态" @change="" >
+              <el-option
+                v-for="item in optionsstats"
+                :key="item.value1"
+                :label="item.label1"
+                :value="item.value1">
+              </el-option>
+            </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+
+
+        </el-row>
+        <el-row>
+
+        </el-row>
+      </el-form>
+    </el-header>
+    <el-container  style="padding-top: 0px">
+      <el-container>
+        <el-main>
+          <div class="mytable" >
+            <vxe-grid
+              id="id"
+              ref="xGrid"
+              border
+              resizable
+              :align="'center'"
+              :height="height"
+              :checkbox-config="{checkField: 'checked'}"
+              :scroll-y="{enabled: true}"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="tableData"
+              :custom-config="{ storage: true }"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+            >
+
+
+            </vxe-grid>
+          </div>
+
+        </el-main>
+      </el-container>
+    </el-container>
+  <!-- 弹出层-->
+    <vxe-modal v-model="dialogVisible" width="1200" :title="title">
+
+
+      <template #default>
+        <el-row class="query_wrapper">
+          <el-row>
+            <el-button style="margin-right: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
+          </el-row>
+        </el-row>
+        <div class="mytable">
+          <vxe-table
+            border
+            show-header-overflow
+            show-overflow
+            :align="allAlign"
+            :data="tableupload">
+            <vxe-column type="seq" width="50"></vxe-column>
+            <vxe-column field="czbh" title="船号" width="150"></vxe-column>
+            <vxe-column field="ph" title="批号" width="150"></vxe-column>
+            <vxe-column field="type" title="类型"width="150"></vxe-column>
+            <vxe-column field="stype" title="小类" width="150"></vxe-column>
+            <vxe-column field="name" title="名称" width="400"></vxe-column>
+          </vxe-table>
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>板材领取表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr" v-for="(item,index) in bclqList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>型材领取表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr" v-for="(item,index) in  xclqList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>板材统计表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr"v-for="(item,index)  in bctjList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>型材统计表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr"v-for="(item,index)  in xctjList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>套料图</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr" v-for="(item,index)  in tltList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>零件配套表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr" v-for="(item,index)  in ljList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+        </div>
+      </template>
+    </vxe-modal>
+  </el-container>
+</template>
+
+<script>
+import {
+  getCzplBase,
+  getListBomRealy,
+  saveListBom,
+  addListBom, uploadBom,
+} from '@/api/sjzx/jcsj'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import {null2str} from "@/utils/rpkj";
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
+export default {
+  name:'czplwh',
+  data() {
+    return {
+      optionsstats:[
+        {
+          value1:'',
+          label1: '未提交'
+        },
+        {
+          value1:'02',
+          label1: '已提交'
+        }
+      ],
+
+      queryParam: {
+        dcch:'',
+        dcpl:'',
+        zt:'',
+      },
+      tableData: [],
+      isupload:'02',
+      filedis:true,
+      uploadData:{
+
+      },
+      tableupload:[],
+      dialogVisible:false,
+      heads: { token: getToken() },
+      fileList: [],
+      dictData:{},
+      height: '500px',
+      bclqList:[],
+      xclqList:[],
+      bctjList:[],
+      xctjList:[],
+      tltList:[],
+      ljList:[],
+      title:'',
+      czbhu:'',
+      phu:'',
+      tableColumn: [
+        { type: 'checkbox', width: 50 },
+        { type: 'seq', width: 60, title: '序号' },
+        { field: 'zt', title: '状态', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pid', title: 'pid', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dcch', title: '船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'mbch', title: '目标船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sjch', title: '数据船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'lqbs', title: '板材领取标识', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'tjbs', title: '板材统计标识', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pl', title: '批量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xqdd', title: '需求地点', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pw', title: '抛丸', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqlb', title: '领取类别', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sbbh', title: '设备编号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sclx', title: '设备类型', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpcz', title: '物品材质', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpgg', title: '物品规格', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bh', title: '板厚', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bc', title: '版长', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'yqyl', title: '油漆油漆用量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgcd', title: '切割长度', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'hxcd', title: '划线长度', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'tzbh', title: '图纸编号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tlsl', title: '套料数量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pklx', title: '坡口类型', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qbs', title: '曲标识', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkbs', title: '坡口長度', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkcd', title: '坡口标识', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmbs', title: '打磨标识', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmcd', title: '打磨长度', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zpsx', title: '装配顺序', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljbh', title: '零件编号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljsl', title: '零件数量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljsx', title: '零件属性', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'djmj', title: '单件面积', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljdz', title: '零件单重', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'blgs', title: '备料', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pwgs', title: '抛丸', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'llgs', title: '理料', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxgs', title: '划线', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qggs', title: '切割', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkgs', title: '坡口', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgs', title: '曲', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmgs', title: '打磨', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zpgs', title: '装配', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkblgs', title: '反馈备料', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkpwgs', title: '抛丸', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkllgs', title: '理料', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkhxgs', title: '划线', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkqggs', title: '切割', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkpkgs', title: '坡口', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkqgs', title: '曲', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkdmgs', title: '打磨', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkzpgs', title: '装配', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+        // { field: 'fds', title: '分段和', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+
+
+
+
+      ]
+
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
+  },
+  methods: {
+
+
+    uploadExcel() {
+      if (this.queryParam.cbbm === '') {
+        this.$message.error('请选择船号！')
+        return false;
+      } else {
+
+      }
+
+      // this.uploadData.czbh = this.queryParam.czbh
+      this.uploadData.isupload = this.isupload
+    },
+
+    czbhChange(){
+      // if (this.queryParam.dcch === '') {
+      //   this.$message.error('请选择船号！')
+      //   return false;
+      // }
+      // if (this.queryParam.dcpl === '') {
+      //   this.$message.error('请输入正确批量！')
+      //   return false;
+      // }
+      if (this.queryParam.cbbm === '') {
+        this.filedis=true
+      }else{
+        this.filedis=false
+      }
+    },
+    handleAddFolder () {
+
+        // this.fileList=[]
+        // this.bclqList=[],
+        // this.xclqList=[],
+        // this.bctjList=[],
+        // this.xctjList=[],
+        // this.tltList=[],
+        // this.ljList=[],
+          this.tableupload=[],
+      this.$nextTick(() => {
+        if (this.queryParam.dcch === ''|| this.queryParam.dcpl === '' ) {
+          this.filedis=true
+          this.$message.error('请输入正确船号 批量！')
+        }else{
+          this.filedis=false
+          this.$refs.upload.$children[0].$refs.input.webkitdirectory = true
+        }
+
+
+
+      })
+
+    },
+     uploadpre(name){
+
+     },
+
+    handleChange(file, fileList) {
+      this.fileList = fileList
+      console.log(file)
+      const bcph=""
+      if (file.name.includes("板材领取表")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("批", underscoreIndex);
+       this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
+        this.bclqList.push(file.name)
+
+        let a={czbh:this.czbhu,ph:this.phu,type:"板材",stype:"板材领取表",name:file.name,sort:1}
+        this.tableupload.push(a);
+      }
+      if (file.name.includes("型材领取表")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("批", underscoreIndex);
+        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
+        this.xclqList.push(file.name)
+        let a={czbh:this.czbhu,ph:this.phu,type:"型材",stype:"型材领取表",name:file.name,sort:2}
+        this.tableupload.push(a);
+      }
+      if (file.name.includes("板材统计数据")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("批", underscoreIndex);
+        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
+        this.bctjList.push(file.name)
+        let a={czbh:this.czbhu,ph:this.phu,type:"板材",stype:"板材统计数据",name:file.name,sort:3}
+        this.tableupload.push(a);
+      }
+      if (file.name.includes("型材统计数据")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("批", underscoreIndex);
+        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
+        this.xctjList.push(file.name)
+        let a={czbh:this.czbhu,ph:this.phu,type:"型材",stype:"型材统计数据",name:file.name,sort:4}
+        this.tableupload.push(a);
+      }
+      if (file.name.includes("套料图")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("套", underscoreIndex);
+        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
+        this.tltList.push(file.name)
+        let a={czbh:this.czbhu,ph:this.phu,type:"",stype:"套料图",name:file.name,sort:5}
+        this.tableupload.push(a);
+      }
+      if((file.name.match(/-/g)).length ===3){
+        this.ljList.push(file.name);
+        var parts = file.name.split('-')
+        var result = parts.slice(0, 3).join('-')
+        var parts1 = result.split('-')
+
+        this.czbhu = parts1.slice(0,2).join('-')
+        this.phu = parts1.slice(2,3)
+        let a={czbh:this.czbhu,ph:this.phu,type:"",stype:"零件",name:file.name,sort:6}
+        this.tableupload.push(a);
+      }
+      //this.title=this.czbhu+"  "+this.phu+"批"
+      this.tableupload.sort((a,b)=>{
+        //return( a[age] - b[age])
+        return( a.sort - b.sort)
+      })
+      this.dialogVisible=true;
+    },
+    // 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。function(file, fileList)
+    handleRemove(file, fileList) {
+      this.fileList = fileList
+
+    },
+    sucessChange(file,fileList){
+      alert(1)
+    },
+    //上传服务器
+    submitUpload() {
+      //判断是否有文件再上传
+      if (this.fileList.length === 0) {
+        return this.$message.warning('请选取文件后再上传')
+      }
+      // 下面的代码将创建一个空的FormData对象:
+      const formData = new FormData()
+      // 你可以使用FormData.append来添加键/值对到表单里面；
+      this.fileList.forEach((file) => {
+        formData.append('file', file.raw)
+      })
+      // 添加自定义参数，不传可删除
+      formData.append('czbh', this.queryParam.dcch)
+      formData.append('pl', this.queryParam.dcpl)
+      formData.append('isupload', '01')
+      uploadBom(formData).then(res=>{
+        if (res.data.zt == "01") {
+          this.$message.success('上传成功');
+        } else if (res.data.zt == "02") { //重新导入
+          this.$alert('该批量已导入数据,是否重新导入并覆盖该批量数据?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            distinguishCancelAndClose: true,
+            type: 'warning'
+          }).then(type => {
+            formData
+            formData.set('isupload', '02')
+            uploadBom(formData).then(res => {
+              console.log(res.data)
+              if (res.data.zt == "01") {
+                this.$message({ message: '导入成功', type: 'success' })
+                this.dialogVisible=false;
+                this.tableData=res.data.data;
+              }
+            })
+          })
+        }
+
+        this.fileList = []
+      })
+      //自定义的接口也可以用ajax或者自己封装的接口
+
+    },
+    bomClick(){
+      if (this.queryParam.cbbm === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+
+      addListBom(this.queryParam).then(res=>{
+        this.tableData=res.data;
+      })
+    },
+
+
+    initBase(){
+      getCzplBase({}).then(res=>{
+        this.dictData = res.data
+        // const xGrid = this.$refs.xGrid
+        //
+        // const dwbm = xGrid.getColumnByField('dwbm')
+        // dwbm.editRender.options = res.data.xqdws
+
+      })
+    },
+    initList() {
+      if (this.queryParam.cbbm === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+
+      getListBomRealy(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+
+      })
+    },
+    formatDate ({ cellValue }) {
+      return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
+    },
+
+    checkBoxClick(row,column){
+      // console.log(row)
+
+      this.$refs.xGrid.setActiveCell(row,column)
+    },
+
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+    tjClick(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length<=0){
+        return
+      }
+      saveListBom(selectRecords).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+
+
+    }
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+.my-table-list {
+  border: 1px solid #e8eaec;
+  float: left;
+}
+.my-table-list table {
+  width: 100%;
+  text-align: center;
+}
+.my-table-list .my-tr {
+  height: 32px;
+  text-align: left;
+}
+.my-table-list .my-tr:hover {
+  background-color: #f5f7fa;
+}
+.my-table-list td {
+  //border-right: 1px solid #e8eaec;
+}
+
+</style>
diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue
index f1561b3..14c60ff 100644
--- a/src/views/sjzx/bomwh.vue
+++ b/src/views/sjzx/bomwh.vue
@@ -21,14 +21,24 @@
             <el-form-item label="批量:">
               <el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
-
-
+<!--            <el-form-item label="状态:">-->
+<!--            <el-select v-model="queryParam.zt"  placeholder="状态" @change="" >-->
+<!--              <el-option-->
+<!--                v-for="item in optionsstats"-->
+<!--                :key="item.value1"-->
+<!--                :label="item.label1"-->
+<!--                :value="item.value1">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--            </el-form-item>-->
           </el-col>
           <el-col :span="2">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
           </el-col>
+
+
         </el-row>
         <el-row>
           <el-col :span="10" :offset="14">
@@ -37,12 +47,12 @@
 
               <el-button
                 type="success"
-                @click="toolbarButtonClickEvent('save')"
-              >提交</el-button>
-              <el-button
-                type="success"
-                @click="bomClick"
-              >生成bom</el-button>
+                @click="tjClick"
+              >保存</el-button>
+<!--              <el-button-->
+<!--                type="success"-->
+<!--                @click="bomClick"-->
+<!--              >生成bom</el-button>-->
               <div style="float: right;margin-left: 5px" >
 
                 <el-upload
@@ -55,6 +65,7 @@
                   :on-change="handleChange"
                   :on-success="sucessChange"
                   :directory="true"
+                  :disabled="filedis"
                   :show-file-list="false"
                 >
                   <el-button  type="primary" @click="handleAddFolder">选取文件夹</el-button>
@@ -80,32 +91,29 @@
     <el-container  style="padding-top: 0px">
       <el-container>
         <el-main>
-          <div class="mytable">
+          <div class="mytable" >
             <vxe-grid
               id="id"
               ref="xGrid"
               border
               resizable
-              keep-source
               :align="'center'"
               :height="height"
-              :auto-resize="true"
+              :checkbox-config="{checkField: 'checked'}"
+              :scroll-y="{enabled: true}"
               :columns="tableColumn"
               highlight-current-row
               :data="tableData"
               :custom-config="{ storage: true }"
-
               highlight-hover-row
               show-overflow
               show-header-overflow
-
             >
 
 
             </vxe-grid>
           </div>
 
-
         </el-main>
       </el-container>
     </el-container>
@@ -120,90 +128,103 @@
           </el-row>
         </el-row>
         <div class="mytable">
-          <vxe-list class="my-table-list" height="200" :data="list" >
-            <template #default="{ items }">
-              <table>
-                <tbody>
-                <tr >
-                  <td>板材领取表</td>
-                </tr>
-                <tr class="my-tr" v-for="(item,index) in bclqList" :key="item.id">
-                  <td>{{index+1}},{{ item }}</td>
-                </tr>
-                </tbody>
-              </table>
-            </template>
-          </vxe-list>
-          <vxe-list class="my-table-list" height="200" :data="list" >
-            <template #default="{ items }">
-              <table>
-                <tbody>
-                <tr >
-                  <td>型材领取表</td>
-                </tr>
-                <tr class="my-tr" v-for="(item,index) in  xclqList" :key="item.id">
-                  <td>{{index+1}},{{ item }}</td>
-                </tr>
-                </tbody>
-              </table>
-            </template>
-          </vxe-list>
-          <vxe-list class="my-table-list" height="200" :data="list" >
-            <template #default="{ items }">
-              <table>
-                <tbody>
-                <tr >
-                  <td>板材统计表</td>
-                </tr>
-                <tr class="my-tr"v-for="(item,index)  in bctjList" :key="item.id">
-                  <td>{{index+1}},{{ item }}</td>
-                </tr>
-                </tbody>
-              </table>
-            </template>
-          </vxe-list>
-          <vxe-list class="my-table-list" height="200" :data="list" >
-            <template #default="{ items }">
-              <table>
-                <tbody>
-                <tr >
-                  <td>型材统计表</td>
-                </tr>
-                <tr class="my-tr"v-for="(item,index)  in xctjList" :key="item.id">
-                  <td>{{index+1}},{{ item }}</td>
-                </tr>
-                </tbody>
-              </table>
-            </template>
-          </vxe-list>
-          <vxe-list class="my-table-list" height="200" :data="list" >
-            <template #default="{ items }">
-              <table>
-                <tbody>
-                <tr >
-                  <td>套料图</td>
-                </tr>
-                <tr class="my-tr" v-for="(item,index)  in tltList" :key="item.id">
-                  <td>{{index+1}},{{ item }}</td>
-                </tr>
-                </tbody>
-              </table>
-            </template>
-          </vxe-list>
-          <vxe-list class="my-table-list" height="200" :data="list" >
-            <template #default="{ items }">
-              <table>
-                <tbody>
-                <tr >
-                  <td>零件配套表</td>
-                </tr>
-                <tr class="my-tr" v-for="(item,index)  in ljList" :key="item.id">
-                  <td>{{index+1}},{{ item }}</td>
-                </tr>
-                </tbody>
-              </table>
-            </template>
-          </vxe-list>
+          <vxe-table
+            border
+            show-header-overflow
+            show-overflow
+            :align="allAlign"
+            :data="tableupload">
+            <vxe-column type="seq" width="50"></vxe-column>
+            <vxe-column field="czbh" title="船号" width="150"></vxe-column>
+            <vxe-column field="ph" title="批号" width="150"></vxe-column>
+            <vxe-column field="type" title="类型"width="150"></vxe-column>
+            <vxe-column field="stype" title="小类" width="150"></vxe-column>
+            <vxe-column field="name" title="名称" width="400"></vxe-column>
+          </vxe-table>
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>板材领取表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr" v-for="(item,index) in bclqList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>型材领取表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr" v-for="(item,index) in  xclqList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>板材统计表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr"v-for="(item,index)  in bctjList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>型材统计表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr"v-for="(item,index)  in xctjList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>套料图</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr" v-for="(item,index)  in tltList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
+<!--          <vxe-list class="my-table-list" height="200" :data="list" >-->
+<!--            <template #default="{ items }">-->
+<!--              <table>-->
+<!--                <tbody>-->
+<!--                <tr >-->
+<!--                  <td>零件配套表</td>-->
+<!--                </tr>-->
+<!--                <tr class="my-tr" v-for="(item,index)  in ljList" :key="item.id">-->
+<!--                  <td>{{index+1}},{{ item }}</td>-->
+<!--                </tr>-->
+<!--                </tbody>-->
+<!--              </table>-->
+<!--            </template>-->
+<!--          </vxe-list>-->
         </div>
       </template>
     </vxe-modal>
@@ -214,7 +235,7 @@
 import {
   getCzplBase,
   getListBom,
-  czPlupdate,
+  saveListBom,
   addListBom, uploadBom,
 } from '@/api/sjzx/jcsj'
 import { mapGetters } from 'vuex'
@@ -227,10 +248,21 @@ export default {
   name:'czplwh',
   data() {
     return {
+      optionsstats:[
+        {
+          value1:'',
+          label1: '未提交'
+        },
+        {
+          value1:'02',
+          label1: '已提交'
+        }
+      ],
+
       queryParam: {
         dcch:'',
         dcpl:'',
-
+        zt:'',
       },
       tableData: [],
       isupload:'02',
@@ -238,6 +270,7 @@ export default {
       uploadData:{
 
       },
+      tableupload:[],
       dialogVisible:false,
       heads: { token: getToken() },
       fileList: [],
@@ -252,285 +285,631 @@ export default {
       title:'',
       czbhu:'',
       phu:'',
+      // tableColumn: [
+      //   { type: 'checkbox', width: 50 },
+      //   { type: 'seq', width: 60, title: '序号' },
+      //   { field: 'zt', title: '状态', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //   { field: 'pid', title: 'pid', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'dcch', title: '船号', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'mbch', title: '目标船号', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'sjch', title: '数据船号', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //   { field: 'lqbs', title: '板材领取标识', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //   { field: 'tjbs', title: '板材统计标识', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //   { field: 'pl', title: '批量', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fd', title: '分段', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'xqdd', title: '需求地点', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'pw', title: '抛丸', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'lqlb', title: '领取类别', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'kw', title: '跨位', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'sbbh', title: '设备编号', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'sclx', title: '设备类型', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'zl', title: '组立', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'wpcz', title: '物品材质', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'wpgg', title: '物品规格', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'bh', title: '板厚', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'bc', title: '版长', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'yqyl', title: '油漆油漆用量', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'qgcd', title: '切割长度', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //   { field: 'hxcd', title: '划线长度', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //   { field: 'tzbh', title: '图纸编号', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'tlsl', title: '套料数量', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'pklx', title: '坡口类型', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'qbs', title: '曲标识', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'pkbs', title: '坡口長度', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'pkcd', title: '坡口标识', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'dmbs', title: '打磨标识', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'dmcd', title: '打磨长度', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'zpsx', title: '装配顺序', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'ljbh', title: '零件编号', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'ljsl', title: '零件数量', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'ljsx', title: '零件属性', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'djmj', title: '单件面积', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'ljdz', title: '零件单重', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'blgs', title: '备料', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'pwgs', title: '抛丸', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'llgs', title: '理料', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'hxgs', title: '划线', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'qggs', title: '切割', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'pkgs', title: '坡口', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'qgs', title: '曲', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'dmgs', title: '打磨', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'zpgs', title: '装配', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkblgs', title: '反馈备料', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkpwgs', title: '抛丸', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkllgs', title: '理料', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkhxgs', title: '划线', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkqggs', title: '切割', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkpkgs', title: '坡口', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkqgs', title: '曲', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkdmgs', title: '打磨', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //   { field: 'fkzpgs', title: '装配', width: 120,
+      //     filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //     filterRender: { name: 'FilterCombination', },
+      //   },
+      //
+      //
+      //
+      //   // { field: 'fds', title: '分段和', width: 120,
+      //   //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      //   //   filterRender: { name: 'FilterCombination', },
+      //   // },
+      //
+      //
+      //
+      //
+      // ]
       tableColumn: [
-
+        { type: 'checkbox', width: 50 ,
+        },
         { type: 'seq', width: 60, title: '序号' },
 
-        { field: 'pid', title: 'pid', width: 120,
+        { field: 'bclq.lqbh', title: '流水号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bclq.xh', title: '序号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bclq.dcChZ', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bclq.dcPlZ', title: '批量', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bclq.dcFdZ', title: '分段', width: 100, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bclq.qpyldZ', title: '前批余料代总', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        // { field: 'ljzlZ', title: '零件重量总', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        { field: 'bclq.ybzsZ', title: '用板总数', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dcch', title: '船号', width: 120,
+        { field: 'bclq.lqzlZ', title: '领取重量总', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'mbch', title: '目标船号', width: 120,
+        { field: 'bclq.shzlZ', title: '实耗重量总', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'sjch', title: '数据船号', width: 120,
+        { field: 'bclq.ylzlZ', title: '余料重量总', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'lqbs', title: '板材领取标识', width: 120,
+
+
+        { field: 'bclq.dcZlZ', title: '组立', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tjbs', title: '板材统计标识', width: 120,
+        { field: 'bclq.lqlbZ', title: '领取类别', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pl', title: '批量', width: 120,
+        { field: 'bclq.zzcjZ', title: '加工跨', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fd', title: '分段', width: 120,
+
+        { field: 'bclq.wpgg', title: '规格', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'xqdd', title: '需求地点', width: 120,
+        { field: 'bclq.wpxh', title: '材质', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pw', title: '抛丸', width: 120,
+        { field: 'bclq.sl', title: '数量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'lqlb', title: '领取类别', width: 120,
+        { field: 'bclq.lqzl', title: '领取重量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'kw', title: '跨位', width: 120,
+        { field: 'bclq.shzl', title: '实耗重量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'sbbh', title: '设备编号', width: 120,
+        { field: 'bclq.ylzl', title: '余料重量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'sclx', title: '设备类型', width: 120,
+        { field: 'bclq.qpyld', title: '前批余料代', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zl', title: '组立', width: 120,
+        { field: 'bclq.ljzl', title: '零件重量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'wpcz', title: '物品材质', width: 120,
+        { field: 'bclq.dztlzl', title: '单张套料重量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'wpgg', title: '物品规格', width: 120,
+        { field: 'bclq.tlshbl', title: '套料实耗比例', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'bh', title: '板厚', width: 120,
+        // { field: 'bz', title: '备注', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+
+        { field: 'bclq.derqZ', title: '导入日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'bc', title: '版长', width: 120,
+        { field: 'bclq.zdrZ', title: '修改人', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'yqyl', title: '油漆油漆用量', width: 120,
+        { field: 'bclq.zdrqZ', title: '修改日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        { type: 'seq', width: 60, title: '序号' },
 
-        { field: 'qgcd', title: '切割长度', width: 120,
+        // { field: 'lqbh', title: '流水号', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: 'xh', title: '序号', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        { field: 'tjb.dcCh', title: '船号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'hxcd', title: '划线长度', width: 120,
+        { field: 'tjb.dcPl', title: '批量', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tzbh', title: '图纸编号', width: 120,
+        { field: 'tjb.ylzd1', title: '划线类型', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'tlsl', title: '套料数量', width: 120,
+
+
+
+        { field: 'tjb.dcZl', title: '组立', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'pklx', title: '坡口类型', width: 120,
+        { field: 'tjb.zzcj', title: '加工跨', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'qbs', title: '曲标识', width: 120,
+        { field: 'tjb.sfyl', title: '余料', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'pkbs', title: '坡口長度', width: 120,
+        { field: 'tjb.tzbh', title: '套料图号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pkcd', title: '坡口标识', width: 120,
+        { field: 'tjb.wpgg', title: '规格', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmbs', title: '打磨标识', width: 120,
+        { field: 'tjb.sl', title: '数量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmcd', title: '打磨长度', width: 120,
+        { field: 'tjb.wpxh', title: '材质', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'zpsx', title: '装配顺序', width: 120,
+        { field: 'tjb.ylbh', title: '余料编号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljbh', title: '零件编号', width: 120,
+        { field: 'tjb.ylgg', title: '余料规格', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        { type: 'seq', width: 60, title: '序号' },
+
 
-        { field: 'ljsl', title: '零件数量', width: 120,
+        { field: 'tlt.dcChZ', title: '船号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'ljsx', title: '零件属性', width: 120,
+        { field: 'tlt.dcPlZ', title: '批量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'djmj', title: '单件面积', width: 120,
+        { field: 'tlt.dcZlZ', title: '组立', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'ljdz', title: '零件单重', width: 120,
+        { field: 'tlt.ylzd1Z', title: '划线类型', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'blgs', title: '备料', width: 120,
+        { field: 'tlt.wpggZ', title: '规格', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pwgs', title: '抛丸', width: 120,
+        { field: 'tlt.wpxhZ', title: '材质', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'llgs', title: '理料', width: 120,
+        { field: 'tlt.hxcdZ', title: '划线长度', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'hxgs', title: '划线', width: 120,
+        { field: 'tlt.ylzd4Z', title: '切割长度', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'qggs', title: '切割', width: 120,
+        { field: 'tlt.tzbhZ', title: '图纸编号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pkgs', title: '坡口', width: 120,
+        { field: 'tlt.ljslZ', title: '零件数量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'qgs', title: '曲', width: 120,
+        { field: 'tlt.xgr', title: '编制人', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'dmgs', title: '打磨', width: 120,
+        { field: 'tlt.xgrq', title: '编制日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zpgs', title: '装配', width: 120,
+        { type: 'seq', width: 60, title: '序号' },
+
+
+        { field: 'ljb.dcCh', title: '船号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'fkblgs', title: '反馈备料', width: 120,
+        { field: 'ljb.dcPl', title: '批量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'fkpwgs', title: '抛丸', width: 120,
+        { field: 'ljb.dcFd', title: '分段', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'fkllgs', title: '理料', width: 120,
+        { field: 'ljb.dcZl', title: '组立', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fkhxgs', title: '划线', width: 120,
+        { field: 'ljb.ylzd1', title: '配套表类型', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fkqggs', title: '切割', width: 120,
+        { field: 'ljb.lcm1', title: '流程码', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fkpkgs', title: '坡口', width: 120,
+        { field: 'ljb.tzbh', title: '图纸编号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fkqgs', title: '曲', width: 120,
+        { field: 'ljb.zxwph', title: '零件编号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fkdmgs', title: '打磨', width: 120,
+        { field: 'ljb.wpmc', title: '名称', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fkzpgs', title: '装配', width: 120,
+        { field: 'ljb.wpgg', title: '规格', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljb.wpxh', title: '材质', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljb.sl', title: '数量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljb.wpflm', title: '物品分类', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljb.abcfx', title: 'ABC分类', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljb.dcTz', title: '特征', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljb.dcYj', title: '依据', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljb.zdry', title: '编制人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljb.xgrq', title: '编制日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-
-
-        // { field: 'fds', title: '分段和', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-
-
-
-
       ]
     }
   },
@@ -560,14 +939,14 @@ export default {
     },
 
     czbhChange(){
-      if (this.queryParam.dcch === '') {
-        this.$message.error('请选择船号！')
-        return false;
-      }
-      if (this.queryParam.dcpl === '') {
-        this.$message.error('请输入正确批量！')
-        return false;
-      }
+      // if (this.queryParam.dcch === '') {
+      //   this.$message.error('请选择船号！')
+      //   return false;
+      // }
+      // if (this.queryParam.dcpl === '') {
+      //   this.$message.error('请输入正确批量！')
+      //   return false;
+      // }
       if (this.queryParam.cbbm === '') {
         this.filedis=true
       }else{
@@ -575,24 +954,37 @@ export default {
       }
     },
     handleAddFolder () {
-        this.fileList=[]
-        this.bclqList=[],
-        this.xclqList=[],
-        this.bctjList=[],
-        this.xctjList=[],
-        this.tltList=[],
-        this.ljList=[],
+
+        // this.fileList=[]
+        // this.bclqList=[],
+        // this.xclqList=[],
+        // this.bctjList=[],
+        // this.xctjList=[],
+        // this.tltList=[],
+        // this.ljList=[],
+          this.tableupload=[],
       this.$nextTick(() => {
-        this.$refs.upload.$children[0].$refs.input.webkitdirectory = true
+        if (this.queryParam.dcch === ''|| this.queryParam.dcpl === '' ) {
+          this.filedis=true
+          this.$message.error('请输入正确船号 批量！')
+        }else{
+          this.filedis=false
+          this.$refs.upload.$children[0].$refs.input.webkitdirectory = true
+        }
+
 
 
       })
 
     },
+     uploadpre(name){
+
+     },
+
     handleChange(file, fileList) {
       this.fileList = fileList
       console.log(file)
-
+      const bcph=""
       if (file.name.includes("板材领取表")) {
         this.czbhu=  file.name.split("_")[0]
         var underscoreIndex = file.name.indexOf("_");
@@ -600,23 +992,61 @@ export default {
        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
         this.bclqList.push(file.name)
 
+        let a={czbh:this.czbhu,ph:this.phu,type:"板材",stype:"板材领取表",name:file.name,sort:1}
+        this.tableupload.push(a);
       }
       if (file.name.includes("型材领取表")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("批", underscoreIndex);
+        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
         this.xclqList.push(file.name)
+        let a={czbh:this.czbhu,ph:this.phu,type:"型材",stype:"型材领取表",name:file.name,sort:2}
+        this.tableupload.push(a);
       }
       if (file.name.includes("板材统计数据")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("批", underscoreIndex);
+        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
         this.bctjList.push(file.name)
+        let a={czbh:this.czbhu,ph:this.phu,type:"板材",stype:"板材统计数据",name:file.name,sort:3}
+        this.tableupload.push(a);
       }
       if (file.name.includes("型材统计数据")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("批", underscoreIndex);
+        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
         this.xctjList.push(file.name)
+        let a={czbh:this.czbhu,ph:this.phu,type:"型材",stype:"型材统计数据",name:file.name,sort:4}
+        this.tableupload.push(a);
       }
       if (file.name.includes("套料图")) {
+        this.czbhu=  file.name.split("_")[0]
+        var underscoreIndex = file.name.indexOf("_");
+        var batchIndex = file.name.indexOf("套", underscoreIndex);
+        this.phu = file.name.substring(underscoreIndex + 1, batchIndex);
         this.tltList.push(file.name)
+        let a={czbh:this.czbhu,ph:this.phu,type:"",stype:"套料图",name:file.name,sort:5}
+        this.tableupload.push(a);
       }
       if((file.name.match(/-/g)).length ===3){
         this.ljList.push(file.name);
+        var parts = file.name.split('-')
+        var result = parts.slice(0, 3).join('-')
+        var parts1 = result.split('-')
+
+        this.czbhu = parts1.slice(0,2).join('-')
+        this.phu = parts1.slice(2,3)
+        let a={czbh:this.czbhu,ph:this.phu,type:"",stype:"零件",name:file.name,sort:6}
+        this.tableupload.push(a);
       }
-      this.title=this.czbhu+"  "+this.phu+"批"
+      //this.title=this.czbhu+"  "+this.phu+"批"
+      this.tableupload.sort((a,b)=>{
+        //return( a[age] - b[age])
+        return( a.sort - b.sort)
+      })
       this.dialogVisible=true;
     },
     // 删除文件之前的钩子，参数为上传的文件和文件列表，若返回 false 或者返回 Promise 且被 reject，则停止删除。function(file, fileList)
@@ -640,7 +1070,8 @@ export default {
         formData.append('file', file.raw)
       })
       // 添加自定义参数，不传可删除
-      formData.append('czbh', '49')
+      formData.append('czbh', this.queryParam.dcch)
+      formData.append('pl', this.queryParam.dcpl)
       formData.append('isupload', '01')
       uploadBom(formData).then(res=>{
         if (res.data.zt == "01") {
@@ -671,6 +1102,11 @@ export default {
 
     },
     bomClick(){
+      if (this.queryParam.cbbm === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+
       addListBom(this.queryParam).then(res=>{
         this.tableData=res.data;
       })
@@ -692,6 +1128,7 @@ export default {
         this.$message.warning('选择船只编号')
         return
       }
+
       getListBom(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
@@ -719,76 +1156,19 @@ export default {
     getHeight() {
       this.height = window.innerHeight - 190
     },
-    toolbarButtonClickEvent(code) {
-      const {
-        insertRecords,
-        removeRecords,
-        updateRecords
-      } = this.$refs.xGrid.getRecordset()
-      switch (code) {
-        case 'insert':
-
-          this.$refs.xGrid.insertAt({
-
-          }, -1).then(({ row }) => {
-            this.$refs.xGrid.setActiveRow(row)
-          })
-          break
-        case 'delete':
-          this.$confirm('删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then((type) => {
-            this.$refs.xGrid.removeCheckboxRow()
-          })
-          break
-        case 'save':
-
-
-          if (removeRecords.length !== 0) {
-            del(removeRecords).then((response) => {
-              if (response.success) {
-                for (let i = 0; i < this.list.length; i++) {
-                  if (removeRecords.indexOf(this.list[i]) !== -1) {
-                    this.list.splice(i, 1)
-                    i--
-                  }
-                }
-                this.$message({ message: '保存成功！', type: 'success' })
-                const xTable = this.$refs.xGrid
-                xTable.loadData(this.initList())
-
-              }
-            })
-          }
+    tjClick(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
 
+      if(selectRecords.length<=0){
+        return
+      }
+      saveListBom(selectRecords).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
 
 
-          if (updateRecords.length !== 0) {
-            czPlupdate(updateRecords).then((response) => {
-              if (response.success) {
-                const xTable = this.$refs.xGrid
-                xTable.loadData(this.initList())
-                this.$message({message: '保存成功！', type: 'success'})
-              }
-            })
-          }
-          if (insertRecords.length !== 0) {
-            add(insertRecords).then((response) => {
-              if (response.success) {
-                this.list = this.list.concat(insertRecords)
-                const xTable = this.$refs.xGrid
-                xTable.loadData(this.initList())
-                this.$message({ message: '保存成功！', type: 'success' })
-              }
-            })
-          }
-          this.$message(
-            `新增 ${insertRecords.length} 条，删除 ${removeRecords.length} 条，更新 ${updateRecords.length} 条`
-          )
-          break
-      }
     }
   }
 }
diff --git a/src/views/sjzx/czplwh.vue b/src/views/sjzx/czplwh.vue
index bd0d4fe..fe73b5f 100644
--- a/src/views/sjzx/czplwh.vue
+++ b/src/views/sjzx/czplwh.vue
@@ -319,70 +319,70 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dzjsq1', title: 'dzjsq1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'dzjsqsm', title: 'dzjsqsm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xzjsq1', title: 'xzjsq1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xzjsqsm', title: 'xzjsqsm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'gjks1', title: 'gjks1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'gjkssm', title: 'gjkssm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqTlt1', title: 'xfqTlt1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqTltsm', title: 'xfqTltsm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqLqb1', title: 'xfqLqb1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqLqb1sm', title: 'xfqLqb1sm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqDhqd1', title: 'xfqDhqd1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqDhqd1sm', title: 'xfqDhqd1sm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'lsh', title: 'lsh', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+        // { field: 'dzjsq1', title: 'dzjsq1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'dzjsqsm', title: 'dzjsqsm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xzjsq1', title: 'xzjsq1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xzjsqsm', title: 'xzjsqsm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'gjks1', title: 'gjks1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'gjkssm', title: 'gjkssm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqTlt1', title: 'xfqTlt1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqTltsm', title: 'xfqTltsm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqLqb1', title: 'xfqLqb1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqLqb1sm', title: 'xfqLqb1sm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqDhqd1', title: 'xfqDhqd1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqDhqd1sm', title: 'xfqDhqd1sm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'lsh', title: 'lsh', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
 
 
       ]
diff --git a/src/views/sjzx/plbXC.vue b/src/views/sjzx/plbXC.vue
index e564a1c..fd8d367 100644
--- a/src/views/sjzx/plbXC.vue
+++ b/src/views/sjzx/plbXC.vue
@@ -319,70 +319,70 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dzjsq1', title: 'dzjsq1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'dzjsqsm', title: 'dzjsqsm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xzjsq1', title: 'xzjsq1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xzjsqsm', title: 'xzjsqsm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'gjks1', title: 'gjks1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'gjkssm', title: 'gjkssm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqTlt1', title: 'xfqTlt1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqTltsm', title: 'xfqTltsm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqLqb1', title: 'xfqLqb1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqLqb1sm', title: 'xfqLqb1sm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqDhqd1', title: 'xfqDhqd1', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'xfqDhqd1sm', title: 'xfqDhqd1sm', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'lsh', title: 'lsh', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+        // { field: 'dzjsq1', title: 'dzjsq1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'dzjsqsm', title: 'dzjsqsm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xzjsq1', title: 'xzjsq1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xzjsqsm', title: 'xzjsqsm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'gjks1', title: 'gjks1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'gjkssm', title: 'gjkssm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqTlt1', title: 'xfqTlt1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqTltsm', title: 'xfqTltsm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqLqb1', title: 'xfqLqb1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqLqb1sm', title: 'xfqLqb1sm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqDhqd1', title: 'xfqDhqd1', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'xfqDhqd1sm', title: 'xfqDhqd1sm', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'lsh', title: 'lsh', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
 
 
       ]