From 95bdecb4b73270f48bd46c628e9d6cf3ddccc92b Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 21 一月 2026 20:34:24 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue
index 17d7fe4..a165bc2 100644
--- a/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue
+++ b/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBillList.vue
@@ -50,26 +50,31 @@
<view class="list" v-for="(item,index) in showList" :key="index" v-if="tabs==0">
<uni-card :title="item.鍒跺崟鏃ユ湡.substr(0,10)" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
@tap="showDetail = showDetail==index?-1:index">
- <view class="card-detail"
- v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)" :key="index">
+ <view class="card-detail">
<template
- v-if="HBillField.ColmType == 'DateTime'"><text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+ v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(0,10)">
+ <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+ <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+ </view>
+ <view class="detail" v-else>
+ <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}
+ </view>
</template>
- <template
- v-else><text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}</template>
</view>
<view class="card-detail" v-if="showDetail == index">
- <view class="card-detail"
- v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)"
- :key="index">
+ <view class="card-detail">
<template
- v-if="HBillField.ColmType == 'DateTime'"><text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+ v-for="(HBillField, index) in CommonUtils.emptyValueFilter(item,HFieldList).slice(10,-1)">
+ <view class="detail" v-if="HBillField.ColmType == 'DateTime'">
+ <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] ? dayjs(item[HBillField.ColmCols]).format("YYYY-MM-DD HH:mm:ss") : "" }}
+ </view>
+ <view class="detail" v-else>
+ <text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}</view>
</template>
- <template
- v-else><text>{{ HBillField.ColmCols }}锛�</text>{{ item[HBillField.ColmCols] }}</template>
+
</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>鏀惰捣
--
Gitblit v1.9.1