1

src/views/backStageManage/organization/personnel/components/personnel.vue

@@ -78,7 +78,7 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column label="剩余天数" align="center" show-overflow-tooltip>
+            <el-table-column label="剩余天数" align="center" width="180px" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <div v-html="getRemainDays(scope.row.expitrTime)">
                     </div>
@@ -253,21 +253,26 @@ export default {
             var endTime = new Date(endDate)
             var now = new Date()
             var dataTime = 24 * 60 * 60 * 1000
-            var remainDays
+            var remainDays,hours ,minutes ,seconds 
             if(endTime<now){
                 remainDays = '已过期'
             }else{
-                remainDays = Math.ceil((endTime - now) / dataTime)
+                console.log((endTime - now) / dataTime,new Date(endTime - now))
+                var remainingTime = endTime - now
+                remainDays = Math.floor(remainingTime / dataTime)
+                hours =  Math.floor((remainingTime % dataTime) / (1000 * 60 * 60))
+                minutes = Math.floor((remainingTime % (1000 * 60 * 60)) / (1000 * 60))
+                seconds = Math.floor((remainingTime % (1000 * 60)) / 1000)
             }
             var maxDay = 30
             if(remainDays == '已过期' || remainDays<=maxDay){
                 if(remainDays == '已过期'){
                     return `<span style="color:red">${remainDays}</span>`
                 }else{
-                    return `<span style="color:red">剩余${remainDays}天</span>`
+                    return `<span style="color:red">剩余${remainDays}天${hours}时${minutes}分${seconds}秒</span>`
                 }
             }
-            return `剩余${remainDays}天`
+            return `剩余${remainDays}天${hours}时${minutes}分${seconds}秒`
         },
         /** 查询部门列表 */
         getList() {