From c054059c05608b1c7235e18b3da0dfa095ebfe4d Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期五, 22 九月 2023 10:45:18 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS --- src/components/makepager/TableCommonView.vue | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue index b32674a..7c023f7 100644 --- a/src/components/makepager/TableCommonView.vue +++ b/src/components/makepager/TableCommonView.vue @@ -60,6 +60,9 @@ :style="{ color: new Date().getTime() > new Date(scope.row[item.prop]).getTime() ? '#D23F3A' : '#606266' }" >{{ timeAgo(scope.row[item.prop]) }}</span > + <div v-else-if="item.conversion"> + <span>{{ item.getStatus(scope.row[item.prop]) }}</span> + </div> <span v-else-if="item.isClick && scope.row[item.prop]" :class="item.className ? item.className : 'sel-name'" -- Gitblit v1.8.0