diff --git a/src/api/jhzx/sygd.js b/src/api/jhzx/sygd.js
index 44d8502..f6d1ee1 100644
--- a/src/api/jhzx/sygd.js
+++ b/src/api/jhzx/sygd.js
@@ -10,3 +10,5 @@ export function sygdPC() {return request({url: '/dmSygdMx/sygdPC', method: 'post
 export function tqSygd() {return request({url: '/dmSygdMx/tqSygd', method: 'post'})}
 export function getCnsb() {return request({url: '/dmSygdMx/getCnsb', method: 'post'})}
 export function saveMxList() {return request({url: '/dmSygdMx/saveList', method: 'post'})}
+export function getYdjh(data) {return request({url: '/dmYdjh/getList', method: 'post', data})}
+export function tjydjh() {return request({url: '/dmYdjh/tjydjh', method: 'post'})}
diff --git a/src/views/jhzx/gdxqDR.vue b/src/views/jhzx/gdxqDR.vue
index d63120e..dad47fd 100644
--- a/src/views/jhzx/gdxqDR.vue
+++ b/src/views/jhzx/gdxqDR.vue
@@ -120,6 +120,7 @@ export default {
       dictData:[],
       height: '500px',
       tableColumn:[
+
         { field: 'dcCh', title: '船只', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -262,19 +263,12 @@ export default {
       return cellValue
     },
     footerMethod({ columns, data }){
-
       return [
         columns.map((column, columnIndex) => {
           if (columnIndex === 0) {
             return '合计'
           }
           return this.sumNum(data, column.property)
-          // if (['yf08'].includes(column.property)) {
-          //   console.log(123)
-          //   return this.sumNum(data, column.property)
-          // }
-          //
-          // return null
         })
       ]
     },
diff --git a/src/views/jhzx/qfxqCX.vue b/src/views/jhzx/qfxqCX.vue
index 1d9f003..31b0e0b 100644
--- a/src/views/jhzx/qfxqCX.vue
+++ b/src/views/jhzx/qfxqCX.vue
@@ -5,14 +5,36 @@
         <el-row>
           <el-col :span="22">
             <el-form-item label="船号:">
-              <el-select v-model="queryParam.dcCh" filterable  placeholder="工程编号" @change="czbhChange" >
-                <el-option
-                  v-for="item in dictData.cbbm"
-                  :key="item.cbbm"
-                  :label="item.cbbm"
-                  :value="item.cbbm">
-                </el-option>
-              </el-select>
+            <vxe-pulldown ref="xDown4" transfer >
+              <template #default>
+                <vxe-input
+                  v-model="queryParam.dcch"
+                  placeholder="船号"
+                  style="height: 28px;
+                    line-height: 28px; width: 150px;"
+                  suffix-icon="vxe-icon--search"
+                  @keyup="keyupEvent4"
+                  @focus="focusEvent4"
+                />
+              </template>
+              <template #dropdown>
+                <div class="my-dropdown  mytable " style="width: 250px">
+                  <vxe-grid
+                    highlight-hover-row
+                    height="auto"
+
+                    :data="projectData"
+                    :columns="projectColumns"
+                    @cell-click="cellClickEvent"
+                    show-overflow
+                  >
+                    <template #wgbsEdit="{ row}">
+                      <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                    </template>
+                  </vxe-grid>
+                </div>
+              </template>
+            </vxe-pulldown>
             </el-form-item>
             <el-form-item label="批量:">
               <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" ></el-input>
@@ -25,7 +47,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="20">
+          <el-col :span="22">
             <el-form-item label="状态:">
               <el-select v-model="queryParam.zt" filterable  placeholder="状态" @change="czbhChange" >
                 <el-option
@@ -79,8 +101,7 @@ import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import {null2str} from "@/utils/rpkj";
 import { getToken } from '@/utils/auth'
-import { startLoading, endLoading } from '@/utils'
-import { Message } from 'element-ui'
+import {getCzplBase} from "@/api/sjzx/jcsj";
 export default {
   name:'QfxqCX',
   data() {
@@ -91,6 +112,16 @@ export default {
         zt:''
       },
       list: [],
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
       filedis:true,
       uploadData:{
       },
@@ -170,11 +201,31 @@ export default {
     this.initList()
   },
   methods: {
+    cellClickEvent({row}) {
+      this.queryParam.dcch = row.cbbm
+      this.$refs.xDown4.hidePanel()
+    },
+    focusEvent4() {
+      this.$refs.xDown4.showPanel()
+    },
+    keyupEvent4() {
+
+
+      if (this.queryParam.dcch) {
+        this.projectData = this.projectData1.filter(row => row.project.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
+      }
 
+    },
     initBase(){
       getCzxx({}).then(res=>{
         this.dictData.cbbm = res.data
       })
+      getCzplBase({}).then(res=>{
+        this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
+      })
       const dict=window.localStorage.getItem('ZTLX');
       this.zt=JSON.parse(dict)
     },
diff --git a/src/views/jhzx/sygdWH.vue b/src/views/jhzx/sygdWH.vue
index 0a4d9e3..31d60a5 100644
--- a/src/views/jhzx/sygdWH.vue
+++ b/src/views/jhzx/sygdWH.vue
@@ -13,7 +13,6 @@
             <el-form-item label="状态:" >
               <el-select
                 v-model="queryParam.gdZt"
-                placeholder="状态"
                 clearable
                 disabled
               >
@@ -109,7 +108,7 @@ export default {
       queryParam: {
         beginTime:'2023/08/01',
         endTime:'2023/10/01',
-        // gdZt:'0'
+        gdZt:'0'
       },
       gdZtOptions:[
         {
diff --git a/src/views/jhzx/symxCX.vue b/src/views/jhzx/symxCX.vue
index 9b4feb7..c2faf32 100644
--- a/src/views/jhzx/symxCX.vue
+++ b/src/views/jhzx/symxCX.vue
@@ -1,19 +1,19 @@
 <template>
   <el-container>
     <el-header style="width: 100%; height: 35px;font-size: 12px">
-      <el-form :inline="true"  label-width="65px"  label-position="left">
-        <el-row >
-          <el-col :span="15" >
-            <el-form-item  >
-              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
-              <el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="date"  style="width: 33%;" />
-              <span  style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
-              <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" type="date" style="width: 33%" />
+      <el-form :inline="true" label-width="65px" label-position="left">
+        <el-row>
+          <el-col :span="15">
+            <el-form-item>
+              <span style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">时间范围:</span>
+              <el-date-picker v-model="queryParam.beginTime" value-format="yyyy/MM/dd" type="date" style="width: 33%;"/>
+              <span style="font-size: 13px;color: #606266; margin-left: 4px;margin-right: 4px">至</span>
+              <el-date-picker v-model="queryParam.endTime" value-format="yyyy/MM/dd" type="date" style="width: 33%"/>
             </el-form-item>
           </el-col>
-          <el-col :span="9" >
-            <el-form-item style="float: right" >
-              <el-button type="success" @click="initList">查询</el-button>
+          <el-col :span="9">
+            <el-form-item style="float: right">
+            <el-button type="success" @click="initList">查询</el-button>
               <el-button type="success" @click="save">保存</el-button>
               <el-button type="success" @click="tqSygd">提交三月滚动</el-button>
             </el-form-item>
@@ -21,173 +21,126 @@
         </el-row>
       </el-form>
     </el-header>
-    <el-container  style="padding-top: 0px">
-        <el-main>
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="中日程分解" name="first">
-              <div class="mytable">
-                <el-button  type="success" @click="sygdPC()" > 提取明细 </el-button>
-                <el-button type="success" @click="symxhz">汇总</el-button>
-                <vxe-grid
-                  id="id"
-                  ref="xGrid"
-                  border
-                  resizable
-                  keep-source
-                  :align="'center'"
-                  :height="height"
-                  :auto-resize="true"
-                  :columns="tableColumn"
-                  highlight-current-row
-                  :data="list"
-                  :custom-config="{ storage: true }"
-                  :edit-config="{
+    <el-container style="padding-top: 0px">
+      <el-main>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="前方三月需求计划" name="first">
+            <div class="mytable">
+              <el-button type="success" @click="sygdPC()"> 提取明细</el-button>
+              <el-button type="success" @click="symxhz">汇总</el-button>
+              <vxe-grid
+                id="id"
+                ref="xGrid"
+                border
+                resizable
+                keep-source
+                :align="'center'"
+                :height="height"
+                :auto-resize="true"
+                :columns="tableColumn"
+                highlight-current-row
+                :data="list"
+                :custom-config="{ storage: true }"
+                :edit-config="{
                             trigger: 'click',
                             mode: 'row',
                             showStatus: true,
                           }"
-                  @checkbox-all="selectAllEvent"
-                  @checkbox-change="selectChangeEvent"
-                  highlight-hover-row
-                  show-overflow
-                >
-                </vxe-grid>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="线表信息" name="second">
-              <div class="mytable">
-                <vxe-grid
-                  id="id1"
-                  ref="xGrid1"
-                  border
-                  resizable
-                  keep-source
-                  :align="'center'"
-                  :height="height"
-                  :auto-resize="true"
-                  :columns="tableColumn1"
-                  highlight-current-row
-                  :data="list1"
-                  :custom-config="{ storage: true }"
-                  :span-method="rowspanMethod"
-                  :cell-style="cellStyle"
-                  highlight-hover-row
-                  show-overflow
-                  show-header-overflow
-                  @cell-click="cellClickEvent_xb"
-                >
-                </vxe-grid>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="批量信息" name="third">
-              <div class="mytable">
-                <vxe-grid
-                  id="id2"
-                  ref="xGrid2"
-                  border
-                  resizable
-                  keep-source
-                  :align="'center'"
-                  :height="height"
-                  :auto-resize="true"
-                  :columns="tableColumn2"
-                  highlight-current-row
-                  :data="list2"
-                  :custom-config="{ storage: true }"
-                  :cell-style="cellStyle"
-                  highlight-hover-row
-                  show-overflow
-                  show-header-overflow
-                  @cell-click="cellClickEvent_xb"
-                >
-                </vxe-grid>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="图纸信息" name="fourth">
-              <div class="mytable">
-                <vxe-grid
-                  id="id3"
-                  ref="xGrid3"
-                  border
-                  resizable
-                  keep-source
-                  :align="'center'"
-                  :height="height"
-                  :auto-resize="true"
-                  :columns="tableColumn3"
-                  highlight-current-row
-                  :data="list3"
-                  :custom-config="{ storage: true }"
-                  :span-method="rowspanMethod"
-                  :cell-style="cellStyle"
-                  :scroll-y="{enabled: false}"
-                  highlight-hover-row
-                  show-overflow
-                  show-header-overflow
-                  @cell-click="cellClickEvent_xb"
-                >
-                </vxe-grid>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="到货信息" name="fifth">
-              <div class="mytable">
-                <vxe-grid
-                  id="id4"
-                  ref="xGrid4"
-                  border
-                  resizable
-                  keep-source
-                  :align="'center'"
-                  :height="height"
-                  :auto-resize="true"
-                  :columns="tableColumn4"
-                  highlight-current-row
-                  :data="list4"
-                  :custom-config="{ storage: true }"
-                  :cell-style="cellStyle"
-                  highlight-hover-row
-                  show-overflow
-                  show-header-overflow
-                  @cell-click="cellClickEvent_xb"
-                >
-                </vxe-grid>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="跨位生产信息" name="sixth">
-              <div class="mytable">
-                <vxe-grid
-                  id="id5"
-                  ref="xGrid5"
-                  border
-                  resizable
-                  keep-source
-                  :align="'center'"
-                  :height="height"
-                  :auto-resize="true"
-                  :columns="tableColumn5"
-                  highlight-current-row
-                  :data="list5"
-                  :custom-config="{ storage: true }"
-                  :span-method="rowspanMethod"
-                  :cell-style="cellStyle"
-                  :scroll-y="{enabled: false}"
-                  highlight-hover-row
-                  show-overflow
-                  show-header-overflow
-                  @cell-click="cellClickEvent_xb"
-                >
-                </vxe-grid>
-              </div>
-            </el-tab-pane>
-          </el-tabs>
-        </el-main>
+                @checkbox-all="selectAllEvent"
+                @checkbox-change="selectChangeEvent"
+                highlight-hover-row
+                show-overflow
+              >
+              </vxe-grid>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="线表信息" name="second">
+            <div class="mytable">
+              <vxe-grid
+                id="id1"
+                ref="xGrid1"
+                border
+                resizable
+                keep-source
+                :align="'center'"
+                :height="height"
+                :auto-resize="true"
+                :columns="tableColumn1"
+                highlight-current-row
+                :data="list1"
+                :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"
+              >
+                <template #numMx5="{ items, _columnIndex }">
+                  <span style="color: red">{{ items[_columnIndex] }}</span>
+                </template>
+              </vxe-grid>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="批量信息" name="third">
+            <div class="mytable">
+              <vxe-grid
+                id="id2"
+                ref="xGrid2"
+                border
+                resizable
+                keep-source
+                :align="'center'"
+                :height="height"
+                :auto-resize="true"
+                :columns="tableColumn2"
+                highlight-current-row
+                :data="list2"
+                :custom-config="{ storage: true }"
+                :cell-style="cellStyle"
+                highlight-hover-row
+                show-overflow
+                show-header-overflow
+              >
+
+              </vxe-grid>
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="跨位信息" name="fourth">
+            <div class="mytable">
+              <vxe-grid
+                id="id3"
+                ref="xGrid3"
+                border
+                resizable
+                keep-source
+                :align="'center'"
+                :height="height"
+                :auto-resize="true"
+                :columns="tableColumn3"
+                highlight-current-row
+                :data="list3"
+                :custom-config="{ storage: true }"
+                highlight-hover-row
+                show-overflow
+                show-header-overflow
+                @cell-dblclick="cellClickEvent_xb"
+              >
+              </vxe-grid>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </el-main>
     </el-container>
     <!-- 弹出层——选择目标船只-->
     <vxe-modal v-model="dialogVisible" width="600" :title="title">
       <template #default>
         <el-row class="query_wrapper">
           <el-row>
-            <el-button  size="small" style="float: right;margin-bottom: 5px;margin-right: 5px;" type="success" @click="saveByDcch">保存</el-button>
+            <el-button size="small" style="float: right;margin-bottom: 5px;margin-right: 5px;" type="success"
+                       @click="saveByDcch">保存
+            </el-button>
           </el-row>
         </el-row>
         <div class="mytable">
@@ -200,11 +153,11 @@
             :row-config="{isHover: true}"
             :column-config="{resizable: true}"
             :data="selectMbch.no_tlt_ch">
-            <vxe-column type="seq" width="50" ></vxe-column>
+            <vxe-column type="seq" width="50"></vxe-column>
             <vxe-column field="dcCh" title="船号" width="150"></vxe-column>
             <vxe-column align="center" field="dcCh1" title="目标船号" width="300">
-              <template #default="{ row }" >
-                <vxe-select v-model="row.dcCh1" style="width: 80%;height: 30px;margin-bottom: 2px"  transfer>
+              <template #default="{ row }">
+                <vxe-select v-model="row.dcCh1" style="width: 80%;height: 30px;margin-bottom: 2px" transfer>
                   <vxe-option
                     v-for="item in haveTltBoms"
                     :key="item.dcch"
@@ -223,907 +176,2221 @@
       <template #default>
         <el-row class="query_wrapper">
           <el-row>
-            <span style="font-size: 13px;color: red; margin-left: 4px;"> * 表中红色数据取自其他船只</span>
-            <el-button  size="small" style="float: right;margin-bottom: 5px;margin-right: 5px;" type="success" @click="save">保存</el-button>
-          </el-row>
-        </el-row>
-        <div class="mytable">
-          <vxe-grid
-            id="id6"
-            ref="tableRef1"
-            border
-            resizable
-            keep-source
-            :align="'center'"
-            :height="height"
-            :auto-resize="true"
-            :columns="tableColumn6"
-            highlight-current-row
-            :data="mxList"
-            :custom-config="{ storage: true }"
-            :edit-config="{
-                            trigger: 'click',
-                            mode: 'row',
-                            showStatus: true,
-                          }"
-            @checkbox-all="selectAllEvent"
-            @checkbox-change="selectChangeEvent"
-            :cell-style="cellStyle1"
-            :header-cell-style="headerCellStyle"
-            highlight-hover-row
-            show-overflow
-          >
-          </vxe-grid>
-        </div>
-      </template>
-    </vxe-modal>
-  </el-container>
-</template>
-<script>
-import router from "@/router";
-import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList} from '@/api/jhzx/sygd'
-import { mapGetters } from 'vuex'
-import XEUtils from 'xe-utils'
-import { getToken } from '@/utils/auth'
-import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
-import {emSbjbbZM} from "@/api/sjzx/sbcnWH";
-export default {
-  name:'SymxCX',
-  components: {ScrollPane},
-  data() {
-    return {
-      dialogVisible:false,
-      dialogVisible1:false,
-      title:'选择目标船只',
-      title1:'修改明细信息',
-      selectMbch:[],
-      mxList:[],
-      haveTltBoms:[],
-      activeName: 'first',
-      queryParam: {
-        beginTime:'2023/08/01',
-        endTime:'2023/10/01'
-      },
-      list: [],
-      list1: [],
-      list2: [],
-      list3: [],
-      list4: [],
-      list5: [],
-      checkedList: [],
-      heads: { token: getToken() },
-      dictData:[],
-      sbxx:{},
-      height: '500px',
-      tableColumn:[
-        { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: 'dcCh', title: '船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: '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: 'dcFd', title: '分段号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jssj', title: '组立结束时间',width: 110,
-          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: 'jsqLqb', title: '领取表接收',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'jsqTlt', title: '套料图接收',width: 80,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'dhqd', title: '订货清单号',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'orderBs', title: '订货数量',width: 80,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'arrivalBs', title: '到货数量',width: 80,
-        //   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: '划线长度(米)',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hxcdKc', title: '划线空程长度(米)',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgcd', title: '切割长度（米)',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: 'qy', title: '区域',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'slrq', title: '上料计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pwrq', title: '抛丸计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hxrq', title: '划线计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgrq', title: '切割计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: 'slry', title: '上料人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'pw', title: '抛丸',width: 100},
-        { field: 'jzsb', title: '矫正设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
-        // { field: 'jzry', title: '矫正人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'jzrq', title: '矫正计划日期',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'pw', title: '抛丸位置',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'pwsb', title: '抛丸设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination'  },editRender: { name: "$select",options: [],props: { clearable: true}}},
-        // { field: 'pwry', title: '抛丸人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
+<!--          <span style="font-size: 13px;color: red; margin-left: 4px;"> * 表中红色数据取自其他船只</span>-->
+                     <el-button size="small" style="float: right;margin-bottom: 5px;margin-right: 5px;" type="success"
+                                @click="save">保存
+                     </el-button>
+                   </el-row>
+                 </el-row>
+                 <div class="mytable">
+                   <vxe-grid
+                     id="id6"
+                     ref="tableRef1"
+                     border
+                     resizable
+                     keep-source
+                     :align="'center'"
+                     :height="height"
+                     :auto-resize="true"
+                     :columns="tableColumn6"
+                     highlight-current-row
+                     :data="mxList"
+                     :custom-config="{ storage: true }"
+                     :edit-config="{
+                                     trigger: 'click',
+                                     mode: 'row',
+                                     showStatus: true,
+                                   }"
+                     @checkbox-all="selectAllEvent"
+                     @checkbox-change="selectChangeEvent"
+                     :cell-style="cellStyle1"
+                     :header-cell-style="headerCellStyle"
+                     highlight-hover-row
+                     show-overflow
+                   >
+                   </vxe-grid>
+                 </div>
+               </template>
+             </vxe-modal>
+           </el-container>
+         </template>
+         <script>
+         import router from "@/router";
+         import {getCzxx} from '@/api/jhzx/qfxq'
+         import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList} from '@/api/jhzx/sygd'
+         import {mapGetters} from 'vuex'
+         import XEUtils from 'xe-utils'
+         import {getToken} from '@/utils/auth'
+         import ScrollPane from "@/layout/components/TagsView/ScrollPane.vue";
+         import {emSbjbbZM} from "@/api/sjzx/sbcnWH";
+
+         export default {
+           name: 'SymxCX',
+           components: {ScrollPane},
+           data() {
+             return {
+               dialogVisible: false,
+               dialogVisible1: false,
+               title: '选择目标船只',
+               title1: '修改明细信息',
+               selectMbch: [],
+               mxList: [],
+               haveTltBoms: [],
+               activeName: 'first',
+               queryParam: {
+                 beginTime: '2023/08/01',
+                 endTime: '2023/10/01'
+               },
+               list: [],
+               list1: [],
+               list2: [],
+               list3: [],
+               checkedList: [],
+               heads: {token: getToken()},
+               dictData: [],
+               height: '500px',
+               tableColumn: [
+                 {type: 'seq', width: 60, title: '序号', fixed: "left"},
+                 {
+                   field: 'dcCh', title: '船号', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: '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: 'dcFd', title: '分段号', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'zl', title: '组立', width: 80, formatter: ['dictFormat', 'ZLLB'],
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'jssj', title: '前方需求时间', width: 110,
+                   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: 'jsqLqb', title: '领取表接收',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 // { field: 'jsqTlt', title: '套料图接收',width: 80,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 // { field: 'dhqd', title: '订货清单号',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 // { field: 'orderBs', title: '订货数量',width: 80,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 // { field: 'arrivalBs', title: '到货数量',width: 80,
+                 //   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: '划线长度(米)', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'hxcdKc', title: '划线空程长度(米)', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qgcd', title: '切割长度（米)', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qgcdKc', title: '切割空程长度（米)', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 // { field: 'qy', title: '区域',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 {
+                   field: 'slrq', title: '上料计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'pwrq', title: '抛丸计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'hxrq', title: '划线计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qgrq', title: '切割计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 // { field: 'slry', title: '上料人员',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 // { field: 'pw', title: '抛丸',width: 100},
+                 {
+                   field: 'jzsb',
+                   title: '矫正设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination'},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 // { field: 'jzry', title: '矫正人员',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 // { field: 'jzrq', title: '矫正计划日期',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 // { field: 'pw', title: '抛丸位置',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 {
+                   field: 'pwsb',
+                   title: '抛丸设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination'},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 // { field: 'pwry', title: '抛丸人员',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+
+                 {
+                   field: 'hxsb',
+                   title: '划线设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true,}}
+                 },
+                 // { field: 'hxry', title: '划线人员',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+
+                 {
+                   field: 'qgsb',
+                   title: '切割设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true,}}
+                 },
+                 // { field: 'qgry', title: '切割人员',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 {
+                   field: 'pklx', title: '坡口类型', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'pkcd', title: '坡口长度', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'pksb',
+                   title: '坡口设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true,}}
+                 },
+                 // { field: 'pkry', title: '坡口人员',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 {
+                   field: 'pkrq', title: '坡口计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qbs', title: '曲标识', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qjgsb',
+                   title: '曲加工设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true,}}
+                 },
+                 // { field: 'qjgry', title: '曲加工人员',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 {
+                   field: 'qjgrq', title: '曲加工计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dmcd', title: '打磨长度', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dmsb',
+                   title: '打磨设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true,}}
+                 },
+                 // { field: 'dmry', title: '打磨人员',width: 100,
+                 //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                 //   filterRender: { name: 'FilterCombination', }},
+                 {
+                   field: 'dmrq', title: '打磨计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'gjjsDz', title: '钢加大组结束', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'gjjsXz', title: '钢加小组结束', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'ljsl', title: '零件数量', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'gjks', title: '钢加开始', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dcCh2', title: '本船号', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },//没有真实数据时，为空
+                 {
+                   field: 'zt', title: '状态', width: 70, formatter: ['dictFormat', 'SYZT'],
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'gxsj', title: '数据更新时间', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+               ],
+               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',}
+                 },
+               ],
+               tableColumn2: [
+                 {type: 'seq', width: 60, title: '序号', fixed: "left"},
+                 {
+                   field: 'dcCh', title: '船号', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dcPl', title: '批量', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dcFd', title: '分段', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'xzjsq', title: 'a=批量表（钢加小组结束）', width: 180,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'xzglxq', title: 'b=三月滚动需求（小组）', width: 180,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombin ation',}
+                 },
+                 {
+                   field: 'xzcz', title: 'b-a=时间差(小组)', width: 180,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dzjsq', title: 'c=批量表（钢加大组结束）', width: 180,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dzglxq', title: 'd=三月滚动需求（大组）', width: 180,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dzcz', title: 'd-c=时间差(大组)', width: 180,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+               ],
+               tableColumn3: [
+                 {type: 'seq', width: 60, title: '序号', fixed: "left"},
+                 { field: 'yf', title: '月份', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'kw', title: '跨位', width: 120, formatter: ['dictFormat', 'QGKW'],
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'ch', title: '船号', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'pl', title: '批量', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'fd', title: '分段', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'bs', title: '板数', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'dhqd', title: '订货清单号', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'dhsl', title: '到货数量', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'dhsl', title: '订货数量', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'blgs', title: '备料总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'pwgs', title: '抛丸总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'llgs', title: '理料总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'hxgs', title: '划线总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'qggs', title: '切割总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'pkgs', title: '坡口总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'dmgs', title: '打磨总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'qjggs', title: '曲加工总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+                 { field: 'zpgs', title: '装配总工时', width: 120,
+                   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+                   filterRender: { name: 'FilterCombination', },
+                 },
+           ],
+               tableColumn6: [
+                 {type: 'seq', width: 60, title: '序号', fixed: "left"},
+                 {
+                   field: 'dcCh', title: '船号', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dcPl', title: '批量', width: 80,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'zl', title: '组立', width: 80, formatter: ['dictFormat', 'ZLLB'],
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'tzbh', title: '套料图号', width: 90,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'wpgg', title: '规格', width: 80,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'jssj', title: '组立结束时间', width: 110,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'jzbs', title: '矫正标识', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'jzsb',
+                   title: '矫正设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination'},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 {
+                   field: 'slrq', title: '上料计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'pwsb',
+                   title: '抛丸设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination'},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 {
+                   field: 'pwrq', title: '抛丸计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'hxcd', title: '划线长度(米)', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'hxcdKc', title: '划线空程长度(米)', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'hxsb',
+                   title: '划线设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 {
+                   field: 'hxrq', title: '划线计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qgcd', title: '切割长度（米)', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qgcdKc', title: '切割空程长度（米)', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qgsb',
+                   title: '切割设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 {
+                   field: 'qgrq', title: '切割计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'pklx', title: '坡口类型', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'pkcd', title: '坡口长度', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'pksb',
+                   title: '坡口设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 {
+                   field: 'pkrq', title: '坡口计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qbs', title: '曲标识', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'qjgsb',
+                   title: '曲加工设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 {
+                   field: 'qjgrq', title: '曲加工计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dmcd', title: '打磨长度', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dmsb',
+                   title: '打磨设备',
+                   width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',},
+                   editRender: {name: "$select", options: [], props: {clearable: true}}
+                 },
+                 {
+                   field: 'dmrq', title: '打磨计划日期', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+
+                 {
+                   field: 'gjjsDz', title: '钢加大组结束', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'gjjsXz', title: '钢加小组结束', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'ljsl', title: '零件数量', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'gjks', title: '钢加开始', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dcFd', title: '分段号', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'dcCh2', title: '本船号', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },//没有真实数据时，为空
+                 {
+                   field: 'dcCh1', title: '目标船号', width: 90,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },//数据来源船，真实数据时，为空
+                 {
+                   field: 'lqlb', title: '领取类型', width: 90, formatter: ['dictFormat', 'CLlQ'],
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'lx', title: '物资类型', width: 90, formatter: this.formatterLx,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'kw', title: '跨位', width: 80, formatter: ['dictFormat', 'QGKW'],
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'zt', title: '状态', width: 70, formatter: ['dictFormat', 'SYZT'],
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'bcshzl', title: '重量', width: 80,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'wpxh', title: '材质', width: 80,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                 },
+                 {
+                   field: 'xcms', title: '型材米数', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+                 {
+                   field: 'gxsj', title: '数据更新时间', width: 100,
+                   filters: [{
+                     data: {
+                       checks: [],
+                       sVal: '',
+                       sMenu: '',
+                       fType1: '',
+                       fVal1: '',
+                       fMode: 'and',
+                       fType2: '',
+                       fVal2: ''
+                     }
+                   }],
+                   filterRender: {name: 'FilterCombination',}
+                 },
+               ],
+             }
+           },
+           computed: {
+             ...mapGetters(['name', 'bmbm'])
+           },
+           created() {
+             window.addEventListener('resize', this.getHeight)
+             this.getHeight()
+             this.initBase()
+           },
+           methods: {
+             rowClassName({ row,rowIndex }){
+               if (row.dcCh==='合计') {
+                 return  {
+                   backgroundColor: 'lightblue',
+                   cursor:'pointer'
+                 }
+               }
+               return null
+             },
+             //汇总
+             symxhz() {
+
+               if (this.list.length < 1) {
+                 this.$message.warning('请先查询需要汇总的信息！');
+                 return
+               }
+               symxhz(this.list).then((res) => {
+                 if (res.data) {
+                   console.log(res.data)
+                   this.list1 = res.data.xbList
+                   this.list2 = res.data.plList
+                   this.list3 = res.data.kwList
+                 }
+               })
+             },
+             //合并行
+             rowspanMethod({row, _rowIndex, column, visibleData}) {
+               //不要忘记在vxe-grid上配置  :scroll-y="{enabled: false}" 防止下拉时样式变化
+         // 需要合并的列字段
+               let fields = ['nf', 'yf', 'rq', 'tzxqq'];// 需要合并的列
+               const cellValue = row[column.property];// 合并行的相同的唯一标识
+               if (cellValue && fields.includes(column.property)) {
+                 const prevRow = visibleData[_rowIndex - 1];
+                 let nextRow = visibleData[_rowIndex + 1];
+                 if (prevRow && prevRow[column.property] === cellValue) {
+                   // 如果和第一行数据一样，就删除
+                   return {rowspan: 0, colspan: 0};
+                 } else {
+                   // 获取有机会数据是一样的
+                   let countRowspan = 1;
+                   while (nextRow && nextRow[column.property] === cellValue) {
+                     nextRow = visibleData[++countRowspan + _rowIndex];
+                   }
+                   if (countRowspan > 1) {
+                     return {rowspan: countRowspan, colspan: 1};
+                   }
+                 }
+               }
+             },
+             //明细修改弹窗
+             cellClickEvent_xb(row) {
+               this.mxList = row.row.mxList
+               this.dialogVisible1 = true
+             },
+             //区分汇总数据
+             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'
+                 }
+               }
+             },
+             //明细修改弹窗，区分是否本船只
+             cellStyle1({row}) {
+               if (row.dcCh1) {
+                 return {
+                   color: 'red',
+                   cursor: 'pointer'
+                 }
+               }
+
+             },
+             //明细修改弹窗，可修改列
+             headerCellStyle({column}) {
+               let fields = ['jzsb', 'pwsb', 'hxsb', 'qgsb', 'pksb', 'dmsb', 'qjgsb'];
+               if (fields.includes(column.field)) {
+                 return {
+                   backgroundColor: 'lightblue',
+                   cursor: 'pointer'
+                 }
+               }
+             },
+             //提取三月滚动
+             tqSygd() {
+               tqSygd().then((res) => {
+                 if (res.data) {
+                   router.push({
+                     name: 'SygdWH',
+                     params: {
+                       list: res.data
+                     }
+                   })
+                 } else {
+                   this.$message.warning('请先将三月明细预排产！');
+                 }
+               })
+             },
+             // 全选
+             selectAllEvent() {
+               const records = this.$refs.xGrid.getCheckboxRecords();
+               this.checkedList = records;
+             },
+             // 单选
+             selectChangeEvent() {
+               const records = this.$refs.xGrid.getCheckboxRecords();
+               this.checkedList = records;
+             },
+             //明细排产时，弹窗选择目标船只
+             saveByDcch() {
+               saveByDcch(this.selectMbch).then((res) => {
+                 this.list = res.data
+                 if (this.$refs.xGrid) {
+                   this.$refs.xGrid.loadData(this.list)
+                 }
+               })
+               this.dialogVisible = false;
+             },
+             //修改明细信息；根据修改后的设备信息；重新排计划期
+             save() {
+               this.$message.warning('保存成功！');
+               this.dialogVisible1 = false;
+             },
+             //切换数据表点击事件
+             handleClick(tab, event) {
+               if (this.activeName === 'second') {
+                 // alert('线表计划')
+
+               }
+               if (this.activeName === 'third') {
+                 // alert('批量表')
+
+               }
+               if (this.activeName === 'fourth') {
+                 // alert('图纸')
+
+               }
+               if (this.activeName === 'fifth') {
+                 // alert('到货')
+                 if (this.list.length > 0) {
 
-        { field: 'hxsb', title: '划线设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
-        // { field: 'hxry', title: '划线人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
+                 }
+               }
+               if (this.activeName === 'sixth') {
+                 console.log(this.list5)
+               }
+             },
+             //材料类型转码
+             formatterLx({cellValue}) {
+               if (cellValue === 'B') {
+                 return '板材'
+               }
+               if (cellValue === 'X') {
+                 return '型材'
+               }
+               return cellValue
+             },
+             //转码信息
+             initBase() {
+               getCzxx({}).then(res => {
+                 this.dictData = res.data
+               })
+             },
+             //初始化表1 数据
+             initList() {
+               if (this.queryParam.beginTime === '' || this.queryParam.endTime === '') {
+                 this.$message.warning('选择时间范围')
+                 return
+               }
+               getList(this.queryParam).then((res) => {
+                 this.list = res.data
+                 if (this.$refs.xGrid) {
+                   this.$refs.xGrid.loadData(this.list)
+                 }
 
-        { field: 'qgsb', title: '切割设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
-        // { field: 'qgry', title: '切割人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'pklx', title: '坡口类型',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pkcd', title: '坡口长度',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pksb', title: '坡口设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
-        // { field: 'pkry', title: '坡口人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'pkrq', title: '坡口计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qbs', title: '曲标识',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qjgsb', title: '曲加工设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
-        // { field: 'qjgry', title: '曲加工人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'qjgrq', title: '曲加工计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dmcd', title: '打磨长度',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dmsb', title: '打磨设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true,}}},
-        // { field: 'dmry', title: '打磨人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'dmrq', title: '打磨计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsDz', title: '钢加大组结束',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsXz', title: '钢加小组结束',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'ljsl', title: '零件数量',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjks', title: '钢加开始',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcCh2', title: '本船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},//没有真实数据时，为空
-        { field: 'zt', title: '状态',width: 70,formatter: ['dictFormat','SYZT'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gxsj', title: '数据更新时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-  ],
-      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: '线表重量',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'tlt_zl', title: '套料图（排产）重量',width: 150,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-      ],
-      tableColumn2:[
-        { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: 'dcCh', title: '船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcPl', title: '批量',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcFd', title: '分段',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dzjsq', title: '批量表（钢加大组结束）',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jsq_dz_pc', title: '排产（钢加大组结束）',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '时间差',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'xzjsq', title: '批量表（钢加小组结束）',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jsq_xz_pc', title: '排产（钢加小组结束）',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '时间差',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-      ],
-      tableColumn3: [
-        { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: 'tzxqq', title: '图纸需求期',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcCh', title: '船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcPl', title: '批量',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcFd', title: '分段',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'xfqLqb', title: '领取表下发 ',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jsqLqb', title: '领取表接收',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'xfqTlt', title: '套料图下发 ',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jsqTlt', title: '套料图接收',width: 180,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
+               })
+               this.activeName = 'first'
+             },
+             formatDate({cellValue}) {
+               return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
+             },
+             getHeight() {
+               this.height = window.innerHeight - 200
+             },
+             //明细排产
+             sygdPC() {
+               this.$store.dispatch('app/closeSideBar', true)
+               sygdPC().then((res) => {
+                 if (res.data.no_tlt) {
+                   this.selectMbch = res.data
+                   this.haveTltBoms = res.data.haveTltBoms
+                   this.dialogVisible = true;
+                 } else {
+                   this.list = res.data.mxList
+                   if (this.$refs.xGrid) {
+                     this.$refs.xGrid.loadData(this.list)
+                   }
+                 }
+               })
+               this.activeName = 'first'
+             }
+           }
+         }
+         </script>
+         <style lang="scss" scoped>
 
-      ],
-      tableColumn4:[
-        { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: 'dcCh', title: '船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcPl', title: '批量',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dhqd', title: '订货清单号',width: 150,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'rkxh', title: '材质',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'wphd', title: '厚度',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'wpkd', title: '宽度',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'wpcd', title: '长度',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hdsl', title: '到货数量',width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gcxqq', title: '钢材需求期',width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-      ],
-      tableColumn5:[
-        { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: 'rq', title: '日期',width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '区域',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'kw', title: '跨位',width: 150,formatter: ['dictFormat','QGKW'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '功能定位',width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '设备编号',width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '设备名称',width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
+         .el-header {
+           margin: 0;
+           padding: 5px;
+           height: auto;
 
-        { field: 'tlt_sl', title: '套料图数量/板数',width: 150,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hx_cd', title: '划线长度',width: 150,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qg_cd', title: '切割长度',width: 150,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '产能',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: '', title: '产能单位',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-      ],
-      tableColumn6:[
-        { type: 'seq', width: 60, title: '序号',fixed: "left"},
-        { field: 'dcCh', title: '船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcPl', title: '批量',width: 80,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'tzbh', title: '套料图号',width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'wpgg', title: '规格',width: 80,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jssj', title: '组立结束时间',width: 110,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jzbs', title: '矫正标识',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'jzsb', title: '矫正设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
-        { field: 'slrq', title: '上料计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: 'pw', title: '抛丸位置',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'pwsb', title: '抛丸设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} } },
-        { field: 'pwrq', title: '抛丸计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hxcd', title: '划线长度(米)',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hxcdKc', title: '划线空程长度(米)',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hxsb', title: '划线设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }},
-        { field: 'hxrq', title: '划线计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgcd', title: '切割长度（米)',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgsb', title: '切割设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }},
-        { field: 'qgrq', title: '切割计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pklx', title: '坡口类型',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pkcd', title: '坡口长度',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'pksb', title: '坡口设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }},
-        { field: 'pkrq', title: '坡口计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qbs', title: '曲标识',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qjgsb', title: '曲加工设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }},
-        { field: 'qjgrq', title: '曲加工计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dmcd', title: '打磨长度',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dmsb', title: '打磨设备',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },editRender: { name: "$select",options: [],props: { clearable: true} }},
-        { field: 'dmrq', title: '打磨计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        // { field: 'jsqLqb', title: '领取表接收',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'jsqTlt', title: '套料图接收',width: 80,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'dhqd', title: '订货清单号',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'orderBs', title: '订货数量',width: 80,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'arrivalBs', title: '到货数量',width: 80,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'qy', title: '区域',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'slry', title: '上料人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'pw', title: '抛丸',width: 100},
+           .el-input {
+             width: 140px;
+           }
 
-        // { field: 'jzry', title: '矫正人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'jzrq', title: '矫正计划日期',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
+           .el-select {
+             width: 140px;
+           }
 
-        // { field: 'pwry', title: '抛丸人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'hxry', title: '划线人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'qgry', title: '切割人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'pkry', title: '坡口人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'qjgry', title: '曲加工人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        // { field: 'dmry', title: '打磨人员',width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsDz', title: '钢加大组结束',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjjsXz', title: '钢加小组结束',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'ljsl', title: '零件数量',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gjks', title: '钢加开始',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcFd', title: '分段号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'dcCh2', title: '本船号',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},//没有真实数据时，为空
-        { field: 'dcCh1', title: '目标船号',width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},//数据来源船，真实数据时，为空
-        { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'zt', title: '状态',width: 70,formatter: ['dictFormat','SYZT'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'bcshzl', title: '重量',width: 80,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'wpxh', title: '材质',width: 80,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
-        { field: 'xcms', title: '型材米数',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'gxsj', title: '数据更新时间',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-      ],
-    }
-  },
-  computed: {
-    ...mapGetters(['name', 'bmbm'])
-  },
-  created() {
-    window.addEventListener('resize', this.getHeight)
-    this.getHeight()
-    this.initBase()
-  },
-  mounted(){
+         }
 
-  },
-  methods: {
-    //汇总
-    symxhz(){
+         .el-container {
+           padding: 0;
+           margin: 0;
+         }
 
-      if (this.list.length<1){
-        this.$message.warning('请先查询需要汇总的信息！');
-        return
-      }
-      symxhz(this.list).then((res) => {
-        if (res.data) {
-          console.log(res.data)
-          this.list1=res.data.xbList
-          this.list2=res.data.plList
-          this.list3=res.data.tzList
-          this.list4=res.data.dhList
-          this.list5=res.data.kwList
-        }
-      })
-    },
-    //合并行
-    rowspanMethod({ row, _rowIndex, column, visibleData }){
-      //不要忘记在vxe-grid上配置  :scroll-y="{enabled: false}" 防止下拉时样式变化
-// 需要合并的列字段
-      let fields = ['nf','yf','rq','tzxqq'];// 需要合并的列
-      const cellValue = row[column.property];// 合并行的相同的唯一标识
-      if (cellValue && fields.includes(column.property)) {
-        const prevRow = visibleData[_rowIndex - 1];
-        let nextRow = visibleData[_rowIndex + 1];
-        if (prevRow && prevRow[column.property] === cellValue) {
-          // 如果和第一行数据一样，就删除
-          return { rowspan: 0, colspan: 0 };
-        } else {
-          // 获取有机会数据是一样的
-          let countRowspan = 1;
-          while (nextRow && nextRow[column.property] === cellValue) {
-            nextRow = visibleData[++countRowspan + _rowIndex];
-          }
-          if (countRowspan > 1) {
-            return { rowspan: countRowspan, colspan: 1 };
-          }
-        }
-      }
-    },
-   //明细修改弹窗
-    cellClickEvent_xb(row){
-      this.mxList=row.row.mxList
-      this.dialogVisible1=true
-      // const tableRef = this.$refs.tableRef1;
-      // this.sbmx1(tableRef)
-    },
-    sbmx1(tableRef){
-      this.sbmx("jzsb",this.sbxx.jp,tableRef)
-      this.sbmx("pwsb",this.sbxx.pw,tableRef)
-      this.sbmx("hxsb",this.sbxx.hx,tableRef)
-      this.sbmx("qgsb",this.sbxx.qg,tableRef)
-      this.sbmx("pksb",this.sbxx.pk,tableRef)
-      this.sbmx("dmsb",this.sbxx.dm,tableRef)
-      this.sbmx("qjgsb",this.sbxx.qjg,tableRef)
-    },
-    //区分汇总数据
-    cellStyle({ row, column, rowIndex, columnIndex }){
-      let fields = ['tlt_zl','jsq_dz_pc','jsq_xz_pc','tzxqq','tlt_sl','hx_cd','qg_cd','gcxqq'];
-      if (fields.includes(column.property)) {
-        return {
-          color: '#CC8B04',
-          cursor:'pointer'
-        }
-      }
-    },
-    //明细修改弹窗，区分是否本船只
-    cellStyle1({ row }){
-      if (row.dcCh1) {
-        return {
-          color: 'red',
-          cursor:'pointer'
-        }
-      }
+         .el-main {
+           padding: 0;
+         }
 
-    },
-    //明细修改弹窗，可修改列
-    headerCellStyle({ column }){
-      let fields = ['jzsb','pwsb','hxsb','qgsb','pksb','dmsb','qjgsb'];
-      if (fields.includes(column.field)) {
-        return {
-          backgroundColor: 'lightblue',
-          cursor:'pointer'
-        }
-      }
-    },
-    //提取三月滚动
-    tqSygd(){
-      tqSygd().then((res) => {
-        if (res.data) {
-          router.push({
-            name: 'SygdWH',
-            params: {
-              list: res.data
-            }
-          })
-        }else {
-          this.$message.warning('请先将三月明细预排产！');
-        }
-      })
-    },
-    // 全选
-    selectAllEvent() {
-      const records = this.$refs.xGrid.getCheckboxRecords();
-      this.checkedList = records;
-    },
-    // 单选
-    selectChangeEvent() {
-      const records = this.$refs.xGrid.getCheckboxRecords();
-      this.checkedList = records;
-    },
-    //明细排产时，弹窗选择目标船只
-    saveByDcch(){
-      saveByDcch(this.selectMbch).then((res) => {
-        this.list = res.data
-        if (this.$refs.xGrid) {
-          this.$refs.xGrid.loadData(this.list)
-        }
-      })
-      this.dialogVisible=false;
-    },
-    //修改明细信息；根据修改后的设备信息；重新排计划期
-    save(){
-      this.$message.warning('保存成功！');
-      this.dialogVisible1=false;
-      // saveMxList(this.mxList).then((res) => {
-      //
-      // })
+         .el-col {
+           padding: 0;
+           height: 32px;
+         }
 
-    },
-    //切换数据表点击事件
-    handleClick(tab, event) {
-      if(this.activeName==='second'){
-        // alert('线表计划')
+         .el-aside {
+           background: #fff;
+           padding: 0
+         }
 
-      }
-      if(this.activeName==='third'){
-        // alert('批量表')
+         .el-container {
+           padding: 0
+         }
 
-      }
-      if(this.activeName==='fourth'){
-        // alert('图纸')
+         .el-row {
+         }
 
-      }
-      if(this.activeName==='fifth'){
-        // alert('到货')
-        if (this.list.length>0){
+         .el-row:last-child {
+           margin-bottom: 0;
+         }
 
-        }
-      }
-      if(this.activeName==='sixth'){
-          console.log(this.list5)
-      }
-    },
-    //材料类型转码
-    formatterLx({cellValue}){
-      if(cellValue==='B'){
-        return '板材'
-      }
-      if (cellValue==='X'){
-        return '型材'
-      }
-      return cellValue
-    },
-    //转码信息
-    initBase(){
-      getCzxx({}).then(res=>{
-        this.dictData = res.data
-      })
-      getCnsb().then(res=>{
-        this.sbxx = res.data
-        const tableRef = this.$refs.xGrid.getColumnByField('dcCh');
-        // this.sbmx1(tableRef)
-        // this.sbmx("jzsb",this.sbxx.jp,tableRef)
-      })
+         .tableStyles {
+           background: #0a76a4;
+         }
 
+         .my-dropdown {
+           width: 400px;
+           height: 400px;
+           background-color: #fff;
+           border: 1px solid #dcdfe6;
+           box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+           font-size: 12px;
 
-    },
-    sbmx(sbmc,list,tableRef){
-      var arr = [];
-      const sb = tableRef.getColumnByField(sbmc);
-      for (let i = 0; i < list.length; i++) {
-        const temp = {
-          label: list[i].sbmc,
-          value: list[i].sbbh,
-        };
-        arr.push(temp);
-      }
-      sb.editRender.options = arr;
+         }
 
-    },
-    //初始化表1 数据
-    initList() {
-      if (this.queryParam.beginTime === ''||this.queryParam.endTime === '') {
-          this.$message.warning('选择时间范围')
-        return
-      }
-      getList(this.queryParam).then((res) => {
-        this.list = res.data
-        if (this.$refs.xGrid) {
-          this.$refs.xGrid.loadData(this.list)
-        }
+         .mytable1 {
 
-      })
-      this.activeName='first'
-    },
-    formatDate ({ cellValue }) {
-      return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
-    },
-    getHeight() {
-      this.height = window.innerHeight - 200
-    },
-    //明细排产
-    sygdPC() {
-      this.$store.dispatch('app/closeSideBar',true)
-      sygdPC().then((res) => {
-        if(res.data.no_tlt){
-          this.selectMbch=res.data
-          this.haveTltBoms=res.data.haveTltBoms
-          this.dialogVisible=true;
-        }else {
-          this.list = res.data.mxList
-          if (this.$refs.xGrid) {
-            this.$refs.xGrid.loadData(this.list)
-          }
-        }
-      })
-      this.activeName='first'
-    }
-  }
-}
-</script>
-<style lang="scss" scoped >
+         }
 
-.el-header{margin:0;padding: 5px;height:auto;
-  .el-input{
-    width: 140px;
-  }
-  .el-select{
-    width: 140px;
-  }
+         .borderClass {
 
-}
-.el-container{padding: 0;margin:0;}
-.el-main{padding: 0;}
-.el-col{padding: 0;height: 32px;}
-.el-aside{background: #fff;padding: 0}
-.el-container{padding: 0}
-.el-row {}
-.el-row:last-child {margin-bottom: 0; }
+         }
 
-.tableStyles{
-  background: #0a76a4;
-}
+         .vxe-input {
+           display: inline-block !important;
+           position: relative !important;
+           width: auto;
+         }
 
-.my-dropdown {
-  width: 400px;
-  height: 400px;
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
-  font-size: 12px;
+         .el-input {
+           display: inline-block !important;
+           position: relative !important;
+           width: auto;
+         }
 
-}
-.mytable1{
+         .keyword-lighten {
+           color: #000;
+           background-color: #FFFF00;
+         }
 
-}
-.borderClass{
+         .vxe-textarea--inner {
+           line-height: inherit;
+         }
 
-}
-.vxe-input {
-  display: inline-block !important;
-  position: relative !important;
-  width: auto;
-}
-.el-input {
-  display: inline-block !important;
-  position: relative !important;
-  width: auto;
-}
-.keyword-lighten {
-  color: #000;
-  background-color: #FFFF00;
-}
+         .el-form-item__label-wrap {
+           margin-left: 0px !important;
+           float: left;
+         }
 
-.vxe-textarea--inner {
-  line-height: inherit;
-}
-.el-form-item__label-wrap {
-  margin-left: 0px !important;
-  float: left;
-}
-.fontClass{
-  font-size: 12px;
-  font-weight: bold;
-}
+         .fontClass {
+           font-size: 12px;
+           font-weight: bold;
+         }
 
 
-</style>
+         </style>
diff --git a/src/views/jhzx/xbjhCX.vue b/src/views/jhzx/xbjhCX.vue
index db079b0..22d2d64 100644
--- a/src/views/jhzx/xbjhCX.vue
+++ b/src/views/jhzx/xbjhCX.vue
@@ -71,8 +71,6 @@
           :footer-method="footerMethod"
           :footer-cell-class-name="footerCellClassName"
           :data="arrList"
-          @checkbox-all="selectAllEvent"
-          @checkbox-change="selectChangeEvent"
         >
           <vxe-column type="seq" width="80" :resizable="false" show-overflow>
             <template #header>
@@ -108,6 +106,7 @@
 <script>
 import { getList, tj, save, upload } from "@/api/jhzx/xbjhWH";
 import { getCzxx } from "@/api/jhzx/qfxq";
+import XEUtils from "xe-utils";
 export default {
   name: "xbjhCX",
   data() {
@@ -169,6 +168,7 @@ export default {
           em.zl = em.zl ? em.zl : null;
         });
       });
+
       this.tableData = data;
       this.leftColumn = []; //左侧列数据
       this.topColumn = []; //顶部列数据
@@ -251,6 +251,7 @@ export default {
         }
       }
       this.arrList = Object.values(objeckList); //data数据
+
     },
 
     // 上传excel
@@ -312,13 +313,13 @@ export default {
       } else {
         this.request.nf = "";
       }
-      // if()
       getList(params).then((res) => {
         if (res.success) {
           this.checkedList = {};
           this.getTableList(res.data);
         }
       });
+
     },
     // 表尾列求和
     total(list, field) {
@@ -331,17 +332,26 @@ export default {
       return count;
     },
     footerMethod({ columns, data }) {
-      const totalList = []; //合计
-      columns.forEach((column) => {
-        if (["checkbox"].includes(column.property)) {
-          return "合并了";
+      console.log( columns, data)
+      return [
+        columns.map((column, columnIndex) => {
+          if (columnIndex === 0) {
+            return '合计'
+          }
+          return this.sumNum(data, column.property)
+        })
+      ]
+    },
+    sumNum(list, field) {
+      let count = 0
+      list.forEach(item => {
+        let num = Number(item[field])
+        if (!XEUtils.isNumber(num) || isNaN(num)) {
+          num = 0
         }
-        var totalData = null;
-        totalData = this.total(data, column.property);
-        totalList.push(totalData);
-      });
-      totalList[0] = "合计";
-      return [totalList];
+        count = this.cal.accAdd(count, num)
+      })
+      return count==0?'-':count;
     },
     // 头部header css
     headerCellClassName({ column, $rowIndex }) {
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index 8b8298d..c193cd3 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -12,7 +12,7 @@
           <el-col :span="9">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
-              <el-button type="success" @click="initList">提交月度计划</el-button>
+              <el-button type="success" @click="tjydjh">提交月度计划</el-button>
               <el-button type="success" @click="initList">保存</el-button>
             </el-form-item>
           </el-col>
@@ -199,7 +199,7 @@
 <script>
 import router from "@/router";
 import {  getCzxx} from '@/api/jhzx/qfxq'
-import {getList, sygdPC, saveByDcch, tqSygd, symxhz, getCnsb, saveMxList} from '@/api/jhzx/sygd'
+import {getYdjh, tjydjh, getCnsb} from '@/api/jhzx/sygd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import { getToken } from '@/utils/auth'
@@ -247,7 +247,7 @@ export default {
         { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'jssj', title: '组立结束时间',width: 110,
+        { field: 'jssj', title: '前方需求时间',width: 110,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
         { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
@@ -794,7 +794,7 @@ export default {
         this.$message.warning('选择时间范围')
         return
       }
-      getList(this.queryParam).then((res) => {
+      getYdjh(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
@@ -807,22 +807,14 @@ export default {
       return XEUtils.toDateString(cellValue, 'yyyy/MM/dd')
     },
     getHeight() {
-      this.height = window.innerHeight - 200
+      this.height = window.innerHeight - 230
     },
-    //明细排产
-    sygdPC() {
-      this.$store.dispatch('app/closeSideBar',true)
-      sygdPC().then((res) => {
-        if(res.data.no_tlt){
-          this.selectMbch=res.data
-          this.haveTltBoms=res.data.haveTltBoms
-          this.dialogVisible=true;
-        }else {
-          this.list = res.data.mxList
-          if (this.$refs.xGrid) {
-            this.$refs.xGrid.loadData(this.list)
-          }
-        }
+    //提取月度计划
+    tjydjh() {
+      tjydjh().then((res) => {
+            if (res){
+              this.list=res.data
+            }
       })
       this.activeName='first'
     }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 7dfb48f..b9b7dcb 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -57,22 +57,6 @@
           </span>
         </el-form-item>
       </el-tooltip>
-
-      <!--<el-form-item prop="username">-->
-      <!--<span class="svg-container">-->
-      <!--<svg-icon icon-class="user" />-->
-      <!--</span>-->
-      <!--<el-input-->
-      <!--ref="zxtbm"-->
-      <!--v-model="loginForm.zxtbm"-->
-      <!--placeholder="Username"-->
-      <!--name="zxtbm"-->
-      <!--type="text"-->
-      <!--tabindex="1"-->
-      <!--autocomplete="on"-->
-      <!--/>-->
-      <!--</el-form-item>-->
-
       <template >
         <div align="center" >
           <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">账号登陆</el-button>
@@ -308,10 +292,11 @@
         height: 47px;
         caret-color: $cursor;
 
-        &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
-          -webkit-text-fill-color: $cursor !important;
-        }
+        //账号密码自动填充
+        //&:-webkit-autofill {
+        //  box-shadow: 0 0 0px 1000px $bg inset !important;
+        //  -webkit-text-fill-color: $cursor !important;
+        //}
       }
     }
 
diff --git a/src/views/sjzx/gcrlWH.vue b/src/views/sjzx/gcrlWH.vue
index f0e87fe..429b00f 100644
--- a/src/views/sjzx/gcrlWH.vue
+++ b/src/views/sjzx/gcrlWH.vue
@@ -87,11 +87,11 @@ export default {
           title: "星期",
           align: "center",
         },
-        {
-          field: "yz",
-          title: "月周",
-          align: "center",
-        },
+        // {
+        //   field: "yz",
+        //   title: "月周",
+        //   align: "center",
+        // },
         {
           field: "nz",
           title: "年周",
@@ -138,7 +138,7 @@ export default {
     window.addEventListener("resize", this.getHeight);
     this.getHeight();
     var date=new Date;
-    var year=date.getFullYear(); 
+    var year=date.getFullYear();
     this.request.nf = year;
     this.typeList();
     this.initList();
diff --git a/src/views/sjzx/sbcnWH.vue b/src/views/sjzx/sbcnWH.vue
index 140fa92..6ae0e0d 100644
--- a/src/views/sjzx/sbcnWH.vue
+++ b/src/views/sjzx/sbcnWH.vue
@@ -4,7 +4,7 @@
     <el-header style="width: 100%">
       <el-form ref="requestForm" :model="request" label-width="80px">
         <el-row>
-          <el-col :span="4">
+          <el-col :span="8">
             <el-form-item label="跨位:">
               <el-select v-model="request.kw" placeholder="跨位" clearable>
                 <el-option
@@ -17,13 +17,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="设备名称:">
-              <el-input
-                v-model="request.sbmc"
-                placeholder="设备名称"
-                clearable
-              />
-            </el-form-item>
+<!--            <el-form-item label="设备名称:">-->
+<!--              <el-input-->
+<!--                v-model="request.sbmc"-->
+<!--                placeholder="设备名称"-->
+<!--                clearable-->
+<!--              />-->
+<!--            </el-form-item>-->
           </el-col>
           <el-col :span="16" style="text-align: right">
             <el-button type="success" @click="toolbarButtonClickEvent('insert')"
@@ -117,6 +117,28 @@ export default {
       tableColumn: [
         { type: "checkbox", width: "50", align: "center" },
         { type: "seq", width: "50", title: "序号", align: "center" },
+        // {
+        //   field: "sbbh",
+        //   title: "设备编号",
+        //   align: "center",
+        //   minWidth: "90",
+        //   slots: { edit: "sbbh_edit" },
+        //   filters: [
+        //     {
+        //       data: {
+        //         checks: [],
+        //         sVal: "",
+        //         sMenu: "",
+        //         fType1: "",
+        //         fVal1: "",
+        //         fMode: "and",
+        //         fType2: "",
+        //         fVal2: "",
+        //       },
+        //     },
+        //   ],
+        //   filterRender: { name: "FilterCombination" },
+        // },
         {
           field: "kw",
           title: "跨位",
@@ -148,7 +170,11 @@ export default {
           title: "工序",
           align: "center",
           minWidth: "70",
-          editRender: { name: "input" },
+          editRender: {
+            name: "$select",
+            options: [],
+            props: { clearable: true },
+          },
           filters: [
             {
               data: {
@@ -167,7 +193,7 @@ export default {
         },
         {
           field: "szcs",
-          title: "所属部门",
+          title: "设备所属部门",
           align: "center",
           minWidth: "90",
           editRender: {
@@ -223,29 +249,6 @@ export default {
           ],
           filterRender: { name: "FilterCombination" },
         },
-        {
-          field: "sbbh",
-          title: "设备编号",
-          align: "center",
-          minWidth: "90",
-          editRender: { name: "input" },
-          slots: { edit: "sbbh_edit" },
-          filters: [
-            {
-              data: {
-                checks: [],
-                sVal: "",
-                sMenu: "",
-                fType1: "",
-                fVal1: "",
-                fMode: "and",
-                fType2: "",
-                fVal2: "",
-              },
-            },
-          ],
-          filterRender: { name: "FilterCombination" },
-        },
         {
           field: "sbcn",
           title: "产能（每小时）",
@@ -273,7 +276,11 @@ export default {
           title: "产能单位",
           align: "center",
           minWidth: "90",
-          editRender: { name: "input" },
+          editRender: {
+            name: "$select",
+            options: [],
+            props: { clearable: true },
+          },
           filters: [
             {
               data: {
@@ -291,8 +298,8 @@ export default {
           filterRender: { name: "FilterCombination" },
         },
         {
-          field: "dwsj",
-          title: "产能系数",
+          field: "",
+          title: "设备默认排产顺序",
           align: "center",
           minWidth: "90",
           editRender: { name: "input" },
@@ -330,8 +337,47 @@ export default {
     this.emSbjbbZM("bmbm");
     this.getBMMCBM();
     this.initList();
+    this.initgxList();
+    this.initdwList();
   },
   methods: {
+    //工序 xn20231110
+    initgxList(){
+      const dict=window.localStorage.getItem( 'PCGX');
+      const gxList =JSON.parse(dict)
+        this.$nextTick(() => {
+          const tableRef = this.$refs.tableRef;
+          const gx = tableRef.getColumnByField("gx");
+          const testList = [];
+          for (let i = 0; i < gxList.length; i++) {
+            const temp = {
+              label: gxList[i].bmsm,
+              value: gxList[i].bm,
+            };
+            testList.push(temp);
+          }
+          gx.editRender.options = testList;
+        });
+
+    },
+    initdwList(){
+      const dict=window.localStorage.getItem( 'JLDW');
+      const dwList =JSON.parse(dict)
+        this.$nextTick(() => {
+          const tableRef = this.$refs.tableRef;
+          const dw = tableRef.getColumnByField("dw");
+          const testList = [];
+          for (let i = 0; i < dwList.length; i++) {
+            const temp = {
+              label: dwList[i].bmsm,
+              value: dwList[i].bm,
+            };
+            testList.push(temp);
+          }
+          dw.editRender.options = testList;
+        });
+
+    },
     // 部门对应设备名称和编号
     getBMMCBM() {
       getBMMCBM().then((res) => {