From 25b727a5dc28f3c2d225c5e017da58f35c6b84b3 Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期二, 26 九月 2023 19:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/components/makepager/TableCommonView.vue | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 1627f0d..7c023f7 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -35,21 +35,19 @@
>
<template slot-scope="scope">
<span v-if="item.price">{{ "锟�" + number_format(scope.row[item.prop], 2, ".", ",") }}</span>
- <!-- 甯︾偣鐨勫姛鑳� -->
+ <!-- 鐘舵�佹樉绀� -->
<div v-else-if="item.status">
- <!-- <span v-if="scope.row.status == '瀹屾垚'" class="Badge greenSlot"></span>
- <span v-else-if="scope.row.status == '鑽夌'" class="Badge redSlot"></span>
- <span v-else-if="scope.row.status == '灏辩华'" class="Badge redSlot"></span>
- <span v-else-if="scope.row.status == '宸插彇娑�'" class="Badge yellowSlot"></span> -->
<span
class="Badge"
:class="{
- greenSlot: scope.row.status == '瀹屾垚',
- redSlot: scope.row.status == '宸插彇娑�',
- blueSlot: scope.row.status == '灏辩华',
- graySlot: scope.row.status == '鑽夌'
+ greenSlot: scope.row.status == '4',
+ redSlot: scope.row.status == '5',
+ blueSlot: scope.row.status == '3',
+ graySlot: scope.row.status == '1'
}"
- >{{ scope.row[item.prop] }}</span
+ >{{
+ item.isCallMethod ? item.getCallMethod(scope.row[item.prop], scope.row) : scope.row[item.prop]
+ }}</span
>
</div>
<!-- 璋冪敤鏂规硶鏄剧ず鏂囧瓧 -->
@@ -62,12 +60,18 @@
: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'"
@click="selCommonClick(scope.row)"
>{{ scope.row[item.prop] }}</span
>
+ <span v-else-if="item.propType == 'mulitple'">
+ {{ scope.row[item.prop][item.propTwo] ? scope.row[item.prop][item.propTwo] : "--" }}
+ </span>
<span :class="item.className ? item.className : ''" v-else>{{
scope.row[item.prop] ? scope.row[item.prop] : scope.row[item.prop] === 0 ? scope.row[item.prop] : "--"
}}</span>
@@ -79,7 +83,7 @@
</div>
</el-table>
<div class="overSpread1" v-show="iscolopen" @click="onMaskClick"></div>
- <div class="styleBtn">
+ <div v-if="showCheckcol" class="styleBtn">
<i @click="checkcol()" class="label">...</i>
<el-checkbox-group v-model="showcolList" v-show="iscolopen" class="checkbox-group" @change="selCeckBoxList">
<el-checkbox v-for="item in tableList.allcol" :label="item" :key="item">{{ item }} </el-checkbox>
@@ -133,6 +137,10 @@
default: () => {
return {}
}
+ },
+ showCheckcol: {
+ type: Boolean,
+ default: true
}
},
data() {
--
Gitblit v1.8.0