fe / yoho-shop-manage · Commits

Go to a project

Authored by 王水玲
Commit 69d5471c8cbb10a7cdaac1d8de121608b4a7a213 1 parent 08441850

红人

Inline Side-by-side
Showing 8 changed files with 90 additions and 25 deletions
... ... @@ -3,25 +3,25 @@
<layout-list>
<h2>帐号信息</h2>
<Form :label-width="80">
<FormItem label="PID">
<FormItem label="PID:">
<span>{{profile.pid}}</span>
</FormItem>
<FormItem label="真实姓名">
<FormItem label="真实姓名:">
<span>{{profile.truename}}</span>
</FormItem>
<FormItem label="帐号">
<FormItem label="帐号:">
<span>{{profile.account}}</span>
</FormItem>
<FormItem label="有效期">
<FormItem label="有效期:">
<span>{{formatDate(profile.create_time)}} ~ {{formatDate(profile.expires)}}</span>
</FormItem>
</Form>
<h2>* 银行账号信息(此账户用于佣金结算，请及时填写，添加后不可修改！)</h2>
<h2 class="mb30">* 银行账号信息(<span class="red">此账户用于佣金结算，请及时填写，添加后不可修改！</span>)</h2>
<Form :label-width="80">
<FormItem label="开户行">
<FormItem label="开户行:">
<span>{{profile.bankName}}</span>
</FormItem>
<FormItem label="银行帐号">
<FormItem label="银行帐号:">
<span>{{profile.bankAccount}}</span>
</FormItem>
</Form>
... ... @@ -69,4 +69,21 @@ export default {
</script>
<style lang="scss">
.ivu-form .ivu-form-item-label {
text-align: left;
margin-left: 90px;
}
h2 {
font-size: 14px;
}
h2 .red {
color: red;
font-size: 12px;
}
.mb30 {
margin-bottom: 30px;
}
</style>
... ...
... ... @@ -191,7 +191,7 @@ export default {
}, {
title: '操作',
render: (h, params) => {
if (params.row.status !== 10) {
if (params.row.status === 10) {
return (
<action-group>
<i-button type="primary" size="small" onClick={() => this.check(params.row)}>对帐</i-button>
... ... @@ -241,7 +241,7 @@ export default {
clearingAmount: ret.data.totalClearingAmount
});
}
this.pageData.total = _.get(ret, 'data.totalPage', 0);
this.pageData.total = _.get(ret, 'data.totalCount', 0);
} else {
this.$Message.error(ret.message);
}
... ... @@ -263,9 +263,10 @@ export default {
id: data.id,
favoritePid: data.favoritePid
}).then(ret => {
if (ret && ret.data === 200) {
if (ret && ret.code === 200) {
this.$Message.success('对账成功！');
this.$refs.confirm.hide();
this.search();
} else {
this.$Message.error(ret.message);
}
... ... @@ -275,7 +276,18 @@ export default {
this.$refs.confirm.hide();
},
exportData() {
let params = {};
let temp = [];
_.assign(params, this.filterValues());
_.each(params, (val, key) => {
temp.push(`${key}=${val}`);
});
const href = `/Api/erp/exportFavoriteBalanceDetail?${temp.join('&')}`;
window.open(href, '_blank');
}
},
components: {Confirm}
... ...
... ... @@ -211,7 +211,7 @@ export default {
this.$Message.success('删除成功！');
this.search();
} else {
this.$Message.error(`删除失败：${ret.message}`);
this.$Message.error(`${ret.message}`);
}
});
},
... ...
... ... @@ -142,7 +142,7 @@ export default {
this.candidateListService.clearingDetail(this.filterValues()).then(ret => {
if (ret && ret.code === 200) {
this.tableData = _.get(ret, 'data.records', []);
this.pageData.total = _.get(ret, 'data.totalPage', 0);
this.pageData.total = _.get(ret, 'data.totalCount', 0);
this.pageData.current = _.get(ret, 'data.pageNo', 1);
} else {
this.$Message.error(ret.message);
... ... @@ -157,7 +157,20 @@ export default {
this.pageData.current = val;
this.search();
},
exportData() {}
exportData() {
let params = {};
let temp = [];
_.assign(params, this.filterValues());
_.each(params, (val, key) => {
temp.push(`${key}=${val}`);
});
const href = `/Api/erp/exportFavoriteClearingDetail?${temp.join('&')}`;
window.open(href, '_blank');
}
},
components: {}
};
... ...
... ... @@ -110,7 +110,7 @@ export default {
align: 'center'
}, {
title: '备注',
key: 'col2',
key: 'remark',
align: 'center'
}, {
title: '操作',
... ... @@ -172,7 +172,7 @@ export default {
this.candidateListService.clearingList(this.filterValues()).then(ret => {
if (ret && ret.code === 200) {
this.tableData = _.get(ret, 'data.records', []);
this.pageData.total = _.get(ret, 'data.totalPage', 0);
this.pageData.total = _.get(ret, 'data.totalCount', 0);
this.pageData.current = _.get(ret, 'data.pageNo', 1);
} else {
this.$Message.error(ret.message);
... ... @@ -195,7 +195,20 @@ export default {
}
});
},
exportData() {}
exportData() {
let params = {};
let temp = [];
_.assign(params, this.filterValues());
_.each(params, (val, key) => {
temp.push(`${key}=${val}`);
});
const href = `/Api/erp/exportFavoriteClearingList?${temp.join('&')}`;
window.open(href, '_blank');
}
},
components: {}
};
... ...
... ... @@ -9,7 +9,10 @@ let apiUrl = {
favoriteBalanceCheck: '/erp/favoriteBalanceCheck',
clearingList: '/erp/clearingList',
clearingDetail: '/erp/clearingDetail',
queryByPidForFavorite: '/erp/queryByPidForFavorite'
queryByPidForFavorite: '/erp/queryByPidForFavorite',
exportFavoriteClearingList: '/erp/exportFavoriteClearingList',
exportFavoriteClearingDetail: '/erp/exportFavoriteClearingDetail',
exportFavoriteBalanceDetail: '/erp/exportFavoriteBalanceDetail'
};
class CandidateListService extends Service {
... ... @@ -40,5 +43,14 @@ class CandidateListService extends Service {
queryByPidForFavorite() {
return this.post(apiUrl.queryByPidForFavorite);
}
exportFavoriteClearingList() {
return this.post(apiUrl.exportFavoriteClearingList);
}
exportFavoriteClearingDetail() {
return this.post(apiUrl.exportFavoriteClearingDetail);
}
exportFavoriteBalanceDetail() {
return this.post(apiUrl.exportFavoriteBalanceDetail);
}
}
export default CandidateListService;
... ...
... ... @@ -64,7 +64,10 @@ let domainApis = {
favoriteBalanceCheck: '/erp-gateway-web/finance/favoriteBalanceDetail/check',
clearingList: '/erp-gateway-web/favorite/clearing/list',
clearingDetail: '/erp-gateway-web/favorite/clearingDetail/list',
queryByPidForFavorite: '/erp-gateway-web/account/profile/queryByPidForFavorite'
queryByPidForFavorite: '/erp-gateway-web/account/profile/queryByPidForFavorite',
exportFavoriteClearingList: '/erp-gateway-web/export/favoriteClearingList',
exportFavoriteClearingDetail: '/erp-gateway-web/export/favoriteClearingDetail',
exportFavoriteBalanceDetail: '/erp-gateway-web/export/exportFavoriteBalanceDetail'
},
platform: {
queryShopsByAdminPid: '/SellerShopController/queryShopsByAdminPid',
... ... @@ -128,11 +131,8 @@ let domainApis = {
// 域名列表
const domains = {
//erp: 'http://192.168.103.82:9098',
erp: 'http://192.168.20.180',
//platform: 'http://192.168.102.48:8088/platform',
platform: 'http://192.168.102.202:8088/platform',
erp: 'http://192.168.103.82:9098',
platform: 'http://192.168.102.48:8088/platform',
shop: 'http://192.168.102.211:30016'
};
... ...
... ... @@ -44,8 +44,6 @@ module.exports = (req, res, next) => {
}
let currentShop = _.find(req.user.shops, shop => shop.shopsId === _.parseInt(req.cookies._sign));
//currentShop.shopsId = 1028; // to do del
if (currentShop) {
let baseParams = {
pid: req.user.uid,
... ...