From 5f1f36bb3ca0b0d749da3c3a8dd8f5b76197f2f8 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 03 十一月 2022 17:55:34 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/myWait/index.vue | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue
index ba01d51..fb682ce 100644
--- a/src/views/operate/myWait/index.vue
+++ b/src/views/operate/myWait/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="userList">
<div class="headerTitle">
- 杩愯惀绠＄悊銆嬪熀纭�璁剧疆銆嬭繚瑙勪簨椤硅缃�
+ 杩愯惀绠＄悊銆嬫垜鐨勫緟鍔�
</div>
<header>
<div class="headerContent">
@@ -12,13 +12,6 @@
<el-button type="primary" @click="getUserList">鏌ヨ</el-button>
</div>
</div>
- <!-- <div class="addUser">
- <el-button class="addBtn" type="primary" @click="dialogCreate = true">鏂板杩濊绫诲瀷</el-button>
- <el-dialog :visible.sync="dialogCreate" title="鏂板杩濊绫诲瀷" width="45%" v-if="dialogCreate"
- :before-close="handleClose">
- <createUser :refresh="getUserList" />
- </el-dialog>
- </div> -->
</div>
</header>
<main>
@@ -32,18 +25,27 @@
</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 prop="eventSource" label="闂鏉ユ簮" min-width="10">
+ <template slot-scope="scope">
+ <span>{{scope.row.eventSource===1 ? '瑙嗛宸℃煡': '浜哄伐涓婃姤'}}</span>
+ </template>
</el-table-column>
- <el-table-column prop="eventSource" label="闂鎻忚堪" min-width="10">
+ <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">
<span>{{getRestTime(scope.row.limitTime)}}</span>
</template>
</el-table-column>
- <el-table-column prop="type" label="闂鐘舵��" min-width="10">
+ <el-table-column prop="stepName" label="闂鐘舵��" min-width="10">
</el-table-column>
<el-table-column min-width="10">
</el-table-column>
@@ -95,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
@@ -271,6 +274,12 @@
// 璁＄畻鏃堕棿
getRestTime(time2){
return computeTime(time2);
+ },
+ // 鏀瑰彉鏃ユ湡鏍煎紡
+ changeTime(time){
+ if(time){
+ return filterTime(time);
+ }
}
}
}
--
Gitblit v1.8.0