From b5d3561a2e06106ed9cce2c6bcc9c2463951e998 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 15 十一月 2024 11:06:26 +0800
Subject: [PATCH] 新增申请页面不显示发运通知单的问题修改
---
pages/my-todo/my-todo.vue | 73 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/pages/my-todo/my-todo.vue b/pages/my-todo/my-todo.vue
index 0f57734..6f42c1c 100644
--- a/pages/my-todo/my-todo.vue
+++ b/pages/my-todo/my-todo.vue
@@ -81,19 +81,19 @@
<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>
- <view @click="adopClick(item)">
+ <view @click="() => adopClick(item)">
<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>
- <view @click="approvalHistoryClick(item.procInstId)">
+ <view @click="() => approvalHistoryClick(item)">
<image src="@/static/home/history.png" mode=""></image>
<view>鍘嗗彶</view>
</view>
@@ -192,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() {
@@ -335,6 +336,7 @@
}
this.daibanData = this.daibanData.concat(res.data.content);
}
+ console.log(this.daibanData,'this.daibanData====寰呭姙-------00000----')
//灏嗘暟鎹嫾鎺ュ湪涓�璧�
this.loadingType = 0; // 灏唋oadingType褰�0閲嶇疆
uni.hideNavigationBarLoading(); // 鍏抽棴鍔犺浇鍔ㄧ敾
@@ -409,19 +411,28 @@
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) {
+ console.log(v,'鍘嗗彶瀹℃壒====----')
uni.navigateTo({
- url: `/pages/approval-history/approval-history?index=${v}`
+ url: `/pages/approval-history/approval-history?index=${v?.procInstId}`
});
},
// 閫氳繃
adopClick(v) {
+ console.log('閫氳繃',v);
this.adoptModalShow = true;
this.adoptForm.ids = v.id;
this.modalType = 0;
@@ -436,47 +447,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;
--
Gitblit v1.9.1