diff --git a/src/api/jhzx/qfxq.js b/src/api/jhzx/qfxq.js
new file mode 100644
index 0000000..7a302f7
--- /dev/null
+++ b/src/api/jhzx/qfxq.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+export function getList(data) {return request({url: '/dmQfxq/getList', method: 'post', data})}
+export function remove(data) {return request({url: '/dmQfxq/remove', method: 'post', data})}
+export function qfxqTJ(data) {return request({url: '/dmQfxq/qfxqTJ', method: 'post', data})}
+export function qfxqSH(data) {return request({url: '/dmQfxq/qfxqSH', method: 'post', data})}
+export function save(data) {return request({url: '/dmQfxq/save', method: 'post', data})}
+export function getCzxx(data) {return request({url: '/dmQfxq/getCzxx', method: 'post', data})}
+
+
+
diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js
new file mode 100644
index 0000000..57a7581
--- /dev/null
+++ b/src/api/jhzx/sygd.js
@@ -0,0 +1,5 @@
+import request from '@/utils/request'
+
+export function getList(data) {return request({url: '/dmSygdMx/getList', method: 'post', data})}
+export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post'})}
+export function saveByDcch(data) {return request({url: '/dmSygdMx/saveByDcch', method: 'post', data})}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index ba8e1e5..d2c211b 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -47,8 +47,6 @@ 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/jhzx/qfxqCX.vue b/src/views/jhzx/qfxqCX.vue
new file mode 100644
index 0000000..c55b3c5
--- /dev/null
+++ b/src/views/jhzx/qfxqCX.vue
@@ -0,0 +1,281 @@
+<template>
+  <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="20">
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" filterable  placeholder="状态" @change="czbhChange" >
+                <el-option
+                  v-for="item in zt"
+                  :key="item.bm"
+                  :label="item.bmsm"
+                  :value="item.bm">
+                </el-option>
+              </el-select>
+            </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 {
+  getList,
+  getCzxx
+} from '@/api/jhzx/qfxq'
+
+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:'QfxqCX',
+  data() {
+    return {
+      queryParam: {
+        dcCh:'',
+        dcPl:'',
+        zt:''
+      },
+      list: [],
+      filedis:true,
+      uploadData:{
+      },
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmQfxq/upload',
+      dictData:{
+        cbbm:[]
+      },
+      zt:[],
+      height: '500px',
+      tableColumn: [
+        { type: 'seq', width: 60, title: '序号' },
+
+        { 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: 'dcFd', title: '分段', width: 100, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pscd', title: '配送场地', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'cjzg', title: '车间主管', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'db', title: '大板', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xc', title: '型材', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'txc', title: 'T型材', width: 120, editRender: { name: 'input' },
+          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: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX']
+        },
+        { field: 'bzry', title: '编制人员', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bzrq', title: '编制日期', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'shry', title: '审核人员', width: 110, editRender: { name: 'input' },
+          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(){
+      getCzxx({}).then(res=>{
+        this.dictData.cbbm = res.data
+      })
+      const dict=window.localStorage.getItem('ZTLX');
+      this.zt=JSON.parse(dict)
+    },
+    initList() {
+      if (this.queryParam.dcCh === '') {
+          this.$message.warning('选择船只编号')
+        return
+      }
+      getList(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+
+      })
+    },
+    czbhChange(){
+      if (this.queryParam.dcCh === '') {
+        this.filedis=true
+      }else{
+        this.filedis=false
+      }
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    formatDate ({ cellValue }) {
+      return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+  }
+}
+</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/jhzx/qfxqSH.vue b/src/views/jhzx/qfxqSH.vue
new file mode 100644
index 0000000..81c4cd1
--- /dev/null
+++ b/src/views/jhzx/qfxqSH.vue
@@ -0,0 +1,300 @@
+<template>
+  <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"
+                  :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="qfxqTJ()" >退回编辑</el-button>
+              <el-button  type="success" @click="qfxqSH()" >审核</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 }"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+  getList,
+  qfxqTJ,
+  getCzxx,
+  qfxqSH
+} from '@/api/jhzx/qfxq'
+
+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:'QfxqSH',
+  data() {
+    return {
+      queryParam: {
+        dcCh:'',
+        dcPl:'',
+        zt:'1'
+      },
+      list: [],
+      isupload:'02',
+      filedis:true,
+      uploadData:{
+      },
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmQfxq/upload',
+      dictData:[],
+      height: '500px',
+      tableColumn: [
+        { type: 'checkbox', width: 50 },
+        { type: 'seq', width: 60, title: '序号' },
+
+        { 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: 'dcFd', title: '分段', width: 100, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pscd', title: '配送场地', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'cjzg', title: '车间主管', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'db', title: '大板', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xc', title: '型材', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'txc', title: 'T型材', width: 120, editRender: { name: 'input' },
+          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: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX']
+        },
+        { field: 'bzry', title: '编制人员', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bzrq', title: '编制日期', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'shry', title: '审核人员', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'shrq', title: '审核日期', width: 110, editRender: { name: 'input' },
+          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()
+    this.initList()
+  },
+  methods: {
+    czbhChange(){
+      if (this.queryParam.dcCh === '') {s
+          this.filedis=true
+      }else{
+        this.filedis=false
+      }
+    },
+    initBase(){
+      getCzxx({}).then(res=>{
+        this.dictData = res.data
+      })
+    },
+    initList() {
+      // if (this.queryParam.dcCh === '') {
+      //     this.$message.warning('选择船只编号')
+      //   return
+      // }
+      getList(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')
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+    qfxqTJ() {
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+
+      if(obj.length<=0){
+        return
+      }
+      qfxqTJ(obj).then(res=> {
+        if (res.success) {
+          this.initList()
+        }
+      })
+    },
+    qfxqSH() {
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+
+      if(obj.length<=0){
+        return
+      }
+      qfxqSH(obj).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;
+}
+
+
+</style>
diff --git a/src/views/jhzx/qfxqwh.vue b/src/views/jhzx/qfxqwh.vue
new file mode 100644
index 0000000..92965d4
--- /dev/null
+++ b/src/views/jhzx/qfxqwh.vue
@@ -0,0 +1,334 @@
+<template>
+  <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"
+                  :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="qfxqTJ()" >提交</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" >        Excel导入    </el-button>
+                </el-upload>
+
+              </div>
+            </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 {
+  getList,
+  qfxqTJ,
+  getCzxx
+} from '@/api/jhzx/qfxq'
+
+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:'Qfxqwh',
+  data() {
+    return {
+      queryParam: {
+        dcCh:'',
+        dcPl:'',
+        zt:'0'
+      },
+      list: [],
+      isupload:'02',
+      filedis:true,
+      uploadData:{
+      },
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmQfxq/upload',
+      dictData:[],
+      height: '500px',
+      tableColumn: [
+        { type: 'checkbox', width: 50 },
+        { type: 'seq', width: 60, title: '序号' },
+
+        { 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: 'dcFd', title: '分段', width: 100, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pscd', title: '配送场地', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'cjzg', title: '车间主管', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'db', title: '大板', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xc', title: '型材', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'txc', title: 'T型材', width: 120, editRender: { name: 'input' },
+          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: 'zt', title: '状态', width: 100,formatter: ['dictFormat','ZTLX']
+        },
+        { field: 'bzry', title: '编制人员', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bzrq', title: '编制日期', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'shry', title: '审核人员', width: 110, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'shrq', title: '审核日期', width: 110, editRender: { name: 'input' },
+          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.dcCh === '') {
+        this.$message.error('请选择船号！')
+        return false;
+      } else {
+
+      }
+      this.uploadData.isupload = this.isupload
+    },
+    czbhChange(){
+      if (this.queryParam.dcCh === '') {
+          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) {
+        this.$message({ message: '导入成功', type: 'success' })
+        this.initList();
+
+      } else {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      }
+    },
+    initBase(){
+      getCzxx({}).then(res=>{
+        this.dictData = res.data
+      })
+    },
+    initList() {
+      if (this.queryParam.dcCh === '') {
+          this.$message.warning('选择船只编号')
+        return
+      }
+      getList(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')
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+    qfxqTJ() {
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+
+      if(obj.length<=0){
+        return
+      }
+      qfxqTJ(obj).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;
+}
+
+
+</style>
diff --git a/src/views/jhzx/sydgWH.vue b/src/views/jhzx/sydgWH.vue
index cc883d5..f74a367 100644
--- a/src/views/jhzx/sydgWH.vue
+++ b/src/views/jhzx/sydgWH.vue
@@ -1,54 +1,52 @@
 <template>
   <el-container>
-    <el-header style="width: 100%">
-      <el-row>
-        <el-col :span="20">
-          <el-col :span="3">
-            <el-input
-              v-model="request.matGrd"
-              placeholder="材质"
-              clearable
-            />
+    <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.dcCh1" filterable  placeholder="工程编号"  >
+                <el-option
+                  v-for="item in dictData"
+                  :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>
-        <el-col :span="4" style="text-align: right">
-          <el-button type="primary" @click="initList()">查询</el-button>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="20">
-          <el-col :span="3">
-            <el-select
-              v-model="request.matType"
-              placeholder="材质类型"
-              clearable
-            >
-              <el-option v-for="item in czlxList" :key="item.itemCode" :value="item.itemCode" :label="item.itemValue" />
-            </el-select>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
           </el-col>
-        </el-col>
-        <el-col :span="4" style="text-align: right">
-
-
-
-          <el-button
-            type="success"
-            @click="toolbarButtonClickEvent('insert')"
-          >添加</el-button>
-          <el-button
-            type="danger"
-            @click="toolbarButtonClickEvent('delete')"
-          >删除</el-button>
-          <el-button
-            type="primary"
-            @click="toolbarButtonClickEvent('save')"
-          >保存</el-button>
-
-
-        </el-col>
-      </el-row>
+        </el-row>
+        <el-row>
+          <el-col :span="10" :offset="14">
+            <el-form-item style="float: right" >
+              <el-button  type="success" @click="sygdPC()" >预排产</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" >Excel导入</el-button>
+                </el-upload>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </el-header>
-    <el-container style="padding-top: 10px">
+    <el-container  style="padding-top: 0px">
       <el-container>
         <el-main>
           <div class="mytable">
@@ -58,18 +56,20 @@
               border
               resizable
               keep-source
+              :align="'center'"
               :height="height"
               :auto-resize="true"
               :columns="tableColumn"
               :data="list"
               :custom-config="{ storage: true }"
-              :edit-config="{ trigger: 'click', mode: 'row', showStatus: true }"
               highlight-hover-row
-            />
+              highlight-current-row
+              show-overflow
+              @cell-click="cellClickEvent"
+            >
+            <!--              show-header-overflow-->
+            </vxe-grid>
           </div>
-
-          <!--        :toolbar-config="tableToolbar"  @toolbar-button-click="toolbarButtonClickEvent"-->
-          <!--        <tb-filter ref="tbFilter" :list="" :filter="columnFilter" @execFilter="execFilter"></tb-filter>-->
         </el-main>
       </el-container>
     </el-container>
@@ -77,95 +77,108 @@
 </template>
 
 <script>
-
-
+import {  getCzxx} from '@/api/jhzx/qfxq'
+import {  getList} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
-import {null2str} from "@/utils/rpkj";
-
+import XEUtils from 'xe-utils'
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
 export default {
-  // components: { TbFilter },
   name:'SydgWH',
   data() {
     return {
-      request: {
-        matGrd: '',
-        matType: '',
-        departCode:''
+      queryParam: {
+        dcCh1:'',
+        dcPl:''
       },
       list: [],
-      deptList: [],
-      czlx: {
-        dictCode: 'CZLX'
-      },
-      czjb: {
-        dictCode: 'CZJB'
-      },
-      czlxList: [],
-      czjbList: [],
-      columnFilter: {},
+      isupload:'02',
+      filedis:false,
+      uploadData:{},
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
+      dictData:[],
       height: '500px',
-      tableColumn: [
-        { type: 'checkbox', width: 50 },
-        { type: 'seq', width: 60, title: '序号' },
-        {
-          field: 'zt', title: '状态',width:"100px", formatter: ['dictFormat','JLDW'],
-        },
-        { field: 'lx', title: '类型',
-          editRender: { name: '$select', options: [], props: { clearable: true },events: { change: this.selectChange }
-          },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        /**
-        {
-          field: 'matGrd',
-          title: '材质',
-          editRender: {
-            name: 'input'
-          },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'matType', title: '材质类型',
-          editRender: { name: '$select', options: [], props: { clearable: true },events: { change: this.selectChange }
-          },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'matLevel', title: '级别',
-          editRender: { name: '$select', options: [], props: { clearable: true },events: { change: this.selectChange }
-          },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        {
-          field: 'weightFactor',
-          title: '重量系数',
-          editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'matCode', title: '材料编码', editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+      tableColumn:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: 'dcCh', title: '船号',width: 100},
+        { field: 'dcPl', title: '批量号',width: 70},
+        { field: 'dcFd', title: '分段号',width: 100},
+        { field: 'gjjsDz', title: '钢加大组结束',width: 100},
+        { field: 'gjjsXz', title: '钢加小组结束',width: 100},
+        { field: 'jsqTlt', title: '套料图接收',width: 80},
+        { field: 'jsqLqb', title: '板材领取表接收',width: 100},
+        { field: 'dhqd', title: '订货清单号',width: 100},
+        { field: 'gdZt', title: '状态',width: 70,formatter: ['dictFormat','SYZT']},
+        { field: 'orderBs', title: '订货板数',width: 80},
+        { field: 'arrivalB', title: '到货板数',width: 80},
+        { field: 'tltSl', title: '套料图板数',width: 100},
+        { field: 'slSl', title: '上料张数',width: 80},
+        { field: 'slSj', title: '上料时间',width: 100},
+        { field: 'pwSl', title: '抛丸数量',width: 100},
+        { field: 'pwSj', title: '抛丸时间',width: 100},
+        { field: 'xcpwSl', title: '型材抛丸',width: 100},
+        { field: 'xcpwSj', title: '型材抛丸时间',width: 100},
+        { field: 'n1ad', title: '1跨平直大板（大组）',width: 100},
+        { field: 'n1adSj', title: '加工时间',width: 100},
+        { field: 'n1ax', title: '1跨平直大板（小组）',width: 100},
+        { field: 'n1axSj', title: '加工时间',width: 100},
+        { field: 'n1ld', title: '1跨进线板（大组）',width: 100},
+        { field: 'n1ldSj', title: '加工时间',width: 100},
+        { field: 'n2bd', title: '2跨超长超宽板（大组）',width: 100},
+        { field: 'n2bdSj', title: '加工时间',width: 100},
+        { field: 'n2bx', title: '2跨超长超宽板（小组）',width: 100},
+        { field: 'n2bxSj', title: '加工时间',width: 100},
+        { field: 'n2cx', title: '2跨超长超宽曲板（小组）',width: 100},
+        { field: 'n2cxSj', title: '加工时间',width: 100},
+        { field: 'n2cd', title: '2跨超长超宽曲板（大组）',width: 100},
+        { field: 'n2cdSj', title: '加工时间',width: 100},
+        { field: 'n2tx', title: '2跨T型材腹板（小组）',width: 100},
+        { field: 'n2txSj', title: '加工时间',width: 100},
+        { field: 'n2td', title: '2跨T型材腹板（大组）',width: 100},
+        { field: 'n2tdSj', title: '加工时间',width: 100},
+        { field: 'n2jx', title: '2跨激光切割板（小组）',width: 100},
+        { field: 'n2jxSj', title: '加工时间',width: 100},
+        { field: 'n2jd', title: '2跨激光切割板（大组）',width: 100},
+        { field: 'n2jdSj', title: '加工时间',width: 100},
+        { field: 'n3cx', title: '3跨曲板（小组）',width: 100},
+        { field: 'n3cxSj', title: '加工时间',width: 100},
+        { field: 'n3cd', title: '3跨曲板（大组）',width: 100},
+        { field: 'n3cdSj', title: '加工时间',width: 100},
+        { field: 'n3hx', title: '3跨厚板（小组）',width: 100},
+        { field: 'n3hxSj', title: '加工时间',width: 100},
+        { field: 'n3hd', title: '3跨厚板（大组）',width: 100},
+        { field: 'n3hdSj', title: '加工时间',width: 100},
+        { field: 'n4px', title: '4跨普通板（小组）',width: 100},
+        { field: 'n4pxSj', title: '加工时间',width: 100},
+        { field: 'n4pd', title: '4跨普通板（大组）',width: 100},
+        { field: 'n4pdSj', title: '加工时间',width: 100},
+        { field: 'n4xx', title: '4跨普通板（机器人）',width: 100},
+        { field: 'n4xxSj', title: '加工时间',width: 100},
+        { field: 'n8gx', title: '光电',width: 100},
+        { field: 'n8gxSj', title: '加工时间',width: 100},
+        { field: 'x7xx', title: '7跨型板（小组）',width: 100},
+        { field: 'x7xxSj', title: '加工时间',width: 100},
+        { field: 'x7xd', title: '7跨型板（大组）',width: 100},
+        { field: 'x7xdSj', title: '加工时间',width: 100},
+        { field: 's2tx', title: '2跨T型材面板（小组）',width: 100},
+        { field: 's2txSj', title: '加工时间',width: 100},
+        { field: 's2td', title: '2跨T型材面板（大组）',width: 100},
+        { field: 's2tdSj', title: '加工时间',width: 100},
+        { field: 's3px', title: '3跨平铁（小组）',width: 100},
+        { field: 's3pxSj', title: '加工时间',width: 100},
+        { field: 's3pd', title: '3跨平铁（大组）',width: 100},
+        { field: 's3pdSj', title: '加工时间',width: 100},
+        { field: 's3xx', title: '3跨平铁（机器人）',width: 100},
+        { field: 's3xxSj', title: '加工时间',width: 100},
+        { field: 'gjks', title: '钢加开始',width: 100},
+        { field: 'jhwgDz', title: '计划大组完成时间',width: 100},
+        { field: 'jhwgXz', title: '计划小组完成时间',width: 100},
+        { field: 'sjlyCh', title: '数据来源船',width: 100},
+        { field: 'gxsj', title: '数据更新时间',width: 100},]
 
-        {
-          field: 'matName',
-          title: '材料名称',
-          editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'weldName', title: '焊材名称',
-          editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-         **/
-        { field: 'remark', title: '备注', editRender: { name: 'input' }}
-      ]
     }
   },
   computed: {
@@ -174,158 +187,143 @@ export default {
   created() {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
-    this.initList()
-    // this.initCzlxList()
-    // this.initCzjbList()
-    // this.request.departCode=this.bmbm
+    this.initBase()
   },
-  mounted() {
-    this.initCzlxList()
-    },
   methods: {
-    initList() {
-      // getCzglList(this.request).then((res) => {
-        this.list = [{
-              'zt':'71',
-              'lx':'M',
-          'remark':''
-        }]
+    uploadExcel() {
+      this.uploadData.isupload = this.isupload
+    },
+    cellClickEvent  ( column )  {
+      this.$router.push({
+        name: 'SymxCX',
+        params: {
+          list: column.row.mxList
+        }
+      })
+      // console.log(column.row.mxList)
+    },
+    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
     },
-    initCzlxList() {
-      const dict=window.localStorage.getItem('GZLX');
-      this.czlxList =JSON.parse(dict)
-      const xGrid = this.$refs.xGrid
-      const departCode = xGrid.getColumnByField('lx')
-        const testList = []
-        for (let i = 0; i < this.czlxList.length; i++) {
-          const temp = { label: this.czlxList[i].bmsm, value:this.czlxList[i].bm }
-          testList.push(temp)
+    handleAvatarSuccess(res, file) {
+      endLoading()
+      if (res.success) {
+        this.$message({ message: '导入成功', type: 'success' })
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
         }
-        departCode.editRender.options = testList
 
+      } else {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      }
+    },
+    initBase(){
+      getCzxx({}).then(res=>{
+        this.dictData = res.data
+      })
+    },
+    initList() {
+      if (this.queryParam.dcCh1 === '') {
+          this.$message.warning('选择船只编号')
+        return
+      }
+      getList(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
 
+      })
     },
-    selectChange(row) {
-      this.$refs.xGrid.clearActived() // 清除单元格激活状态
-      this.$refs.xGrid.setActiveCell(row.row, row.column.property) // 设置单元格为激活状态
-      // if(row.row.treatmentType==='01'){
-      //   row.row.remark='11111111'
-      //   // 希望改变这一行这个列得属性  disabled=false
-      //   this.$refs.xGrid.getColumnByField('itdepartCode').editRender.props.disabled=false
-      //   //console.log(this.$refs.xGrid.getColumnByField('itdepartCode'))
-      // }
-      null2str(row.row)
+    formatDate ({ cellValue }) {
+      return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
-      this.height = window.innerHeight - 160
+      this.height = window.innerHeight - 190
     },
-    toolbarButtonClickEvent(code) {
-      const {
-        insertRecords,
-        removeRecords,
-        updateRecords
-      } = this.$refs.xGrid.getRecordset()
-      switch (code) {
-        case 'insert':
-          this.$refs.xGrid.insertAt({
-            'bzry': this.name
-          }, -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 (insertRecords.length !== 0) {
-            addCzgl(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' })
-              }
-            })
-          }
-          if (removeRecords.length !== 0) {
-            delCzgl(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--
-                  }
-                }
-                const xTable = this.$refs.xGrid
-                xTable.loadData(this.initList())
-                this.$message({ message: '保存成功！', type: 'success' })
-              }
-            })
-          }
-          if (updateRecords.length !== 0) {
-            updateCzgl(updateRecords).then((response) => {
-              if (response.success) {
-                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-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
 }
-.el-container {
-  padding: 0;
-  margin: 0;
+.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;
 }
-.el-main {
-  padding: 0;
+
+.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;
+
 }
-.el-col {
-  padding: 0;
+.mytable1{
+
 }
-.el-aside {
-  background: #fff;
-  padding: 0;
+.borderClass{
+
 }
-.el-container {
-  padding: 0;
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
 }
-.el-row {
-  margin-bottom: 5px;
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
 }
-.el-row:last-child {
-  margin-bottom: 0;
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
 }
-.tableStyles {
-  background: #0a76a4;
+
+.vxe-textarea--inner {
+  line-height: inherit;
 }
-.my-dropdown {
-  width: 450px;
-  height: 250px;
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
   font-size: 12px;
+  font-weight: bold;
 }
+
+
 </style>
diff --git a/src/views/jhzx/sygd.vue b/src/views/jhzx/sygd.vue
new file mode 100644
index 0000000..9dd82a3
--- /dev/null
+++ b/src/views/jhzx/sygd.vue
@@ -0,0 +1,363 @@
+<template>
+  <el-container>
+    <el-header style="width: 100%; height: 40px;font-size: 12px">
+      <el-form :inline="true"  label-width="65px"  label-position="left">
+        <el-row>
+          <el-col :span="20">
+            <el-form-item label="月份:">
+              <el-select v-model="queryParam.yf" >
+                <el-option
+                  v-for="item in monthList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.valve">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+              <el-button  type="success" @click="sygdPC()" >预排产</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 }"
+              :row-style="rowStyle"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+            </vxe-grid>
+          </div>
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {  getCzxx} from '@/api/jhzx/qfxq'
+import {  getYdjhList,generateMx} from '@/api/jhzx/sygd'
+
+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:'sygd',
+  data() {
+    return {
+      queryParam: {
+        yf:''
+      },
+      monthList:[
+        {
+          name:'一月',
+          valve:'202301'
+        },
+        {
+          name:'二月',
+          valve:'202302'
+        },
+        {
+          name:'三月',
+          valve:'202303'
+        },
+        {
+          name:'四月',
+          valve:'202304'
+        },
+        {
+          name:'五月',
+          valve:'202305'
+        },
+        {
+          name:'六月',
+          valve:'202306'
+        },
+        {
+          name:'七月',
+          valve:'202307'
+        },
+        {
+          name:'八月',
+          valve:'202308'
+        },
+        {
+          name:'九月',
+          valve:'202309'
+        },
+        {
+          name:'十月',
+          valve:'202310'
+        },
+        {
+          name:'十一月',
+          valve:'202311'
+        }
+      ],
+      list: [],
+      isupload:'02',
+      filedis:false,
+      uploadData:{},
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
+      dictData:[],
+      height: '500px',
+      tableColumn: [
+        // { type: 'checkbox', width: 50 },
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+
+        {
+          field: 'dcCh', title: '产品',fixed: "left", width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'dcPl', title: '批量',fixed: "left", width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'dcFd', title: '分段',fixed: "left", width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'gjks', title: '钢加开始',fixed: "left", width: 70,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'gjjsDz', title: '钢加结束大组', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'gjjsXz', title: '钢加结束小组', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        {
+          field: 'tltSl', title: '套料图数量', width: 80,formatter:this.tltformat,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'pzdbK1', title: '一跨平直大板', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'jxbK1', title: '一跨进线板', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'cckbK2', title: '二跨超长超宽板', width: 130,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'cckqK2', title: '二跨超长超宽曲板', width: 140,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'jgqgK2', title: '二跨激光切割板', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'txfK2', title: '二跨T型材腹板', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'txmK2', title: '二跨T型材面板', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'hbK3', title: '三跨厚板', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'qbK3', title: '三跨曲板', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'ptK3', title: '三跨平铁', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'ptbK4', title: '四跨普通板', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'gd', title: '光电', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'xcK7', title: '七跨型材', width: 100,editRender: { name: 'input' },
+          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(){
+      getCzxx({}).then(res=>{
+        this.dictData = res.data
+      })
+    },
+    initList() {
+      if (this.queryParam.yf === '') {
+          this.$message.warning('选择查询月份')
+        return
+      }
+      getYdjhList(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')
+    },
+    rowStyle({row}) {
+      if (row.tltSl===0)
+        return {
+          color: 'red',
+          // textDecoration: 'line-through'
+    };
+      return "";
+    },
+    tltformat({cellValue}){
+      if(cellValue===0){
+        return '无'
+      }
+      return cellValue
+    },
+    getHeight() {
+      this.height = window.innerHeight - 150
+    },
+    sygdPC() {
+      generateMx().then((res) => {
+        console.log(res.data)
+        if (res.success){
+          this.$message.warning('中日程中没有下月信息!')
+        }
+        this.$message.warning('成功!')
+      })
+    }
+  }
+}
+</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;
+
+}
+.mytable{
+
+}
+.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/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
new file mode 100644
index 0000000..2de5831
--- /dev/null
+++ b/src/views/jhzx/symxCX.vue
@@ -0,0 +1,573 @@
+<template>
+  <el-container>
+    <el-header style="width: 100%; height: 70px;font-size: 12px">
+      <el-form :inline="true"  label-width="65px"  label-position="left">
+        <el-row >
+          <el-col :span="19">
+            <el-form-item label="船号:">
+              <el-select v-model="queryParam.dcCh1" filterable  placeholder="工程编号"  >
+                <el-option
+                  v-for="item in dictData"
+                  :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="5" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+              <el-button type="success" @click="initList">保存</el-button>
+              <el-button  type="success" @click="sygdPC()" > 三月明细预排产 </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" >
+            <el-form-item label="跨位:">
+              <el-select v-model="queryParam.dcCh1" filterable  placeholder="工程编号"  >
+                <el-option
+                  v-for="item in dictData"
+                  :key="item.cbbm"
+                  :label="item.cbbm"
+                  :value="item.cbbm">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" >
+            <el-form-item label="时间:">
+            <el-date-picker v-model="queryParam.startTime" value-format="yyyy/MM/dd" type="date"  style="width: 33%" />
+            <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
+            <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" type="date" style="width: 33%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">提取跨位信息</el-button>
+              <el-button type="success" @click="initList">生成三月滚动</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-header>
+    <el-container  style="padding-top: 0px">
+        <el-main>
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="中日程分解" name="first">
+              <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-tab-pane>
+            <el-tab-pane label="跨位生产信息" name="second">
+              <div class="mytable">
+                <vxe-grid
+                  id="id1"
+                  ref="xGrid1"
+                  border
+                  resizable
+                  keep-source
+                  :align="'center'"
+                  :height="height"
+                  :auto-resize="true"
+                  :columns="tableColumn1"
+                  highlight-current-row
+                  :data="list1"
+                  :custom-config="{ storage: true }"
+                  highlight-hover-row
+                  show-overflow
+                  show-header-overflow
+                >
+                </vxe-grid>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+
+        </el-main>
+    </el-container>
+    <!-- 弹出层-->
+    <vxe-modal v-model="dialogVisible" width="600" :title="title">
+      <template #default>
+        <el-row class="query_wrapper">
+          <el-row>
+            <el-button  size="small" style="float: right;margin-bottom: 5px;margin-right: 5px;" type="success" @click="saveByDcch">保存</el-button>
+          </el-row>
+        </el-row>
+        <div class="mytable">
+          <vxe-table
+            ref="tableRef"
+            auto-resize
+            show-header-overflow
+            show-overflow
+            height="300"
+            :row-config="{isHover: true}"
+            :column-config="{resizable: true}"
+            @checkbox-change="checkboxChangeEvent"
+            :data="selectMbch.no_tlt_ch">
+            <vxe-column type="seq" width="50" ></vxe-column>
+            <vxe-column field="dcCh" title="船号" width="150"></vxe-column>
+            <vxe-column align="center" field="dcCh1" title="目标船号" width="300">
+              <template #default="{ row }" >
+                <vxe-select v-model="row.dcCh1" style="width: 80%;height: 30px;margin-bottom: 2px"  transfer>
+                  <vxe-option
+                    v-for="item in haveTltBoms"
+                    :key="item.dcch"
+                    :value="item.dcch"
+                    :label="item.dcch"
+                  />
+                </vxe-select>
+              </template>
+            </vxe-column>
+          </vxe-table>
+        </div>
+      </template>
+    </vxe-modal>
+  </el-container>
+</template>
+
+<script>
+import {  getCzxx} from '@/api/jhzx/qfxq'
+import {  getList,sygdPC,saveByDcch} from '@/api/jhzx/sygd'
+
+
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
+export default {
+  name:'SymxCX',
+  data() {
+    return {
+      dialogVisible:false,
+      title:'选择目标船只',
+      selectMbch:[],
+      haveTltBoms:[],
+      activeName: 'first',
+      queryParam: {
+        dcCh1:'',
+        dcPl:''
+      },
+      list: [],
+      list1: [],
+      heads: { token: getToken() },
+      dictData:[],
+      height: '500px',
+      tableColumn:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: 'dcCh', title: '船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcCh1', title: '目标船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
+        { field: 'dcPl', title: '批量',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcFd', title: '分段号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'lqlb', title: '领取类型',width: 100,formatter: ['dictFormat','CLlQ'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'lx', title: '物资类型',width: 100,formatter:this.formatterLx,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'zl', title: '组立',width: 100,formatter: ['dictFormat','ZLLB'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'kw', title: '跨位',width: 100,formatter: ['dictFormat','QGKW'],
+          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: 'wpxh', title: '材质',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+        { field: 'xcms', title: '型材米数',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+
+        { field: 'jssj', title: '结束时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxcd', title: '划线长度(米)',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgcd', title: '切割长度（米)',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'gjjsDz', title: '钢加大组结束',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'gjjsXz', title: '钢加小组结束',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jsqTlt', title: '套料图接收',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jsqLqb', title: '领取表接收',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dhqd', title: '订货清单号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'zt', title: '状态',width: 70,formatter: ['dictFormat','SYZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'orderBs', title: '订货数量',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'arrivalBs', title: '到货数量',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'ljsl', title: '零件数量',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qy', title: '区域',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        // { field: 'kw', title: '跨位',width: 100,formatter: ['dictFormat','KWXX']},
+        { field: 'slrq', title: '上料日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'slry', title: '上料人员',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        // { field: 'pw', title: '抛丸',width: 100},
+        { field: 'jzbs', title: '矫正标识',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jzsb', title: '矫正设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jzry', title: '矫正人员',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jzrq', title: '矫正日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pw', title: '抛丸',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pwsb', title: '抛丸设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pwry', title: '抛丸人员',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pwrq', title: '抛丸日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+
+        { field: 'hxcdCk', title: '划线空程长度(米)',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxsb', title: '划线设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxry', title: '划线人员',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxrq', title: '划线日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+
+        { field: 'qgcdCk', title: '切割空程长度（米)',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgsb', title: '切割设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgry', title: '切割人员',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgrq', title: '切割日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pklx', title: '坡口类型',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pkcd', title: '坡口长度',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pksb', title: '坡口设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pkry', title: '坡口人员',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pkrq', title: '坡口日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qbs', title: '曲标识',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qjgsb', title: '曲加工设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qjgry', title: '曲加工人员',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qjgrq', title: '曲加工日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dmcd', title: '打磨长度',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dmsb', title: '打磨设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dmry', title: '打磨人员',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dmrq', title: '打磨日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'gjks', title: '钢加开始',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+
+        { field: 'dcCh2', title: '本船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},//没有真实数据时，为空
+        { field: 'gxsj', title: '数据更新时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+  ],
+      tableColumn1:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: '', title: '日期',width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '区域',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '跨位',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        // { field: '', title: '功能定位',width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '设备编号',width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '设备名称',width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        // { field: '', title: '人员',width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
+
+        { field: '', title: '加工数量',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '产能',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', 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()
+  },
+  watch: {
+    '$route'(){
+      this.getParams();
+    }
+  },
+  methods: {
+    saveByDcch(){
+
+      // for (var a of this.selectMbch.no_tlt_ch){
+      //       if(!a.dcCh1){
+      //         this.$message.warning('请为'+a.dcCh+'选择目标船只编号')
+      //         this.dialogVisible=true;
+      //         return
+      //       }
+      // }
+
+      saveByDcch(this.selectMbch).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+
+      })
+      this.dialogVisible=false;
+    },
+    checkboxChangeEvent(){
+      const $table = tableRef.value
+      if ($table) {
+        selectRecords.value = $table.getCheckboxRecords()
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event)
+    },
+    getParams(){
+      var a=[]
+        a= this.$route.params.list
+      if (a===undefined){
+        return;
+      }
+      this.list=a
+      if (this.$refs.xGrid) {
+        this.$refs.xGrid.loadData(this.list)
+      }
+    },
+    formatterLx({cellValue}){
+      if(cellValue==='B'){
+        return '板材'
+      }
+      if (cellValue==='X'){
+        return '型材'
+      }
+      return cellValue
+    },
+    initBase(){
+      getCzxx({}).then(res=>{
+        this.dictData = res.data
+      })
+    },
+    initList() {
+      // if (this.queryParam.dcCh1 === '') {
+      //     this.$message.warning('选择船只编号')
+      //   return
+      // }
+      getList(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')
+    },
+    getHeight() {
+      this.height = window.innerHeight - 220
+    },
+    sygdPC() {
+      //TODO
+      this.$store.dispatch('app/closeSideBar',true)
+      sygdPC().then((res) => {
+        if(res.data.no_tlt){
+          this.selectMbch=res.data
+          this.haveTltBoms=res.data.haveTltBoms
+          this.dialogVisible=true;
+        }else {
+          this.list = res.data.mxList
+          if (this.$refs.xGrid) {
+            this.$refs.xGrid.loadData(this.list)
+          }
+        }
+      })
+    }
+  }
+}
+</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>