From b35aeb19716da4da404cd9722bfc28405e8afecc Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Mon, 4 Dec 2023 16:06:19 +0800
Subject: [PATCH] pgd

---
 src/api/jhzxgl/pgd.js       |  27 ++
 src/views/jhzxgl/dhqdFK.vue | 498 +++++++++++++++++++++++++++++++
 src/views/jhzxgl/dmjhD.vue  | 566 +++++++++++++++++++++++++++++++++++
 src/views/jhzxgl/dmjhFK.vue | 566 +++++++++++++++++++++++++++++++++++
 src/views/jhzxgl/pkjhD.vue  | 571 +++++++++++++++++++++++++++++++++++
 src/views/jhzxgl/pkjhFK.vue | 571 +++++++++++++++++++++++++++++++++++
 src/views/jhzxgl/pwjhFK.vue | 531 +++++++++++++++++++++++++++++++++
 src/views/jhzxgl/qgjhFK.vue | 567 +++++++++++++++++++++++++++++++++++
 src/views/jhzxgl/qmjhD.vue  |  16 +-
 src/views/jhzxgl/qmjhFK.vue | 580 ++++++++++++++++++++++++++++++++++++
 src/views/jhzxgl/sljhFK.vue | 549 ++++++++++++++++++++++++++++++++++
 src/views/jhzxgl/tzjhFK.vue | 484 ++++++++++++++++++++++++++++++
 src/views/sjzx/bclqCX1.vue  |  45 ++-
 13 files changed, 5559 insertions(+), 12 deletions(-)
 create mode 100644 src/views/jhzxgl/dhqdFK.vue
 create mode 100644 src/views/jhzxgl/dmjhD.vue
 create mode 100644 src/views/jhzxgl/dmjhFK.vue
 create mode 100644 src/views/jhzxgl/pkjhD.vue
 create mode 100644 src/views/jhzxgl/pkjhFK.vue
 create mode 100644 src/views/jhzxgl/pwjhFK.vue
 create mode 100644 src/views/jhzxgl/qgjhFK.vue
 create mode 100644 src/views/jhzxgl/qmjhFK.vue
 create mode 100644 src/views/jhzxgl/sljhFK.vue
 create mode 100644 src/views/jhzxgl/tzjhFK.vue

diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js
index 67ced14..589c518 100644
--- a/src/api/jhzxgl/pgd.js
+++ b/src/api/jhzxgl/pgd.js
@@ -36,3 +36,30 @@ export function saveQgPgdFk(data) {return request({url: '/pgdQgjh/saveQgPgdFk',
 
 
 
+
+export function getQmPgd(data) {return request({url: '/pgdQmjh/getQmPgd', method: 'post', data})}
+export function saveQmPgdXd(data) {return request({url: '/pgdQmjh/saveQmPgdXd', method: 'post', data})}
+export function saveQmPgdXdBack(data) {return request({url: '/pgdQmjh/saveQmPgdXdBack', method: 'post', data})}
+export function saveQmPgdFk(data) {return request({url: '/pgdQmjh/saveQmPgdFk', method: 'post', data})}
+
+
+
+export function getPkPgd(data) {return request({url: '/pgdPkjh/getPkPgd', method: 'post', data})}
+export function savePkPgdXd(data) {return request({url: '/pgdPkjh/savePkPgdXd', method: 'post', data})}
+export function savePkPgdXdBack(data) {return request({url: '/pgdPkjh/savePkPgdXdBack', method: 'post', data})}
+export function savePkPgdFk(data) {return request({url: '/pgdPkjh/savePkPgdFk', method: 'post', data})}
+
+
+export function getDmPgd(data) {return request({url: '/pgdDmjh/getDmPgd', method: 'post', data})}
+export function saveDmPgdXd(data) {return request({url: '/pgdDmjh/saveDmPgdXd', method: 'post', data})}
+export function saveDmPgdXdBack(data) {return request({url: '/pgdDmjh/saveDmPgdXdBack', method: 'post', data})}
+export function saveDmPgdFk(data) {return request({url: '/pgdDmjh/saveDmPgdFk', method: 'post', data})}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/jhzxgl/dhqdFK.vue b/src/views/jhzxgl/dhqdFK.vue
new file mode 100644
index 0000000..f6f0aef
--- /dev/null
+++ b/src/views/jhzxgl/dhqdFK.vue
@@ -0,0 +1,498 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+  getDhPgd,
+  saveDhPgdFk,
+  saveDhPgdXd,
+  saveDhPgdXdBack,
+  getPgdBase
+} 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'
+export default {
+  name:'DhqdFK',
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dhqdh', title: '订货清单号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpcz', title: '物品材质', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hd', title: '厚度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kd', title: '宽度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'cd', title: '长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xqsl', title: '数量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'slxqrq', title: '上料需求日期', width: 100,
+          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: 'qfxqrqdz', title: '前方需求大组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hth', title: '合同号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xhth', title: '小合同号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dhsl', title: '到货数量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'cgsl', title: '采购数量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fkry', title: '反馈人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', title: '反馈原因', width: 100, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzry', title: '编制人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
+  },
+  methods: {
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveDhPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveDhPgdXdBack(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '取消下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }else  {
+        this.$confirm('下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveDhPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getDhPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/dmjhD.vue b/src/views/jhzxgl/dmjhD.vue
new file mode 100644
index 0000000..b246a44
--- /dev/null
+++ b/src/views/jhzxgl/dmjhD.vue
@@ -0,0 +1,566 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</el-button>
+              <el-button type="success" @click="Choice">取自</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+    <GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
+  </el-container>
+</template>
+
+<script>
+import {
+getQgPgd,
+  saveQgPgdFk,
+  saveQgPgdXd,
+  saveQgPgdXdBack,
+
+  getPgdBase
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
+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:'DmjhD',
+  components: {GxsqAdd},
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      flag:false,
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tlth', title: '套料图号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          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: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljmc', title: '零件名称', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljgg', title: '零件规格', width: 120,
+          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: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jldw', title: '计量单位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sl', title: '数量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmjhrq', 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: 'qfxqrqdz', title: '前方需求大组期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'gylx', title: '工艺路线', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmfzry', title: '打磨负责人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmsbbh', title: '打磨设备编号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmcd', title: '打磨长度', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmry', title: '打磨人员', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmksrq', title: '打磨开始日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmjsrq', title: '打磨结束日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzry', title: '编制人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkry', title: '反馈人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', 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: {
+    Choice() {
+      this.$refs.gxsqAdd.show()
+    },
+    callback(obj, inputFive) {
+
+    //  this.loadData()
+
+    },
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveQgPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        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(() =>{
+          saveQgPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getQgPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/dmjhFK.vue b/src/views/jhzxgl/dmjhFK.vue
new file mode 100644
index 0000000..1c55c9d
--- /dev/null
+++ b/src/views/jhzxgl/dmjhFK.vue
@@ -0,0 +1,566 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</el-button>
+              <el-button type="success" @click="Choice">取自</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+    <GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
+  </el-container>
+</template>
+
+<script>
+import {
+getQgPgd,
+  saveQgPgdFk,
+  saveQgPgdXd,
+  saveQgPgdXdBack,
+
+  getPgdBase
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
+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:'DmjhFK',
+  components: {GxsqAdd},
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      flag:false,
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tlth', title: '套料图号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          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: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljmc', title: '零件名称', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljgg', title: '零件规格', width: 120,
+          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: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jldw', title: '计量单位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sl', title: '数量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmjhrq', 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: 'qfxqrqdz', title: '前方需求大组期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'gylx', title: '工艺路线', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmfzry', title: '打磨负责人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmsbbh', title: '打磨设备编号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmcd', title: '打磨长度', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmry', title: '打磨人员', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmksrq', title: '打磨开始日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'dmjsrq', title: '打磨结束日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzry', title: '编制人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkry', title: '反馈人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', 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: {
+    Choice() {
+      this.$refs.gxsqAdd.show()
+    },
+    callback(obj, inputFive) {
+
+    //  this.loadData()
+
+    },
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveQgPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        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(() =>{
+          saveQgPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getQgPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/pkjhD.vue b/src/views/jhzxgl/pkjhD.vue
new file mode 100644
index 0000000..87a5049
--- /dev/null
+++ b/src/views/jhzxgl/pkjhD.vue
@@ -0,0 +1,571 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</el-button>
+              <el-button type="success" @click="Choice">取自</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+    <GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
+  </el-container>
+</template>
+
+<script>
+import {
+getQgPgd,
+  saveQgPgdFk,
+  saveQgPgdXd,
+  saveQgPgdXdBack,
+
+  getPgdBase
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
+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:'QmjhD',
+  components: {GxsqAdd},
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      flag:false,
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tlth', title: '套料图号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          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: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljmc', title: '零件名称', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljgg', title: '零件规格', width: 120,
+          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: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jldw', title: '计量单位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sl', 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: 'qfxqrqxz', title: '前方需求小组期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'gylx', title: '工艺路线', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkfzry', title: '坡口负责人', width: 120,
+          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: 'pkry', title: '坡口人员', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkksrq', title: '坡口开始日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkjsrq', title: '坡口结束日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzry', title: '编制人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkry', title: '反馈人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', 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: {
+    Choice() {
+      this.$refs.gxsqAdd.show()
+    },
+    callback(obj, inputFive) {
+
+    //  this.loadData()
+
+    },
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveQgPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        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(() =>{
+          saveQgPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getQgPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/pkjhFK.vue b/src/views/jhzxgl/pkjhFK.vue
new file mode 100644
index 0000000..87a5049
--- /dev/null
+++ b/src/views/jhzxgl/pkjhFK.vue
@@ -0,0 +1,571 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</el-button>
+              <el-button type="success" @click="Choice">取自</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+    <GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
+  </el-container>
+</template>
+
+<script>
+import {
+getQgPgd,
+  saveQgPgdFk,
+  saveQgPgdXd,
+  saveQgPgdXdBack,
+
+  getPgdBase
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
+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:'QmjhD',
+  components: {GxsqAdd},
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      flag:false,
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tlth', title: '套料图号', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          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: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljmc', title: '零件名称', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'ljgg', title: '零件规格', width: 120,
+          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: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jldw', title: '计量单位', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sl', 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: 'qfxqrqxz', title: '前方需求小组期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qfxqrqdz', title: '前方需求大组期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'gylx', title: '工艺路线', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkfzry', title: '坡口负责人', width: 120,
+          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: 'pkry', title: '坡口人员', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkksrq', title: '坡口开始日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pkjsrq', title: '坡口结束日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzry', title: '编制人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkry', title: '反馈人', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', 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: {
+    Choice() {
+      this.$refs.gxsqAdd.show()
+    },
+    callback(obj, inputFive) {
+
+    //  this.loadData()
+
+    },
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveQgPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        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(() =>{
+          saveQgPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getQgPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/pwjhFK.vue b/src/views/jhzxgl/pwjhFK.vue
new file mode 100644
index 0000000..5ac6a21
--- /dev/null
+++ b/src/views/jhzxgl/pwjhFK.vue
@@ -0,0 +1,531 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+getPwPgd,
+  savePwPgdFk,
+  savePwPgdXd,
+  savePwPgdXdBack,
+
+  getPgdBase
+} 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'
+export default {
+  name:'PwjhD',
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
+          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: 'wpgg', title: '规格', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpcz', title: '材质', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpzl', title: '重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pwwz', 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: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sljhwgrq', title: '上料计划完工期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pwfzr', title: '抛丸负责人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jpbs', title: '校平标识', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pwjgry', title: '抛丸加工人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pwksrq', title: '抛丸开始日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pwjsrq', title: '抛丸结束日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fkry', title: '反馈人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bzry', title: '编制人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+
+
+
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
+  },
+  methods: {
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      savePwPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          savePwPgdXdBack(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '取消下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }else  {
+        this.$confirm('下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          savePwPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getPwPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/qgjhFK.vue b/src/views/jhzxgl/qgjhFK.vue
new file mode 100644
index 0000000..74cdf79
--- /dev/null
+++ b/src/views/jhzxgl/qgjhFK.vue
@@ -0,0 +1,567 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+getQgPgd,
+  saveQgPgdFk,
+  saveQgPgdXd,
+  saveQgPgdXdBack,
+
+  getPgdBase
+} 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'
+export default {
+  name:'QgjhD',
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
+          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: 'wpgg', title: '规格', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpcz', title: '材质', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpzl', title: '重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgjhrq', title: '切割计划期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pwjhwgrq', title: '抛丸计划完工期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgfzry', title: '切割负责人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxsbbh', title: '划线设备编号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxcd', title: '划线长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxkccd', title: '划线空程长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgsbbh', title: '切割设备编号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgcd', title: '切割长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgkccd', title: '切割空程长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxry', title: '划线人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxksrq', title: '划线开始时间', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxjsrq', title: '划线结束时间', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgry', title: '切割人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgksrq', title: '切割开始时间', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgjsrq', title: '切割结束时间', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fkry', title: '反馈人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzry', title: '编制人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+
+
+
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
+  },
+  methods: {
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveQgPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        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(() =>{
+          saveQgPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getQgPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/qmjhD.vue b/src/views/jhzxgl/qmjhD.vue
index a60eb7c..d062be6 100644
--- a/src/views/jhzxgl/qmjhD.vue
+++ b/src/views/jhzxgl/qmjhD.vue
@@ -127,10 +127,10 @@
 
 <script>
 import {
-getQgPgd,
-  saveQgPgdFk,
-  saveQgPgdXd,
-  saveQgPgdXdBack,
+getQmPgd,
+  saveQmPgdFk,
+  saveQmPgdXd,
+  saveQmPgdXdBack,
 
   getPgdBase
 } from '@/api/jhzxgl/pgd'
@@ -441,7 +441,7 @@ export default {
         this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
         return
       }
-      saveQgPgdFk(obj).then(res=>{
+      saveQmPgdFk(obj).then(res=>{
         if(res.success){
           this.initList()
         }
@@ -458,7 +458,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
-          saveQgPgdXdBack(obj).then(res=>{
+          saveQmPgdXdBack(obj).then(res=>{
             if(res.success){
               this.$message({ message: '取消下达成功', type: 'success' })
               this.initList()
@@ -472,7 +472,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
-          saveQgPgdXd(obj).then(res=>{
+          saveQmPgdFk(obj).then(res=>{
             if(res.success){
               this.$message({ message: '下达成功', type: 'success' })
               this.initList()
@@ -489,7 +489,7 @@ export default {
         this.$message.warning('选择船只编号')
         return
       }
-      getQgPgd(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/qmjhFK.vue b/src/views/jhzxgl/qmjhFK.vue
new file mode 100644
index 0000000..d062be6
--- /dev/null
+++ b/src/views/jhzxgl/qmjhFK.vue
@@ -0,0 +1,580 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</el-button>
+              <el-button type="success" @click="Choice">取自</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+    <GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
+  </el-container>
+</template>
+
+<script>
+import {
+getQmPgd,
+  saveQmPgdFk,
+  saveQmPgdXd,
+  saveQmPgdXdBack,
+
+  getPgdBase
+} from '@/api/jhzxgl/pgd'
+import { mapGetters } from 'vuex'
+import GxsqAdd from '@/views/jhzxgl/components/GxsqAdd'
+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:'QmjhD',
+  components: {GxsqAdd},
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      flag:false,
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
+          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: 'wpgg', title: '规格', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpcz', title: '材质', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpzl', title: '重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgjhrq', title: '切割计划期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pwjhwgrq', title: '抛丸计划完工期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgfzry', title: '切割负责人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxsbbh', title: '划线设备编号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxcd', title: '划线长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxkccd', title: '划线空程长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgsbbh', title: '切割设备编号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgcd', title: '切割长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgkccd', title: '切割空程长度', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxry', title: '划线人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxksrq', title: '划线开始时间', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hxjsrq', title: '划线结束时间', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgry', title: '切割人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgksrq', title: '切割开始时间', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgjsrq', title: '切割结束时间', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fkry', title: '反馈人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', title: '反馈原因', width: 100,editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzry', title: '编制人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+
+
+
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
+  },
+  methods: {
+    Choice() {
+      this.$refs.gxsqAdd.show()
+    },
+    callback(obj, inputFive) {
+
+    //  this.loadData()
+
+    },
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveQmPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveQmPgdXdBack(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '取消下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }else  {
+        this.$confirm('下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveQmPgdFk(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getQmPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/sljhFK.vue b/src/views/jhzxgl/sljhFK.vue
new file mode 100644
index 0000000..40b8c58
--- /dev/null
+++ b/src/views/jhzxgl/sljhFK.vue
@@ -0,0 +1,549 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+getSljhPgd,
+  saveSljhPgdFk,
+  saveSljhPgdXd,
+  saveSljhPgdXdBack,
+
+  getPgdBase
+} 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'
+export default {
+  name:'SljhD',
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'czbh', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
+          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: 'wpgg', title: '规格', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpcz', title: '材质', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'wpzl', title: '重量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'hth', title: '合同号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xhth', title: '小合同号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lph', title: '炉批号/物料号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'kwh', title: '库存垛位', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'cs', title: '层数', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'jpbs', title: '校平标识', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'slfzry', title: '上料负责人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'slwz', 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: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'slry', title: '上料人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'slksrq', title: '上料开始', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'sjjsrq', title: '上料结束', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'fkry', title: '反馈人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', title: '反馈原因', width: 100, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bzry', title: '编制人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfry', title: '下发人', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
+  },
+  methods: {
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveSljhPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveSljhPgdXdBack(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '取消下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }else  {
+        this.$confirm('下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveSljhPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getSljhPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/jhzxgl/tzjhFK.vue b/src/views/jhzxgl/tzjhFK.vue
new file mode 100644
index 0000000..0b45216
--- /dev/null
+++ b/src/views/jhzxgl/tzjhFK.vue
@@ -0,0 +1,484 @@
+<template>
+  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
+  <el-container>
+    <el-header style="width: 100%; height: 80px;font-size: 12px">
+
+      <el-form :inline="true"  label-width="60px"  label-position="left">
+        <el-row>
+
+          <el-col :span="22">
+
+            <el-form-item label="船号:">
+              <vxe-pulldown ref="xDown4" transfer >
+                <template #default>
+                  <vxe-input
+                    v-model="queryParam.dcch"
+                    placeholder="船号"
+                    style="height: 28px;
+                    line-height: 28px; width: 140px;"
+                    suffix-icon="vxe-icon--search"
+                    @keyup="keyupEvent4"
+                    @focus="focusEvent4"
+                  />
+                </template>
+                <template #dropdown>
+                  <div class="my-dropdown  mytable " style="width: 250px">
+                    <vxe-grid
+                      highlight-hover-row
+                      height="auto"
+
+                      :data="projectData"
+                      :columns="projectColumns"
+                      @cell-click="cellClickEvent"
+                      show-overflow
+                    >
+                      <template #wgbsEdit="{ row}">
+                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+              </vxe-pulldown>
+
+
+            </el-form-item>
+            <el-form-item label="批量:">
+              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
+            </el-form-item>
+            <el-form-item label="分段:">
+              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
+            </el-form-item>
+
+
+
+
+          </el-col>
+          <el-col :span="2">
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="initList">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="14" >
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6"  style="text-align: right;">
+            <el-form-item  >
+              <el-input v-model="queryParam.fkyy" placeholder="反馈原因" clearable />
+              <el-button type="info" @click="plClick">批量</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" >
+            <el-form-item style="float: right" >
+              <el-button type="success" @click="saveclick">反馈</el-button>
+              <el-button type="success" @click="xdClick">接收</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,activeMethod: activeRowMethod}"
+              highlight-hover-row
+              show-overflow
+              show-header-overflow
+
+            >
+
+
+            </vxe-grid>
+          </div>
+
+
+        </el-main>
+      </el-container>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import {
+ getTzjhPgd,
+  saveTzjhPgdFk,
+  saveTzjhPgdXd,
+  saveTzjhPgdXdBack,
+
+  getPgdBase
+} 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'
+export default {
+  name:'tzjhD',
+  data() {
+    return {
+      queryParam: {
+        dcch:'',
+        pl:'',
+        fd:'',
+        fkyy:'',
+        zt:'01'
+      },
+      statusOptions: [
+        {
+          value: "01",
+          label: "编制",
+        },
+        {
+          value: "02",
+          label: "下达",
+        },
+        {
+          value: "09",
+          label: "反馈",
+        },
+      ],
+      list: [],
+      heads: { token: getToken() },
+      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
+      dictData:{},
+      height: '500px',
+      projectData:[],
+      projectData1:[],
+      projectColumns: [
+        {field: 'cbbm', title: '船号',width: 110},
+        { field: 'wgbs', title: '完工标识', width: 80,
+          slots:{
+            default: 'wgbsEdit'
+          },
+        },
+      ],
+      tableColumn: [
+        { type: 'checkbox', width: 40 },
+        { type: 'seq', width: 40, title: '序号' },
+
+
+        { field: 'tzzt', title: '图纸状态', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'czbh', title: '船号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'pl', title: '批量', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fd', title: '分段', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqbxfrq', title: '领取表下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'lqbjsrq', title: '领取表接收日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tltxfrq', title: '套料图下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'tltjsrq', title: '套料图接收日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'qgxqrq', title: '切割需求日期', width: 100,
+          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: 'qfxqrqdz', title: '前方需求大组期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+
+
+        { field: 'xfry', title: '下发人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'xfrq', title: '下发日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkry', title: '反馈人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkrq', title: '反馈日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'fkyy', title: '反馈原因', width: 100, editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'bzry', title: '编制人员', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+        { field: 'bzrq', title: '编制日期', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+
+      ]
+    }
+  },
+  computed: {
+    ...mapGetters(['name', 'bmbm'])
+  },
+  created() {
+    window.addEventListener('resize', this.getHeight)
+    this.getHeight()
+    this.initBase()
+
+
+  },
+  methods: {
+    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)
+      }
+
+    },
+
+
+
+
+    activeRowMethod({ row, rowIndex }){
+      if(row.zt==="01"){
+        return  true
+      }else{
+        return  false
+      }
+    },
+
+    initBase(){
+      getPgdBase({}).then(res=>{
+        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(){
+      let obj=this.$refs.xGrid.getUpdateRecords()
+      if(obj.length===0){
+        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+        return
+      }
+      saveTzjhPgdFk(obj).then(res=>{
+        if(res.success){
+          this.initList()
+        }
+      })
+    },
+    xdClick(){
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      if(this.queryParam.zt==='02'){
+        this.$confirm('取消下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveTzjhPgdXdBack(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '取消下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }else  {
+        this.$confirm('下达？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveTzjhPgdXd(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '下达成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      }
+
+
+    },
+    initList() {
+      if (this.queryParam.dcch === '') {
+        this.$message.warning('选择船只编号')
+        return
+      }
+      getTzjhPgd(this.queryParam).then((res) => {
+        this.list = res.data
+        if (this.$refs.xGrid) {
+          this.$refs.xGrid.loadData(this.list)
+          console.log(this.list)
+        }
+
+      })
+    },
+    selectChange(row) {
+      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
+      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
+      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
+      null2str(row.row)
+    },
+    getHeight() {
+      this.height = window.innerHeight - 190
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+
+.el-header{margin:0;padding: 5px;height:auto;
+  .el-input{
+    width: 140px;
+  }
+  .el-select{
+    width: 140px;
+  }
+
+}
+.el-container{padding: 0;margin:0;}
+.el-main{padding: 0;}
+.el-col{padding: 0;height: 32px;}
+.el-aside{background: #fff;padding: 0}
+.el-container{padding: 0}
+.el-row {}
+.el-row:last-child {margin-bottom: 0; }
+
+.tableStyles{
+  background: #0a76a4;
+}
+
+.my-dropdown {
+  width: 400px;
+  height: 400px;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  font-size: 12px;
+
+}
+.mytable1{
+
+}
+.borderClass{
+
+}
+.vxe-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.el-input {
+  display: inline-block !important;
+  position: relative !important;
+  width: auto;
+}
+.keyword-lighten {
+  color: #000;
+  background-color: #FFFF00;
+}
+
+.vxe-textarea--inner {
+  line-height: inherit;
+}
+.el-form-item__label-wrap {
+  margin-left: 0px !important;
+  float: left;
+}
+.fontClass{
+  font-size: 12px;
+  font-weight: bold;
+}
+
+
+</style>
diff --git a/src/views/sjzx/bclqCX1.vue b/src/views/sjzx/bclqCX1.vue
index 770bcef..13d9cc4 100644
--- a/src/views/sjzx/bclqCX1.vue
+++ b/src/views/sjzx/bclqCX1.vue
@@ -124,8 +124,9 @@
               :scroll-y="{enabled: true}"
               highlight-hover-row
               show-overflow
-              show-header-overflow
-
+              :footer-method="footerMethod"
+              :footer-cell-style="{'text-align':'center','color':'red'}"
+              show-footer
             >
               <template #expand="{ row }">
 
@@ -143,7 +144,9 @@
                   highlight-hover-row
                   show-overflow
                   show-header-overflow
-
+                  :footer-method="footerMethod1"
+                  :footer-cell-style="{'text-align':'center','color':'red'}"
+                  show-footer
                 >
 
                   <template #expand1="{ row }">
@@ -189,7 +192,7 @@ import {
 } from '@/api/sjzx/jcsj'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
+import {getSumAdd, getSumAddDicByName1, null2str} from "@/utils/rpkj";
 import { getToken } from '@/utils/auth'
 import { startLoading, endLoading } from '@/utils'
 import { Message } from 'element-ui'
@@ -556,6 +559,40 @@ export default {
         })
       })
     },
+    footerMethod1 ({ columns, data }) {
+
+      return [
+        columns.map((column, columnIndex) => {
+          if (['sl'].includes(column.property)) {
+            return getSumAdd(data, column.property)
+          }
+
+
+          if (columnIndex === 1) {
+            return '合计'
+          }
+          return null
+        })
+      ]
+    },
+    footerMethod ({ columns, data }) {
+
+      return [
+        columns.map((column, columnIndex) => {
+          if (['sl','lqzl','shzl','ylzl','qpyld','ljzl','dztlzl'].includes(column.property)) {
+            return getSumAdd(data, column.property)
+          }
+
+          if (['qpyldZ','ybzsZ','lqzlZ','shzlZ','ylzlZ'].includes(column.property)) {
+            return getSumAddDicByName1(data,  column.property,'lqbh')
+          }
+          if (columnIndex === 1) {
+            return '合计'
+          }
+          return null
+        })
+      ]
+    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()