diff --git a/package.json b/package.json
index 46d0486..386e685 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "dev": "vue-cli-service serve",
     "local": "vue-cli-service serve --mode local",
     "lint": "eslint --ext .js,.vue src",
+    "build:test": "vue-cli-service build --mode test",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js
index 74cac75..91003a4 100644
--- a/src/api/jhzx/sygd.js
+++ b/src/api/jhzx/sygd.js
@@ -6,6 +6,10 @@ export function tj(data) {return request({url: '/dmSygd/tj', method: 'post', dat
 export function sh(data) {return request({url: '/dmSygd/sh', method: 'post', data})}
 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 排产(data) {return request({url: '/dmSygdMx/pc', method: 'get',params:data})}
+
+export function 获取排产结果(data) {return request({url: '/dmSygdMx/sygdjh', method: 'get',params:data})}
+
 export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post'})}
 export function tqSygd(data) {return request({url: '/dmSygdMx/tqSygd', method: 'post',data})}
 export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})}
diff --git a/src/views/jhzx/components/sygdpc/Bcxq.vue b/src/views/jhzx/components/sygdpc/Bcxq.vue
new file mode 100644
index 0000000..7293caa
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/Bcxq.vue
@@ -0,0 +1,106 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id4"
+      ref="xGrid4"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn"
+      highlight-current-row
+      :custom-config="{ storage: true }"
+      :cell-style="cellStyle"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+      :scroll-y="{enabled: true}"
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'Bcxq',
+  props:{
+    queryParam:Object,
+    list:{
+      type:Array,
+      default:[]
+    },
+    height:{
+      type:Number,
+      default:500,
+    }
+  },
+  data(){
+    return {
+      tableColumn:[
+        {type: 'seq', width: 60, title: '序号', fixed: "left"},
+        { field: '', title: '日期', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '垛位', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '船号', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '批量', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '数量', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '重量', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '订货清单号', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '订货数量', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '采购数量', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '到货数量', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '跨位', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '', title: '跨位需求数量', width: 150,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+      ],
+    }
+  },
+  methods:{
+    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'
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/First.vue b/src/views/jhzx/components/sygdpc/First.vue
new file mode 100644
index 0000000..02d74b1
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/First.vue
@@ -0,0 +1,215 @@
+<template>
+  <div class="mytable">
+    <el-button type="success" @click="sygdPC"> 提取明细</el-button>
+    <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 }"
+      :scroll-x="{enabled: true}"
+      :scroll-y="{enabled: true}"
+      :span-method="rowspanMethod"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+import {sygdPC, symxhz} from "@/api/jhzx/sygd";
+
+export default {
+  name:'First',
+  props:{
+    queryParam:Object,
+    list:{
+      type:Array,
+      default:[]
+    },
+    height:{
+      type:Number,
+      default:500,
+    }
+  },
+  data(){
+    return {
+      tableColumn:[
+        { type: 'checkbox', width: 50 ,},
+        { type: 'seq', width: 60, title: '序号',fixed: "left"},
+        { field: 'dcCh', title: '船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcPl', title: '批量号',width: 70,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcFd', title: '分段号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'bs', title: '板数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sl', title: '上料', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xcpw', title: '型材抛丸', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pw', title: '抛丸', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'yklm', title: '一垮龙门板数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'yksk', title: '一垮数控板数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ykpkjs', title: '坡口切割结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'eksk', title: '二垮数控板数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ekskks', title: '数控切割开始', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ekpkjs', title: '坡口切割结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sksk', title: '三垮数控板数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skskqgks', title: '数控切割开始', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skpkjs', title: '坡口切割结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skpt', title: '三垮平铁板数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ptks', title: '平铁切割开始', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ptjs', title: '平铁切割结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qpt_zjs', title: '曲平铁转结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qptjs', title: '曲平铁结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qwbjs', title: '曲外板结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zl', title: '组立', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skbs', title: '数控   板数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'skqgks', title: '数控切割开始', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pkqgjs', title: '坡口切割结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'mbjb', title: '面板挤边', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qkxcms', title: '七垮型  材米数', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xcmb', title: '型材  面板', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fdxq', title: '分段需求', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'gdjs', title: '光电  结束', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bz', title: '备注', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        }
+      ],
+    }
+  },
+  methods:{
+    sygdPC() {
+      this.$store.dispatch('app/closeSideBar', true)
+      sygdPC().then((res) => {
+        if (!res.success){
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    symxhz() {
+      if (!this.queryParam.beginTime ||!this.queryParam.endTime) {
+        this.$message.warning('请先输入汇总的时间范围！');
+        return
+      }
+      symxhz(this.queryParam).then((res) => {
+        if (res.data) {
+          this.list1 = res.data.xbList
+          this.list2 = res.data.plList
+          this.list3 = res.data.kwList
+        }
+      })
+    },
+    rowspanMethod({row, _rowIndex, column, visibleData}) {
+      let fields = ['dcCh','dcPl'];// 需要合并的列
+      const cellValue = row[column.property];// 合并行的相同的唯一标识
+      if (cellValue && fields.includes(column.property)) {
+        const prevRow = visibleData[_rowIndex - 1];
+        let nextRow = visibleData[_rowIndex + 1];
+        if(_rowIndex%2==0){
+          return {rowspan: 2, colspan: 1};
+        }else {
+          return {rowspan: 0, colspan: 0};
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/Fourth.vue b/src/views/jhzx/components/sygdpc/Fourth.vue
new file mode 100644
index 0000000..f93af62
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/Fourth.vue
@@ -0,0 +1,888 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id3"
+      ref="xGrid3"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn"
+      highlight-current-row
+      :data="list"
+      :custom-config="{ storage: true }"
+      :scroll-y="{enabled: true}"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+      @cell-dblclick="cellClickEvent_xb"
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'Third',
+  props:{
+    queryParam:Object,
+    list:{
+      type:Array,
+      default:[]
+    },
+    height:{
+      type:Number,
+      default:500,
+    }
+  },
+  data(){
+    return {
+      tableColumn:[
+        {type: 'seq', width: 60, title: '序号', fixed: "left"},
+        {
+          field: 'yf', title: '月份', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'kw', title: '跨位', width: 120, formatter: ['dictFormat', 'QGKW'],
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'ch', title: '船号', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'pl', title: '批量', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'fd', title: '分段', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'bs', title: '板数', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'dhqd', title: '订货清单号', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'lhsl', title: '到货数量', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'dhsl', title: '订货数量', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'blgs', title: '备料总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'pwgs', title: '抛丸总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'llgs', title: '理料总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'hxgs', title: '划线总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'qggs', title: '切割总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'pkgs', title: '坡口总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'dmgs', title: '打磨总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'qjggs', title: '曲加工总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'zpgs', title: '装配总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+      ],
+      tableColumn6: [
+        {type: 'seq', width: 60, title: '序号', fixed: "left"},
+        {
+          field: 'dcCh', title: '船号', minWidth: "70",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dcCh1', title: '目标船号', minWidth: "90",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },//数据来源船，真实数据时，为空
+        {
+          field: 'dcPl', title: '批量', minWidth: "70",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dcFd', title: '分段号', minWidth: "150",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'zl', title: '组立', minWidth: "70", formatter: ['dictFormat', 'ZLLB'],
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'jssj', title: '钢料滚动需求期(小组)', minWidth: "160",
+          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: 'tzbh', title: '套料图号', width: 90,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'wpgg', title: '规格', width: 80,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'bcshzl', title: '重量', width: 80,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'wpxh', title: '材质', width: 80,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+        },
+        {
+          field: 'xcms', title: '型材米数', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'jzbs', title: '矫正标识', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'hxcd', title: '划线长度(米)', minWidth: "110",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'hxcdKc', title: '划线空程长度(米)', minWidth: "140",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'qgcd', title: '切割长度（米)', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'qgcdKc', title: '切割空程长度（米)', minWidth: "140",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'slrq', title: '上料计划日期', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'pwrq', title: '抛丸计划日期', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'hxrq', title: '划线计划日期', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'qgrq', title: '切割计划日期', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'pkcd', title: '坡口长度', minWidth: "110",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'pkrq', title: '坡口计划日期', minWidth: "130",
+          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: 'dmrq', title: '打磨计划日期', minWidth: "130",
+          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: 'qjgrq', title: '曲加工计划日期', minWidth: "140",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'gjjsDz', title: '钢料滚动需求期(大组)', minWidth: "160",
+          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: '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: '数据更新时间', minWidth: "130",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+      ],
+    }
+  },
+  methods:{
+    cellClickEvent_xb(row) {
+      this.mxList = row.row.mxList
+      this.dialogVisible1 = true
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/MyTabs.vue b/src/views/jhzx/components/sygdpc/MyTabs.vue
new file mode 100644
index 0000000..cdc0f2d
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/MyTabs.vue
@@ -0,0 +1,70 @@
+<template>
+  <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tab-pane :label="item.label" :name="item.name" v-for="(item,index) in tabs" >
+      <component :is="item.tableComp" :ref="item.ref" :height="height" :queryParam="queryParam" :list="tabsData[item.name]"/>
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import First from "@/views/jhzx/components/sygdpc/First";
+import Sygdjh from "@/views/jhzx/components/sygdpc/Sygdjh";
+import Second from "@/views/jhzx/components/sygdpc/Second";
+import Third from "@/views/jhzx/components/sygdpc/Third";
+import Fourth from "@/views/jhzx/components/sygdpc/Fourth";
+import Bcxq from "@/views/jhzx/components/sygdpc/Bcxq";
+import SygdjhDetail from "@/views/jhzx/components/sygdpc/SygdjhDetail";
+export default {
+  name:"MyTabs",
+  components:{First,Sygdjh,Second,Third,Bcxq,Fourth,SygdjhDetail},
+  props:{
+    queryParam:Object,
+    height:{
+      type:Number,
+      default:500,
+    }
+  },
+  data(){
+    return{
+      activeName:'first',
+      tabs:[
+        {name:'first',label:'前方三月需求计划',tableComp:'First',ref:'firstRef'},
+        {name:'sygdjh',label:'三月滚动计划编制',tableComp:'Sygdjh',ref:'sygdjhRef'},
+        {name:'sygdjhDetail',label:'三月滚动计划明细',tableComp:'SygdjhDetail',ref:'sygdjhDetailRef'},
+        {name:'second',label:'线表信息',tableComp:'Second',ref:'secondRef'},
+        {name:'third',label:'批量信息',tableComp:'Third',ref:'thirdRef'},
+        {name:'bcxq',label:'板材需求',tableComp:'Bcxq',ref:'bcxqRef'},
+        {name:'fourth',label:'跨位信息',tableComp:'Fourth',ref:'fourthRef'},
+      ],
+      tabsData:{
+        first:[],
+        sygdjh:[],
+        sygdjhDetail:[],
+        second:[],
+        third:[],
+        bcxq:[],
+        fourth:[],
+      }
+    }
+  },
+  methods:{
+    initData(name,list){
+      this.tabsData[name]=list
+    },
+    initTabData(){
+      this.$emit('initTabData',this.activeName);
+    },
+    getSelectData(){
+      return this.$refs['sygdjhDetail'].getSelectData();
+    },
+    handleClick(){
+      Object.keys(this.tabsData).forEach(key=>{
+        if (key!==this.activeName){
+          this.tabsData[key]=null;
+        }
+      })
+      this.initTabData();
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/Second.vue b/src/views/jhzx/components/sygdpc/Second.vue
new file mode 100644
index 0000000..87a70c6
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/Second.vue
@@ -0,0 +1,1181 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id1"
+      ref="xGrid1"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn"
+      highlight-current-row
+      :data="list"
+      :custom-config="{ storage: true }"
+      :span-method="rowspanMethod"
+      :cell-style="cellStyle"
+      :row-style="rowClassName"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+      @cell-dblclick="cellClickEvent_xb"
+      :scroll-y="{enabled: true}"
+    >
+      <template #numMx5="{ items, _columnIndex }">
+        <span style="color: red">{{ items[_columnIndex] }}</span>
+      </template>
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'Second',
+  props:{
+    queryParam:Object,
+    list:{
+      type:Array,
+      default:[]
+    },
+    height:{
+      type:Number,
+      default:500,
+    }
+  },
+  data(){
+    return {
+      tableColumn:[
+        {type: 'seq', width: 60, title: '序号', fixed: "left"},
+        {
+          field: 'nf', title: '年份', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'yf', title: '月份', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dcCh', title: '船号', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'zl', title: 'a=线表重量(吨)', width: 170,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'tlt_zl', title: 'b=套料图实耗重量(吨)', width: 170,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'xczl', title: 'b-a=差值重量(吨)', width: 170,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+      ],
+      tableColumn2: [
+        {type: 'seq', width: 60, title: '序号', fixed: "left"},
+        {
+          field: 'dcCh', title: '船号', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: '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: 'xzjsq', title: 'a=批量表（钢加小组结束）', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'xzglxq', title: 'b=钢料滚动需求（小组）', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombin ation',}
+        },
+        {
+          field: 'xzcz', title: 'b-a=时间差(小组)', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dzjsq', title: 'c=批量表（钢加大组结束）', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dzglxq', title: 'd=钢料滚动需求（大组）', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dzcz', title: 'd-c=时间差(大组)', 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: 'yf', title: '月份', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'kw', title: '跨位', width: 120, formatter: ['dictFormat', 'QGKW'],
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'ch', title: '船号', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'pl', title: '批量', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'fd', title: '分段', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'bs', title: '板数', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'dhqd', title: '订货清单号', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'lhsl', title: '到货数量', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'dhsl', title: '订货数量', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'blgs', title: '备料总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'pwgs', title: '抛丸总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'llgs', title: '理料总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'hxgs', title: '划线总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'qggs', title: '切割总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'pkgs', title: '坡口总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'dmgs', title: '打磨总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'qjggs', title: '曲加工总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+        {
+          field: 'zpgs', title: '装配总工时', width: 120,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',},
+        },
+      ],
+      tableColumn6: [
+        {type: 'seq', width: 60, title: '序号', fixed: "left"},
+        {
+          field: 'dcCh', title: '船号', minWidth: "70",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dcCh1', title: '目标船号', minWidth: "90",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },//数据来源船，真实数据时，为空
+        {
+          field: 'dcPl', title: '批量', minWidth: "70",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dcFd', title: '分段号', minWidth: "150",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'zl', title: '组立', minWidth: "70", formatter: ['dictFormat', 'ZLLB'],
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'jssj', title: '钢料滚动需求期(小组)', minWidth: "160",
+          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: 'tzbh', title: '套料图号', width: 90,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'wpgg', title: '规格', width: 80,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'bcshzl', title: '重量', width: 80,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'wpxh', title: '材质', width: 80,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+        },
+        {
+          field: 'xcms', title: '型材米数', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'jzbs', title: '矫正标识', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'hxcd', title: '划线长度(米)', minWidth: "110",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'hxcdKc', title: '划线空程长度(米)', minWidth: "140",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'qgcd', title: '切割长度（米)', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'qgcdKc', title: '切割空程长度（米)', minWidth: "140",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'slrq', title: '上料计划日期', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'pwrq', title: '抛丸计划日期', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'hxrq', title: '划线计划日期', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'qgrq', title: '切割计划日期', minWidth: "120",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'pkcd', title: '坡口长度', minWidth: "110",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'pkrq', title: '坡口计划日期', minWidth: "130",
+          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: 'dmrq', title: '打磨计划日期', minWidth: "130",
+          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: 'qjgrq', title: '曲加工计划日期', minWidth: "140",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'gjjsDz', title: '钢料滚动需求期(大组)', minWidth: "160",
+          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: '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: '数据更新时间', minWidth: "130",
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+      ],
+    }
+  },
+  methods:{
+    cellClickEvent_xb(row) {
+      this.mxList = row.row.mxList
+      this.dialogVisible1 = true
+    },
+    rowClassName({row, rowIndex}) {
+      if (row.dcCh === '合计') {
+        return {
+          backgroundColor: 'lightblue',
+          cursor: 'pointer'
+        }
+      }
+      return null
+    },
+    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'
+        }
+      }
+    },
+    rowspanMethod({row, _rowIndex, column, visibleData}) {
+      //不要忘记在vxe-grid上配置  :scroll-y="{enabled: false}" 防止下拉时样式变化
+      // 需要合并的列字段
+      let fields = ['nf', 'yf', 'rq', 'tzxqq','kw','ch',];// 需要合并的列
+      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};
+          }
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/SelectShipModal.vue b/src/views/jhzx/components/sygdpc/SelectShipModal.vue
new file mode 100644
index 0000000..820ccc5
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/SelectShipModal.vue
@@ -0,0 +1,66 @@
+<template>
+  <vxe-modal v-model="dialogVisible" width="600" title="选择目标船只">
+    <template #default>
+      <el-row class="query_wrapper">
+        <el-row>
+          <el-button size="small" style="float: right;margin-bottom: 5px;margin-right: 5px;" type="success"
+                     @click="saveByDcch">保存
+          </el-button>
+        </el-row>
+      </el-row>
+      <div class="mytable">
+        <vxe-table
+          ref="tableRef"
+          auto-resize
+          show-header-overflow
+          show-overflow
+          height="300"
+          :row-config="{isHover: true}"
+          :column-config="{resizable: true}"
+          :data="selectMbch.no_tlt_ch">
+          <vxe-column type="seq" width="50"></vxe-column>
+          <vxe-column field="dcCh" title="船号" width="150"></vxe-column>
+          <vxe-column align="center" field="dcCh1" title="目标船号" width="300">
+            <template #default="{ row }">
+              <vxe-select v-model="row.dcCh1" style="width: 80%;height: 30px;margin-bottom: 2px" transfer>
+                <vxe-option
+                  v-for="item in haveTltBoms"
+                  :key="item.dcch"
+                  :value="item.dcch"
+                  :label="item.dcch"
+                />
+              </vxe-select>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
+    </template>
+  </vxe-modal>
+</template>
+
+<script>
+import {saveByDcch} from "@/api/jhzx/sygd";
+
+export default {
+  name:'SelectShipModal',
+  data(){
+    return{
+      dialogVisible:false,
+      title:'',
+      selectMbch:[],
+      haveTltBoms:[],
+    }
+  },
+  methods:{
+    saveByDcch() {
+      saveByDcch(this.selectMbch).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+      })
+      this.dialogVisible = false;
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/ShowDetailModal.vue b/src/views/jhzx/components/sygdpc/ShowDetailModal.vue
new file mode 100644
index 0000000..aff38fe
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/ShowDetailModal.vue
@@ -0,0 +1,67 @@
+<template>
+  <vxe-modal v-model="dialogVisible" width="80%" title="修改明细信息">
+    <template #default>
+      <el-row class="query_wrapper">
+        <el-row>
+          <el-button size="small" style="float: right;margin-bottom: 5px;margin-right: 5px;" type="success"
+                     @click="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>
+</template>
+
+<script>
+
+export default {
+  name:'ShowDetailModal',
+  data(){
+    return{
+      dialogVisible:false,
+      title:'',
+      selectMbch:[],
+      haveTltBoms:[],
+    }
+  },
+  methods:{
+    saveByDcch() {
+      saveByDcch(this.selectMbch).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+        }
+      })
+      this.dialogVisible = false;
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/Sygdjh.vue b/src/views/jhzx/components/sygdpc/Sygdjh.vue
new file mode 100644
index 0000000..6d8d216
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/Sygdjh.vue
@@ -0,0 +1,151 @@
+<template>
+  <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 }"
+      :scroll-x="{enabled: true}"
+      :scroll-y="{enabled: true}"
+      :span-method="rowspanMethod"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'Sygdjh',
+  props:{
+    height:{
+      type:Number,
+      default:500,
+    },
+    list:{
+      type:Array,
+      default:[]
+    },
+  },
+  data(){
+    return {
+      tableColumn:[
+        { field: 'day', title: '日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '白班时长', title: '白班', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '二班时长', title: '夜班', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '工序', title: '工序', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'kw', title: '套料图名称', width: 120,formatter:['dictFormat','QGKW'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '产能', title: '工序定额', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '设备编号', title: '设备编码', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '设备名称', title: '设备名称', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '设备产能', title: '设备定额', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcCh', title: '船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dcPl', 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: 'czlx', title: '操作类型(手工/数控)', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        //下面是bom的表头
+        { field: 'zl', title: '组立', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'kw', title: '跨位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'tzbh', title: '套料图名称', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'tzbh', title: '套料图号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wpgg', title: '规格', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wpcz', title: '材质', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljsl', title: '数量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: '_degs', title: '定额', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+      ],
+    }
+  },
+  methods:{
+    rowspanMethod({row, _rowIndex, column, visibleData}) {
+      let fields = ['dcCh','dcPl'];// 需要合并的列
+      const cellValue = row[column.property];// 合并行的相同的唯一标识
+      if (cellValue && fields.includes(column.property)) {
+        const prevRow = visibleData[_rowIndex - 1];
+        let nextRow = visibleData[_rowIndex + 1];
+        if(_rowIndex%2==0){
+          return {rowspan: 2, colspan: 1};
+        }else {
+          return {rowspan: 0, colspan: 0};
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/SygdjhDetail.vue b/src/views/jhzx/components/sygdpc/SygdjhDetail.vue
new file mode 100644
index 0000000..7b0f7fb
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/SygdjhDetail.vue
@@ -0,0 +1,142 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id9"
+      ref="xGrid"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn"
+      highlight-current-row
+      :data="list"
+      :custom-config="{ storage: true }"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'SygdjhDetail',
+  props:{
+    list:{
+      type:Array,
+      default: []
+    },
+    height:{
+      type:Number,
+      default:500,
+    }
+  },
+  data(){
+    return {
+      tableColumn:[
+        { field: 'gl', title: '日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bbgs', title: '白班', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ybgs', title: '夜班', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'gx', title: '工位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sbbh', title: '设备编码', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sbmc', title: '设备名称', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sbde', title: '设备定额', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ch', title: '船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pl', title: '批次', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xqrq', title: '钢板需求期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dzks', title: '小组开始', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dz', title: '大组', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'type', title: '类型（手工/数控）', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zl', title: '组立', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'kw', title: '跨位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'tzmc', title: '套料图名称', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'tzbh', title: '套料图号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wpgg', title: '规格', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'wpcz', title: '材质', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sl', title: '数量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'jglx', title: '加工路线', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'de', title: '定额', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zrc', title: '中日程', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        }
+      ],
+    }
+  },
+  methods:{
+    getSelectData(){
+      const data=this.$refs.xGrid.getCheckboxRecords();
+      return data;
+    }
+  }
+}
+</script>
diff --git a/src/views/jhzx/components/sygdpc/Third.vue b/src/views/jhzx/components/sygdpc/Third.vue
new file mode 100644
index 0000000..86fb168
--- /dev/null
+++ b/src/views/jhzx/components/sygdpc/Third.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id2"
+      ref="xGrid2"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn"
+      :data="list"
+      :custom-config="{ storage: true }"
+      :cell-style="cellStyle"
+      highlight-current-row
+      highlight-hover-row
+      show-overflow
+      :scroll-y="{enabled: true}"
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'Third',
+  props:{
+    queryParam:Object,
+    list:{
+      type:Array,
+      default:[]
+    },
+    height:{
+      type:Number,
+      default:500,
+    }
+  },
+  data(){
+    return {
+      tableColumn: [
+        {type: 'seq', width: 60, title: '序号', fixed: "left"},
+        {
+          field: 'dcCh', title: '船号', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: '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: 'xzjsq', title: 'a=批量表（钢加小组结束）', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'xzglxq', title: 'b=钢料滚动需求（小组）', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombin ation',}
+        },
+        {
+          field: 'xzcz', title: 'b-a=时间差(小组)', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dzjsq', title: 'c=批量表（钢加大组结束）', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dzglxq', title: 'd=钢料滚动需求（大组）', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: 'dzcz', title: 'd-c=时间差(大组)', width: 180,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+      ],
+    }
+  },
+  methods:{
+    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'
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index f872f17..1a7b5cd 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -26,77 +26,82 @@
     <el-container style="padding-top: 0px">
       <el-main>
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="前方三月需求计划" name="first" v-show="isUser">
+          <el-tab-pane label="三月滚动计划编制" name="sygdjh" v-show="isUser">
             <div class="mytable">
-              <el-button type="success" @click="sygdPC()"> 提取明细</el-button>
-              <el-button type="success" @click="symxhz">汇总</el-button>
+              <el-button type="success" @click="paichan">三月滚动计划编制</el-button>
+              <el-button type="success" @click="jgcx">读取三月滚动</el-button>
               <vxe-grid
-                id="id"
-                ref="xGrid"
+                id="id9"
+                ref="xGrid9"
                 border
                 resizable
                 keep-source
                 :align="'center'"
                 :height="height"
                 :auto-resize="true"
-                :columns="tableColumn"
+                :columns="tableColumn9"
                 highlight-current-row
-                :data="list"
+                :data="list1"
                 :custom-config="{ storage: true }"
                 :scroll-y="{enabled: true}"
-                :span-method="rowspanMethod1"
                 highlight-hover-row
                 show-overflow
                 show-header-overflow
               >
               </vxe-grid>
-<!--              <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 }"-->
-<!--                :edit-config="{-->
-<!--                            trigger: 'click',-->
-<!--                            mode: 'row',-->
-<!--                            showStatus: true,-->
-<!--                          }"-->
-<!--                @checkbox-all="selectAllEvent"-->
-<!--                @checkbox-change="selectChangeEvent"-->
-<!--                highlight-current-row-->
-<!--                highlight-hover-row-->
-<!--                show-overflow-->
-<!--                :scroll-y="{enabled: true}"-->
-<!--              >-->
-<!--              </vxe-grid>-->
             </div>
           </el-tab-pane>
-          <el-tab-pane label="三月滚动计划编制">
+          <el-tab-pane label="前方三月需求计划" name="first">
             <div class="mytable">
+              <el-button type="success" @click="paichan" v-show="isUser">三月滚动计划编制</el-button>
+              <el-button type="success" @click="jgcx" v-show="isUser">读取三月滚动</el-button>
+              <el-button type="success" @click="sygdPC()" v-show="!isUser"> 提取明细</el-button>
+              <el-button type="success" @click="symxhz" v-show="!isUser">汇总</el-button>
               <vxe-grid
-                id="id9"
-                ref="xGrid9"
+                id="id"
+                ref="xGrid"
                 border
                 resizable
                 keep-source
                 :align="'center'"
                 :height="height"
                 :auto-resize="true"
-                :columns="tableColumn9"
+                :columns="tableColumn"
                 highlight-current-row
-                :data="list1"
+                :data="list"
                 :custom-config="{ storage: true }"
+                :scroll-y="{enabled: true}"
+                :span-method="rowspanMethod1"
                 highlight-hover-row
                 show-overflow
                 show-header-overflow
               >
               </vxe-grid>
+              <!--              <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 }"-->
+              <!--                :edit-config="{-->
+              <!--                            trigger: 'click',-->
+              <!--                            mode: 'row',-->
+              <!--                            showStatus: true,-->
+              <!--                          }"-->
+              <!--                @checkbox-all="selectAllEvent"-->
+              <!--                @checkbox-change="selectChangeEvent"-->
+              <!--                highlight-current-row-->
+              <!--                highlight-hover-row-->
+              <!--                show-overflow-->
+              <!--                :scroll-y="{enabled: true}"-->
+              <!--              >-->
+              <!--              </vxe-grid>-->
             </div>
           </el-tab-pane>
           <el-tab-pane label="线表信息" name="second">
@@ -290,7 +295,18 @@
 <script>
 import router from "@/router";
 import {getCzxx} from '@/api/jhzx/qfxq'
-import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList, tqSygd1} from '@/api/jhzx/sygd'
+import {
+  getList,
+  sygdPC,
+  saveByDcch,
+  tqSygd,
+  symxhz,
+  getCnsb,
+  saveMxList,
+  tqSygd1,
+  排产,
+  获取排产结果
+} from '@/api/jhzx/sygd'
 import {mapGetters} from 'vuex'
 import XEUtils from 'xe-utils'
 import {getToken} from '@/utils/auth'
@@ -2591,67 +2607,68 @@ export default {
         },
       ],
       tableColumn9:[
-        { field: 'gl', title: '日期', width: 120,
+        { field: 'day', title: '日期', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'bbgs', title: '白班', width: 120,
+        { field: '白班时长', title: '白班', width: 70,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'ybgs', title: '夜班', width: 120,
+        { field: '二班时长', title: '夜班', width: 70,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'gx', title: '工位', width: 120,
+        { field: '工序', title: '工序', width: 70,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sbbh', title: '设备编码', width: 120,
+        { field: 'kw', title: '套料图名称', width: 100,formatter:['dictFormat','QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sbmc', title: '设备名称', width: 120,
+        { field: '产能', title: '定额', width: 70,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sbde', title: '设备定额', width: 120,
+        { field: '设备编号', title: '设备编码', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'ch', title: '船号', width: 120,
+        { field: '设备名称', title: '设备名称', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'pl', title: '批次', width: 120,
+        { field: '设备产能', title: '设备定额', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'xqrq', title: '钢板需求期', width: 120,
+        { field: 'dcCh', title: '船号', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dzks', title: '小组开始', width: 120,
+        { field: 'dcPl', title: '批量', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dz', title: '大组', width: 120,
+        { field: 'xzglxq', title: '小组需求期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'type', title: '类型（手工/数控）', width: 120,
+        { field: 'dzglxq', title: '大组需求期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zl', title: '组立', width: 120,
+        { field: 'czlx', title: '操作类型(手工/数控)', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'kw', title: '跨位', width: 120,
+        //下面是bom的表头
+        { field: 'zl', title: '组立', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tzmc', title: '套料图名称', width: 120,
+        { field: 'kw', title: '跨位', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -2659,30 +2676,22 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'wpgg', title: '规格', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'wpcz', title: '材质', width: 120,
+        { field: 'wpgg', title: '规格', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'sl', title: '数量', width: 120,
+        { field: 'wpcz', title: '材质', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jglx', title: '加工路线', width: 120,
+        { field: 'ljsl', title: '数量', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'de', title: '定额', width: 120,
+        { field: '_degs', title: '定额', width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zrc', title: '中日程', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        }
       ]
     }
   },
@@ -2894,7 +2903,7 @@ export default {
       getCzxx({}).then(res => {
         this.dictData = res.data
       })
-      this.queryParam.beginTime = new Date();
+      this.queryParam.beginTime = XEUtils.toDateString(XEUtils.getWhatMonth(new Date(), 0, 1),'yyyy/MM/dd')
     },
     //初始化表1 数据
     initList() {
@@ -2919,6 +2928,65 @@ export default {
     getHeight() {
       this.height = window.innerHeight - 200
     },
+    paichan(){
+      const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
+      排产(data).then(res=>{
+        this.jgcx()
+      })
+    },
+    jgcx(){
+      const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
+      const list=[]
+
+      const 工序表=['上料','抛丸','理料','划线','切割','坡口','曲型','打磨','型材面板']
+      获取排产结果(data).then(res=>{
+        this.activeName="sygdjh"
+        const zy=res.data.zy
+        console.log(res)
+        const list=[]
+        Object.keys(zy).forEach(key=>{
+          if (key>=this.queryParam.beginTime&&key<=this.queryParam.endTime){
+            const 工序产能MAP=zy[key].工序产能MAP
+            for (const 工序 of 工序表) {
+              const 工序产能=工序产能MAP[工序]
+              const 设备=工序产能.设备
+              Object.keys(设备).forEach(_key=>{
+                const _设备=设备[_key]
+                for (const bom of _设备.资源占用图表) {
+                  if (bom){
+                    const data={
+                      day:key,
+                    }
+                    data.白班时长=工序产能.白班时长
+                    data.二班时长=工序产能.二班时长
+                    data.工序=工序
+                    data.产能=工序产能.产能
+                    data.设备编号=_key
+                    data.设备名称=_key
+                    data.设备产能=_设备.产能
+
+                    data.dcCh=bom.dcch
+                    data.dcPl=bom.pl
+                    data.xzglxq=bom.xzglxq
+                    data.dzglxq=bom.dzglxq
+                    data.zl=bom.zl
+                    data.kw=bom.kw
+                    data.tzbh=bom.tzbh
+                    data.wpgg=bom.wpgg
+                    data.wpcz=bom.wpcz
+                    data.ljsl=bom.ljsl
+                    data._degs=bom.degs
+                    list.push(data)
+                  }
+                }
+              })
+            }
+          }
+        })
+        console.log(list)
+        this.list1=list
+      })
+    },
     //明细排产
     sygdPC() {
       this.$store.dispatch('app/closeSideBar', true)
@@ -2935,14 +3003,7 @@ export default {
       this.activeName = 'first'
     },
     format (val) {
-      var date = new Date(val); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
-
-      date.setMonth(date.getMonth()+2);
-      var Y = date.getFullYear() + "/";
-      var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1)+ "/";
-      var D = date.getDate()<10?  "0" +date.getDate():date.getDate();
-      this.queryParam.endTime=Y + M + D;
-
+      this.queryParam.endTime=XEUtils.toDateString(XEUtils.getWhatMonth(val, 2, 'last'),'yyyy/MM/dd')
     }
   }
 }
diff --git a/src/views/jhzx/symxCX_1.vue b/src/views/jhzx/symxCX_1.vue
new file mode 100644
index 0000000..2f9e8bf
--- /dev/null
+++ b/src/views/jhzx/symxCX_1.vue
@@ -0,0 +1,235 @@
+<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" fromat="yyyy/MM/dd"  type="month"  style="width: 33%;" />
+              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
+              <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" fromat="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="tqSygd">提交三月滚动</el-button>
+              <el-button type="success" @click="钢料需求倒排三月滚动计划">三月滚动计划编制</el-button>
+              <el-button type="success" @click="三月滚动计划数据读取">读取三月滚动</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-header>
+    <el-container style="padding-top: 0px">
+      <el-main>
+        <MyTabs ref="myTabsRef" :height="height" :queryParam="queryParam" />
+      </el-main>
+    </el-container>
+    <SelectShipModal ref="selectShipModalRef"/>
+    <ShowDetailModal ref="showDetailModalRef"/>
+  </el-container>
+</template>
+<script>
+import router from "@/router";
+import {getList, tqSygd, 排产, 获取排产结果} from '@/api/jhzx/sygd'
+import {mapGetters} from 'vuex'
+import XEUtils from 'xe-utils'
+import MyTabs from "@/views/jhzx/components/sygdpc/MyTabs.vue";
+import SelectShipModal from "@/views/jhzx/components/sygdpc/SelectShipModal.vue";
+import ShowDetailModal from "@/views/jhzx/components/sygdpc/ShowDetailModal.vue";
+
+export default {
+  name: 'SymxCX',
+  components: {ShowDetailModal, SelectShipModal, MyTabs},
+  data() {
+    return {
+      isUser:true,
+      queryParam: {
+        beginTime: '',
+        endTime: ''
+      },
+      dictData: [],
+      height: '500px',
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm','yhdm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+    if(this.yhdm=='UserAdmin'||this.yhdm=='user02'){
+      this.isUser=false
+    }
+  },
+  watch: {
+    'queryParam.beginTime'(newValue, Value){
+      if (newValue){
+        this.format(newValue);
+      }
+    }
+  },
+  methods: {
+    钢料需求倒排三月滚动计划(){
+      console.log(111)
+      const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
+      排产(data).then(res=>{
+        this.三月滚动计划数据读取()
+      })
+    },
+    三月滚动计划数据读取(){
+      const data={from:this.queryParam.beginTime,to:this.queryParam.endTime}
+      获取排产结果(data).then(res=>{
+        this.activeName="sygdjh"
+        console.log(res)
+      })
+    },
+    //提交三月滚动
+    tqSygd() {
+      console.log(111)
+      const list=this.$refs.myTabsRef.getSelectData();
+      if (list.length===0){
+        this.$message.warning('请先选择三月滚动计划明细数据！');
+        return
+      }
+      tqSygd(this.list).then((res) => {
+        if (res.data) {
+          router.push({
+            name: 'SygdWH',
+            params: {
+              list: res.data
+            }
+          })
+        } else {
+          this.$message.warning('请先提取明细！');
+        }
+      })
+    },
+    //转码信息
+    initBase() {
+      this.queryParam.beginTime = XEUtils.toDateString(XEUtils.getWhatMonth(new Date(), 0, 1),'yyyy/MM/dd')
+    },
+    initList() {
+      if (this.queryParam.beginTime === '' || this.queryParam.endTime === '') {
+        this.$message.warning('选择时间范围')
+        return
+      }
+      getList(this.queryParam).then((res) => {
+        this.activeName = 'sygdjhDetail'
+        this.$refs.myTabsRef.initData('sygdjhDetail',res.data.list)
+      })
+    },
+    format (val) {
+      this.queryParam.endTime=XEUtils.toDateString(XEUtils.getWhatMonth(val, 2, 'last'),'yyyy/MM/dd')
+    },
+    getHeight() {
+      this.height = window.innerHeight - 200
+    },
+  }
+}
+</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>