From fbcd224fc18cd749bc2e77c5dfa5d684271fccbe Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 11 三月 2026 17:14:22 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
index dc7e7ea..ffffe2a 100644
--- a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
+++ b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
@@ -12,7 +12,12 @@
                 <view class="card-detail">
                     <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
                         :key="index">
-                        <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+                        <template v-if="field.ColmType == 'DateTime'">
+                            <text>{{field.ColmCols}}锛�</text>{{dayjs(item[field.ColmCols]).format('YYYY-MM-DD HH:mm:ss')}}
+                        </template>
+                        <template v-else>
+                            <text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
+                        </template>
                     </view>
                 </view>
                 <view class="more" v-if="showDetail == index && operations != index">
@@ -83,11 +88,12 @@
                 } else if (tab == 1) {
                     uni.navigateTo({
                         url: '/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill?operationType=5' + Query
+                        + `&HSendWorkID=${item.HSendWorkID}`
                     })
                 } else if (tab == 2) {
                     uni.navigateTo({
                         url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=4' +
-                            Query
+                            Query + `&HSendWorkID=${item.HSendWorkID}`
                     })
                 }
             },
@@ -110,7 +116,7 @@
                     let res = await CommonUtils.doRequest2Async({
                         url: '/Sb_EquipRepairCheckTaskReport/RepairCheckList2',
                         data: {
-                            user: getUserInfo()["Czymc"]
+                            user: getUserInfo()["HEmpName"]
                         }
                     })
 
@@ -157,7 +163,7 @@
                 }
             }
         },
-        onLoad() {
+        onShow() {
             this.getRepairList()
         }
     }

--
Gitblit v1.9.1