shish 4 лет назад
Родитель
Сommit
1420cf40a5

+ 4 - 4
ghsApp/src/admin/home/workbench.vue

@@ -24,7 +24,7 @@
 						{{ $util.numberFormat(data.todayData.visitCustom) || 0 }}
 					</div>
 				</navigator>
-				<navigator url="/pagesStore/me/expend" class="info-list">
+				<navigator url="/admin/stat/profit" class="info-list">
 					<div class="info-list-name">支出</div>
 					<div class="info-list-value">
 						{{ $util.numberFormat(data.todayData.expend) || 0 }}
@@ -36,15 +36,15 @@
 			<div class="total-blo">
 				<div class="total-list"> 
 					<div class="app-color-3">系统收入</div>
-					<div class="list-num" style="font-weight:normal;font-size:25upx;margin-top:10upx;">{{countStat.systemCount}}笔 ¥{{countStat.systemIncome}}</div>
+					<div class="list-num" style="font-weight:normal;font-size:25upx;margin-top:10upx;">{{countStat.systemCount}}笔 ¥{{countStat.systemIncome?parseFloat(countStat.systemIncome):0}}</div>
 				</div>
 				<div class="total-list"> 
 					<div class="app-color-3">客服收入</div>
-					<div class="list-num" style="font-weight:normal;font-size:25upx;margin-top:10upx;">{{countStat.kfWxCount}}笔 ¥{{countStat.kfWxIncome}}</div> 
+					<div class="list-num" style="font-weight:normal;font-size:25upx;margin-top:10upx;">{{countStat.kfWxCount}}笔 ¥{{countStat.kfWxIncome?parseFloat(countStat.kfWxIncome):0}}</div> 
 				</div>
 				<div class="total-list"> 
 					<div class="app-color-3">欠款</div>
-					<div class="list-num" style="font-weight:normal;font-size:25upx;margin-top:10upx;">{{countStat.debtCount}}笔 ¥{{countStat.debtIncome}}</div> 
+					<div class="list-num" style="font-weight:normal;font-size:25upx;margin-top:10upx;">{{countStat.debtCount}}笔 ¥{{countStat.debtIncome?parseFloat(countStat.debtIncome):0}}</div> 
 				</div>
 			</div>
 		</div>

+ 1 - 1
ghsApp/src/admin/stat/kdIncome.vue

@@ -12,7 +12,7 @@
 							<t-tr>
 								<t-td><view>{{item.name}}</view></t-td>
 								<t-td><view>{{item.num}}</view></t-td>
-								<t-td><view>{{item.amount}}</view></t-td>
+								<t-td><view>{{item.amount?parseFloat(item.amount):0}}</view></t-td>
 								<t-td>
 									<view>
 										<button class="admin-button-com middel blue" @click="getDetail(item)">明细</button>

+ 4 - 0
hdPad/src/pages/home/components/settlePop.vue

@@ -197,6 +197,10 @@ export default {
 
     },
     methods: {
+        changeGetStaff(item){
+            this.form.getStaffId = item.id
+            this.form.getStaffName = item.name
+        },
         changeNeedPrint(val){
             this.$util.hitVoice()
             this.form.needPrint = val