shish il y a 3 ans
Parent
commit
b8c7ff796b
2 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 2 2
      ghsApp/src/admin/expend/list.vue
  2. 2 2
      ghsApp/src/pages.json

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

@@ -5,6 +5,7 @@
 				<t-tr header>
 					<t-th><view>时间</view></t-th>
 					<t-th><view>登记人</view></t-th>
+					<t-th><view>支付</view></t-th>
 					<t-th><view>事项</view></t-th>
 					<t-th>金额</t-th>
 				</t-tr>
@@ -12,6 +13,7 @@
 					<t-tr>
 						<t-td align="center" color="info">{{ item.addTime.substr(5,11) }}</t-td>
 						<t-td align="center" color="info">{{item.staffName}}</t-td>
+						<t-td align="center" color="info">{{item.payWay==0?'员工微信':item.payWay == 4 ? '现金':item.payWay == 1?'支付宝':item.payWay == 5 ? '银行卡':''}}</t-td>
 						<t-td align="center" color="info">{{item.type == 0 ? '店租':item.type==1?'水电':item.type==2?'物业':item.type==3?'伙食':item.type==4?'房租':'其它'}}</t-td>
 						<t-td align="center" color="info">{{item.amount?parseFloat(item.amount):0}}</t-td>
 					</t-tr>
@@ -26,11 +28,9 @@
 		<block v-else>
 			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 		</block>
-
 		<view class="app-footer open_btn">
 			<view @click="addExpend" class="admin-button-com big blue" style="width:230upx;">新增支出</view>
 		</view>
-
 	</view>
 </template>
 

+ 2 - 2
ghsApp/src/pages.json

@@ -407,8 +407,8 @@
 			"pages": [
 				{"path": "addExpend","style": {"navigationBarTitleText": "支出登记"}},
 				{"path": "addSalary","style": {"navigationBarTitleText": "发工资"}},
-				{"path": "salary","style": {"navigationBarTitleText": "发工资记录"}},
-				{"path": "list","style": {"navigationBarTitleText": "支出记录"}}
+				{"path": "salary","style": {"navigationBarTitleText": "发工资记录","enablePullDownRefresh": true}},
+				{"path": "list","style": {"navigationBarTitleText": "支出记录","enablePullDownRefresh": true}}
 			]
 		}
 	],