diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js
index 3fcdbc7..44d8502 100644
--- a/src/api/jhzx/sygd.js
+++ b/src/api/jhzx/sygd.js
@@ -4,9 +4,9 @@ export function getList(data) {return request({url: '/dmSygdMx/getList', method:
 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 symxhz(data) {return request({url: '/dmSygdMx/symxhz', method: 'post', data})}
+export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post'})}
 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/api/jhzx/sygdxq.js b/src/api/jhzx/sygdxq.js
new file mode 100644
index 0000000..5d2b567
--- /dev/null
+++ b/src/api/jhzx/sygdxq.js
@@ -0,0 +1,4 @@
+import request from '@/utils/request'
+
+export function getList(data) {return request({url: '/dmSygdxq/getList', method: 'post', data})}
+
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index d2a56e7..7ae89d5 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -17,10 +17,10 @@
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">Close</li>
-      <li @click="closeOthersTags">Close Others</li>
-      <li @click="closeAllTags(selectedTag)">Close All</li>
+      <li @click="refreshSelectedTag(selectedTag)">刷新当前页</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭当前页</li>
+      <li @click="closeOthersTags">关闭其他标签页</li>
+      <li @click="closeAllTags(selectedTag)">关闭所有标签页</li>
     </ul>
   </div>
 </template>
diff --git a/src/utils/index.js b/src/utils/index.js
index 0256d95..1e41efe 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -3,7 +3,7 @@ let loading
 export function startLoading() { // 使用Element loading-start 方法
   loading = Loading.service({
     lock: true,
-    text: '加载中……',
+    text: '处理中……',
     background: 'rgba(0, 0, 0, 0.7)'
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 2fdf81b..712d805 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -9,7 +9,7 @@ let loading
 function startLoading() { // 使用Element loading-start 方法
   loading = Loading.service({
     lock: true,
-    text: '加载中……',
+    text: '处理中……',
     background: 'rgba(0, 0, 0, 0.7)'
   })
 }
diff --git a/src/views/jhzx/gdxqDR.vue b/src/views/jhzx/gdxqDR.vue
new file mode 100644
index 0000000..d63120e
--- /dev/null
+++ b/src/views/jhzx/gdxqDR.vue
@@ -0,0 +1,508 @@
+<template>
+  <el-container>
+    <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="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="month"  style="width: 33%;" />
+              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
+              <el-input v-model="queryParam.endTime"  disabled></el-input>
+<!--              <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd"  type="month" style="width: 33%" />-->
+            </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="generatedCol">查询</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"
+                  :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-main>
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="钢料需求" name="first">
+              <div class="mytable">
+                <vxe-grid
+                  id="id"
+                  ref="xGrid"
+                  border
+                  resizable
+                  keep-source
+                  :align="'center'"
+                  :height="height"
+                  :auto-resize="true"
+                  :columns="tableColumn"
+                  highlight-current-row
+                  :data="list"
+                  :custom-config="{ storage: true }"
+                  @checkbox-all="selectAllEvent"
+                  @checkbox-change="selectChangeEvent"
+                  :row-style="rowClassName"
+                  highlight-hover-row
+                  show-overflow
+                >
+                </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
+                  show-footer
+                  :align="'center'"
+                  :height="height"
+                  :auto-resize="true"
+                  highlight-current-row
+                  :data="list2"
+                  :columns="tableColumn2"
+                  :custom-config="{ storage: true }"
+                  :footer-method="footerMethod"
+                  highlight-hover-row
+                  show-overflow
+                  show-header-overflow
+                >
+                  <template #numMx5="{ items, _columnIndex }">
+                    <span style="color: red">{{ items[_columnIndex] }}</span>
+                  </template>
+                </vxe-grid>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </el-main>
+  </el-container>
+  </el-container>
+</template>
+<script>
+import router from "@/router";
+import {  getCzxx} from '@/api/jhzx/qfxq'
+import {getList} from '@/api/jhzx/sygdxq'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import { getToken } from '@/utils/auth'
+import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
+import {endLoading, startLoading} from "@/utils";
+import {Message} from "element-ui";
+export default {
+  name:'GdxqDR',
+  components: {ScrollPane},
+  data() {
+    return {
+      activeName: 'first',
+      queryParam: {
+        beginTime:'',
+        endTime:''
+      },
+      monthList:[],
+      list: [],
+      list1: [],
+      list2: [],
+      checkedList: [],
+      dictData:[],
+      height: '500px',
+      tableColumn:[
+        { field: 'dcCh', title: '船只', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcPl', title: '批量号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zdh', title: '总段号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcFd', title: '分段号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dzjz', title: '大组极重', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zxfdxq', title: '总装部最新分段需求期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xzglxq', title: '钢料需求（小组）', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dzglxq', title: '钢料需求（大组）', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xdb', title: 'X大板', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xskj', title: 'X数控件', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xpt', title: 'X平铁', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xyw', title: 'X压弯', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xxc', title: 'X型材', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xtxc', title: 'X二次装T型材', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ddb', title: 'D大板', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dqb', title: 'D曲板', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dxc', title: 'D型材T', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dsj', title: 'D散件', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xqzt', title: '需求状态', width: 120,formatter:this.formatterZt,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'drcs', title: '导入次数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xzglxqOld', title: '原需求期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+      ],
+      tableColumn2:[
+        { field: 'dcCh', title: '船只', width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        }
+      ],
+      isupload:'02',
+      uploadData:{},
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmSygdxq/upload',
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+  },
+  watch: {
+    'queryParam.beginTime'(newValue, Value){
+      if (newValue){
+        this.format(newValue);
+      }
+    }
+  },
+  methods: {
+    rowClassName({ row,rowIndex }){
+      if (row.xqzt==='1') {
+        return  {
+          color: 'red',
+          cursor:'pointer'
+        }
+      }
+      if (row.xqzt==='2') {
+        return {
+          backgroundColor: 'darkseagreen',
+        }
+      }
+      return null
+    },
+    //转码
+    formatterZt({cellValue}){
+      if(cellValue==='0'){
+        return '正常'
+      }
+      if(cellValue==='1'){
+        return '提前'
+      }
+      if (cellValue==='2'){
+        return '拖期'
+      }
+      return cellValue
+    },
+    footerMethod({ columns, data }){
+
+      return [
+        columns.map((column, columnIndex) => {
+          if (columnIndex === 0) {
+            return '合计'
+          }
+          return this.sumNum(data, column.property)
+          // if (['yf08'].includes(column.property)) {
+          //   console.log(123)
+          //   return this.sumNum(data, column.property)
+          // }
+          //
+          // return null
+        })
+      ]
+    },
+    sumNum(list, field) {
+      let count = 0
+      list.forEach(item => {
+        let num = Number(item[field])
+        if (!XEUtils.isNumber(num) || isNaN(num)) {
+          num = 0
+        }
+        count = this.cal.accAdd(count, num)
+      })
+      return count
+    },
+    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.initList();
+
+      } else {
+        Message({
+          message: res.message || 'Error',
+          type: 'error',
+          duration: 5 * 1000
+        })
+      }
+    },
+    //合并行
+    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 };
+          }
+        }
+      }
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    //切换数据表点击事件
+    handleClick(tab, event) {
+
+    },
+    //转码信息
+    initBase(){
+      getCzxx({}).then(res=>{
+        this.dictData = res.data
+      })
+    },
+    //初始化表1 数据
+    initList() {
+      if (this.queryParam.beginTime === '') {
+          this.$message.warning('选择时间范围')
+        return
+      }
+
+      this.generatedCol()
+      getList(this.queryParam).then((res) => {
+        if (res.data){
+          this.list = res.data.list
+          this.list2 = res.data.hz
+          if (this.$refs.xGrid) {
+            this.$refs.xGrid.loadData(this.list)
+          }
+          if (this.$refs.xGrid2) {
+            this.$refs.xGrid2.loadData(this.list2)
+          }
+        }
+      })
+      this.activeName='first'
+    },
+    generatedCol(){
+      //日期
+      this.tableColumn2= [] ;
+      this.tableColumn2.push({
+        key:  this.tableColumn2.length + 1,
+        field: 'dcCh',
+        title: '船只',
+        width: 200
+      })
+      var a =this.monthList
+      for (let i = 0; i < a.length; i++) {
+        this.tableColumn2.push({
+          key:  this.tableColumn2.length + 1,
+          field: 'yf'+a[i],
+          title: a[i]+`月`,
+          width: 200
+        })
+      }
+
+    },
+    formatDate ({ cellValue }) {
+      return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
+    },
+    getHeight() {
+      this.height = window.innerHeight - 200
+    },
+    format (val) {
+      this.monthList= [] ;
+      var date = new Date(val); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+      var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1);
+      // this.queryParam.beginTime=Y+M;
+      this.monthList.push(M);
+
+      date.setMonth(date.getMonth()+1);
+       M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) ;
+      this.monthList.push(M)
+
+      date.setMonth(date.getMonth()+1);
+      M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) ;
+      this.monthList.push(M)
+
+      date.setMonth(date.getMonth()+1);
+      var Y = date.getFullYear() + "/";
+       M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/";
+      var D = date.getDate()<10?  "0" +date.getDate():date.getDate();
+      // var h = date.getHours() + ":";
+      // var m = date.getMinutes() + ":";
+      // var s = (date.getSeconds() < 10 ? "0" + (date.getSeconds()) : date.getSeconds());
+      // return Y + M + D + h + m + s;
+      this.queryParam.endTime=Y + M + D;
+      // return Y + M ;
+    }
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzx/qfxqwh.vue b/src/views/jhzx/qfxqwh.vue
index 92965d4..3538718 100644
--- a/src/views/jhzx/qfxqwh.vue
+++ b/src/views/jhzx/qfxqwh.vue
@@ -4,18 +4,8 @@
       <el-form :inline="true"  label-width="65px"  label-position="left">
         <el-row>
           <el-col :span="22">
-            <el-form-item label="船号:">
-              <el-select v-model="queryParam.dcCh" filterable  placeholder="工程编号" @change="czbhChange" >
-                <el-option
-                  v-for="item in dictData"
-                  :key="item.cbbm"
-                  :label="item.cbbm"
-                  :value="item.cbbm">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="批量:">
-              <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
+            <el-form-item label="月份:">
+              <el-date-picker v-model="queryParam.db" value-format="yyyy/MM"  type="month"  style="width: 80%;" />
             </el-form-item>
           </el-col>
           <el-col :span="2">
@@ -90,7 +80,6 @@ import {
 
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
 import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
@@ -99,13 +88,12 @@ export default {
   data() {
     return {
       queryParam: {
-        dcCh:'',
-        dcPl:'',
+        db:'',
         zt:'0'
       },
       list: [],
       isupload:'02',
-      filedis:true,
+      filedis:false,
       uploadData:{
       },
       heads: { token: getToken() },
@@ -184,21 +172,8 @@ export default {
   },
   methods: {
     uploadExcel() {
-      if (this.queryParam.dcCh === '') {
-        this.$message.error('请选择船号！')
-        return false;
-      } else {
-
-      }
       this.uploadData.isupload = this.isupload
     },
-    czbhChange(){
-      if (this.queryParam.dcCh === '') {
-          this.filedis=true
-      }else{
-        this.filedis=false
-      }
-    },
     beforeAvatarUpload(file) {
 
       // 文件类型
@@ -232,10 +207,7 @@ export default {
       })
     },
     initList() {
-      if (this.queryParam.dcCh === '') {
-          this.$message.warning('选择船只编号')
-        return
-      }
+
       getList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
diff --git a/src/views/jhzx/sygdWH.vue b/src/views/jhzx/sygdWH.vue
index 7552280..0a4d9e3 100644
--- a/src/views/jhzx/sygdWH.vue
+++ b/src/views/jhzx/sygdWH.vue
@@ -109,7 +109,7 @@ export default {
       queryParam: {
         beginTime:'2023/08/01',
         endTime:'2023/10/01',
-        gdZt:'0'
+        // gdZt:'0'
       },
       gdZtOptions:[
         {
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index eb49d0c..9b4feb7 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -14,9 +14,8 @@
           <el-col :span="9" >
             <el-form-item style="float: right" >
               <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-button type="success" @click="tqSygd">生成三月滚动</el-button>
+              <el-button type="success" @click="save">保存</el-button>
+              <el-button type="success" @click="tqSygd">提交三月滚动</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -27,6 +26,7 @@
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="中日程分解" name="first">
               <div class="mytable">
+                <el-button  type="success" @click="sygdPC()" > 提取明细 </el-button>
                 <el-button type="success" @click="symxhz">汇总</el-button>
                 <vxe-grid
                   id="id"
@@ -260,6 +260,7 @@
   </el-container>
 </template>
 <script>
+import router from "@/router";
 import {  getCzxx} from '@/api/jhzx/qfxq'
 import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList} from '@/api/jhzx/sygd'
 import { mapGetters } from 'vuex'
@@ -917,7 +918,7 @@ export default {
     tqSygd(){
       tqSygd().then((res) => {
         if (res.data) {
-          this.$router.push({
+          router.push({
             name: 'SygdWH',
             params: {
               list: res.data
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index 6480456..8b8298d 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -4,237 +4,588 @@
     <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-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-col :span="15">
+            <el-form-item label="月份:">
+              <el-date-picker v-model="queryParam.yf" value-format="yyyy/MM/dd"  type="month"  style="width: 80%;" />
             </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-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-main>
+        <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"
+                border
+                resizable
+                keep-source
+                :align="'center'"
+                :height="height"
+                :auto-resize="true"
+                :columns="tableColumn"
+                highlight-current-row
+                :data="list"
+                :custom-config="{ storage: true }"
+                :edit-config="{
+                            trigger: 'click',
+                            mode: 'row',
+                            showStatus: true,
+                          }"
+                @checkbox-all="selectAllEvent"
+                @checkbox-change="selectChangeEvent"
+                highlight-hover-row
+                show-overflow
+              >
+              </vxe-grid>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="图纸信息" name="second">
+            <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 }"
+                :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="third">
+            <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 }"
+                :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="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 }"
+                :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="fifth">
+            <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 }"
+                :cell-style="cellStyle"
+                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="80%" :title="title">
+      <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 router from "@/router";
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList} 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 { startLoading, endLoading } from '@/utils'
-import { Message } from 'element-ui'
+import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
+import {emSbjbbZM} from "@/api/sjzx/sbcnWH";
 export default {
   name:'YdjhzxGL',
+  components: {ScrollPane},
   data() {
     return {
+      dialogVisible:false,
+      title1:'修改明细信息',
+      selectMbch:[],
+      mxList:[],
+      haveTltBoms:[],
+      activeName: 'first',
       queryParam: {
-        dcCh:'',
-        dcPl:''
+        yf:''
       },
       list: [],
-      isupload:'02',
-      filedis:false,
-      uploadData:{},
+      list2: [],
+      list3: [],
+      list4: [],
+      list5: [],
+      checkedList: [],
       heads: { token: getToken() },
-      uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
       dictData:[],
+      sbxx:{},
       height: '500px',
       tableColumn:[
+
         { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: '', title: '产品', width: 120, editRender: { name: 'input' },
+        { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '批量', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcCh1', title: '目标船号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '分段', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
+        { field: 'dcPl', title: '批量',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '上料', width: 120, editRender: { name: 'input' },
+          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: '', title: '型材抛丸', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jssj', title: '组立结束时间',width: 110,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '抛丸', width: 120, editRender: { name: 'input' },
+          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: '', title: '一垮龙门板数', width: 120, editRender: { name: 'input' },
+          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: '', title: '一垮数控板数', width: 120, editRender: { name: 'input' },
+          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: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'tzbh', title: '套料图号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '二垮数控板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wpgg', title: '规格',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'bcshzl', title: '重量',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          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: '', title: '三垮数控板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jzbs', title: '矫正标识',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxcd', title: '划线长度(米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxcdKc', title: '划线空程长度(米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '三垮平铁板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgcd', title: '切割长度（米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '平铁切割开始', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '平铁切割结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'slrq', title: '上料计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '曲平铁转结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pwrq', title: '抛丸计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '曲平铁结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxrq', title: '划线计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '曲外板结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgrq', title: '切割计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '组立', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jzsb', title: '矫正设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '数控   板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        { field: 'pwsb', title: '抛丸设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination'  },editRender: { name: "$select",options: [],props: { clearable: true}}},
+        { field: 'hxsb', title: '划线设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        { field: 'qgsb', title: '切割设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '面板挤边', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        { field: 'pklx', title: '坡口类型',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '七垮型  材米数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pkcd', title: '坡口长度',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '型材  面板', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pksb', title: '坡口设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '小组配送结束', width: 120, editRender: { name: 'input' },
+          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: '', title: '光电  结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qbs', title: '曲标识',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '备注', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qjgsb', title: '曲加工设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-  ]
+          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: '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: '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: 'gxsj', title: '数据更新时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+      ],
+      tableColumn2: [
+        { 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: 'dcCh', title: '船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcPl', title: '批量',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcFd', title: '分段',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'xfqLqb', title: '领取表下发 ',width: 180,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jsqLqb', title: '领取表接收',width: 180,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'xfqTlt', title: '套料图下发 ',width: 180,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jsqTlt', title: '套料图接收',width: 180,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
 
+      ],
+      tableColumn3:[
+        { 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: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dhqd', title: '订货清单号',width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'rkxh', title: '材质',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wphd', title: '厚度',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wpkd', title: '宽度',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { 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', }},
+      ],
+      tableColumn4:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: '', title: '钢料需求期',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '上料位置',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '上料张数',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+      ],
+      tableColumn5:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: '', title: '切割日期',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '跨位',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '切割设备',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '切割张数',width: 200,
+          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: '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: {
@@ -245,85 +596,236 @@ export default {
     this.getHeight()
     this.initBase()
   },
-  watch: {
-    '$route'(){
-      this.getParams();
-    }
-  },
   methods: {
-    getParams(){
-      var a=[]
-      a= this.$route.params.list
-      if (a===undefined){
-        return;
+    //汇总
+    symxhz(){
+      if (this.list.length<1){
+        this.$message.warning('请先查询需要汇总的信息！');
+        return
       }
-      this.list=a
-      if (this.$refs.xGrid) {
-        this.$refs.xGrid.loadData(this.list)
+      symxhz(this.list).then((res) => {
+        if (res.data) {
+          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 };
+          }
+        }
       }
     },
-    uploadExcel() {
-      this.uploadData.isupload = this.isupload
+    //明细修改弹窗
+    cellClickEvent_xb(row){
+      this.mxList=row.row.mxList
+      this.dialogVisible=true
+      // const tableRef = this.$refs.tableRef1;
+      // this.sbmx1(tableRef)
     },
-    cellClickEvent  ( column )  {
-
-      // console.log(column.row.mxList)
+    // 设备下拉框
+    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'
+        }
+      }
     },
-    beforeAvatarUpload(file) {
+    //明细修改弹窗，区分是否本船只
+    cellStyle1({ row }){
+      if (row.dcCh1) {
+        return {
+          color: 'red',
+          cursor:'pointer'
+        }
+      }
 
-      // 文件类型
-      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
+    },
+    //明细修改弹窗，可修改列
+    headerCellStyle({ column }){
+      let fields = ['jzsb','pwsb','hxsb','qgsb','pksb','dmsb','qjgsb'];
+      if (fields.includes(column.field)) {
+        return {
+          backgroundColor: 'lightblue',
+          cursor:'pointer'
+        }
       }
-      startLoading()
-      return fileType
     },
-    handleAvatarSuccess(res, file) {
-      endLoading()
-      if (res.success) {
-        this.$message({ message: '导入成功', type: 'success' })
+    //提取三月滚动
+    tqSygd(){
+      tqSygd().then((res) => {
+        if (res.data) {
+          router.push({
+            name: 'SygdWH',
+            params: {
+              list: res.data
+            }
+          })
+        }else {
+          this.$message.warning('请先将三月明细预排产！');
+        }
+      })
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    //明细排产时，弹窗选择目标船只
+    saveByDcch(){
+      saveByDcch(this.selectMbch).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
         }
+      })
+      this.dialogVisible=false;
+    },
+    //修改明细信息；根据修改后的设备信息；重新排计划期
+    save(){
+      this.$message.warning('保存成功！');
+      this.dialogVisible=false;
+      // saveMxList(this.mxList).then((res) => {
+      //
+      // })
+
+    },
+    //切换数据表点击事件
+    handleClick(tab, event) {
+      if(this.activeName==='second'){
+        // alert('线表计划')
+
+      }
+      if(this.activeName==='third'){
+        // alert('批量表')
+
+      }
+      if(this.activeName==='fourth'){
+        // alert('图纸')
 
-      } else {
-        Message({
-          message: res.message || 'Error',
-          type: 'error',
-          duration: 5 * 1000
-        })
+      }
+      if(this.activeName==='fifth'){
+        // alert('到货')
+        if (this.list.length>0){
+
+        }
+      }
+      if(this.activeName==='sixth'){
+        console.log(this.list5)
       }
     },
+    //材料类型转码
+    formatterLx({cellValue}){
+      if(cellValue==='B'){
+        return '板材'
+      }
+      if (cellValue==='X'){
+        return '型材'
+      }
+      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
       }
-      getSygdList(this.queryParam).then((res) => {
+      getList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
         }
 
       })
+      this.activeName='first'
     },
     formatDate ({ cellValue }) {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
-      this.height = window.innerHeight - 190
+      this.height = window.innerHeight - 200
     },
-
+    //明细排产
+    sygdPC() {
+      this.$store.dispatch('app/closeSideBar',true)
+      sygdPC().then((res) => {
+        if(res.data.no_tlt){
+          this.selectMbch=res.data
+          this.haveTltBoms=res.data.haveTltBoms
+          this.dialogVisible=true;
+        }else {
+          this.list = res.data.mxList
+          if (this.$refs.xGrid) {
+            this.$refs.xGrid.loadData(this.list)
+          }
+        }
+      })
+      this.activeName='first'
+    }
   }
 }
 </script>
diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue
index 47d92d1..30d3e20 100644
--- a/src/views/jhzx/ydjhzxXF.vue
+++ b/src/views/jhzx/ydjhzxXF.vue
@@ -4,238 +4,582 @@
     <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-col :span="15">
+            <el-form-item label="月份:">
+              <el-date-picker v-model="queryParam.yf" value-format="yyyy/MM/dd"  type="month"  style="width: 80%;" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <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-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-main>
+        <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"
+                border
+                resizable
+                keep-source
+                :align="'center'"
+                :height="height"
+                :auto-resize="true"
+                :columns="tableColumn"
+                highlight-current-row
+                :data="list"
+                :custom-config="{ storage: true }"
+                :edit-config="{
+                            trigger: 'click',
+                            mode: 'row',
+                            showStatus: true,
+                          }"
+                @checkbox-all="selectAllEvent"
+                @checkbox-change="selectChangeEvent"
+                highlight-hover-row
+                show-overflow
+              >
+              </vxe-grid>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="图纸信息" name="second">
+            <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 }"
+                :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="third">
+            <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 }"
+                :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="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 }"
+                :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="fifth">
+            <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 }"
+                :cell-style="cellStyle"
+                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="80%" :title="title">
+      <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 }"
+            @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 router from "@/router";
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getSygdList} 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 { startLoading, endLoading } from '@/utils'
-import { Message } from 'element-ui'
+import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
+import {emSbjbbZM} from "@/api/sjzx/sbcnWH";
 export default {
   name:'YdjhzxXF',
+  components: {ScrollPane},
   data() {
     return {
+      dialogVisible:false,
+      title1:'修改明细信息',
+      selectMbch:[],
+      mxList:[],
+      haveTltBoms:[],
+      activeName: 'first',
       queryParam: {
-        dcCh:'',
-        dcPl:''
+        yf:''
       },
       list: [],
-      isupload:'02',
-      filedis:false,
-      uploadData:{},
+      list2: [],
+      list3: [],
+      list4: [],
+      list5: [],
+      checkedList: [],
       heads: { token: getToken() },
-      uploadAction: process.env.VUE_APP_BASE_API + '/dmSygd/upload',
       dictData:[],
+      sbxx:{},
       height: '500px',
       tableColumn:[
+
         { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: '', title: '产品', width: 120, editRender: { name: 'input' },
+        { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '批量', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcCh1', title: '目标船号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '分段', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
+        { field: 'dcPl', title: '批量',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '上料', width: 120, editRender: { name: 'input' },
+          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: '', title: '型材抛丸', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jssj', title: '组立结束时间',width: 110,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '抛丸', width: 120, editRender: { name: 'input' },
+          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: '', title: '一垮龙门板数', width: 120, editRender: { name: 'input' },
+          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: '', title: '一垮数控板数', width: 120, editRender: { name: 'input' },
+          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: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'tzbh', title: '套料图号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '二垮数控板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wpgg', title: '规格',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'bcshzl', title: '重量',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          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: '', title: '三垮数控板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jzbs', title: '矫正标识',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxcd', title: '划线长度(米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxcdKc', title: '划线空程长度(米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '三垮平铁板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgcd', title: '切割长度（米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '平铁切割开始', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '平铁切割结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'slrq', title: '上料计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '曲平铁转结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pwrq', title: '抛丸计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '曲平铁结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxrq', title: '划线计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '曲外板结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgrq', title: '切割计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '组立', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jzsb', title: '矫正设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '数控   板数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
+        { field: 'pwsb', title: '抛丸设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '数控切割开始', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination'  },editRender: { name: "$select",options: [],props: { clearable: true}}},
+        { field: 'hxsb', title: '划线设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '坡口切割结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        { field: 'qgsb', title: '切割设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '面板挤边', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
+        { field: 'pklx', title: '坡口类型',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '七垮型  材米数', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pkcd', title: '坡口长度',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '型材  面板', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pksb', title: '坡口设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '小组配送结束', width: 120, editRender: { name: 'input' },
+          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: '', title: '光电  结束', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qbs', title: '曲标识',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: '', title: '备注', width: 120, editRender: { name: 'input' },
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qjgsb', title: '曲加工设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-  ]
+          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: '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: '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: 'gxsj', title: '数据更新时间',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+      ],
+      tableColumn2: [
+        { 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: 'dcCh', title: '船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcPl', title: '批量',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcFd', title: '分段',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'xfqLqb', title: '领取表下发 ',width: 180,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jsqLqb', title: '领取表接收',width: 180,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'xfqTlt', title: '套料图下发 ',width: 180,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jsqTlt', title: '套料图接收',width: 180,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
 
+      ],
+      tableColumn3:[
+        { 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: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dhqd', title: '订货清单号',width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'rkxh', title: '材质',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wphd', title: '厚度',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'wpkd', title: '宽度',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { 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', }},
+      ],
+      tableColumn4:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: '', title: '钢料需求期',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '上料位置',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '上料张数',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+      ],
+      tableColumn5:[
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: '', title: '切割日期',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '跨位',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '切割设备',width: 200,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: '', title: '切割张数',width: 200,
+          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: '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: {
@@ -246,85 +590,236 @@ export default {
     this.getHeight()
     this.initBase()
   },
-  watch: {
-    '$route'(){
-      this.getParams();
-    }
-  },
   methods: {
-    getParams(){
-      var a=[]
-      a= this.$route.params.list
-      if (a===undefined){
-        return;
+    //汇总
+    symxhz(){
+      if (this.list.length<1){
+        this.$message.warning('请先查询需要汇总的信息！');
+        return
       }
-      this.list=a
-      if (this.$refs.xGrid) {
-        this.$refs.xGrid.loadData(this.list)
+      symxhz(this.list).then((res) => {
+        if (res.data) {
+          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 };
+          }
+        }
       }
     },
-    uploadExcel() {
-      this.uploadData.isupload = this.isupload
+    //明细修改弹窗
+    cellClickEvent_xb(row){
+      this.mxList=row.row.mxList
+      this.dialogVisible=true
+      // const tableRef = this.$refs.tableRef1;
+      // this.sbmx1(tableRef)
     },
-    cellClickEvent  ( column )  {
-
-      // console.log(column.row.mxList)
+    // 设备下拉框
+    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'
+        }
+      }
     },
-    beforeAvatarUpload(file) {
+    //明细修改弹窗，区分是否本船只
+    cellStyle1({ row }){
+      if (row.dcCh1) {
+        return {
+          color: 'red',
+          cursor:'pointer'
+        }
+      }
 
-      // 文件类型
-      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
+    },
+    //明细修改弹窗，可修改列
+    headerCellStyle({ column }){
+      let fields = ['jzsb','pwsb','hxsb','qgsb','pksb','dmsb','qjgsb'];
+      if (fields.includes(column.field)) {
+        return {
+          backgroundColor: 'lightblue',
+          cursor:'pointer'
+        }
       }
-      startLoading()
-      return fileType
     },
-    handleAvatarSuccess(res, file) {
-      endLoading()
-      if (res.success) {
-        this.$message({ message: '导入成功', type: 'success' })
+    //提取三月滚动
+    tqSygd(){
+      tqSygd().then((res) => {
+        if (res.data) {
+          router.push({
+            name: 'SygdWH',
+            params: {
+              list: res.data
+            }
+          })
+        }else {
+          this.$message.warning('请先将三月明细预排产！');
+        }
+      })
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    //明细排产时，弹窗选择目标船只
+    saveByDcch(){
+      saveByDcch(this.selectMbch).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
         }
+      })
+      this.dialogVisible=false;
+    },
+    //修改明细信息；根据修改后的设备信息；重新排计划期
+    save(){
+      this.$message.warning('保存成功！');
+      this.dialogVisible=false;
+      // saveMxList(this.mxList).then((res) => {
+      //
+      // })
+
+    },
+    //切换数据表点击事件
+    handleClick(tab, event) {
+      if(this.activeName==='second'){
+        // alert('线表计划')
+
+      }
+      if(this.activeName==='third'){
+        // alert('批量表')
+
+      }
+      if(this.activeName==='fourth'){
+        // alert('图纸')
 
-      } else {
-        Message({
-          message: res.message || 'Error',
-          type: 'error',
-          duration: 5 * 1000
-        })
+      }
+      if(this.activeName==='fifth'){
+        // alert('到货')
+        if (this.list.length>0){
+
+        }
+      }
+      if(this.activeName==='sixth'){
+        console.log(this.list5)
       }
     },
+    //材料类型转码
+    formatterLx({cellValue}){
+      if(cellValue==='B'){
+        return '板材'
+      }
+      if (cellValue==='X'){
+        return '型材'
+      }
+      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
       }
-      getSygdList(this.queryParam).then((res) => {
+      getList(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
         }
 
       })
+      this.activeName='first'
     },
     formatDate ({ cellValue }) {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
-      this.height = window.innerHeight - 190
+      this.height = window.innerHeight - 200
     },
-
+    //明细排产
+    sygdPC() {
+      this.$store.dispatch('app/closeSideBar',true)
+      sygdPC().then((res) => {
+        if(res.data.no_tlt){
+          this.selectMbch=res.data
+          this.haveTltBoms=res.data.haveTltBoms
+          this.dialogVisible=true;
+        }else {
+          this.list = res.data.mxList
+          if (this.$refs.xGrid) {
+            this.$refs.xGrid.loadData(this.list)
+          }
+        }
+      })
+      this.activeName='first'
+    }
   }
 }
 </script>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a8a303e..7dfb48f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -292,8 +292,9 @@
     .el-input {
       display: inline-block;
       height: 47px;
-      width: 90%;
-
+      width: 87%;
+      background-color: white;
+      border-radius: 5px;
       input {
         background: transparent;
         border-bottom: 1px solid black;
@@ -303,8 +304,7 @@
         -webkit-appearance: none;
         border-radius: 0px;
         /*padding: 12px 5px 12px 15px;*/
-        //color: $light_gray;
-        color: white;
+        color: $light_gray;
         height: 47px;
         caret-color: $cursor;
 
@@ -357,7 +357,6 @@
       font-size: 14px;
       color: #fff;
       margin-bottom: 10px;
-
       span {
         &:first-of-type {
           margin-right: 16px;
@@ -367,7 +366,8 @@
 
     .svg-container {
       padding: 6px 5px 6px 15px;
-      color: $dark_gray;
+      //color: $dark_gray;
+      color: white;
       vertical-align: middle;
       width: 30px;
       display: inline-block;
@@ -396,7 +396,7 @@
       right: 10px;
       top: 7px;
       font-size: 16px;
-      color: $dark_gray;
+      color: white;
       cursor: pointer;
       user-select: none;
     }
diff --git a/src/views/sjzx/sbryWH.vue b/src/views/sjzx/sbryWH.vue
index 58f29a3..c7c2ac2 100644
--- a/src/views/sjzx/sbryWH.vue
+++ b/src/views/sjzx/sbryWH.vue
@@ -186,31 +186,31 @@ export default {
           ],
           filterRender: { name: "FilterCombination" },
         },
-        {
-          field: "rymc",
-          title: "人员名称",
-          align: "center",
-          editRender: {
-            name: "$select",
-            options: [],
-            props: { clearable: true }
-          },
-          filters: [
-            {
-              data: {
-                checks: [],
-                sVal: "",
-                sMenu: "",
-                fType1: "",
-                fVal1: "",
-                fMode: "and",
-                fType2: "",
-                fVal2: "",
-              },
-            },
-          ],
-          filterRender: { name: "FilterCombination" },
-        },
+        // {
+        //   field: "rymc",
+        //   title: "人员名称",
+        //   align: "center",
+        //   editRender: {
+        //     name: "$select",
+        //     options: [],
+        //     props: { clearable: true }
+        //   },
+        //   filters: [
+        //     {
+        //       data: {
+        //         checks: [],
+        //         sVal: "",
+        //         sMenu: "",
+        //         fType1: "",
+        //         fVal1: "",
+        //         fMode: "and",
+        //         fType2: "",
+        //         fVal2: "",
+        //       },
+        //     },
+        //   ],
+        //   filterRender: { name: "FilterCombination" },
+        // },
         {
           field: "jlr",
           title: "负责人",