diff --git a/src/api/jhzx/ylxx.js b/src/api/jhzx/ylxx.js
index a3cd482..2bd9430 100644
--- a/src/api/jhzx/ylxx.js
+++ b/src/api/jhzx/ylxx.js
@@ -1,4 +1,5 @@
 import request from '@/utils/request'
 
 export function getYlList(data) {return request({url: '/mpYlxxp/getYlList', method: 'post', data})}
+export function czzjList(data) {return request({url: '/mpYlxxp/czzjList', method: 'post', data})}
 
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index 69c4def..af1ab3d 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -20,15 +20,37 @@
             </el-form-item>
 
             <el-form-item label="船号:">
-              <el-select v-model="queryParam.dcch" placeholder="船号" clearable >
-                <el-option
-                  v-for="item in this.dictData.cbbm"
-                  :key="item.cbbm"
-                  :label="item.cbbm"
-                  :value="item.cbbm"
-                >
-                </el-option>
-              </el-select>
+              <vxe-pulldown ref="xDown6" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent6"
+                    @focus="focusEvent6"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData6"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent6"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
 
 
 
@@ -115,19 +137,48 @@
 
 
 
-          <el-select v-model="inParam.dcch" placeholder="需求船号" clearable >
-            <el-option
-              v-for="item in this.dictData.cbbm"
-              :key="item.cbbm"
-              :label="item.cbbm"
-              :value="item.cbbm"
-            >
-            </el-option>
-          </el-select>
-
+<!--          <el-select v-model="inParam.dcch" placeholder="需求船号" clearable >-->
+<!--            <el-option-->
+<!--              v-for="item in this.dictData.cbbm"-->
+<!--              :key="item.cbbm"-->
+<!--              :label="item.cbbm"-->
+<!--              :value="item.cbbm"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
 
 
 
+          <vxe-pulldown ref="xDown5" transfer >
+            <template #default>
+              <vxe-input
+                v-model="inParam.dcch"
+                placeholder="需求船号"
+                style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                suffix-icon="vxe-icon--search"
+                @keyup="keyupEvent5"
+                @focus="focusEvent5"
+              />
+            </template>
+            <template #dropdown>
+              <div class="my-dropdown  mytable " style="width: 250px">
+                <vxe-grid
+                  highlight-hover-row
+                  height="auto"
+
+                  :data="projectData5"
+                  :columns="projectColumns"
+                  @cell-click="cellClickEvent5"
+                  show-overflow
+                >
+                  <template #wgbsEdit="{ row}">
+                    <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                  </template>
+                </vxe-grid>
+              </div>
+            </template>
+          </vxe-pulldown>
 
 
 
@@ -328,6 +379,8 @@ export default {
       dictData:{},
       height: '500px',
       projectData:[],
+      projectData5:[],
+      projectData6:[],
       projectData1:[],
       projectColumns: [
         {field: 'cbbm', title: '船号',width: 110},
@@ -418,23 +471,36 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
+        // {
+        //   field: 'slkcxx',
+        //   title: '上料库存信息',
+        //   width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
         {
-          field: 'slkcxx',
-          title: '上料库存信息',
+          field: 'slycldw',
+          title: '上料预处理垛位',editRender: {
+            name: '$select', options: [],
+            optionProps: {value: 'id', label: 'name'},
+            props: {clearable: true}
+            , events: {change: this.selectChange}
+          },
           width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
-          field: 'slycldw',
-          title: '上料预处理垛位',
+          field: 'slyclcs',
+          title: '上料预处理层数',editRender: { name: 'input' },
           width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
+
         {
           field: 'slpgry',
-          title: '上料派工人',
+          title: '上料派工人',editRender: { name: 'input' },
           width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -720,6 +786,43 @@ export default {
       }
 
     },
+
+    cellClickEvent5({row}) {
+      this.inParam.dcch = row.cbbm
+      this.$refs.xDown5.hidePanel()
+    },
+    focusEvent5() {
+      this.$refs.xDown5.showPanel()
+    },
+    keyupEvent5() {
+
+
+      if (this.inParam.dcch) {
+        this.projectData5 = this.projectData1.filter(row => row.cbbm.indexOf(this.inParam.dcch.toUpperCase()) > -1)
+      } else {
+        this.projectData5 = this.projectData1.slice(0)
+      }
+
+    },
+    keyupEvent6() {
+
+
+      if (this.queryParam.dcch) {
+        console.log(111)
+        this.projectData6 = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+      } else {
+        this.projectData6 = this.projectData1.slice(0)
+      }
+
+    },
+    cellClickEvent6({row}) {
+      this.queryParam.dcch = row.cbbm
+      this.$refs.xDown6.hidePanel()
+    },
+    focusEvent6() {
+      this.$refs.xDown6.showPanel()
+    },
+
     ztChange(){
       this.list=[]
     },
@@ -806,6 +909,8 @@ export default {
       getPgdBase({}).then(res=>{
         this.dictData = res.data
         this.projectData=res.data.cbbm
+        this.projectData5=res.data.cbbm
+        this.projectData6=res.data.cbbm
         this.projectData1=res.data.cbbm
 
 
@@ -825,7 +930,8 @@ export default {
         const pwwz = this.$refs.xGrid.getColumnByField('pwwz')
         pwwz.editRender.options = this.dictData.pwwz
 
-
+        const slycldw = this.$refs.xGrid1.getColumnByField('slycldw')
+        slycldw.editRender.options = this.dictData.ycldws
 
 
 
@@ -899,13 +1005,13 @@ export default {
       })
     },
 
-    initList() {
-      this.bdbs=""
-      // if (this.queryParam.dcch === '') {
-      //   this.$message.warning('选择船只编号')
-      //   return
-      // }
-      getKcAndSljh(this.queryParam).then((res) => {
+    async initList() {
+        this.bdbs=""
+      if (this.queryParam.dcch === '') {
+       // this.queryParam.dcch=aaa
+
+      }
+      await  getKcAndSljh(this.queryParam).then((res) => {
         this.tableOne = res.data.slkcs
         console.log(this.tableOne)
 
@@ -937,6 +1043,7 @@ export default {
         if (this.$refs.xGrid1) {
           this.$refs.xGrid1.loadData(res.data)
           console.log(this.list)
+          this.initList()
         }
 
       })
@@ -946,26 +1053,31 @@ export default {
       if(this.queryParam.rqopt!=='01'){
         return
       }
-
-
-      if(this.inParam.pl !=='') {
-        this.queryParam.xqdcch = this.inParam.dcch
-      }
+      //  this.bdbs='01' 核对 标识 等于 01 不能继续核对
       if(this.inParam.dcch !==''){
-        this.queryParam.xqdcch=this.inParam.dcch
-        this.getlist1().then(res=>{
+        this.queryParam.dcch=this.inParam.dcch
+      }
+      this.initList().then(res=>{
+        if(this.inParam.pl !=='') {
+          this.queryParam.xqpl = this.inParam.pl
+        }
+        if(this.inParam.dcch !==''){
+          this.queryParam.xqdcch=this.inParam.dcch
+          this.getlist1().then(res=>{
+            this.hd()
+          })
+
+        }else{
           this.hd()
-        })
+        }
 
-      }else{
-        this.hd()
-      }
+        // if(this.bdbs=='01'){
+        //   this.$message({ message: '核对结果未保存，重新查询后进行核对', type: 'warning' })
+        //   return
+        // }
+        console.log(this.$refs.xGrid.getTableData())
+      })
 
-      // if(this.bdbs=='01'){
-      //   this.$message({ message: '核对结果未保存，重新查询后进行核对', type: 'warning' })
-      //   return
-      // }
-      console.log(this.$refs.xGrid.getTableData())
 
     },
 
@@ -978,13 +1090,15 @@ export default {
         "dw":this.inParam.dw
       }).then((res) => {
         if(res.success){
-
+          this.bdbs='01'
           // 与现有数据进行比对
           let array1 = this.$refs.xGrid.getTableData().visibleData
           let array2=res.data.slkcs
           console.log(array1)
           console.log(array2)
           array1.forEach(item1 => {
+            this.$refs.xGrid.setCheckboxRow(item1,false)
+
             array2.forEach(item2 => {
               if (item1.ckh === item2.ckh  &&  item1.wph === item2.wph  && item1.kwh === item2.kwh && item1.nbsbm === item2.nbsbm) {
                 //console.log(`Match found: ${item1.name} and ${item2.name}`);
@@ -1019,7 +1133,9 @@ export default {
                 item1.slhth = item2.dcFd
                 item1.slwlh = item2.wph
                 item1.slkcdw = item2.kwh
-                item1.slycldw = item1.slycldw
+                console.log(item1.slycldw)
+                item1.slycldw = this.inParam.dw
+                item1.slyclcs = 1
 
                 this.$refs.xGrid1.setCheckboxRow(item1, true)
                 return
@@ -1032,6 +1148,8 @@ export default {
 
 
       })
+
+
     },
     saveOne(){
       if(this.queryParam.rqopt!=='01'){
diff --git a/src/views/jhzxgl/ylxx.vue b/src/views/jhzxgl/ylxx.vue
index 80c1c46..fd22c3b 100644
--- a/src/views/jhzxgl/ylxx.vue
+++ b/src/views/jhzxgl/ylxx.vue
@@ -133,7 +133,7 @@ import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
 export default {
-  name:'HxjhD',
+  name:'Ylxx',
   data() {
     return {
       queryParam: {
@@ -205,13 +205,13 @@ export default {
         {
           field: 'dcZl',
           title: '组立',
-          width: 120,
+          width: 120,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
           field: 'dcHx',
-          title: '划线',
+          title: '划线',formatter: ['dictFormat','HXLX'],
           width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
diff --git a/src/views/kcwz/wzkctj.vue b/src/views/kcwz/wzkctj.vue
index e0acfc6..56c6151 100644
--- a/src/views/kcwz/wzkctj.vue
+++ b/src/views/kcwz/wzkctj.vue
@@ -215,6 +215,7 @@ export default {
         //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
         // { field: 'zt', title: '状态',width: 80,
         //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+
         { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
@@ -350,14 +351,29 @@ export default {
         { type: 'seq', width: 40, title: '序号' }, // 1
         // { title: '操作', width: 50, slots: { default: 'operation' }, fixed: 'right' },
         {
-          title: '小合同号',
+          title: '入库日期',
           width: "120px",
-          field: 'gcddh',
+          field: 'rkrq',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '车号',
+          width: "100px",
+          field: 'dcTpbh',
 
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
+        {
+          title: '合同号',
+          width: "120px",
+          field: 'dcFd',
+
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
         {
           title: '期量',
           width: "90px",
@@ -366,6 +382,16 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '小合同号',
+          width: "120px",
+          field: 'gcddh',
+
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
+
+
 
         {
           title: '船号',
@@ -528,30 +554,7 @@ export default {
           filterRender: { name: 'FilterCombination' },
         },
 
-        {
-          title: '入库日期',
-          width: "120px",
-          field: 'rkrq',
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        {
-          title: '车号',
-          width: "100px",
-          field: 'dcTpbh',
-
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
-        {
-          title: '合同号',
-          width: "120px",
-          field: 'dcFd',
 
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' },
-        },
         {
           title: '生产id',
           width: "120px",
diff --git a/src/views/zl/czzjgz.vue b/src/views/zl/czzjgz.vue
index e69de29..a430c13 100644
--- a/src/views/zl/czzjgz.vue
+++ b/src/views/zl/czzjgz.vue
@@ -0,0 +1,619 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="18">
+
+
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.dcpl" type="search" placeholder="批量" ></el-input>
+              -
+              <el-input v-model="queryParam.dcpl1" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <!--            <el-form-item label="分段:">-->
+            <!--              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>-->
+            <!--            </el-form-item>-->
+
+
+
+
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :span="20"  >
+
+
+
+
+
+
+
+
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <!--              <el-button type="success" @click="slpgclick">派工</el-button>-->
+              <!--              <el-button type="success" @click="xdClick">接收</el-button>-->
+              <!--              <el-button type="success" @click="saveclick">反馈</el-button>-->
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-header>
+    <el-container  style="padding-top: 0px">
+      <el-container>
+        <el-main>
+          <div class="mytable">
+            <vxe-grid
+              id="id"
+              ref="xGrid"
+              border
+              resizable
+              keep-source
+              :align="'center'"
+              :height="height"
+              :auto-resize="true"
+              :columns="tableColumn"
+              highlight-current-row
+              :data="list"
+              :scroll-y="{enabled: true}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+  getPgdBase,
+} from '@/api/jhzxgl/pgd'
+import {
+  getYlList,czzjList
+} from '@/api/jhzx/ylxx'
+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'
+export default {
+  name:'Czzjgz',
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        dcpl1:'',
+        dcpl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "派工",
+        },
+        {
+          value: "03",
+          label: "接收",
+        },
+        {
+          value: "04",
+          label: "反馈",
+        },
+      ],
+      inParam:{
+        slry:'',
+        slks:'',
+        sljs:'',
+        dw:'',
+        scry:'',
+        scdw:''
+      },
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+
+      tableColumn: [
+
+        { type: 'seq', width: 40, title: '序号' },
+        {
+          field: 'DC_CH',
+          title: '船号',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'DC_PL',
+          title: '批量',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'DC_TH',
+          title: '纸带号',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'WPH',
+          title: '零件号',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'WPMC',
+          title: '零件名称',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'WPGG',
+          title: '规格',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'WPXH',
+          title: '材质',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'DHSL',
+          title: '数量',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'sjksrqg',
+          title: '切割日期',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'DC_LPH',
+          title: '炉批号',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'ZBSH',
+          title: '质保书号',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'gdh',
+          title: '购单号',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'ylzd2',
+          title: '交货状态',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'GG',
+          title: '质保书规格',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'CZ',
+          title: '质保书材质',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'zjzt',
+          title: '证书状态',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'DC_PB',
+          title: '整理状态',
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+
+
+
+
+
+
+
+
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
+  },
+  methods: {
+
+    cellClickEvent({row}) {
+      this.queryParam.dcch = row.cbbm
+      this.$refs.xDown4.hidePanel()
+    },
+    focusEvent4() {
+      this.$refs.xDown4.showPanel()
+    },
+    keyupEvent4() {
+
+
+      if (this.queryParam.dcch) {
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+      } else {
+        this.projectData = this.projectData1.slice(0)
+      }
+
+    },
+    ztChange(){
+      this.list=[]
+    },
+    bzClick(){
+      console.log(this.dictData.gxry)
+      console.log(this.inParam.scdw)
+      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      console.log(this.dictData.gxry)
+    },
+    updates2(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+
+
+          selectRecords[i].pscdw = this.inParam.scdw
+          selectRecords[i].pscry = this.inParam.scry
+
+
+        }
+        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].pkFkry = this.inParam.slry
+            selectRecords[i].pkFkrq = 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.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!=='03'){
+        return
+      }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
+      savePkPgdFk(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(() =>{
+          savePkPgdXdBack(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '取消派工成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }else if (this.queryParam.zt==='01') {
+        this.$confirm('派工？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          savePkPgdXd(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(() =>{
+        savePkPgdJs(obj).then(res=>{
+          if(res.success){
+            this.$message({ message: '接收成功', type: 'success' })
+            this.initList()
+          }
+        })
+
+      })
+      // }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      czzjList(this.queryParam).then((res) => {
+        console.log(res.data)
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>