From 2c11814ecf148a5fe5a80d03e29481476e47f34d Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期一, 19 十二月 2022 16:13:34 +0800
Subject: [PATCH] test push two
---
pages/approval-history/approval-history.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/pages/approval-history/approval-history.vue b/pages/approval-history/approval-history.vue
index 3edde09..bf6cdff 100644
--- a/pages/approval-history/approval-history.vue
+++ b/pages/approval-history/approval-history.vue
@@ -3,7 +3,7 @@
<combined-title title="瀹℃壒鍘嗗彶"></combined-title>
<u-empty v-if="scheduleData.length == 0"
mode="data"
- icon="http://cdn.uviewui.com/uview/empty/data.png"
+ icon="http://cdn.uviewui.com/uview/empty/data.png"
width="100px"
height="150px"
>
@@ -18,8 +18,8 @@
<uni-tr>
<uni-th align="center">澶勭悊浜�</uni-th>
<uni-td>
- <view class="">
- <u-tag :text="role.nickname" type="primary" size="mini" style="display:inline-block;margin-left: 5%;" plain v-for="(role,roleIndex) in item.assignees" :key="roleIndex"></u-tag>
+ <view class="assigneesContainer">
+ <u-tag :text="role.nickname" type="primary" size="mini" plain v-for="(role,roleIndex) in item.assignees" :key="roleIndex"></u-tag>
</view>
</uni-td>
</uni-tr>
@@ -29,7 +29,7 @@
</uni-tr>
<uni-tr>
<uni-th align="center">瀹℃壒鎰忚</uni-th>
- <uni-td>{{ item.comment }}</uni-td>
+ <uni-td>{{ item.comment=='undefined'?item.endTime?'鏈～鍐�':'':item.comment|| item.endTime?'鏈～鍐�':'' }}</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">鑰楁椂</uni-th>
@@ -48,7 +48,7 @@
</uni-tr>
<uni-tr>
<uni-th align="center">瀹屾垚鏃堕棿</uni-th>
- <uni-td>{{ item.endTime }}</uni-td>
+ <uni-td>{{ item.endTime ||'' }}</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">鐘舵��</uni-th>
@@ -107,7 +107,7 @@
historicFlow(){
this.$reqGet('historicFlow',{},this.applicationId).then(res=>{
console.log('瀹℃壒鍘嗗彶',res);
-
+
if(res.code == 0){
if(res.data == null){
this.ifEmpty = true
@@ -149,6 +149,13 @@
font-size: vww(13);
}
}
+ // 澶勭悊浜烘爣绛惧鍣�
+ .assigneesContainer{
+ .u-transition{
+ display:inline-block;
+ margin-left: vww(3);
+ }
+ }
}
// 杈规
// .table--border{
--
Gitblit v1.9.1