diff --git a/src/api/jhzxgl/ypp.js b/src/api/jhzxgl/ypp.js
index 5735410..cacde41 100644
--- a/src/api/jhzxgl/ypp.js
+++ b/src/api/jhzxgl/ypp.js
@@ -19,6 +19,8 @@ export function saveBfwz(data={}) {return request({url: '/dwxx/addOrEdit', metho
 export function getDmppxxbList(data={}) {return request({url: '/dmPpxxb/getDmppxxbList', method: 'post', data})}
 
 export function saveDmppxxb(data) {return request({url: '/dmPpxxb/saveDmppxxb', method: 'post', data})}
+export function saveDmppxxbpg(data) {return request({url: '/dmPpxxb/saveDmppxxbpg', method: 'post', data})}
+export function saveDmppxxbqr(data) {return request({url: '/dmPpxxb/saveDmppxxbqr', method: 'post', data})}
 
 export function getList(data) {return request({url: '/ypp/getList', method: 'post', data})}
 
diff --git a/src/views/jhzx/qfqrGL.vue b/src/views/jhzx/qfqrGL.vue
index 6a492e3..984d775 100644
--- a/src/views/jhzx/qfqrGL.vue
+++ b/src/views/jhzx/qfqrGL.vue
@@ -1,17 +1,33 @@
 <template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
   <el-container>
-    <el-header style="width: 100%;height: 35px">
-      <el-form ref="requestForm" :model="request" label-width="65px">
+    <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="3">
+
+          <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>
                   <vxe-input
-                    v-model="request.dcCh"
+                    v-model="queryParam.dcch"
                     placeholder="船号"
                     style="height: 28px;
-                    line-height: 28px; width: 150px;"
+                    line-height: 28px; width: 140px;"
                     suffix-icon="vxe-icon--search"
                     @keyup="keyupEvent4"
                     @focus="focusEvent4"
@@ -22,6 +38,7 @@
                     <vxe-grid
                       highlight-hover-row
                       height="auto"
+
                       :data="projectData"
                       :columns="projectColumns"
                       @cell-click="cellClickEvent"
@@ -34,47 +51,200 @@
                   </div>
                 </template>
               </vxe-pulldown>
+
+
             </el-form-item>
-          </el-col>
-          <el-col :span="3">
             <el-form-item label="批量:">
-              <el-input v-model="request.dcPl" type="search" placeholder="批量" ></el-input>
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="3">
             <el-form-item label="分段:">
-              <el-input v-model="request.dcFd" type="search" placeholder="分段" ></el-input>
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+            <el-form-item label="套料图:">
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
             </el-form-item>
+
+
+
+
+            <el-form-item label="区域:">
+
+              <el-select v-model="queryParam.qy" placeholder="区域" clearable  @change="bzClick" >
+                <el-option
+                  v-for="item in dictData.qys"
+                  :key="item.qy"
+                  :label="item.qy"
+                  :value="item.qy"
+                >
+                </el-option>
+              </el-select>
+              <el-select v-model="queryParam.dwh" placeholder="垛位" clearable>
+                <el-option
+                  v-for="item in dictData.dwxxs"
+                  :key="item.dwh"
+                  :label="item.dwh"
+                  :value="item.dwh"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="在建船只:" label-width="105px">
-              <el-checkbox v-model="request.zjcz" type="search" placeholder="合同号" ></el-checkbox>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
           </el-col>
-          <el-col :span="11" style="text-align: right">
-            <el-button type="primary" @click="initList()">查询</el-button>
-            <el-button type="success" @click="qr">确认</el-button>
+        </el-row>
+        <el-row>
+
+          <el-col :span="20"  >
+
+          </el-col>
+
+
+
+
+
+          <!--            <span style="width:6%" >班组:</span>-->
+          <!--            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">-->
+          <!--              <el-option-->
+          <!--                v-for="item in this.dictData.resourcesCodes"-->
+          <!--                :key="item.resourcesCode"-->
+          <!--                :label="item.resourcesCode"-->
+          <!--                :value="item.resourcesCode"-->
+          <!--              >-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+
+          <!--            <span style="width:6%" >作业区:</span>-->
+          <!--            <el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">-->
+          <!--              <el-option-->
+          <!--                v-for="item in this.dictData.zyqs"-->
+          <!--                :key="item.resourcesCode+item.zyq"-->
+          <!--                :label="item.resourcesCode+item.zyq"-->
+          <!--                :value="item.zyq"-->
+          <!--              >-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+
+          <!--            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >-->
+          <!--              <el-option-->
+          <!--                v-for="item in this.dictData.zyrys"-->
+          <!--                :key="item.id"-->
+          <!--                :label="item.resourcesCode+item.zyq+item.userName"-->
+          <!--                :value="item.userName"-->
+          <!--              >-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+
+          <!--            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="打磨计划日期"/>-->
+          <!--            <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>-->
+          <!--            &lt;!&ndash;            <span style="width:6%" >反馈人员:</span>&ndash;&gt;-->
+          <!--            &lt;!&ndash;            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />&ndash;&gt;-->
+          <!--            &lt;!&ndash;            <span style="width:6%" >反馈日期:</span>&ndash;&gt;-->
+          <!--            &lt;!&ndash;            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>&ndash;&gt;-->
+          <!--            &lt;!&ndash;            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>&ndash;&gt;-->
+          <!--          </el-col>-->
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="slpgclick">确认</el-button>
+
+
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </el-header>
-    <Yppfk0 ref="yppfk0" />
+    <el-container  style="padding-top: 0px">
+      <el-container>
+        <el-main>
+          <div class="mytable">
+            <vxe-grid
+              id="id"
+              ref="xGrid"
+              border
+              resizable
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="list"
+              :scroll-y="{enabled: true}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
   </el-container>
 </template>
 
 <script>
-import {getCzplBase} from "@/api/sjzx/jcsj";
-import {getBfwz, yppQr} from "@/api/jhzxgl/ypp";
-import Yppfk0 from "@/views/jhzxgl/components/Yppfk0.vue";
-
+import {
+  saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import {null2str} from "@/utils/rpkj";
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
+import {saveDmppxxb, getDmppxxbList, saveDmppxxbpg, saveDmppxxbqr} from "@/api/jhzxgl/ypp";
 export default {
-  name: "Cgjhdh",
-  components: { Yppfk0},
+  name:'Cgjhdh',
   data() {
     return {
-      yppTqShow:false,
-      height: "500px",
-      list:[],
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'03',
+        'lx':'d',
+        qgkw:'',
+        tlth:'',
+        qy:'',
+        dw:''
+      },
+      statusOptions: [
+        {
+          value: "03",
+          label: "未确认",
+        },
+        {
+          value: "04",
+          label: "已确认",
+        },
+
+
+      ],
+      inParam:{
+        qy:'',
+        dw:''
+      },
+      dwxxs:[],
+      zyqs:[],
+      zyrys:[],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
       projectColumns: [
         {field: 'cbbm', title: '船号',width: 110},
         { field: 'wgbs', title: '完工标识', width: 80,
@@ -83,133 +253,714 @@ export default {
           },
         },
       ],
-      qyList:[],
-      dwList:[],
-      bfwzList:[],
-      projectData:[],
-      projectData1:[],
-      request:{
-        dcCh:'',
-        dcPl:'',
-        dcFd:'',
-        zjcz:true,
-        zt1:'04'
-      },
+
+      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,
+          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: 'wpfl', title: '物品分类', width: 60,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jldw', title: '计量单位', width: 60,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sl', title: '数量', width: 70,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+        { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qrry', title: '确认人员', width: 90,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qrrq', title: '确认日期', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dzjz', title: '大组极重', minWidth: "70",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          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: {
+    ...mapGetters(['name', 'bmbm'])
+  },
   created() {
-    window.addEventListener("resize", this.getHeight);
-    this.getHeight();
-    this.initProject()
-    this.initBfwz()
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
   },
   methods: {
-    qr(){
-      const data=this.$refs.yppfk0.getSelectQfxq();
-      if (data.length==0){
-        this.$message.warning('请选择待执行的数据');
-        return;
+
+    cellClickEvent({row}) {
+      this.queryParam.dcch = row.cbbm
+      this.$refs.xDown4.hidePanel()
+    },
+    focusEvent4() {
+      this.$refs.xDown4.showPanel()
+    },
+    keyupEvent4() {
+
+
+      if (this.queryParam.dcch) {
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
       }
-      yppQr(data).then(res=>{
-        this.$message.success('成功');
-        this.initList()
-      })
+
     },
-    initList(){
-      this.$refs.yppfk0.initXqjh(this.request)
-    },
-    initBfwz(){
-      getBfwz().then(res=>{
-        this.bfwzList=res.data
-        const _qyList=[]
-        const _dwhList=[]
-        const table=this.$refs.tableRef
-        const qyColumn=table.getColumnByField('qy')
-        const dwColumn=table.getColumnByField('dwh')
-        this.bfwzList.forEach(item=>{
-          _qyList.push({label:item.qy,value:item.qy})
-          _dwhList.push({label:item.dwh,value:item.dwh,_parent:item.qy})
-        })
-        qyColumn.editRender.options=_qyList
-        dwColumn.editRender.options=_dwhList
-        this.qyList=_qyList;
-        this.dwList=_dwhList
-      })
+    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;
     },
-    initProject(){
-      getCzplBase({}).then(res=>{
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.dwxxs=res.data.dwxxs
+        this.zyrys=res.data.zyrys
+        this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
       })
     },
-    cellClickEvent({row}){
-      this.request.dcCh = row.cbbm
-      this.$refs.xDown4.hidePanel()
+    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)
+      }
+
     },
-    focusEvent4(){
-      this.$refs.xDown4.showPanel()
+    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()
+        }
+      })
     },
-    keyupEvent4(){
-      if (this.request.dcCh) {
-        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
-      } else {
-        this.projectData = this.projectData1.slice(0)
+
+    slpgclick(){
+      // if(this.queryParam.zt!=="01"){
+      //   return
+      // }
+
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if (this.queryParam.zt==='03') {
+        this.$confirm('确认？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveDmppxxbqr(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)
     },
     getHeight() {
-      this.height = window.innerHeight - 160;
+      this.height = window.innerHeight - 190
     },
+
   }
-};
+}
 </script>
 <style lang="scss" scoped >
-.el-header {
-  margin: 0;
-  padding: 5px 0;
-  height: auto;
-}
-.el-container {
-  padding: 0;
-  margin: 0;
-}
-.el-main {
-  padding: 0;
-}
-.el-col {
-  padding: 0;
-}
-.el-aside {
-  background: #fff;
-  padding: 0;
-}
-.el-container {
-  padding: 0;
-}
-.el-row {
-  margin-bottom: 5px;
-}
-.el-row:last-child {
-  margin-bottom: 0;
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
 }
-.tableStyles {
+.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: 450px;
-  height: 250px;
+  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;
+
 }
-::v-deep .mytable .vxe-input {
-  display: flex !important;
+.mytable1{
+
 }
-::v-deep .el-form-item {
-  margin-bottom: 0px !important;
+.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;
 }
 
-::v-deep .el-input{
-  width: auto !important;
+.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/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index 9ea0f05..655680e 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -667,55 +667,55 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-        {
-          field: 'hxjybs',
-          title: '划线借用标识',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'hxjych',
-          title: '划线借用船号',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'hxjypl',
-          title: '划线借用批量',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'hxjyfd',
-          title: '划线借用分段',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'hxjyzl',
-          title: '划线借用组立',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'hxjykw',
-          title: '划线借用跨位',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'hxjytlth',
-          title: '划线借用套料图号',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
+        // {
+        //   field: 'hxjybs',
+        //   title: '划线借用标识',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'hxjych',
+        //   title: '划线借用船号',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'hxjypl',
+        //   title: '划线借用批量',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'hxjyfd',
+        //   title: '划线借用分段',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'hxjyzl',
+        //   title: '划线借用组立',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'hxjykw',
+        //   title: '划线借用跨位',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        // {
+        //   field: 'hxjytlth',
+        //   title: '划线借用套料图号',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
         {
           field: 'hxbz',
           title: '划线备注',
@@ -778,55 +778,55 @@ export default {
 
 
 // 曲加工相关字段
-        {
-          field: 'qgjybs',
-          title: '切割借用标识',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgjych',
-          title: '切割借用船号',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgjypl',
-          title: '切割借用批量',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgjyfd',
-          title: '切割借用分段',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgjyzl',
-          title: '切割借用组立',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgjykw',
-          title: '切割借用跨位',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        {
-          field: 'qgjytlth',
-          title: '切割借用套料图号',
-          width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
+//         {
+//           field: 'qgjybs',
+//           title: '切割借用标识',
+//           width: 100,
+//           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+//           filterRender: { name: 'FilterCombination' }
+//         },
+//         {
+//           field: 'qgjych',
+//           title: '切割借用船号',
+//           width: 100,
+//           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+//           filterRender: { name: 'FilterCombination' }
+//         },
+//         {
+//           field: 'qgjypl',
+//           title: '切割借用批量',
+//           width: 100,
+//           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+//           filterRender: { name: 'FilterCombination' }
+//         },
+//         {
+//           field: 'qgjyfd',
+//           title: '切割借用分段',
+//           width: 100,
+//           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+//           filterRender: { name: 'FilterCombination' }
+//         },
+//         {
+//           field: 'qgjyzl',
+//           title: '切割借用组立',
+//           width: 100,
+//           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+//           filterRender: { name: 'FilterCombination' }
+//         },
+//         {
+//           field: 'qgjykw',
+//           title: '切割借用跨位',
+//           width: 100,
+//           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+//           filterRender: { name: 'FilterCombination' }
+//         },
+//         {
+//           field: 'qgjytlth',
+//           title: '切割借用套料图号',
+//           width: 100,
+//           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+//           filterRender: { name: 'FilterCombination' }
+//         },
 
 // 其他标识和计划日期字段
         {
diff --git a/src/views/jhzxgl/dmjhD.vue b/src/views/jhzxgl/dmjhD.vue
index be9fca5..45fb0eb 100644
--- a/src/views/jhzxgl/dmjhD.vue
+++ b/src/views/jhzxgl/dmjhD.vue
@@ -6,7 +6,7 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="18">
+          <el-col :span="20">
 
             <el-form-item label="状态:">
               <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
@@ -60,12 +60,29 @@
             <el-form-item label="分段:">
               <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
             </el-form-item>
+            <el-form-item label="套料图:">
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
+            </el-form-item>
+
+
 
 
+            <el-form-item label="跨位:">
+              <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable >
+                <el-option
+                  v-for="item in this.dictData.qgkw"
+                  :key="item.bm"
+                  :label="item.bmsm"
+                  :value="item.bm"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
 
 
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
@@ -83,25 +100,36 @@
             <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.bmbm"
-                :key="item.bm"
-                :label="item.bmsm"
-                :value="item.bm"
+                v-for="item in this.dictData.resourcesCodes"
+                :key="item.resourcesCode"
+                :label="item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
-            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
+            <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.gxry"
-                :key="item.dlzh"
-                :label="item.dlzh"
-                :value="item.dlzh"
+                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>
 <!--            <span style="width:6%" >反馈人员:</span>-->
 <!--            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />-->
@@ -157,7 +185,7 @@
 
 <script>
 import {
-  saveDmPgdXd,getDmPgd,getPgdBase,saveDmPgdFk,saveDmPgdJs,saveDmPgdXdBack
+  saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -166,7 +194,7 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 export default {
-  name:'PwjhD',
+  name:'Dmjhd',
   data() {
     return {
       queryParam: {
@@ -174,7 +202,10 @@ export default {
         pl:'',
         fd:'',
         fkyy:'',
-        zt:'01'
+        zt:'01',
+        'lx':'d',
+        qgkw:'',
+        tlth:'',
       },
       statusOptions: [
         {
@@ -197,8 +228,11 @@ export default {
         sljs:'',
         dw:'',
         scry:'',
-        scdw:''
+        scdw:'',
+        zyq:''
       },
+      zyqs:[],
+      zyrys:[],
       list: [],
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
@@ -218,189 +252,341 @@ export default {
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-        { field: 'lsh', title: '工单号', width: 100,
+        { field: 'dgdh', title: '打磨工单号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dmZt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
+
+        { field: 'dmzt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'czbh', title: '船号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'czbh', title: '船号', width: 100,
+        { field: 'pl', title: '批量', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pl', title: '批量', width: 100,
+        { field: 'fd', title: '分段', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'fd', title: '分段', width: 100,
+        { field: 'kw', title: '跨位', width: 120,formatter: ['dictFormat', 'QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'kw', title: '跨位', width: 100,
+        { field: 'zl', title: '组立', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'zl', title: '组立', width: 100,
+        { field: 'tlth', title: '套料图号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'tlth', title: '套料图号', width: 100,
+
+
+        { field: 'ljbh', title: '零件编号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ptblx', title: '套料图号', width: 100,
+        { field: 'ljmc', title: '零件名称', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljbh', title: '零件编号', width: 100,
+        { field: 'ljgg', title: '零件规格', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljmc', title: '零件名称', width: 100,
+        { field: 'ljcz', title: '零件材质', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljgg', title: '零件规格', width: 100,
+        { field: 'wpfl', title: '物品分类', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ljcz', title: '零件材质', width: 100,
+        { field: 'jldw', title: '计量单位', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'wpfl', title: '物品分类', width: 100,
+        { field: 'sl', title: '数量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qfxqrqxz', title: '前方需求小组期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'jldw', title: '计量单位', width: 100,
+        { field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'sl', title: '数量', width: 100,
+        // { field: 'dgdh', title: '打磨工单号', width: 100,
+        //   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,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
-        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+        { field: 'dmXfrq', title: '打磨派工日期', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
+        { field: 'dscry', title: '打磨生产人员', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        // { field: 'gylx', title: '工艺路线', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
 
-        // { field: 'dmfzry', title: '打磨负责人', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
 
-        { field: 'dmsbbh', title: '打磨设备编号', width: 100,
+        { field: 'dmFkry', title: '打磨反馈人', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmcd', title: '打磨长度', width: 100,
+        { field: 'dmFkrq', title: '打磨反馈日期', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dmXfry', title: '派工人', width: 100,
+        { field: 'pgdh', title: '坡口工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmXfrq', title: '派工日期', width: 100,
+        { field: 'pkjhrq', title: '坡口计划日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        // { field: 'dmry', title: '打磨人员', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        //
-        // { field: 'dmksrq', title: '打磨开始日期', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        //
-        // { field: 'dmjsrq', title: '打磨结束日期', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: 'dscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'dscry', title: '生产人员', width: 100,editRender: { name: 'input' },
+
+        { field: 'pgdh', title: '坡口工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        // { field: 'djsry', title: '接收人员', width: 100,editRender: { name: 'input' },
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: 'djsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
-        //   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: 'dmFkry', title: '反馈人', width: 100,editRender: { name: 'input' },
+        { field: 'pklx', title: '坡口类型', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmFkrq', title: '反馈日期', width: 100,editRender: { name: 'input' },
+        { 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: 'dmBzry', title: '编制人', width: 100,
+        { 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: 'dmBzrq', title: '编制日期', width: 100,
+        { 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' }
+        },
 
 
 
@@ -442,7 +628,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      console.log(this.dictData.zyqs)
+    },
+    bzClick1(){
+      console.log(this.dictData.zyrys)
+      console.log(this.zyrys)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
@@ -454,6 +646,7 @@ export default {
 
           selectRecords[i].dscdw = this.inParam.scdw
           selectRecords[i].dscry = this.inParam.scry
+          selectRecords[i].dmjhrq = this.inParam.sljs
 
 
         }
@@ -494,6 +687,8 @@ export default {
     initBase(){
       getPgdBase({}).then(res=>{
         console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.zyrys=res.data.zyrys
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
@@ -612,7 +807,7 @@ export default {
         this.$message.warning('选择船只编号')
         return
       }
-      getDmPgd(this.queryParam).then((res) => {
+      getQmPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
diff --git a/src/views/jhzxgl/hxjhD.vue b/src/views/jhzxgl/hxjhD.vue
index ce1e836..d56dcf4 100644
--- a/src/views/jhzxgl/hxjhD.vue
+++ b/src/views/jhzxgl/hxjhD.vue
@@ -9,7 +9,7 @@
           <el-col :span="22">
             <el-col :span="5" >
               <el-form-item label="状态:">
-                <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+                <el-select v-model="queryParam.zt" placeholder="状态"  @change="ztChange">
                   <el-option
                     v-for="item in statusOptions"
                     :key="item.value"
@@ -87,24 +87,34 @@
 
 
 
-
             <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.bmbm"
-                :key="item.bm"
-                :label="item.bmsm"
-                :value="item.bm"
+                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%" >
+            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >
               <el-option
-                v-for="item in this.dictData.gxry"
-                :key="item.dlzh"
-                :label="item.dlzh"
-                :value="item.dlzh"
+                v-for="item in this.dictData.zyrys"
+                :key="item.id"
+                :label="item.resourcesCode+item.zyq+item.userName"
+                :value="item.userName"
               >
               </el-option>
             </el-select>
@@ -205,6 +215,8 @@ export default {
         },
 
       ],
+      zyqs:[],
+      zyrys:[],
       inParam:{
         slry:'',
         slks:'',
@@ -232,6 +244,13 @@ export default {
         tableColumn: [
       { type: 'checkbox', width: 40 },
       { type: 'seq', width: 40, title: '序号' },
+          {
+            field: 'djh',
+            title: '单据号',
+            width: 100,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination' }
+          },
 
           { field: 'dcCh', title: '船号',width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -310,22 +329,22 @@ export default {
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination' }
           },
-
           {
-            field: 'hxry',
-            title: '划线人员',
+            field: 'hxfkry',
+            title: '划线反馈人员',
             width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination' }
           },
-
           {
-            field: 'hxfkry',
-            title: '划线反馈人员',
+            field: 'hxry',
+            title: '划线人员',
             width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination' }
           },
+
+
           {
             field: 'hxbz',
             title: '划线备注',
@@ -373,7 +392,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      console.log(this.dictData.zyqs)
+    },
+    bzClick1(){
+      console.log(this.dictData.zyrys)
+      console.log(this.zyrys)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
@@ -427,6 +452,8 @@ export default {
     initBase(){
       getPgdBase({}).then(res=>{
         console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.zyrys=res.data.zyrys
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue
index 423a997..377673a 100644
--- a/src/views/jhzxgl/pwjhD.vue
+++ b/src/views/jhzxgl/pwjhD.vue
@@ -9,7 +9,7 @@
           <el-col :span="22">
             <el-col :span="4" >
               <el-form-item label="状态:">
-                <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+                <el-select v-model="queryParam.zt" placeholder="状态"  @change="ztChange">
                   <el-option
                     v-for="item in statusOptions"
                     :key="item.value"
@@ -245,7 +245,13 @@ export default {
         tableColumn: [
       { type: 'checkbox', width: 40 },
       { type: 'seq', width: 40, title: '序号' },
-
+          {
+            field: 'djh',
+            title: '单据号',
+            width: 100,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination' }
+          },
           { field: 'dcCh', title: '船号',width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
             filterRender: { name: 'FilterCombination', }},
diff --git a/src/views/jhzxgl/qgjhD.vue b/src/views/jhzxgl/qgjhD.vue
index a3843c7..bd28847 100644
--- a/src/views/jhzxgl/qgjhD.vue
+++ b/src/views/jhzxgl/qgjhD.vue
@@ -9,7 +9,7 @@
           <el-col :span="22">
             <el-col :span="5" >
               <el-form-item label="状态:">
-                <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+                <el-select v-model="queryParam.zt" placeholder="状态"  @change="ztChange">
                   <el-option
                     v-for="item in statusOptions"
                     :key="item.value"
@@ -83,24 +83,34 @@
             <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.bmbm"
-                :key="item.bm"
-                :label="item.bmsm"
-                :value="item.bm"
+                v-for="item in this.dictData.resourcesCodes"
+                :key="item.resourcesCode"
+                :label="item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
-            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
+            <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.gxry"
-                :key="item.dlzh"
-                :label="item.dlzh"
-                :value="item.dlzh"
+                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-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
             <!--            <span style="width:6%" >反馈人员:</span>-->
@@ -182,6 +192,8 @@ export default {
         zt:'42',
         ztHx:'52'
       },
+      zyqs:[],
+      zyrys:[],
       statusOptions: [
         {
           value: "42",
@@ -224,7 +236,13 @@ export default {
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-
+        {
+          field: 'djh',
+          title: '单据号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
         { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
@@ -339,6 +357,7 @@ export default {
 
   },
   methods: {
+
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -362,7 +381,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      console.log(this.dictData.zyqs)
+    },
+    bzClick1(){
+      console.log(this.dictData.zyrys)
+      console.log(this.zyrys)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
@@ -416,6 +441,8 @@ export default {
     initBase(){
       getPgdBase({}).then(res=>{
         console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.zyrys=res.data.zyrys
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
diff --git a/src/views/jhzxgl/qmjhD.vue b/src/views/jhzxgl/qmjhD.vue
index 91500c3..69fa903 100644
--- a/src/views/jhzxgl/qmjhD.vue
+++ b/src/views/jhzxgl/qmjhD.vue
@@ -6,7 +6,7 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="18">
+          <el-col :span="20">
 
             <el-form-item label="状态:">
               <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
@@ -60,12 +60,30 @@
             <el-form-item label="分段:">
               <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
             </el-form-item>
+            <el-form-item label="套料图:">
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
+            </el-form-item>
+
+
+
+
+            <el-form-item label="跨位:">
+              <el-select v-model="queryParam.qgkw" placeholder="跨位" clearable >
+                <el-option
+                  v-for="item in this.dictData.qgkw"
+                  :key="item.bm"
+                  :label="item.bmsm"
+                  :value="item.bm"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
 
 
 
 
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
@@ -83,25 +101,36 @@
             <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.bmbm"
-                :key="item.bm"
-                :label="item.bmsm"
-                :value="item.bm"
+                v-for="item in this.dictData.resourcesCodes"
+                :key="item.resourcesCode"
+                :label="item.resourcesCode"
+                :value="item.resourcesCode"
               >
               </el-option>
             </el-select>
 
-            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
+            <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.gxry"
-                :key="item.dlzh"
-                :label="item.dlzh"
-                :value="item.dlzh"
+                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>
 <!--            <span style="width:6%" >反馈人员:</span>-->
 <!--            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />-->
@@ -174,7 +203,10 @@ export default {
         pl:'',
         fd:'',
         fkyy:'',
-        zt:'01'
+        zt:'01',
+        tlth:'',
+        'lx':'q',
+        qgkw:''
       },
       statusOptions: [
         {
@@ -196,8 +228,11 @@ export default {
         sljs:'',
         dw:'',
         scry:'',
-        scdw:''
+        scdw:'',
+        zyq:''
       },
+      zyqs:[],
+      zyrys:[],
       list: [],
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
@@ -217,7 +252,7 @@ export default {
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-        { field: 'lsh', title: '工单号', width: 100,
+        { field: 'qgdh', title: '  曲工单号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -240,7 +275,7 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'kw', title: '跨位', width: 120,
+        { field: 'kw', title: '跨位', width: 120,formatter: ['dictFormat', 'QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -255,10 +290,7 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'ptblx', title: '套料图号', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+
 
         { field: 'ljbh', title: '零件编号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -304,78 +336,240 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'gylx', title: '工艺路线', width: 120,
+        { field: 'qjgjhrq', title: '曲加工计划期', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'qjgjhrq', title: '曲加工计划期', width: 120,
+
+
+        { field: 'qsbbh', title: '曲设备编号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgfzry', title: '曲加工负责人', width: 120,
+
+        { field: 'qscry', title: '曲生产人员', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qsbbh', title: '曲设备编号', width: 120,
+
+        { field: 'qjgXfry', title: '曲派工人员', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        // { field: 'qjgry', title: '曲加工人员', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        //
-        // { field: 'qjgksrq', title: '曲加工开始日期', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        //
-        // { field: 'qjgjsrq', title: '曲加工结束日期', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
+        { field: 'qjgXfrq', title: '曲派工日期', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
-        // { field: 'qscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'qscry', title: '生产人员', width: 100,editRender: { name: 'input' },
+        { field: 'qjgFkry', title: '曲反馈人', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
+        { field: 'qjgFkrq', title: '曲反馈日期', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
-        { field: 'qjgXfry', title: '派工人员', width: 120,
+        //-------------------------------------------
+        { field: 'pghd', title: '坡口工单号', width: 120,
+          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: 'qjgXfrq', title: '派工日期', width: 120,
+
+
+        { field: 'pksbbh', title: '坡口设备编号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
+        { field: 'pklx', title: '坡口类型', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
+        { 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: 'dgdh', title: '打磨工单号', width: 100,
+          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: 'dmXfry', title: '打磨派工人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
-        // { field: 'qjgFkyy', title: '反馈原因', width: 120,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
+        { field: 'dmXfrq', title: '打磨派工日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
+        { field: 'dscry', title: '打磨生产人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+        { field: 'dmFkry', title: '打磨反馈人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
+          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' }
+        },
 
 
 
@@ -393,13 +587,7 @@ export default {
 
   },
   methods: {
-    syncXiaochi(){
-      syncXiaochi().then(res=>{
-        if (res.success){
-          this.initList()
-        }
-      })
-    },
+
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -423,7 +611,13 @@ export default {
     bzClick(){
       console.log(this.dictData.gxry)
       console.log(this.inParam.scdw)
-      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      this.dictData.zyqs= this.zyqs.filter(fst=>fst.resourcesCode===this.inParam.scdw)
+      console.log(this.dictData.zyqs)
+    },
+    bzClick1(){
+      console.log(this.dictData.zyrys)
+      console.log(this.zyrys)
+      this.dictData.zyrys= this.zyrys.filter(fst=>fst.resourcesCode+fst.zyq===this.inParam.scdw+this.inParam.zyq)
       console.log(this.dictData.gxry)
     },
     updates2(){
@@ -435,6 +629,7 @@ export default {
 
           selectRecords[i].qscdw = this.inParam.scdw
           selectRecords[i].qscry = this.inParam.scry
+          selectRecords[i].qjgjhrq = this.inParam.sljs
 
 
         }
@@ -475,6 +670,8 @@ export default {
     initBase(){
       getPgdBase({}).then(res=>{
         console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.zyrys=res.data.zyrys
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
@@ -515,7 +712,9 @@ export default {
       if(obj.length===0){
         return
       }
+      console.log(this.queryParam.zt)
       if(this.queryParam.zt==='02'){
+        console.log(this.queryParam.zt)
         this.$confirm('取消派工？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
diff --git a/src/views/jhzxgl/yppCX.vue b/src/views/jhzxgl/yppCX.vue
index 911f09c..d496b9f 100644
--- a/src/views/jhzxgl/yppCX.vue
+++ b/src/views/jhzxgl/yppCX.vue
@@ -1,17 +1,33 @@
 <template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
   <el-container>
-    <el-header style="width: 100%;height: 35px">
-      <el-form ref="requestForm" :model="request" label-width="65px">
+    <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="3">
+
+          <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>
                   <vxe-input
-                    v-model="request.dcCh"
+                    v-model="queryParam.dcch"
                     placeholder="船号"
                     style="height: 28px;
-                    line-height: 28px; width: 150px;"
+                    line-height: 28px; width: 140px;"
                     suffix-icon="vxe-icon--search"
                     @keyup="keyupEvent4"
                     @focus="focusEvent4"
@@ -22,8 +38,7 @@
                     <vxe-grid
                       highlight-hover-row
                       height="auto"
-                      keep-source
-                      :custom-config="{ storage: true }"
+
                       :data="projectData"
                       :columns="projectColumns"
                       @cell-click="cellClickEvent"
@@ -36,47 +51,226 @@
                   </div>
                 </template>
               </vxe-pulldown>
+
+
             </el-form-item>
-          </el-col>
-          <el-col :span="3">
             <el-form-item label="批量:">
-              <el-input v-model="request.dcPl" type="search" placeholder="批量" ></el-input>
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="3">
             <el-form-item label="分段:">
-              <el-input v-model="request.dcFd" type="search" placeholder="分段" ></el-input>
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+            <el-form-item label="套料图:">
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
             </el-form-item>
+
+
+
+
+            <el-form-item label="区域:">
+
+              <el-select v-model="queryParam.qy" placeholder="区域" clearable  @change="bzClick" >
+                <el-option
+                  v-for="item in dictData.qys"
+                  :key="item.qy"
+                  :label="item.qy"
+                  :value="item.qy"
+                >
+                </el-option>
+              </el-select>
+              <el-select v-model="queryParam.dwh" placeholder="垛位" clearable>
+                <el-option
+                  v-for="item in dictData.dwxxs"
+                  :key="item.dwh"
+                  :label="item.dwh"
+                  :value="item.dwh"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="在建船只:" label-width="105px">
-              <el-checkbox v-model="request.zjcz" type="search" placeholder="合同号" ></el-checkbox>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
           </el-col>
-          <el-col :span="11" style="text-align: right">
-            <el-button type="primary" @click="initList">查询</el-button>
+        </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>
-    <Yppfk0 ref="yppfk0" />
+    <el-container  style="padding-top: 0px">
+      <el-container>
+        <el-main>
+          <div class="mytable">
+            <vxe-grid
+              id="id"
+              ref="xGrid"
+              border
+              resizable
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="list"
+              :scroll-y="{enabled: true}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
   </el-container>
 </template>
 
 <script>
-import {getCzplBase} from "@/api/sjzx/jcsj";
-import YppTq from "@/views/jhzxgl/components/YppTq.vue";
-import {getBfwz} from "@/api/jhzxgl/ypp";
-import Yppfk0 from "@/views/jhzxgl/components/Yppfk0.vue";
-
+import {
+  saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import {null2str} from "@/utils/rpkj";
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
+import {saveDmppxxb,getDmppxxbList} from "@/api/jhzxgl/ypp";
 export default {
-  name: "Cgjhdh",
-  components: {Yppfk0, YppTq},
+  name:'Cgjhdh',
   data() {
     return {
-      yppTqShow:false,
-      height: "500px",
-      list:[],
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01',
+        'lx':'d',
+        qgkw:'',
+        tlth:'',
+        qy:'',
+        dw:''
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "編制",
+        },
+        {
+          value: "02",
+          label: "配盘",
+        },
+        {
+          value: "03",
+          label: "报工",
+        },
+        {
+          value: "04",
+          label: "确认",
+        },
+
+
+      ],
+      inParam:{
+        qy:'',
+        dw:''
+      },
+      dwxxs:[],
+      zyqs:[],
+      zyrys:[],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
       projectColumns: [
         {field: 'cbbm', title: '船号',width: 110},
         { field: 'wgbs', title: '完工标识', width: 80,
@@ -85,122 +279,697 @@ export default {
           },
         },
       ],
-      qyList:[],
-      dwList:[],
-      bfwzList:[],
-      projectData:[],
-      request:{
-        dcCh:'',
-        dcPl:'',
-        dcFd:'',
-        zjcz:true
-      },
+
+      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,
+          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: 'wpfl', title: '物品分类', width: 60,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jldw', title: '计量单位', width: 60,
+          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: {
+    ...mapGetters(['name', 'bmbm'])
+  },
   created() {
-    window.addEventListener("resize", this.getHeight);
-    this.getHeight();
-    this.initProject()
-    this.initBfwz()
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
   },
   methods: {
-    qtjc(){
-      this.$refs.yppfk0.qtjc()
-    },
-    initList(){
-      this.$refs.yppfk0.initXqjh(this.request)
-    },
-    initBfwz(){
-      getBfwz().then(res=>{
-        this.bfwzList=res.data
-        const _qyList=[]
-        const _dwhList=[]
-        const table=this.$refs.tableRef
-        const qyColumn=table.getColumnByField('qy')
-        const dwColumn=table.getColumnByField('dwh')
-        this.bfwzList.forEach(item=>{
-          _qyList.push({label:item.qy,value:item.qy})
-          _dwhList.push({label:item.dwh,value:item.dwh,_parent:item.qy})
-        })
-        qyColumn.editRender.options=_qyList
-        dwColumn.editRender.options=_dwhList
-        this.qyList=_qyList;
-        this.dwList=_dwhList
-      })
-    },
-    initProject(){
-      getCzplBase({}).then(res=>{
-        this.projectData=res.data.cbbm
-      })
-    },
-    cellClickEvent({row}){
-      this.request.dcCh = row.cbbm
+
+    cellClickEvent({row}) {
+      this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
     },
-    focusEvent4(){
+    focusEvent4() {
       this.$refs.xDown4.showPanel()
     },
-    keyupEvent4(){
-      if (this.request.dcCh) {
-        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
+    keyupEvent4() {
+
+
+      if (this.queryParam.dcch) {
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
       } else {
         this.projectData = this.projectData1.slice(0)
       }
+
+    },
+    ztChange(){
+      this.list=[]
+    },
+    bzClick(){
+
+      this.dictData.dwxxs= this.dwxxs.filter(fst=>fst.qy===this.queryParam.qy)
+      console.log(this.dictData.zyqs)
+    },
+    bzClick1(){
+      this.dictData.dwxxs1= this.dwxxs.filter(fst=>fst.qy===this.inParam.qy)
+      console.log(this.dictData.zyqs)
+    },
+    updates2(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+
+
+          selectRecords[i].qq = this.inParam.qy
+          selectRecords[i].dw = this.inParam.dw
+
+
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+    },
+    updates(type){
+
+
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          if(type==='1'){
+
+            selectRecords[i].slksrq = this.inParam.slks
+          }else if (type==='2'){
+            selectRecords[i].dmFkry = this.inParam.slry
+            selectRecords[i].dmFkrq = this.inParam.sljs
+          }
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+
+    activeRowMethod({ row, rowIndex }){
+      // if(row.zt==="01"){
+      //   return  true
+      // }else{
+      //   return  false
+      // }
+
+      return true;
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.dwxxs=res.data.dwxxs
+        this.zyrys=res.data.zyrys
+        this.dictData = res.data
+        this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
+      })
+    },
+    plClick(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          selectRecords[i].fkyy = this.queryParam.fkyy
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+    saveclick(){
+
+      if(this.queryParam.zt!=='02'){
+        return
+      }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
+      saveDmPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+
+    slpgclick(){
+      // 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)
     },
     getHeight() {
-      this.height = window.innerHeight - 160;
+      this.height = window.innerHeight - 190
     },
+
   }
-};
+}
 </script>
 <style lang="scss" scoped >
-.el-header {
-  margin: 0;
-  padding: 5px 0;
-  height: auto;
-}
-.el-container {
-  padding: 0;
-  margin: 0;
-}
-.el-main {
-  padding: 0;
-}
-.el-col {
-  padding: 0;
-}
-.el-aside {
-  background: #fff;
-  padding: 0;
-}
-.el-container {
-  padding: 0;
-}
-.el-row {
-  margin-bottom: 5px;
-}
-.el-row:last-child {
-  margin-bottom: 0;
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
 }
-.tableStyles {
+.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: 450px;
-  height: 250px;
+  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;
+
 }
-::v-deep .mytable .vxe-input {
-  display: flex !important;
+.mytable1{
+
 }
-::v-deep .el-form-item {
-  margin-bottom: 0px !important;
+.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;
 }
 
-::v-deep .el-input{
-  width: auto !important;
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
 }
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
 </style>
diff --git a/src/views/jhzxgl/yppFK.vue b/src/views/jhzxgl/yppFK.vue
index 348b09f..aaa0322 100644
--- a/src/views/jhzxgl/yppFK.vue
+++ b/src/views/jhzxgl/yppFK.vue
@@ -1,17 +1,33 @@
 <template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
   <el-container>
-    <el-header style="width: 100%;height: 35px">
-      <el-form ref="requestForm" :model="request" label-width="65px">
+    <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="3">
+
+          <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>
                   <vxe-input
-                    v-model="request.dcCh"
+                    v-model="queryParam.dcch"
                     placeholder="船号"
                     style="height: 28px;
-                    line-height: 28px; width: 150px;"
+                    line-height: 28px; width: 140px;"
                     suffix-icon="vxe-icon--search"
                     @keyup="keyupEvent4"
                     @focus="focusEvent4"
@@ -22,8 +38,7 @@
                     <vxe-grid
                       highlight-hover-row
                       height="auto"
-                      keep-source
-                      :custom-config="{ storage: true }"
+
                       :data="projectData"
                       :columns="projectColumns"
                       @cell-click="cellClickEvent"
@@ -36,48 +51,200 @@
                   </div>
                 </template>
               </vxe-pulldown>
+
+
             </el-form-item>
-          </el-col>
-          <el-col :span="3">
             <el-form-item label="批量:">
-              <el-input v-model="request.dcPl" type="search" placeholder="批量" ></el-input>
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="3">
             <el-form-item label="分段:">
-              <el-input v-model="request.dcFd" type="search" placeholder="分段" ></el-input>
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+            <el-form-item label="套料图:">
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
             </el-form-item>
+
+
+
+
+            <el-form-item label="区域:">
+
+              <el-select v-model="queryParam.qy" placeholder="区域" clearable  @change="bzClick" >
+                <el-option
+                  v-for="item in dictData.qys"
+                  :key="item.qy"
+                  :label="item.qy"
+                  :value="item.qy"
+                >
+                </el-option>
+              </el-select>
+              <el-select v-model="queryParam.dwh" placeholder="垛位" clearable>
+                <el-option
+                  v-for="item in dictData.dwxxs"
+                  :key="item.dwh"
+                  :label="item.dwh"
+                  :value="item.dwh"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+
           </el-col>
-          <el-col :span="4">
-            <el-form-item label="在建船只:" label-width="105px">
-              <el-checkbox v-model="request.zjcz" type="search" placeholder="合同号" ></el-checkbox>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
           </el-col>
-          <el-col :span="11" style="text-align: right">
-            <el-button type="primary" @click="initList()">查询</el-button>
-            <el-button type="success" @click="qtjc">齐套检查</el-button>
+        </el-row>
+        <el-row>
+
+          <el-col :span="20"  >
+
+          </el-col>
+
+
+
+
+
+          <!--            <span style="width:6%" >班组:</span>-->
+          <!--            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">-->
+          <!--              <el-option-->
+          <!--                v-for="item in this.dictData.resourcesCodes"-->
+          <!--                :key="item.resourcesCode"-->
+          <!--                :label="item.resourcesCode"-->
+          <!--                :value="item.resourcesCode"-->
+          <!--              >-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+
+          <!--            <span style="width:6%" >作业区:</span>-->
+          <!--            <el-select v-model="inParam.zyq" placeholder="作业区" clearable style="width: 15%" @change="bzClick1">-->
+          <!--              <el-option-->
+          <!--                v-for="item in this.dictData.zyqs"-->
+          <!--                :key="item.resourcesCode+item.zyq"-->
+          <!--                :label="item.resourcesCode+item.zyq"-->
+          <!--                :value="item.zyq"-->
+          <!--              >-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+
+          <!--            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" filterable >-->
+          <!--              <el-option-->
+          <!--                v-for="item in this.dictData.zyrys"-->
+          <!--                :key="item.id"-->
+          <!--                :label="item.resourcesCode+item.zyq+item.userName"-->
+          <!--                :value="item.userName"-->
+          <!--              >-->
+          <!--              </el-option>-->
+          <!--            </el-select>-->
+
+          <!--            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="打磨计划日期"/>-->
+          <!--            <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>-->
+          <!--            &lt;!&ndash;            <span style="width:6%" >反馈人员:</span>&ndash;&gt;-->
+          <!--            &lt;!&ndash;            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />&ndash;&gt;-->
+          <!--            &lt;!&ndash;            <span style="width:6%" >反馈日期:</span>&ndash;&gt;-->
+          <!--            &lt;!&ndash;            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>&ndash;&gt;-->
+          <!--            &lt;!&ndash;            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>&ndash;&gt;-->
+          <!--          </el-col>-->
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="slpgclick">报工</el-button>
+
+
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </el-header>
-    <Yppfk0 ref="yppfk0" />
+    <el-container  style="padding-top: 0px">
+      <el-container>
+        <el-main>
+          <div class="mytable">
+            <vxe-grid
+              id="id"
+              ref="xGrid"
+              border
+              resizable
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="list"
+              :scroll-y="{enabled: true}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
   </el-container>
 </template>
 
 <script>
-import {getCzplBase} from "@/api/sjzx/jcsj";
-import YppTq from "@/views/jhzxgl/components/YppTq.vue";
-import {getBfwz} from "@/api/jhzxgl/ypp";
-import Yppfk0 from "@/views/jhzxgl/components/Yppfk0.vue";
-
+import {
+  saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import {null2str} from "@/utils/rpkj";
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
+import {saveDmppxxb, getDmppxxbList, saveDmppxxbpg} from "@/api/jhzxgl/ypp";
 export default {
-  name: "Cgjhdh",
-  components: {Yppfk0, YppTq},
+  name:'Cgjhdh',
   data() {
     return {
-      yppTqShow:false,
-      height: "500px",
-      list:[],
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'02',
+        'lx':'d',
+        qgkw:'',
+        tlth:'',
+        qy:'',
+        dw:''
+      },
+      statusOptions: [
+        {
+          value: "02",
+          label: "未报工",
+        },
+        {
+          value: "03",
+          label: "已报工",
+        },
+
+
+      ],
+      inParam:{
+        qy:'',
+        dw:''
+      },
+      dwxxs:[],
+      zyqs:[],
+      zyrys:[],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
       projectColumns: [
         {field: 'cbbm', title: '船号',width: 110},
         { field: 'wgbs', title: '完工标识', width: 80,
@@ -86,122 +253,705 @@ export default {
           },
         },
       ],
-      qyList:[],
-      dwList:[],
-      bfwzList:[],
-      projectData:[],
-      request:{
-        dcCh:'',
-        dcPl:'',
-        dcFd:'',
-        zjcz:true
-      },
+
+      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,
+          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: 'wpfl', title: '物品分类', width: 60,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jldw', title: '计量单位', width: 60,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sl', title: '数量', width: 70,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+        { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dzjz', title: '大组极重', minWidth: "70",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xdb', title: 'X大板', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xskj', title: 'X数控件', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xpt', title: 'X平铁', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xyw', title: 'X压弯', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xxc', title: 'X型材', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'xtxc', title: 'X二次装T型材', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'ddb', title: 'D大板', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dqb', title: 'D曲板', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dxc', title: 'D型材T', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dsj', title: 'D散件', minWidth: "100",
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dgdh', title: '打磨工单号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dmsbbh', title: '打磨设备编号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmcd', title: '打磨打磨长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dmjhrq', title: '打磨计划日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dmXfry', title: '打磨派工人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmXfrq', title: '打磨派工日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dscry', title: '打磨生产人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+        { field: 'dmFkry', title: '打磨反馈人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmFkrq', title: '打磨反馈日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pgdh', title: '坡口工单号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkjhrq', title: '坡口计划日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pgdh', title: '坡口工单号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pksbbh', title: '坡口设备编号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pklx', title: '坡口类型', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkcd', title: '坡口长度', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pkXfry', title: '坡口派工人员', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkXfrq', title: '坡口派工日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pscry', title: '坡口生产人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkFkrq', title: '坡口反馈日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pkFkry', title: '坡口反馈人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgdh', title: '  曲工单号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qjgjhrq', title: '曲加工计划期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+        { field: 'qsbbh', title: '曲设备编号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+        { field: 'qscry', title: '曲生产人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+        { field: 'qjgXfry', title: '曲派工人员', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qjgXfrq', title: '曲派工日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qjgFkry', title: '曲反馈人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qjgFkrq', title: '曲反馈日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        //-------------------------------------------
+
+        // --------------------------------------------------------------
+
+
+        {
+          field: 'slfkry',
+          title: '上料反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slfkrq',
+          title: '上料反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwfkry',
+          title: '抛丸反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwfkrq',
+          title: '抛丸反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llfkry',
+          title: '理料反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llfkrq',
+          title: '理料反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+        {
+          field: 'hxfkrq',
+          title: '划线反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxfkry',
+          title: '划线反馈人员',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+        {
+          field: 'qgfkry',
+          title: '切割反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgfkrq',
+          title: '切割反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'sljhrq',
+          title: '上料计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwjhrq',
+          title: '抛丸计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'lljhrq',
+          title: '理料计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjhrq',
+          title: '划线计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjhrq',
+          title: '切割计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+
+
+      ]
     }
   },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
   created() {
-    window.addEventListener("resize", this.getHeight);
-    this.getHeight();
-    this.initProject()
-    this.initBfwz()
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
   },
   methods: {
-    qtjc(){
-      this.$refs.yppfk0.qtjc()
-    },
-    initList(){
-      this.$refs.yppfk0.initXqjh(this.request)
-    },
-    initBfwz(){
-      getBfwz().then(res=>{
-        this.bfwzList=res.data
-        const _qyList=[]
-        const _dwhList=[]
-        const table=this.$refs.tableRef
-        const qyColumn=table.getColumnByField('qy')
-        const dwColumn=table.getColumnByField('dwh')
-        this.bfwzList.forEach(item=>{
-          _qyList.push({label:item.qy,value:item.qy})
-          _dwhList.push({label:item.dwh,value:item.dwh,_parent:item.qy})
-        })
-        qyColumn.editRender.options=_qyList
-        dwColumn.editRender.options=_dwhList
-        this.qyList=_qyList;
-        this.dwList=_dwhList
-      })
-    },
-    initProject(){
-      getCzplBase({}).then(res=>{
-        this.projectData=res.data.cbbm
-      })
-    },
-    cellClickEvent({row}){
-      this.request.dcCh = row.cbbm
+
+    cellClickEvent({row}) {
+      this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
     },
-    focusEvent4(){
+    focusEvent4() {
       this.$refs.xDown4.showPanel()
     },
-    keyupEvent4(){
-      if (this.request.dcCh) {
-        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
+    keyupEvent4() {
+
+
+      if (this.queryParam.dcch) {
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
       } else {
         this.projectData = this.projectData1.slice(0)
       }
+
+    },
+    ztChange(){
+      this.list=[]
+    },
+    bzClick(){
+
+      this.dictData.dwxxs= this.dwxxs.filter(fst=>fst.qy===this.queryParam.qy)
+      console.log(this.dictData.zyqs)
+    },
+    bzClick1(){
+      this.dictData.dwxxs1= this.dwxxs.filter(fst=>fst.qy===this.inParam.qy)
+      console.log(this.dictData.zyqs)
+    },
+    updates2(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+
+
+          selectRecords[i].qq = this.inParam.qy
+          selectRecords[i].dw = this.inParam.dw
+
+
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+    },
+    updates(type){
+
+
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          if(type==='1'){
+
+            selectRecords[i].slksrq = this.inParam.slks
+          }else if (type==='2'){
+            selectRecords[i].dmFkry = this.inParam.slry
+            selectRecords[i].dmFkrq = this.inParam.sljs
+          }
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+
+    activeRowMethod({ row, rowIndex }){
+      // if(row.zt==="01"){
+      //   return  true
+      // }else{
+      //   return  false
+      // }
+
+      return true;
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.dwxxs=res.data.dwxxs
+        this.zyrys=res.data.zyrys
+        this.dictData = res.data
+        this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
+      })
+    },
+    plClick(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          selectRecords[i].fkyy = this.queryParam.fkyy
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+    saveclick(){
+
+      if(this.queryParam.zt!=='02'){
+        return
+      }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
+      saveDmPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+
+    slpgclick(){
+      // if(this.queryParam.zt!=="01"){
+      //   return
+      // }
+
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if (this.queryParam.zt==='02') {
+        this.$confirm('报工？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveDmppxxbpg(obj).then(res=>{
+            if(res.success){
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    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)
     },
     getHeight() {
-      this.height = window.innerHeight - 160;
+      this.height = window.innerHeight - 190
     },
+
   }
-};
+}
 </script>
 <style lang="scss" scoped >
-.el-header {
-  margin: 0;
-  padding: 5px 0;
-  height: auto;
-}
-.el-container {
-  padding: 0;
-  margin: 0;
-}
-.el-main {
-  padding: 0;
-}
-.el-col {
-  padding: 0;
-}
-.el-aside {
-  background: #fff;
-  padding: 0;
-}
-.el-container {
-  padding: 0;
-}
-.el-row {
-  margin-bottom: 5px;
-}
-.el-row:last-child {
-  margin-bottom: 0;
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
 }
-.tableStyles {
+.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: 450px;
-  height: 250px;
+  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;
+
 }
-::v-deep .mytable .vxe-input {
-  display: flex !important;
+.mytable1{
+
 }
-::v-deep .el-form-item {
-  margin-bottom: 0px !important;
+.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;
 }
 
-::v-deep .el-input{
-  width: auto !important;
+.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 39296fe..603ea81 100644
--- a/src/views/jhzxgl/yppGL.vue
+++ b/src/views/jhzxgl/yppGL.vue
@@ -1,14 +1,30 @@
 <template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
   <el-container>
-    <el-header style="width: 100%">
-      <el-form ref="requestForm" :model="request" label-width="65px">
+    <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="3">
+
+          <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>
                   <vxe-input
-                    v-model="request.dcCh"
+                    v-model="queryParam.dcch"
                     placeholder="船号"
                     style="height: 28px;
                     line-height: 28px; width: 140px;"
@@ -35,117 +51,218 @@
                   </div>
                 </template>
               </vxe-pulldown>
+
+
             </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label="区域:">
-              <el-select v-model="request.qy" placeholder="区域" clearable>
-                <el-option
-                  v-for="item in qyList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item label="垛位:">
-              <el-select v-model="request.dwh" placeholder="垛位" clearable>
-                <el-option
-                  v-for="item in dwList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="2">
-            <el-form-item label="在建船只:" label-width="105px">
-              <el-checkbox v-model="request.zjcz" type="search" placeholder="合同号" ></el-checkbox>
+            <el-form-item label="套料图:">
+              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="2">
-              <el-select v-model="pl.qy" placeholder="区域" clearable>
+
+
+
+
+            <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 qyList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  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-select v-model="pl.dwh" placeholder="垛位" clearable>
-                <el-option
-                  v-for="item in dwList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
           </el-col>
-          <el-col :span="1" style="text-align: left">
-            <el-button type="primary" @click="plsr">批量</el-button>
+        </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>
-          <el-col :span="8" style="text-align: right">
-            <el-button type="primary" @click="initList">查询</el-button>
-            <el-button type="primary" @click="tq">提取</el-button>
-            <el-button type="success" @click="save">保存</el-button>
+
+
+
+
+
+<!--            <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: 10px">
+    <el-container  style="padding-top: 0px">
       <el-container>
         <el-main>
           <div class="mytable">
             <vxe-grid
               id="id"
+              ref="xGrid"
               border
-              ref="tableRef"
-              keep-source
               resizable
+              keep-source
+              :align="'center'"
               :height="height"
               :auto-resize="true"
               :columns="tableColumn"
+              highlight-current-row
               :data="list"
-              :edit-config="{ trigger: 'click', mode: 'row', showStatus: true }"
-              :custom-config="{ storage: true }"
-              :scroll-y="{ enabled: true }"
+              :scroll-y="{enabled: true}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
               highlight-hover-row
+              show-overflow
+              show-header-overflow
+
             >
+
+
             </vxe-grid>
           </div>
+
+
         </el-main>
       </el-container>
     </el-container>
-    <YppTq ref="yppTqRef" @add="add" />
   </el-container>
 </template>
 
 <script>
-import {getCzplBase} from "@/api/sjzx/jcsj";
-import YppTq from "@/views/jhzxgl/components/YppTq.vue";
-import {checkBfwz, getBfwz, getDmppxxbList, saveDmppxxb} from "@/api/jhzxgl/ypp";
-
+import {
+  saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import XEUtils from 'xe-utils'
+import {null2str} from "@/utils/rpkj";
+import { getToken } from '@/utils/auth'
+import { startLoading, endLoading } from '@/utils'
+import { Message } from 'element-ui'
+import {saveDmppxxb,getDmppxxbList} from "@/api/jhzxgl/ypp";
 export default {
-  name: "Cgjhdh",
-  components: {YppTq},
+  name:'Cgjhdh',
   data() {
     return {
-      yppTqShow:false,
-      height: "500px",
-      list:[],
-      pl:{
-        dwh:'',
-        qy:''
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01',
+        'lx':'d',
+        qgkw:'',
+        tlth:'',
+        qy:'',
+        dw:''
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "未配盘",
+        },
+        {
+          value: "02",
+          label: "已配盘·",
+        },
+
+
+      ],
+      inParam:{
+        qy:'',
+        dw:''
       },
+      dwxxs:[],
+      zyqs:[],
+      zyrys:[],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
       projectColumns: [
         {field: 'cbbm', title: '船号',width: 110},
         { field: 'wgbs', title: '完工标识', width: 80,
@@ -154,300 +271,697 @@ export default {
           },
         },
       ],
-      qyList:[],
-      dwList:[],
-      bfwzList:[],
-      projectData:[],
-      projectData1:[],
-      request:{
-        dcCh:'',
-        dwh:'',
-        qy:'',
-        zjcz:true
-      },
+
       tableColumn: [
-        {type: "checkbox", width: "50", align: "center", fixed: "left",},
-        {type: "seq", width: "50", title: "序号", align: "center", fixed: "left",},
-        { field: 'dcCh', title: '船只', width: 120,align: "center",
+        { 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: 'dcPl', title: '批量', width: 120,align: "center",
+
+        { field: 'pl', title: '批量', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcFd', title: '分段号', width: 120,align: "center",
+
+        { field: 'fd', title: '分段', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcTh', title: '图号', width: 120,align: "center",
+
+        { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcZl', title: '组立', width: 120,align: "center",
+
+        { field: 'zl', title: '组立', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcTz', title: '特征', width: 120,align: "center",
+
+        { field: 'tlth', title: '套料图号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcYj', title: '依据', width: 120,align: "center",
+
+
+
+        { field: 'ljbh', title: '零件编号', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcYs', title: '页数', width: 120,align: "center",
+
+        { field: 'ljmc', title: '零件名称', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcPb', title: '拼板', width: 120,align: "center",
+
+        { field: 'ljgg', title: '零件规格', width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcLph', title: '炉批号', width: 120,align: "center",
+
+        { field: 'ljcz', title: '零件材质', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcTpbh', title: '托盘编号', width: 120,align: "center",
+
+        { field: 'wpfl', title: '物品分类', width: 60,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'dcTpmc', title: '托盘名称', width: 120,align: "center",
+
+        { field: 'jldw', title: '计量单位', width: 60,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'jldw1', title: '单价重量计量单位', width: 120,align: "center",
+
+        { 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: 'wpmc', title: '物品名称', width: 120,align: "center",
+
+
+
+        { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'wpgg', title: '规格', width: 120,align: "center",
+
+        { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'wpxh', title: '材质', width: 120,align: "center",
+
+
+        { field: 'dzjz', title: '大组极重', minWidth: "70",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'qy', title: '区域', width: 120,align: "center",
+        { field: 'zxfdxq', title: '总装部最新分段需求期', minWidth: "90",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
-          editRender:{name:'$select',options:[],props:{clearable:true},events:{change:this.bfwzChanged}}
         },
-        { field: 'dwh', title: '垛位号', width: 120,align: "center",
+        { field: 'xzglxq', title: '钢料需求（小组）', minWidth: "100",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
-          editRender:{name:'$select',options:[],props:{clearable:true},events:{change:this.bfwzChanged}}
         },
-        { field: 'wpjb', title: '物品级别', width: 120,align: "center",
+        { field: 'dzglxq', title: '钢料需求（大组）', minWidth: "100",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'wpflm', title: '物品分类', width: 120,align: "center",
+        { field: 'xdb', title: 'X大板', minWidth: "100",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'abclx', title: 'ABC分类', width: 120,align: "center",
+        { field: 'xskj', title: 'X数控件', minWidth: "100",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'gzlx', title: '加工进度', width: 120,align: "center",
+        { field: 'xpt', title: 'X平铁', minWidth: "100",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'ylzd1', title: '配套表类型', width: 120,align: "center",
+        { field: 'xyw', title: 'X压弯', minWidth: "100",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'lcm1', title: '流程码', width: 120,align: "center",
+        { field: 'xxc', title: 'X型材', minWidth: "100",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'zt', title: '状态', width: 120,align: "center",
+        { field: 'xtxc', title: 'X二次装T型材', minWidth: "100",
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'tpxx', title: '托盘信息', width: 120,align: "center",
+        { 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: {
+    ...mapGetters(['name', 'bmbm'])
+  },
   created() {
-    window.addEventListener("resize", this.getHeight);
-    this.getHeight();
-    this.initProject()
-    this.initBfwz()
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
   },
   methods: {
-    save(){
-      const {insertRecords,updateRecords}=this.$refs.tableRef.getRecordset()
-      const list=[...insertRecords,...updateRecords]
-      if (list.length>0){
-        for (const item of list) {
-          if (!item.dwh){
-            this.$message.error('请选择摆放位置');
-            return;
-          }
-        }
-        saveDmppxxb(list).then(res=>{
-          this.$message.success('保存成功')
-          this.$refs.tableRef.reloadData(list)
-        })
-      }
+
+    cellClickEvent({row}) {
+      this.queryParam.dcch = row.cbbm
+      this.$refs.xDown4.hidePanel()
     },
-    plsr(){
-      const data = this.$refs.tableRef.getCheckboxRecords();
-      if(data.length<=0){
-        this.$message.warning('请先选择要批量操作的数据')
-        return;
+    focusEvent4() {
+      this.$refs.xDown4.showPanel()
+    },
+    keyupEvent4() {
+
+
+      if (this.queryParam.dcch) {
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
       }
-      if (!this.pl.dwh||!this.pl.qy){
-        this.$message.warning('请选择摆放位置');
-        return;
+
+    },
+    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)
       }
-      data.forEach(item=>{
-        item.dwh=this.pl.dwh
-        item.qy=this.pl.qy
-      })
     },
-    bfwzChanged({row}){
-      checkBfwz([row]).then(res=>{
-        if (!res.data.success){
-          this.$message.warning(res.message)
+    updates(type){
+
+
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          if(type==='1'){
+
+            selectRecords[i].slksrq = this.inParam.slks
+          }else if (type==='2'){
+            selectRecords[i].dmFkry = this.inParam.slry
+            selectRecords[i].dmFkrq = this.inParam.sljs
+          }
+
         }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+
+    activeRowMethod({ row, rowIndex }){
+      // if(row.zt==="01"){
+      //   return  true
+      // }else{
+      //   return  false
+      // }
+
+      return true;
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        console.log(res.data)
+        this.zyqs=res.data.zyqs
+        this.dwxxs=res.data.dwxxs
+        this.zyrys=res.data.zyrys
+        this.dictData = res.data
+        this.projectData=res.data.cbbm
+        this.projectData1=res.data.cbbm
       })
     },
-    add(list){
-      this.$refs.tableRef.insertAt(list)
+    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)
+      }
+
     },
-    initList(){
-      if (this.request.dcCh === '') {
-        this.$message.warning('选择船号')
+    saveclick(){
+
+      if(this.queryParam.zt!=='02'){
         return
       }
-      getDmppxxbList(this.request).then(res=>{
-        this.list=res.data
+      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()
+        }
       })
     },
-    tq(){
-      this.$refs.yppTqRef.show()
-    },
-    initBfwz(){
-      getBfwz().then(res=>{
-        this.bfwzList=this.groupBy(res.data,(item)=>{
-          return item.qy
-        })
-        console.log(this.bfwzList)
-        const _qyList=[]
-        const _dwhList=[]
-        const table=this.$refs.tableRef
-        const qyColumn=table.getColumnByField('qy')
-        const dwColumn=table.getColumnByField('dwh')
-        Object.keys(this.bfwzList).forEach(key=>{
-          const list=this.bfwzList[key];
-          const _key=key.replaceAll('"','');
-          _qyList.push({label:_key,value:_key})
-          list.forEach(item=>{
-            _dwhList.push({label:item.dwh,value:item.dwh,_parent:item.qy})
+
+    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()
+            }
           })
+
         })
+      }
+
 
-        qyColumn.editRender.options=_qyList
-        dwColumn.editRender.options=_dwhList
-        this.qyList=_qyList;
-        this.dwList=_dwhList
-      })
     },
-    groupBy(obj,fn){
-      const groups={};
-      obj.forEach(o=>{
-        const group = JSON.stringify(fn(o));
-        groups[group] = groups[group] || [];
-        groups[group].push(o);
+    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()
+          }
+        })
+
       })
-      return groups;
+      // }
+
+
     },
-    initProject(){
-      getCzplBase({}).then(res=>{
-        this.projectData=res.data.cbbm
-        this.projectData1=res.data.cbbm
+    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)
+        }
+
       })
     },
-    cellClickEvent({row}){
-      this.request.dcCh = row.cbbm
-      this.$refs.xDown4.hidePanel()
-    },
-    focusEvent4(){
-      this.$refs.xDown4.showPanel()
-    },
-    keyupEvent4(){
-      console.log(this.request.dcCh)
-      if (this.request.dcCh) {
-        console.log(this.request.dcCh)
-        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
-      } else {
-        this.projectData = this.projectData1.slice(0)
-      }
+    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 - 160;
+      this.height = window.innerHeight - 190
     },
+
   }
-};
+}
 </script>
 <style lang="scss" scoped >
-.el-header {
-  margin: 0;
-  padding: 5px 0;
-  height: auto;
-}
-.el-container {
-  padding: 0;
-  margin: 0;
-}
-.el-main {
-  padding: 0;
-}
-.el-col {
-  padding: 0;
-}
-.el-aside {
-  background: #fff;
-  padding: 0;
-}
-.el-container {
-  padding: 0;
-}
-.el-row {
-  margin-bottom: 5px;
-}
-.el-row:last-child {
-  margin-bottom: 0;
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
 }
-.tableStyles {
+.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: 450px;
-  height: 250px;
+  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{
+
 }
-::v-deep .mytable .vxe-input {
-  display: flex !important;
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
 }
-::v-deep .el-form-item {
-  margin-bottom: 0px !important;
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
 }
 
-::v-deep .el-input{
-  width: auto !important;
+.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>