From c56e67c77e2a36c894346830c1ab1e6df36fe935 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 01 十二月 2023 16:55:02 +0800
Subject: [PATCH] 测试bug调整
---
pages/my-have-todo/my-have-todo.vue | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/pages/my-have-todo/my-have-todo.vue b/pages/my-have-todo/my-have-todo.vue
index 3dffd2c..9fef375 100644
--- a/pages/my-have-todo/my-have-todo.vue
+++ b/pages/my-have-todo/my-have-todo.vue
@@ -51,7 +51,7 @@
</view>
<view class="center-content__two center-margin">
<view>
- <text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
+ <text>鍙戣捣浜猴細{{ item.actBusiness.createByName || '' }}</text>
</view>
<view>
<text>瀹℃壒鎿嶄綔锛歿{ item.deleteReason }}</text>
@@ -59,7 +59,7 @@
</view>
<view class="center-content__three center-margin">
<view class="">
- <text>瀹℃壒鎰忚锛歿{ item.comment }}</text>
+ <text>瀹℃壒鎰忚锛歿{ item.comment == 'undefined' ? '鏈～鍐�' : item.comment || '鏈～鍐�' }}</text>
</view>
<view class="">
<text>
@@ -82,15 +82,15 @@
<view class="bottom-container">
<!-- 宸插姙鎸夐挳 -->
<view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'">
+ <view @click="() => theFormDataClick(item)" v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
- <view @click="approvalHistoryClick(item.procInstId)">
+ <view @click="() => approvalHistoryClick(item.procInstId)">
<image src="@/static/home/history.png" mode=""></image>
<view>瀹℃壒鍘嗗彶</view>
</view>
- <view @click="deleteApplicationClick(item.id)">
+ <view @click="() => deleteApplicationClick(item.id)">
<image src="@/static/home/delete.png" mode=""></image>
<view>鍒犻櫎</view>
</view>
@@ -99,6 +99,10 @@
</template>
</combination-card>
</u-checkbox-group>
+ </view>
+
+ <view class="empty-placeH">
+
</view>
<!-- 搴曢儴鍏ㄩ�� -->
<view class="bottomTabbar">
@@ -126,9 +130,7 @@
<!-- <u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker> -->
<!--杩斿洖椤堕儴-->
- <view class="back-top-container">
- <u-back-top :scroll-top="scrollTop"></u-back-top>
- </view>
+ <view class="back-top-container"><u-back-top :scroll-top="scrollTop"></u-back-top></view>
<!-- 鑿滃崟鏍� -->
<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
@@ -372,15 +374,23 @@
// console.log(a)
// },
// 琛ㄥ崟鏁版嵁
- theFormDataClick(v) {
- uni.navigateTo({
- url: `/pages/the-form-data/the-form-data?index=${v}`
- });
+ theFormDataClick(item) {
+ if(item?.actBusiness?.actType == 'Offsetting') { //鏀舵 actType = 鈥極ffsetting鈥�
+ uni.navigateTo({
+ url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
+
+ })
+ }else if(item?.actBusiness?.actType == 'XsWaybill') {
+ uni.navigateTo({
+ url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
+ })
+ }
},
// 瀹℃壒鍘嗗彶
approvalHistoryClick(v) {
uni.navigateTo({
- url: `/pages/approval-history/approval-history?index=${v}`
+ //url: `/pages/approval-history/approval-history?index=${v}`
+ url: `/pages/check-the-schedule/check-the-schedule?index=${v}`
});
}
}
@@ -389,6 +399,8 @@
<style lang="scss" scoped>
::v-deep.my-have-todo {
+ width: 100%;
+ height: 100%;
// 鎼滅储鍖哄煙
.searchContainer {
width: 94%;
@@ -594,14 +606,19 @@
}
}
- // 杩斿洖椤堕儴
- .back-top-container{
- .u-transition{
- position:fixed;
- bottom:vww(80)!important;
- right:vww(20)!important;
- }
- }
+ // 杩斿洖椤堕儴
+ .back-top-container {
+ .u-transition {
+ position: fixed;
+ bottom: vww(80) !important;
+ right: vww(20) !important;
+ }
+ }
+
+ // 搴曢儴绔欎綅
+ .empty-placeH{
+ height:vww(5);
+ }
// 搴曢儴
.bottomTabbar {
--
Gitblit v1.9.1