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-todo/my-todo.vue | 109 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 32 deletions(-)
diff --git a/pages/my-todo/my-todo.vue b/pages/my-todo/my-todo.vue
index 66ca313..af694e1 100644
--- a/pages/my-todo/my-todo.vue
+++ b/pages/my-todo/my-todo.vue
@@ -49,11 +49,12 @@
<!-- 鎴戠殑寰呭姙鍗＄墖鍖哄煙 -->
+ <view class="cardCheckGroup">
<u-checkbox-group v-model="checkBoxValue" placement="column" @change="checkboxChange" style="margin-bottom:50px">
<combination-card v-for="(item, index) in daibanData" index="index">
<template v-slot:top>
- <u-checkbox size="35" :key="item.id" :name="item.id+item.procInstId"></u-checkbox>
- <view>
+ <view class="daibanTop">
+ <u-checkbox size="30" iconSize="18" :key="item.id" :name="item.id+item.procInstId"></u-checkbox>
<text>{{ item.actBusiness.title }}</text>
</view>
</template>
@@ -80,7 +81,7 @@
<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/jindu.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
@@ -88,7 +89,7 @@
<image src="@/static/home/tongguo.png" mode=""></image>
<view>閫氳繃</view>
</view>
- <view @click="rejectModalShow = true">
+ <view @click="rejectClick(item)">
<image src="@/static/home/bohui.png" mode=""></image>
<view>椹冲洖</view>
</view>
@@ -101,11 +102,12 @@
</template>
</combination-card>
</u-checkbox-group>
+ </view>
<!-- 搴曢儴鍏ㄩ�� -->
<view class="bottomTabbar">
<view class="bottomTabbar_checkBox">
- <u-checkbox-group size="35" v-model="totalSelectValue" placement="column" @change="totalSelectChange">
+ <u-checkbox-group size="35" iconSize="18" v-model="totalSelectValue" placement="column" @change="totalSelectChange">
<u-checkbox labelSize="13px" label="鍏ㄩ��" name="tatalSelect"></u-checkbox>
</u-checkbox-group>
</view>
@@ -178,7 +180,9 @@
</view> -->
<!--杩斿洖椤堕儴-->
- <u-back-top :scroll-top="scrollTop"></u-back-top>
+ <view class="back-top-container">
+ <u-back-top :scroll-top="scrollTop"></u-back-top>
+ </view>
<!-- 鑿滃崟鏍� -->
<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
@@ -188,6 +192,7 @@
<script>
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
import combinationCard from '@/components/common/combination-card/combination-card.vue';
+import { callWithErrorHandling } from "vue";
export default {
data() {
@@ -405,10 +410,17 @@
console.log('totalSelect', n);
},
// 琛ㄥ崟鏁版嵁
- 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) {
@@ -418,6 +430,7 @@
},
// 閫氳繃
adopClick(v) {
+ console.log('閫氳繃',v);
this.adoptModalShow = true;
this.adoptForm.ids = v.id;
this.modalType = 0;
@@ -432,47 +445,61 @@
// 閫氳繃妯℃�佹
adoptModalConfirm() {
this.adoptModalShow = false;
- this.checkBoxValue.forEach(item => {
- this.adoptDataBox.push(item.slice(0, 6))
- })
- this.adoptForm.ids = this.adoptDataBox.toString();
- this.$reqPost('passAll', this.adoptForm, 'form').then(res => {
+ if(this.checkBoxValue.length >= 1){
+ this.checkBoxValue.forEach(item => {
+ this.adoptDataBox.push(item.slice(0, 6))
+ })
+ this.adoptForm.ids = this.adoptDataBox.toString();
+ }
+ this.$reqPost('passAll', this.adoptForm).then(res => {
console.log('鏄惁杩樺師', this.adoptForm.ids, this.rejectForm.procInstIds);
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛!');
} else {
this.$u.toast('娣诲姞澶辫触!!');
}
+ // 鍒濆鍖�
+ this.checkBoxValue = []
+ this.adoptForm.ids = '';
+ this.adoptForm.comment = '';
this.init();
});
},
adoptModalCancel() {
this.adoptModalShow = false;
},
+ // 椹冲洖鐐瑰嚮
+ rejectClick(v) {
+ this.modalType = 1;
+ this.rejectModalShow = true;
+ this.rejectForm.procInstIds = v.procInstId;
+ },
// 椹冲洖妯℃�佹
rejectModalConfirm() {
this.rejectModalShow = false;
- this.checkBoxValue.forEach(item => {
- this.rejectDataBox.push(item.slice(6, 12))
- })
- this.rejectForm.procInstIds = this.rejectDataBox.toString();
- this.$reqPost('backAll', this.rejectForm, 'form').then(res => {
+ if(this.checkBoxValue.length >= 1){
+ this.checkBoxValue.forEach(item => {
+ this.rejectDataBox.push(item.slice(6, 12))
+ })
+ this.rejectForm.procInstIds = this.rejectDataBox.toString();
+ }
+ this.$reqPost('backAll', this.rejectForm).then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛�');
} else {
this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�');
}
+ // 鍒濆鍖�
+ this.rejectForm.procInstIds = '';
+ this.rejectForm.comment = '';
+ this.checkBoxValue = []
this.init();
});
},
rejectModalCancel() {
this.rejectModalShow = false;
},
- rejectClick(v) {
- this.modalType = 1;
- this.rejectModalShow = true;
- this.rejectForm.procInstIds = v.procInstId;
- },
+
batchRejectClick() {
if (this.checkBoxValue.length != 0) {
this.rejectModalShow = true;
@@ -491,7 +518,7 @@
::v-deep.my-todo {
// 鎼滅储鍖哄煙
.searchContainer {
- width:91%;
+ width:94%;
margin:vww(16) auto;
.u-collapse {
.u-collapse-item {
@@ -514,7 +541,7 @@
margin: 0 auto vww(16);
.search {
- width: vww(150);
+ width: vww(158);
border: 1px solid #d1d1d1;
border-radius: vww(4);
@@ -555,7 +582,7 @@
.data-selet {
border: 1px solid #d1d1d1;
border-radius: 4px;
- width: vww(150);
+ width: vww(160);
// width: 100%;
height: 40px;
display: flex;
@@ -576,7 +603,7 @@
.content {
margin-left: vww(8);
- width: vww(150);
+ width: vww(160);
}
}
}
@@ -590,7 +617,7 @@
justify-content: space-between;
.uni-date {
- width: vww(150);
+ width: vww(160);
.uni-date-editor {
.uni-date-editor--x {
@@ -619,6 +646,15 @@
}
+ // 鍗＄墖澶撮儴
+ .cardCheckGroup{
+ margin-bottom: vww(48);
+ }
+ .daibanTop{
+ .u-checkbox{
+ display:inline-block;
+ }
+ }
// 鍗＄墖涓棿
.center-container {
@@ -687,6 +723,15 @@
}
}
+ // 杩斿洖椤堕儴
+ .back-top-container{
+ .u-transition{
+ position:fixed;
+ bottom:vww(80)!important;
+ right:vww(20)!important;
+ }
+ }
+
// 搴曢儴
.bottomTabbar {
position: fixed;
@@ -741,7 +786,7 @@
width: vww(280);
height: vww(90) !important;
- .uni-textarea-wrapper {
+ .u-textarea__field {
height: vww(90) !important;
}
}
@@ -770,7 +815,7 @@
width: vww(280);
height: vww(90) !important;
- .uni-textarea-wrapper {
+ .u-textarea__field {
height: vww(90) !important;
}
}
--
Gitblit v1.9.1