From 85a1311c8c13cfb4d2dc6b2ee49a9f0494e8fe6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 20 Mar 2025 16:58:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A2=84=E9=85=8D=E7=9B=98=E6=91=86=E6=94=BE?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E3=80=81=E7=A1=AE=E8=AE=A4=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sjzx/bzzGL.js                         |    8 -
 src/api/zyjh.js                               |   24 +
 src/views/jhzx/qfqrGL.vue                     |   36 +-
 src/views/jhzxgl/components/yppfk.js          |  106 ++
 src/views/jhzxgl/yppFK.vue                    | 1052 ++---------------
 src/views/jhzxgl/yppFK_bak                    |  578 +++++++++
 src/views/jhzxgl/yppyz.vue                    |    3 +-
 src/views/zyjhzx/bfang/comps/BFangLJTable.vue |   56 +
 src/views/zyjhzx/bfang/comps/BFangShow.vue    |    1 +
 src/views/zyjhzx/bfang/comps/BFangTable.vue   |   83 +-
 src/views/zyjhzx/bfang/comps/ljTable.js       |  408 +++++++
 src/views/zyjhzx/bfang/comps/table.js         |  380 +-----
 src/views/zyjhzx/bfang/index.vue              |    5 +-
 13 files changed, 1334 insertions(+), 1406 deletions(-)
 create mode 100644 src/views/jhzxgl/components/yppfk.js
 create mode 100644 src/views/jhzxgl/yppFK_bak
 create mode 100644 src/views/zyjhzx/bfang/comps/BFangLJTable.vue
 create mode 100644 src/views/zyjhzx/bfang/comps/ljTable.js

diff --git a/src/api/sjzx/bzzGL.js b/src/api/sjzx/bzzGL.js
index 09b9269..57f365a 100644
--- a/src/api/sjzx/bzzGL.js
+++ b/src/api/sjzx/bzzGL.js
@@ -68,14 +68,6 @@ export function getryBase(data) {
   });
 }
 
-export function bgList(data) {
-  return request({
-    url: "/yppyz/bgList",
-    method: "post",
-    data,
-  });
-}
-
 export function yppyzcx(data) {
   return request({
     url: "/yppyz/list",
diff --git a/src/api/zyjh.js b/src/api/zyjh.js
index cf14331..3637bf3 100644
--- a/src/api/zyjh.js
+++ b/src/api/zyjh.js
@@ -1,5 +1,29 @@
 import request from '@/utils/request'
 
+export function yppbg(data) {
+  return request({
+    url: "/zyjh/yppbg",
+    method: "post",
+    data,
+  });
+}
+
+export function bgList(data) {
+  return request({
+    url: "/zyjh/wzxjc",
+    method: "post",
+    data,
+  });
+}
+
+export function wbfList(data) {
+  return request({
+    url: "/yppyz/wbfList",
+    method: "post",
+    data,
+  });
+}
+
 export function ppBGong(data) {
   return request({
     url: "/zyjh/ppBGong",
diff --git a/src/views/jhzx/qfqrGL.vue b/src/views/jhzx/qfqrGL.vue
index 52d37c1..bf15cac 100644
--- a/src/views/jhzx/qfqrGL.vue
+++ b/src/views/jhzx/qfqrGL.vue
@@ -345,24 +345,24 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qrry', title: '确认人员', width: 90,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qrrq', title: '确认日期', width: 120,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+        // { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' },
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' },
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: 'qrry', title: '确认人员', width: 90,editRender: { name: 'input' },
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'qrrq', title: '确认日期', width: 120,editRender: { name: 'input' },
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
 
         { field: 'dzjz', title: '大组极重', minWidth: "70",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
diff --git a/src/views/jhzxgl/components/yppfk.js b/src/views/jhzxgl/components/yppfk.js
new file mode 100644
index 0000000..01e4a3a
--- /dev/null
+++ b/src/views/jhzxgl/components/yppfk.js
@@ -0,0 +1,106 @@
+export default function () {
+  const options={
+    height:840,
+    align:'center',
+    border: true,
+    resizable: true,
+    keepSource:true,
+    size:'mini',
+    showOverflow: true,
+    scrollY:{enable:true},
+    highlightCurrentRow:true,
+    data:[],
+  }
+
+  const columns = [
+    { type: 'checkbox', width: 50 ,},
+    { type: 'seq', width: 60, title: '序号' },
+    {
+      field: 'dcCh',
+      title: '船号',editRender: { name: '$select',options: [], },
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'ypph',
+      title: '虚拟托盘',editRender: { name: 'input' },
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'dcPl',
+      title: '批量',editRender: { name: 'input' },
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'dcFd',editRender: { name: 'input' },
+      title: '分段',
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'kw',
+      title: '跨位', formatter: ['dictFormat', 'QGKW'],
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'zl',
+      title: '组立',editRender: { name: '$select',options: [{label: '小组立',value:'X'},{label: '中大组立',value:'D'}], props: {clearable: true} },
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+
+    {
+      field: 'tz',
+      title: '特征',
+      width: 120, editRender: { name: 'input' },
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'lx',
+      title: '流向',editRender: { name: 'input' },
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'xj',
+      title: '下级',editRender: { name: 'input' },
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'qy',
+      title: '区域',
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'dwh',
+      title: '垛位号',
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'status',
+      title: '状态',
+      width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+  ]
+
+  return {options,columns}
+}
diff --git a/src/views/jhzxgl/yppFK.vue b/src/views/jhzxgl/yppFK.vue
index 9c4a6a0..2b730b7 100644
--- a/src/views/jhzxgl/yppFK.vue
+++ b/src/views/jhzxgl/yppFK.vue
@@ -1,1017 +1,97 @@
 <template>
-  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
-  <el-container>
-    <el-header style="width: 100%; height: 80px;font-size: 12px">
-
-      <el-form :inline="true"  label-width="60px"  label-position="left">
+  <el-container style="padding: 0">
+    <el-header style="width: 100%; height: 22px;font-size: 12px;padding-top: 5px">
+      <el-form :inline="true" label-width="55px" label-position="right">
         <el-row>
-
-          <el-col :span="22">
-
-            <el-form-item label="状态:">
-              <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
-                <el-option
-                  v-for="item in statusOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-
+          <el-col :span="20">
             <el-form-item label="船号:">
-              <vxe-pulldown ref="xDown4" transfer >
-                <template #default>
-                  <vxe-input
-                    v-model="queryParam.dcch"
-                    placeholder="船号"
-                    style="height: 28px;
-                    line-height: 28px; width: 140px;"
-                    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>
-
-
+              <ProjectSelect ref="projectSelectRef" />
             </el-form-item>
             <el-form-item label="批量:">
-              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+              <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" />
             </el-form-item>
             <el-form-item label="分段:">
-              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
-            </el-form-item>
-            <el-form-item label="套料图:">
-              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
-            </el-form-item>
-
-
-
-
-            <el-form-item label="区域:">
-
-              <el-select v-model="queryParam.qy" placeholder="区域" clearable  @change="bzClick" >
-                <el-option
-                  v-for="item in dictData.qys"
-                  :key="item.qy"
-                  :label="item.qy"
-                  :value="item.qy"
-                >
-                </el-option>
-              </el-select>
-              <el-select v-model="queryParam.dwh" placeholder="垛位" clearable>
-                <el-option
-                  v-for="item in dictData.dwxxs"
-                  :key="item.dwh"
-                  :label="item.dwh"
-                  :value="item.dwh"
-                >
-                </el-option>
-              </el-select>
+              <el-input v-model="queryParam.dcFd" type="search" placeholder="分段" />
             </el-form-item>
-
-
           </el-col>
-          <el-col :span="2">
-            <el-form-item style="float: right" >
-              <el-button type="success" @click="initList">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-
-          <el-col :span="20"  >
-
-          </el-col>
-
-
-
-
-
-          <!--            <span style="width:6%" >班组:</span>-->
-          <!--            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">-->
-          <!--              <el-option-->
-          <!--                v-for="item in this.dictData.resourcesCodes"-->
-          <!--                :key="item.resourcesCode"-->
-          <!--                :label="item.resourcesCode"-->
-          <!--                :value="item.resourcesCode"-->
-          <!--              >-->
-          <!--              </el-option>-->
-          <!--            </el-select>-->
-
-          <!--            <span style="width:6%" >作业区:</span>-->
-          <!--            <el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">-->
-          <!--              <el-option-->
-          <!--                v-for="item in this.dictData.zyqs"-->
-          <!--                :key="item.resourcesCode+item.zyq"-->
-          <!--                :label="item.resourcesCode+item.zyq"-->
-          <!--                :value="item.zyq"-->
-          <!--              >-->
-          <!--              </el-option>-->
-          <!--            </el-select>-->
-
-          <!--            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >-->
-          <!--              <el-option-->
-          <!--                v-for="item in this.dictData.zyrys"-->
-          <!--                :key="item.id"-->
-          <!--                :label="item.resourcesCode+item.zyq+item.userName"-->
-          <!--                :value="item.userName"-->
-          <!--              >-->
-          <!--              </el-option>-->
-          <!--            </el-select>-->
-
-          <!--            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="打磨计划日期"/>-->
-          <!--            <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>-->
-          <!--            &lt;!&ndash;            <span style="width:6%" >反馈人员:</span>&ndash;&gt;-->
-          <!--            &lt;!&ndash;            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />&ndash;&gt;-->
-          <!--            &lt;!&ndash;            <span style="width:6%" >反馈日期:</span>&ndash;&gt;-->
-          <!--            &lt;!&ndash;            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>&ndash;&gt;-->
-          <!--            &lt;!&ndash;            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>&ndash;&gt;-->
-          <!--          </el-col>-->
-          <el-col :span="4" >
-            <el-form-item style="float: right" >
-              <el-button type="success" @click="wzxjc">完整性检查</el-button>
-              <el-button type="success" @click="slpgclick">报工</el-button>
-            </el-form-item>
+          <el-col :span="4" style="text-align: right">
+            <el-button type="success" @click="wzxjc">完整性检查</el-button>
+            <el-button type="success" @click="bgong">报工</el-button>
           </el-col>
         </el-row>
       </el-form>
     </el-header>
-    <el-container  style="padding-top: 0px">
-      <el-container>
-        <el-main>
-          <div class="mytable">
-            <vxe-grid
-              id="id"
-              ref="xGrid"
-              border
-              resizable
-              keep-source
-              :align="'center'"
-              :height="height"
-              :auto-resize="true"
-              :columns="tableColumn"
-              highlight-current-row
-              :data="list"
-              :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
-              highlight-hover-row
-              show-overflow
-              show-header-overflow
-
-            >
-
-
-            </vxe-grid>
-          </div>
-
-
-        </el-main>
-      </el-container>
+    <el-container style="padding: 0">
+      <el-main>
+        <VxeGrid ref="bFangRef" v-bind="gridOptions" />
+      </el-main>
     </el-container>
   </el-container>
 </template>
-
 <script>
-import {
-  saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
-} from '@/api/jhzxgl/pgd'
-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 {saveDmppxxb, getDmppxxbList, saveDmppxxbpg, getDmppxxbListAndYz} from "@/api/jhzxgl/ypp";
-export default {
-  name:'Cgjhdh',
-  data() {
-    return {
-      queryParam: {
-        dcch:'',
-        pl:'',
-        fd:'',
-        fkyy:'',
-        zt:'02',
-        'lx':'d',
-        qgkw:'',
-        tlth:'',
-        qy:'',
-        dw:''
-      },
-      statusOptions: [
-        {
-          value: "02",
-          label: "未报工",
-        },
-        {
-          value: "03",
-          label: "已报工",
-        },
-
+import tableConfig from "@/views/jhzxgl/components/yppfk";
+import ProjectSelect from "@/components/ProjectSelect/index.vue";
+import {bgList, yppbg} from "@/api/zyjh";
+import {getBFangDwxx} from "@/views/zyjhzx/bfang/comps/api";
 
-      ],
-      inParam:{
-        qy:'',
-        dw:''
+export default {
+  name:'YppFk',
+  components: {ProjectSelect},
+  data(){
+    return{
+      queryParam:{
+        dcCh:'',
+        dcPl:'',
+        dcFd:'',
       },
-      dwxxs:[],
-      zyqs:[],
-      zyrys:[],
-      list: [],
-      heads: { token: getToken() },
-      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
-      dictData:{},
-      height: '500px',
-      projectData:[],
-      projectData1:[],
-      projectColumns: [
-        {field: 'cbbm', title: '船号',width: 110},
-        { field: 'wgbs', title: '完工标识', width: 80,
-          slots:{
-            default: 'wgbsEdit'
-          },
-        },
-      ],
-
-      tableColumn: [
-        { type: 'checkbox', width: 40 },
-        { type: 'seq', width: 40, title: '序号' },
-
-
-        { field: 'ppzt', title: '状态', width: 90, formatter: ['dictFormat', 'PPZT'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'czbh', title: '船号', width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        {
-          field: 'ypph',
-          title: '虚拟托盘',
-          width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        { field: 'pl', title: '批量', width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'fd', title: '分段', width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'tlth', title: '套料图号', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-
-
-        { field: 'ljbh', title: '零件编号', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        // { field: 'ljmc', title: '零件名称', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-
-        { field: 'ljgg', title: '零件规格', width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'ljcz', title: '零件材质', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'sl', title: '数量', width: 70,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'dzjz', title: '大组极重', minWidth: "70",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xdb', title: 'X大板', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xskj', title: 'X数控件', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xpt', title: 'X平铁', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xyw', title: 'X压弯', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xxc', title: 'X型材', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'xtxc', title: 'X二次装T型材', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ddb', title: 'D大板', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'dqb', title: 'D曲板', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'dxc', title: 'D型材T', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'dsj', title: 'D散件', minWidth: "100",
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'dgdh', title: '打磨工单号', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'dmsbbh', 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: 'dmjhrq', title: '打磨计划日期', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'dmXfry', title: '打磨派工人', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'dmXfrq', title: '打磨派工日期', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'dscry', title: '打磨生产人员', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-
-
-        { field: 'dmFkry', title: '打磨反馈人', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'pgdh', title: '坡口工单号', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pkjhrq', title: '坡口计划日期', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pgdh', title: '坡口工单号', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pksbbh', title: '坡口设备编号', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pklx', title: '坡口类型', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pkcd', title: '坡口长度', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'pkXfry', title: '坡口派工人员', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pkXfrq', title: '坡口派工日期', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'pscry', title: '坡口生产人员', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pkFkrq', title: '坡口反馈日期', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'pkFkry', title: '坡口反馈人', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qgdh', title: '  曲工单号', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qjgjhrq', title: '曲加工计划期', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-
-        { field: 'qsbbh', title: '曲设备编号', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-
-        { field: 'qscry', title: '曲生产人员', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-
-        { field: 'qjgXfry', title: '曲派工人员', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qjgXfrq', title: '曲派工日期', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qjgFkry', title: '曲反馈人', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qjgFkrq', title: '曲反馈日期', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        //-------------------------------------------
-
-        // --------------------------------------------------------------
-
-
-        {
-          field: 'slfkry',
-          title: '上料反馈人',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'slfkrq',
-          title: '上料反馈日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'pwfkry',
-          title: '抛丸反馈人',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'pwfkrq',
-          title: '抛丸反馈日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'llfkry',
-          title: '理料反馈人',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'llfkrq',
-          title: '理料反馈日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-
-        {
-          field: 'hxfkrq',
-          title: '划线反馈日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'hxfkry',
-          title: '划线反馈人员',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-
-        {
-          field: 'qgfkry',
-          title: '切割反馈人',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgfkrq',
-          title: '切割反馈日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'sljhrq',
-          title: '上料计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'pwjhrq',
-          title: '抛丸计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'lljhrq',
-          title: '理料计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'hxjhrq',
-          title: '划线计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgjhrq',
-          title: '切割计划日期',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'yzDcCh',
-          title: '配盘船号',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'yzDcPl',
-          title: '配盘批量',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'yzDcFd',
-          title: '配盘分段',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'yzkw',
-          title: '配盘跨位',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'yzZl',
-          title: '配盘组立',
-          width: 100,formatter:this.zlFormat,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'yzTz',
-          title: '配盘特征',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'yzLx',
-          title: '配盘流向',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'yzXj',
-          title: '配盘下级',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-      ]
+      list:[],
+      gridOptions:{},
+      qyData:[],
+      qyList:[],
     }
   },
-  computed: {
-    ...mapGetters(['name', 'bmbm'])
-  },
-  created() {
-    window.addEventListener('resize', this.getHeight)
-    this.getHeight()
-    this.initBase()
-  },
-  methods: {
-    //完整性检查
-    wzxjc(){
-      if (!this.queryParam.dcch){
-        this.$message.warning('请选择船号')
-        return;
-      }
-
-    },
-    zlFormat({cellValue}){
-      if(cellValue==='D'){
-        return '中大组立'
-      }
-      if(cellValue==='X'){
-        return '小组立'
-      }
-      return cellValue
-    },
-    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.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
-      } else {
-        this.projectData = this.projectData1.slice(0)
-      }
-
-    },
-    ztChange(){
-      this.list=[]
-    },
-    bzClick(){
-
-      this.dictData.dwxxs= this.dwxxs.filter(fst=>fst.qy===this.queryParam.qy)
-      console.log(this.dictData.zyqs)
-    },
-    bzClick1(){
-      this.dictData.dwxxs1= this.dwxxs.filter(fst=>fst.qy===this.inParam.qy)
-      console.log(this.dictData.zyqs)
-    },
-    updates2(){
-      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
-
-      if(selectRecords.length>0){
-        for(let i = 0; i < selectRecords.length; i++) {
-
-
-          selectRecords[i].qq = this.inParam.qy
-          selectRecords[i].dw = this.inParam.dw
-
-
-
-        }
-        this.$refs.xGrid.updateData(this.list)
-      }
-    },
-    updates(type){
-
-
-      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
-
-      if(selectRecords.length>0){
-        for(let i = 0; i < selectRecords.length; i++) {
-          if(type==='1'){
-
-            selectRecords[i].slksrq = this.inParam.slks
-          }else if (type==='2'){
-            selectRecords[i].dmFkry = this.inParam.slry
-            selectRecords[i].dmFkrq = this.inParam.sljs
-          }
-
-        }
-        this.$refs.xGrid.updateData(this.list)
-      }
-
-    },
-
-    activeRowMethod({ row, rowIndex }){
-      // if(row.zt==="01"){
-      //   return  true
-      // }else{
-      //   return  false
-      // }
-
-      return true;
-    },
-
-    initBase(){
-      getPgdBase({}).then(res=>{
-        console.log(res.data)
-        this.zyqs=res.data.zyqs
-        this.dwxxs=res.data.dwxxs
-        this.zyrys=res.data.zyrys
-        this.dictData = res.data
-        this.projectData=res.data.cbbm
-        this.projectData1=res.data.cbbm
-      })
-    },
-    plClick(){
-      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
-      if(selectRecords.length>0){
-        for(let i = 0; i < selectRecords.length; i++) {
-          selectRecords[i].fkyy = this.queryParam.fkyy
-        }
-        this.$refs.xGrid.updateData(this.list)
-      }
-
-    },
-    saveclick(){
-
-      if(this.queryParam.zt!=='02'){
-        return
-      }
-      let obj=this.$refs.xGrid.getCheckboxRecords()
-      // if(obj.length===0){
-      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
-      //   return
-      // }
-      saveDmPgdFk(obj).then(res=>{
-        if(res.success){
-          this.initList()
-        }
+  created(){
+    const {options,columns}=tableConfig()
+    this.gridOptions=options
+    this.gridOptions.columns = columns;
+    this.gridOptions.height=window.innerHeight-150
+    getBFangDwxx().then((res)=>{
+      this.qyData=res.data
+      const qyList=[]
+      Object.keys(this.qyData).forEach(key=>{
+        const qy={label:key,value:key};
+        qyList.push(qy)
       })
-    },
-
-    slpgclick(){
-      // if(this.queryParam.zt!=="01"){
-      //   return
-      // }
-
-      let obj=this.$refs.xGrid.getCheckboxRecords()
-      if(obj.length===0){
-        return
-      }
-      if (this.queryParam.zt==='02') {
-        this.$confirm('报工？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() =>{
-          saveDmppxxbpg(obj).then(res=>{
-            if(res.success){
-              this.initList()
-            }
-          })
-
+      this.qyList=qyList
+    })
+  },
+  methods:{
+    bgong(){
+      const data=this.$refs.bFangRef.getCheckboxRecords()
+      if(data.length>0){
+        yppbg(data).then(()=>{
+          this.$message.success('成功');
+          this.wzxjc()
         })
       }
-
-
     },
-    xdClick(){
-
-      if(this.queryParam.zt!=="02"){
-        return
-      }
-      let obj=this.$refs.xGrid.getCheckboxRecords()
-      if(obj.length===0){
-        return
-      }
-      // if(this.queryParam.zt==='03'){
-      //   this.$confirm('取消接收？', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   }).then(() =>{
-      //     saveQgPgdXdBack(obj).then(res=>{
-      //       if(res.success){
-      //         this.$message({ message: '取消下达成功', type: 'success' })
-      //         this.initList()
-      //       }
-      //     })
-      //
-      //   })
-      // }else  {
-      this.$confirm('接收？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() =>{
-        saveDmPgdJs(obj).then(res=>{
-          if(res.success){
-            this.$message({ message: '接收成功', type: 'success' })
-            this.initList()
-          }
+    wzxjc(){
+      this.queryParam.dcPl = this.$refs.projectSelectRef.getDcch()
+      bgList(this.queryParam).then((res) => {
+        res.data.forEach(item=>{
+          item.status='已配盘'
+          Object.values(this.qyData).forEach(dwList=>{
+            dwList.forEach(dwxx=>{
+              if (dwxx.id===item.dwxxId){
+                item.qy=dwxx.qy
+                item.dwh=dwxx.dwh
+              }
+            })
+          })
         })
-
+        this.gridOptions.data=res.data
       })
-      // }
-
-
     },
-    initList() {
-      // if (this.queryParam.dcch === '') {
-      //   this.$message.warning('选择船只编号')
-      //   return
-      // }
-      getDmppxxbListAndYz(this.queryParam).then((res) => {
-        this.list = res.data
-        if (this.$refs.xGrid) {
-          this.$refs.xGrid.loadData(this.list)
-          console.log(this.list)
-        }
-
-      })
-    },
-    selectChange(row) {
-      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
-      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
-      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
-      null2str(row.row)
-    },
-    getHeight() {
-      this.height = window.innerHeight - 190
-    },
-
   }
 }
 </script>
-<style lang="scss" scoped >
-
-.el-header{margin:0;padding: 5px;height:auto;
-  .el-input{
-    width: 140px;
-  }
-  .el-select{
-    width: 140px;
-  }
-
-}
-.el-container{padding: 0;margin:0;}
-.el-main{padding: 0;}
-.el-col{padding: 0;height: 32px;}
-.el-aside{background: #fff;padding: 0}
-.el-container{padding: 0}
-.el-row {}
-.el-row:last-child {margin-bottom: 0; }
-
-.tableStyles{
-  background: #0a76a4;
-}
-
-.my-dropdown {
-  width: 400px;
-  height: 400px;
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
-  font-size: 12px;
-
-}
-.mytable1{
-
-}
-.borderClass{
-
-}
-.vxe-input {
-  display: inline-block !important;
-  position: relative !important;
-  width: auto;
-}
-.el-input {
-  display: inline-block !important;
-  position: relative !important;
-  width: auto;
-}
-.keyword-lighten {
-  color: #000;
-  background-color: #FFFF00;
-}
-
-.vxe-textarea--inner {
-  line-height: inherit;
-}
-.el-form-item__label-wrap {
-  margin-left: 0px !important;
-  float: left;
-}
-.fontClass{
-  font-size: 12px;
-  font-weight: bold;
-}
-
-
-</style>
diff --git a/src/views/jhzxgl/yppFK_bak b/src/views/jhzxgl/yppFK_bak
new file mode 100644
index 0000000..5c23390
--- /dev/null
+++ b/src/views/jhzxgl/yppFK_bak
@@ -0,0 +1,578 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+          <el-col :span="22">
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+                <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    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.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+<!--            <el-form-item label="套料图:">
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
+            </el-form-item>-->
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="20"  >
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="wzxjc">完整性检查</el-button>
+              <el-button type="success" @click="slpgclick">报工</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-header>
+    <el-container  style="padding-top: 0px">
+      <el-container>
+        <el-main>
+          <div class="mytable">
+            <vxe-grid
+              id="id"
+              ref="xGrid"
+              border
+              resizable
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="list"
+              :scroll-y="{enabled: true}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+            >
+            </vxe-grid>
+          </div>
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+  saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
+} from '@/api/jhzxgl/pgd'
+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 {saveDmppxxb, getDmppxxbList, saveDmppxxbpg, getDmppxxbListAndYz} from "@/api/jhzxgl/ypp";
+export default {
+  name:'Cgjhdh',
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'02',
+        'lx':'d',
+        qgkw:'',
+        tlth:'',
+        qy:'',
+        dw:''
+      },
+      statusOptions: [
+        {
+          value: "02",
+          label: "未报工",
+        },
+        {
+          value: "03",
+          label: "已报工",
+        },
+
+
+      ],
+      inParam:{
+        qy:'',
+        dw:''
+      },
+      dwxxs:[],
+      zyqs:[],
+      zyrys:[],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+        { field: 'ppzt', title: '状态', width: 90, formatter: ['dictFormat', 'PPZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'czbh', title: '船号', width: 90,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        {
+          field: 'ypph',
+          title: '虚拟托盘',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        { field: 'pl', title: '批量', width: 90,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fd', title: '分段', width: 90,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tlth', title: '套料图号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljbh', title: '零件编号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ljgg', title: '零件规格', width: 90,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljcz', title: '零件材质', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'sl', title: '数量', width: 70,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        // { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' },
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' },
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        // {
+        //   field: 'yzDcCh',
+        //   title: '配盘船号',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'yzDcPl',
+        //   title: '配盘批量',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'yzDcFd',
+        //   title: '配盘分段',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'yzTz',
+        //   title: '配盘特征',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'yzLx',
+        //   title: '配盘流向',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'yzXj',
+        //   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: {
+    //完整性检查
+    wzxjc(){
+
+    },
+    zlFormat({cellValue}){
+      if(cellValue==='D'){
+        return '中大组立'
+      }
+      if(cellValue==='X'){
+        return '小组立'
+      }
+      return cellValue
+    },
+    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.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
+      }
+
+    },
+    ztChange(){
+      this.list=[]
+    },
+    bzClick(){
+
+      this.dictData.dwxxs= this.dwxxs.filter(fst=>fst.qy===this.queryParam.qy)
+      console.log(this.dictData.zyqs)
+    },
+    bzClick1(){
+      this.dictData.dwxxs1= this.dwxxs.filter(fst=>fst.qy===this.inParam.qy)
+      console.log(this.dictData.zyqs)
+    },
+    updates2(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+
+
+          selectRecords[i].qq = this.inParam.qy
+          selectRecords[i].dw = this.inParam.dw
+
+
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+    },
+    updates(type){
+
+
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          if(type==='1'){
+
+            selectRecords[i].slksrq = this.inParam.slks
+          }else if (type==='2'){
+            selectRecords[i].dmFkry = this.inParam.slry
+            selectRecords[i].dmFkrq = this.inParam.sljs
+          }
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+
+    activeRowMethod({ row, rowIndex }){
+      // if(row.zt==="01"){
+      //   return  true
+      // }else{
+      //   return  false
+      // }
+
+      return true;
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.dwxxs=res.data.dwxxs
+        this.zyrys=res.data.zyrys
+        this.dictData = res.data
+        this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
+      })
+    },
+    plClick(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          selectRecords[i].fkyy = this.queryParam.fkyy
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+    saveclick(){
+
+      if(this.queryParam.zt!=='02'){
+        return
+      }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
+      saveDmPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+
+    slpgclick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if (this.queryParam.zt==='02') {
+        this.$confirm('报工？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveDmppxxbpg(obj).then(res=>{
+            if(res.success){
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    xdClick(){
+
+      if(this.queryParam.zt!=="02"){
+        return
+      }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      // if(this.queryParam.zt==='03'){
+      //   this.$confirm('取消接收？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() =>{
+      //     saveQgPgdXdBack(obj).then(res=>{
+      //       if(res.success){
+      //         this.$message({ message: '取消下达成功', type: 'success' })
+      //         this.initList()
+      //       }
+      //     })
+      //
+      //   })
+      // }else  {
+      this.$confirm('接收？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() =>{
+        saveDmPgdJs(obj).then(res=>{
+          if(res.success){
+            this.$message({ message: '接收成功', type: 'success' })
+            this.initList()
+          }
+        })
+
+      })
+      // }
+
+
+    },
+    initList() {
+      // if (this.queryParam.dcch === '') {
+      //   this.$message.warning('选择船只编号')
+      //   return
+      // }
+      getDmppxxbListAndYz(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/yppyz.vue b/src/views/jhzxgl/yppyz.vue
index bf7f900..ab1ac6c 100644
--- a/src/views/jhzxgl/yppyz.vue
+++ b/src/views/jhzxgl/yppyz.vue
@@ -118,8 +118,7 @@ export default {
       dictData:{},
       height: '500px',
       tableColumn: [
-        { type: 'checkbox', width: 50 ,
-        },
+        { type: 'checkbox', width: 50 ,},
         { type: 'seq', width: 40, title: '序号' },
         {
           field: 'dcCh',
diff --git a/src/views/zyjhzx/bfang/comps/BFangLJTable.vue b/src/views/zyjhzx/bfang/comps/BFangLJTable.vue
new file mode 100644
index 0000000..d24597c
--- /dev/null
+++ b/src/views/zyjhzx/bfang/comps/BFangLJTable.vue
@@ -0,0 +1,56 @@
+<template>
+  <div id="bfangLjTable" v-if="showFlag">
+    <VxeGrid ref="bFangRef" v-bind="gridOptions" @checkbox-change="checkboxChange" @checkbox-all="checkboxAll" />
+  </div>
+</template>
+
+<script>
+import tableConfig from './ljTable';
+import {EventBus} from "@/event-bus";
+import {getDmppxxbList} from "@/api/jhzxgl/ypp";
+
+export default {
+  name: 'BFangLjTable',
+  data(){
+    return {
+      gridOptions:{},
+      zyq:'',
+      setInterval0:'',
+      showFlag:false,
+    }
+  },
+  created(){
+    const {options,columns} = tableConfig();
+    this.gridOptions = options;
+    this.gridOptions.columns = columns;
+    this.zyq=this.$route.query.zyq
+    EventBus.$on('ljShow', params => {
+      this.initData(params)
+    })
+  },
+  methods:{
+    checkboxChange(){
+
+    },
+    checkboxAll(){
+
+    },
+    initData(list){
+      this.gridOptions.data = list;
+      this.showFlag=true
+    }
+  }
+}
+</script>
+
+<style scoped>
+#bfangLjTable {
+  width:81.6%;
+  height: auto;
+  position: absolute;
+  top:78px;
+  left:344px;
+  border: none;
+  margin: 0;
+}
+</style>
diff --git a/src/views/zyjhzx/bfang/comps/BFangShow.vue b/src/views/zyjhzx/bfang/comps/BFangShow.vue
index 64ae1f4..a1dd5f0 100644
--- a/src/views/zyjhzx/bfang/comps/BFangShow.vue
+++ b/src/views/zyjhzx/bfang/comps/BFangShow.vue
@@ -51,6 +51,7 @@ export default {
             id:item.id,
             dcCh:item.dcCh,
             dcPl:item.dcPl,
+            dcFd:item.dcFd,
             ljList:[]
           }
           item.ljList.forEach(lj=>{
diff --git a/src/views/zyjhzx/bfang/comps/BFangTable.vue b/src/views/zyjhzx/bfang/comps/BFangTable.vue
index 42cd629..525ed63 100644
--- a/src/views/zyjhzx/bfang/comps/BFangTable.vue
+++ b/src/views/zyjhzx/bfang/comps/BFangTable.vue
@@ -1,22 +1,21 @@
 <template>
-  <div id="bfangTable" v-if="showFlag">
-    <VxeGrid ref="bFangRef" v-bind="gridOptions" @checkbox-change="checkboxChange" @checkbox-all="checkboxAll" />
+  <div id="bfangTable">
+    <VxeGrid ref="bFangRef" v-bind="gridOptions" />
   </div>
 </template>
 
 <script>
-import tableConfig from './table';
+import tableConfig from "@/views/zyjhzx/bfang/comps/table";
 import {EventBus} from "@/event-bus";
-import {getDmppxxbList} from "@/api/jhzxgl/ypp";
+import {getBfwz} from "@/api/jhzxgl/ypp";
+import {ppBGong, wbfList} from "@/api/zyjh";
 
 export default {
-  name: 'BFangTable',
+  name: "BFangTable",
   data(){
     return {
       gridOptions:{},
       zyq:'',
-      setInterval0:'',
-      showFlag:false,
     }
   },
   created(){
@@ -24,20 +23,72 @@ export default {
     this.gridOptions = options;
     this.gridOptions.columns = columns;
     this.zyq=this.$route.query.zyq
-    EventBus.$on('ljShow', params => {
-      this.initData(params)
+    EventBus.$on('bfSave', params => {
+      this.save()
     })
+    this.yppShow()
   },
   methods:{
-    checkboxChange(){
-
+    save(){
+      const data=this.$refs.bFangRef.getCheckboxRecords()
+      if(data.length >0){
+        const saveList=[]
+        data.forEach(item=>{
+          const data={
+            id:item.id,
+            dcCh:item.dcCh,
+            dcPl:item.dcPl,
+            dcFd:item.dcFd,
+            ljList:[]
+          }
+          item.ljList.forEach(lj=>{
+            const _lj={
+              id:lj.id,
+              qq:item.qy,
+              dw:item.dwh,
+              ppzt:'02'
+            }
+            data.ljList.push(_lj)
+          })
+          saveList.push(data)
+        })
+        ppBGong(saveList).then((res)=>{
+          this.$message.success('成功')
+          this.initData()
+        })
+      }
     },
-    checkboxAll(){
-
+    initData() {
+      const params=this.dataInitParam;
+      if(!params.dcCh){
+        this.$message.warning('请选择船号')
+        return;
+      }
+      params.zyq=this.zyq
+      wbfList(params).then((res) => {
+        res.data.forEach(item => {
+          item.selected = false
+          for (const dw of this.dwxx) {
+            if (item.dwxxId === dw.id) {
+              item.qy = dw.qy
+              item.dwh = dw.dwh
+            }
+          }
+        })
+        this.gridOptions.data = res.data.filter(item => item.ljList.length > 0)
+      })
+    },
+    yppShow(){
+      this.initDw()
+      EventBus.$on('bfSearch', params => {
+        this.dataInitParam=params;
+        this.initData()
+      })
     },
-    initData(list){
-      this.gridOptions.data = list;
-      this.showFlag=true
+    initDw(){
+      getBfwz().then((res)=>{
+        this.dwxx=res.data
+      })
     }
   }
 }
diff --git a/src/views/zyjhzx/bfang/comps/ljTable.js b/src/views/zyjhzx/bfang/comps/ljTable.js
new file mode 100644
index 0000000..6dd502e
--- /dev/null
+++ b/src/views/zyjhzx/bfang/comps/ljTable.js
@@ -0,0 +1,408 @@
+export default function () {
+  const options={
+    height:840,
+    align:'center',
+    border: true,
+    resizable: true,
+    keepSource:true,
+    size:'mini',
+    showOverflow: true,
+    scrollY:{enable:true},
+    editConfig:{trigger: 'click', mode: 'cell', showStatus: true},
+    highlightCurrentRow:true,
+    data:[],
+  }
+
+  const columns = [
+    { type: 'checkbox', width: 40 },
+    { type: 'seq', width: 40, title: '序号' },
+
+
+    { field: 'ppzt', title: '状态', width: 90, formatter: ['dictFormat', 'PPZT'],
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'czbh', title: '船号', width: 90,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'pl', title: '批量', width: 90,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'fd', title: '分段', width: 90,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'],
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'tlth', title: '套料图号', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+
+
+    { field: 'ljbh', title: '零件编号', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    // { field: 'ljmc', title: '零件名称', width: 100,
+    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+    //   filterRender: { name: 'FilterCombination', },
+    // },
+
+    { field: 'ljgg', title: '零件规格', width: 90,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'ljcz', title: '零件材质', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'sl', title: '数量', width: 70,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+
+
+    { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+
+    { field: 'dzjz', title: '大组极重', minWidth: "70",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'xdb', title: 'X大板', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'xskj', title: 'X数控件', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'xpt', title: 'X平铁', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'xyw', title: 'X压弯', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'xxc', title: 'X型材', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'xtxc', title: 'X二次装T型材', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'ddb', title: 'D大板', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dqb', title: 'D曲板', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dxc', title: 'D型材T', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dsj', title: 'D散件', minWidth: "100",
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'dgdh', title: '打磨工单号', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dmsbbh', 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: 'dmjhrq', title: '打磨计划日期', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'dmXfry', title: '打磨派工人', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'dmXfrq', title: '打磨派工日期', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'dscry', title: '打磨生产人员', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+
+
+    { field: 'dmFkry', title: '打磨反馈人', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'pgdh', title: '坡口工单号', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'pkjhrq', title: '坡口计划日期', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'pgdh', title: '坡口工单号', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'pksbbh', title: '坡口设备编号', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'pklx', title: '坡口类型', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'pkcd', title: '坡口长度', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'pkXfry', title: '坡口派工人员', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'pkXfrq', title: '坡口派工日期', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'pscry', title: '坡口生产人员', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'pkFkrq', title: '坡口反馈日期', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+    { field: 'pkFkry', title: '坡口反馈人', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'qgdh', title: '  曲工单号', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'qjgjhrq', title: '曲加工计划期', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+
+    { field: 'qsbbh', title: '曲设备编号', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+
+    { field: 'qscry', title: '曲生产人员', width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+
+    { field: 'qjgXfry', title: '曲派工人员', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'qjgXfrq', title: '曲派工日期', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'qjgFkry', title: '曲反馈人', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    { field: 'qjgFkrq', title: '曲反馈日期', width: 120,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
+
+    //-------------------------------------------
+
+    // --------------------------------------------------------------
+
+
+    {
+      field: 'slfkry',
+      title: '上料反馈人',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'slfkrq',
+      title: '上料反馈日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'pwfkry',
+      title: '抛丸反馈人',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'pwfkrq',
+      title: '抛丸反馈日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'llfkry',
+      title: '理料反馈人',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'llfkrq',
+      title: '理料反馈日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+
+    {
+      field: 'hxfkrq',
+      title: '划线反馈日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'hxfkry',
+      title: '划线反馈人员',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+
+    {
+      field: 'qgfkry',
+      title: '切割反馈人',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'qgfkrq',
+      title: '切割反馈日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'sljhrq',
+      title: '上料计划日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'pwjhrq',
+      title: '抛丸计划日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'lljhrq',
+      title: '理料计划日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'hxjhrq',
+      title: '划线计划日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+    {
+      field: 'qgjhrq',
+      title: '切割计划日期',
+      width: 100,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination' }
+    },
+  ]
+
+  return {options,columns}
+}
diff --git a/src/views/zyjhzx/bfang/comps/table.js b/src/views/zyjhzx/bfang/comps/table.js
index 6dd502e..0cee3f7 100644
--- a/src/views/zyjhzx/bfang/comps/table.js
+++ b/src/views/zyjhzx/bfang/comps/table.js
@@ -7,7 +7,7 @@ export default function () {
     keepSource:true,
     size:'mini',
     showOverflow: true,
-    scrollY:{enable:true},
+    // scrollY:{enable:true},
     editConfig:{trigger: 'click', mode: 'cell', showStatus: true},
     highlightCurrentRow:true,
     data:[],
@@ -15,393 +15,27 @@ export default function () {
 
   const columns = [
     { type: 'checkbox', width: 40 },
-    { type: 'seq', width: 40, title: '序号' },
-
-
-    { field: 'ppzt', title: '状态', width: 90, formatter: ['dictFormat', 'PPZT'],
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'czbh', title: '船号', width: 90,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pl', title: '批量', width: 90,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'fd', title: '分段', width: 90,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'],
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'tlth', title: '套料图号', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-
-    { field: 'ljbh', title: '零件编号', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    // { field: 'ljmc', title: '零件名称', width: 100,
-    //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-    //   filterRender: { name: 'FilterCombination', },
-    // },
-
-    { field: 'ljgg', title: '零件规格', width: 90,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'ljcz', title: '零件材质', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'sl', title: '数量', width: 70,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-
-    { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-    { field: 'dzjz', title: '大组极重', minWidth: "70",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xdb', title: 'X大板', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xskj', title: 'X数控件', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xpt', title: 'X平铁', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xyw', title: 'X压弯', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xxc', title: 'X型材', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'xtxc', title: 'X二次装T型材', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'ddb', title: 'D大板', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dqb', title: 'D曲板', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dxc', title: 'D型材T', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dsj', title: 'D散件', minWidth: "100",
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'dgdh', title: '打磨工单号', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dmsbbh', 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: 'dmjhrq', title: '打磨计划日期', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'dmXfry', title: '打磨派工人', width: 100,
+    { type: 'seq', width: 60, title: '序号' },
+    { field: 'dcCh', title: '船号', width: 120,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'dmXfrq', title: '打磨派工日期', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'dscry', title: '打磨生产人员', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-
-    { field: 'dmFkry', title: '打磨反馈人', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
+    { field: 'dcPl', title: '批量', width: 100,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-    { field: 'pgdh', title: '坡口工单号', width: 100,
+    { field: 'dcFd', title: '分段', width: 100,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'pkjhrq', title: '坡口计划日期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pgdh', title: '坡口工单号', width: 100,
+    { field: 'qy', title: '摆放区域', width: 100,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-    { field: 'pksbbh', title: '坡口设备编号', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pklx', title: '坡口类型', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pkcd', title: '坡口长度', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'pkXfry', title: '坡口派工人员', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pkXfrq', title: '坡口派工日期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'pscry', title: '坡口生产人员', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'pkFkrq', title: '坡口反馈日期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-    { field: 'pkFkry', title: '坡口反馈人', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qgdh', title: '  曲工单号', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qjgjhrq', title: '曲加工计划期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-    { field: 'qsbbh', title: '曲设备编号', width: 120,
+    { field: 'dwh', title: '垛位', width: 100,
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },
     },
-
-
-    { field: 'qscry', title: '曲生产人员', width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-
-    { field: 'qjgXfry', title: '曲派工人员', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qjgXfrq', title: '曲派工日期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qjgFkry', title: '曲反馈人', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    { field: 'qjgFkrq', title: '曲反馈日期', width: 120,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination', },
-    },
-
-    //-------------------------------------------
-
-    // --------------------------------------------------------------
-
-
-    {
-      field: 'slfkry',
-      title: '上料反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'slfkrq',
-      title: '上料反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'pwfkry',
-      title: '抛丸反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'pwfkrq',
-      title: '抛丸反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'llfkry',
-      title: '理料反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'llfkrq',
-      title: '理料反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-
-    {
-      field: 'hxfkrq',
-      title: '划线反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'hxfkry',
-      title: '划线反馈人员',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-
-    {
-      field: 'qgfkry',
-      title: '切割反馈人',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'qgfkrq',
-      title: '切割反馈日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'sljhrq',
-      title: '上料计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'pwjhrq',
-      title: '抛丸计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'lljhrq',
-      title: '理料计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'hxjhrq',
-      title: '划线计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
-    {
-      field: 'qgjhrq',
-      title: '切割计划日期',
-      width: 100,
-      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-      filterRender: { name: 'FilterCombination' }
-    },
   ]
 
   return {options,columns}
diff --git a/src/views/zyjhzx/bfang/index.vue b/src/views/zyjhzx/bfang/index.vue
index 189aa88..0a3f41c 100644
--- a/src/views/zyjhzx/bfang/index.vue
+++ b/src/views/zyjhzx/bfang/index.vue
@@ -2,8 +2,7 @@
   <div>
     <div id="bfang" class="bfang" ref="bfangRef" />
     <BFangSearch />
-    <BFangTable ref="bfangTable" />
-    <BFangShow />
+    <BFangTable />
     <ZyjhSelectComp id="selectComp" ref="selRef"  @initWorkers="initWorkers"/>
   </div>
 </template>
@@ -14,11 +13,11 @@ import drawTitle from "@/views/zyjhzx/bfang/comps/title";
 import BFangSearch from "@/views/zyjhzx/bfang/comps/BFangSearch.vue";
 import initSearch from "@/views/zyjhzx/bfang/comps/search";
 import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue";
-import BFangTable from "@/views/zyjhzx/bfang/comps/BFangTable.vue";
 import workers from "@/views/zyjhzx/bfang/comps/person";
 import {getBzryByBz} from "@/api/zyjh";
 import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue";
 import BFangShow from "@/views/zyjhzx/bfang/comps/BFangShow.vue";
+import BFangTable from "@/views/zyjhzx/bfang/comps/BFangTable.vue";
 
 export default {
   name: 'BFang',