shish 2 лет назад
Родитель
Сommit
3f51182f70

+ 9 - 8
ghsApp/src/admin/custom/balanceChange.vue

@@ -4,14 +4,16 @@
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
 					<t-th>日期</t-th>
-					<t-th><view style="width:230upx;">事项</view></t-th>
+					<t-th><view style="width:180upx;">事项</view></t-th>
+					<t-th>人员</t-th>
 					<t-th>变动</t-th>
-					<t-th>剩余欠款</t-th>
+					<t-th>余额</t-th>
 				</t-tr>
 				<view v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
 					<t-tr>
 						<t-td align="center" color="info"><view >{{ item.addTime.substr(5,11) }}</view></t-td>
-						<t-td align="center" color="info"><view style="width:230upx;">{{ item.event }}</view></t-td>
+						<t-td align="center" color="info"><view style="width:180upx;">{{ item.event }}</view></t-td>
+						<t-td align="center" color="info"><view >{{ item.staffName }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ item.amount }}</view></t-td>
 						<t-td align="center" color="info"><view >{{ parseFloat(item.balance) }}</view></t-td>
 					</t-tr>
@@ -25,10 +27,10 @@
 </template>
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import { debtChangeList } from '@/api/custom'
+import { getCustomBalanceChange } from '@/api/custom'
 import list from '@/mixins/list'
 export default {
-	name: "debtChange",
+	name: "balanceChange",
 	components: {
 		AppWrapperEmpty
 	},
@@ -39,7 +41,7 @@ export default {
 	},
 	methods: {
 		async init(){
-			const res = await debtChangeList({ page:this.list.page,customId:this.option.customId })
+			const res = await getCustomBalanceChange({ page:this.list.page,customId:this.option.customId })
 			if (this.$util.isEmpty(res.data.list)){
 				this.completes(res)
 				return
@@ -66,8 +68,7 @@ export default {
 		} else {
 			uni.stopPullDownRefresh();
 		}
-	},
-	
+	}
 };
 </script>
 <style lang="scss" scoped></style>

+ 8 - 0
ghsApp/src/api/custom/index.js

@@ -1,5 +1,13 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const getCustomBalanceChange = data => {
+	return https.get('/custom-balance-change/list', data)
+}
+
+export const getCustomRechargeList = data => {
+	return https.get('/custom-recharge/list', data)
+}
+
 export const rechargeFn = data => {
 	return https.get('/custom/recharge', data)
 }

+ 2 - 1
ghsApp/src/pages.json

@@ -56,7 +56,8 @@
 				{"path": "selectCustom","style": {"navigationBarTitleText": "选择客户"}},
 				{"path": "levelSet","style": {"navigationBarTitleText": "客户等级标准"}},
 				{"path": "visit","style": {"navigationBarTitleText": "今日访客"}},
-				{"path": "debtChange","style": {"navigationBarTitleText": "欠款变动明细"}},
+				{"path": "debtChange","style": {"navigationBarTitleText": "欠款变动明细","enablePullDownRefresh": false}},
+				{"path": "balanceChange","style": {"navigationBarTitleText": "余额变动明细","enablePullDownRefresh": false}},
 				{"path": "addStaff","style": {"navigationBarTitleText": "帮客户添加员工"}}
 			]
 		},

+ 2 - 1
ghsApp/src/pagesClient/member/detail.vue

@@ -340,7 +340,7 @@ export default {
       })
     },
     confirmRecharge(val){
-			let that=this;
+			let that = this;
 			if (val.index == 0) {
 				that.czShow = false
 				that.czFocus = false
@@ -355,6 +355,7 @@ export default {
           that.czShow = false
 				  that.czFocus = false
           that.rechargeMoney = ''
+          that.getUserDetail()
           that.$msg(res.msg)
         }
       })