From 717a88667cd6bbe474fba13eaab3a69e5688cbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 12 Dec 2023 10:41:33 +0800 Subject: [PATCH] =?UTF-8?q?feature/2.9.9.2312.01-=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E6=A0=B8=E7=AE=97=E5=88=97=E8=A1=A8=E5=9C=A8=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doCalc/components/salaryEditCalc/editCalcTable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js index 545cd0db..7c0124f9 100644 --- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js +++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js @@ -259,13 +259,13 @@ const traverse = (arr) => { return { title: item.text, width: item.width + "px", ellipsis: true, dataIndex: item.column, children: traverse(item.children), - fixed: item.fixed || false, dataType: item.dataType + fixed: item.fixed || false, dataType: item.dataType, align: "center" }; } else { return { title: item.text, width: item.width + "px", fixed: item.fixed || false, dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus, - pattern: item.pattern, dataType: item.dataType + pattern: item.pattern, dataType: item.dataType, align: "center" }; } });