diff --git a/package.json b/package.json
index 72b2709..3d180a1 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "dropzone": "5.5.1",
     "echarts": "4.2.1",
     "element-ui": "2.13.2",
+    "exceljs": "^4.4.0",
     "file-saver": "^2.0.5",
     "fuse.js": "3.4.4",
     "js-cookie": "2.2.0",
@@ -49,6 +50,7 @@
     "vuedraggable": "2.20.0",
     "vuex": "3.1.0",
     "vxe-table": "^3.4.14",
+    "vxe-table-plugin-export-xlsx": "^2.3.1",
     "xe-utils": "^3.2.1",
     "xlsx": "^0.14.1"
   },
diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js
index 316957d..3fcdbc7 100644
--- a/src/api/jhzx/sygd.js
+++ b/src/api/jhzx/sygd.js
@@ -2,7 +2,11 @@ import request from '@/utils/request'
 
 export function getList(data) {return request({url: '/dmSygdMx/getList', method: 'post', data})}
 export function getSygdList(data) {return request({url: '/dmSygd/getList', method: 'post', data})}
+export function tj(data) {return request({url: '/dmSygd/tj', method: 'post', data})}
+export function sh(data) {return request({url: '/dmSygd/sh', 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})}
-export function getKwList(data) {return request({url: '/dmSygdMx/getKwList', method: 'post', data})}
+export function symxhz(data) {return request({url: '/dmSygdMx/symxhz', method: 'post', data})}
 export function tqSygd() {return request({url: '/dmSygdMx/tqSygd', method: 'post'})}
+export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})}
+export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})}
diff --git a/src/components/RightPanel/index.vue b/src/components/RightPanel/index.vue
index 55e8c1e..4c0ebed 100644
--- a/src/components/RightPanel/index.vue
+++ b/src/components/RightPanel/index.vue
@@ -2,9 +2,9 @@
   <div ref="rightPanel" :class="{show:show}" class="rightPanel-container">
     <div class="rightPanel-background" />
     <div class="rightPanel">
-      <div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show">
-        <i :class="show?'el-icon-close':'el-icon-setting'" />
-      </div>
+<!--      <div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show">-->
+<!--        <i :class="show?'el-icon-close':'el-icon-setting'" />-->
+<!--      </div>-->
       <div class="rightPanel-items">
         <slot />
       </div>
diff --git a/src/main.js b/src/main.js
index 907be40..aca8131 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,6 +24,8 @@ import 'xe-utils'
 import VXETable from 'vxe-table'
 import 'vxe-table/lib/style.css'
 import cal from './utils/calculation'
+import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
+VXETable.use(VXETablePluginExportXLSX)
 Vue.prototype.cal = cal
 Vue.use(VXETable)
 import print from './utils/print' //能不能单独引用
diff --git a/src/settings.js b/src/settings.js
index 558fc42..2c578f5 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: '计划排产',
+  title: '钢加计划排产',
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/jhzx/sygdCX.vue b/src/views/jhzx/sygdCX.vue
index 21fe659..11f143b 100644
--- a/src/views/jhzx/sygdCX.vue
+++ b/src/views/jhzx/sygdCX.vue
@@ -1,22 +1,29 @@
 <template>
   <el-container>
-    <el-header style="width: 100%; height: 80px;font-size: 12px">
+    <el-header style="width: 100%; height: 50px;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="工程编号"  >
+            <el-form-item  >
+              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
+              <el-date-picker v-model="queryParam.beginTime" 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-form-item label="状态:">
+              <el-select
+                v-model="queryParam.gdZt"
+                placeholder="状态"
+              >
                 <el-option
-                  v-for="item in dictData"
-                  :key="item.cbbm"
-                  :label="item.cbbm"
-                  :value="item.cbbm">
+                  v-for="item in gdZtOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </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" >
@@ -74,15 +81,28 @@ export default {
   data() {
     return {
       queryParam: {
-        dcCh:'',
-        dcPl:''
+        beginTime:'2023/08/01',
+        endTime:'2023/10/01',
+        gdZt:''
       },
+      gdZtOptions:[
+        {
+          value: "0",
+          label: "编辑",
+        },
+        {
+          value: "1",
+          label: "提交",
+        },
+        {
+          value: "2",
+          label: "审核",
+        },
+      ],
       list: [],
-      isupload:'02',
       filedis:false,
       uploadData:{},
       heads: { token: getToken() },
-      uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
       dictData:[],
       height: '500px',
       tableColumn:[
@@ -320,59 +340,8 @@ export default {
     this.getHeight()
     this.initBase()
   },
-  watch: {
-    '$route'(){
-      this.getParams();
-    }
-  },
   methods: {
-    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)
-      }
-    },
-    uploadExcel() {
-      this.uploadData.isupload = this.isupload
-    },
     cellClickEvent  ( column )  {
-
-      // 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
-    },
-    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)
-        }
-
-      } else {
-        Message({
-          message: res.message || 'Error',
-          type: 'error',
-          duration: 5 * 1000
-        })
-      }
     },
     initBase(){
       getCzxx({}).then(res=>{
@@ -380,8 +349,8 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcCh1 === '') {
-          this.$message.warning('选择船只编号')
+      if (this.queryParam.beginTime === ''||this.queryParam.endTime === '') {
+        this.$message.warning('选择时间范围')
         return
       }
       getSygdList(this.queryParam).then((res) => {
diff --git a/src/views/jhzx/sygdSH.vue b/src/views/jhzx/sygdSH.vue
new file mode 100644
index 0000000..e2c939b
--- /dev/null
+++ b/src/views/jhzx/sygdSH.vue
@@ -0,0 +1,536 @@
+<template>
+  <el-container>
+    <el-header style="width: 100%; height: 50px;font-size: 12px">
+      <el-form :inline="true"  label-width="65px"  label-position="left">
+        <el-row>
+          <el-col :span="15">
+            <el-form-item  >
+              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
+              <el-date-picker v-model="queryParam.beginTime" 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-form-item label="状态:" >
+              <el-select
+                v-model="queryParam.gdZt"
+                placeholder="状态"
+                clearable
+                disabled
+              >
+                <el-option
+                  v-for="item in gdZtOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+              <el-button type="success" @click="tj">退回</el-button>
+              <el-button type="success" @click="sh">审核</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10" :offset="14">
+            <el-form-item style="float: right" >
+
+            </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"
+              :data="list"
+              :custom-config="{ storage: true }"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+              @checkbox-all="selectAllEvent"
+              @checkbox-change="selectChangeEvent"
+            >
+            <!--              show-header-overflow-->
+            </vxe-grid>
+          </div>
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {  getCzxx} from '@/api/jhzx/qfxq'
+import {getSygdList,tj,sh} 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:'SygdSH',
+  data() {
+    return {
+      queryParam: {
+        beginTime:'2023/08/01',
+        endTime:'2023/10/01',
+        gdZt:'1'
+      },
+      gdZtOptions:[
+        {
+          value: "0",
+          label: "编辑",
+        },
+        {
+          value: "1",
+          label: "提交",
+        },
+        {
+          value: "2",
+          label: "审核",
+        },
+      ],
+      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: '船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcPl', title: '批量号',width: 70,
+          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: '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: 'gdZt', 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: 'arrivalB', title: '到货板数',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'tltSl', title: '套料图板数',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'slSl', title: '上料张数',width: 80,filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'slSj', title: '上料时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pwSl', title: '抛丸数量',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pwSj', title: '抛丸时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'xcpwSl', title: '型材抛丸',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'xcpwSj', title: '型材抛丸时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n1ad', title: '1跨平直大板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n1adSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n1ax', title: '1跨平直大板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n1axSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n1ld', title: '1跨进线板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n1ldSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2bd', title: '2跨超长超宽板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2bdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2bx', title: '2跨超长超宽板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2bxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2cx', title: '2跨超长超宽曲板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2cxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2cd', title: '2跨超长超宽曲板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2cdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2tx', title: '2跨T型材腹板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2txSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2td', title: '2跨T型材腹板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2tdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2jx', title: '2跨激光切割板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2jxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2jd', title: '2跨激光切割板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n2jdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n3cx', title: '3跨曲板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n3cxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n3cd', title: '3跨曲板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n3cdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n3hx', title: '3跨厚板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n3hxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n3hd', title: '3跨厚板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n3hdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n4px', title: '4跨普通板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n4pxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n4pd', title: '4跨普通板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n4pdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n4xx', title: '4跨普通板（机器人）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n4xxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n8gx', title: '光电',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'n8gxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'x7xx', title: '7跨型板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'x7xxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'x7xd', title: '7跨型板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'x7xdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's2tx', title: '2跨T型材面板（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's2txSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's2td', title: '2跨T型材面板（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's2tdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's3px', title: '3跨平铁（小组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's3pxSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's3pd', title: '3跨平铁（大组）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's3pdSj', title: '加工时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's3xx', title: '3跨平铁（机器人）',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 's3xxSj', 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: 'jhwgDz', title: '计划大组完成时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jhwgXz', title: '计划小组完成时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'sjlyCh', 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', }},
+
+  ],
+      checkedList: [],
+
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+  },
+  watch: {
+    '$route'(){
+      this.getParams();
+    }
+  },
+  methods: {
+    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)
+      }
+    },
+    handleExport() {
+      this.$refs.xGrid.exportData({
+        filename: '三月滚动计划',// 文件名字
+        sheetName: 'Sheet1',
+        type: 'xlsx',//导出文件类型 xlsx 和 csv
+        data: this.data, // 数据源
+        // 过滤那个字段导出
+        // columnFilterMethod: function(column, $columnIndex) {
+        //   return !(column.$columnIndex === 0 )
+        //   // 0是复选框 不导出
+        // }
+      })
+    },
+    uploadExcel() {
+      this.uploadData.isupload = this.isupload
+    },
+    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.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+
+      } else {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      }
+    },
+    initBase(){
+      getCzxx({}).then(res=>{
+        this.dictData = res.data
+      })
+    },
+    initList() {
+      if (this.queryParam.beginTime === ''||this.queryParam.endTime === '') {
+        this.$message.warning('选择时间范围')
+        return
+      }
+      getSygdList(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+
+      })
+    },
+    tj(){
+      tj(this.checkedList).then((res)=>{
+        if (res){
+          this.$message({ message: '提交成功', type: 'success' })
+          this.initList()
+        }
+      })
+    },
+    sh(){
+      sh(this.checkedList).then((res)=>{
+        if (res){
+          this.$message({ message: '审核成功', type: 'success' })
+          this.initList()
+        }
+      })
+    },
+    formatDate ({ cellValue }) {
+      return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+  }
+}
+</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/sygdWH.vue
similarity index 89%
rename from src/views/jhzx/sydgWH.vue
rename to src/views/jhzx/sygdWH.vue
index 1a3eae7..7552280 100644
--- a/src/views/jhzx/sydgWH.vue
+++ b/src/views/jhzx/sygdWH.vue
@@ -1,33 +1,42 @@
 <template>
   <el-container>
-    <el-header style="width: 100%; height: 80px;font-size: 12px">
+    <el-header style="width: 100%; height: 50px;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="工程编号"  >
+          <el-col :span="15" >
+            <el-form-item  style="margin-left: 4px;">
+              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
+              <el-date-picker v-model="queryParam.beginTime" 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-form-item label="状态:" >
+              <el-select
+                v-model="queryParam.gdZt"
+                placeholder="状态"
+                clearable
+                disabled
+              >
                 <el-option
-                  v-for="item in dictData"
-                  :key="item.cbbm"
-                  :label="item.cbbm"
-                  :value="item.cbbm">
+                  v-for="item in gdZtOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </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-col :span="9">
             <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="sygdPC()" >导出excel</el-button>
+              <el-button type="success" @click="tj">提交</el-button>
+              <el-button
+                class="out-item"
+                type="primary"
+                icon="el-icon-download"
+                @click="handleExport"
+              >导出</el-button>
               <div style="float: right;margin-left: 5px" >
                 <el-upload
                   :action="uploadAction"
@@ -38,12 +47,19 @@
                   :disabled="filedis"
                   :headers="heads"
                 >
-                  <el-button type="success" @click="uploadExcel" >Excel导入</el-button>
+                  <el-button type="success" @click="uploadExcel" >导入</el-button>
                 </el-upload>
               </div>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="10" :offset="14">
+            <el-form-item style="float: right" >
+
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </el-header>
     <el-container  style="padding-top: 0px">
@@ -65,7 +81,8 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
-              @cell-click="cellClickEvent"
+              @checkbox-all="selectAllEvent"
+              @checkbox-change="selectChangeEvent"
             >
             <!--              show-header-overflow-->
             </vxe-grid>
@@ -78,7 +95,7 @@
 
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList} from '@/api/jhzx/sygd'
+import {getSygdList,tj} from '@/api/jhzx/sygd'
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -86,13 +103,28 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 export default {
-  name:'SydgWH',
+  name:'SygdWH',
   data() {
     return {
       queryParam: {
-        dcCh:'',
-        dcPl:''
+        beginTime:'2023/08/01',
+        endTime:'2023/10/01',
+        gdZt:'0'
       },
+      gdZtOptions:[
+        {
+          value: "0",
+          label: "编辑",
+        },
+        {
+          value: "1",
+          label: "提交",
+        },
+        {
+          value: "2",
+          label: "审核",
+        },
+      ],
       list: [],
       isupload:'02',
       filedis:false,
@@ -102,6 +134,7 @@ export default {
       dictData:[],
       height: '500px',
       tableColumn:[
+        { type: 'checkbox', width: 50 ,},
         { type: 'seq', width: 60, title: '序号',fixed: "left"},
         { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -324,8 +357,8 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
 
-  ]
-
+  ],
+      checkedList: [],
     }
   },
   computed: {
@@ -353,15 +386,23 @@ export default {
         this.$refs.xGrid.loadData(this.list)
       }
     },
+    handleExport() {
+      this.$refs.xGrid.exportData({
+        filename: '三月滚动计划',// 文件名字
+        sheetName: 'Sheet1',
+        type: 'xlsx',//导出文件类型 xlsx 和 csv
+        data: this.data, // 数据源
+        // 过滤那个字段导出
+        // columnFilterMethod: function(column, $columnIndex) {
+        //   return !(column.$columnIndex === 0 )
+        //   // 0是复选框 不导出
+        // }
+      })
+    },
     uploadExcel() {
       this.uploadData.isupload = this.isupload
     },
-    cellClickEvent  ( column )  {
-
-      // 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'
@@ -396,8 +437,8 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcCh1 === '') {
-          this.$message.warning('选择船只编号')
+      if (this.queryParam.beginTime === ''||this.queryParam.endTime === '') {
+        this.$message.warning('选择时间范围')
         return
       }
       getSygdList(this.queryParam).then((res) => {
@@ -408,13 +449,34 @@ export default {
 
       })
     },
+    tj(){
+      tj(this.checkedList).then((res)=>{
+        if (res){
+          this.$message({ message: '提交成功', type: 'success' })
+          this.initList()
+        }
+      })
+    },
     formatDate ({ cellValue }) {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
       this.height = window.innerHeight - 190
     },
+    // 全选
+    selectAllEvent() {
+      console.log(123)
+      const records = this.$refs.xGrid.getCheckboxRecords();
 
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      console.log(1456)
+      const records = this.$refs.xGrid.getCheckboxRecords();
+
+      this.checkedList = records;
+    },
   }
 }
 </script>
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index f7a23b3..eb49d0c 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -1,57 +1,21 @@
 <template>
   <el-container>
-    <el-header style="width: 100%; height: 70px;font-size: 12px">
+    <el-header style="width: 100%; height: 35px;font-size: 12px">
       <el-form :inline="true"  label-width="65px"  label-position="left">
         <el-row >
-          <el-col :span="4" >
-            <el-form-item label="船号:">
-              <el-select v-model="queryParam.dcCh" 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="15">
+          <el-col :span="15" >
             <el-form-item  >
-              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">结束时间:</span>
+              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
               <el-date-picker v-model="queryParam.beginTime" 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="5" >
+          <el-col :span="9" >
             <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="saveByDcch1">保存</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="14" >
-            <el-form-item label="批量:">
-              <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10" >
-            <el-form-item style="float: right" >
-              <el-button type="success" @click="getKwList">提取跨位信息</el-button>
               <el-button type="success" @click="tqSygd">生成三月滚动</el-button>
             </el-form-item>
           </el-col>
@@ -63,6 +27,7 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="中日程分解" name="first">
               <div class="mytable">
+                <el-button type="success" @click="symxhz">汇总</el-button>
                 <vxe-grid
                   id="id"
                   ref="xGrid"
@@ -76,20 +41,20 @@
                   highlight-current-row
                   :data="list"
                   :custom-config="{ storage: true }"
+                  :edit-config="{
+                            trigger: 'click',
+                            mode: 'row',
+                            showStatus: true,
+                          }"
                   @checkbox-all="selectAllEvent"
                   @checkbox-change="selectChangeEvent"
                   highlight-hover-row
                   show-overflow
-                  show-header-overflow
-
                 >
-
-
                 </vxe-grid>
               </div>
             </el-tab-pane>
-
-            <el-tab-pane label="跨位生产信息" name="second">
+            <el-tab-pane label="线表信息" name="second">
               <div class="mytable">
                 <vxe-grid
                   id="id1"
@@ -104,18 +69,120 @@
                   highlight-current-row
                   :data="list1"
                   :custom-config="{ storage: true }"
+                  :span-method="rowspanMethod"
+                  :cell-style="cellStyle"
                   highlight-hover-row
                   show-overflow
                   show-header-overflow
+                  @cell-click="cellClickEvent_xb"
+                >
+                </vxe-grid>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="批量信息" name="third">
+              <div class="mytable">
+                <vxe-grid
+                  id="id2"
+                  ref="xGrid2"
+                  border
+                  resizable
+                  keep-source
+                  :align="'center'"
+                  :height="height"
+                  :auto-resize="true"
+                  :columns="tableColumn2"
+                  highlight-current-row
+                  :data="list2"
+                  :custom-config="{ storage: true }"
+                  :cell-style="cellStyle"
+                  highlight-hover-row
+                  show-overflow
+                  show-header-overflow
+                  @cell-click="cellClickEvent_xb"
+                >
+                </vxe-grid>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="图纸信息" name="fourth">
+              <div class="mytable">
+                <vxe-grid
+                  id="id3"
+                  ref="xGrid3"
+                  border
+                  resizable
+                  keep-source
+                  :align="'center'"
+                  :height="height"
+                  :auto-resize="true"
+                  :columns="tableColumn3"
+                  highlight-current-row
+                  :data="list3"
+                  :custom-config="{ storage: true }"
+                  :span-method="rowspanMethod"
+                  :cell-style="cellStyle"
+                  :scroll-y="{enabled: false}"
+                  highlight-hover-row
+                  show-overflow
+                  show-header-overflow
+                  @cell-click="cellClickEvent_xb"
+                >
+                </vxe-grid>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="到货信息" name="fifth">
+              <div class="mytable">
+                <vxe-grid
+                  id="id4"
+                  ref="xGrid4"
+                  border
+                  resizable
+                  keep-source
+                  :align="'center'"
+                  :height="height"
+                  :auto-resize="true"
+                  :columns="tableColumn4"
+                  highlight-current-row
+                  :data="list4"
+                  :custom-config="{ storage: true }"
+                  :cell-style="cellStyle"
+                  highlight-hover-row
+                  show-overflow
+                  show-header-overflow
+                  @cell-click="cellClickEvent_xb"
+                >
+                </vxe-grid>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="跨位生产信息" name="sixth">
+              <div class="mytable">
+                <vxe-grid
+                  id="id5"
+                  ref="xGrid5"
+                  border
+                  resizable
+                  keep-source
+                  :align="'center'"
+                  :height="height"
+                  :auto-resize="true"
+                  :columns="tableColumn5"
+                  highlight-current-row
+                  :data="list5"
+                  :custom-config="{ storage: true }"
+                  :span-method="rowspanMethod"
+                  :cell-style="cellStyle"
+                  :scroll-y="{enabled: false}"
+                  highlight-hover-row
+                  show-overflow
+                  show-header-overflow
+                  @cell-click="cellClickEvent_xb"
                 >
                 </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">
@@ -151,226 +218,375 @@
         </div>
       </template>
     </vxe-modal>
+    <!-- 弹出层——展示明细-->
+    <vxe-modal v-model="dialogVisible1" width="80%" :title="title1">
+      <template #default>
+        <el-row class="query_wrapper">
+          <el-row>
+            <span style="font-size: 13px;color: red; margin-left: 4px;"> * 表中红色数据取自其他船只</span>
+            <el-button  size="small" style="float: right;margin-bottom: 5px;margin-right: 5px;" type="success" @click="save">保存</el-button>
+          </el-row>
+        </el-row>
+        <div class="mytable">
+          <vxe-grid
+            id="id6"
+            ref="tableRef1"
+            border
+            resizable
+            keep-source
+            :align="'center'"
+            :height="height"
+            :auto-resize="true"
+            :columns="tableColumn6"
+            highlight-current-row
+            :data="mxList"
+            :custom-config="{ storage: true }"
+            :edit-config="{
+                            trigger: 'click',
+                            mode: 'row',
+                            showStatus: true,
+                          }"
+            @checkbox-all="selectAllEvent"
+            @checkbox-change="selectChangeEvent"
+            :cell-style="cellStyle1"
+            :header-cell-style="headerCellStyle"
+            highlight-hover-row
+            show-overflow
+          >
+          </vxe-grid>
+        </div>
+      </template>
+    </vxe-modal>
   </el-container>
 </template>
-
 <script>
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {  getList,sygdPC,saveByDcch,getKwList,tqSygd} from '@/api/jhzx/sygd'
+import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList} from '@/api/jhzx/sygd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import { getToken } from '@/utils/auth'
+import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
+import {emSbjbbZM} from "@/api/sjzx/sbcnWH";
 export default {
   name:'SymxCX',
+  components: {ScrollPane},
   data() {
     return {
       dialogVisible:false,
+      dialogVisible1:false,
       title:'选择目标船只',
+      title1:'修改明细信息',
       selectMbch:[],
+      mxList:[],
       haveTltBoms:[],
       activeName: 'first',
       queryParam: {
-        dcCh:'',
-        dcPl:'',
-        beginTime:'',
-        endTime:''
+        beginTime:'2023/08/01',
+        endTime:'2023/10/01'
       },
       list: [],
       list1: [],
+      list2: [],
+      list3: [],
+      list4: [],
+      list5: [],
       checkedList: [],
       heads: { token: getToken() },
       dictData:[],
+      sbxx:{},
       height: '500px',
       tableColumn:[
-        { type: "checkbox", width: 50 },
         { 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: 80,
+        { field: 'dcCh1', title: '目标船号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
         { field: 'dcPl', title: '批量',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'dcFd', title: '分段号',width: 80,
+        { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'lqlb', title: '领取类型',width: 80,formatter: ['dictFormat','CLlQ'],
+        { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'lx', title: '物资类型',width: 80,formatter:this.formatterLx,
+        { field: 'jssj', title: '组立结束时间',width: 110,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
+        { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
         { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'tzbh', title: '套料图号',width: 80,
+        { field: 'tzbh', title: '套料图号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
         { field: 'wpgg', title: '规格',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
+        { field: 'bcshzl', title: '重量',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
         { field: 'wpxh', title: '材质',width: 80,
           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,
+        // { field: 'jsqLqb', 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: 'dhqd', title: '订货清单号',width: 100,
+        //   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: 'jzbs', 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: 'hxcdKc', 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,
+        { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsXz', title: '钢加小组结束',width: 100,
+        // { field: 'qy', title: '区域',width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
+        { field: 'slrq', title: '上料计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'jsqTlt', title: '套料图接收',width: 80,
+        { field: 'pwrq', title: '抛丸计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'jsqLqb', title: '领取表接收',width: 100,
+        { field: 'hxrq', title: '划线计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'dhqd', title: '订货清单号',width: 100,
+        { field: 'qgrq', 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'],
+        // { 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: 'jzsb', title: '矫正设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        // { 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'  },editRender: { name: "$select",options: [],props: { clearable: true}}},
+        // { field: 'pwry', 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', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        // { field: 'hxry', 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', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        // { field: 'qgry', 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: 'orderBs', title: '订货数量',width: 80,
+        { field: 'pkcd', title: '坡口长度',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'arrivalBs', title: '到货数量',width: 80,
+        { field: 'pksb', title: '坡口设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        // { 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: 'ljsl', title: '零件数量',width: 100,
+        { field: 'qbs', title: '曲标识',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'qy', title: '区域',width: 100,
+        { field: 'qjgsb', title: '曲加工设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        // { 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: 'kw', title: '跨位',width: 100,formatter: ['dictFormat','KWXX']},
-        { field: 'slrq', title: '上料日期',width: 100,
+        { field: 'dmcd', title: '打磨长度',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'pwrq', title: '抛丸日期',width: 100,
+        { field: 'dmsb', title: '打磨设备',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        // { 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: 'hxrq', title: '划线日期',width: 100,
+        { field: 'gjjsDz', title: '钢加大组结束',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'qgrq', title: '切割日期',width: 100,
+        { field: 'gjjsXz', title: '钢加小组结束',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'slry', title: '上料人员',width: 100,
+        { field: 'ljsl', 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,
+        { field: 'gjks', title: '钢加开始',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'jzsb', title: '矫正设备',width: 100,
+        { field: 'dcCh2', 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: 'jzry', title: '矫正人员',width: 100,
+        { field: 'gxsj', title: '数据更新时间',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'jzrq', title: '矫正日期',width: 100,
+  ],
+      tableColumn1:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: 'nf', title: '年份',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'pw', title: '抛丸',width: 100,
+        { field: 'yf', title: '月份',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'pwsb', title: '抛丸设备',width: 100,
+        { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'pwry', title: '抛丸人员',width: 100,
+        { field: 'zl', title: '线表重量',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-
-
-        { field: 'hxcdKc', title: '划线空程长度(米)',width: 100,
+        { field: 'tlt_zl', title: '套料图（排产）重量',width: 150,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'hxsb', title: '划线设备',width: 100,
+      ],
+      tableColumn2:[
+        { 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: 'hxry', title: '划线人员',width: 100,
+        { field: 'dcPl', title: '批量',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-
-
-        { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
+        { field: 'dcFd', title: '分段',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'qgsb', title: '切割设备',width: 100,
+        { field: 'dzjsq', title: '批量表（钢加大组结束）',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'qgry', title: '切割人员',width: 100,
+        { field: 'jsq_dz_pc', title: '排产（钢加大组结束）',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-
-        { field: 'pklx', title: '坡口类型',width: 100,
+        // { field: '', title: '时间差',width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
+        { field: 'xzjsq', title: '批量表（钢加小组结束）',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'pkcd', title: '坡口长度',width: 100,
+        { field: 'jsq_xz_pc', title: '排产（钢加小组结束）',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'pksb', title: '坡口设备',width: 100,
+        // { field: '', title: '时间差',width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
+      ],
+      tableColumn3: [
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: 'tzxqq', title: '图纸需求期',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'pkry', title: '坡口人员',width: 100,
+        { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'pkrq', title: '坡口日期',width: 100,
+        { field: 'dcPl', title: '批量',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'qbs', title: '曲标识',width: 100,
+        { field: 'dcFd', title: '分段',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'qjgsb', title: '曲加工设备',width: 100,
+        { field: 'xfqLqb', title: '领取表下发 ',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'qjgry', title: '曲加工人员',width: 100,
+        { field: 'jsqLqb', title: '领取表接收',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'qjgrq', title: '曲加工日期',width: 100,
+        { field: 'xfqTlt', title: '套料图下发 ',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'dmcd', title: '打磨长度',width: 100,
+        { field: 'jsqTlt', title: '套料图接收',width: 180,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'dmsb', title: '打磨设备',width: 100,
+
+      ],
+      tableColumn4:[
+        { 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: 'dmry', title: '打磨人员',width: 100,
+        { field: 'dcPl', title: '批量',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'dmrq', title: '打磨日期',width: 100,
+        { field: 'dhqd', title: '订货清单号',width: 150,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'gjks', title: '钢加开始',width: 100,
+        { field: 'rkxh', title: '材质',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-
-        { field: 'dcCh2', title: '本船号',width: 100,
+        { field: 'wphd', title: '厚度',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},//没有真实数据时，为空
-        { field: 'gxsj', title: '数据更新时间',width: 100,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wpkd', title: '宽度',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-  ],
-      tableColumn1:[
+        { field: 'wpcd', title: '长度',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hdsl', title: '到货数量',width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'gcxqq', title: '钢材需求期',width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+      ],
+      tableColumn5:[
         { type: 'seq', width: 60, title: '序号',fixed: "left"},
         { field: 'rq', title: '日期',width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -409,8 +625,192 @@ export default {
         // { field: '', title: '产能单位',width: 100,
         //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
         //   filterRender: { name: 'FilterCombination', }},
-      ]
+      ],
+      tableColumn6:[
+        { 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: 'dcPl', title: '批量',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'tzbh', title: '套料图号',width: 90,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wpgg', title: '规格',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jssj', title: '组立结束时间',width: 110,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { 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' },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        { field: 'slrq', 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' },editRender: { name: "$select",options: [],props: { clearable: true} } },
+        { field: 'pwrq', 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: 'hxcdKc', 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', },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        { field: 'hxrq', 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: 'qgcdKc', 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', },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        { 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', },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        { 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', },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        { 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', },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        { field: 'dmrq', title: '打磨计划日期',width: 100,
+          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: 'jsqTlt', title: '套料图接收',width: 80,
+        //   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: '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: 'qy', 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: '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: 'pwry', 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: 'qgry', 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: 'qjgry', 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: '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: 'ljsl', 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: 'dcFd', 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: 'dcCh1', title: '目标船号',width: 90,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
+        { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
+          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: 'bcshzl', title: '重量',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wpxh', title: '材质',width: 80,
+          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: 'gxsj', title: '数据更新时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+      ],
     }
   },
   computed: {
@@ -421,17 +821,104 @@ export default {
     this.getHeight()
     this.initBase()
   },
+  mounted(){
 
+  },
   methods: {
+    //汇总
+    symxhz(){
+
+      if (this.list.length<1){
+        this.$message.warning('请先查询需要汇总的信息！');
+        return
+      }
+      symxhz(this.list).then((res) => {
+        if (res.data) {
+          console.log(res.data)
+          this.list1=res.data.xbList
+          this.list2=res.data.plList
+          this.list3=res.data.tzList
+          this.list4=res.data.dhList
+          this.list5=res.data.kwList
+        }
+      })
+    },
+    //合并行
+    rowspanMethod({ row, _rowIndex, column, visibleData }){
+      //不要忘记在vxe-grid上配置  :scroll-y="{enabled: false}" 防止下拉时样式变化
+// 需要合并的列字段
+      let fields = ['nf','yf','rq','tzxqq'];// 需要合并的列
+      const cellValue = row[column.property];// 合并行的相同的唯一标识
+      if (cellValue && fields.includes(column.property)) {
+        const prevRow = visibleData[_rowIndex - 1];
+        let nextRow = visibleData[_rowIndex + 1];
+        if (prevRow && prevRow[column.property] === cellValue) {
+          // 如果和第一行数据一样，就删除
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          // 获取有机会数据是一样的
+          let countRowspan = 1;
+          while (nextRow && nextRow[column.property] === cellValue) {
+            nextRow = visibleData[++countRowspan + _rowIndex];
+          }
+          if (countRowspan > 1) {
+            return { rowspan: countRowspan, colspan: 1 };
+          }
+        }
+      }
+    },
+   //明细修改弹窗
+    cellClickEvent_xb(row){
+      this.mxList=row.row.mxList
+      this.dialogVisible1=true
+      // const tableRef = this.$refs.tableRef1;
+      // this.sbmx1(tableRef)
+    },
+    sbmx1(tableRef){
+      this.sbmx("jzsb",this.sbxx.jp,tableRef)
+      this.sbmx("pwsb",this.sbxx.pw,tableRef)
+      this.sbmx("hxsb",this.sbxx.hx,tableRef)
+      this.sbmx("qgsb",this.sbxx.qg,tableRef)
+      this.sbmx("pksb",this.sbxx.pk,tableRef)
+      this.sbmx("dmsb",this.sbxx.dm,tableRef)
+      this.sbmx("qjgsb",this.sbxx.qjg,tableRef)
+    },
+    //区分汇总数据
+    cellStyle({ row, column, rowIndex, columnIndex }){
+      let fields = ['tlt_zl','jsq_dz_pc','jsq_xz_pc','tzxqq','tlt_sl','hx_cd','qg_cd','gcxqq'];
+      if (fields.includes(column.property)) {
+        return {
+          color: '#CC8B04',
+          cursor:'pointer'
+        }
+      }
+    },
+    //明细修改弹窗，区分是否本船只
+    cellStyle1({ row }){
+      if (row.dcCh1) {
+        return {
+          color: 'red',
+          cursor:'pointer'
+        }
+      }
+
+    },
+    //明细修改弹窗，可修改列
+    headerCellStyle({ column }){
+      let fields = ['jzsb','pwsb','hxsb','qgsb','pksb','dmsb','qjgsb'];
+      if (fields.includes(column.field)) {
+        return {
+          backgroundColor: 'lightblue',
+          cursor:'pointer'
+        }
+      }
+    },
+    //提取三月滚动
     tqSygd(){
-    //   if (!this.checkedList){
-    //     this.$message.warning('请选择生成内容！');
-    //     return
-    //   }
       tqSygd().then((res) => {
         if (res.data) {
           this.$router.push({
-            name: 'SygdCX',
+            name: 'SygdWH',
             params: {
               list: res.data
             }
@@ -451,51 +938,50 @@ export default {
       const records = this.$refs.xGrid.getCheckboxRecords();
       this.checkedList = records;
     },
-    getKwList(){
-      if (!this.checkedList){
-        this.$message.warning('请选择提取内容！');
-        return
-      }
-      getKwList(this.checkedList).then((res) => {
-        this.list1 = res.data
-        if (this.$refs.xGrid1) {
-          this.$refs.xGrid1.loadData(this.list1)
-          this.activeName='second'
-        }
-
-      })
-    },
+    //明细排产时，弹窗选择目标船只
     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)
-      // console.log(event)
-      console.log(this.activeName)
+    //修改明细信息；根据修改后的设备信息；重新排计划期
+    save(){
+      this.$message.warning('保存成功！');
+      this.dialogVisible1=false;
+      // saveMxList(this.mxList).then((res) => {
+      //
+      // })
+
     },
+    //切换数据表点击事件
+    handleClick(tab, event) {
+      if(this.activeName==='second'){
+        // alert('线表计划')
+
+      }
+      if(this.activeName==='third'){
+        // alert('批量表')
+
+      }
+      if(this.activeName==='fourth'){
+        // alert('图纸')
+
+      }
+      if(this.activeName==='fifth'){
+        // alert('到货')
+        if (this.list.length>0){
 
+        }
+      }
+      if(this.activeName==='sixth'){
+          console.log(this.list5)
+      }
+    },
+    //材料类型转码
     formatterLx({cellValue}){
       if(cellValue==='B'){
         return '板材'
@@ -505,14 +991,37 @@ export default {
       }
       return cellValue
     },
+    //转码信息
     initBase(){
       getCzxx({}).then(res=>{
         this.dictData = res.data
       })
+      getCnsb().then(res=>{
+        this.sbxx = res.data
+        const tableRef = this.$refs.xGrid.getColumnByField('dcCh');
+        // this.sbmx1(tableRef)
+        // this.sbmx("jzsb",this.sbxx.jp,tableRef)
+      })
+
+
+    },
+    sbmx(sbmc,list,tableRef){
+      var arr = [];
+      const sb = tableRef.getColumnByField(sbmc);
+      for (let i = 0; i < list.length; i++) {
+        const temp = {
+          label: list[i].sbmc,
+          value: list[i].sbbh,
+        };
+        arr.push(temp);
+      }
+      sb.editRender.options = arr;
+
     },
+    //初始化表1 数据
     initList() {
-      if (this.queryParam.dcCh1 === '') {
-          this.$message.warning('选择船只编号')
+      if (this.queryParam.beginTime === ''||this.queryParam.endTime === '') {
+          this.$message.warning('选择时间范围')
         return
       }
       getList(this.queryParam).then((res) => {
@@ -522,15 +1031,16 @@ export default {
         }
 
       })
+      this.activeName='first'
     },
     formatDate ({ cellValue }) {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
-      this.height = window.innerHeight - 220
+      this.height = window.innerHeight - 200
     },
+    //明细排产
     sygdPC() {
-      //TODO
       this.$store.dispatch('app/closeSideBar',true)
       sygdPC().then((res) => {
         if(res.data.no_tlt){
@@ -544,6 +1054,7 @@ export default {
           }
         }
       })
+      this.activeName='first'
     }
   }
 }
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index b94f380..6480456 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -1,7 +1,7 @@
 <template>
 <!--  月度计划管理 -->
   <el-container>
-    <el-header style="width: 100%; height: 80px;font-size: 12px">
+    <el-header style="width: 100%; height: 50px;font-size: 12px">
       <el-form :inline="true"  label-width="65px"  label-position="left">
         <el-row>
           <el-col :span="22">
@@ -28,20 +28,20 @@
         <el-row>
           <el-col :span="10" :offset="14">
             <el-form-item style="float: right" >
-              <el-button  type="success" @click="sygdPC()" >导出excel</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-button  type="success" @click="sygdPC()" >导出excel</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>
diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue
new file mode 100644
index 0000000..47d92d1
--- /dev/null
+++ b/src/views/jhzx/ydjhzxXF.vue
@@ -0,0 +1,397 @@
+<template>
+<!--  月度计划管理 -->
+  <el-container>
+    <el-header style="width: 100%; height: 50px;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.dcCh" 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="4">
+            <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-row>
+          <el-col :span="10" :offset="14">
+            <el-form-item style="float: right" >
+<!--              <el-button  type="success" @click="sygdPC()" >导出excel</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"
+              :data="list"
+              :custom-config="{ storage: true }"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+              @cell-click="cellClickEvent"
+            >
+            <!--              show-header-overflow-->
+            </vxe-grid>
+          </div>
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {  getCzxx} from '@/api/jhzx/qfxq'
+import {getSygdList} 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:'YdjhzxXF',
+  data() {
+    return {
+      queryParam: {
+        dcCh:'',
+        dcPl:''
+      },
+      list: [],
+      isupload:'02',
+      filedis:false,
+      uploadData:{},
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
+      dictData:[],
+      height: '500px',
+      tableColumn:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: '', title: '产品', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '批量', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '分段', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '板数', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '上料', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '型材抛丸', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '抛丸', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '一垮龙门板数', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '一垮数控板数', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '二垮数控板数', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '三垮数控板数', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '三垮平铁板数', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '平铁切割开始', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '平铁切割结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '曲平铁转结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '曲平铁结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '曲外板结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '组立', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '数控   板数', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '面板挤边', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '七垮型  材米数', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '型材  面板', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '小组配送结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '光电  结束', width: 120, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '备注', width: 120, 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()
+  },
+  watch: {
+    '$route'(){
+      this.getParams();
+    }
+  },
+  methods: {
+    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)
+      }
+    },
+    uploadExcel() {
+      this.uploadData.isupload = this.isupload
+    },
+    cellClickEvent  ( column )  {
+
+      // 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
+    },
+    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)
+        }
+
+      } 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
+      }
+      getSygdList(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
+    },
+
+  }
+}
+</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/login/index.vue b/src/views/login/index.vue
index 65806d8..a8a303e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -303,7 +303,8 @@
         -webkit-appearance: none;
         border-radius: 0px;
         /*padding: 12px 5px 12px 15px;*/
-        color: $light_gray;
+        //color: $light_gray;
+        color: white;
         height: 47px;
         caret-color: $cursor;
 
diff --git a/src/views/sjzx/tzjhGL.vue b/src/views/sjzx/tzjhGL.vue
index 0e3d7b9..03c1d42 100644
--- a/src/views/sjzx/tzjhGL.vue
+++ b/src/views/sjzx/tzjhGL.vue
@@ -47,7 +47,7 @@
         <el-row>
           <el-col :span="24" style="text-align: right">
             <el-button type="success" @click="toolbarButtonClickEvent('insert')"
-              >审核</el-button
+              >提交</el-button
             >
           </el-col>
         </el-row>