From eda46bf83619297600436e5015fd8977e9974219 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 04 十一月 2022 15:50:31 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/components/Table/index.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index ca39951..48072b9 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -6,7 +6,7 @@
                 :row-class-name="tableRowClassName">
                 <el-table-column type="selection" :min-width="5">
                 </el-table-column>
-                <el-table-column v-for="(item,idx) in option.group" :key="item.prop" :label="item.label"
+                <el-table-column v-for="item in option.group" :key="item.prop" :label="item.label"
                     :prop="item.prop" :min-width="item['min-width'] ? item['item.min-width']:'10'">
                     <template slot-scope="scope">
                         <div v-if="item.type === 'text'">
@@ -17,7 +17,9 @@
                         </slot>
                         <slot name="status" v-else-if="item.type === 'status'" :info="scope">
                         </slot>
-                        <div class=""></div>
+                        <slot name='time' v-else-if="item.type === 'time'" :timeobj="scope"> 
+
+                        </slot>
                     </template>
                 </el-table-column>
             </el-table>

--
Gitblit v1.8.0