From 423c1948a631cff298e6348cc55626f5149c111a Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 26 二月 2026 13:10:19 +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 | 132 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 116 insertions(+), 16 deletions(-)
diff --git a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
index b0618b2..e4bd830 100644
--- a/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
+++ b/pages/MJGL/Sb_EquipRepairTaskReport/Sb_EquipRepairTaskReport.vue
@@ -1,18 +1,43 @@
<template>
<view>
<view class="tabs" id="tabs">
- <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呯淮淇�</view>
- <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">宸茬淮淇�</view>
- <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">鍏ㄩ儴浠诲姟</view>
+ <view :class="tabs == 0 ? 'on':''" @tap="switchTab(0)">寰呮淳宸�</view>
+ <view :class="tabs == 1 ? 'on':''" @tap="switchTab(1)">寰呯淮淇�</view>
+ <view :class="tabs == 2 ? 'on':''" @tap="switchTab(2)">寰呴獙鏀�</view>
</view>
<!-- 璁惧缁翠慨浠诲姟鍒楄〃鍒楄〃 -->
<view class="list" v-for="(item,index) in reportBillsDisplay" :key="index">
- <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" :extra="`鏃ユ湡: ${dayjs(item.璁惧鏁呴殰鏃ユ湡).format('YYYY-MM-DD')}`" style="margin: 10px;">
+ <uni-card :title="item.鏁呴殰鐧昏鍗曞彿" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
<view class="card-detail">
- <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)" :key="index">
+ <view class="detail" v-for="(field, index) in CommonUtils.emptyValueFilter(item, HFieldList)"
+ :key="index">
<text>{{field.ColmCols}}锛�</text>{{item[field.ColmCols]}}
</view>
+ </view>
+ <view class="more" v-if="showDetail == index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="more" v-if="showDetail != index && operations != index">
+ <view class="part" style="border-right: 1px solid #eee;">
+ <uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
+ </view>
+ <view class="part" @tap.stop="operations = operations==index?-1:index">
+ <uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
+ </view>
+ </view>
+ <view class="op" v-if="operations == index">
+ <!-- <button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button> -->
+ <!-- <button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button> -->
+ <button class="op3" size="mini" v-if="tabs == 0" plain @tap.stop="pushBill(0, item)">涓嬫帹娲惧伐鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 1" plain @tap.stop="pushBill(1, item)">涓嬫帹缁翠慨鍗�</button>
+ <button class="op3" size="mini" v-if="tabs == 2" plain @tap.stop="pushBill(2, item)">涓嬫帹楠屾敹鍗�</button>
+ <button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
</view>
</uni-card>
</view>
@@ -36,6 +61,9 @@
dayjs,
CommonUtils,
tabs: 0,
+ showDetail: -1,
+ operations: -1,
+
reportBillsDisplay: [],
reportBillsAwaitRepair: [], // 寰呯淮淇�
reportBillsRepaired: [], // 宸茬淮淇�
@@ -44,6 +72,26 @@
};
},
methods: {
+ pushBill(tab, item) {
+ console.log('item: ', item);
+ let Query = `&HBillNo=${item['鏁呴殰鐧昏鍗曞彿']}&HInterID=${item['HInterID']}&HSourceBillType=3907`
+ if (tab == 0) {
+ uni.navigateTo({
+ url: '/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill?operationType=4' +
+ Query
+ })
+ } 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 + `&HSendWorkID=${item.HSendWorkID}`
+ })
+ }
+ },
switchTab(tabIndex) {
this.tabs = tabIndex
switch (tabIndex) {
@@ -61,9 +109,9 @@
async getRepairList() {
try {
let res = await CommonUtils.doRequest2Async({
- url: 'Sb_EquipRepairTaskReport/RepairList',
+ url: '/Sb_EquipRepairCheckTaskReport/RepairCheckList2',
data: {
- user: getUserInfo()["Czymc"]
+ user: getUserInfo()["HEmpName"]
}
})
@@ -76,22 +124,22 @@
if (count == 1) {
console.log('data: ', data);
- this.reportBillsAwaitRepair = data.h_p_Sb_EquipRepairTaskReport
- this.reportBillsRepaired = data.h_p_Sb_EquipRepairTaskReport1
- this.reportBillsAll = data.h_p_Sb_EquipRepairTaskReport2
-
+ this.reportBillsAwaitRepair = data.h_p_Sb_EquipRepairCheckTaskReport_2
+ this.reportBillsRepaired = data.h_p_Sb_EquipRepairCheckTaskReport_21
+ this.reportBillsAll = data.h_p_Sb_EquipRepairCheckTaskReport_22
+
let fieldList = CommonUtils.fieldListFilterRole({
- ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿', '璁惧鏁呴殰鏃ユ湡'],
+ ExcludeKeys: ['鏁呴殰鐧昏鍗曞彿'],
FieldList: list
})
-
+
if (fieldList.status == false) {
CommonUtils.showTips({
title: '娓╅Θ鎻愮ず',
message: `鑾峰彇琛ㄥ崟缁撴瀯澶辫触: ${fieldList.Message}`
})
}
-
+
this.HFieldList = fieldList.data
this.switchTab(0)
@@ -110,12 +158,64 @@
}
}
},
- onLoad() {
+ onShow() {
this.getRepairList()
}
}
</script>
<style lang="scss">
- @import "@/pages/MJGL/style/MJBillStyle.scss"
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
+
+ .more {
+ color: #888;
+ font-size: 26rpx;
+ display: flex;
+ border-top: 1px solid #eee;
+ padding-top: 20rpx;
+
+ .part {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+
+ .op {
+ display: flex;
+ justify-content: space-around;
+ margin-top: 20rpx;
+
+ button {
+ padding: 0;
+ width: 150rpx;
+ font-size: 25rpx;
+ }
+
+ .op1 {
+ border: 1px solid #41a863;
+ color: #41a863;
+ }
+
+ .op2 {
+ border: 1px solid #d98d00;
+ color: #d98d00;
+ }
+
+ .op3 {
+ border: 1px solid #3a78ff;
+ color: #3a78ff;
+ }
+
+ .op4 {
+ border: 1px solid #da0000;
+ color: #da0000;
+ }
+
+ .op5 {
+ border: 1px solid #888;
+ color: #888;
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.1