diff --git a/src/views/jhzxgl/yppCX.vue b/src/views/jhzxgl/yppCX.vue
index 137544f..7690bb1 100644
--- a/src/views/jhzxgl/yppCX.vue
+++ b/src/views/jhzxgl/yppCX.vue
@@ -1,25 +1,9 @@
 w<template>
-  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
   <el-container>
-    <el-header style="width: 100%; height: 80px;font-size: 12px">
-
+    <el-header style="width: 100%; height: 40px;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-option>
-              </el-select>
-            </el-form-item>
-
             <el-form-item label="船号:">
               <vxe-pulldown ref="xDown4" transfer >
                 <template #default>
@@ -38,7 +22,6 @@ w<template>
                     <vxe-grid
                       highlight-hover-row
                       height="auto"
-
                       :data="projectData"
                       :columns="projectColumns"
                       @cell-click="cellClickEvent"
@@ -51,8 +34,6 @@ w<template>
                   </div>
                 </template>
               </vxe-pulldown>
-
-
             </el-form-item>
             <el-form-item label="批量:">
               <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
@@ -63,33 +44,12 @@ w<template>
             <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-form-item label="区域:" label-width="50px">
+              <VxeSelect v-model="queryParam.qy" ref="qyRef" clearable :options="qyList" @change="qyChange" size="mini" style="width: 125px" placeholder="选择区域"/>
+            </el-form-item>
+            <el-form-item label="垛位:" label-width="50px">
+              <VxeSelect v-model="queryParam.dw" ref="dwRef" clearable :options="dwList" size="mini" style="width: 115px" placeholder="选择垛位"/>
             </el-form-item>
-
-
           </el-col>
           <el-col :span="2">
             <el-form-item style="float: right" >
@@ -97,113 +57,12 @@ w<template>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-
-          <el-col :span="20"  >
-<!--            <el-select v-model="inParam.qy" placeholder="区域" clearable  @change="bzClick1" >-->
-<!--              <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="inParam.dw" placeholder="垛位" clearable>-->
-<!--              <el-option-->
-<!--                v-for="item in dictData.dwxxs1"-->
-<!--                :key="item.dwh"-->
-<!--                :label="item.dwh"-->
-<!--                :value="item.dwh"-->
-<!--              >-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--            <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>-->
-          </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="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>
-
-
+          <PPComponent ref="ppComponentRef" :height="735" />
         </el-main>
       </el-container>
     </el-container>
@@ -221,10 +80,16 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 import {saveDmppxxb,getDmppxxbList} from "@/api/jhzxgl/ypp";
+import PPComponent from "@/views/zyjhzx/bfang/comps/PPComponent.vue";
+import {getBFangDwxx} from "@/views/zyjhzx/bfang/comps/api";
+import {EventBus} from "@/event-bus";
 export default {
   name:'Cgjhdh',
+  components: {PPComponent},
   data() {
     return {
+      qyList:[],
+      dwList:[],
       queryParam: {
         dcch:'',
         pl:'',
@@ -254,13 +119,7 @@ export default {
           value: "04",
           label: "确认",
         },
-
-
       ],
-      inParam:{
-        qy:'',
-        dw:''
-      },
       dwxxs:[],
       zyqs:[],
       zyrys:[],
@@ -279,397 +138,6 @@ export default {
           },
         },
       ],
-
-      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: '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' }
-        },
-
-
-
-      ]
     }
   },
   computed: {
@@ -679,11 +147,26 @@ export default {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
-
-
+    this.getDw()
   },
   methods: {
-
+    getDw(){
+      getBFangDwxx().then((res)=>{
+        this.qyData=res.data
+        this.qyList=[]
+        Object.keys(this.qyData).forEach(key=>{
+          const qy={label:key,value:key};
+          this.qyList.push(qy)
+        })
+      })
+    },
+    qyChange({value}){
+      this.dwList=[]
+      this.qyData[value]?.forEach(item=>{
+        const dw={label:item.dwh,value:item.dwh};
+        this.dwList.push(dw)
+      })
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -692,8 +175,6 @@ export default {
       this.$refs.xDown4.showPanel()
     },
     keyupEvent4() {
-
-
       if (this.queryParam.dcch) {
         this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
       } else {
@@ -701,68 +182,8 @@ export default {
       }
 
     },
-    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
@@ -770,120 +191,14 @@ export default {
         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(){
-      // if(this.queryParam.zt!=="01"){
-      //   return
-      // }
-
-      let obj=this.$refs.xGrid.getCheckboxRecords()
-      if(obj.length===0){
-        return
-      }
-      if (this.queryParam.zt==='01') {
-        this.$confirm('保存？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() =>{
-          saveDmppxxb(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
-      // }
-      getDmppxxbList(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)
+      const data={
+        dcCh:this.queryParam.dcch,
+        zyq:this.bmbm,
+        dcPl:this.queryParam.pl,
+      }
+      EventBus.$emit('bfSearch', data)
     },
     getHeight() {
       this.height = window.innerHeight - 190
diff --git a/src/views/jhzxgl/yppFK.vue b/src/views/jhzxgl/yppFK.vue
index 8aede75..762380e 100644
--- a/src/views/jhzxgl/yppFK.vue
+++ b/src/views/jhzxgl/yppFK.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-container style="padding: 0">
-    <el-header style="width: 100%; height: 22px;font-size: 12px;padding-top: 5px">
+  <el-container>
+    <el-header style="width: 100%; height: 22px;font-size: 12px;">
       <el-form :inline="true" label-width="55px" label-position="right">
         <el-row>
           <el-col :span="20">
@@ -21,22 +21,23 @@
         </el-row>
       </el-form>
     </el-header>
-    <el-container style="padding: 0">
+    <el-container style="padding-top: 5px">
       <el-main>
-        <VxeGrid ref="bFangRef" v-bind="gridOptions" />
+        <PPComponent ref="ppComponentRef" :height="750" />
       </el-main>
     </el-container>
   </el-container>
 </template>
 <script>
-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";
+import PPComponent from "@/views/zyjhzx/bfang/comps/PPComponent.vue";
+import {EventBus} from "@/event-bus";
 
 export default {
   name:'YppFk',
-  components: {ProjectSelect},
+  components: {PPComponent, ProjectSelect},
   data(){
     return{
       queryParam:{
@@ -45,16 +46,11 @@ export default {
         dcFd:'',
       },
       list:[],
-      gridOptions:{},
       qyData:[],
       qyList:[],
     }
   },
   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=[]
@@ -67,13 +63,14 @@ export default {
   },
   methods:{
     bgong(){
-      const data=this.$refs.bFangRef.getCheckboxRecords()
-      if(data.length>0){
-        yppbg(data).then(()=>{
-          this.$message.success('成功');
-          this.wzxjc()
-        })
-      }
+      EventBus.$emit('yppbg', {})
+      // const data=this.$refs.bFangRef.getCheckboxRecords()
+      // if(data.length>0){
+      //   yppbg(data).then(()=>{
+      //     this.$message.success('成功');
+      //     this.wzxjc()
+      //   })
+      // }
     },
     wzxjc(){
       this.queryParam.dcPl = this.$refs.projectSelectRef.getDcch()
@@ -95,3 +92,70 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped >
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 80px;
+  }
+  .el-select{
+    width: 90px;
+  }
+}
+
+.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/yppGL.vue b/src/views/jhzxgl/yppGL.vue
index 3a5599c..a4ea884 100644
--- a/src/views/jhzxgl/yppGL.vue
+++ b/src/views/jhzxgl/yppGL.vue
@@ -65,13 +65,9 @@
         </el-row>
         <el-row>
           <el-col :span="20"  >
-            <el-select v-model="inParam.qy" placeholder="区域" clearable  @change="bzClick1" >
-              <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="inParam.dw" placeholder="垛位" clearable>
-              <el-option v-for="item in dictData.dwxxs1" :key="item.dwh" :label="item.dwh" :value="item.dwh"></el-option>
-            </el-select>
-            <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
+            <VxeSelect v-model="plParam.qy" ref="qyRef" clearable :options="qyList" @change="qyChange" style="margin-left: 10px;width: 125px" placeholder="选择区域"/>
+            <VxeSelect v-model="plParam.dw" ref="dwRef" clearable :options="dwList" style="width: 115px" placeholder="选择垛位"/>
+            <VxeButton status="primary" content="批量" @click="pl" />
           </el-col>
           <el-col :span="4" >
             <el-form-item style="float: right" >
@@ -84,27 +80,7 @@
     <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>
+          <PPComponent ref="ppComponentRef" :height="695" />
         </el-main>
       </el-container>
     </el-container>
@@ -123,10 +99,20 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 import {saveDmppxxb, getDmppxxbList, saveBfwz} from "@/api/jhzxgl/ypp";
+import PPComponent from "@/views/zyjhzx/bfang/comps/PPComponent.vue";
+import {EventBus} from "@/event-bus";
+import {getBFangDwxx} from "@/views/zyjhzx/bfang/comps/api";
 export default {
   name:'YppGL',
+  components: {PPComponent},
   data() {
     return {
+      qyList:[],
+      dwList:[],
+      plParam:{
+        qy:'',
+        dw:''
+      },
       queryParam: {
         dcch:'',
         pl:'',
@@ -171,380 +157,6 @@ export default {
           },
         },
       ],
-      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: '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' }
-        // },
-      ]
     }
   },
   computed: {
@@ -554,8 +166,29 @@ export default {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
+    this.getDw()
   },
   methods: {
+    pl(){
+      EventBus.$emit('pl', this.plParam)
+    },
+    getDw(){
+      getBFangDwxx().then((res)=>{
+        this.qyData=res.data
+        this.qyList=[]
+        Object.keys(this.qyData).forEach(key=>{
+          const qy={label:key,value:key};
+          this.qyList.push(qy)
+        })
+      })
+    },
+    qyChange({value}){
+      this.dwList=[]
+      this.qyData[value]?.forEach(item=>{
+        const dw={label:item.dwh,value:item.dwh};
+        this.dwList.push(dw)
+      })
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -654,8 +287,8 @@ export default {
         }
       })
     },
-
     slpgclick(){
+      EventBus.$emit('bfSave', {})
       let obj=this.$refs.xGrid.getCheckboxRecords()
       if(obj.length===0){
         return
@@ -713,12 +346,12 @@ export default {
         this.$message.warning('选择船只编号')
         return
       }
-      getDmppxxbList(this.queryParam).then((res) => {
-        this.list = res.data
-        if (this.$refs.xGrid) {
-          this.$refs.xGrid.loadData(this.list)
-        }
-      })
+      const data={
+        dcCh:this.queryParam.dcch,
+        zyq:this.bmbm,
+        dcPl:this.queryParam.pl,
+      }
+      EventBus.$emit('bfSearch', data)
     },
     selectChange(row) {
       this.$refs.xGrid.clearEdit() // 清除单元格激活状态
diff --git a/src/views/zyjhzx/bfang/comps/BFangLJTable.vue b/src/views/zyjhzx/bfang/comps/BFangLJTable.vue
index 715471c..ca78c84 100644
--- a/src/views/zyjhzx/bfang/comps/BFangLJTable.vue
+++ b/src/views/zyjhzx/bfang/comps/BFangLJTable.vue
@@ -8,10 +8,16 @@
 import tableConfig from './ljTable';
 import {EventBus} from "@/event-bus";
 import {getDmppxxbList} from "@/api/jhzxgl/ypp";
-import {ppBGong} from "@/api/zyjh";
+import {ppBGong, yppbg} from "@/api/zyjh";
 
 export default {
   name: 'BFangLjTable',
+  props:{
+    height:{
+      type:Number|String,
+      default:()=>786
+    }
+  },
   data(){
     return {
       gridOptions:{},
@@ -22,6 +28,7 @@ export default {
   created(){
     const {options,columns} = tableConfig();
     this.gridOptions = options;
+    this.gridOptions.height=this.$props.height
     this.gridOptions.columns = columns;
     this.zyq=this.$route.query.zyq
     EventBus.$on('detailShow', params => {
@@ -33,8 +40,10 @@ export default {
     EventBus.$on('bfSave', params => {
       this.save()
     })
+
   },
   methods:{
+
     save(){
       const data=this.$refs.bFangRef.getCheckboxRecords()
       if (data.length>0){
diff --git a/src/views/zyjhzx/bfang/comps/BFangSearch.vue b/src/views/zyjhzx/bfang/comps/BFangSearch.vue
index bdec0a2..ec107a5 100644
--- a/src/views/zyjhzx/bfang/comps/BFangSearch.vue
+++ b/src/views/zyjhzx/bfang/comps/BFangSearch.vue
@@ -32,9 +32,8 @@ export default {
       }
     }
   },
-  mounted() {
+  created(){
     this.getDw()
-
   },
   methods:{
     search(){
diff --git a/src/views/zyjhzx/bfang/comps/BFangTable.vue b/src/views/zyjhzx/bfang/comps/BFangTable.vue
index 42af791..bd23dea 100644
--- a/src/views/zyjhzx/bfang/comps/BFangTable.vue
+++ b/src/views/zyjhzx/bfang/comps/BFangTable.vue
@@ -8,10 +8,16 @@
 import tableConfig from "@/views/zyjhzx/bfang/comps/table";
 import {EventBus} from "@/event-bus";
 import {getBfwz} from "@/api/jhzxgl/ypp";
-import {ppBGong, wbfList} from "@/api/zyjh";
+import {ppBGong, wbfList, yppbg} from "@/api/zyjh";
 
 export default {
   name: "BFangTable",
+  props:{
+    height:{
+      type:Number|String,
+      default:()=>786
+    }
+  },
   data(){
     return {
       gridOptions:{},
@@ -21,11 +27,24 @@ export default {
   created(){
     const {options,columns} = tableConfig();
     this.gridOptions = options;
+    this.gridOptions.height=this.$props.height
     this.gridOptions.columns = columns;
     this.zyq=this.$route.query.zyq
     this.yppShow()
+    EventBus.$on('yppbg', param=>{
+      this.bgong()
+    })
   },
   methods:{
+    bgong(){
+      const data=this.$refs.bFangRef.getCheckboxRecords()
+      if(data.length>0){
+        yppbg(data).then(()=>{
+          this.$message.success('成功');
+          this.wzxjc()
+        })
+      }
+    },
     showDetail({row}){
       EventBus.$emit('detailShow', row)
     },
@@ -60,11 +79,7 @@ export default {
     },
     initData() {
       const params=this.dataInitParam;
-      // if(!params.dcCh){
-      //   this.$message.warning('请选择船号')
-      //   return;
-      // }
-      params.zyq=this.zyq
+      !params.zyq&&(params.zyq=this.zyq||'')
       wbfList(params).then((res) => {
         res.data.forEach(item => {
           item.selected = false
@@ -92,7 +107,7 @@ export default {
       getBfwz().then((res)=>{
         this.dwxx=res.data
       })
-    }
+    },
   }
 }
 </script>
diff --git a/src/views/zyjhzx/bfang/comps/PPComponent.vue b/src/views/zyjhzx/bfang/comps/PPComponent.vue
index f7e0974..3d5575f 100644
--- a/src/views/zyjhzx/bfang/comps/PPComponent.vue
+++ b/src/views/zyjhzx/bfang/comps/PPComponent.vue
@@ -2,10 +2,10 @@
   <div class="tabsContainer">
     <el-tabs v-model="activeName">
       <el-tab-pane label="汇总" name="first">
-        <BFangTable />
+        <BFangTable :height="height" />
       </el-tab-pane>
       <el-tab-pane label="明细" name="second">
-        <BFangLjTable />
+        <BFangLjTable :height="height" />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -14,15 +14,20 @@
 <script>
 import BFangTable from "@/views/zyjhzx/bfang/comps/BFangTable.vue";
 import BFangLjTable from "@/views/zyjhzx/bfang/comps/BFangLJTable.vue";
-import tableConfig from "@/views/zyjhzx/bfang/comps/ljTable";
 import {EventBus} from "@/event-bus";
 
 export default {
   name:'PPComponent',
   components: {BFangLjTable, BFangTable},
+  props:{
+    height:{
+      type:Number|String,
+      default:()=>786
+    }
+  },
   data(){
     return{
-      activeName:'first'
+      activeName:'first',
     }
   },
   created(){
@@ -31,7 +36,6 @@ export default {
     })
   },
   methods:{
-
   }
 }
 </script>
diff --git a/src/views/zyjhzx/bfang/comps/ljTable.js b/src/views/zyjhzx/bfang/comps/ljTable.js
index 6d76d00..c85321f 100644
--- a/src/views/zyjhzx/bfang/comps/ljTable.js
+++ b/src/views/zyjhzx/bfang/comps/ljTable.js
@@ -15,7 +15,7 @@ export default function () {
 
   const columns = [
     { type: 'checkbox', width: 40 },
-    { type: 'seq',width: 40 , title: '序号' },
+    { type: 'seq',width: 60 , title: '序号' },
     { field: 'ppzt', title: '状态',  formatter: ['dictFormat', 'PPZT'],
       filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
       filterRender: { name: 'FilterCombination', },