From 50072669bacb4c0fc842817ea0129cef98932d0b Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 28 七月 2022 20:01:24 +0800
Subject: [PATCH] '解决冲突'
---
pages/check-the-schedule/check-the-schedule.vue | 67 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/pages/check-the-schedule/check-the-schedule.vue b/pages/check-the-schedule/check-the-schedule.vue
index d0ced1a..ea32aa0 100644
--- a/pages/check-the-schedule/check-the-schedule.vue
+++ b/pages/check-the-schedule/check-the-schedule.vue
@@ -1,40 +1,50 @@
<template>
<view class="check-the-schedule">
<combined-title title="鏌ョ湅杩涘害"></combined-title>
- <view class="scheduleTable">
+ <view class="scheduleTable" v-for="(item,index) in scheduleData">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
<!-- 琛ㄦ牸鏁版嵁琛� -->
<uni-tr>
<uni-th align="center">浠诲姟鍚嶇О</uni-th>
- <uni-td>{{ yibanData.renwu }}</uni-td>
+ <uni-td>{{ item.name }}</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">澶勭悊浜�</uni-th>
- <uni-td>XXX XXX XXX XXX</uni-td>
+ <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>
+ </uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">瀹℃壒鎿嶄綔</uni-th>
- <uni-td>鈥斺��</uni-td>
+ <uni-td>{{item.deleteReason}}</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">瀹℃壒鎰忚</uni-th>
- <uni-td>{{ yibanData.shenpiyijian }}</uni-td>
+ <uni-td>{{ item.comment }}</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">鑰楁椂</uni-th>
- <uni-td>{{ yibanData.haoshi }}</uni-td>
+ <uni-td>
+ <text>{{item.duration >= 86400000
+ ? parseInt(item.duration / 86400000 + '澶�' + parseInt(item.duration % 86400000) / 3600000 + '鏃�' + parseInt(item.duration % 3600000) / 60000 + '鍒�')
+ : item.duration >= 3600000
+ ? parseInt(item.duration / 3600000) + '鏃�' + parseInt((item.duration / 3600000) % 3600000) + '鍒�'
+ : parseInt(item.duration / 60000) + '鍒�'}}</text>
+ </uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">鍒涘缓鏃堕棿</uni-th>
- <uni-td>{{ yibanData.createTime }}</uni-td>
+ <uni-td>{{ item.createTime }}</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">瀹屾垚鏃堕棿</uni-th>
- <uni-td>鈥斺��</uni-td>
+ <uni-td>{{ item.endTime }}</uni-td>
</uni-tr>
<uni-tr>
<uni-th align="center">鐘舵��</uni-th>
- <uni-td style="color:#007AFF">寰呭鐞�</uni-td>
+ <uni-td :style="{color:(item.endTime==null?'#969696':'#007AFF')}">{{ item.endTime ==null? '寰呭鐞�' : '宸插姙鐞�' }}</uni-td>
</uni-tr>
</uni-table>
</view>
@@ -50,17 +60,22 @@
export default {
data() {
return {
- yibanData: {
- meizhongshenqing: '钁涙硥鐭跨敵璇凤細鐓ょ煾鐭�',
- renwu: '鍙戣繍瀹℃壒',
- liucheng: '鍙戣繍閫氱煡鍗�',
- faqiren: '钁涙硥鐭�',
- shenpiCaozuo: '瀹℃壒閫氳繃',
- shenpiyijian: '鍚屾剰',
- haoshi: '19绉�',
- createTime: '2022-5-25 12:06:15'
- }
+ scheduleData: {
+ // meizhongshenqing: '钁涙硥鐭跨敵璇凤細鐓ょ煾鐭�',
+ // renwu: '鍙戣繍瀹℃壒',
+ // liucheng: '鍙戣繍閫氱煡鍗�',
+ // faqiren: '钁涙硥鐭�',
+ // shenpiCaozuo: '瀹℃壒閫氳繃',
+ // shenpiyijian: '鍚屾剰',
+ // haoshi: '19绉�',
+ // createTime: '2022-5-25 12:06:15'
+ },
+ applicationId:null,
+ menuShow:false
};
+ },
+ onLoad(options){
+ this.applicationId = JSON.parse(options.index);
},
// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
onNavigationBarButtonTap(e) {
@@ -71,12 +86,24 @@
if(this.menuShow == true){
this.$refs.menuRef.menuClick()
}
+ this.init();
},
components: {
combinedTitle,
popupMenu
},
methods: {
+ init(){
+ this.historicFlow()
+ },
+ historicFlow(){
+ this.$reqGet('historicFlow',{},this.applicationId).then(res=>{
+ console.log('鏌ョ湅杩涘害',res);
+ if(res.code == 0){
+ this.scheduleData = res.data
+ }
+ })
+ },
menushow(e){
this.menuShow = e
}
@@ -89,7 +116,7 @@
width: 100%;
height: 100%;
.scheduleTable {
- margin: 0 auto;
+ margin: vww(10) auto 0;
width: 91%;
.uni-table {
.uni-table-tr {
--
Gitblit v1.9.1