diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue
index be8ae98..63199fe 100644
--- a/src/views/jhzx/ydjhzxCX.vue
+++ b/src/views/jhzx/ydjhzxCX.vue
@@ -845,9 +845,9 @@ export default {
       }
       for (const item of data) {
         item.zyq=this.plParam.zyq||item.zyq
-        for (const item of this.zyqList) {
-          if(item.value===this.plParam.zyq){
-            item.zyq1=item.label
+        for (const _item of this.zyqList) {
+          if(_item.value===this.plParam.zyq){
+            item.zyq1=_item.label
           }
         }
       }
diff --git a/src/views/jhzxgl/yppGL.vue b/src/views/jhzxgl/yppGL.vue
index 3441bf3..3a5599c 100644
--- a/src/views/jhzxgl/yppGL.vue
+++ b/src/views/jhzxgl/yppGL.vue
@@ -2,12 +2,9 @@
   <!--  <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
@@ -19,7 +16,6 @@
                 </el-option>
               </el-select>
             </el-form-item>
-
             <el-form-item label="船号:">
               <vxe-pulldown ref="xDown4" transfer >
                 <template #default>
@@ -38,7 +34,6 @@
                     <vxe-grid
                       highlight-hover-row
                       height="auto"
-
                       :data="projectData"
                       :columns="projectColumns"
                       @cell-click="cellClickEvent"
@@ -51,8 +46,6 @@
                   </div>
                 </template>
               </vxe-pulldown>
-
-
             </el-form-item>
             <el-form-item label="批量:">
               <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
@@ -63,33 +56,6 @@
             <el-form-item label="套料图:">
               <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" style="width: 130px" ></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>
-
-
           </el-col>
           <el-col :span="2">
             <el-form-item style="float: right" >
@@ -98,78 +64,18 @@
           </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-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-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>
@@ -196,14 +102,9 @@
               highlight-hover-row
               show-overflow
               show-header-overflow
-
             >
-
-
             </vxe-grid>
           </div>
-
-
         </el-main>
       </el-container>
     </el-container>
@@ -223,7 +124,7 @@ import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 import {saveDmppxxb, getDmppxxbList, saveBfwz} from "@/api/jhzxgl/ypp";
 export default {
-  name:'Cgjhdh',
+  name:'YppGL',
   data() {
     return {
       queryParam: {
@@ -247,8 +148,6 @@ export default {
           value: "02",
           label: "已配盘·",
         },
-
-
       ],
       inParam:{
         qy:'',
@@ -272,12 +171,9 @@ 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', },
@@ -286,7 +182,6 @@ export default {
           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', },
@@ -296,39 +191,30 @@ export default {
           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: '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', },
@@ -341,277 +227,273 @@ export default {
           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: '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: '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: '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: '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',
@@ -627,44 +509,41 @@ export default {
           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: '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' }
+        // },
       ]
     }
   },
@@ -675,11 +554,8 @@ export default {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
     this.initBase()
-
-
   },
   methods: {
-
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -688,20 +564,16 @@ 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 {
         this.projectData = this.projectData1.slice(0)
       }
-
     },
     ztChange(){
       this.list=[]
     },
     bzClick(){
-
       this.dictData.dwxxs= this.dwxxs.filter(fst=>fst.qy===this.queryParam.qy)
     },
     bzClick1(){
@@ -709,7 +581,6 @@ export default {
     },
     async updates2() {
       let selectRecords = this.$refs.xGrid.getCheckboxRecords()
-
       const dw = this.dictData.dwxxs.filter(item => item.dwh === this.inParam.dw && item.qy === this.inParam.qy)
       if (selectRecords.length > 0 && dw.length > 0) {
         const selectDw = dw[0]
@@ -733,8 +604,6 @@ export default {
       }
     },
     updates(type){
-
-
       let selectRecords = this.$refs.xGrid.getCheckboxRecords()
 
       if(selectRecords.length>0){
@@ -752,17 +621,9 @@ export default {
       }
 
     },
-
     activeRowMethod({ row, rowIndex }){
-      // if(row.zt==="01"){
-      //   return  true
-      // }else{
-      //   return  false
-      // }
-
       return true;
     },
-
     initBase(){
       getPgdBase({}).then(res=>{
         this.zyqs=res.data.zyqs
@@ -781,18 +642,12 @@ export default {
         }
         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()
@@ -801,44 +656,37 @@ export default {
     },
 
     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(() =>{
-          let selectRecords = this.$refs.xGrid.getCheckboxRecords()
-          const dw = this.dictData.dwxxs.filter(item => item.dwh === this.inParam.dw && item.qy === this.inParam.qy)
-          if (dw.length > 0) {
-            const selectDw = dw[0]
-            if (!selectDw.dcCh && !selectDw.dcPl && !selectDw.dcFd) {
-              selectDw.dcCh = selectRecords[0].czbh
-              selectDw.dcPl = selectRecords[0].pl
-              selectDw.dcFd = selectRecords[0].fd
-              saveBfwz({edit:[selectDw]}).then(res=>{})
-            }
-          }
-          saveDmppxxb(obj).then(res=>{
-            if(res.success){
-              this.initList()
+      if (this.queryParam.zt==='01') {
+          this.$confirm('保存？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() =>{
+            let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+            const dw = this.dictData.dwxxs.filter(item => item.dwh === this.inParam.dw && item.qy === this.inParam.qy)
+            if (dw.length > 0) {
+              const selectDw = dw[0]
+              if (!selectDw.dcCh && !selectDw.dcPl && !selectDw.dcFd) {
+                selectDw.dcCh = selectRecords[0].czbh
+                selectDw.dcPl = selectRecords[0].pl
+                selectDw.dcFd = selectRecords[0].fd
+                saveBfwz({edit:[selectDw]}).then(res=>{})
+              }
             }
-          })
+            saveDmppxxb(obj).then(res=>{
+              if(res.success){
+                this.initList()
+              }
+            })
 
-        })
+          })
       }
-
-
     },
     xdClick(){
-
       if(this.queryParam.zt!=="02"){
         return
       }
@@ -846,21 +694,6 @@ export default {
       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: '取消',
@@ -874,38 +707,30 @@ export default {
         })
 
       })
-      // }
-
-
     },
     initList() {
-      // if (this.queryParam.dcch === '') {
-      //   this.$message.warning('选择船只编号')
-      //   return
-      // }
+      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)
         }
-
       })
     },
     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: 80px;
@@ -913,8 +738,8 @@ export default {
   .el-select{
     width: 90px;
   }
-
 }
+
 .el-container{padding: 0;margin:0;}
 .el-main{padding: 0;}
 .el-col{padding: 0;height: 32px;}
diff --git a/src/views/jhzxgl/yppyz.vue b/src/views/jhzxgl/yppyz.vue
index 0393190..068505c 100644
--- a/src/views/jhzxgl/yppyz.vue
+++ b/src/views/jhzxgl/yppyz.vue
@@ -3,7 +3,7 @@
     <el-header style="width: 100%; height: 80px;font-size: 12px">
       <el-form :inline="true" label-width="55px" label-position="right">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="7">
             <el-form-item label="船号:">
               <ProjectSelect ref="projectSelectRef" />
             </el-form-item>
@@ -11,7 +11,7 @@
               <el-input v-model="queryParam.dcPl" type="search" placeholder="批量" />
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="15">
             <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" placeholder="选择垛位"/>
             <VxeButton status="primary" content="批量" @click="pl" />
@@ -19,7 +19,6 @@
           <el-col :span="2">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
-              <el-button type="success" @click="tq">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -106,7 +105,6 @@ export default {
       plParam:{
         qy:'',
         dw:'',
-        dwxxId:''
       },
       qyList:[],
       dwList:[],
@@ -239,9 +237,10 @@ export default {
         this.$message.warning('请选择数据')
         return
       }
-      data.qy=this.plParam.qy
-      data.dwh=this.plParam.dwh
-      data.dwxxId=this.plParam.dwxxId
+      data.forEach(item=>{
+        item.qy=this.plParam.qy
+        item.dwh=this.plParam.dw
+      })
     },
     initBase(){
       getPgdBase({}).then(res=>{
@@ -275,7 +274,6 @@ export default {
     },
     tq(){
       this.queryParam.dcCh=this.$refs.projectSelectRef.getDcch()
-
     },
     initList() {
       this.queryParam.dcCh=this.$refs.projectSelectRef.getDcch()
@@ -293,10 +291,9 @@ export default {
         this.list = res.data
       })
     },
-    qyChange({row}){
-      const qy=row.qy
+    qyChange({value}){
       const dwList=[]
-      this.qyData[qy]?.forEach(item=>{
+      this.qyData[value]?.forEach(item=>{
         const dw={label:item.dwh,value:item.dwh};
         dwList.push(dw)
       })
diff --git a/src/views/zyjhzx/bfang/comps/Ypp.vue b/src/views/zyjhzx/bfang/comps/Ypp.vue
new file mode 100644
index 0000000..c3f5553
--- /dev/null
+++ b/src/views/zyjhzx/bfang/comps/Ypp.vue
@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <el-row :gutter="20">
+      <el-col :span="3" v-for="(item, index) in list" :key="index">
+        <dv-border-box-12>
+          <YppDetail :data="item"></YppDetail>/
+        </dv-border-box-12>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import YppDetail from "@/views/zyjhzx/bfang/comps/YppDetail.vue";
+
+export default {
+  name: "Ypp",
+  components: {YppDetail},
+  data() {
+    return {
+      list: []
+    }
+  },
+  methods: {
+    initList(){
+
+    }
+  }
+}
+</script>
diff --git a/src/views/zyjhzx/bfang/comps/YppDetail.vue b/src/views/zyjhzx/bfang/comps/YppDetail.vue
new file mode 100644
index 0000000..0414884
--- /dev/null
+++ b/src/views/zyjhzx/bfang/comps/YppDetail.vue
@@ -0,0 +1,40 @@
+<template>
+  <div @click="clickEvent" v-if="">
+
+  </div>
+</template>
+<script>
+export default {
+  name: 'YppDetail',
+  props:{
+    data:{
+      type:Object,
+      default:()=>{
+        return {
+          dcCh:'',
+          dcPl:'',
+          dcFd:'',
+          qy:'',
+          dw:'',
+          list:[]
+        }
+      }
+    }
+  },
+  data(){
+    return {
+      total:0,
+      wpp:0,
+    }
+  },
+  mounted(){
+    this.total = this.$props.data.list.length;
+    this.num=this.$props.data.list.filter(item=>item.ppzt==='01').length
+  },
+  methods:{
+    clickEvent(){
+
+    }
+  }
+}
+</script>
diff --git a/src/views/zyjhzx/bfang/comps/YppLjTable.vue b/src/views/zyjhzx/bfang/comps/YppLjTable.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/zyjhzx/bfang/index.vue b/src/views/zyjhzx/bfang/index.vue
index 7eb4f72..5c6118b 100644
--- a/src/views/zyjhzx/bfang/index.vue
+++ b/src/views/zyjhzx/bfang/index.vue
@@ -26,7 +26,7 @@ export default {
   data(){
     return{
       workers:[],
-      title:'摆  放  报  工',
+      title:'预 配 盘 报 工',
       zyq:'',
       stage:null,
       layer:null,