From b25be565b2d9b856179d207aa5099abd3ae3fa45 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 13 四月 2026 17:33:22 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
index d23b2f2..101d76b 100644
--- a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
+++ b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
@@ -91,6 +91,12 @@
<view class="detail" v-if="item.璁″垝缁撴潫鏃堕棿鐐�">
<text>璁″垝缁撴潫鏃堕棿鐐癸細</text>{{item.璁″垝缁撴潫鏃堕棿鐐�.substr(0,10)}}
</view>
+ <view class="detail" v-if="false">
+ <text>淇濆吇璁″垝鍗曚富ID锛�</text>{{item.HPlanHInterID}}
+ </view>
+ <view class="detail" v-if="false">
+ <text>淇濆吇璁″垝鍗曞瓙ID锛�</text>{{item.HPlanHEntryID}}
+ </view>
</view>
<view class="card-detail" v-if="showDetail == item.hmainid">
<view class="detail" v-if="item.鍒跺崟浜�">
@@ -202,6 +208,17 @@
total: 0,
}
},
+ {
+ label: '閫炬湡寰呬繚鍏�',
+ type: 3,
+ count: 0,
+ listData: [], // 娣诲姞杩欎釜
+ pageMeta: { // 娣诲姞杩欎釜
+ curPage: 1,
+ size: 50,
+ total: 0,
+ }
+ },
{
label: '杩戞棩鍏ㄩ儴浠诲姟',
type: 2,
@@ -270,7 +287,7 @@
},
methods: {
pushBill(currTab, item) {
- let Query = `?operationType=4&HBarCode=${item['璁惧浠ｇ爜']}`
+ let Query = `?operationType=4&HBarCode=${item['璁惧浠ｇ爜']}&HPlanHInterID=${item['HPlanHInterID']}&HPlanHEntryID=${item['HPlanHEntryID']}`
if(currTab == 0) {
uni.navigateTo({
url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill' + Query
@@ -388,10 +405,17 @@
if (data && data.h_p_Sb_EquipMaintainTaskReport_APP2) {
// 鏇存柊寰呴獙鏀堕〉绛�
- this.tabs[2].listData = data.h_p_Sb_EquipMaintainTaskReport_APP2
- this.tabs[2].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
- this.tabs[2].count = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
+ this.tabs[3].listData = data.h_p_Sb_EquipMaintainTaskReport_APP2
+ this.tabs[3].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
+ this.tabs[3].count = data.h_p_Sb_EquipMaintainTaskReport_APP2.length
}
+
+ if (data && data.h_p_Sb_EquipMaintainTaskReport_APP3) {
+ // 鏇存柊寰呴獙鏀堕〉绛�
+ this.tabs[2].listData = data.h_p_Sb_EquipMaintainTaskReport_APP3
+ this.tabs[2].pageMeta.total = data.h_p_Sb_EquipMaintainTaskReport_APP3.length
+ this.tabs[2].count = data.h_p_Sb_EquipMaintainTaskReport_APP3.length
+ }
uni.stopPullDownRefresh()
--
Gitblit v1.9.1