|
|
|
@ -53,9 +53,9 @@ const addColumn = () => { |
|
|
|
} |
|
|
|
} |
|
|
|
const getText = (text: any,val:any,name:any) => { |
|
|
|
console.log("text===>",text) |
|
|
|
console.log("name===>",name) |
|
|
|
console.log("val===>",val) |
|
|
|
// console.log("text===>",text) |
|
|
|
// console.log("name===>",name) |
|
|
|
// console.log("val===>",val) |
|
|
|
if (typeof text === 'string') { |
|
|
|
return text |
|
|
|
} else { |
|
|
|
@ -93,6 +93,7 @@ const timeToAry = (timestamp:number) => { |
|
|
|
@ 功能: 将时间戳转换成字符串 |
|
|
|
*/ |
|
|
|
const timeToString = (timeVal:any,types:int) => { |
|
|
|
// console.log("将时间戳转换成字符串",timeVal,types) |
|
|
|
let timeStr = "" |
|
|
|
if(Array.isArray(timeVal)){ |
|
|
|
if(timeVal.length >= 2){ |
|
|
|
@ -169,7 +170,7 @@ const timeToString = (timeVal:any,types:int) => { |
|
|
|
case "week": //周 |
|
|
|
timeStr = getYearWeek(timeVal) |
|
|
|
break; |
|
|
|
case "timeCalss": //时间 |
|
|
|
case "timePicker": //时间 |
|
|
|
timeStr = `${hours}:${minutes}:${seconds}`; |
|
|
|
break; |
|
|
|
default: |
|
|
|
@ -210,6 +211,8 @@ const timeToString = (timeVal:any,types:int) => { |
|
|
|
</div> |
|
|
|
<div v-else-if="item.type=='datePicker'" v-html="timeToString(scope.row[item.name],item.control.type)"> |
|
|
|
</div> |
|
|
|
<div v-else-if="item.type=='timePicker'" v-html="timeToString(scope.row[item.name],item.type)"> |
|
|
|
</div> |
|
|
|
<div v-else>{{ getText(scope.row[item.name],scope.row,item.name) }}</div> |
|
|
|
</div> |
|
|
|
<div v-else> |
|
|
|
|