报销优化

ghsApp/src/admin/expend/list.vue

@@ -30,8 +30,8 @@
 		<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 	</block>
 	<view class="app-footer open_btn">
-		<text style="margin-right:50upx;color:blue;font-size:34upx;" @click="goToStat()">汇总统计</text>
-		<text style="margin-right:50upx;color:blue;font-size:34upx;" @click="goToMayBx()">应报销统计</text>
+		<text style="margin-right:60upx;color:blue;font-size:36upx;" @click="goToStat()">汇总统计</text>
+		<text style="margin-right:60upx;color:blue;font-size:36upx;" @click="goToMayBx()">应报销统计</text>
 		<view @click="addExpend" class="admin-button-com big blue" style="width:210upx;">新增支出</view>
 	</view>
 

ghsApp/src/admin/expend/mayBx.vue

@@ -3,7 +3,7 @@
 	<block v-if="!$util.isEmpty(bxList)">
 		<view v-for="(item, index) in bxList" :key="index">
 			<view style="background-color: white;margin-bottom:15upx;padding:20upx 0 20upx 20upx;">
-				<view style="font-size:33upx;margin-bottom:20upx;">
+				<view style="font-size:36upx;margin-bottom:20upx;">
 					<view>
 						<text style="font-weight:bold;">{{item.staffName?item.staffName:''}}</text>
 						<text style="margin-left:30upx;">待报销：¥{{ item.amount }}</text>
@@ -14,7 +14,7 @@
 		</view>
 	</block>
 	<block v-else>
-		<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(bxList)" />
+		<AppWrapperEmpty title="没有需要报销" :is-empty="$util.isEmpty(bxList)" />
 	</block>
 </view>
 </template>

ghsApp/src/admin/expend/stat.vue

@@ -1,11 +1,13 @@
 <template>
 <view class="app-content">
+
 	<view class="top-bar" style="margin:20upx 0 20upx 40upx;padding-top:30upx;">
 		<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
 	</view>
+
 	<block v-if="!$util.isEmpty(bxList)">
 		<view v-for="(item, index) in bxList" :key="index">
-			<view style="background-color: white;margin-bottom:15upx;padding:20upx 0 20upx 20upx;">
+			<view style="background-color: white;margin-bottom:10upx;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>
@@ -15,17 +17,27 @@
 			</view>
 		</view>
 	</block>
-	<block v-else>
-		<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(bxList)" />
+
+	<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>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import { getUnBxList,bx } from '@/api/expend'
+import { getStat } from '@/api/expend'
 import DateSelect from "@/components/module/dateSelect"
 export default {
-	name: "bxList",
+	name: "stat",
 	components: {
 		AppWrapperEmpty,
 		DateSelect
@@ -36,7 +48,8 @@ export default {
 			bxList:[],
 			searchTime:'',
 			startTime:'',
-			endTime:''
+			endTime:'',
+			catList:[]
 		};
 	},
 	methods: {
@@ -46,21 +59,11 @@ export default {
 			this.endTime = val.endTime
 			this.init()
 		},
-		confirmBx(staffId,amount){
-			let that = this
-			that.$util.confirmModal({content:'确认已报销？'},() => {
-				bx({staffId,amount}).then(res=>{
-					if(res.code == 1){
-						that.$msg(res.msg)
-						that.init()
-					}
-				})
-        	})
-		},
 		init(){
-			getUnBxList({searchTime: this.searchTime,startTime: this.startTime,endTime: this.endTime}).then(res=>{
+			getStat({searchTime: this.searchTime,startTime: this.startTime,endTime: this.endTime}).then(res=>{
 				if(res.code == 1){
 					this.bxList = res.data.list ? res.data.list : []
+					this.catList = res.data.catList ? res.data.catList : []
 				}
 			})
 		}

ghsApp/src/api/expend/index.js

@@ -8,6 +8,10 @@ export const getUnBxList = data => {
 	return https.get('/expend/un-bx-list', data)
 }
 
+export const getStat = data => {
+	return https.get('/expend/stat', data)
+}
+
 export const getTypeList = data => {
 	return https.get('/expend/get-type-list', data)
 }

ghsApp/src/pages.json

@@ -511,7 +511,6 @@
 				{"path": "addSalary","style": {"navigationBarTitleText": "发工资"}},
 				{"path": "salary","style": {"navigationBarTitleText": "发工资记录","enablePullDownRefresh": true}},
 				{"path": "list","style": {"navigationBarTitleText": "支出记录","enablePullDownRefresh": false}},
-				{"path": "bxList","style": {"navigationBarTitleText": "报销记录","enablePullDownRefresh": false}},
 				{"path": "stat","style": {"navigationBarTitleText": "统计","enablePullDownRefresh": false}},
 				{"path": "mayBx","style": {"navigationBarTitleText": "应报销","enablePullDownRefresh": false}}
 			]