diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js
index 3f4f4b7..52420d5 100644
--- a/src/api/jhzxgl/pgd.js
+++ b/src/api/jhzxgl/pgd.js
@@ -49,6 +49,7 @@ export function saveQgjhPg(data) {return request({url: '/pgdQgjh/saveQgjhPg', me
 export function saveQgjhPgBack(data) {return request({url: '/pgdQgjh/saveQgjhPgBack', method: 'post', data})}
 
 
+export function saveQmPgdJs(data) {return request({url: '/pgdQmjh/saveQmPgdJs', method: 'post', data})}
 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})}
@@ -65,6 +66,7 @@ export function savePkPgdXd(data) {return request({url: '/pgdPkjh/savePkPgdXd',
 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 savePkFk(data) {return request({url: '/pgdPkjh/savePkFk', method: 'post', data})}
+export function savePkPgdJs(data) {return request({url: '/pgdPkjh/savePkPgdJs', method: 'post', data})}
 
 
 export function getDmPgd(data) {return request({url: '/pgdDmjh/getDmPgd', method: 'post', data})}
@@ -72,6 +74,7 @@ export function saveDmPgdXd(data) {return request({url: '/pgdDmjh/saveDmPgdXd',
 export function saveDmPgdXdBack(data) {return request({url: '/pgdDmjh/saveDmPgdXdBack', method: 'post', data})}
 export function saveDmPgdFk(data) {return request({url: '/pgdDmjh/saveDmPgdFk', method: 'post', data})}
 export function saveDmFk(data) {return request({url: '/pgdDmjh/saveDmFk', method: 'post', data})}
+export function saveDmPgdJs(data) {return request({url: '/pgdDmjh/saveDmPgdJs', method: 'post', data})}
 
 
 
diff --git a/src/views/jhzxgl/dmjhD.vue b/src/views/jhzxgl/dmjhD.vue
index 13c0689..642515c 100644
--- a/src/views/jhzxgl/dmjhD.vue
+++ b/src/views/jhzxgl/dmjhD.vue
@@ -6,7 +6,19 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="22">
+          <el-col :span="18">
+
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
 
             <el-form-item label="船号:">
               <vxe-pulldown ref="xDown4" transfer >
@@ -53,37 +65,56 @@
 
 
           </el-col>
-          <el-col :span="2">
+          <el-col :span="6">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="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 :span="20"  >
+
+
+
+
+
+
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+              <el-option
+                v-for="item in this.dictData.bmbm"
+                :key="item.bm"
+                :label="item.bmsm"
+                :value="item.bm"
+              >
+              </el-option>
+            </el-select>
+
+            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
+              <el-option
+                v-for="item in this.dictData.gxry"
+                :key="item.dlzh"
+                :label="item.dlzh"
+                :value="item.dlzh"
+              >
+              </el-option>
+            </el-select>
+
+
+            <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
+            <span style="width:6%" >反馈人员:</span>
+            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />
+            <span style="width:6%" >反馈日期:</span>
+            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>
+            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
           </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="slpgclick">派工</el-button>
               <el-button type="success" @click="xdClick">接收</el-button>
-              <el-button type="success" @click="Choice">取自</el-button>
+              <el-button type="success" @click="saveclick">反馈</el-button>
+
             </el-form-item>
           </el-col>
         </el-row>
@@ -106,7 +137,7 @@
               highlight-current-row
               :data="list"
               :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
               highlight-hover-row
               show-overflow
               show-header-overflow
@@ -121,29 +152,21 @@
         </el-main>
       </el-container>
     </el-container>
-    <GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
   </el-container>
 </template>
 
 <script>
 import {
-getDmPgd,
-  saveDmPgdFk,
-  saveDmPgdXd,
-  saveDmPgdXdBack,
-
-  getPgdBase
+  saveDmPgdXd,getDmPgd,getPgdBase,saveDmPgdFk,saveDmPgdJs,saveDmPgdXdBack
 } 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},
+  name:'PwjhD',
   data() {
     return {
       queryParam: {
@@ -160,15 +183,26 @@ export default {
         },
         {
           value: "02",
-          label: "下达",
+          label: "派工",
         },
         {
-          value: "09",
+          value: "03",
+          label: "接收",
+        },
+        {
+          value: "04",
           label: "反馈",
         },
       ],
+      inParam:{
+        slry:'',
+        slks:'',
+        sljs:'',
+        dw:'',
+        scry:'',
+        scdw:''
+      },
       list: [],
-      flag:false,
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
       dictData:{},
@@ -183,10 +217,18 @@ export default {
           },
         },
       ],
+
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-
+        { field: 'lsh', title: '流水号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'dmZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
         { field: 'czbh', title: '船号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -293,60 +335,73 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmry', title: '打磨人员', width: 120,
+        // { 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: 'dscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'dmksrq', title: '打磨开始日期', width: 120,
+        { field: 'dscry', title: '生产人员', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmjsrq', title: '打磨结束日期', width: 120,
+        { field: 'djsry', title: '接收人员', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'dmZt', title: '状态', width: 120,
+        { field: 'djsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmBzry', title: '编制人', width: 120,
+        { field: 'dmFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmBzrq', title: '编制日期', width: 120,
+        { field: 'dmFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmXfry', title: '下发人', width: 120,
+        { field: 'dmBzry', title: '编制人', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmXfrq', title: '下发日期', width: 120,
+        { field: 'dmBzrq', title: '编制日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmFkry', title: '反馈人', width: 120,
+        { field: 'dmXfry', title: '下发人', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmFkrq', title: '反馈日期', width: 120,
+        { field: 'dmXfrq', title: '下发日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'dmFkyy', title: '反馈原因', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        }
+
+
+
+
+
 
 
 
@@ -366,14 +421,7 @@ export default {
 
   },
   methods: {
-    Choice() {
-      this.$refs.gxsqAdd.show()
-    },
-    callback(obj, inputFive) {
-
-    //  this.loadData()
 
-    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -385,26 +433,70 @@ export default {
 
 
       if (this.queryParam.dcch) {
-         this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
       } else {
         this.projectData = this.projectData1.slice(0)
       }
 
     },
+    ztChange(){
+      this.list=[]
+    },
+    bzClick(){
+      console.log(this.dictData.gxry)
+      console.log(this.inParam.scdw)
+      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      console.log(this.dictData.gxry)
+    },
+    updates2(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
 
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
 
 
+          selectRecords[i].dscdw = this.inParam.scdw
+          selectRecords[i].dscry = this.inParam.scry
 
-    activeRowMethod({ row, rowIndex }){
-      if(row.zt==="01"){
-        return  true
-      }else{
-        return  false
+
+        }
+        this.$refs.xGrid.updateData(this.list)
       }
     },
+    updates(type){
+
+
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          if(type==='1'){
+
+            selectRecords[i].slksrq = this.inParam.slks
+          }else if (type==='2'){
+            selectRecords[i].dmFkry = this.inParam.slry
+            selectRecords[i].dmFkrq = this.inParam.sljs
+          }
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+
+    activeRowMethod({ row, rowIndex }){
+      // if(row.zt==="01"){
+      //   return  true
+      // }else{
+      //   return  false
+      // }
+
+      return true;
+    },
 
     initBase(){
       getPgdBase({}).then(res=>{
+        console.log(res.data)
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
@@ -421,45 +513,53 @@ export default {
 
     },
     saveclick(){
-      let obj=this.$refs.xGrid.getUpdateRecords()
-      if(obj.length===0){
-        this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+
+      if(this.queryParam.zt!=='03'){
         return
       }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
       saveDmPgdFk(obj).then(res=>{
         if(res.success){
           this.initList()
         }
       })
     },
-    xdClick(){
+
+    slpgclick(){
+      // if(this.queryParam.zt!=="01"){
+      //   return
+      // }
+
       let obj=this.$refs.xGrid.getCheckboxRecords()
       if(obj.length===0){
         return
       }
       if(this.queryParam.zt==='02'){
-        this.$confirm('取消下达？', '提示', {
+        this.$confirm('取消派工？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
           saveDmPgdXdBack(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '取消下达成功', type: 'success' })
+              this.$message({ message: '取消派工成功', type: 'success' })
               this.initList()
             }
           })
 
         })
-      }else  {
-        this.$confirm('下达？', '提示', {
+      }else if (this.queryParam.zt==='01') {
+        this.$confirm('派工？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
           saveDmPgdXd(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '下达成功', type: 'success' })
               this.initList()
             }
           })
@@ -468,6 +568,47 @@ export default {
       }
 
 
+    },
+    xdClick(){
+
+      if(this.queryParam.zt!=="02"){
+        return
+      }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      // if(this.queryParam.zt==='03'){
+      //   this.$confirm('取消接收？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() =>{
+      //     saveQgPgdXdBack(obj).then(res=>{
+      //       if(res.success){
+      //         this.$message({ message: '取消下达成功', type: 'success' })
+      //         this.initList()
+      //       }
+      //     })
+      //
+      //   })
+      // }else  {
+      this.$confirm('接收？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() =>{
+        saveDmPgdJs(obj).then(res=>{
+          if(res.success){
+            this.$message({ message: '接收成功', type: 'success' })
+            this.initList()
+          }
+        })
+
+      })
+      // }
+
+
     },
     initList() {
       if (this.queryParam.dcch === '') {
diff --git a/src/views/jhzxgl/pkjhD.vue b/src/views/jhzxgl/pkjhD.vue
index 11ee80b..bb160dc 100644
--- a/src/views/jhzxgl/pkjhD.vue
+++ b/src/views/jhzxgl/pkjhD.vue
@@ -6,7 +6,19 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="22">
+          <el-col :span="18">
+
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
 
             <el-form-item label="船号:">
               <vxe-pulldown ref="xDown4" transfer >
@@ -53,37 +65,56 @@
 
 
           </el-col>
-          <el-col :span="2">
+          <el-col :span="6">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="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 :span="20"  >
+
+
+
+
+
+
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+              <el-option
+                v-for="item in this.dictData.bmbm"
+                :key="item.bm"
+                :label="item.bmsm"
+                :value="item.bm"
+              >
+              </el-option>
+            </el-select>
+
+            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
+              <el-option
+                v-for="item in this.dictData.gxry"
+                :key="item.dlzh"
+                :label="item.dlzh"
+                :value="item.dlzh"
+              >
+              </el-option>
+            </el-select>
+
+
+            <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
+            <span style="width:6%" >反馈人员:</span>
+            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />
+            <span style="width:6%" >反馈日期:</span>
+            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>
+            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
           </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="slpgclick">派工</el-button>
               <el-button type="success" @click="xdClick">接收</el-button>
-              <el-button type="success" @click="Choice">取自</el-button>
+              <el-button type="success" @click="saveclick">反馈</el-button>
+
             </el-form-item>
           </el-col>
         </el-row>
@@ -106,7 +137,7 @@
               highlight-current-row
               :data="list"
               :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
               highlight-hover-row
               show-overflow
               show-header-overflow
@@ -121,29 +152,21 @@
         </el-main>
       </el-container>
     </el-container>
-    <GxsqAddpk ref="gxsqAdd" @callback="callback" :flag="flag"/>
   </el-container>
 </template>
 
 <script>
 import {
-getPkPgd,
-  savePkPgdXd,
-  savePkPgdFk,
-  savePkPgdXdBack,
-
-  getPgdBase
+  savePkPgdJs,savePkPgdXd,savePkPgdXdBack,getPkPgd,savePkPgdFk,getPgdBase
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
-import GxsqAddpk from '@/views/jhzxgl/components/GxsqAddpk'
 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:'PkjhD',
-  components: {GxsqAddpk},
+  name:'PwjhD',
   data() {
     return {
       queryParam: {
@@ -160,15 +183,26 @@ export default {
         },
         {
           value: "02",
-          label: "下达",
+          label: "派工",
         },
         {
-          value: "09",
+          value: "03",
+          label: "接收",
+        },
+        {
+          value: "04",
           label: "反馈",
         },
       ],
+      inParam:{
+        slry:'',
+        slks:'',
+        sljs:'',
+        dw:'',
+        scry:'',
+        scdw:''
+      },
       list: [],
-      flag:false,
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
       dictData:{},
@@ -183,10 +217,18 @@ export default {
           },
         },
       ],
+
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-
+        { field: 'lsh', title: '流水号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'pkZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
 
         { field: 'czbh', title: '船号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -301,58 +343,75 @@ export default {
           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: 'pkry', title: '坡口人员', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pkksrq', title: '坡口开始日期', width: 120,
+        { field: 'pscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'pkjsrq', title: '坡口结束日期', width: 120,
+        { field: 'pscry', title: '生产人员', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'pkZt', title: '状态', width: 120,
+        // { 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: 'pjsry', title: '接收人员', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'pkBzry', title: '编制人', width: 120,
+        { field: 'pjsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'pkBzrq', title: '编制日期', width: 120,
+        { field: 'pkFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'pkXfry', title: '下发人', width: 120,
+        { field: 'pkFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pkXfrq', title: '下发日期', width: 120,
+        // { field: 'pkFkyy', title: '反馈原因', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        { field: 'pkBzry', title: '编制人', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pkFkry', title: '反馈人', width: 120,
+        { field: 'pkBzrq', title: '编制日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pkFkrq', title: '反馈日期', width: 120,
+        { field: 'pkXfry', title: '下发人', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'pkFkyy', title: '反馈原因', width: 120,
+        { field: 'pkXfrq', title: '下发日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
@@ -364,10 +423,6 @@ export default {
 
 
 
-
-
-
-
       ]
     }
   },
@@ -382,14 +437,7 @@ export default {
 
   },
   methods: {
-    Choice() {
-      this.$refs.gxsqAdd.show()
-    },
-    callback(obj, inputFive) {
-
-    //  this.loadData()
 
-    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -401,26 +449,70 @@ export default {
 
 
       if (this.queryParam.dcch) {
-         this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
       } else {
         this.projectData = this.projectData1.slice(0)
       }
 
     },
+    ztChange(){
+      this.list=[]
+    },
+    bzClick(){
+      console.log(this.dictData.gxry)
+      console.log(this.inParam.scdw)
+      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      console.log(this.dictData.gxry)
+    },
+    updates2(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
 
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
 
 
+          selectRecords[i].pscdw = this.inParam.scdw
+          selectRecords[i].pscry = this.inParam.scry
 
-    activeRowMethod({ row, rowIndex }){
-      if(row.zt==="01"){
-        return  true
-      }else{
-        return  false
+
+        }
+        this.$refs.xGrid.updateData(this.list)
       }
     },
+    updates(type){
+
+
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          if(type==='1'){
+
+            selectRecords[i].slksrq = this.inParam.slks
+          }else if (type==='2'){
+            selectRecords[i].pkFkry = this.inParam.slry
+            selectRecords[i].pkFkrq = this.inParam.sljs
+          }
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+
+    activeRowMethod({ row, rowIndex }){
+      // if(row.zt==="01"){
+      //   return  true
+      // }else{
+      //   return  false
+      // }
+
+      return true;
+    },
 
     initBase(){
       getPgdBase({}).then(res=>{
+        console.log(res.data)
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
@@ -430,52 +522,60 @@ export default {
       let selectRecords = this.$refs.xGrid.getCheckboxRecords()
       if(selectRecords.length>0){
         for(let i = 0; i < selectRecords.length; i++) {
-          selectRecords[i].pkFkyy = this.queryParam.fkyy
+          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' })
+
+      if(this.queryParam.zt!=='03'){
         return
       }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
       savePkPgdFk(obj).then(res=>{
         if(res.success){
           this.initList()
         }
       })
     },
-    xdClick(){
+
+    slpgclick(){
+      // if(this.queryParam.zt!=="01"){
+      //   return
+      // }
+
       let obj=this.$refs.xGrid.getCheckboxRecords()
       if(obj.length===0){
         return
       }
       if(this.queryParam.zt==='02'){
-        this.$confirm('取消下达？', '提示', {
+        this.$confirm('取消派工？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
           savePkPgdXdBack(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '取消下达成功', type: 'success' })
+              this.$message({ message: '取消派工成功', type: 'success' })
               this.initList()
             }
           })
 
         })
-      }else  {
-        this.$confirm('下达？', '提示', {
+      }else if (this.queryParam.zt==='01') {
+        this.$confirm('派工？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
           savePkPgdXd(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '下达成功', type: 'success' })
               this.initList()
             }
           })
@@ -484,6 +584,47 @@ export default {
       }
 
 
+    },
+    xdClick(){
+
+      if(this.queryParam.zt!=="02"){
+        return
+      }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      // if(this.queryParam.zt==='03'){
+      //   this.$confirm('取消接收？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() =>{
+      //     saveQgPgdXdBack(obj).then(res=>{
+      //       if(res.success){
+      //         this.$message({ message: '取消下达成功', type: 'success' })
+      //         this.initList()
+      //       }
+      //     })
+      //
+      //   })
+      // }else  {
+      this.$confirm('接收？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() =>{
+        savePkPgdJs(obj).then(res=>{
+          if(res.success){
+            this.$message({ message: '接收成功', type: 'success' })
+            this.initList()
+          }
+        })
+
+      })
+      // }
+
+
     },
     initList() {
       if (this.queryParam.dcch === '') {
diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue
index 879c225..3ce48a7 100644
--- a/src/views/jhzxgl/pwjhD.vue
+++ b/src/views/jhzxgl/pwjhD.vue
@@ -228,7 +228,10 @@ export default {
       { type: 'checkbox', width: 40 },
       { type: 'seq', width: 40, title: '序号' },
 
-
+          { field: 'pwlsh', 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', },
@@ -482,6 +485,9 @@ export default {
 
     },
     saveclick(){
+      if(this.queryParam.zt!=='03'){
+        return
+      }
       let obj=this.$refs.xGrid.getCheckboxRecords()
       // if(obj.length===0){
       //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
diff --git a/src/views/jhzxgl/qgjhD.vue b/src/views/jhzxgl/qgjhD.vue
index a7ff331..8c9d1d2 100644
--- a/src/views/jhzxgl/qgjhD.vue
+++ b/src/views/jhzxgl/qgjhD.vue
@@ -230,7 +230,10 @@ export default {
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
 
-
+        { field: 'qglsh', 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', },
@@ -552,6 +555,9 @@ export default {
 
     },
     saveclick(){
+      if(this.queryParam.zt!=='03'){
+        return
+      }
       let obj=this.$refs.xGrid.getCheckboxRecords()
       // if(obj.length===0){
       //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
diff --git a/src/views/jhzxgl/qmjhD.vue b/src/views/jhzxgl/qmjhD.vue
index 9425d22..4053036 100644
--- a/src/views/jhzxgl/qmjhD.vue
+++ b/src/views/jhzxgl/qmjhD.vue
@@ -6,7 +6,19 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="22">
+          <el-col :span="18">
+
+            <el-form-item label="状态:">
+              <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
 
             <el-form-item label="船号:">
               <vxe-pulldown ref="xDown4" transfer >
@@ -53,37 +65,56 @@
 
 
           </el-col>
-          <el-col :span="2">
+          <el-col :span="6">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="14" >
-            <el-form-item label="状态:">
-              <el-select v-model="queryParam.zt" placeholder="状态" >
-                <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 :span="20"  >
+
+
+
+
+
+
+            <span style="width:6%" >班组:</span>
+            <el-select v-model="inParam.scdw" placeholder="班组" clearable style="width: 15%" @change="bzClick">
+              <el-option
+                v-for="item in this.dictData.bmbm"
+                :key="item.bm"
+                :label="item.bmsm"
+                :value="item.bm"
+              >
+              </el-option>
+            </el-select>
+
+            <el-select v-model="inParam.scry" placeholder="人员" clearable style="width: 15%" >
+              <el-option
+                v-for="item in this.dictData.gxry"
+                :key="item.dlzh"
+                :label="item.dlzh"
+                :value="item.dlzh"
+              >
+              </el-option>
+            </el-select>
+
+
+            <el-button type="info" @click="updates2()" style="width: 5%">批量</el-button>
+            <span style="width:6%" >反馈人员:</span>
+            <el-input v-model="inParam.slry" placeholder="反馈人员" clearable style="width:10%"  />
+            <span style="width:6%" >反馈日期:</span>
+            <el-date-picker v-model="inParam.sljs" value-format="yyyy/MM/dd"     format="yyyy/MM/dd" type="date" style="width: 15%" placeholder="反馈日期"/>
+            <el-button type="info" @click="updates('2')" style="width: 5%">批量</el-button>
           </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="slpgclick">派工</el-button>
               <el-button type="success" @click="xdClick">接收</el-button>
-              <el-button type="success" @click="Choice">取自</el-button>
+              <el-button type="success" @click="saveclick">反馈</el-button>
+
             </el-form-item>
           </el-col>
         </el-row>
@@ -106,7 +137,7 @@
               highlight-current-row
               :data="list"
               :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,activeMethod: activeRowMethod}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
               highlight-hover-row
               show-overflow
               show-header-overflow
@@ -121,29 +152,22 @@
         </el-main>
       </el-container>
     </el-container>
-    <GxsqAdd ref="gxsqAdd" @callback="callback" :flag="flag"/>
   </el-container>
 </template>
 
 <script>
 import {
-getQmPgd,
-  saveQmPgdFk,
   saveQmPgdXd,
-  saveQmPgdXdBack,
-
-  getPgdBase
+  saveQmPgdXdBack,saveQmPgdJs,saveQmPgdFk,getQmPgd,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},
+  name:'PwjhD',
   data() {
     return {
       queryParam: {
@@ -160,15 +184,26 @@ export default {
         },
         {
           value: "02",
-          label: "下达",
+          label: "派工",
+        },
+        {
+          value: "03",
+          label: "接收",
         },
         {
-          value: "09",
+          value: "04",
           label: "反馈",
         },
       ],
+      inParam:{
+        slry:'',
+        slks:'',
+        sljs:'',
+        dw:'',
+        scry:'',
+        scdw:''
+      },
       list: [],
-      flag:false,
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
       dictData:{},
@@ -183,11 +218,18 @@ export default {
           },
         },
       ],
+
       tableColumn: [
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
-
-
+        { field: 'lsh', title: '流水号', width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
+        { field: 'qjgZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', },
+        },
         { field: 'czbh', title: '船号', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
@@ -286,62 +328,81 @@ export default {
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgry', title: '曲加工人员', width: 120,
+        // { field: 'qjgry', title: '曲加工人员', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'qjgksrq', title: '曲加工开始日期', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+        //
+        // { field: 'qjgjsrq', title: '曲加工结束日期', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
+
+        { field: 'qscdw', title: '生产单位', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'qjgksrq', title: '曲加工开始日期', width: 120,
+        { field: 'qscry', title: '生产人员', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'qjgjsrq', title: '曲加工结束日期', width: 120,
+        // { 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: 'qjsry', title: '接收人员', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'qjgZt', title: '状态', width: 120,
+        { field: 'qjsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgBzry', title: '编制人', width: 120,
+        { field: 'qjgFkry', title: '反馈人', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgBzrq', title: '编制日期', width: 120,
+        { field: 'qjgFkrq', title: '反馈日期', width: 120,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-
-        { field: 'qjgXfry', title: '下发人', width: 120,
+        { field: 'qjgBzry', title: '编制人', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgXfrq', title: '下发日期', width: 120,
+        { field: 'qjgBzrq', title: '编制日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgFkry', title: '反馈人', width: 120,
+        { field: 'qjgXfry', title: '下发人', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgFkrq', title: '反馈日期', width: 120,
+        { field: 'qjgXfrq', title: '下发日期', width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
 
-        { field: 'qjgFkyy', title: '反馈原因', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
 
 
+        // { field: 'qjgFkyy', title: '反馈原因', width: 120,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', },
+        // },
 
 
 
@@ -360,13 +421,12 @@ export default {
 
   },
   methods: {
-    Choice() {
-      this.$refs.gxsqAdd.show()
-    },
-    callback(obj, inputFive) {
-
-    //  this.loadData()
-
+    syncXiaochi(){
+      syncXiaochi().then(res=>{
+        if (res.success){
+          this.initList()
+        }
+      })
     },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
@@ -379,26 +439,70 @@ export default {
 
 
       if (this.queryParam.dcch) {
-         this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
+        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
       } else {
         this.projectData = this.projectData1.slice(0)
       }
 
     },
+    ztChange(){
+      this.list=[]
+    },
+    bzClick(){
+      console.log(this.dictData.gxry)
+      console.log(this.inParam.scdw)
+      this.dictData.gxry= this.dictData.gxry.filter(fst=>fst.szcs===this.inParam.scdw)
+      console.log(this.dictData.gxry)
+    },
+    updates2(){
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
 
 
+          selectRecords[i].qscdw = this.inParam.scdw
+          selectRecords[i].qscry = this.inParam.scry
 
 
-    activeRowMethod({ row, rowIndex }){
-      if(row.qjgZt==="01"){
-        return  true
-      }else{
-        return  false
+        }
+        this.$refs.xGrid.updateData(this.list)
       }
     },
+    updates(type){
+
+
+      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+
+      if(selectRecords.length>0){
+        for(let i = 0; i < selectRecords.length; i++) {
+          if(type==='1'){
+
+            selectRecords[i].slksrq = this.inParam.slks
+          }else if (type==='2'){
+            selectRecords[i].qjgFkry = this.inParam.slry
+            selectRecords[i].qjgFkrq = this.inParam.sljs
+          }
+
+        }
+        this.$refs.xGrid.updateData(this.list)
+      }
+
+    },
+
+    activeRowMethod({ row, rowIndex }){
+      // if(row.zt==="01"){
+      //   return  true
+      // }else{
+      //   return  false
+      // }
+
+      return true;
+    },
 
     initBase(){
       getPgdBase({}).then(res=>{
+        console.log(res.data)
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
@@ -408,52 +512,59 @@ export default {
       let selectRecords = this.$refs.xGrid.getCheckboxRecords()
       if(selectRecords.length>0){
         for(let i = 0; i < selectRecords.length; i++) {
-          selectRecords[i].qjgFkyy = this.queryParam.fkyy
+          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' })
+      if(this.queryParam.zt!=='03'){
         return
       }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      // if(obj.length===0){
+      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
+      //   return
+      // }
       saveQmPgdFk(obj).then(res=>{
         if(res.success){
           this.initList()
         }
       })
     },
-    xdClick(){
+
+    slpgclick(){
+      if(this.queryParam.zt!=="01"){
+        return
+      }
+
       let obj=this.$refs.xGrid.getCheckboxRecords()
       if(obj.length===0){
         return
       }
       if(this.queryParam.zt==='02'){
-        this.$confirm('取消下达？', '提示', {
+        this.$confirm('取消派工？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
           saveQmPgdXdBack(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '取消下达成功', type: 'success' })
+              this.$message({ message: '取消派工成功', type: 'success' })
               this.initList()
             }
           })
 
         })
       }else  {
-        this.$confirm('下达？', '提示', {
+        this.$confirm('派工？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
-          saveQmPgdFk(obj).then(res=>{
+          saveQmPgdXd(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '下达成功', type: 'success' })
               this.initList()
             }
           })
@@ -462,6 +573,47 @@ export default {
       }
 
 
+    },
+    xdClick(){
+
+      if(this.queryParam.zt!=="02"){
+        return
+      }
+      let obj=this.$refs.xGrid.getCheckboxRecords()
+      if(obj.length===0){
+        return
+      }
+      // if(this.queryParam.zt==='03'){
+      //   this.$confirm('取消接收？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() =>{
+      //     saveQgPgdXdBack(obj).then(res=>{
+      //       if(res.success){
+      //         this.$message({ message: '取消下达成功', type: 'success' })
+      //         this.initList()
+      //       }
+      //     })
+      //
+      //   })
+      // }else  {
+        this.$confirm('接收？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() =>{
+          saveQmPgdJs(obj).then(res=>{
+            if(res.success){
+              this.$message({ message: '接收成功', type: 'success' })
+              this.initList()
+            }
+          })
+
+        })
+      // }
+
+
     },
     initList() {
       if (this.queryParam.dcch === '') {
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index 19bf4e9..c191538 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -235,7 +235,10 @@ export default {
         { type: 'checkbox', width: 40 },
         { type: 'seq', width: 40, title: '序号' },
 
-
+        { field: 'sllsh', 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', },