|
@@ -76,7 +76,12 @@ export default {
|
|
condition[`buy_time@end`] = _.last(condition.buy_time);
|
|
condition[`buy_time@end`] = _.last(condition.buy_time);
|
|
delete condition.buy_time;
|
|
delete condition.buy_time;
|
|
}
|
|
}
|
|
- let res = await this.query({ skip, limit, ...condition, ...info, shop: this.user.shop.id });
|
|
|
|
|
|
+ if (this.user.role.code == 'sadmin') {
|
|
|
|
+ info.shop = '';
|
|
|
|
+ } else {
|
|
|
|
+ info.shop = this.user.shop.id;
|
|
|
|
+ }
|
|
|
|
+ let res = await this.query({ skip, limit, ...condition, ...info });
|
|
if (this.$checkRes(res)) {
|
|
if (this.$checkRes(res)) {
|
|
this.$set(this, 'list', res.data);
|
|
this.$set(this, 'list', res.data);
|
|
this.$set(this, 'total', res.total);
|
|
this.$set(this, 'total', res.total);
|
|
@@ -84,7 +89,7 @@ export default {
|
|
},
|
|
},
|
|
// 详情
|
|
// 详情
|
|
toDetail({ data }) {
|
|
toDetail({ data }) {
|
|
- this.$router.push({ path: '/selfShop/zrOrder/detail_orderDetail', query: { id: data._id } });
|
|
|
|
|
|
+ this.$router.push({ path: '/zr/zrOrder/detail_orderDetail', query: { id: data._id } });
|
|
},
|
|
},
|
|
toClose() {
|
|
toClose() {
|
|
this.searchForm = {};
|
|
this.searchForm = {};
|