From 08a59477c7f131953ade0b2a573b3ba9b314b8a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Thu, 26 Dec 2024 17:09:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=88=87=E5=89=B2=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E7=94=9F=E6=88=90=E8=B4=A8=E9=87=8F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=80=81erp=E7=9A=84=E5=8A=9F=E8=83=BD=202.?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E5=88=92=E7=BA=BF=E5=92=8C=E5=88=87=E5=89=B2=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5=E7=AD=9B=E9=80=89=E5=9E=AE=E4=BD=8D=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue |  3 +++
 src/views/zyjhzx/hxianfkui/comps/pgdTable.js  | 23 +++++++++++++++++++
 src/views/zyjhzx/qgefkui/comps/QgePgd.vue     |  3 +++
 src/views/zyjhzx/qgefkui/comps/pgdTable.js    | 21 +++++++++++++++++
 4 files changed, 50 insertions(+)

diff --git a/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue b/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue
index 746b1bd..02d9eba 100644
--- a/src/views/zyjhzx/hxianfkui/comps/HxianPgd.vue
+++ b/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)
diff --git a/src/views/zyjhzx/hxianfkui/comps/pgdTable.js b/src/views/zyjhzx/hxianfkui/comps/pgdTable.js
index 45f46e8..331f629 100644
--- a/src/views/zyjhzx/hxianfkui/comps/pgdTable.js
+++ b/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},
diff --git a/src/views/zyjhzx/qgefkui/comps/QgePgd.vue b/src/views/zyjhzx/qgefkui/comps/QgePgd.vue
index e3671fd..b69f940 100644
--- a/src/views/zyjhzx/qgefkui/comps/QgePgd.vue
+++ b/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)
diff --git a/src/views/zyjhzx/qgefkui/comps/pgdTable.js b/src/views/zyjhzx/qgefkui/comps/pgdTable.js
index a0a38e8..85d743b 100644
--- a/src/views/zyjhzx/qgefkui/comps/pgdTable.js
+++ b/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},