1.增加切割报工生成质量数据兼容老erp的功能

2.增加作业计划执行划线和切割报工筛选垮位的功能

src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue

@@ -164,6 +164,9 @@ export default {
         this.gridOptions.ycldw=res.data
         getForemanByWorker({worker:worker}).then(res=>{
           getYdjhByZtOrForeman({foreman:res.data.userCode,zt:zt,field:'hxpgry',zyq:this.zyq}).then(res=>{
+            res.data.forEach(item=>{
+              item._lx=item.tzbh.substring(5,6)
+            })
             this.list=res.data
             this.gridOptions.data=res.data
             this.setExt('workers',this.$props.workers)

src/views/zyjhzx/hxianfkui/comps/pgdTable.js

@@ -27,12 +27,14 @@ export default function () {
     }
     return cellValue
   }
+
   const gdhFormat=function ({cellValue}){
     if (cellValue){
       return 'PW'+cellValue
     }
     return ''
   }
+
   const dwFormat=function ({cellValue}){
     for (const item of options.ycldw) {
       if (cellValue===item.id+''){
@@ -40,6 +42,23 @@ export default function () {
       }
     }
   }
+
+  const formatLx=function ({cellValue}){
+    if (cellValue==='1'){
+      return '一垮'
+    }
+    if (cellValue==='2'){
+      return '二垮'
+    }
+    if (cellValue==='3'){
+      return '三垮'
+    }
+    if (cellValue==='4'){
+      return '四五六垮'
+    }
+    return ''
+  }
+
   const columns = [
     { type: 'checkbox', width: 40 },
     { type: 'seq',title:'序号', width: 50 },
@@ -58,6 +77,10 @@ export default function () {
     {field: 'wpgg', title: '材质', width: 80},
     {field: 'wpxh', title: '规格', width: 70},
     {field: 'sllph', title: '炉批号', width: 100},
+    {field: '_lx', title: '流向', width: 80,formatter:formatLx,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
     {field: 'tzbh', title: '套料图号', width: 100},
     {field: 'hxry', title: '接收人', width: 80,formatter: nameFormat},
     {field: 'hxfkry', title: '报工人', width: 80,formatter:nameFormat},

src/views/zyjhzx/qgefkui/comps/QgePgd.vue

@@ -114,6 +114,9 @@ export default {
         getDw({type:'llj'}).then(res=>{
           this.gridOptions.ycldw=res.data
           getYdjhByZtOrForeman({foreman:result.data.userCode,zt:zt,field:'qgpgry',zyq:this.zyq}).then(res => {
+            res.data.forEach(item=>{
+              item._lx=item.tzbh.substring(5,6)
+            })
             this.list=res.data
             this.gridOptions.data = res.data
             this.setExt('workers',this.$props.workers)

src/views/zyjhzx/qgefkui/comps/pgdTable.js

@@ -42,6 +42,23 @@ export default function () {
       }
     }
   }
+
+  const formatLx=function ({cellValue}){
+    if (cellValue==='1'){
+      return '一垮'
+    }
+    if (cellValue==='2'){
+      return '二垮'
+    }
+    if (cellValue==='3'){
+      return '三垮'
+    }
+    if (cellValue==='4'){
+      return '四五六垮'
+    }
+    return ''
+  }
+
   const columns = [
     { type: 'checkbox', width: 40 },
     { type: 'seq',title:'序号', width: 50 },
@@ -60,6 +77,10 @@ export default function () {
     {field: 'wpgg', title: '材质', width: 80},
     {field: 'wpxh', title: '规格', width: 70},
     {field: 'sllph', title: '炉批号', width: 100},
+    {field: '_lx', title: '流向', width: 80,formatter:formatLx,
+      filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+      filterRender: { name: 'FilterCombination', },
+    },
     {field: 'tzbh', title: '套料图号', width: 100},
     {field: 'qgry', title: '接收人', width: 80,formatter: nameFormat},
     {field: 'qgfkry', title: '报工人', width: 80,formatter:nameFormat},