diff --git a/src/views/sjzx/ydjhzzCX.vue b/src/views/sjzx/ydjhzzCX.vue
index 2bcf657..2a54ff4 100644
--- a/src/views/sjzx/ydjhzzCX.vue
+++ b/src/views/sjzx/ydjhzzCX.vue
@@ -3,7 +3,7 @@
     <el-header style="width: 100%; height: 60px;font-size: 12px">
       <el-form :inline="true"  label-width="65px"  label-position="left">
         <el-row>
-          <el-col :span="20">
+          <el-col :span="18">
             <el-form-item label="船号:">
               <vxe-pulldown ref="xDown4" transfer >
                 <template #default>
@@ -42,7 +42,7 @@
               <el-input v-model="queryParam.dcpl1" type="search" placeholder="批量" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
               <el-button type="success" @click="handlerYqb">预切板计算</el-button>
@@ -174,6 +174,42 @@ export default {
         {field: '数1零件重量', title: '零件重量', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }, },
+        {field: 'xj2', title: '激光小2', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: 'bclqzl_xj2', title: '领取重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: 'bcshzl_xj2', title: '实耗重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: '小激光2余料重量', title: '余料重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: '小激光2前批余料代', title: '前批余料代', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: '小激光2零件重量', title: '零件重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: 'dj2', title: '激光中大2', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: 'bclqzl_dj2', title: '领取重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: 'bcshzl_dj2', title: '实耗重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: '大激光2余料重量', title: '余料重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: '大激光2前批余料代', title: '前批余料代', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
+        {field: '大激光2零件重量', title: '零件重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }, },
         {field: 'sx2', title: '数小2', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }, },
@@ -650,23 +686,30 @@ export default {
       })
     },
     footerMethod ({ columns, data }) {
+      const sumGroup=["lm1","s1","sx2","szd2","xf","df","xzhb","dzhb","sx4","jz4","xm","dm","sx3","sj3","szd3","xzxc","xzgs","dzxc","dzgs","fg","szd4","sq2x","sq2d","xq3","dq3","gd","xflj","dflj",
+        "bclqzl_lm1","bclqzl_s1","bclqzl_sx2","bclqzl_szd2","bclqzl_xf","bclqzl_df","bclqzl_xzhb","bclqzl_dzhb","bclqzl_sx4","bclqzl_jz4","bclqzl_xm","bclqzl_dm","bclqzl_sx3","bclqzl_sj3",
+        "bclqzl_szd3","lqzl_xzxc","lqzl_dzxc","lqzl_fg","bclqzl_szd4","bclqzl_sq2x","bclqzl_sq2d","bclqzl_xq3","bclqzl_dq3","bclqzl_gd","bclqzl_xflj","bclqzl_dflj","bcshzl_lm1","bcshzl_s1","bcshzl_sx2",
+        "bcshzl_szd2","bcshzl_xf","bcshzl_df","bcshzl_xzhb","bcshzl_dzhb","bcshzl_sx4","bcshzl_jz4","bcshzl_xm","bcshzl_dm","bcshzl_sx3","bcshzl_sj3","bcshzl_szd3","bcshzl_xzxc","shzl_xzxc",
+        "shzl_dzxc","shzl_fg","bcshzl_szd4","bcshzl_sq2x","bcshzl_sq2d","bcshzl_xq3","bcshzl_dq3","bcshzl_gd","bcshzl_xflj","bcshzl_dflj","lqhj_xz","lqhj_dz","shhj_xz","shhj_dz",
+        "龙门1余料重量","龙门1前批余料代","龙门1零件重量","数1余料重量","数1前批余料代","数1零件重量","数小2余料重量","数小2前批余料代","数小2零件重量","数中大2余料重量","数中大2前批余料代","数中大2零件重量","小腹余料重量",
+        "小腹前批余料代","小腹零件重量","大腹余料重量","大腹前批余料代","大腹零件重量","小组厚板余料重量","小组厚板前批余料代","小组厚板零件重量","大组厚板余料重量","大组厚板前批余料代","大组厚板零件重量","数小4余料重量",
+        "数小4前批余料代","数小4零件重量","机肘4余料重量","机肘4前批余料代","机肘4零件重量","小面余料重量","小面前批余料代","小面零件重量","大面余料重量","大面前批余料代","大面零件重量","手小3余料重量","手小3前批余料代",
+        "手小3零件重量","手机3余料重量","手机3前批余料代","手机3零件重量","手中大3余料重量","手中大3前批余料代","手中大3零件重量","小组型材余料重量","小组型材前批余料代","小组型材零件重量","大组型材余料重量","大组型材前批余料代",
+        "大组型材零件重量","数中大4余料重量","数中大4前批余料代","数中大4零件重量","数曲2小余料重量","数曲2小前批余料代","数曲2小零件重量","数曲2大余料重量","数曲2大前批余料代","数曲2大零件重量","小曲3余料重量","小曲3前批余料代",
+        "小曲3零件重量","大曲3余料重量","大曲3前批余料代","大曲3零件重量","光电余料重量","光电前批余料代","光电零件重量","xzxcgs","dzxcgs","fggs","小组型材领取米数","大组型材领取米数","小组型材实耗米数","大组型材实耗米数"
+        ,"方钢实耗米数","方钢领取米数","方钢余料重量","方钢前批余料代","方钢零件重量","xcgs_hj","xcms_hj"
+      ]
+
+      //激光2
+      sumGroup.push("xj2","bclqzl_xj2","bcshzl_xj2","小激光2余料重量","小激光2前批余料代","小激光2零件重量")
+      sumGroup.push("dj2","bclqzl_dj2","bcshzl_dj2","大激光2余料重量","大激光2前批余料代","大激光2零件重量")
       return [
         columns.map((column, columnIndex) => {
           if (columnIndex === 1) {
             return '合计'
           }
-          if (["lm1","s1","sx2","szd2","xf","df","xzhb","dzhb","sx4","jz4","xm","dm","sx3","sj3","szd3","xzxc","xzgs","dzxc","dzgs","fg","szd4","sq2x","sq2d","xq3","dq3","gd","xflj","dflj",
-            "bclqzl_lm1","bclqzl_s1","bclqzl_sx2","bclqzl_szd2","bclqzl_xf","bclqzl_df","bclqzl_xzhb","bclqzl_dzhb","bclqzl_sx4","bclqzl_jz4","bclqzl_xm","bclqzl_dm","bclqzl_sx3","bclqzl_sj3",
-            "bclqzl_szd3","lqzl_xzxc","lqzl_dzxc","lqzl_fg","bclqzl_szd4","bclqzl_sq2x","bclqzl_sq2d","bclqzl_xq3","bclqzl_dq3","bclqzl_gd","bclqzl_xflj","bclqzl_dflj","bcshzl_lm1","bcshzl_s1","bcshzl_sx2",
-            "bcshzl_szd2","bcshzl_xf","bcshzl_df","bcshzl_xzhb","bcshzl_dzhb","bcshzl_sx4","bcshzl_jz4","bcshzl_xm","bcshzl_dm","bcshzl_sx3","bcshzl_sj3","bcshzl_szd3","bcshzl_xzxc","shzl_xzxc",
-            "shzl_dzxc","shzl_fg","bcshzl_szd4","bcshzl_sq2x","bcshzl_sq2d","bcshzl_xq3","bcshzl_dq3","bcshzl_gd","bcshzl_xflj","bcshzl_dflj","lqhj_xz","lqhj_dz","shhj_xz","shhj_dz",
-            "龙门1余料重量","龙门1前批余料代","龙门1零件重量","数1余料重量","数1前批余料代","数1零件重量","数小2余料重量","数小2前批余料代","数小2零件重量","数中大2余料重量","数中大2前批余料代","数中大2零件重量","小腹余料重量",
-            "小腹前批余料代","小腹零件重量","大腹余料重量","大腹前批余料代","大腹零件重量","小组厚板余料重量","小组厚板前批余料代","小组厚板零件重量","大组厚板余料重量","大组厚板前批余料代","大组厚板零件重量","数小4余料重量",
-            "数小4前批余料代","数小4零件重量","机肘4余料重量","机肘4前批余料代","机肘4零件重量","小面余料重量","小面前批余料代","小面零件重量","大面余料重量","大面前批余料代","大面零件重量","手小3余料重量","手小3前批余料代",
-            "手小3零件重量","手机3余料重量","手机3前批余料代","手机3零件重量","手中大3余料重量","手中大3前批余料代","手中大3零件重量","小组型材余料重量","小组型材前批余料代","小组型材零件重量","大组型材余料重量","大组型材前批余料代",
-            "大组型材零件重量","数中大4余料重量","数中大4前批余料代","数中大4零件重量","数曲2小余料重量","数曲2小前批余料代","数曲2小零件重量","数曲2大余料重量","数曲2大前批余料代","数曲2大零件重量","小曲3余料重量","小曲3前批余料代",
-            "小曲3零件重量","大曲3余料重量","大曲3前批余料代","大曲3零件重量","光电余料重量","光电前批余料代","光电零件重量","xzxcgs","dzxcgs","fggs","小组型材领取米数","大组型材领取米数","小组型材实耗米数","大组型材实耗米数"
-            ,"方钢实耗米数","方钢领取米数","方钢余料重量","方钢前批余料代","方钢零件重量","xcgs_hj","xcms_hj"].includes(column.property)) {
+
+          if (sumGroup.includes(column.property)) {
             return this.sumNum(data, column.property)
           }
           if (["hdw","hdw1","hjbs",'lqhj_xz','shhj_xz','lqhj_dz','shhj_dz'].includes(column.property)) {
@@ -699,7 +742,7 @@ export default {
     cellClassName ({ row, column }) {
        let fields=['lm1','s1','sx2','szd2','xf','df','xzhb','dzhb','sx4','jz4',
                   'xm','dm','sx3','sj3','szd3','xzxcgs','dzxcgs','fggs','szd4','sq2x',
-                  'sq2d','xq3','dq3','gd'
+                  'sq2d','xq3','dq3','gd',"xj2",'dj2'
        ]
       let hzfields=['hdw','lqhj_xz','shhj_xz','hdw1','lqhj_dz','shhj_dz']
       let zjfields=['hjdw','lqhj','shhj','hjbs']