From a88092021b14abc67c2f2e53ce722d609632aeb5 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期二, 23 八月 2022 08:07:36 +0800
Subject: [PATCH] 修改日计划，我的待办，等相应bug
---
pages/check-the-schedule/check-the-schedule.vue | 282 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 151 insertions(+), 131 deletions(-)
diff --git a/pages/check-the-schedule/check-the-schedule.vue b/pages/check-the-schedule/check-the-schedule.vue
index ea32aa0..09732bc 100644
--- a/pages/check-the-schedule/check-the-schedule.vue
+++ b/pages/check-the-schedule/check-the-schedule.vue
@@ -1,146 +1,166 @@
<template>
- <view class="check-the-schedule">
- <combined-title title="鏌ョ湅杩涘害"></combined-title>
- <view class="scheduleTable" v-for="(item,index) in scheduleData">
- <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
- <!-- 琛ㄦ牸鏁版嵁琛� -->
- <uni-tr>
- <uni-th align="center">浠诲姟鍚嶇О</uni-th>
- <uni-td>{{ item.name }}</uni-td>
- </uni-tr>
- <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>
- </uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="center">瀹℃壒鎿嶄綔</uni-th>
- <uni-td>{{item.deleteReason}}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="center">瀹℃壒鎰忚</uni-th>
- <uni-td>{{ item.comment }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="center">鑰楁椂</uni-th>
- <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>{{ item.createTime }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="center">瀹屾垚鏃堕棿</uni-th>
- <uni-td>{{ item.endTime }}</uni-td>
- </uni-tr>
- <uni-tr>
- <uni-th align="center">鐘舵��</uni-th>
- <uni-td :style="{color:(item.endTime==null?'#969696':'#007AFF')}">{{ item.endTime ==null? '寰呭鐞�' : '宸插姙鐞�' }}</uni-td>
- </uni-tr>
- </uni-table>
- </view>
+ <view class="check-the-schedule">
+ <combined-title title="鏌ョ湅杩涘害"></combined-title>
+ <view class="scheduleTable" v-for="(item,index) in scheduleData">
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
+ <!-- 琛ㄦ牸鏁版嵁琛� -->
+ <uni-tr>
+ <uni-th align="center">浠诲姟鍚嶇О</uni-th>
+ <uni-td>{{ item.name }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="center">澶勭悊浜�</uni-th>
+ <uni-td>
+ <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>
+ <uni-tr>
+ <uni-th align="center">瀹℃壒鎿嶄綔</uni-th>
+ <uni-td>{{ item.deleteReason == null ? '' : item.deleteReason }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="center">瀹℃壒鎰忚</uni-th>
+ <uni-td>{{ item.comment == null ? '' : item.comment }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="center">鑰楁椂</uni-th>
+ <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>{{ item.createTime }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="center">瀹屾垚鏃堕棿</uni-th>
+ <uni-td>{{ item.endTime == null ? '' : item.endTime }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="center">鐘舵��</uni-th>
+ <uni-td :style="{color:(item.endTime==null?'#969696':'#007AFF')}">{{
+ item.endTime == null ? '寰呭鐞�' : '宸插姙鐞�'
+ }}
+ </uni-td>
+ </uni-tr>
+ </uni-table>
+ </view>
- <!-- 鑿滃崟鏍� -->
- <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
- </view>
+ <!-- 鑿滃崟鏍� -->
+ <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
+ </view>
</template>
<script>
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
import combinedTitle from '@/components/common/combined-title/combined-title.vue';
+
export default {
- data() {
- return {
- 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) {
- // console.log(e);
- this.$refs.menuRef.menuClick();
- },
- onShow(){
- 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
- }
- }
+ data() {
+ return {
+ 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) {
+ // console.log(e);
+ this.$refs.menuRef.menuClick();
+ },
+ onShow() {
+ 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
+ }
+ }
};
</script>
<style lang="scss" scoped>
::v-deep.check-the-schedule {
- width: 100%;
- height: 100%;
- .scheduleTable {
- margin: vww(10) auto 0;
- width: 91%;
- .uni-table {
- .uni-table-tr {
- .uni-table-th {
- width: vww(88);
- height: vww(40);
- background-color: #f5f5f5;
- color: #111111;
- font-size: vww(13);
- font-weight: 500;
- }
- .uni-table-td {
- width: vww(240);
- height: vww(40);
- background-color: #ffffff;
- color: #111111;
- font-size: vww(13);
- }
- }
- }
- // 杈规
- // .table--border{
- // border:1px solid #DDDDDD;
- // }
- }
+ width: 100%;
+ height: 100%;
+
+ .scheduleTable {
+ margin: vww(10) auto 0;
+ width: 91%;
+
+ .uni-table {
+ .uni-table-tr {
+ .uni-table-th {
+ width: vww(88);
+ height: vww(40);
+ background-color: #f5f5f5;
+ color: #111111;
+ font-size: vww(13);
+ font-weight: 500;
+ }
+
+ .uni-table-td {
+ width: vww(240);
+ height: vww(40);
+ background-color: #ffffff;
+ color: #111111;
+ font-size: vww(13);
+ }
+
+ // 澶勭悊浜烘爣绛剧洅瀛�
+ .assigneesContainer {
+ .u-transition {
+ display: inline-block;
+ margin-left: vww(3);
+ }
+ }
+ }
+ }
+
+ // 杈规
+ // .table--border{
+ // border:1px solid #DDDDDD;
+ // }
+ }
}
</style>
--
Gitblit v1.9.1