shish 1 سال پیش
والد
کامیت
abdb277178
2فایلهای تغییر یافته به همراه9 افزوده شده و 12 حذف شده
  1. 2 6
      ghsApp/src/admin/expend/list.vue
  2. 7 6
      ghsApp/src/admin/expend/mayBx.vue

+ 2 - 6
ghsApp/src/admin/expend/list.vue

@@ -30,9 +30,8 @@
 		<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 	</block>
 	<view class="app-footer open_btn">
-		<text style="margin-right:30upx;color:blue;font-size:34upx;" @click="goToStat()">汇总统计</text>
-		<text style="margin-right:30upx;color:blue;font-size:34upx;" @click="goToMayBx()">应报销</text>
-		<text style="margin-right:30upx;color:blue;font-size:34upx;" @click="goToBxList()">报销记录</text>
+		<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>
 		<view @click="addExpend" class="admin-button-com big blue" style="width:210upx;">新增支出</view>
 	</view>
 
@@ -116,9 +115,6 @@ export default {
 		goToStat(){
 			this.$util.pageTo({ url: "/admin/expend/stat"})
 		},
-		goToBxList(){
-			this.$util.pageTo({ url: "/admin/expend/bxList"})
-		},
 		goToMayBx(){
 			this.$util.pageTo({ url: "/admin/expend/mayBx"})
 		},

+ 7 - 6
ghsApp/src/admin/expend/mayBx.vue

@@ -3,9 +3,11 @@
 	<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;margin-top:20upx;">
-					<view><text style="font-weight:bold;">{{item.staffName?item.staffName:''}}</text></view>
-					<view><text>待报销:¥{{ item.amount }}</text></view>
+				<view style="font-size:33upx;margin-bottom:20upx;">
+					<view>
+						<text style="font-weight:bold;">{{item.staffName?item.staffName:''}}</text>
+						<text style="margin-left:30upx;">待报销:¥{{ item.amount }}</text>
+					</view>
 				</view>
 				<button @tap="confirmBx(index,item.amount)" class="admin-button-com blue middle">确认报销</button>
 			</view>
@@ -16,13 +18,12 @@
 	</block>
 </view>
 </template>
-
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { getUnBxList,bx } from '@/api/expend'
 import DateSelect from "@/components/module/dateSelect"
 export default {
-	name: "bxList",
+	name: "mayBx",
 	components: {
 		AppWrapperEmpty,
 		DateSelect
@@ -55,7 +56,7 @@ export default {
         	})
 		},
 		init(){
-			getUnBxList({searchTime: this.searchTime,startTime: this.startTime,endTime: this.endTime}).then(res=>{
+			getUnBxList({}).then(res=>{
 				if(res.code == 1){
 					this.bxList = res.data.list ? res.data.list : []
 				}