diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js
index 070795b..ce3e3f4 100644
--- a/src/api/jhzxgl/pgd.js
+++ b/src/api/jhzxgl/pgd.js
@@ -20,23 +20,31 @@ export function saveDhPgdFk(data) {return request({url: '/pgdDh/saveDhPgdFk', me
 
 
 
-export function getSljhPgd(data) {return request({url: '/pgdSljh/getSljhPgd', method: 'post', data})}
+// export function getSljhPgd(data) {return request({url: '/pgdSljh/getSljhPgd', method: 'post', data})}
+export function getSljhPgd(data) {return request({url: '/zyjh/sljh', method: 'post', data})}
+export function getydjhByid(data) {return request({url: '/pgdSljh/getydjhByid', method: 'post', data})}
+export function getKcAndSljh(data) {return request({url: '/pgdSljh/getKcAndSljh', method: 'post', data})}
+export function kcAdnSlBd(data) {return request({url: '/pgdSljh/kcAdnSlBd', method: 'post', data})}
+export function kcAdnSlZx(data) {return request({url: '/pgdSljh/kcAdnSlZx', method: 'post', data})}
 export function saveSljhPgdXd(data) {return request({url: '/pgdSljh/saveSljhPgdXd', method: 'post', data})}
 export function saveSljhPgdXdBack(data) {return request({url: '/pgdSljh/saveSljhPgdXdBack', method: 'post', data})}
 export function saveSljhPgdFk(data) {return request({url: '/pgdSljh/saveSljhPgdFk', method: 'post', data})}
-export function saveSljhFk(data) {return request({url: '/pgdSljh/saveSljhFk', method: 'post', data})}
+// export function saveSljhFk(data) {return request({url: '/pgdSljh/saveSljhFk', method: 'post', data})}
+export function saveSljhFk(data) {return request({url: '/zyjh/slweb', method: 'post', data})}
 export function saveSljhPg(data) {return request({url: '/pgdSljh/saveSljhPg', method: 'post', data})}
 export function saveSljhPgBack(data) {return request({url: '/pgdSljh/saveSljhPgBack', method: 'post', data})}
 
 
 
-export function getPwPgd(data) {return request({url: '/pgdPwjh/getPwPgd', method: 'post', data})}
+// export function getPwPgd(data) {return request({url: '/pgdPwjh/getPwPgd', method: 'post', data})}
+export function getPwPgd(data) {return request({url: '/zyjh/pgdweb', method: 'post', data})}
 export function savePwPgdXd(data) {return request({url: '/pgdPwjh/savePwPgdXd', method: 'post', data})}
 export function savePwPgdXdBack(data) {return request({url: '/pgdPwjh/savePwPgdXdBack', method: 'post', data})}
 export function savePwPgdFk(data) {return request({url: '/pgdPwjh/savePwPgdFk', method: 'post', data})}
 export function savePwFk(data) {return request({url: '/pgdPwjh/savePwFk', method: 'post', data})}
 export function savePwjhPg(data) {return request({url: '/pgdPwjh/savePwjhPg', method: 'post', data})}
-export function savePwjhPgBack(data) {return request({url: '/pgdPwjh/savePwjhPgBack', method: 'post', data})}
+// export function savePwjhPgBack(data) {return request({url: '/pgdPwjh/savePwjhPgBack', method: 'post', data})}
+export function savePwjhPgBack(data) {return request({url: '/zyjh/zxweb', method: 'post', data})}
 
 
 export function getQgPgd(data) {return request({url: '/pgdQgjh/getQgPgd', method: 'post', data})}
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index b2c40bc..95c4cd8 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -405,6 +405,497 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
+        // 作业计划信息
+// 生产状态
+        {
+          field: 'sczt',
+          title: '生产状态',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+// 上料相关字段
+        {
+          field: 'slxzxqrq',
+          title: '上料小组需求期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'sldzxqrq',
+          title: '上料大组需求期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slkcdw',
+          title: '上料库存垛位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slcs',
+          title: '上料层数',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slxhth',
+          title: '上料小合同号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slhth',
+          title: '上料合同号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slwlh',
+          title: '上料物料号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slkcxx',
+          title: '上料库存信息',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slycldw',
+          title: '上料预处理垛位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slpgry',
+          title: '上料派工人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slfkry',
+          title: '上料反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slfkrq',
+          title: '上料反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slbz',
+          title: '上料备注',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+// 抛丸相关字段
+        {
+          field: 'pwxcldw',
+          title: '抛丸库存垛位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwcs',
+          title: '抛丸层数',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwpgry',
+          title: '抛丸派工人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        // {
+        //   field: 'slpgrq',
+        //   title: '抛丸上料派工日期',
+        //   width: 100,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination' }
+        // },
+        {
+          field: 'pwpgrq',
+          title: '抛丸派工日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwfkry',
+          title: '抛丸反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwfkrq',
+          title: '抛丸反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwbz',
+          title: '抛丸备注',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+// 理料相关字段
+        {
+          field: 'lldw',
+          title: '理料垛位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llcs',
+          title: '理料层数',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llpgry',
+          title: '理料派工人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llpgrq',
+          title: '理料派工日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llry',
+          title: '理料施工人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llfkry',
+          title: '理料反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llfkrq',
+          title: '理料反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'llbz',
+          title: '理料备注',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+// 划线相关字段
+        {
+          field: 'hxdw',
+          title: '划线垛位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxcs',
+          title: '划线层数',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxpgry',
+          title: '划线派工人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxpgrq',
+          title: '划线派工日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxfkrq',
+          title: '划线反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxfkry',
+          title: '划线反馈人员',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjybs',
+          title: '划线借用标识',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjych',
+          title: '划线借用船号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjypl',
+          title: '划线借用批量',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjyfd',
+          title: '划线借用分段',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjyzl',
+          title: '划线借用组立',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjykw',
+          title: '划线借用跨位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjytlth',
+          title: '划线借用套料图号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxbz',
+          title: '划线备注',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+// 切割相关字段
+        {
+          field: 'qgdw',
+          title: '切割垛位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgcs',
+          title: '切割层数',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgpgry',
+          title: '切割派工人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgpgrq',
+          title: '切割派工日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgfkry',
+          title: '切割反馈人',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgfkrq',
+          title: '切割反馈日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgbz',
+          title: '切割备注',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+
+
+// 曲加工相关字段
+        {
+          field: 'qgjybs',
+          title: '切割借用标识',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjych',
+          title: '切割借用船号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjypl',
+          title: '切割借用批量',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjyfd',
+          title: '切割借用分段',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjyzl',
+          title: '切割借用组立',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjykw',
+          title: '切割借用跨位',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjytlth',
+          title: '切割借用套料图号',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+// 其他标识和计划日期字段
+        {
+          field: 'qjgbs',
+          title: '曲加工标识',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pkbs',
+          title: '坡口标识',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'ycbs',
+          title: '型材标识',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'hxjhrq',
+          title: '划线计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'qgjhrq',
+          title: '切割计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'zcljhrq',
+          title: '再处理计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'sljhrq',
+          title: '上料计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'pwjhrq',
+          title: '抛丸计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'lljhrq',
+          title: '理料计划日期',
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        }
+
+
+
+
       ],
       // tableColumn2: [
       //   { type: 'seq', width: 60, title: '序号',fixed: "left"},
diff --git a/src/views/jhzxgl/pwjhD.vue b/src/views/jhzxgl/pwjhD.vue
index 6b9e14c..1f372ea 100644
--- a/src/views/jhzxgl/pwjhD.vue
+++ b/src/views/jhzxgl/pwjhD.vue
@@ -54,12 +54,12 @@
 
 
             </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-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>-->
 
 
 
@@ -112,7 +112,6 @@
           <el-col :span="4" >
             <el-form-item style="float: right" >
               <el-button type="success" @click="slpgclick">派工</el-button>
-              <el-button type="success" @click="xdClick">接收</el-button>
               <el-button type="success" @click="saveclick">反馈</el-button>
 
             </el-form-item>
@@ -177,28 +176,25 @@ export default {
     return {
       queryParam: {
         dcch:'',
-        pl:'',
-        fd:'',
-        fkyy:'',
-        zt:'01'
+        field:'',
+        user:'',
+        jhrqField:'',
+        zt:'21'
       },
       statusOptions: [
         {
-          value: "01",
-          label: "编制",
-        },
-        {
-          value: "02",
-          label: "派工",
+          value: "21",
+          label: "未派工",
         },
         {
-          value: "03",
-          label: "接收",
+          value: "31",
+          label: "未反馈",
         },
         {
-          value: "04",
-          label: "反馈",
+          value: "32",
+          label: "已反馈",
         },
+
       ],
       inParam:{
         slry:'',
@@ -228,157 +224,114 @@ export default {
       { type: 'checkbox', width: 40 },
       { type: 'seq', width: 40, title: '序号' },
 
-          { field: 'pwlsh', title: '工单号', width: 100,
+          { field: 'dcCh', 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: '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', },
-      },
-
+            filterRender: { name: 'FilterCombination', }},
 
+          { field: 'dcPl', title: '批量',width: 80,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination', }},
+          { field: 'dcFd', title: '分段号',width: 100,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination', }},
+          { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination', }},
+          { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination', }},
+          { field: 'tzbh', title: '套料图号',width: 90,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination', }},
+          { field: 'jssj', title: '前方需求时间',width: 110,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination', }},
+          // { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
+          //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          //   filterRender: { name: 'FilterCombination', }},
+          // { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+          //   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: 'scdw', title: '生产单位', width: 100,editRender: { name: 'input' },
+          { field: 'wpgg', title: '规格',width: 80,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination', }},
+
+
+          { field: 'wpxh', title: '材质',width: 80,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+
+          {
+            field: 'pwsb', title: '抛丸设备', width: 100,
+            filters: [{
+              data: {
+                checks: [],
+                sVal: '',
+                sMenu: '',
+                fType1: '',
+                fVal1: '',
+                fMode: 'and',
+                fType2: '',
+                fVal2: ''
+              }
+            }],
+
+          },{
+            field: 'pwxcldw',
+            title: '抛丸库存垛位',
+            width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
+            filterRender: { name: 'FilterCombination' }
           },
-          { field: 'scry', title: '生产人员', width: 100,editRender: { name: 'input' },
+          {
+            field: 'pwcs',
+            title: '抛丸层数',
+            width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
+            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: 'jsry', title: '接收人员', width: 100,editRender: { name: 'input' },
+          {
+            field: 'pwpgry',
+            title: '抛丸派工人',
+            width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
+            filterRender: { name: 'FilterCombination' }
           },
-          { field: 'jsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
+          {
+            field: 'pwry',
+            title: '抛丸人员',
+            width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
+            filterRender: { name: 'FilterCombination' }
           },
-
-          { field: 'fkrq', title: '反馈日期', width: 100,editRender: { name: 'input' },
+          {
+            field: 'pwpgrq',
+            title: '抛丸派工日期',
+            width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
+            filterRender: { name: 'FilterCombination' }
           },
-
-          { field: 'fkry', title: '反馈人员', width: 100, editRender: { name: 'input' },
+          {
+            field: 'pwfkry',
+            title: '抛丸反馈人',
+            width: 100,
             filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-            filterRender: { name: 'FilterCombination', },
+            filterRender: { name: 'FilterCombination' }
+          },
+          {
+            field: 'pwfkrq',
+            title: '抛丸反馈日期',
+            width: 100,
+            filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+            filterRender: { name: 'FilterCombination' }
+          },
+          {
+            field: 'pwbz',
+            title: '抛丸备注',
+            width: 100,
+            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', },
-      },
-
-
-
 
       ]
     }
@@ -392,6 +345,8 @@ export default {
     this.initBase()
 
 
+
+
   },
   methods: {
     cellClickEvent({row}) {
@@ -426,9 +381,11 @@ export default {
       if(selectRecords.length>0){
         for(let i = 0; i < selectRecords.length; i++) {
 
-          selectRecords[i].dw = this.inParam.dw
-          selectRecords[i].scdw = this.inParam.scdw
-          selectRecords[i].scry = this.inParam.scry
+         // selectRecords[i].dw = this.inParam.dw
+          //selectRecords[i].scdw = this.inParam.scdw
+          selectRecords[i].pwry = this.inParam.scry
+          selectRecords[i].pwpgry = this.name
+         // selectRecords[i].pwpgrq = this.inParam.scry
 
 
         }
@@ -485,7 +442,7 @@ export default {
 
     },
     saveclick(){
-      if(this.queryParam.zt!=='03'){
+      if(this.queryParam.zt!=='31'){
         return
       }
       let obj=this.$refs.xGrid.getCheckboxRecords()
@@ -493,7 +450,14 @@ export default {
       //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
       //   return
       // }
-      savePwFk(obj).then(res=>{
+
+      savePwjhPgBack({
+        'field': 'pwfkrq',
+        'fieldry': 'pwfkry',
+        'zxZtName':'PWFK',
+        'list':obj
+
+      }).then(res=>{
         if(res.success){
           this.initList()
         }
@@ -501,7 +465,7 @@ export default {
     },
 
     slpgclick(){
-      if(this.queryParam.zt!=="01"){
+      if(this.queryParam.zt!=="21"){
         return
       }
 
@@ -509,34 +473,41 @@ export default {
       if(obj.length===0){
         return
       }
-      if(this.queryParam.zt==='02'){
-        this.$confirm('取消派工？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() =>{
-          savePwjhPgBack(obj).then(res=>{
+      // if(this.queryParam.zt==='02'){
+      //   this.$confirm('取消派工？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() =>{
+
+          savePwjhPgBack({
+           'field': 'pwpgrq',
+           'fieldry': 'pwpgry',
+            'zxZtName':'PWPG',
+            'list':obj
+
+          }).then(res=>{
             if(res.success){
-              this.$message({ message: '取消派工成功', type: 'success' })
+              this.$message({ message: '派工成功', type: 'success' })
               this.initList()
             }
           })
 
-        })
-      }else  {
-        this.$confirm('派工？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() =>{
-          savePwjhPg(obj).then(res=>{
-            if(res.success){
-              this.initList()
-            }
-          })
-
-        })
-      }
+      //   })
+      // }else  {
+      //   this.$confirm('派工？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() =>{
+      //     savePwjhPg(obj).then(res=>{
+      //       if(res.success){
+      //         this.initList()
+      //       }
+      //     })
+      //
+      //   })
+      // }
 
 
     },
@@ -582,9 +553,17 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
-        return
+      // if (this.queryParam.dcch === '') {
+      //   this.$message.warning('选择船只编号')
+      //   return
+      // }
+      // this.
+      if(this.queryParam.zt==='21'){
+
+      }else{
+       // this.queryParam.field='pwry';
+        this.queryParam.user=this.name;
+
       }
       getPwPgd(this.queryParam).then((res) => {
         this.list = res.data
diff --git a/src/views/jhzxgl/qgjhD.vue b/src/views/jhzxgl/qgjhD.vue
index e09c0e0..f41dd1a 100644
--- a/src/views/jhzxgl/qgjhD.vue
+++ b/src/views/jhzxgl/qgjhD.vue
@@ -6,8 +6,8 @@
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
-          <el-col :span="18">
-
+          <el-col :span="22">
+            <el-col :span="4" >
               <el-form-item label="状态:">
                 <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
                   <el-option
@@ -19,7 +19,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-
+            </el-col>
             <el-form-item label="船号:">
               <vxe-pulldown ref="xDown4" transfer >
                 <template #default>
@@ -54,21 +54,20 @@
 
 
             </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-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="6">
+          <el-col :span="2">
             <el-form-item style="float: right" >
               <el-button type="success" @click="initList">查询</el-button>
-              <el-button type="success" @click="syncXiaochi">同步小池</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -104,16 +103,15 @@
 
 
             <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>-->
+            <!--            <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="slpgclick">派工</el-button>
-              <el-button type="success" @click="xdClick">接收</el-button>
               <el-button type="success" @click="saveclick">反馈</el-button>
 
             </el-form-item>
@@ -158,14 +156,13 @@
 
 <script>
 import {
-  getQgPgd,
-  saveQgdFk,
-  saveQgPgdFk,
-  saveQgPgdXd,
-  saveQgPgdXdBack,
-  saveQgjhPg,
-  saveQgjhPgBack,
-  getPgdBase, syncXiaochi, savePwjhPg
+  getPwPgd,
+  savePwFk,
+  getPgdBase,
+  savePwPgdXd,
+  savePwPgdXdBack,
+  savePwjhPg,
+  savePwjhPgBack
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -179,28 +176,25 @@ export default {
     return {
       queryParam: {
         dcch:'',
-        pl:'',
-        fd:'',
-        fkyy:'',
-        zt:'01'
+        field:'',
+        user:'',
+        jhrqField:'',
+        zt:'52'
       },
       statusOptions: [
         {
-          value: "01",
-          label: "编制",
+          value: "52",
+          label: "未派工",
         },
         {
-          value: "02",
-          label: "派工",
+          value: "61",
+          label: "未反馈",
         },
         {
-          value: "03",
-          label: "接收",
-        },
-        {
-          value: "04",
-          label: "反馈",
+          value: "62",
+          label: "已反馈",
         },
+
       ],
       inParam:{
         slry:'',
@@ -230,219 +224,117 @@ 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', },
-        },
-
-        { 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'],
+        { field: 'dcCh', title: '船号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+          filterRender: { name: 'FilterCombination', }},
 
-        { field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
+        { field: 'dcPl', title: '批量',width: 80,
           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,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'wpcz', title: '材质', width: 100,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'wpzl', title: '重量', width: 100,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qgjhrq', title: '切割计划期', width: 100,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'tzbh', title: '套料图号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jssj', title: '前方需求时间',width: 110,
           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', },
-        },
+          filterRender: { name: 'FilterCombination', }},
+        // { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
+        // { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
 
-        { field: 'hxksrq', title: '划线开始时间', width: 100,
+        { field: 'wpgg', title: '规格',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+          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: 'wpxh', title: '材质',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
 
-        { field: 'qgksrq', title: '切割开始时间', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+        {
+          field: 'pwsb', title: '抛丸设备', width: 100,
+          filters: [{
+            data: {
+              checks: [],
+              sVal: '',
+              sMenu: '',
+              fType1: '',
+              fVal1: '',
+              fMode: 'and',
+              fType2: '',
+              fVal2: ''
+            }
+          }],
 
-        { field: 'qgjsrq', title: '切割结束时间', width: 100,
+        },{
+          field: 'qgdw',
+          title: '切割垛位',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          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: 'scdw', title: '生产单位', width: 100,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'scry', title: '生产人员', width: 100,editRender: { name: 'input' },
-          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: 'jsry', title: '接收人员', width: 100,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'jsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
+        {
+          field: 'qgcs',
+          title: '切割层数',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-        { field: 'fkrq', title: '反馈日期', width: 100,editRender: { name: 'input' },
+        {
+          field: 'qgry',
+          title: '切割人员',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'fkry', title: '反馈人员', width: 100, editRender: { name: 'input' },
+        {
+          field: 'qgpgry',
+          title: '切割派工人',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          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,
+        {
+          field: 'qgpgrq',
+          title: '切割派工日期',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'bzrq', title: '编制日期', width: 100,
+        {
+          field: 'qgfkry',
+          title: '切割反馈人',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'xfry', title: '下发人', width: 100,
+        {
+          field: 'qgfkrq',
+          title: '切割反馈日期',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'xfrq', title: '下发日期', width: 100,
+        {
+          field: 'qgbz',
+          title: '切割备注',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
 
 
-
       ]
     }
   },
@@ -455,15 +347,10 @@ export default {
     this.initBase()
 
 
+
+
   },
   methods: {
-    syncXiaochi(){
-      syncXiaochi().then(res=>{
-        if (res.success){
-          this.initList()
-        }
-      })
-    },
     cellClickEvent({row}) {
       this.queryParam.dcch = row.cbbm
       this.$refs.xDown4.hidePanel()
@@ -496,9 +383,11 @@ export default {
       if(selectRecords.length>0){
         for(let i = 0; i < selectRecords.length; i++) {
 
-          selectRecords[i].dw = this.inParam.dw
-          selectRecords[i].scdw = this.inParam.scdw
-          selectRecords[i].scry = this.inParam.scry
+          // selectRecords[i].dw = this.inParam.dw
+          //selectRecords[i].scdw = this.inParam.scdw
+          selectRecords[i].qgry = this.inParam.scry
+          selectRecords[i].qgpgry = this.name
+          // selectRecords[i].pwpgrq = this.inParam.scry
 
 
         }
@@ -555,7 +444,7 @@ export default {
 
     },
     saveclick(){
-      if(this.queryParam.zt!=='03'){
+      if(this.queryParam.zt!=='61'){
         return
       }
       let obj=this.$refs.xGrid.getCheckboxRecords()
@@ -563,7 +452,14 @@ export default {
       //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
       //   return
       // }
-      saveQgdFk(obj).then(res=>{
+
+      savePwjhPgBack({
+        'field': 'qgfkrq',
+        'fieldry': 'qgfkry',
+        'zxZtName':'QGFK',
+        'list':obj
+
+      }).then(res=>{
         if(res.success){
           this.initList()
         }
@@ -571,7 +467,7 @@ export default {
     },
 
     slpgclick(){
-      if(this.queryParam.zt!=="01"){
+      if(this.queryParam.zt!=="52"){
         return
       }
 
@@ -579,34 +475,41 @@ export default {
       if(obj.length===0){
         return
       }
-      if(this.queryParam.zt==='02'){
-        this.$confirm('取消派工？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() =>{
-          saveQgjhPgBack(obj).then(res=>{
-            if(res.success){
-              this.$message({ message: '取消派工成功', type: 'success' })
-              this.initList()
-            }
-          })
-
-        })
-      }else  {
-        this.$confirm('派工？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() =>{
-          saveQgjhPg(obj).then(res=>{
-            if(res.success){
-              this.initList()
-            }
-          })
+      // if(this.queryParam.zt==='02'){
+      //   this.$confirm('取消派工？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() =>{
+
+      savePwjhPgBack({
+        'field': 'qgpgrq',
+        'fieldry': 'qgpgry',
+        'zxZtName':'QGPG',
+        'list':obj
+
+      }).then(res=>{
+        if(res.success){
+          this.$message({ message: '派工成功', type: 'success' })
+          this.initList()
+        }
+      })
 
-        })
-      }
+      //   })
+      // }else  {
+      //   this.$confirm('派工？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning'
+      //   }).then(() =>{
+      //     savePwjhPg(obj).then(res=>{
+      //       if(res.success){
+      //         this.initList()
+      //       }
+      //     })
+      //
+      //   })
+      // }
 
 
     },
@@ -625,7 +528,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
-          saveQgPgdXdBack(obj).then(res=>{
+          savePwPgdXdBack(obj).then(res=>{
             if(res.success){
               this.$message({ message: '取消下达成功', type: 'success' })
               this.initList()
@@ -639,9 +542,9 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() =>{
-          saveQgPgdXd(obj).then(res=>{
+          savePwPgdXd(obj).then(res=>{
             if(res.success){
-              this.$message({ message: '接收成功', type: 'success' })
+              this.$message({ message: '下达成功', type: 'success' })
               this.initList()
             }
           })
@@ -652,11 +555,19 @@ export default {
 
     },
     initList() {
-      if (this.queryParam.dcch === '') {
-        this.$message.warning('选择船只编号')
-        return
+      // if (this.queryParam.dcch === '') {
+      //   this.$message.warning('选择船只编号')
+      //   return
+      // }
+      // this.
+      if(this.queryParam.zt==='52'){
+
+      }else{
+        // this.queryParam.field='pwry';
+        this.queryParam.user=this.name;
+
       }
-      getQgPgd(this.queryParam).then((res) => {
+      getPwPgd(this.queryParam).then((res) => {
         this.list = res.data
         if (this.$refs.xGrid) {
           this.$refs.xGrid.loadData(this.list)
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index 05b1047..2e8f5a9 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -1,15 +1,14 @@
 <template>
-  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
   <el-container>
-    <el-header style="width: 100%; height: 80px;font-size: 12px">
+    <el-header style="width: 100%; height: 60px;font-size: 12px">
 
       <el-form :inline="true"  label-width="60px"  label-position="left">
         <el-row>
 
           <el-col :span="22">
-            <el-col :span="4" >
+            <el-col :span="5" >
               <el-form-item label="状态:">
-                <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
+                <el-select v-model="queryParam.rqopt" placeholder="状态" clearable @change="ztChange">
                   <el-option
                     v-for="item in statusOptions"
                     :key="item.value"
@@ -57,9 +56,9 @@
             <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-form-item label="跨位:">-->
+<!--              <el-input v-model="queryParam.kw" type="search" placeholder="跨位" ></el-input>-->
+<!--            </el-form-item>-->
 
 
 
@@ -73,90 +72,124 @@
         </el-row>
         <el-row>
 
-          <el-col :span="20"  >
-
-
-
-
-            <span style="width:6%" >垛位:</span>
-              <el-select v-model="inParam.dw" placeholder="垛位" clearable style="width: 15%">
-                <el-option
-                  v-for="item in this.dictData.dwxx"
-                  :key="item.dwh"
-                  :label="item.dwh"
-                  :value="item.dwh"
-                >
-                </el-option>
-              </el-select>
-
-            <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>
-          </el-col>
-          <el-col :span="4" >
-            <el-form-item style="float: right" >
-              <el-button type="success" @click="slpgclick">派工</el-button>
-              <el-button type="success" @click="xdClick">接收</el-button>
-              <el-button type="success" @click="saveclick">反馈</el-button>
-
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="20"  >-->
+
+
+
+
+<!--            <span style="width:6%" >垛位:</span>-->
+<!--            <el-select v-model="inParam.dw" placeholder="垛位" clearable style="width: 15%">-->
+<!--              <el-option-->
+<!--                v-for="item in this.dictData.ycldws"-->
+<!--                :key="item.id"-->
+<!--                :label="item.name"-->
+<!--                :value="item.id"-->
+<!--              >-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+
+            <!--            <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>-->
+<!--          </el-col>-->
+<!--          <el-col :span="4"  >-->
+<!--            <el-form-item style="float: right" >-->
+<!--              &lt;!&ndash;              <el-button type="success" @click="slpgclick">派工</el-button>&ndash;&gt;-->
+<!--              &lt;!&ndash;              <el-button type="success" @click="xdClick">接收</el-button>&ndash;&gt;-->
+<!--              <el-button type="success" @click="saveclick">反馈</el-button>-->
+
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
       </el-form>
     </el-header>
-    <el-container  style="padding-top: 0px">
+    <el-container :style="defaultHeight" style="margin-top: 10px">
       <el-container>
         <el-main>
-          <div class="mytable">
+
+          <div class="mytableLfet" style="width: 60%">
+
             <vxe-grid
               id="id"
               ref="xGrid"
               border
               resizable
               keep-source
-              :align="'center'"
               :height="height"
               :auto-resize="true"
-              :columns="tableColumn"
-              highlight-current-row
-              :data="list"
+              :columns="tableColumn1"
+              :data="tableOne"
               :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
+              :custom-config="{storage: true}"
+
               highlight-hover-row
-              show-overflow
-              show-header-overflow
+              highlight-current-row
+              @current-change="rowClick"
+              :header-cell-style="{'text-align':'center'}"
 
             >
-
-
+<!--              <template #operation="{ row }">-->
+<!--                <vxe-button type="text" icon="vxe-icon&#45;&#45;check" @click="tjClcik(row)" />-->
+<!--              </template>-->
             </vxe-grid>
+            <el-button type="success" @click="hdClick()">核对</el-button>
+<!--            <el-button type="danger" @click="delOne('insert')">删除</el-button>-->
+            <el-button type="success" @click="saveOne()">保存</el-button>
           </div>
 
 
+          <div class="mytableLfet" style="width: 40%">
+
+            <vxe-grid
+              id="id1"
+              ref="xGrid1"
+              border
+              resizable
+              keep-source
+              :scroll-y="{enabled: true}"
+              :height="height"
+              :columns="tableColumn2"
+              :data="tableTwo"
+              :custom-config="{storage: true}"
+              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true,showIcon:false}"
+              highlight-hover-row
+              show-overflow
+              highlight-current-row
+              :header-cell-style="{'text-align':'center'}"
+            >
+<!--              <template #operation="{ row }">-->
+<!--                <vxe-button type="text" icon="vxe-icon&#45;&#45;plus" @click="openMat(row)" />-->
+<!--              </template>-->
+            </vxe-grid>
+<!--            <el-button type="success" @click="addTwo()">增加</el-button>-->
+<!--            <el-button type="danger" @click="delTwo('insert')">删除</el-button>-->
+          </div>
         </el-main>
       </el-container>
     </el-container>
+
   </el-container>
+
 </template>
 
 <script>
@@ -166,7 +199,7 @@ import {
   saveSljhPgdXd,
   saveSljhPgdXdBack,
   saveSljhFk,
-  getPgdBase, saveSljhPg,saveSljhPgBack
+  getPgdBase, saveSljhPg, saveSljhPgBack, getKcAndSljh, kcAdnSlBd, kcAdnSlZx,getydjhByid
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -181,27 +214,19 @@ export default {
       queryParam: {
         dcch:'',
         pl:'',
-        fd:'',
-        fkyy:'',
-        zt:'01'
+        kw:'',
+        sljhrq:'',
+        rqopt:'01'
       },
       statusOptions: [
         {
           value: "01",
-          label: "编制",
+          label: "未核对",
         },
         {
           value: "02",
-          label: "派工",
-        },
-        {
-          value: "03",
-          label: "接收",
-        },
-        {
-          value: "04",
-          label: "反馈",
-        },
+          label: "已核对",
+        }
       ],
       inParam:{
         slry:'',
@@ -212,6 +237,9 @@ export default {
         scdw:''
       },
       list: [],
+      tableOne: [],
+      bdbs: "",
+      tableTwo: [],
       heads: { token: getToken() },
       uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
       dictData:{},
@@ -226,196 +254,293 @@ export default {
           },
         },
       ],
-      tableColumn: [
-        { type: 'checkbox', width: 40 },
-        { type: 'seq', width: 40, title: '序号' },
+      tableColumn2: [
+        { type: 'seq', width: '40px', title: '序号' },
+        // { field: 'id', title: 'id',width: 80,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+        // { field: 'zt', title: '状态',width: 80,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
+        { field: 'dcCh', title: '船号',width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination', }},
 
-        { field: 'sllsh', title: '工单号', width: 100,
+        { field: 'dcPl', title: '批量',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'czbh', title: '船号', width: 100,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'dcFd', title: '分段号',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'pl', title: '批量', width: 100,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'zl', title: '组立',width: 80,formatter: ['dictFormat','ZLLB'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'fd', title: '分段', width: 100,
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'tzbh', title: '套料图号',width: 90,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'lqlb', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
+          filterRender: { name: 'FilterCombination', }},
+        { field: 'jssj', title: '前方需求时间',width: 110,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+          filterRender: { name: 'FilterCombination', }},
+        // { field: 'lqlb', title: '领取类型',width: 90,formatter: ['dictFormat','CLlQ'],
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
+        // { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        //   filterRender: { name: 'FilterCombination', }},
 
-        { field: 'kw', title: '跨位', width: 100,formatter: ['dictFormat','QGKW'],
+        { field: 'wpgg', title: '规格',width: 80,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
+          filterRender: { name: 'FilterCombination', }},
+
+
+        { field: 'wpxh', title: '材质',width: 80,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],},
 
-        { field: 'tlth', title: '套料图号', width: 100,
+        {
+          field: 'slkcdw',
+          title: '上料库存垛位',
+          editRender: {
+            name: '$select', options: [],
+            optionProps: {value: 'id', label: 'name'},
+            props: {clearable: true}
+            , events: {change: this.selectChange}
+          },
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'wpgg', title: '规格', width: 100,
+        {
+          field: 'slcs',
+          title: '上料层数',editRender: { name: 'input' },
+          width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'wpcz', title: '材质', width: 100,
+        {
+          field: 'slxhth',
+          title: '上料小合同号',
+          width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'wpzl', title: '重量', width: 100,
+        {
+          field: 'slhth',
+          title: '上料合同号',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'hth', title: '合同号', width: 100,
+        {
+          field: 'slwlh',
+          title: '上料物料号',
+          width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'xhth', title: '小合同号', width: 100,
+        {
+          field: 'slkcxx',
+          title: '上料库存信息',
+          width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'lph', title: '炉批号/物料号', width: 100,
+        {
+          field: 'slycldw',
+          title: '上料预处理垛位',
+          width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'kwh', title: '库存垛位', width: 100,
+        {
+          field: 'slpgry',
+          title: '上料派工人',
+          width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'cs', title: '层数', width: 100,
+        {
+          field: 'slfkry',
+          title: '上料反馈人',
+          width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'jpbs', title: '校平标识', width: 100,
+        {
+          field: 'slfkrq',
+          title: '上料反馈日期',
+          width: 120,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'slfzry', title: '上料负责人', width: 100,
+        {
+          field: 'slbz',
+          title: '上料备注',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
-
-        { field: 'slwz', title: '上料位置', width: 100,
+        {
+          field: 'sljhrq',
+          title: '上料计划日期',
+          width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' }
         },
+      ],
+      tableColumn1: [
+        { type: 'seq', width: 40, title: '序号' }, // 1
+        // { title: '操作', width: 50, slots: { default: 'operation' }, fixed: 'right' },
+        {
+          title: '入库日期',
+          width: "120px",
+          field: 'rkrq',
 
-        { field: 'sljhrq', title: '上料计划期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '车号',
+          width: "100px",
+          field: 'dcTpbh',
 
-        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '合同号',
+          width: "120px",
+          field: 'dcFd',
 
-        { field: 'qfxqrqdz', title: '前方需求大组期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
 
+        {
+          title: '小合同号',
+          width: "120px",
+          field: 'gcddh',
 
-
-        // { field: 'slksrq', title: '上料开始', width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        { field: 'dw', title: '垛位', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '船号',
+          width: "100px",
+          field: 'dcch',
 
-        { field: 'scdw', title: '生产单位', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
-        { field: 'scry', title: '生产人员', width: 100,editRender: { name: 'input' },
+        {
+          title: '材质',
+          width: "100px",
+          field: 'wpxh',
+
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          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: 'jsry', title: '接收人员', width: 100,editRender: { name: 'input' },
+        {
+          title: '规格',
+          width: "100px",
+          field: 'wpgg',
+
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
-        { field: 'jsrq', title: '接收日期', width: 100,editRender: { name: 'input' },
+        {
+          title: '炉批号',
+          width: "120px",
+          field: 'lph',
+
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '数量',
+          width: "100px",
+          field: 'qxkcl',
 
-        { field: 'fkrq', title: '反馈日期', width: 100,editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '库存',
+          width: "100px",
+          field: 'kwh',
 
-        { field: 'fkry', title: '反馈人员', width: 100, editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '层数',
+          width: "100px",
+          field: 'cfcs1',
 
-        { field: 'zt', title: '状态', width: 100,formatter: ['dictFormat','PGZT'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '打印单',
+          width: "100px",
+          field: 'sllsh',
 
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
 
+        {
+          title: '套料图号',
+          width: "120px",
+          field: 'dcTh',
 
-        { field: 'bzry', title: '编制人', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '需求船只',
+          width: "120px",
+          field: 'zych',
 
-        { field: 'bzrq', title: '编制日期', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
+        {
+          title: '需求批量',
+          width: "120px",
+          field: 'zypl',
 
-        { field: 'xfry', title: '下发人', width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
-
-        { field: 'xfrq', title: '下发日期', width: 100,
+        {
+          title: '流向',
+          width: "120px",
+          field: 'zylx',
+          formatter: ['dictFormat', 'ZLLB'],
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        },
+        {
+          title: '切割跨位',
+          width: "120px",
+          field: 'sldw',
+          formatter: ['dictFormat', 'QGKW'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
+          filterRender: { name: 'FilterCombination' },
         },
 
 
 
+        {
+          title: '备注',
+          width: "120px",
+          field: 'bz',
 
-      ]
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' },
+        }
+      ],
     }
   },
   computed: {
@@ -440,7 +565,7 @@ 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)
       }
@@ -461,9 +586,10 @@ export default {
       if(selectRecords.length>0){
         for(let i = 0; i < selectRecords.length; i++) {
 
-            selectRecords[i].dw = this.inParam.dw
-            selectRecords[i].scdw = this.inParam.scdw
-            selectRecords[i].scry = this.inParam.scry
+          selectRecords[i].slkcdw = this.inParam.dw
+          //selectRecords[i].dw = this.inParam.dw
+          //selectRecords[i].scdw = this.inParam.scdw
+          // selectRecords[i].scry = this.inParam.scry
 
 
         }
@@ -506,6 +632,9 @@ export default {
         this.dictData = res.data
         this.projectData=res.data.cbbm
         this.projectData1=res.data.cbbm
+
+        // const slkcdw = this.$refs.xGrid.getColumnByField('slkcdw')
+        // slkcdw.editRender.options = this.dictData.ycldws
       })
     },
     plClick(){
@@ -520,7 +649,7 @@ export default {
     },
     saveclick(){
 
-      if(this.queryParam.zt!=='03'){
+      if(this.queryParam.zt!=='2'){
         return ;
       }
       let obj=this.$refs.xGrid.getCheckboxRecords()
@@ -531,6 +660,7 @@ export default {
       saveSljhFk(obj).then(res=>{
         if(res.success){
           this.initList()
+
         }
       })
     },
@@ -574,6 +704,27 @@ export default {
       }
 
 
+    },
+    async    rowClick({ column, row }) {
+      if(this.queryParam.rqopt==="02"){
+          if(row.ydid==='' || row.ydid==null){
+            this.$refs.xGrid1.setCurrentRow();
+          }
+        getydjhByid({"id":row.ydid}).then(res=>{
+          if(res.success){
+            let subObj=this.$refs.xGrid1.getTableData().visibleData
+            for(let obj of subObj){
+              console.log(obj)
+              console.log(res.data)
+              // console.log(Object.assign(this.testClone(updateobj),obj))
+              if(obj.id===res.data.id){
+                this.$refs.xGrid1.setCurrentRow( obj);
+              }
+            }
+
+          }
+        })
+      }
     },
     xdClick(){
 
@@ -617,19 +768,86 @@ export default {
 
     },
     initList() {
+      this.bdbs=""
       if (this.queryParam.dcch === '') {
         this.$message.warning('选择船只编号')
         return
       }
-      getSljhPgd(this.queryParam).then((res) => {
-        this.list = res.data
+      getKcAndSljh(this.queryParam).then((res) => {
+        this.tableOne = res.data.slkcs
+        console.log(this.tableOne)
+
+        this.tableTwo = res.data.ydjhs
+        console.log(this.tableTwo)
         if (this.$refs.xGrid) {
-          this.$refs.xGrid.loadData(this.list)
+          this.$refs.xGrid.loadData(this.tableOne)
+          console.log(this.list)
+        }
+        if (this.$refs.xGrid1) {
+          this.$refs.xGrid1.loadData(this.tableTwo)
           console.log(this.list)
         }
 
       })
     },
+    hdClick(){
+      if(this.queryParam.rqopt!=='01'){
+        return
+      }
+
+      if(this.bdbs=='01'){
+        this.$message({ message: '核对结果未保存，重新查询后进行核对', type: 'warning' })
+        return
+      }
+      console.log(this.$refs.xGrid.getTableData())
+      kcAdnSlBd({
+        // "data1":this.$refs.xGrid.getTableData().visibleData,
+        // "data2":this.$refs.xGrid1.getTableData().visibleData
+        "data1":this.$refs.xGrid.getTableData().fullData,
+        "data2":this.$refs.xGrid1.getTableData().fullData
+      }).then((res) => {
+        if(res.success){
+          this.tableOne = res.data.slkcs
+          console.log(this.tableOne)
+
+          this.tableTwo = res.data.ydjhs
+          console.log(this.tableTwo)
+          if (this.$refs.xGrid) {
+            this.$refs.xGrid.loadData(this.tableOne)
+            console.log(this.list)
+          }
+          if (this.$refs.xGrid1) {
+            this.$refs.xGrid1.loadData(this.tableTwo)
+            console.log(this.list)
+          }
+
+          this.bdbs="01"
+        }
+
+
+      })
+    },
+    saveOne(){
+      if(this.queryParam.rqopt!=='01'){
+        return
+      }
+      if(this.bdbs!=='01'){
+        this.$message({ message: '请先进行核对', type: 'warning' })
+        return
+      }
+
+      kcAdnSlZx({
+        // "data1":this.$refs.xGrid.getTableData().visibleData,
+        // "data2":this.$refs.xGrid1.getTableData().visibleData
+        "data1":this.$refs.xGrid.getTableData().fullData,
+        "data2":this.$refs.xGrid1.getTableData().fullData
+      }).then((res) => {
+       // if(res.success){
+          this.initList()
+        //}
+
+      })
+    },
     selectChange(row) {
       // this.$refs.xGrid.clearActived() // 清除单元格激活状态
       this.$refs.xGrid.clearEdit() // 清除单元格激活状态
@@ -643,6 +861,7 @@ export default {
   }
 }
 </script>
+
 <style lang="scss" scoped >
 
 .el-header{margin:0;padding: 5px;height:auto;
diff --git a/src/views/sjzx/bclqCX.vue b/src/views/sjzx/bclqCX.vue
index f24fcde..aa164b8 100644
--- a/src/views/sjzx/bclqCX.vue
+++ b/src/views/sjzx/bclqCX.vue
@@ -204,7 +204,7 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },
-        { field: 'lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','ZLLB'],
+        { field: 'lqlbZ', title: '领取类别', width: 100,formatter: ['dictFormat','CLlQ'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', },
         },