diff --git a/src/views/system/device/device_detail.vue b/src/views/system/device/device_detail.vue index a3c9cbe..b910a7f 100644 --- a/src/views/system/device/device_detail.vue +++ b/src/views/system/device/device_detail.vue @@ -820,7 +820,7 @@ export default { .el-button { margin: 0; - // padding: 0 10px; + padding: 20 10px; flex: 1 1 45%; } } diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue index 268318b..a7ba8a6 100644 --- a/src/views/system/device/index.vue +++ b/src/views/system/device/index.vue @@ -358,6 +358,10 @@ export default { type: Number, default: 26.94088 }, + storeId: { + type: Number, + default: 0 + }, }, data() { return { @@ -616,6 +620,7 @@ export default { }, getList() { this.loading = true; + this.queryParams.storeId = this.storeId; listDevice(this.queryParams).then(response => { this.deviceList = response.rows; this.total = response.total; diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue index 092cfbb..9b23aff 100644 --- a/src/views/system/equipment/index.vue +++ b/src/views/system/equipment/index.vue @@ -27,7 +27,7 @@ /> - + { this.equipmentList = response.rows .filter(item => ['2', '3'].includes(item.type)) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 42e2e2d..bf95768 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -265,6 +265,7 @@ const defaultSort = { export default { name: "Order", mixins: [$showColumns], + props: ['storeId'], dicts: ['ss_order_status', 'ss_pay_type', 'rl_distribution_mode', 'rl_rental_unit','ss_order_type','et_order_pay_status'], data() { return { @@ -384,6 +385,7 @@ export default { /** 查询订单列表 */ getList() { this.loading = true; + this.queryParams.storeId = this.storeId; listOrder(this.queryParams).then(response => { this.orderList = response.rows; this.total = response.total; diff --git a/src/views/system/room/index.vue b/src/views/system/room/index.vue index f81b3f3..ac848b3 100644 --- a/src/views/system/room/index.vue +++ b/src/views/system/room/index.vue @@ -9,7 +9,7 @@ @keyup.enter.native="handleQuery" /> - + { this.roomList = response.rows; this.total = response.total; diff --git a/src/views/system/store/store_detail.vue b/src/views/system/store/store_detail.vue index ad236c2..b6f6e11 100644 --- a/src/views/system/store/store_detail.vue +++ b/src/views/system/store/store_detail.vue @@ -1,223 +1,443 @@ -