shish пре 1 година
родитељ
комит
55d6da8635
1 измењених фајлова са 14 додато и 15 уклоњено
  1. 14 15
      ghsApp/src/admin/expend/stat.vue

+ 14 - 15
ghsApp/src/admin/expend/stat.vue

@@ -5,10 +5,22 @@
 		<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
 	</view>
 
+	<block v-if="!$util.isEmpty(catList)">
+		<view style="margin-bottom:50upx;">
+			<view v-for="(item, index) in catList" :key="index">
+				<view style="background-color: white;margin-bottom:5upx;padding:20upx 0 20upx 20upx;" v-if="Number(item.amount)>0">
+					<view style="font-size:33upx;margin-bottom:5upx;">
+						<view><text style="font-weight:bold;">{{ item.name }}</text><text style="margin-left:20upx;">{{ item.num }}笔 ¥{{ item.amount }}</text></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</block>
+
 	<block v-if="!$util.isEmpty(bxList)">
 		<view v-for="(item, index) in bxList" :key="index">
-			<view style="background-color: white;margin-bottom:5upx;padding:20upx 0 20upx 20upx;">
-				<view style="font-size:33upx;margin-bottom:10upx;">
+			<view style="background-color: white;margin-bottom:15upx;padding:20upx 0 20upx 20upx;">
+				<view style="font-size:33upx;margin-bottom:20upx;">
 					<view><text style="font-weight:bold;">{{item.staffName?item.staffName:''}}</text></view>
 					<view><text>总支出:¥{{ item.totalAmount }}</text></view>
 					<view><text>已报销:¥{{ item.hasAmount }}</text></view>
@@ -17,19 +29,6 @@
 			</view>
 		</view>
 	</block>
-
-	<block v-if="!$util.isEmpty(catList)">
-		<view style="margin-top:50upx;">
-			<view v-for="(item, index) in catList" :key="index">
-				<view style="background-color: white;margin-bottom:15upx;padding:20upx 0 20upx 20upx;" v-if="Number(item.amount)>0">
-					<view style="font-size:33upx;margin-bottom:20upx;">
-						<view><text>{{ item.name }} {{ item.num }}笔 ¥{{ item.amount }}</text></view>
-					</view>
-				</view>
-			</view>
-		</view>
-	</block>
-
 </view>
 </template>
 <script>