列表

ghsApp/src/admin/expend/bxList.vue

@@ -1,12 +1,18 @@
 <template>
 <view class="app-content">
+	<view class="top-bar" style="margin:20upx 0 20upx 40upx;">
+		<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="font-size:33upx;margin-bottom:20upx;">
-					<text style="font-weight:bold;">{{item.staffName?item.staffName:''}}</text><text style="margin-left:20upx;">待报销：¥{{ item.amount }}</text>
+					<view><text style="font-weight:bold;">{{item.staffName?item.staffName:''}}</text></view>
+					<view><text>总支出：¥{{ item.totalAmount }}</text></view>
+					<view><text>已报销：¥{{ item.hasAmount }}</text></view>
+					<view><text>待报销：¥{{ item.amount }}</text></view>
 				</view>
-				<button  @tap="confirmBx(index,item.amount)" class="admin-button-com blue middle">确认报销</button>
+				<button v-if="Number(item.amount)>0" @tap="confirmBx(index,item.amount)" class="admin-button-com blue middle">确认报销</button>
 			</view>
 		</view>
 	</block>
@@ -19,18 +25,29 @@
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { getUnBxList,bx } from '@/api/expend'
+import DateSelect from "@/components/module/dateSelect"
 export default {
 	name: "bxList",
 	components: {
-		AppWrapperEmpty
+		AppWrapperEmpty,
+		DateSelect
 	},
 	mixins:[],
 	data() {
 		return {
-			bxList:[]
+			bxList:[],
+			searchTime:'',
+			startTime:'',
+			endTime:''
 		};
 	},
 	methods: {
+		selectDateFn(val) {
+			this.searchTime = val.searchTime
+			this.startTime = val.startTime
+			this.endTime = val.endTime
+			this.init()
+		},
 		confirmBx(staffId,amount){
 			let that = this
 			that.$util.confirmModal({content:'确认已报销？'},() => {
@@ -43,7 +60,7 @@ export default {
         	})
 		},
 		init(){
-			getUnBxList().then(res=>{
+			getUnBxList({searchTime: this.searchTime,startTime: this.startTime,endTime: this.endTime}).then(res=>{
 				if(res.code == 1){
 					this.bxList = res.data.list ? res.data.list : []
 				}

ghsApp/src/admin/expend/list.vue

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