Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period
This commit is contained in:
+1
-1
@@ -198,7 +198,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
|
||||
if(dictModelList.size() != 0){
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (DictModel dictModel : dictModelList) {
|
||||
if(CutEnum.CN.getValue().equals(paramsReportEO)){
|
||||
if(CutEnum.CN.getValue().equals(paramsReportEO.getCut())){
|
||||
sb.append(dictModel.getText()+",");
|
||||
}else{
|
||||
sb.append(dictModel.getTextEn()+",");
|
||||
|
||||
@@ -145,13 +145,13 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
|
||||
ellipsis: true,
|
||||
scopedSlots: { customRender: 'msgTitile' }
|
||||
},
|
||||
{
|
||||
title: this.$t('Sponsor'),
|
||||
align: 'left',
|
||||
ellipsis: true,
|
||||
dataIndex: 'initiator',
|
||||
width: 200
|
||||
},
|
||||
// {
|
||||
// title: this.$t('Sponsor'),
|
||||
// align: 'left',
|
||||
// ellipsis: true,
|
||||
// dataIndex: 'initiator',
|
||||
// width: 200
|
||||
// },
|
||||
{
|
||||
title: this.$t('MessageType'),
|
||||
align: 'left',
|
||||
|
||||
Reference in New Issue
Block a user