From 25bfdf783be9c8e34afcec8106c39e17aa66a1e2 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 29 四月 2024 15:56:43 +0800
Subject: [PATCH] 纤度检验表的 车间显示问题处理

---
 src/views/employeeSalary/salaryPlan/index.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index da67aad..733a436 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -51,7 +51,7 @@
       tableColumn: [
         { label: "鏂规鍚嶇О", prop: "name",min:110},
         { label: "宸ョ", prop: "workTypeNames",min:100 },
-        { label: "钖祫绫诲瀷", prop: "salaryType",min:110 },
+        { label: "钖祫绫诲瀷", prop: "salaryTypeName",min:110 },
         { label: "璁¤垂鍛ㄦ湡", prop: "cycle",min:110 },
         { label: "璁¤垂鍏紡瀹氫箟", prop: "salaryFormulaValue",min:140  },
         { label: "娣诲姞鏃堕棿", prop: "createTime",min:130 },
@@ -122,6 +122,7 @@
                   ...item,
                   workTypeNames:workTypeNames,
                   salaryFormulaValue:salaryFormulaValue,
+                  salaryTypeName:item.salaryType?item.salaryType.name:''
                 }
               })
               this.tableList.tableInfomation = list || []

--
Gitblit v1.8.0