|
|
@@ -644,8 +644,26 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="report-export-create-modal-footer" @click="closeDropdownAll">
|
|
|
- <view class="report-export-create-modal-btn" @click.stop="confirmFilter"
|
|
|
+ <view
|
|
|
+ class="report-export-create-modal-footer"
|
|
|
+ @click="closeDropdownAll"
|
|
|
+ :style="{ display: 'flex', justifyContent: 'space-between' }"
|
|
|
+ >
|
|
|
+ <view
|
|
|
+ class="report-export-create-modal-btn"
|
|
|
+ :style="{
|
|
|
+ background: '#fff',
|
|
|
+ color: '#666',
|
|
|
+ border: '1rpx solid #dcdfe6',
|
|
|
+ flex: '0 0 45%',
|
|
|
+ }"
|
|
|
+ @click.stop="resetFilter"
|
|
|
+ >重置</view
|
|
|
+ >
|
|
|
+ <view
|
|
|
+ class="report-export-create-modal-btn"
|
|
|
+ :style="{ flex: '0 0 45%' }"
|
|
|
+ @click.stop="confirmFilter"
|
|
|
>确认</view
|
|
|
>
|
|
|
</view>
|
|
|
@@ -1033,7 +1051,7 @@ export default {
|
|
|
// this.animateAll();
|
|
|
// this.fetchLoading = false;
|
|
|
// }, 1000);
|
|
|
- if (!this.hasmore) {
|
|
|
+ if (!this.hasmore && this.pageNum > 1) {
|
|
|
setTimeout(() => {
|
|
|
this.fetchLoading = false;
|
|
|
this.loading = false;
|
|
|
@@ -1313,6 +1331,20 @@ export default {
|
|
|
onFilterDateChange() {},
|
|
|
confirmFilter() {
|
|
|
this.filterModalOpen = false;
|
|
|
+ this.resetFetch();
|
|
|
+ },
|
|
|
+ resetFilter() {
|
|
|
+ this.filterForm = {
|
|
|
+ product: { physicName: "" },
|
|
|
+ status: "全部",
|
|
|
+ pkgSpec: "",
|
|
|
+ };
|
|
|
+ this.filterSearchForm.product = "";
|
|
|
+ this.filterProductPage = 0;
|
|
|
+ this.filterDisplayProducts = [];
|
|
|
+ this.filterDropdown = { product: false, pkgSpec: false };
|
|
|
+ this.filterDateRange = [];
|
|
|
+ this.resetFetch();
|
|
|
},
|
|
|
openDropdown(k) {
|
|
|
this.closeDropdownAll();
|