From 51e20d3bde90da8f5cc0fa378e0d6d5c1355fda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 20 Mar 2024 10:44:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E7=9B=B4?=
 =?UTF-8?q?=E8=A7=82=E5=9B=BE=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/components/fd/child/bcxq.vue    |  154 +++
 .../dashboard/components/fd/child/kwxx.vue    |  396 ++++++
 .../dashboard/components/fd/child/plxx.vue    |  250 ++++
 .../components/fd/child/sygdxqjh.vue          |  607 +++++++++
 .../dashboard/components/fd/child/tab.vue     |   64 +
 .../dashboard/components/fd/child/xbjh.vue    |  209 +++
 .../dashboard/components/fd/child/zgt.vue     |  151 +++
 .../dashboard/components/fd/czfdzgtcx.vue     | 1128 +----------------
 src/views/dashboard/index.vue                 |    2 +-
 src/views/jhzx/symxCX.vue                     |    2 +-
 10 files changed, 1853 insertions(+), 1110 deletions(-)
 create mode 100644 src/views/dashboard/components/fd/child/bcxq.vue
 create mode 100644 src/views/dashboard/components/fd/child/kwxx.vue
 create mode 100644 src/views/dashboard/components/fd/child/plxx.vue
 create mode 100644 src/views/dashboard/components/fd/child/sygdxqjh.vue
 create mode 100644 src/views/dashboard/components/fd/child/tab.vue
 create mode 100644 src/views/dashboard/components/fd/child/xbjh.vue
 create mode 100644 src/views/dashboard/components/fd/child/zgt.vue

diff --git a/src/views/dashboard/components/fd/child/bcxq.vue b/src/views/dashboard/components/fd/child/bcxq.vue
new file mode 100644
index 0000000..4f4127a
--- /dev/null
+++ b/src/views/dashboard/components/fd/child/bcxq.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id4"
+      ref="xGrid4"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn7"
+      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:{
+    height:String,
+    list:Array,
+  },
+  data(){
+    return {
+      tableColumn7: [
+        {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:{
+    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};
+          }
+        }
+      }
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    cellStyle2({row}) {
+      if (this.gcrl.includes(row.jssj)) {
+        return {
+          color: 'red',
+          cursor: 'pointer'
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/fd/child/kwxx.vue b/src/views/dashboard/components/fd/child/kwxx.vue
new file mode 100644
index 0000000..511aa27
--- /dev/null
+++ b/src/views/dashboard/components/fd/child/kwxx.vue
@@ -0,0 +1,396 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id3"
+      ref="xGrid3"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn3"
+      highlight-current-row
+      :data="list"
+      :custom-config="{ storage: true }"
+      :span-method="rowspanMethod"
+      :scroll-y="{enabled: true}"
+      highlight-hover-row
+      show-overflow
+      show-header-overflow
+      @cell-dblclick="cellClickEvent_xb"
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'Kwxx',
+  props:{
+    height:String,
+    list:Array,
+  },
+  data(){
+    return {
+      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',},
+        },
+      ],
+    }
+  },
+  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};
+          }
+        }
+      }
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    cellStyle2({row}) {
+      if (this.gcrl.includes(row.jssj)) {
+        return {
+          color: 'red',
+          cursor: 'pointer'
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/fd/child/plxx.vue b/src/views/dashboard/components/fd/child/plxx.vue
new file mode 100644
index 0000000..1ab2ef2
--- /dev/null
+++ b/src/views/dashboard/components/fd/child/plxx.vue
@@ -0,0 +1,250 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id2"
+      ref="xGrid2"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn2"
+      :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:'Plxx',
+  props:{
+    height:String,
+    list:Array,
+  },
+  data(){
+    return {
+      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',}
+        },
+      ],
+    }
+  },
+  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};
+          }
+        }
+      }
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    cellStyle2({row}) {
+      if (this.gcrl.includes(row.jssj)) {
+        return {
+          color: 'red',
+          cursor: 'pointer'
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/fd/child/sygdxqjh.vue b/src/views/dashboard/components/fd/child/sygdxqjh.vue
new file mode 100644
index 0000000..f812577
--- /dev/null
+++ b/src/views/dashboard/components/fd/child/sygdxqjh.vue
@@ -0,0 +1,607 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id"
+      ref="xGrid"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn"
+      :data="list"
+      :custom-config="{ storage: true }"
+      :edit-config="{trigger: 'click',mode: 'row',showStatus: true,}"
+      @checkbox-all="selectAllEvent"
+      @checkbox-change="selectChangeEvent"
+      :cell-style="cellStyle2"
+      highlight-current-row
+      highlight-hover-row
+      show-overflow
+      :scroll-y="{enabled: true}"
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'Sygdxqjh',
+  props:{
+    height:String,
+    list:Array,
+  },
+  data(){
+    return {
+      tableColumn: [
+        {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:{
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    cellStyle2({row}) {
+      if (this.gcrl.includes(row.jssj)) {
+        return {
+          color: 'red',
+          cursor: 'pointer'
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/fd/child/tab.vue b/src/views/dashboard/components/fd/child/tab.vue
new file mode 100644
index 0000000..1857bf0
--- /dev/null
+++ b/src/views/dashboard/components/fd/child/tab.vue
@@ -0,0 +1,64 @@
+<template>
+  <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tab-pane label="前方三月需求计划" name="first">
+      <Sygdxqjh :height="height" :list="list" />
+    </el-tab-pane>
+    <el-tab-pane label="线表信息" name="second">
+      <Xbjh :height="height" :list="list1" />
+    </el-tab-pane>
+    <el-tab-pane label="批量信息" name="third">
+      <Plxx :height="height" :list="list2" />
+    </el-tab-pane>
+    <el-tab-pane label="板材需求" name="">
+      <Bcxq :height="height" :list="list4" />
+    </el-tab-pane>
+    <el-tab-pane label="跨位信息" name="fourth">
+      <Kwxx :height="height" :list="list3" />
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import Sygdxqjh from "@/views/dashboard/components/fd/child/sygdxqjh.vue";
+import Xbjh from "@/views/dashboard/components/fd/child/xbjh.vue";
+import Plxx from "@/views/dashboard/components/fd/child/plxx.vue";
+import Kwxx from "@/views/dashboard/components/fd/child/kwxx.vue";
+import Bcxq from "@/views/dashboard/components/fd/child/bcxq.vue";
+
+export default {
+  name:'Tabs',
+  components: {Bcxq, Kwxx, Plxx, Xbjh, Sygdxqjh},
+  props:{
+    data:Object
+  },
+  data(){
+    return {
+      activeName: 'first',
+      height: '500px',
+      list:[],
+      list1:[],
+      list2:[],
+      list3:[],
+      list4:[],
+    }
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+  },
+  methods:{
+    showData(fd){
+      this.list1=this.data.list1
+      this.list2=this.data.list2
+      this.list3=this.data.list3
+      this.list4=this.data.list4
+    },
+    handleClick(tab, event) {
+
+    },
+    getHeight() {
+      this.height = window.innerHeight - 718+'px'
+    },
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/fd/child/xbjh.vue b/src/views/dashboard/components/fd/child/xbjh.vue
new file mode 100644
index 0000000..ca1fb03
--- /dev/null
+++ b/src/views/dashboard/components/fd/child/xbjh.vue
@@ -0,0 +1,209 @@
+<template>
+  <div class="mytable">
+    <vxe-grid
+      id="id1"
+      ref="xGrid1"
+      border
+      resizable
+      keep-source
+      :align="'center'"
+      :height="height"
+      :auto-resize="true"
+      :columns="tableColumn1"
+      highlight-current-row
+      :data="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:'Xbjh',
+  props:{
+    height:String,
+    list:Array,
+  },
+  data(){
+    return {
+      tableColumn1: [
+        {type: 'seq', width: 60, title: '序号', fixed: "left"},
+        {
+          field: 'nf', title: '年份', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
+          filterRender: {name: 'FilterCombination',}
+        },
+        {
+          field: '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',}
+        },
+      ],
+    }
+  },
+  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};
+          }
+        }
+      }
+    },
+    // 全选
+    selectAllEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    // 单选
+    selectChangeEvent() {
+      const records = this.$refs.xGrid.getCheckboxRecords();
+      this.checkedList = records;
+    },
+    cellStyle2({row}) {
+      if (this.gcrl.includes(row.jssj)) {
+        return {
+          color: 'red',
+          cursor: 'pointer'
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/fd/child/zgt.vue b/src/views/dashboard/components/fd/child/zgt.vue
new file mode 100644
index 0000000..213ede3
--- /dev/null
+++ b/src/views/dashboard/components/fd/child/zgt.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="mytablefdt" style="display: flex;justify-content: center;align-items: center;">
+    <vxe-grid
+      id="id"
+      ref="xGridFd"
+      :empty-text="emtext"
+      :height="520"
+      resizable
+      :columns="tableColumn"
+      :data="tableData"
+      :show-header="false"
+      align="center"
+      @cell-click="cellClick"
+      border=none
+      :cell-style="cellStyle"
+    >
+    </vxe-grid>
+  </div>
+</template>
+
+<script>
+export default {
+  name:'Zgt',
+  props:{
+    czbh:String,
+  },
+  data(){
+    return{
+      columns:[],
+      tableData:[],
+      tableColumn: [],
+      tableDataMainAll:[],
+      fds:[],
+      emtext:''
+    }
+  },
+  methods:{
+    show(res){
+      this.tableColumn=[]
+      this.emtext=this.czbh+"尚未定义直观图请于分段制造部管理人员联系！"
+      if(res.success) {
+        const col = res.data.col;
+        for (let i = 0; i <= col; i++) {
+          let ii = i + '';
+          let aaa = 'column' + ii.padStart(3, '0');
+          this.columns.push(aaa);
+          let temp1 = {
+            title: `111`, width: "35px", field: `column${ii.padStart(3, '0')}`, type: "html",
+            slots: {
+              // 使用 JSX 渲染
+              default: ({row, column}) => {
+                return [
+                  <a>{row[column.property]}</a>
+                ]
+              }
+            }
+          };
+          this.tableColumn.push(temp1)
+        }
+        this.tableData=res.data.data
+        this.tableDataMainAll=res.data.fdqk
+        this.fds=res.data.fd
+      }
+    },
+    cellClick({row,column}){
+      if( row[column.field] ==='' ||  row[column.field]===undefined ||  row[column.field]===null){
+        return
+      }else{
+        this.$confirm('是否选择'+ row[column.field] +'分段数据?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          distinguishCancelAndClose: false,
+          type: 'warning'
+        }).then(type => {
+          this.row = row
+          this.column = column
+          this.tableDataMain = this.tableDataMainAll.filter((item) => {
+            return item.fdh == row[column.field];
+          });
+        })
+      }
+    },
+    cellStyle({ row, rowIndex, column }) {
+      for(let index of this.fds) {
+        if(index.fdh===row[column.property]){
+          if(index.color==='green'){
+            if (this.row === row && this.column === column) {
+              return {
+                backgroundColor: '#00FF00',
+                border:'1px solid black',
+                color:'blue'
+              }
+            }else{
+              return {
+                backgroundColor: '#00FF00',
+                border:'1px solid black',
+                color:'black'
+              }
+            }
+          }
+          if(index.color==='yellow'){
+            if (this.row === row && this.column === column) {
+              return {
+                backgroundColor: '#FFFF00',
+                border:'1px solid black',
+                color:'blue'
+              }
+            }else{
+              return {
+                backgroundColor: '#FFFF00',
+                border:'1px solid black',
+                color:'black'
+              }
+            }
+          }
+          if(index.color==='red'){
+            if (this.row === row && this.column === column) {
+              return {
+                backgroundColor: '#FF0000',
+                border:'1px solid black',
+                color:'blue'
+
+              }
+            }else{
+              return {
+                backgroundColor: '#FF0000',
+                border:'1px solid black',
+                color:'black'
+              }
+            }
+          }
+        }
+      }
+
+      if(row[column.property]){
+        if (this.row === row && this.column === column) {
+          return {
+            border:'1px solid black',
+            color:'blue'
+          }
+        }else{
+          return {
+            border:'1px solid black',
+            color:'black'
+          }
+        }
+      }
+    },
+  }
+}
+</script>
diff --git a/src/views/dashboard/components/fd/czfdzgtcx.vue b/src/views/dashboard/components/fd/czfdzgtcx.vue
index 7e6a68b..eecfb51 100644
--- a/src/views/dashboard/components/fd/czfdzgtcx.vue
+++ b/src/views/dashboard/components/fd/czfdzgtcx.vue
@@ -36,78 +36,10 @@
       </el-form>
     </el-header>
     <hr style="margin: 0.5%">
-    <el-container  style="padding-top: 0px">
+    <el-container style="padding-top: 0px">
       <el-main>
-        <div class="mytablefdt" style="display: flex;justify-content: center;align-items: center;">
-          <vxe-grid
-            id="id"
-            ref="xGridFd"
-            :empty-text="emtext"
-            show-footer
-            :height="520"
-            resizable
-            :columns="tableColumn"
-            :data="tableData"
-            :show-header="false"
-            align="center"
-            @cell-click="cellClick"
-            border=none
-            :cell-style="cellStyle"
-          >
-          </vxe-grid>
-        </div>
-        <el-tabs v-model="activeName" >
-          <el-tab-pane label="汇总" name="first">
-            <span slot="label" class="fontClass">汇总</span>
-            <div class="mytable">
-              <vxe-grid
-                id="id"
-                ref="xGridMain"
-                border
-                resizable
-                :custom-config="{storage: true}"
-                :height="330"
-                :row-config="{isHover: true,isCurrent:true}"
-                :columns="tableColumnMain"
-                :data="tableDataMain"
-                align="center"
-                :span-method="spanMethods"
-                show-header-overflow
-                :cell-style="cellStyle1"
-              >
-                <template #tpbh="{ row }">
-                  <span style="cursor:pointer;color: blue" @click="tpbhClcik(row)">{{ row.tpbh }}</span>
-                </template>
-                <template #fdh="{ row }">
-                  <span style="cursor:pointer;color: blue" @click="fdhClcik(row)">{{ row.fdh }}</span>
-                </template>
-              </vxe-grid>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="明细" name="second">
-            <span slot="label" class="fontClass">明细</span>
-            <div class="mytable" >
-              <vxe-grid
-                id="id"
-                ref="xGrid"
-                border
-                :footer-method="footerMethod"
-                resizable
-                :custom-config="{storage: true}"
-                :height="330"
-                :row-config="{isHover: true,isCurrent:true}"
-                :columns="tableColumnMx"
-                :data="tableDataMx"
-                align="center"
-                show-header-overflow
-                :row-class-name="rowClassName"
-                :header-cell-style="headerCellStyle"
-                :show-footer="true"
-              >
-              </vxe-grid>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
+        <Zgt ref="zgtRef" :czbh="this.queryParam.czbh"/>
+        <Tabs :data="tabsData"/>
       </el-main>
     </el-container>
   </el-container>
@@ -121,489 +53,34 @@ import { Message } from 'element-ui'
 import { getCzFdBase, getList, upload, getListFdMx, findTPxqjh } from '@/api/fd/base'
 import XEUtils from 'xe-utils'
 import { getSumAdd } from '@/utils/rpkj'
+import Tabs from "@/views/dashboard/components/fd/child/tab.vue";
+import Zgt from "@/views/dashboard/components/fd/child/zgt.vue";
 export default {
   // 船只分段直观图定义
   name: 'Czfdzgtcx',
+  components: {Zgt, Tabs},
   data() {
     return {
-      emtext:'',
+      tabsData:{},
       defaultHeight: { height: '' },
-      tableDataMain:[],
-      tableDataMainAll:[],
-      tableColumnMx: [
-        { type: 'seq', width: 60, title: '序号' },
-        { field: 'jhqh', title: '计划期号', width: 100 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'czbh', title: '船只编号', width: 90 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zyjd', title: '作业阶段', width: 90 ,formatter: ['dictXtFormat','ZYJD'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'fdh', title: '分段号', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'tpbh', title: '托盘表号', width: 110 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'hh', title: '行号', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'azth', title: '安装图号', width: 100 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zztph', title: '批号/卡号', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zzth', title: '制作图号', width: 110 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zztmc', title: '制作图名称', width: 150 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'bjdh', title: '部件号', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'bjmc', title: '部件名称', width: 100 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'wpgg', title: '规格+型号+材质', width: 210 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhxqrq', title: '集团三月滚动计划期', width: 150 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'fdxqrq', title: '分段计划需求期', width: 150 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zyzzssbm', title: '需求部门', width: 100 ,formatter: ['ddeptFormat'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zyzzcjmc', title: '作业车间及场地', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xqsl', title: '需求数量', width: 70 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'bjzl', title: '单重', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'bjzzl', title: '总重', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xzjhrkrq', title: '舾装公司计划集配入库', width: 160 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zdcp', title: '重点产品', width: 100 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'tplx', title: '部件分类', width: 100 ,formatter: ['dictFormat','TPLX'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'ygpprq', title: '预计配送期', width: 100 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'fkpprq', title: '反馈配送期', width: 150 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xqtsc', title: '需求/反馈差距', width: 160 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'fkwtsm', title: '反馈说明', width: 100 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'sscj', title: '所属车间', width: 100 ,formatter: ['dictFormat','BMBM'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhlx', title: '计划类型', width: 100 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhjtrq', title: '设计院计划发图日期', width: 150 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jtxqts', title: '需求发图天数差', width: 150 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'sjltsj', title: '实际接图日期', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'ltxqts', title: '需求来图天数差', width: 130 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhxqrq_sq', title: '上期滚动计划需求日期', width: 160 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhbgts', title: '变更天数', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhxqrq_ls', title: '滚动计划需求期变更历史', width: 165 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'por_no', title: '采购需求编号', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'lc', title: '来处', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-
-        { field: 'zzt_zt', title: '技术处理状态', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zzt_gyspsj', title: '工艺审批时间', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zzt_cplx', title: '产品类型', width: 120 ,formatter: ['dictFormat','CPLX'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zzt_clfs', title: '表面处理方式', width: 120 ,formatter: ['dictFormat','CLFS'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zzt_bmcl', title: '表面处理', width: 120 ,formatter: ['dictFormat','CLFS'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zzt_ntzdm', title: '内表面涂装代码', width: 130 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zzt_wtzdm', title: '外表面涂装代码', width: 130 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xglx', title: '修改类型', width: 120 ,formatter: ['dictFormat','TPXG'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xgph', title: '修改批号/卡号', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xgsj', title: '修改时间', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xgtzdh', title: '修改通知单号', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'sc_zt', title: '制作状态', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'sgdw', title: '结构施工单位', width: 120 ,formatter: ['deptFormat'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jgwgrq', title: '结构实际完工日期', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'tzdw', title: '表面处理单位', width: 120 ,formatter: ['deptFormat'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'tzjsrq', title: '表面处理接收日期', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'tzwgrq', title: '表面处理时间完工日期', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'scqkbz', title: '生产情况备注', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'psdw', title: '配送单位', width: 120 ,formatter: ['deptFormat'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jprkrq', title: '集配入库完工时间', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'ps_zt', title: '配送状态', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfsqrq', title: '前方配送申请日期', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfxqrq', title: '前方实际需求期', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfpssl', title: '前方配送数量', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfpswc', title: '配送完成情况', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfpsrq', title: '实际配送日期', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfqrrq', title: '配送确认日期', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'psqkbz', title: '配送情况备注', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhdrry', title: '计划导入人员', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhdrrq', title: '计划导入日期', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-      ],
-      tableColumnMain:[
-        { type: 'seq', width: 60, title: '序号' },
-
-        { field: 'czbh', title: '船只编号', width: 90 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'fdh', title: '分段号', width: 80 ,
-          slots: { default: 'fdh' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'tpbh', title: '托盘表号', width: 110 ,
-          slots: { default: 'tpbh' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zyzzssbm', title: '需求部门', width: 100 ,formatter: ['ddeptFormat'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zyzzcjmc', title: '作业车间及场地', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'tplx', title: '物质类别', width: 110 ,formatter: ['dictFormat','TPLX'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xqsl', title: '需求数量', width: 90 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'pssl', title: '配送数量', width: 90 ,formatter:['numberFormat','zero'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'psbfb', title: '实际配送率', width: 100 ,formatter:['numberFormat','percent',2],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'pssl0', title: '按期配送率', width: 100 ,formatter:['numberFormat','percent',2],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'pssl5', title: '预计5日配送率', width: 100 ,formatter:['numberFormat','percent',2],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'pssl10', title: '预计10日配送率', width: 100 ,formatter:['numberFormat','percent',2],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'pssl15', title: '预计15日配送率', width: 100 ,formatter:['numberFormat','percent',2],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfxqrq', title: '前方实际需求期 ', width: 130 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'fdxqrq', title: '分段计划需求期', width: 130 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jhxqrq', title: '集团计划需求期', width: 130 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'yjtgq', title: '预计提供期', width: 110 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'sjpsrqmin', title: '配送开始期', width: 110 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'sjpsrqmax', title: '配送结束期', width: 110 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-      ],
       activeName: 'first',
-      tableDataMx: [
-
-      ],
+      tableDataMx: [],
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/api/dmCzfddyb/upload',
       uploadData: {},
       queryParam: {
         czbh: '',
-        ph: '',
-        kh: '',
-        dwgNo: '',
-        departCode: '02'
       },
       uploadState: 0,
       isupload:'01',
       dictData: {},
       projectData: [],
       col:0,
-      //    tableData: [],
-      tableColumn: [
-
-      ],
       row:'',
       column:'',
       columns:[],
       filterName1:'',
-      tableData: [
-
-      ],
-      fds:[],
+      tableData: [],
     }
   },
   computed: {
@@ -612,416 +89,16 @@ export default {
       'bmbm',
       'apbm'
     ]),
-
-    // list() {
-    //   if (this.tableData===undefined){
-    //
-    //     return []
-    //   }
-    //   const filterName = XEUtils.toString(this.filterName1).trim().toLowerCase();
-    //   if (filterName) {
-    //     const filterRE = new RegExp(filterName, 'gi');
-    //     const searchProps = this.columns
-    //     // const rest = this.tableData.filter(item => searchProps.some(key => XEUtils.toString(item[key]).toLowerCase().indexOf(filterName) > -1));
-    //     const rest = this.tableData
-    //     return rest.map(row => {
-    //
-    //       const item = Object.assign({}, row);
-    //
-    //       searchProps.forEach(key => {
-    //         if(XEUtils.toString(item[key]).toLowerCase().indexOf(filterName) > -1){
-    //           item[key] = XEUtils.toString(item[key]).replace(filterRE, match => `<span style='background-color: #FFFF00;'>${match}</span>`);
-    //         }
-    //
-    //       });
-    //
-    //
-    //       return item
-    //     })
-    //   }
-    //   return this.tableData
-    // }
-
-
   },
   created() {
-    // window.addEventListener('resize', this.getHeight)
-    // this.getHeight()
     this.emtext='暂无数据'
     this.baseSeacrh()
     this.uploadState=0
-    // this.loadData()
-    if(this.apbm.length>2){
-      // this.queryParam.xqdw=this.apbm
-      this.flag=true;
-    }else{
-      this.flag=false;
-    }
-    if(this.flag){
-      this.tableColumnMx= [
-        { type: 'seq', width: 60, title: '序号' },
-        // { field: 'jhqh', title: '计划期号', width: 100 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'czbh', title: '船只编号', width: 90 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'zyjd', title: '作业阶段', width: 90 ,formatter: ['dictXtFormat','ZYJD'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'fdh', title: '分段号', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'tpbh', title: '托盘表号', width: 110 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        // { field: 'hh', title: '行号', width: 80 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'azth', title: '安装图号', width: 100 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zztph', title: '批号/卡号', width: 80 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zzth', title: '制作图号', width: 110 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zztmc', title: '制作图名称', width: 150 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'bjdh', title: '部件号', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'bjmc', title: '部件名称', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'wpgg', title: '规格+型号+材质', width: 210 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-
-        // { field: 'jhxqrq', title: '集团三月滚动计划期', width: 150 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'fdxqrq', title: '分段计划需求期', width: 150 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zyzzssbm', title: '需求部门', width: 100 ,formatter: ['ddeptFormat'],
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'zyzzcjmc', title: '作业车间及场地', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        // { field: 'xqsl', title: '需求数量', width: 70 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'bjzl', title: '单重', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'bjzzl', title: '总重', width: 80 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        // { field: 'xzjhrkrq', title: '舾装公司计划集配入库', width: 160 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zdcp', title: '重点产品', width: 100 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'tplx', title: '部件分类', width: 100 ,formatter: ['dictFormat','TPLX'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'ygpprq', title: '预计配送期', width: 100 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'fkpprq', title: '反馈配送期', width: 150 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xqtsc', title: '需求/反馈差距', width: 160 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        // { field: 'fkwtsm', title: '反馈说明', width: 100 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'sscj', title: '所属车间', width: 100 ,formatter: ['dictFormat','BMBM'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        // { field: 'jhlx', title: '计划类型', width: 100 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'jhjtrq', title: '设计院计划发图日期', width: 150 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'jtxqts', title: '需求发图天数差', width: 150 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'sjltsj', title: '实际接图日期', width: 120 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'ltxqts', title: '需求来图天数差', width: 130 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'jhxqrq_sq', title: '上期滚动计划需求日期', width: 160 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'jhbgts', title: '变更天数', width: 120 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'jhxqrq_ls', title: '滚动计划需求期变更历史', width: 165 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'por_no', title: '采购需求编号', width: 120 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'lc', title: '来处', width: 120 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-
-
-        // { field: 'zzt_cplx', title: '产品类型', width: 120 ,formatter: ['dictFormat','CPLX'],
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zzt_clfs', title: '表面处理方式', width: 120 ,formatter: ['dictFormat','CLFS'],
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zzt_bmcl', title: '表面处理', width: 120 ,formatter: ['dictFormat','CLFS'],
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zzt_ntzdm', title: '内表面涂装代码', width: 130 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'zzt_wtzdm', title: '外表面涂装代码', width: 130 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'xglx', title: '修改类型', width: 120 ,formatter: ['dictFormat','TPXG'],
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        // { field: 'xgph', title: '修改批号/卡号', width: 120 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'xgsj', title: '修改时间', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'xgtzdh', title: '修改通知单号', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'jprkrq', title: '集配入库完工时间', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-
-        // { field: 'qfsqrq', title: '前方配送申请日期', width: 140 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        { field: 'qfxqrq', title: '前方实际需求期', width: 140 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfpssl', title: '前方配送数量', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfpswc', title: '配送完成情况', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfpsrq', title: '实际配送日期', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        { field: 'qfqrrq', title: '配送确认日期', width: 120 ,
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        // { field: 'psqkbz', title: '配送情况备注', width: 120 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'jhdrry', title: '计划导入人员', width: 120 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        // { field: 'jhdrrq', title: '计划导入日期', width: 120 ,
-        //
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' },
-        // },
-        //
-      ]
-    }
   },
   methods: {
     czbhChange(){
       this.uploadState = 1
     },
-
-    cellClick({row,column}){
-
-      if( row[column.field] ==='' ||  row[column.field]===undefined ||  row[column.field]===null){
-        return
-      }else{
-
-        this.$confirm('是否选择'+ row[column.field] +'分段数据?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          distinguishCancelAndClose: false,
-          type: 'warning'
-        }).then(type => {
-          this.row = row
-          this.column = column
-          this.tableDataMain = this.tableDataMainAll.filter((item) => {
-            return item.fdh == row[column.field];
-          });
-        })
-      }
-    },
-    tpbhClcik(row){
-      findTPxqjh({czbh1:row.czbh,tpbh1:row.tpbh}).then(res=>{
-        if(res.success){
-          this.activeName='second'
-          this.$refs.xGrid.reloadData(res.data)
-        }
-
-      })
-    },
-    fdhClcik(row){
-      findTPxqjh({czbh1:row.czbh,fdh:row.fdh}).then(res=>{
-        this.activeName='second'
-        this.$refs.xGrid.reloadData(res.data)
-      })
-    },
-
-
-    spanMethods({row, $rowIndex, column, data}){
-      let fields = ["czbh","fdh", "tpbh"]
-      let tempcol=column.property
-      if(tempcol==='czbh'){
-        tempcol='fdh'
-      }
-      let cellValue = row[tempcol]
-      if (cellValue && fields.includes(column.property)) {
-
-        let prevRow = data[$rowIndex - 1]
-        let nextRow = data[$rowIndex + 1]
-        if (prevRow && prevRow[tempcol] === cellValue) {
-          return {rowspan: 0, colspan: 0}
-        } else {
-          let countRowspan = 1
-          while (nextRow && nextRow[tempcol] === cellValue) {
-            nextRow = data[++countRowspan + $rowIndex]
-          }
-          if (countRowspan > 1) {
-            return {rowspan: countRowspan, colspan: 1}
-          }
-        }
-      }
-
-    },
-
-
     headerCellStyle ({ column, columnIndex }) {
       if (['jhxqrq','fdxqrq',
         "jhjtrq","jtxqts","qfxqrq"].includes(column.property)) {
@@ -1044,7 +121,6 @@ export default {
           color: '#ffffff'
         }
       }
-
     },
     rowClassName({ row, rowIndex ,column}){
       if(row.qfpsrq!=='' && row.qfpsrq!==undefined && row.qfpsrq!==null){
@@ -1057,7 +133,6 @@ export default {
       return [
         columns.map((column, columnIndex) => {
           if (['xqsl','bjzzl'].includes(column.property)) {
-
             return getSumAdd(data, column.property)
           }
           if (columnIndex === 1) {
@@ -1067,16 +142,11 @@ export default {
         })
       ]
     },
-
-
     uploadExcel() {
-
       if (this.queryParam.czbh === '') {
         this.$message.warning('选择工程编码')
         this.uploadState = 0
         return
-      } else {
-
       }
       this.uploadData.czbh = this.queryParam.czbh
       this.uploadData.isupload = this.isupload
@@ -1114,8 +184,6 @@ export default {
           this.$message({ message: '导入成功', type: 'success' })
           this.loadData()
         }
-
-
       } else {
         Message({
           message: res.message || 'Error',
@@ -1124,129 +192,18 @@ export default {
         })
       }
     },
-
-    cellStyle1({ row, rowIndex, column }) {
-      console.log(row)
-      console.log(column)
-      if(column.field==='psbfb') {
-        if (row.psbfb >= 90) {
-          console.log(1)
-
-          return {
-            backgroundColor: '#00FF00'
-          }
-
-        } else if (row.psbfb < 90 && row.psbfb >= 50) {
-          return {
-            backgroundColor: '#FFFF00'
-          }
-        } else if (row.psbfb < 50 && (row.qfxqrq !== undefined )) {
-          return {
-            backgroundColor: '#FF0000',
-            color: '#fff'
-          }
-        }
-      }
-    },
-
-    cellStyle({ row, rowIndex, column }) {
-
-      for(let index of this.fds) {
-        if(index.fdh===row[column.property]){
-
-          if(index.color==='green'){
-            if (this.row === row && this.column === column) {
-              return {
-                backgroundColor: '#00FF00',
-                border:'1px solid black',
-                color:'blue'
-
-              }
-            }else{
-              return {
-                backgroundColor: '#00FF00',
-                border:'1px solid black',
-                color:'black'
-                // textAlign:'center'
-              }
-            }
-
-          }
-          if(index.color==='yellow'){
-            if (this.row === row && this.column === column) {
-              return {
-                backgroundColor: '#FFFF00',
-                border:'1px solid black',
-                color:'blue'
-
-              }
-            }else{
-              return {
-                backgroundColor: '#FFFF00',
-                border:'1px solid black',
-                color:'black'
-                // textAlign:'center'
-              }
-            }
-
-          }
-          if(index.color==='red'){
-            if (this.row === row && this.column === column) {
-              return {
-                backgroundColor: '#FF0000',
-                border:'1px solid black',
-                color:'blue'
-
-              }
-            }else{
-              return {
-                backgroundColor: '#FF0000',
-                border:'1px solid black',
-                color:'black'
-                // textAlign:'center'
-              }
-            }
-
-          }
-        }
-      }
-
-      if(row[column.property]){
-        if (this.row === row && this.column === column) {
-          return {
-            border:'1px solid black',
-            color:'blue'
-          }
-        }else{
-          return {
-            border:'1px solid black',
-            color:'black'
-          }
-        }
-
-
-
-
-      }
-
-
-      // if(row[column.property]){
-      //
-      //   return {
-      //
-      //     border:'1px solid black'
-      //
-      //     // textAlign:'center'
-      //   }
-      // }
-
-    },
-
-
-
     async baseSeacrh() {
       getCzFdBase({  }).then(response => {
-        this.projectData = response.data.czbhs
+        const tmpList=[]
+        const data=[]
+        for (const item of response.data.czbhs) {
+          if (tmpList.includes(item.cbbm)){
+            continue
+          }
+          tmpList.push(item.cbbm)
+          data.push(item)
+        }
+        this.projectData = data
       })
     },
     loadData() {
@@ -1255,47 +212,9 @@ export default {
         return
       }
       getListFdMx(this.queryParam).then(res=>{
-        this.tableColumn=[]
-        this.emtext=this.queryParam.czbh+"尚未定义直观图请于分段制造部管理人员联系！"
-        if(res.success){
-          const col=res.data.col;
-          for (let i = 0; i <= col; i++) {
-            let ii=i+'';
-            let aaa='column'+ii.padStart(3, '0');
-            this.columns.push(aaa);
-            let temp1=   {
-              title: `111`,width:"35px",field: `column${ii.padStart(3, '0')}`,type:"html",
-              slots: {
-                // 使用 JSX 渲染
-                default: ({ row,column }) => {
-
-                  return [
-                    <a >{row[column.property]}</a>
-                  ]
-
-                }
-              }
-            };
-
-            this.tableColumn.push(temp1)
-          }
-
-          //this.tableData=res.data.data
-          this.tableData=res.data.data
-          this.tableDataMainAll=res.data.fdqk
-          this.fds=res.data.fd
-          //this.list=res.data.data
-        }
+          this.$refs.zgtRef.show(res)
       })
-
     },
-
-
-
-    // getHeight() {
-    //   this.height = window.innerHeight - 170
-    //   this.defaultHeight.height = window.innerHeight - 165 + 'px'
-    // },
   }
 }
 </script>
@@ -1351,13 +270,6 @@ export default {
   font-size: 12px;
   font-weight: bold;
 }
-
-.mytablefdt .vxe-table--render-default .vxe-cell {
-  white-space: pre-line;
-  word-break: break-all;
-  padding-left: 2px!important;
-  padding-right: 2px!important;
-}
 </style>
 
 
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0abc581..e702691 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -69,7 +69,7 @@ export default {
 
 .dashboard-editor-container {
   background-color: #e3e3e3;
-  min-height: 100vh;
+  height: 70vh;
   padding: 10px;
   .pan-info-roles {
     font-size: 12px;
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index 1d2d8e5..d7f3c37 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -2348,7 +2348,7 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-  ],
+      ],
     }
   },
   computed: {