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 |   45 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/pages/my-application/my-application.vue b/pages/my-application/my-application.vue
index 1a486b0..ca36364 100644
--- a/pages/my-application/my-application.vue
+++ b/pages/my-application/my-application.vue
@@ -86,34 +86,38 @@
         <view class="bottom-container">
           <!-- 鎸夐挳鍖哄煙 -->
           <view class="bottom-content__chulizhong bottom-content__item">
-            <view @click="withDrawClick(item.procInstId)" 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 || item.status == 3 ) && (item.processName == '鍙戣繍閫氱煡鍗�')">
+            <view @click="() => shenqingDetail(item)" v-if="item.actType == 'Offsetting' || item.actType == 'XsWaybill'">
               <image src="@/static/home/biaodan.png" mode=""></image>
               <view>鐢宠璇︽儏</view>
             </view>
+<!--            <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 @click="editMyApplication(item)" v-if="item.status == 1 && item.processName == '鍙戣繍閫氱煡鍗�'">
+            <!-- <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">
+						<!-- <view @click="deleteWithDrawApplication(item.tableId)" v-if="item.status == 3">
 							<image src="@/static/home/delete.png" mode=""></image>
 							<view>鍒犻櫎</view>
-						</view>
+						</view> -->
           </view>
         </view>
       </template>
@@ -306,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;
@@ -546,6 +564,7 @@
     },
     // 鏌ョ湅杩涘害
     checkTheScheduleClick(v) {
+      console.log(v,'v====鏌ョ湅杩涘害====')
       uni.navigateTo({
         url: `/pages/check-the-schedule/check-the-schedule?index=${v}`
       });
@@ -562,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({
@@ -787,7 +814,7 @@
       right:vww(20)!important;
     }
   }
-	
+
 	// 搴曢儴鍗犱綅
 	.empty-placeH{
 		height:vww(50);

--
Gitblit v1.9.1