diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js
index 239fa4f..eba2e0e 100644
--- a/src/api/jhzxgl/pgd.js
+++ b/src/api/jhzxgl/pgd.js
@@ -25,6 +25,8 @@ export function saveDhPgdFk(data) {return request({url: '/pgdDh/saveDhPgdFk', me
 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 slPrint(data) {return request({url: '/pgdSljh/slPrint', method: 'post', data})}
+export function slPrintqx(data) {return request({url: '/pgdSljh/slPrintqx', method: 'post', data})}
+export function slPrintD(data) {return request({url: '/pgdSljh/slPrintD', method: 'post', data})}
 export function getKcAndSljh(data) {return request({url: '/pgdSljh/getKcAndSljh', method: 'post', data})}
 export function getKcAndSljh1(data) {return request({url: '/pgdSljh/getKcAndSljh1', method: 'post', data})}
 export function kcAdnSlBd(data) {return request({url: '/pgdSljh/kcAdnSlBd', method: 'post', data})}
diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue
index f9b88a4..14dde21 100644
--- a/src/views/jhzx/ydjhzxCX.vue
+++ b/src/views/jhzx/ydjhzxCX.vue
@@ -119,6 +119,40 @@ export default {
         { field: 'jssj', title: '前方需求时间',width: 110,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
+        {
+          field: 'slkcdw',
+          title: '上料库存垛位',
+          editRender: { name: 'input' },
+          width: 100,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slcs',
+          title: '上料层数',editRender: { name: 'input' },
+          width: 120,
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+        {
+          field: 'slhth',
+          title: '上料合同号',
+          width: 100,  editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+        {
+          field: 'slwlh',
+          title: '上料物料号',
+          width: 120,  editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
+
+
+
+
         { field: 'slrq', title: '上料计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
diff --git a/src/views/jhzxgl/sljhD.vue b/src/views/jhzxgl/sljhD.vue
index 692b32e..5666f6b 100644
--- a/src/views/jhzxgl/sljhD.vue
+++ b/src/views/jhzxgl/sljhD.vue
@@ -84,6 +84,7 @@
           <!--            <el-button type="danger" @click="delOne('insert')">删除</el-button>-->
           <el-button type="success" @click="saveOne()">保存</el-button>
           <el-button type="success" @click="print()">打印</el-button>
+<!--          <el-button type="success" @click="printPd()">盘点打印</el-button>-->
         </el-col>
 <!--        <el-col :span="10">-->
 
@@ -253,6 +254,25 @@
 
           <div class="mytableLfet" style="width: 100%">
 
+<!--            <vxe-grid-->
+<!--              id="id"-->
+<!--              ref="xGrid"-->
+<!--              border-->
+<!--              resizable-->
+<!--              keep-source-->
+<!--              :height="height"-->
+<!--              :auto-resize="true"-->
+<!--              :columns="tableColumn1"-->
+<!--              :data="tableOne"-->
+<!--              :scroll-y="{enabled: true}"-->
+<!--              :custom-config="{storage: true}"-->
+<!--              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"-->
+<!--              highlight-hover-row-->
+<!--              highlight-current-row-->
+<!--              @current-change="rowClick"-->
+<!--              :header-cell-style="{'text-align':'center'}"-->
+
+<!--            >-->
             <vxe-grid
               id="id"
               ref="xGrid"
@@ -264,7 +284,7 @@
               :columns="tableColumn1"
               :data="tableOne"
               :scroll-y="{enabled: true}"
-              :custom-config="{storage: true}"
+
               :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
               highlight-hover-row
               highlight-current-row
@@ -334,7 +354,7 @@ import {
   getKcAndSljh1,
   slPrint,
   kcAdnSlBd1,
-  kcAdnSlBd2
+  kcAdnSlBd2, slPrintqx
 } from '@/api/jhzxgl/pgd'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
@@ -465,13 +485,7 @@ export default {
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
-        {
-          field: 'slxhth',
-          title: '上料小合同号',
-          width: 120,  editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
+
         {
           field: 'slhth',
           title: '上料合同号',
@@ -577,7 +591,7 @@ export default {
 
         {
           title: '期量',
-          width: "90px",
+          width: "70px",
           field: 'dzwz',
           formatter: ['dictFormat','DHQL'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -602,7 +616,7 @@ export default {
         },
         {
           title: '规格',
-          width: "80px",
+          width: "100px",
           field: 'wpgg',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -618,7 +632,7 @@ export default {
         },
         {
           title: '数量',
-          width: "70px",
+          width: "50px",
           field: 'qxkcl',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -626,7 +640,7 @@ export default {
         },
         {
           title: '库存',
-          width: "70px",
+          width: "50px",
           field: 'kwh',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -634,7 +648,7 @@ export default {
         },
         {
           title: '层数',
-          width: "100px",
+          width: "50px",
           field: 'cfcs1',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -642,7 +656,7 @@ export default {
         },
         {
           title: '打印单',
-          width: "100px",
+          width: "70px",
           field: 'sllsh',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -651,7 +665,7 @@ export default {
 
         {
           title: '套料图号',
-          width: "120px",
+          width: "70px",
           field: 'dcth',
           editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -659,7 +673,7 @@ export default {
         },
         {
           title: '需求船只',
-          width: "120px",
+          width: "70px",
           field: 'zych',
           editRender: {
             name: '$select', options: [],
@@ -672,7 +686,7 @@ export default {
         },
         {
           title: '需求批量',
-          width: "120px",
+          width: "70px",
           field: 'zypl',
           editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -680,7 +694,7 @@ export default {
         },
         {
           title: '流向',
-          width: "120px",
+          width: "70px",
           field: 'zylx',
           editRender: {
             name: '$select', options: [],
@@ -693,7 +707,7 @@ export default {
         },
         {
           title: '切割跨位',
-          width: "120px",
+          width: "70px",
           field: 'sldw',
           formatter: ['dictFormat', 'QGKW'],
           editRender: {
@@ -707,7 +721,7 @@ export default {
         },
         {
           title: '抛丸位置',
-          width: "120px",
+          width: "70px",
           field: 'pwwz',
           formatter: ['dictFormat', 'PWWZ'],
           editRender: {
@@ -721,7 +735,7 @@ export default {
         },
         {
           title: '计划日期',
-          width: "120px",
+          width: "70px",
           field: 'dhh',
           editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -729,7 +743,7 @@ export default {
         },
         {
           title: '物品状态',
-          width: "120px",
+          width: "70px",
           field: 'wpzt',
           formatter: ['dictFormat', 'WPZT'],
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -738,7 +752,7 @@ export default {
 
         {
           title: '备注',
-          width: "120px",
+          width: "70px",
           field: 'bz',
           editRender: { name: 'input' },
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -747,7 +761,7 @@ export default {
 
         {
           title: '入库日期',
-          width: "120px",
+          width: "70px",
           field: 'rkrq',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@@ -755,12 +769,19 @@ export default {
         },
         {
           title: '车号',
-          width: "100px",
+          width: "70px",
           field: 'dcTpbh',
 
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },
         },
+        {
+          field: 'slxhth',
+          title: '上料小合同号',
+          width: 100,  editRender: { name: 'input' },
+          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+          filterRender: { name: 'FilterCombination' }
+        },
         {
           title: '生产id',
           width: "120px",
@@ -967,6 +988,20 @@ export default {
     },
     print(){
 
+
+      if(this.queryParam.rqopt=='03'){  // 取消打印
+        let selectRecords = this.$refs.xGrid.getCheckboxRecords()
+        if(selectRecords.length>0){
+          slPrintqx(selectRecords).then(res=>{
+            if(res.success){
+              this.initList()
+            }
+
+          })
+        }
+      }
+
+
       if(this.queryParam.rqopt!='02'){
         return
       }