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-application/my-application.vue | 251 ++++++++++++++++++++++++++++---------------------
1 files changed, 143 insertions(+), 108 deletions(-)
diff --git a/pages/my-application/my-application.vue b/pages/my-application/my-application.vue
index 2a2d27c..ca36364 100644
--- a/pages/my-application/my-application.vue
+++ b/pages/my-application/my-application.vue
@@ -48,7 +48,7 @@
<!-- 鎴戠殑鐢宠鍗＄墖鍖哄煙 -->
<!-- <u-checkbox-group v-model="checkBoxValue" placement="column" @change="checkboxChange" style="margin-bottom:150px"> -->
<combination-card v-for="(item, index) in shenqingData" index="index">
- <template v-slot:top>
+ <template v-slot:top>
<!-- <u-checkbox size="35" :key="item.id" :name="item.id"></u-checkbox> -->
<view>
<text>{{ item.title }}</text>
@@ -61,7 +61,7 @@
<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
</view>
<view class="">
- <text>瀹℃壒鐜妭锛歿{ item.currTaskName }}</text>
+ <text>瀹℃壒鐜妭锛歿{ item.currTaskName ||'' }}</text>
</view>
</view>
<view class="center-content__two center-margin">
@@ -86,30 +86,38 @@
<view class="bottom-container">
<!-- 鎸夐挳鍖哄煙 -->
<view class="bottom-content__chulizhong bottom-content__item">
- <view @click="withDrawClick(item.id)" v-if="item.status == 1">
+ <!-- <view @click="withDrawClick(item.procInstId)" v-if="item.status == 1">
<image src="@/static/home/cehui.png" mode=""></image>
<view>鎾ゅ洖</view>
- </view>
- <view @click="checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">
+ </view> -->
+ <view @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">
<image src="@/static/home/jindu.png" mode=""></image>
<view>鏌ョ湅杩涘害</view>
</view>
- <view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
+ <view @click="() => shenqingDetail(item)" v-if="item.actType == 'Offsetting' || item.actType == 'XsWaybill'">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
- <view v-if="item.status == 3" @click="apply(item)">
+<!-- <view @click="() => shenqingDetail(item)" v-if="(item.status == 1 || item.status == 2 || item.status == 3 ) && (item.processName == '鍙戣繍閫氱煡鍗�')">-->
+<!-- <image src="@/static/home/biaodan.png" mode=""></image>-->
+<!-- <view>鐢宠璇︽儏</view>-->
+<!-- </view>-->
+ <!-- <view v-if="item.status == 3" @click="apply(item)">
<image src="@/static/home/history.png" mode=""></image>
<view>閲嶆柊鐢宠</view>
- </view>
- <view v-if="item.status == 3" @click="editMyApplication(item)">
+ </view> -->
+ <!-- <view @click="editMyApplication(item)" v-if="item.status == 1 && item.processName == '鍙戣繍閫氱煡鍗�'">
<image src="@/static/home/history.png" mode=""></image>
<view>缂栬緫</view>
- </view>
+ </view> -->
<view @click="approvalHistoryClick(item.procInstId)" v-if="item.status == 2 || item.status == 3">
<image src="@/static/home/history.png" mode=""></image>
<view>瀹℃壒鍘嗗彶</view>
</view>
+ <!-- <view @click="deleteWithDrawApplication(item.tableId)" v-if="item.status == 3">
+ <image src="@/static/home/delete.png" mode=""></image>
+ <view>鍒犻櫎</view>
+ </view> -->
</view>
</view>
</template>
@@ -118,10 +126,11 @@
<!-- 鎾ゅ洖妯℃�佹 -->
<view class="wodeshenqingMotai">
- <u-modal width="684rpx" :show="withDrawShow" title="鎾ゅ洖鍘熷洜" :showCancelButton="true" @confirm="withDrawConfirm"
+ <u-modal width="684rpx" :show="withDrawShow" title="鎻愮ず" :showCancelButton="true" @confirm="withDrawConfirm"
@cancel="withDrawCancel">
<view class="slot-content">
- <u--textarea v-model="withDrawData.reason" placeholder="璇疯緭鍏ユ挙鍥炲師鍥�"></u--textarea>
+ <!-- <u--textarea v-model="withDrawData.reason" placeholder="璇疯緭鍏ユ挙鍥炲師鍥�"></u--textarea> -->
+ <text>纭鎾ゅ洖璇ョ敵璇峰悧锛�</text>
</view>
</u-modal>
</view>
@@ -139,9 +148,11 @@
</view>
<!--杩斿洖椤堕儴-->
- <u-back-top :scroll-top="scrollTop"></u-back-top>
+ <view class="back-top-container">
+ <u-back-top :scroll-top="scrollTop" style="position:fixed;bottom:100px;right:100px;"></u-back-top>
+ </view>
- <view class="" style="height:50px;">
+ <view class="empty-placeH">
</view>
@@ -191,8 +202,8 @@
// 鎾ゅ洖妯℃�佹
withDrawShow: false,
withDrawData: {
- reason: '',
- id: '', // 鎾ゅ洖鐢宠ID
+ // reason: '',
+ // id: '', // 鎾ゅ洖鐢宠ID
procInstId: ''
},
// 閲嶆柊鐢宠
@@ -299,6 +310,20 @@
this.init();
},
methods: {
+ shenqingDetail(item) { //璺宠浆璇︽儏椤甸潰
+ console.log(item,'item=====')
+ if(item.actType == 'Offsetting') { //鏀舵 actType = 鈥極ffsetting鈥�
+ uni.navigateTo({
+ url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
+
+ })
+ }else if(item.actType == 'XsWaybill') {
+ uni.navigateTo({
+ url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
+ })
+ }
+
+ },
init() {
this.myApplication.pageNumber = 1;
this.loadingType = 0;
@@ -401,17 +426,12 @@
this.init();
},
// 鎾ゅ洖妯℃�佹
- withDrawClick(id) {
+ withDrawClick(procInstId) {
this.withDrawShow = true;
- this.withDrawData.id = id;
+ this.withDrawData.procInstId = procInstId;
},
withDrawConfirm() {
- this.shenqingData.forEach(i => {
- if (i.id == this.withDrawData.id) {
- this.withDrawData.procInstId = i.procInstId;
- }
- });
- this.$reqPost('withDraw', this.withDrawData, 'form').then(res => {
+ this.$reqPost('cancel', this.withDrawData).then(res => {
console.log('res', res);
if (res.code == 0) {
uni.showToast({
@@ -426,95 +446,86 @@
this.getMoreNews();
});
- console.log(this.withDrawId);
- if (this.withDrawData.reason.length >= 2) {
- console.log(this.withDrawData.reason);
- } else {
- uni.showToast({
- title: '璇疯鑼冭緭鍏�',
- duration: 2000
- });
- }
},
withDrawCancel() {
this.withDrawShow = false;
},
- apply(v) {
- if (!v.procDefId || v.procDefId == 'null') {
- this.$u.toast('娴佺▼瀹氫箟涓虹┖');
- return;
- }
- this.form.id = v.id;
- this.form.procDefId = v.procDefId;
- this.form.title = v.title;
- // 鍔犺浇瀹℃壒浜�
- // this.userLoading = true;
- uni.showLoading({
- title: '瀹℃壒浜哄姞杞戒腑'
- });
- // getFirstNode(v.procDefId).then((res) => {
- this.$reqGet('getFirstNode', {}, v.procDefId).then(res => {
- // this.userLoading = false;
- console.log('瀹℃壒浜�', res);
- uni.hideLoading();
- if (res.data) {
- this.error = '';
- if (res.data.type == 3 || res.data.type == 4) {
- this.isGateway = true;
- this.form.firstGateway = true;
- this.showAssign = false;
- this.isCustom = false;
- return;
- }
- if (res.data.type == 5) {
- this.isCustom = true;
- this.isGateway = false;
- this.form.firstGateway = false;
- this.showAssign = false;
- return;
- }
- if (res.data.type == 1) {
- this.showAssign = true;
- this.isGateway = false;
- this.form.firstGateway = false;
- this.isCustom = false;
- if (res.data.users && res.data.users.length > 0) {
- this.assigneeList = res.data.users;
- // 榛樿鍕鹃��
- let ids = [];
- res.data.users.forEach(e => {
- ids.push(e.userId);
- });
- this.form.assignees = ids;
- this.showAssign = true;
- // 鑾峰彇琛ㄥ崟鍐呭锛岄噸鏂板垱寤虹敵璇�
- this.$reqPost('apply', this.form, 'form').then(res => {
- console.log('閲嶆柊鎻愪氦鐢宠', res);
- if (res.code == 0) {
- uni.showToast({
- title: res.data,
- icon: 'success',
- duration: 2000
- });
- }
- // 鍒濆鍖栫敵璇峰垪琛�
- this.myApplication.pageNumber = 1;
- this.shenqingData = [];
- this.getMoreNews();
- })
- } else {
- this.form.assignees = [];
- this.showAssign = true;
- this.error = '璇疯繘鍏�"娴佺▼绠＄悊"涓哄鎵硅妭鐐瑰垎閰嶅�欓�夊鎵逛汉鍛�';
- }
- }
- }
- console.log(this.form);
- });
+ // apply(v) {
+ // if (!v.procDefId || v.procDefId == 'null') {
+ // this.$u.toast('娴佺▼瀹氫箟涓虹┖');
+ // return;
+ // }
+ // this.form.id = v.id;
+ // this.form.procDefId = v.procDefId;
+ // this.form.title = v.title;
+ // // 鍔犺浇瀹℃壒浜�
+ // // this.userLoading = true;
+ // uni.showLoading({
+ // title: '瀹℃壒浜哄姞杞戒腑'
+ // });
+ // // getFirstNode(v.procDefId).then((res) => {
+ // this.$reqGet('getFirstNode', {}, v.procDefId).then(res => {
+ // // this.userLoading = false;
+ // console.log('瀹℃壒浜�', res);
+ // uni.hideLoading();
+ // if (res.data) {
+ // this.error = '';
+ // if (res.data.type == 3 || res.data.type == 4) {
+ // this.isGateway = true;
+ // this.form.firstGateway = true;
+ // this.showAssign = false;
+ // this.isCustom = false;
+ // return;
+ // }
+ // if (res.data.type == 5) {
+ // this.isCustom = true;
+ // this.isGateway = false;
+ // this.form.firstGateway = false;
+ // this.showAssign = false;
+ // return;
+ // }
+ // if (res.data.type == 1) {
+ // this.showAssign = true;
+ // this.isGateway = false;
+ // this.form.firstGateway = false;
+ // this.isCustom = false;
+ // if (res.data.users && res.data.users.length > 0) {
+ // this.assigneeList = res.data.users;
+ // // 榛樿鍕鹃��
+ // let ids = [];
+ // res.data.users.forEach(e => {
+ // ids.push(e.userId);
+ // });
+ // this.form.assignees = ids;
+ // this.showAssign = true;
+ // // 鑾峰彇琛ㄥ崟鍐呭锛岄噸鏂板垱寤虹敵璇�
+ // this.$reqPost('apply', this.form, 'form').then(res => {
+ // console.log('閲嶆柊鎻愪氦鐢宠', res);
+ // if (res.code == 0) {
+ // uni.showToast({
+ // title: res.data,
+ // icon: 'success',
+ // duration: 2000
+ // });
+ // }
+ // // 鍒濆鍖栫敵璇峰垪琛�
+ // this.myApplication.pageNumber = 1;
+ // this.shenqingData = [];
+ // this.getMoreNews();
+ // })
+ // } else {
+ // this.form.assignees = [];
+ // this.showAssign = true;
+ // this.error = '璇疯繘鍏�"娴佺▼绠＄悊"涓哄鎵硅妭鐐瑰垎閰嶅�欓�夊鎵逛汉鍛�';
+ // }
+ // }
+ // }
+ // console.log(this.form);
+ // });
- this.modalVisible = true;
- // }
- },
+ // this.modalVisible = true;
+ // // }
+ // },
// 淇敼鐢宠
editMyApplication(v) {
console.log('淇敼鐢宠');
@@ -553,6 +564,7 @@
},
// 鏌ョ湅杩涘害
checkTheScheduleClick(v) {
+ console.log(v,'v====鏌ョ湅杩涘害====')
uni.navigateTo({
url: `/pages/check-the-schedule/check-the-schedule?index=${v}`
});
@@ -569,6 +581,14 @@
url: `/pages/approval-history/approval-history?index=${v}`
});
},
+ // 鍒犻櫎宸叉挙鍥炵敵璇�
+ deleteWithDrawApplication(id){
+ this.deleteWithDrawApplicationGlobal(id).then(res=>{
+ console.log('shenqing,鍥炴樉',res);
+ }).catch(err=>{
+ console.log('shenqing,鍒犻櫎閿欒');
+ })
+ },
// 鏂板鐢宠
newApplicationClick() {
uni.navigateTo({
@@ -786,6 +806,21 @@
}
}
+ // 杩斿洖椤堕儴
+ .back-top-container{
+ .u-transition{
+ position:fixed;
+ bottom:vww(80)!important;
+ right:vww(20)!important;
+ }
+ }
+
+ // 搴曢儴鍗犱綅
+ .empty-placeH{
+ height:vww(50);
+ }
+
+
// 搴曢儴
.bottomTabbar {
position: fixed;
--
Gitblit v1.9.1