From c87a6f7310ca992d7f058a8f286b095c9a632c90 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 21 九月 2023 16:51:58 +0800
Subject: [PATCH] 位置+产品类型的接口联调+业务类型的字段添加

---
 src/components/makepager/TableCommonView.vue |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index 1627f0d..96fedc2 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -62,15 +62,22 @@
             :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>
+          
         </template>
       </el-table-column>
       <slot name="tableButton" />
@@ -79,7 +86,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 +140,10 @@
       default: () => {
         return {}
       }
+    },
+    showCheckcol: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

--
Gitblit v1.8.0