Skip to content

M
marketing
Commit e1efb66e by liuchenxi
Options

Merge commit '2116cbae' into feature/10月迭代

parents 40ecd0b7 2116cbae
Showing with 10 additions and 16 deletions
src/views/ecm/list.vue
......@@ -222,11 +222,9 @@ export default {
minWidth: '120',
align: 'left',
formatter(row) {
let openFlag = JSON.parse(row.analyseJson);
let openFlag = row.analyseJson ? JSON.parse(row.analyseJson) : null;
if (!openFlag) openFlag = {};
console.log(openFlag);
return openFlag.open_flag == 0 ? '--' : row.ecmMemberNum || 0;
// return openFlag.open_flag == 0 || (!row.ecmMemberNum && row.ecmMemberNum != 0) ? '--' : row.ecmMemberNum;
return !openFlag.open_flag ? '--' : row.ecmMemberNum || 0;
}
},
{
......@@ -235,10 +233,9 @@ export default {
minWidth: '120',
align: 'left',
formatter(row) {
let openFlag = JSON.parse(row.analyseJson);
let openFlag = row.analyseJson ? JSON.parse(row.analyseJson) : null;
if (!openFlag) openFlag = {};
return openFlag.open_flag == 0 ? '--' : row.ecmSuccessNum || 0;
// return openFlag.open_flag == 0 || (!row.ecmSuccessNum && row.ecmSuccessNum != 0) ? '0' : row.ecmSuccessNum;
return !openFlag.open_flag ? '--' : row.ecmSuccessNum || 0;
}
},
{
......@@ -247,10 +244,9 @@ export default {
minWidth: '120',
align: 'left',
formatter(row) {
let openFlag = JSON.parse(row.analyseJson);
let openFlag = row.analyseJson ? JSON.parse(row.analyseJson) : null;
if (!openFlag) openFlag = {};
return openFlag.open_flag == 0 ? '--' : row.ecmTranNum || 0;
// return openFlag.open_flag == 0 || (!row.ecmTranNum && row.ecmTranNum != 0) ? '0' : row.ecmTranNum;
return !openFlag.open_flag ? '--' : row.ecmTranNum || 0;
}
},
{
......@@ -259,10 +255,9 @@ export default {
minWidth: '120',
align: 'left',
formatter(row) {
let openFlag = JSON.parse(row.analyseJson);
let openFlag = row.analyseJson ? JSON.parse(row.analyseJson) : null;
if (!openFlag) openFlag = {};
return openFlag.open_flag == 0 ? '--' : Number(row.ecmTranIncome).toFixed(2) || '0.00';
// return openFlag.open_flag == 0 || (!row.ecmTranIncome && row.ecmTranIncome != 0) ? '0.00' : row.ecmTranIncome.toFixed(2);
return !openFlag.open_flag ? '--' : Number(row.ecmTranIncome).toFixed(2) || '0.00';
}
},
{
......@@ -271,10 +266,9 @@ export default {
minWidth: '120',
align: 'left',
formatter(row) {
let openFlag = JSON.parse(row.analyseJson);
let openFlag = row.analyseJson ? JSON.parse(row.analyseJson) : null;
if (!openFlag) openFlag = {};
return openFlag.open_flag == 0 ? '--' : Number(row.cardSalesAmt).toFixed(2) || '0.00';
// return openFlag.open_flag == 0 || (!row.cardSalesAmt && row.cardSalesAmt != 0) ? '0.00' : row.cardSalesAmt.toFixed(2);
return !openFlag.open_flag ? '--' : Number(row.cardSalesAmt).toFixed(2) || '0.00';
}
}
],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment