diff --git a/src/api/zyjh.js b/src/api/zyjh.js
index 6adfe3a..e429fb6 100644
--- a/src/api/zyjh.js
+++ b/src/api/zyjh.js
@@ -48,6 +48,14 @@ export const getSljhPgd=function(data={}){
   })
 }
 
+export const getDw=function(data={}){
+  return request({
+    url: '/zyjh/dw',
+    method: 'get',
+    params:data
+  })
+}
+
 export const getYcldw=function(data={}){
   return request({
     url: '/zyjh/ycldw',
diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue
index 1d53639..f9b88a4 100644
--- a/src/views/jhzx/ydjhzxCX.vue
+++ b/src/views/jhzx/ydjhzxCX.vue
@@ -110,19 +110,31 @@ export default {
         { 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'],
+        { field: 'slrq', title: '上料计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+        { field: 'pwrq', title: '抛丸计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
+        { field: 'hxrq', title: '划线计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'tzbh', title: '套料图号',width: 90,
+        { field: 'qgrq', title: '切割计划日期',width: 100,
+          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: 'wpgg', title: '规格',width: 80,
@@ -151,18 +163,6 @@ export default {
         { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
           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', }},
-        { field: 'pwrq', title: '抛丸计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hxrq', title: '划线计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgrq', title: '切割计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
         { field: 'jzsb', title: '矫正设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
diff --git a/src/views/jhzx/ydjhzxGL.vue b/src/views/jhzx/ydjhzxGL.vue
index 6dedaa0..1fb9277 100644
--- a/src/views/jhzx/ydjhzxGL.vue
+++ b/src/views/jhzx/ydjhzxGL.vue
@@ -231,19 +231,31 @@ export default {
         { 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'],
+        { field: 'sljhrq', title: '上料计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+        { field: 'pwjhrq', title: '抛丸计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
+        { field: 'hxjhrq', title: '划线计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'tzbh', title: '套料图号',width: 90,
+        { field: 'qgjhrq', title: '切割计划日期',width: 100,
+          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: 'wpgg', title: '规格',width: 80,
@@ -272,18 +284,6 @@ export default {
         { field: 'qgcdKc', 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: 'pwrq', title: '抛丸计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hxrq', title: '划线计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgrq', title: '切割计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
         { field: 'jzsb', title: '矫正设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
@@ -1193,7 +1193,7 @@ export default {
         { field: 'jzsb', title: '矫正设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
-        { field: 'slrq', title: '上料计划日期',width: 100,
+        { field: 'sljhrq', title: '上料计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
         // { field: 'pw', title: '抛丸位置',width: 100,
diff --git a/src/views/jhzx/ydjhzxXF.vue b/src/views/jhzx/ydjhzxXF.vue
index 1189575..7505bff 100644
--- a/src/views/jhzx/ydjhzxXF.vue
+++ b/src/views/jhzx/ydjhzxXF.vue
@@ -268,19 +268,31 @@ export default {
         { 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'],
+        { field: 'slrq', title: '上料计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'lx', title: '物资类型',width: 90,formatter:this.formatterLx,
+        { field: 'pwrq', title: '抛丸计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'kw', title: '跨位',width: 80,formatter: ['dictFormat','QGKW'],
+        { field: 'hxrq', title: '划线计划日期',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination', }},
-        { field: 'tzbh', title: '套料图号',width: 90,
+        { field: 'qgrq', title: '切割计划日期',width: 100,
+          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: 'wpgg', title: '规格',width: 80,
@@ -309,18 +321,6 @@ export default {
         { field: 'qgcdKc', title: '切割空程长度（米)',width: 100,
           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', }},
-        { field: 'pwrq', title: '抛丸计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'hxrq', title: '划线计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
-        { field: 'qgrq', title: '切割计划日期',width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', }},
         { field: 'jzsb', title: '矫正设备',width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' },editRender: { name: "$select",options: [],props: { clearable: true} }},
diff --git a/src/views/kban/comps/GxChanLiang.vue b/src/views/kban/comps/GxChanLiang.vue
index cdb7f19..ae719a6 100644
--- a/src/views/kban/comps/GxChanLiang.vue
+++ b/src/views/kban/comps/GxChanLiang.vue
@@ -370,23 +370,23 @@ export default {
         }
       }
       let d1=data.上料.num.number[0]/totalZl*100
-      d1=d1<1?1:d1
+      d1=d1>0&&d1<1?1:d1
       data.上料.ring.series[0].data[0].value=parseFloat(d1.toFixed(2))
 
       let d2=data.上料.num.number[0]/totalZl*100
-      d2=d2<1?1:d2
+      d2=d2>0&&d2<1?1:d2
       data.抛丸.ring.series[0].data[0].value=parseFloat(d2.toFixed(2))
 
       let d3=data.上料.num.number[0]/totalZl*100
-      d3=d3<1?1:d3
+      d3=d3>0&&d3<1?1:d3
       data.理料.ring.series[0].data[0].value=parseFloat(d3.toFixed(2))
 
       let d4=data.上料.num.number[0]/totalZl*100
-      d4=d4<1?1:d4
+      d4=d4>0&&d4<1?1:d4
       data.划线.ring.series[0].data[0].value=parseFloat(d4.toFixed(2))
 
       let d5=data.上料.num.number[0]/totalZl*100
-      d5=d5<1?1:d5
+      d5=d5>0&&d5<1?1:d5
       data.切割.ring.series[0].data[0].value=parseFloat(d5.toFixed(2))
       return data
     },
diff --git a/src/views/kban/comps/MainChanLian.vue b/src/views/kban/comps/MainChanLian.vue
index 8b49ce5..77ce767 100644
--- a/src/views/kban/comps/MainChanLian.vue
+++ b/src/views/kban/comps/MainChanLian.vue
@@ -14,12 +14,7 @@ export default {
     return {
       show:false,
       config: {
-        data: [
-          {
-            name: '上料',
-            value: 120
-          },
-        ],
+        data: [],
         rowNum: 9
       },
       delay:null
diff --git a/src/views/sjzx/tzjhGL.vue b/src/views/sjzx/tzjhGL.vue
index 17bffed..b0f996b 100644
--- a/src/views/sjzx/tzjhGL.vue
+++ b/src/views/sjzx/tzjhGL.vue
@@ -97,7 +97,7 @@ export default {
       request: {
         dcCh: "",
         dcPl:"",
-        Zt: "",
+        Zt: "0",
       },
       list: [],
       height: "500px",
diff --git a/src/views/sjzx/tzjhSH.vue b/src/views/sjzx/tzjhSH.vue
index 8da050c..89f8b99 100644
--- a/src/views/sjzx/tzjhSH.vue
+++ b/src/views/sjzx/tzjhSH.vue
@@ -97,7 +97,7 @@ export default {
       request: {
         dcCh: "",
         dcPl:"",
-        Zt: "",
+        Zt: "1",
       },
       list: [],
       height: "500px",
diff --git a/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue b/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
index 81c317a..c696054 100644
--- a/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
+++ b/src/views/zyjhzx/pwanfkui/comps/PwanPgd.vue
@@ -4,7 +4,7 @@
 
 <script>
 import paoWanPgdConfig from './pgdTable'
-import {getPgd} from "@/api/zyjh";
+import {getDw, getPgd, getYcldw} from "@/api/zyjh";
 export default {
   name:'PwanPgd',
   props:{
@@ -27,6 +27,9 @@ export default {
   },
   methods:{
     initData(worker,zt){
+      getDw({type:'ycl'}).then(res=>{
+        this.gridOptions.ycldw=res.data
+      })
       getPgd({user:worker,zt:zt,field:'pwry'}).then(res=>{
         this.gridOptions.data=res.data
         this.setExt('workers',this.$props.workers)
diff --git a/src/views/zyjhzx/pwanfkui/comps/pgdTable.js b/src/views/zyjhzx/pwanfkui/comps/pgdTable.js
index 0e597f1..e262bb3 100644
--- a/src/views/zyjhzx/pwanfkui/comps/pgdTable.js
+++ b/src/views/zyjhzx/pwanfkui/comps/pgdTable.js
@@ -9,8 +9,10 @@ export default function () {
     size:'mini',
     showOverflow: true,
     scrollY:{enable:true},
-    data:[]
+    data:[],
+    ycldw:[]
   }
+
   const ext={}
   const setExt=function (key,value){
     ext[key]=value
@@ -29,6 +31,14 @@ export default function () {
       }
     }
   }
+  const dwFormat=function ({cellValue}){
+    for (const item of options.ycldw) {
+      if (cellValue===item.id){
+        return item.name
+      }
+    }
+    return cellValue
+  }
   const ztFormat=function ({cellValue}){
     return ztEnmu[cellValue]
   }
@@ -39,21 +49,21 @@ export default function () {
   const columns = [
     { type: 'checkbox', width: 40 },
     { type: 'seq',title:'序号', width: 60 },
-    { field: 'gdh',title:'派工单号', width: 120,formatter: gdhFormat},
-    {field: '', title: '抛丸位置', width: 80},
-    {field: '', title: '垛位', width: 60},
-    {field: '', title: '层数', width: 60},
+    { field: 'djh',title:'派工单号', width: 120,formatter: gdhFormat},
+    {field: 'slycldw', title: '垛位', width: 60,formatter: dwFormat},
+    {field: 'slyclcs', title: '层数', width: 60},
     {field: 'dcCh', title: '船号', width: 80},
     {field: 'dcPl', title: '批量', width: 80},
-    {field: '', title: '材质', width: 80},
-    {field: '', title: '规格', width: 100},
-    {field: '', title: '炉批号', width: 100},
+    {field: 'wpgg', title: '材质', width: 80},
+    {field: 'wpxh', title: '规格', width: 70},
+    {field: 'slwlh', title: '炉批号', width: 100},
     {field: 'tzbh', title: '套料图号', width: 100},
     {field: 'pwry', title: '接收人', width: 80,formatter:nameFormat},
     {field: 'pwpgrq', title: '接收时间', width: 100},
-    {field: 'pwfkr', title: '反馈人', width: 80,formatter:nameFormat},
-    {field: 'pwfkrq', title: '反馈时间', width: 100},
-    {field: 'zt', title: '状态', width: 60,formatter:ztFormat},
+    {field: 'pwfkry', title: '反馈人', width: 80,formatter:nameFormat},
+    {field: 'pwfksj', title: '反馈时间', width: 100},
+    {field: 'pgr', title: '派工人', width: 80},
+    {field: 'pwpgrq', title: '派工时间', width: 100},
   ]
 
   return {
diff --git a/src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue b/src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue
index 25b920a..619d945 100644
--- a/src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue
+++ b/src/views/zyjhzx/pwanpgong/comps/PwanPgd.vue
@@ -5,7 +5,7 @@
 <script>
 import { VXETable } from 'vxe-table'
 import paoWanPgdConfig from './pgdTable'
-import {getPgd, zx} from "@/api/zyjh";
+import {getDw, getPgd, getYcldw, zx} from "@/api/zyjh";
 
 export default {
   name:'PwanPgd',
@@ -13,6 +13,10 @@ export default {
     worker:{
       type:Function,
       default:function (){}
+    },
+    workers:{
+      type:Array,
+      default:[]
     }
   },
   data(){
@@ -20,18 +24,24 @@ export default {
       type:'pwpg',
       gridOptions:{},
       list:{},
+      setExt:null,
     }
   },
   created(){
-    const {options,columns}=paoWanPgdConfig()
+    const {options,columns,setExt}=paoWanPgdConfig()
+    this.setExt=setExt
     this.gridOptions=options
     this.gridOptions.columns=columns
     this.initData()
   },
   methods:{
     initData(){
+      getDw({type:'ycl'}).then(res=>{
+        this.gridOptions.ycldw=res.data
+      })
       getPgd({zt:'21'}).then(res=>{
         this.gridOptions.data=res.data
+        this.setExt('workers',this.$props.workers)
       })
     },
     checkboxAll({checked}){
diff --git a/src/views/zyjhzx/pwanpgong/comps/pgd.js b/src/views/zyjhzx/pwanpgong/comps/pgd.js
index 485a705..c1cfdd2 100644
--- a/src/views/zyjhzx/pwanpgong/comps/pgd.js
+++ b/src/views/zyjhzx/pwanpgong/comps/pgd.js
@@ -91,7 +91,7 @@ export default function (width,height){
       width:_width-48,
       height:15,
       fill:'#fff',
-      text:`单号:${data.gdh?'PW_'+data.gdh:''}`,
+      text:`单号:${data.djh?'PW'+data.djh:''}`,
       align:'left',
       fontSize:12,
     })
@@ -121,7 +121,7 @@ export default function (width,height){
     group0.add(group7)
     const group8=drawQz(data)
     group0.add(group8)
-    generateQRCode(data.gdh,group0)
+    generateQRCode(data.djh,group0)
     return group
   }
 
diff --git a/src/views/zyjhzx/pwanpgong/comps/pgdTable.js b/src/views/zyjhzx/pwanpgong/comps/pgdTable.js
index 2daeed0..e23d0d2 100644
--- a/src/views/zyjhzx/pwanpgong/comps/pgdTable.js
+++ b/src/views/zyjhzx/pwanpgong/comps/pgdTable.js
@@ -9,36 +9,58 @@ export default function () {
     size:'mini',
     showOverflow: true,
     scrollY:{enable:true},
-    data:[]
+    data:[],
+    ycldw:[]
   }
+  const ext={}
+  const setExt=function (key,value){
+    ext[key]=value
+  }
+
+  const nameFormat=function ({cellValue}){
+    const workers=ext.workers
+    for (const item of workers) {
+      if(item.userCode===cellValue){
+        return item.userName
+      }
+    }
+  }
+
   const gdhFormat=function ({cellValue}){
     if (cellValue){
       return 'PW'+cellValue
     }
     return ''
   }
+
+  const dwFormat=function ({cellValue}){
+    for (const item of options.ycldw) {
+      if (cellValue===item.id){
+        return item.name
+      }
+    }
+  }
   const columns = [
     { type: 'checkbox', width: 40 },
     { type: 'seq',title:'序号', width: 60 },
-    { field: 'gdh',title:'派工单号', width: 120,formatter: gdhFormat},
-    {field: '', title: '抛丸位置', width: 80},
-    {field: '', title: '垛位', width: 60},
-    {field: '', title: '层数', width: 60},
+    { field: 'djh',title:'派工单号', width: 120,formatter: gdhFormat},
+    {field: 'slycldw', title: '垛位', width: 60,formatter: dwFormat},
+    {field: 'slyclcs', title: '层数', width: 60},
     {field: 'dcCh', title: '船号', width: 80},
     {field: 'dcPl', title: '批量', width: 80},
-    {field: '', title: '材质', width: 80},
-    {field: '', title: '规格', width: 100},
-    {field: '', title: '炉批号', width: 100},
+    {field: 'wpgg', title: '材质', width: 80},
+    {field: 'wpxh', title: '规格', width: 70},
+    {field: 'slwlh', title: '炉批号', width: 100},
     {field: 'tzbh', title: '套料图号', width: 100},
-    {field: 'pwry', title: '接收人', width: 80},
+    {field: 'pwry', title: '接收人', width: 80,formatter:nameFormat},
     {field: 'pwjssj', title: '接收时间', width: 100},
-    {field: 'pwfkry', title: '反馈人', width: 80},
-    {field: 'pwfkrq', title: '反馈时间', width: 100},
-    {field: '', title: '状态', width: 60},
+    {field: 'pgr', title: '派工人', width: 80},
+    {field: 'pgsj', title: '派工时间', width: 100},
   ]
 
   return {
     options,
     columns,
+    setExt
   }
 }