From 3821b5cc96a7e6702a0cbc8187c6dc67d7eacf3e Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.cm>
Date: 星期六, 29 十一月 2025 15:26:48 +0800
Subject: [PATCH] fix:批量通过和批量拒绝参数错误

---
 pages/my-todo/my-todo.vue |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/pages/my-todo/my-todo.vue b/pages/my-todo/my-todo.vue
index af694e1..6f9b577 100644
--- a/pages/my-todo/my-todo.vue
+++ b/pages/my-todo/my-todo.vue
@@ -54,7 +54,7 @@
       <combination-card v-for="(item, index) in daibanData" index="index">
         <template v-slot:top>
           <view class="daibanTop">
-						<u-checkbox size="30" iconSize="18" :key="item.id" :name="item.id+item.procInstId"></u-checkbox>
+						<u-checkbox size="30" iconSize="18" :key="item.id" :name="item.id+'@'+item.procInstId"></u-checkbox>
             <text>{{ item.actBusiness.title }}</text>
           </view>
         </template>
@@ -81,19 +81,19 @@
           <view class="bottom-container">
             <!-- 寰呭姙鎸夐挳 -->
             <view class="bottom-content__item">
-              <view @click="theFormDataClick(item)" v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">
+              <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="rejectClick(item)">
+              <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>
@@ -336,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(); // 鍏抽棴鍔犺浇鍔ㄧ敾
@@ -395,13 +396,13 @@
       console.log(a);
     },
     // 澶嶉�夋
-    checkboxChange(n) {
-      console.log('checkbox', n);
+    checkboxChange(n,v) {
+      console.log('checkbox', n,v);
     },
     totalSelectChange(n) {
       if (n[0] == 'tatalSelect') {
         this.daibanData.forEach(item => {
-          this.totalSelectValue.push(item.id + item.procInstId)
+          this.totalSelectValue.push(item.id)
         })
         this.checkBoxValue = this.totalSelectValue
       } else {
@@ -424,8 +425,9 @@
     },
     // 瀹℃壒鍘嗗彶
     approvalHistoryClick(v) {
+      console.log(v,'鍘嗗彶瀹℃壒====----')
       uni.navigateTo({
-        url: `/pages/approval-history/approval-history?index=${v}`
+        url: `/pages/approval-history/approval-history?index=${v?.procInstId}`
       });
     },
     // 閫氳繃
@@ -436,6 +438,7 @@
       this.modalType = 0;
     },
     batchAdoptClick() {
+      console.log('鎵归噺閫氳繃鎸夐挳----------',this.checkBoxValue)
       if (this.checkBoxValue.length != 0) {
         this.adoptModalShow = true;
       } else {
@@ -444,13 +447,15 @@
     },
     // 閫氳繃妯℃�佹
     adoptModalConfirm() {
+      this.adoptDataBox = []
       this.adoptModalShow = false;
 			if(this.checkBoxValue.length >= 1){
 				this.checkBoxValue.forEach(item => {
-				  this.adoptDataBox.push(item.slice(0, 6))
+				  this.adoptDataBox.push(item.split("@")[0])
 				})
 				this.adoptForm.ids = this.adoptDataBox.toString();
 			}
+      console.log(this.checkBoxValue,'this.checkBoxValue--00000000000',this.adoptDataBox,this.adoptForm)
       this.$reqPost('passAll', this.adoptForm).then(res => {
         console.log('鏄惁杩樺師', this.adoptForm.ids, this.rejectForm.procInstIds);
         if (res.code == 0) {
@@ -476,13 +481,15 @@
 		},
     // 椹冲洖妯℃�佹
     rejectModalConfirm() {
+      this.rejectDataBox = []
       this.rejectModalShow = false;
 			if(this.checkBoxValue.length >= 1){
 				this.checkBoxValue.forEach(item => {
-				  this.rejectDataBox.push(item.slice(6, 12))
+				  this.rejectDataBox.push(item.split("@")[1])
 				})
 				this.rejectForm.procInstIds = this.rejectDataBox.toString();
 			}
+      console.log(this.rejectForm)
       this.$reqPost('backAll', this.rejectForm).then(res => {
         if (res.code == 0) {
           this.$u.toast('鎿嶄綔鎴愬姛锛�');

--
Gitblit v1.9.1