Anna Ho пре 1 година
родитељ
комит
af54518f20
3 измењених фајлова са 17 додато и 5 уклоњено
  1. +3
    -1
      src/pages/DemandNote/Search_Public/DataGrid.js
  2. +1
    -1
      src/utils/ApiPathConst.js
  3. +13
    -3
      src/utils/statusUtils/DnStatus.js

+ 3
- 1
src/pages/DemandNote/Search_Public/DataGrid.js Прегледај датотеку

@@ -20,6 +20,7 @@ export default function SearchDemandNote({ searchCriteria }) {
const intl = useIntl();
const theme = useTheme();
const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
const { locale } = intl;


const [_searchCriteria, set_searchCriteria] = React.useState(searchCriteria);
@@ -65,7 +66,8 @@ export default function SearchDemandNote({ searchCriteria }) {
width: isMdOrLg ? 'auto' : 175,
flex: isMdOrLg ? 1 : undefined,
renderCell: (params) => {
return [StatusUtils.getStatus_Cht(params)]

return [StatusUtils.getStatus_i18n(params, locale) ]
},
},
{


+ 1
- 1
src/utils/ApiPathConst.js Прегледај датотеку

@@ -44,7 +44,7 @@ export const GET_ORG_MARK_AS_CREDITOR = apiPath+'/org/mark-as-creditor';
export const GET_ORG_MARK_AS_NON_CREDITOR = apiPath+'/org/mark-as-non-creditor';
export const GET_SEND_TERMINATION_OF_CREDIT = apiPath+'/org/sendDn_terminationOfCredit';
export const GET_ORG_EXPORT = apiPath+'/org/export';
export const GET_SEND_OVERDUE_CREDITOR_LIST = apiPath+'/org/sendDn_OverdueCreditorList';//POST
export const GET_SEND_OVERDUE_CREDITOR_LIST = apiPath+'/org/sendDn_OverdueCreditorList';

//public
export const GET_PUB_ORG_PATH = apiPath+'/org/pub';


+ 13
- 3
src/utils/statusUtils/DnStatus.js Прегледај датотеку

@@ -1,8 +1,8 @@
import {getStatusTag} from "utils/statusUtils/Base";

const pending = {color:"#f5a83d", eng:"Pending", cht:"待辦"}
const toBePaid = {color:"#f5a83d", eng:"To be Paid", cht:"待付款"}
const paid = {color:"#22a13f", eng:"Paid", cht:"已付款"}
const pending = {color:"#f5a83d", eng:"Pending", cht:"待辦", cn: "待办"}
const toBePaid = {color:"#f5a83d", eng:"To be Paid", cht:"待付款", cn: "待付款"}
const paid = {color:"#22a13f", eng:"Paid", cht:"已付款", cn: "已付款"}

export function getStatus_Cht(params) {
let status = getStatus(params);
@@ -14,6 +14,16 @@ export function getStatus_Eng(params) {
return status?getStatusTag({color: status.color, textColor:status.textColor, text:status.eng }):"";
}

export function getStatus_i18n(params, locale) {
let status = getStatus(params);
if(locale === 'zh-CN')
return status?getStatusTag({color: status.color, textColor:status.textColor, text:status.cn }):"";
if(locale === 'zh-HK')
return status?getStatusTag({color: status.color, textColor:status.textColor, text:status.cht }):"";
return status?getStatusTag({color: status.color, textColor:status.textColor, text:status.eng }):"";
}


function getStatus(params) {
let status = params?.row?params.row.status:params;



Loading…
Откажи
Сачувај