diff --git a/src/controllers/Report_1_Controller.ts b/src/controllers/Report_1_Controller.ts index e4ea968..74d004b 100644 --- a/src/controllers/Report_1_Controller.ts +++ b/src/controllers/Report_1_Controller.ts @@ -104,9 +104,8 @@ export class Report_1_Controller extends Controller { (item.child1==undefined && item.child1==null ? "" : item.child1+"/")+ (item.root==undefined && item.root==null ? "" : item.root), posLevel: item.posLevel, - orgShortName: item.orgShortName+item.posMasterNo, + posMasterNo: Extension.ToThaiNumber(String(item.posMasterNo)), amount: item.amount == undefined || item.amount == null ? "๐" : Extension.ToThaiNumber(String(item.amount)), - amountSpecial: item.amountSpecial == undefined || item.amountSpecial == null ? "๐" : Extension.ToThaiNumber(String(item.amountSpecial)), score: null, //สรุปผลการประเมินฯ ระดับและคะแนน remark: null //หมายเหตุ })) @@ -176,7 +175,7 @@ export class Report_1_Controller extends Controller { (item.child1==undefined && item.child1==null ? "" : item.child1+"/")+ (item.root==undefined && item.root==null ? "" : item.root), posLevel: item.posLevel, - orgShortName: item.orgShortName+item.posMasterNo, + orgShortName: item.orgShortName+Extension.ToThaiNumber(String(item.posMasterNo)), amount: item.amount == undefined || item.amount == null ? "๐" : Extension.ToThaiNumber(String(item.amount)), amountSpecial: item.amountSpecial == undefined || item.amountSpecial == null ? "๐" : Extension.ToThaiNumber(String(item.amountSpecial)), score: null, //สรุปผลการประเมินฯ ระดับและคะแนน