From 993f0a2b33227c69fd8dfcfffe99a1cb181c7d68 Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Tue, 18 Aug 2020 11:20:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5table?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/process-card.vue       | 2 +-
 src/components/table/table-um.vue     | 1 +
 src/components/table/table-umhref.vue | 4 ++--
 src/pages/workbench/workPlace.vue     | 2 ++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/process-card.vue b/src/components/process-card.vue
index 503b290..1bcac67 100644
--- a/src/components/process-card.vue
+++ b/src/components/process-card.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="out">
-        <div class="box" v-for="(item,index) in data" :key="index+3000" :style="!(item.arr&&item.arr.length!==0)||item.result==='审批未通过'||item.result==='审批不通过'?{border:'none'}:(type&&type=='approval'&&index==data.length-1)?{borderLeft:'none',paddingBottom:'0px',}:{}" :class="data[index+1]&&data[index+1].result==='审批中'?'dashedbd':''">
+        <div class="box" v-for="(item,index) in data" :key="index+3000" :style="!(item.arr&&item.arr.length!==0)||item.result==='审批未通过'||item.result==='审批不通过'?{border:'none'}:(index==data.length-1)?{borderLeft:'none',paddingBottom:'0px',}:{}" :class="data[index+1]&&data[index+1].result==='审批中'?'dashedbd':''">
             <div class="circle" :style="!(item.arr&&item.arr.length!==0)?{borderColor:'#ffc95c'}:item.result==='审批未通过'||item.result==='审批不通过'?{borderColor:'#de3b4b'}:{}"></div>
             <div class="card" :style="item.result==='审批未通过'||item.result==='审批不通过'?{backgroundColor:'#fcfafa'}:{}">
                 <p class="card_title" :style="!(item.arr&&item.arr.length!==0)?{backgroundColor:'#fcefd6'}:item.result==='审批未通过'||item.result==='审批不通过'?{backgroundColor:'#f7d5d5'}:{}">
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index fe639ba..c5404ea 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -81,6 +81,7 @@
           :width="item.width"
           :align="item.align"
           :min-width="item.minWidth"
+          :show-overflow-tooltip="true"
           :render-header="item.require ? renderHeader : null"
         >
           <template slot-scope="scope">
diff --git a/src/components/table/table-umhref.vue b/src/components/table/table-umhref.vue
index de36f44..a21aa58 100644
--- a/src/components/table/table-umhref.vue
+++ b/src/components/table/table-umhref.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>
+  <span>
     <span v-if="this.row.id||ids" class="href" @click="goHref(baseVal)">{{ text }}</span>
     <span v-else>{{text}}</span>
-  </div>
+  </span>
 </template>
 
 <script>
diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue
index 5db3efb..5fcef75 100644
--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -2271,6 +2271,8 @@ export default {
   height: calc(100% + 2px);
   cursor: pointer;
   color: #8890a7;
+  font-weight: 600;
+  padding-top: 5px;
 }
 .myservice_btn {
   float: right;
-- 
2.26.0