From 1445c7e1f76c4628f4619cf67150a63d6f8f5e90 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期二, 01 十一月 2022 09:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/myWait/index.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index 6efd191..fb682ce 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -25,14 +25,20 @@
</el-table-column>
<el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10">
</el-table-column>
- <el-table-column prop="category" label="闂灏忕被" min-width="10">
- </el-table-column>
- <el-table-column prop="eventSource" label="闂鎻忚堪" min-width="10">
+ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10">
<template slot-scope="scope">
- <span>{{scope.row.eventSource===1 ? '杩濊': '杩濆缓'}}</span>
+ <span>{{scope.row.eventSource===1 ? '瑙嗛宸℃煡': '浜哄伐涓婃姤'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="category" label="闂绫诲埆" min-width="10">
+ <template slot-scope="scope">
+ <span>{{scope.row.category===1 ? '杩濊': '杩濆缓'}}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
+ <template slot-scope="scope">
+ <span>{{changeTime(scope.row.createTime)}}</span>
+ </template>
</el-table-column>
<el-table-column prop="type" label="鍓╀綑鏃堕棿" min-width="10">
<template slot-scope="scope">
@@ -91,6 +97,7 @@
import updateUser from "./updateUser"
import createUser from "./createUser"
import {computeTime} from '@/utils/helper'
+import filterTime from '@/utils/mydate'
export default {
components: {
updateUser,createUser
@@ -266,8 +273,13 @@
},
// 璁＄畻鏃堕棿
getRestTime(time2){
- console.log(time2);
return computeTime(time2);
+ },
+ // 鏀瑰彉鏃ユ湡鏍煎紡
+ changeTime(time){
+ if(time){
+ return filterTime(time);
+ }
}
}
}
--
Gitblit v1.8.0