@@ -72,6 +72,7 @@
:loading="resultLoading"
tooltip-effect="dark"
border
+ style="width:100% !important;"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
height="100%"
@@ -79,9 +80,10 @@
+ min-width="5%">
@@ -112,11 +116,11 @@
+ min-width="12%">
- {{ $dateFormat(new Date((selectIndex === 'stand' || (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN')) ? scope.row.SSRQ : (selectIndex === 'laws' ? scope.row.XCXSSRQLAWS :scope.row.putTime)), "yyyy-MM-dd") }}
+ : (selectIndex === 'laws' ? scope.row.XCXSSRQLAWS : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== ''))" :title="dateFormat2((selectIndex === 'stand' || (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN')) ? scope.row.SSRQ : (selectIndex === 'laws' ? scope.row.XCXSSRQLAWS :scope.row.putTime))">
+ {{ dateFormat2((selectIndex === 'stand' || (selectIndex === 'bussstand' && scope.row.standType === 'FOREIGN')) ? scope.row.SSRQ : (selectIndex === 'laws' ? scope.row.XCXSSRQLAWS :scope.row.putTime)) | ellipsis }}
@@ -125,7 +129,7 @@
v-if="selectIndex !== 'msgdyinfo'"
align="center"
:label="selectIndex === 'stand'||'bussstand' ? $t('m.standStateShow') : (selectIndex === 'laws' ? $t('m.fileStatus') : $t('m.enterpriseStandardStatus'))"
- width="200">
+ min-width="12%">
{
let filterOptions = {}
let originOptions = this.searchOriginOptions
+ console.log(originOptions)
filterOptions.selectIndex = originOptions.selectIndex
switch (resType) {
case 'stand':
@@ -2533,6 +2550,19 @@
},
//时间处理
dateFormat2(str){
+ if(str === undefined || str === null || str === ''){
+ return ""
+ }else {
+ if(str.indexOf(",") !== -1){
+ const arr = str.split(",")
+ const arr1 = str.split(",")
+ arr.forEach( date =>{
+ arr1.push(dateFormat(date.trim()))
+ })
+ return arr1.toString()
+ }
+
+ }
return dateFormat(str)
},