diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js
index 529811c..05eb102 100644
--- a/src/api/jhzx/sygd.js
+++ b/src/api/jhzx/sygd.js
@@ -11,6 +11,10 @@ export function tqSygd(data={}) {return request({url: '/dmSygdMx/tqSygd', method
 export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})}
 export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})}
 export function getYdjh(data) {return request({url: '/dmYdjh/getList', method: 'post', data})}
+export function getListhz(data) {return request({url: '/dmYdjh/getListhz', method: 'post', data})}
+
+export function getListhzBymx(data) {return request({url: '/dmYdjh/getListhzBymx', method: 'post', data})}
+
 export function tjydjh(data) {return request({url: '/dmYdjh/tj', method: 'post', data})}
 export function hz(data) {return request({url: '/dmYdjh/hz', method: 'post', params:data})}
 export function ydjhxf(data) {return request({url: '/dmYdjh/xf', method: 'post', data})}
diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue
index 317ebba..93e053c 100644
--- a/src/views/jhzx/ydjhzxCX.vue
+++ b/src/views/jhzx/ydjhzxCX.vue
@@ -32,27 +32,52 @@
     </el-header>
     <el-container  style="padding-top: 0px">
       <el-main>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <div class="mytable">
-            <vxe-grid
-              id="id"
-              ref="xGrid"
-              border
-              resizable
-              keep-source
-              :align="'center'"
-              :height="height"
-              :auto-resize="true"
-              :columns="tableColumn"
-              :data="list"
-              :custom-config="{ storage: true }"
-              highlight-current-row
-              highlight-hover-row
-              show-overflow
-              :scroll-y="{enabled: true}"
-            >
-            </vxe-grid>
-          </div>
+        <el-tabs v-model="activeName" >
+          <el-tab-pane label="汇总" name="first">
+            <div class="mytable">
+              <vxe-grid
+                id="id1"
+                ref="xGrid1"
+                border
+                resizable
+                keep-source
+                :align="'center'"
+                :height="height"
+                :auto-resize="true"
+                :columns="tableColumn1"
+                :data="list1"
+                :custom-config="{ storage: true }"
+                highlight-current-row
+                highlight-hover-row
+                show-overflow
+                :scroll-y="{enabled: true}"
+                @cell-dblclick="getListhzBymx1"
+              >
+              </vxe-grid>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="明细" name="second">
+            <div class="mytable">
+              <vxe-grid
+                id="id"
+                ref="xGrid"
+                border
+                resizable
+                keep-source
+                :align="'center'"
+                :height="height"
+                :auto-resize="true"
+                :columns="tableColumn"
+                :data="list"
+                :custom-config="{ storage: true }"
+                highlight-current-row
+                highlight-hover-row
+                show-overflow
+                :scroll-y="{enabled: true}"
+              >
+              </vxe-grid>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </el-main>
     </el-container>
@@ -62,7 +87,7 @@
 
 <script>
 import { getCzxx} from '@/api/jhzx/qfxq'
-import {getYdjh, tjydjh, getCnsb,hz} from '@/api/jhzx/sygd'
+import {getYdjh, tjydjh, getCnsb, hz, getListhz, getListhzBymx} from '@/api/jhzx/sygd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import { getToken } from '@/utils/auth'
@@ -85,11 +110,78 @@ export default {
         zt: '0'
       },
       list: [],
+      list1: [],
       checkedList: [],
       heads: { token: getToken() },
       dictData:[],
       sbxx:{},
       height: '500px',
+      tableColumn1:[
+
+        { type: 'seq', width: 60, title: '序号'},
+        { field: 'dcCh', title: '船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        // { field: 'dcCh1', title: '目标船号',width: 90,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
+        { field: 'dcPl', title: '批量',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+
+
+
+
+
+        { field: 'jssj', title: '前方需求时间',width: 110,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+
+        { field: 'sljhrq', title: '上料计划日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
+        },
+        { field: 'pwjhrq', title: '抛丸计划日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
+        },
+        { field: 'hxjhrq', title: '划线计划日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
+        },
+        { field: 'qgjhrq', title: '切割计划日期',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+          editRender:{ name: '$input', props: { type: 'date',labelFormat:"yyyy/MM/dd",valueFormat:"yyyy/MM/dd" }}
+        },
+        { field: 'bs', title: '板数',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'ylbs', title: '余料板数',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'slxhthCount', title: '上料匹配板数',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'slCount', title: '上料板数',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'pwCount', title: '抛丸板数',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'llCount', title: '理料板数',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'hxCount', title: '划线板数',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'qgCount', title: '切割板数',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
+      ],
       tableColumn:[
         { type: 'checkbox', width: 50 ,},
         { type: 'seq', width: 60, title: '序号'},
@@ -120,6 +212,41 @@ export default {
         { field: 'ylbs', title: '余料',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
+        {
+          field: 'slkcdw',
+          title: '上料库存垛位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slcs',
+          title: '上料层数',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slxhth',
+          title: '上料小合同号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slhth',
+          title: '上料合同号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slwlh',
+          title: '上料物料号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
         { field: 'jssj', title: '前方需求时间',width: 110,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
@@ -291,41 +418,7 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-        {
-          field: 'slkcdw',
-          title: '上料库存垛位',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'slcs',
-          title: '上料层数',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'slxhth',
-          title: '上料小合同号',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'slhth',
-          title: '上料合同号',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'slwlh',
-          title: '上料物料号',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
+
         {
           field: 'slkcxx',
           title: '上料库存信息',
@@ -651,8 +744,8 @@ export default {
         this.$message.warning('选择时间范围')
         return
       }
-      getYdjh(this.queryParam).then((res) => {
-        this.list = res.data
+      getListhz(this.queryParam).then((res) => {
+        this.list1 = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
         }
@@ -666,7 +759,18 @@ export default {
     getHeight() {
       this.height = window.innerHeight - 160
     },
-
+    getListhzBymx1({row}){
+      console.log(row)
+      console.log(row.dcCh)
+      const quer={'dcch': row.dcCh,'dcpl':row.dcPl}
+      console.log(quer)
+      getListhzBymx(
+        quer
+      ).then(res => {
+        this.activeName = 'second'
+        this.list = res.data
+      })
+    },
   }
 }
 </script>