diff --git a/src/views/AppMultipleStoreBoardFilter.vue b/src/views/AppMultipleStoreBoardFilter.vue index fbfd19e..1f079ec 100644 --- a/src/views/AppMultipleStoreBoardFilter.vue +++ b/src/views/AppMultipleStoreBoardFilter.vue @@ -50,6 +50,9 @@ export default { + + +
@@ -57,7 +60,7 @@ export default { - + @@ -84,7 +87,7 @@ export default { } .AppMultipleStoreBoardFilter .el-input { - width: 100%; + width: 100% !important; } .AppMultipleStoreBoardFilter .el-form-item__label { diff --git a/src/views/AppStoresTable.vue b/src/views/AppStoresTable.vue index 3beac3d..e350b31 100644 --- a/src/views/AppStoresTable.vue +++ b/src/views/AppStoresTable.vue @@ -102,8 +102,9 @@ export default { methods: { getData() { const {$http, $waitFor} = window + const {groupCodeList, type, compareDate} = this.search console.log("筛选条件:", this.search) - $waitFor($http && this.search.groupCodeList.length > 0).then(() => this.getStores()) + $waitFor($http && groupCodeList.length > 0 && (type != 3 || compareDate)).then(() => this.getStores()) .then(codes => Promise.all([this.getCameras(), this.getStoreKeyGoods(), this.getCategorySales()]).then(() => codes)) .then((codes = []) => { this.stores = codes?.map(storeCode => {