shish il y a 1 an
Parent
commit
9b7cedee82

+ 3 - 3
ghsApp/src/admin/book/detail.vue

@@ -92,17 +92,17 @@ export default {
 	padding:20upx 20upx 60upx 20upx;
 	padding:20upx 20upx 60upx 20upx;
     .title{
     .title{
 		font-weight: bold;
 		font-weight: bold;
-		font-size:40upx;
+		font-size:42upx;
 		margin-bottom:22upx;
 		margin-bottom:22upx;
 	}
 	}
 	.smallTitle{
 	.smallTitle{
 		font-weight: bold;
 		font-weight: bold;
-		font-size:30upx;
+		font-size:32upx;
 		font-weight: bold;
 		font-weight: bold;
 		margin:25upx 0 25upx 0;
 		margin:25upx 0 25upx 0;
 	}
 	}
 	.info{
 	.info{
-    	font-size:30upx;
+    	font-size:32upx;
 		margin-bottom:20upx;
 		margin-bottom:20upx;
 	}
 	}
 	.image{
 	.image{

+ 1 - 1
ghsApp/src/admin/book/index.vue

@@ -88,7 +88,7 @@ export default {
             .book-item{
             .book-item{
                 line-height: 64upx;
                 line-height: 64upx;
                 color:#008000;
                 color:#008000;
-                font-size:32upx;
+                font-size:34upx;
                 display:list-item;
                 display:list-item;
                 list-style-type:disc;
                 list-style-type:disc;
                 margin-left:80upx;
                 margin-left:80upx;

+ 1 - 3
ghsApp/src/admin/expend/mayBx.vue

@@ -3,10 +3,8 @@
 	<block v-if="!$util.isEmpty(bxList)">
 	<block v-if="!$util.isEmpty(bxList)">
 		<view v-for="(item, index) in bxList" :key="index">
 		<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:15upx;padding:20upx 0 20upx 20upx;">
-				<view style="font-size:33upx;margin-bottom: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 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><text>待报销:¥{{ item.amount }}</text></view>
 				</view>
 				</view>
 				<button @tap="confirmBx(index,item.amount)" class="admin-button-com blue middle">确认报销</button>
 				<button @tap="confirmBx(index,item.amount)" class="admin-button-com blue middle">确认报销</button>

+ 3 - 1
ghsApp/src/pages.json

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