diff --git a/src/api/sjzx/jcsj.js b/src/api/sjzx/jcsj.js
index 601cef2..a74e573 100644
--- a/src/api/sjzx/jcsj.js
+++ b/src/api/sjzx/jcsj.js
@@ -23,3 +23,22 @@ export function uploadPl(data) {
   })
 }
 
+export function uploadBom(data) {
+  const param = new FormData()
+  param.append('file', data.file)
+
+  return request({
+    url: '/bom/uploadBom',
+    method: 'post',
+    headers: { 'Content-Type': 'multipart/form-data' },
+    data: data
+  })
+}
+
+export function getListBom(data) {return request({url: '/dmBom/getListBom', method: 'post', data})}
+export function addListBom(data) {return request({url: '/dmBom/addListBom', method: 'post', data})}
+
+
+export function getBcLQlList(data) {return request({url: '/dmBclqmxp/getBcLQlList', method: 'post', data})}
+export function getBcTJlList(data) {return request({url: '/dmBchxylp/getBcTJlList', method: 'post', data})}
+
diff --git a/src/views/sjzx/bclqCX.vue b/src/views/sjzx/bclqCX.vue
new file mode 100644
index 0000000..e90b1ff
--- /dev/null
+++ b/src/views/sjzx/bclqCX.vue
@@ -0,0 +1,540 @@
+<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-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">
+<!--            <el-form-item style="float: right" >-->
+
+
+<!--              <el-button-->
+<!--                type="success"-->
+<!--                @click="toolbarButtonClickEvent('save')"-->
+<!--              >保存</el-button>-->
+<!--              <div style="float: right;margin-left: 5px" >-->
+
+<!--                <el-upload-->
+<!--                  :action="uploadAction"-->
+<!--                  :show-file-list="false"-->
+<!--                  :before-upload="beforeAvatarUpload"-->
+<!--                  :data="uploadData"-->
+<!--                  :on-success="handleAvatarSuccess"-->
+<!--                  :disabled="filedis"-->
+<!--                  :headers="heads"-->
+<!--                >-->
+<!--                  <el-button type="success" @click="uploadExcel" >        批量表导入    </el-button>-->
+<!--                </el-upload>-->
+
+<!--              </div>-->
+
+
+
+<!--&lt;!&ndash;              <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;                type="danger"&ndash;&gt;-->
+<!--&lt;!&ndash;                @click="toolbarButtonClickEvent('delete')"&ndash;&gt;-->
+<!--&lt;!&ndash;              >删除&ndash;&gt;-->
+<!--&lt;!&ndash;              </el-button>&ndash;&gt;-->
+<!--            </el-form-item>-->
+          </el-col>
+        </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
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="list"
+              :custom-config="{ storage: true }"
+
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+  getCzplBase ,
+  wgetCzplBase,
+  czPlupdate,
+  getBcLQlList,
+} 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 {
+      queryParam: {
+        dcch:'',
+        dcpl:'',
+        delx:'B'
+
+      },
+      list: [],
+      isupload:'02',
+      filedis:true,
+      uploadData:{
+
+      },
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+
+      tableColumn: [
+
+        { type: 'seq', width: 60, title: '序号' },
+
+        { 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: 'dcChZ', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcPlZ', title: '批量', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcFdZ', title: '分段', width: 100, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '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: 'ybzsZ', title: '用板总数', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqzlZ', title: '领取重量总', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'shzlZ', title: '实耗重量总', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ylzlZ', title: '余料重量总', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+        { field: 'dcZlZ', title: '组立', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'lqlbZ', title: '领取类别', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zzcjZ', title: '加工跨', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+        { field: 'wpgg', title: '规格', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpxh', title: '材质', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sl', title: '数量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqzl', title: '领取重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'shzl', title: '实耗重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ylzl', title: '余料重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qpyld', title: '前批余料代', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljzl', title: '零件重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dztlzl', title: '单张套料重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tlshbl', title: '套料实耗比例', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        // { field: 'bz', title: '备注', width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+
+        { field: 'derqZ', title: '导入日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xgr', title: '修改人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xgrq', title: '修改日期', width: 100,
+          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.cbbm === '') {
+          this.filedis=true
+      }else{
+        this.filedis=false
+      }
+    },
+    beforeAvatarUpload(file) {
+
+      // 文件类型
+      const isType = file.type === 'application/vnd.ms-excel'
+      const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      const fileType = isType || isTypeComputer
+      if (!fileType) {
+        this.$message.error('上传文件只能是xls/xlsx格式！')
+        return
+      }
+      startLoading()
+      return fileType
+    },
+    handleAvatarSuccess(res, file) {
+      endLoading()
+      if (res.success) {
+        // if(res.data.zt==='01'){
+        //   this.$confirm('该模板已导入数据,是否重新导入并覆盖模板数据?', '提示', {
+        //     confirmButtonText: '确定',
+        //     cancelButtonText: '取消',
+        //     distinguishCancelAndClose: true,
+        //     type: 'warning'
+        //   }).then(type => {
+        //     upload({ file: file.raw, czbh: this.queryParam.czbh, isupload: '02' }).then(res => {
+        //       if (res.success) {
+        //         this.$message({ message: '导入成功', type: 'success' })
+        //         this.loadData()
+        //       }
+        //     })
+        //   })
+        // }else{
+        //   this.$message({ message: '导入成功', type: 'success' })
+        //   this.loadData()
+        // }
+        this.$message({ message: '导入成功', type: 'success' })
+        this.initList();
+
+      } else {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      }
+    },
+    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
+      }
+      getBcLQlList(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(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
+    },
+    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())
+
+              }
+            })
+          }
+
+
+
+          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
+      }
+    }
+  }
+}
+</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;
+}
+
+
+</style>
diff --git a/src/views/sjzx/bcybCX.vue b/src/views/sjzx/bcybCX.vue
new file mode 100644
index 0000000..f6fc234
--- /dev/null
+++ b/src/views/sjzx/bcybCX.vue
@@ -0,0 +1,473 @@
+<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-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">
+<!--            <el-form-item style="float: right" >-->
+
+
+<!--              <el-button-->
+<!--                type="success"-->
+<!--                @click="toolbarButtonClickEvent('save')"-->
+<!--              >保存</el-button>-->
+<!--              <div style="float: right;margin-left: 5px" >-->
+
+<!--                <el-upload-->
+<!--                  :action="uploadAction"-->
+<!--                  :show-file-list="false"-->
+<!--                  :before-upload="beforeAvatarUpload"-->
+<!--                  :data="uploadData"-->
+<!--                  :on-success="handleAvatarSuccess"-->
+<!--                  :disabled="filedis"-->
+<!--                  :headers="heads"-->
+<!--                >-->
+<!--                  <el-button type="success" @click="uploadExcel" >        批量表导入    </el-button>-->
+<!--                </el-upload>-->
+
+<!--              </div>-->
+
+
+
+<!--&lt;!&ndash;              <el-button&ndash;&gt;-->
+<!--&lt;!&ndash;                type="danger"&ndash;&gt;-->
+<!--&lt;!&ndash;                @click="toolbarButtonClickEvent('delete')"&ndash;&gt;-->
+<!--&lt;!&ndash;              >删除&ndash;&gt;-->
+<!--&lt;!&ndash;              </el-button>&ndash;&gt;-->
+<!--            </el-form-item>-->
+          </el-col>
+        </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
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="list"
+              :custom-config="{ storage: true }"
+
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+  getCzplBase ,
+  wgetCzplBase,
+  czPlupdate,
+  getBcTJlList,
+} 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 {
+      queryParam: {
+        dcch:'',
+        dcpl:'',
+        delx:'B'
+
+      },
+      list: [],
+      isupload:'02',
+      filedis:true,
+      uploadData:{
+
+      },
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+
+      tableColumn: [
+
+        { type: 'seq', width: 60, title: '序号' },
+
+        // { 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: 'dcCh', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcPl', title: '批量', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ylzd1', title: '划线类型', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+
+        { field: 'dcZl', title: '组立', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zzcj', title: '加工跨', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sfyl', title: '余料', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'tzbh', title: '套料图号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpgg', title: '规格', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sl', title: '数量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpxh', title: '材质', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ylbh', title: '余料编号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ylgg', title: '余料规格', width: 100,
+          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.cbbm === '') {
+          this.filedis=true
+      }else{
+        this.filedis=false
+      }
+    },
+    beforeAvatarUpload(file) {
+
+      // 文件类型
+      const isType = file.type === 'application/vnd.ms-excel'
+      const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      const fileType = isType || isTypeComputer
+      if (!fileType) {
+        this.$message.error('上传文件只能是xls/xlsx格式！')
+        return
+      }
+      startLoading()
+      return fileType
+    },
+    handleAvatarSuccess(res, file) {
+      endLoading()
+      if (res.success) {
+        // if(res.data.zt==='01'){
+        //   this.$confirm('该模板已导入数据,是否重新导入并覆盖模板数据?', '提示', {
+        //     confirmButtonText: '确定',
+        //     cancelButtonText: '取消',
+        //     distinguishCancelAndClose: true,
+        //     type: 'warning'
+        //   }).then(type => {
+        //     upload({ file: file.raw, czbh: this.queryParam.czbh, isupload: '02' }).then(res => {
+        //       if (res.success) {
+        //         this.$message({ message: '导入成功', type: 'success' })
+        //         this.loadData()
+        //       }
+        //     })
+        //   })
+        // }else{
+        //   this.$message({ message: '导入成功', type: 'success' })
+        //   this.loadData()
+        // }
+        this.$message({ message: '导入成功', type: 'success' })
+        this.initList();
+
+      } else {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      }
+    },
+    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
+      }
+      getBcTJlList(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(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
+    },
+    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())
+
+              }
+            })
+          }
+
+
+
+          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
+      }
+    }
+  }
+}
+</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;
+}
+
+
+</style>
diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue
new file mode 100644
index 0000000..1b7aa6d
--- /dev/null
+++ b/src/views/sjzx/bomwh.vue
@@ -0,0 +1,879 @@
+<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-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">
+            <el-form-item style="float: right" >
+
+
+              <el-button
+                type="success"
+                @click="toolbarButtonClickEvent('save')"
+              >保存</el-button>
+              <el-button
+                type="success"
+                @click="bomClick"
+              >生成bom</el-button>
+              <div style="float: right;margin-left: 5px" >
+
+                <el-upload
+                  class="pop-upload"
+                  ref="upload"
+                  action=""
+                  :file-list="fileList"
+                  :auto-upload="false"
+                  :multiple="true"
+                  :on-change="handleChange"
+                  :on-success="sucessChange"
+                  :directory="true"
+                  :show-file-list="false"
+                >
+                  <el-button slot="trigger" size="small" type="primary" @click="handleAddFolder">选取文件夹</el-button>
+
+                </el-upload>
+
+
+
+              </div>
+
+
+
+              <!--              <el-button-->
+              <!--                type="danger"-->
+              <!--                @click="toolbarButtonClickEvent('delete')"-->
+              <!--              >删除-->
+              <!--              </el-button>-->
+            </el-form-item>
+          </el-col>
+        </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
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="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-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,
+  getListBom,
+  czPlupdate,
+  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 {
+      queryParam: {
+        dcch:'',
+        dcpl:'',
+
+      },
+      tableData: [],
+      isupload:'02',
+      filedis:true,
+      uploadData:{
+
+      },
+      dialogVisible:false,
+      heads: { token: getToken() },
+      fileList: [],
+      dictData:{},
+      height: '500px',
+      bclqList:[],
+      xclqList:[],
+      bctjList:[],
+      xctjList:[],
+      tltList:[],
+      ljList:[],
+      title:'',
+      czbhu:'',
+      phu:'',
+      tableColumn: [
+
+        { type: 'seq', width: 60, title: '序号' },
+
+        { 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.$nextTick(() => {
+        this.$refs.upload.$children[0].$refs.input.webkitdirectory = true
+
+
+      })
+
+    },
+    handleChange(file, fileList) {
+      this.fileList = fileList
+      console.log(file)
+
+      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)
+
+      }
+      if (file.name.includes("型材领取表")) {
+        this.xclqList.push(file.name)
+      }
+      if (file.name.includes("板材统计数据")) {
+        this.bctjList.push(file.name)
+      }
+      if (file.name.includes("型材统计数据")) {
+        this.xctjList.push(file.name)
+      }
+      if (file.name.includes("套料图")) {
+        this.tltList.push(file.name)
+      }
+      if((file.name.match(/-/g)).length ===3){
+        this.ljList.push(file.name);
+      }
+      this.title=this.czbhu+"  "+this.phu+"批"
+      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', '49')
+      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(){
+      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
+      }
+      getListBom(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
+    },
+    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())
+
+              }
+            })
+          }
+
+
+
+          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
+      }
+    }
+  }
+}
+</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/czbhcx.vue b/src/views/sjzx/czbhcx.vue
new file mode 100644
index 0000000..2a30d1d
--- /dev/null
+++ b/src/views/sjzx/czbhcx.vue
@@ -0,0 +1,426 @@
+<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-input v-model="request.cbbm" type="search" placeholder="船号" ></el-input>
+            </el-form-item>
+            <!--            <el-form-item label="场地名称:">-->
+            <!--              <el-input v-model="request.cdmc" type="search" placeholder="场地名称" ></el-input>-->
+            <!--            </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">-->
+<!--            <el-form-item style="float: right" >-->
+
+<!--              <el-button-->
+<!--                type="success"-->
+<!--                @click="toolbarButtonClickEvent('save')"-->
+<!--              >保存</el-button>-->
+<!--              <el-button type="success" @click="toolbarButtonClickEvent('insert')">添加</el-button>-->
+<!--              <el-button-->
+<!--                type="danger"-->
+<!--                @click="toolbarButtonClickEvent('delete')"-->
+<!--              >删除-->
+<!--              </el-button>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </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
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="list"
+              :custom-config="{ storage: true }"
+              :edit-config="{ trigger: 'click', mode: 'cell', showStatus: true}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+              <template #wgbsEdit="{ row}">
+                <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"  @change="checkBoxClick(row,'tzDsqx01')"></vxe-checkbox>
+              </template>
+              <template #ckxsztEdit="{ row}">
+                <vxe-checkbox v-model="row.ckxszt"  checked-value="Y" unchecked-value="N"  @change="checkBoxClick(row,'tzDsqx01')"></vxe-checkbox>
+              </template>
+              <template #cwfzbsEdit="{ row}">
+                <vxe-checkbox v-model="row.cwfzbs"  checked-value="Y" unchecked-value="N"  @change="checkBoxClick(row,'tzDsqx01')"></vxe-checkbox>
+              </template>
+              <template #xbzEdit="{ row}">
+                <vxe-checkbox v-model="row.xbz"  checked-value="Y" unchecked-value="N"  @change="checkBoxClick(row,'tzDsqx01')"></vxe-checkbox>
+              </template>
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+  getList,
+  add,
+  edit,
+  del,
+} from '@/api/sjzx/jcsj'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import {null2str} from "@/utils/rpkj";
+export default {
+  name:'czbhwh',
+  data() {
+    return {
+      request: {
+        cbbm:'',
+
+      },
+      list: [],
+
+      dictData:{},
+      height: '500px',
+
+      tableColumn: [
+        { type: 'checkbox', width: 50 ,
+        },
+        { type: 'seq', width: 60, title: '序号' },
+
+        { field: 'cbbm', title: '船号编码', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'cbmc', title: '船号名称', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wgbs', title: '完工标识', width: 120, editRender: {},
+          slots:{
+            //
+            edit:'wgbsEdit',
+            default: 'wgbsEdit'
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ckxszt', title: '库存系统显示标识', width: 120, editRender: {  },
+          slots:{
+            //
+            edit:'ckxsztEdit',
+            default: 'ckxsztEdit'
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'cjs', title: '船级社', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sCzbh', title: '目标船只', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xbz', title: '标准', width: 120, editRender: {  },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          slots:{
+            //
+            edit:'xbzEdit',
+            default: 'xbzEdit'
+          },
+        },
+
+        { field: 'kgrq', title: '开工日期', width: 120,  editRender: {
+            name: '$input',
+            props: {type: 'date', labelFormat: "yyyy/MM/dd", valueFormat: "yyyy/MM/dd"},
+            formatter: this.formatDate,
+            events: {change: this.selectChange}
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pdrq', title: '铺底日期', width: 120,  editRender: {
+            name: '$input',
+            props: {type: 'date', labelFormat: "yyyy/MM/dd", valueFormat: "yyyy/MM/dd"},
+            formatter: this.formatDate,
+            events: {change: this.selectChange}
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xsrq', title: '下水日期', width: 120,  editRender: {
+            name: '$input',
+            props: {type: 'date', labelFormat: "yyyy/MM/dd", valueFormat: "yyyy/MM/dd"},
+            formatter: this.formatDate,
+            events: {change: this.selectChange},
+
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'shrq', title: '试航日期', width: 120,  editRender: {
+            name: '$input',
+            props: {type: 'date', labelFormat: "yyyy/MM/dd", valueFormat: "yyyy/MM/dd"},
+            formatter: this.formatDate,
+            events: {change: this.selectChange}
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'drbz', title: '导入标准', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'cwfzbs', title: '财务封账标识', width: 120, editRender: { },
+          slots:{
+            //
+            edit:'cwfzbsEdit',
+            default: 'cwfzbsEdit'
+          },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bz', title: '备注', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bzr', title: '编制人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bzrq', 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: {
+
+
+
+
+
+
+    initBase(){
+      // getTpBase({}).then(res=>{
+      //   this.dictData = res.data
+      //   const xGrid = this.$refs.xGrid
+      //
+      //   const dwbm = xGrid.getColumnByField('dwbm')
+      //   dwbm.editRender.options = res.data.xqdws
+      //
+      // })
+    },
+    initList() {
+      getList(this.request).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+
+      })
+    },
+    formatDate ({ cellValue }) {
+      console.log("111")
+      return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
+    },
+
+    checkBoxClick(row,column){
+      // console.log(row)
+      // this.$refs.xGrid.clearActived()
+      console.log('1')
+      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
+    },
+    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())
+
+              }
+            })
+          }
+
+
+
+          if (updateRecords.length !== 0) {
+            edit(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
+      }
+    }
+  }
+}
+</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;
+}
+
+
+</style>