From 19756b3475d70b5758a12ff2383970ef3edcece7 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 02 二月 2026 09:58:58 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
index 4da4cad..d23b2f2 100644
--- a/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
+++ b/pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue
@@ -145,6 +145,7 @@
 					</view>
 
 					<view class="op" v-if="operations == item.hmainid">
+                        <button class="op1" v-if="activeTab == 0" size="mini" plain @tap.stop="pushBill(0,item)">涓嬫帹淇濆吇鍗�</button>
 						<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
 					</view>
 				</uni-card>
@@ -180,7 +181,7 @@
 				activeTab: 0,
 
 				tabs: [{
-						label: '浠婃棩寰呬繚鍏�',
+						label: '杩戞棩寰呬繚鍏�',
 						type: 0,
 						count: 0,
 						listData: [], // 娣诲姞杩欎釜
@@ -191,7 +192,7 @@
 						}
 					},
 					{
-						label: '浠婃棩宸蹭繚鍏�',
+						label: '杩戞棩宸蹭繚鍏�',
 						type: 1,
 						count: 0,
 						listData: [], // 娣诲姞杩欎釜
@@ -202,7 +203,7 @@
 						}
 					},
 					{
-						label: '浠婃棩鍏ㄩ儴浠诲姟',
+						label: '杩戞棩鍏ㄩ儴浠诲姟',
 						type: 2,
 						count: 0,
 						listData: [], // 娣诲姞杩欎釜
@@ -221,9 +222,9 @@
 				},
 
 				dateRangePicker: ["浠绘剰闂撮殧", "浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"],
-				curDateGap: "浠婂ぉ",
+				curDateGap: "杩戜竷澶�",
 				enableCustomDateRange: false,
-				startDate: dayjs(new Date()).format('YYYY-MM-DD'),
+				startDate: dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD'),
 				endDate: dayjs(new Date()).format('YYYY-MM-DD'),
 				HBillNo: '',
 
@@ -268,6 +269,14 @@
 			// #endif
 		},
 		methods: {
+            pushBill(currTab, item) {
+                let Query = `?operationType=4&HBarCode=${item['璁惧浠g爜']}`
+                if(currTab == 0) {
+                    uni.navigateTo({
+                        url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill' + Query
+                    })
+                }
+            },
 			goTop: function(e) {
 				// 瑙e喅view灞備笉鍚屾鐨勯棶棰�
 				this.scrollTop = this.old.scrollTop
@@ -335,9 +344,9 @@
 			},
 
 			clear() {
-				this.curDateGap = "浠婂ぉ"
+				this.curDateGap = "杩�7澶�"
 				this.enableCustomDateRange = false
-				this.startDate = dayjs(new Date()).format('YYYY-MM-DD')
+				this.startDate = dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD')
 				this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
 				this.HBillNo = ''
 			},

--
Gitblit v1.9.1