fix: 让推广费店铺筛选持续可用 #780
@ -142,10 +142,10 @@
|
||||
</div>
|
||||
<form v-if="!compact" class="tw-filter" @submit.prevent="applyFilters">
|
||||
<label>店铺
|
||||
<el-select v-if="usesMirrorOptions && !filterOptionsError" v-model="filters.store_name" filterable clearable :loading="filterOptionsLoading" placeholder="全部店铺" aria-label="店铺筛选" popper-class="account-bill-filter-options" no-match-text="没有匹配的店铺" no-data-text="暂无店铺" @change="applyFilters">
|
||||
<el-select v-if="usesMirrorOptions && canUseStoreSelect" v-model="filters.store_name" filterable allow-create default-first-option clearable :loading="filterOptionsLoading" placeholder="全部店铺" aria-label="店铺筛选" popper-class="account-bill-filter-options" no-match-text="没有匹配的店铺,输入后回车使用" no-data-text="暂无店铺,输入后回车使用" @change="applyFilters">
|
||||
<el-option v-for="shop in filterOptions.shops" :key="shop" :label="shop" :value="shop" />
|
||||
</el-select>
|
||||
<input v-else v-model.trim="filters.store_name" placeholder="店铺名称" />
|
||||
<input v-else v-model.trim="filters.store_name" placeholder="输入店铺名称" />
|
||||
</label>
|
||||
<label v-if="!isPromotionMarketing">总账备注
|
||||
<el-select v-if="usesMirrorOptions && !filterOptionsError" v-model="filters.ledger_remark" filterable clearable :loading="filterOptionsLoading" placeholder="全部总账备注" aria-label="总账备注筛选" popper-class="account-bill-filter-options" no-match-text="没有匹配的总账备注" no-data-text="暂无总账备注" @change="applyFilters">
|
||||
@ -274,7 +274,7 @@ export default {
|
||||
name:'AccountBills', components:{ TableColumnSettings, flatPicker, [Select.name]:Select, [Option.name]:Option }, props:{ apiBase:{type:String,required:true}, billType:{type:String,required:true}, progressBase:{type:String,default:''}, userKey:{type:[String,Number],required:true}, pageKey:{type:String,default:'store-receiving-bills'}, compact:{type:Boolean,default:false}, initialStart:{type:String,default:''}, initialEnd:{type:String,default:''} },
|
||||
data(){
|
||||
const filters=filtersForRange(this.initialStart,this.initialEnd);
|
||||
return{loading:false,loadError:false,sync:null,rows:[],sourceColumns:[],configuredColumns:[],columnsTitle:'',sourceGroups:[],summary:{income:0,expense:0,balance:0,count:0},total:0,currentPage:1,lastPage:1,perPage:this.compact?1:20,filters,queryFilters:{...filters},resultFilters:null,filterOptions:{shops:[],bill_items:[],ledger_remarks:[]},filterOptionsLoading:false,filterOptionsError:false,requestSerial:0,promotionRequestSerial:0,sort:{key:'occurred_at',dir:'desc'},exportMode:'filtered-visible',exporting:false,exportModalOpen:false,exportTasks:[],exportHint:'导出在后台生成,成功后点「下载」;期间可以继续查看其它页面。',exportTimer:null,promotionModalOpen:false,promotionExpenseTab:'platform',promotionExpenseLoading:false,promotionExpenseError:false,promotionStoreSummary:[],promotionExpenseSummary:{income:0,expense:0,balance:0,count:0},promotionExpenseMessage:'',promotionPlatformFilter:'',promotionStoreFilter:'',promotionNoteFilter:'',promotionNoteTimer:null};
|
||||
return{loading:false,loadError:false,sync:null,rows:[],sourceColumns:[],configuredColumns:[],columnsTitle:'',sourceGroups:[],summary:{income:0,expense:0,balance:0,count:0},total:0,currentPage:1,lastPage:1,perPage:this.compact?1:20,filters,queryFilters:{...filters},resultFilters:null,filterOptions:{shops:[],bill_items:[],ledger_remarks:[]},filterOptionsLoading:true,filterOptionsError:false,filterOptionsRequestSerial:0,requestSerial:0,promotionRequestSerial:0,sort:{key:'occurred_at',dir:'desc'},exportMode:'filtered-visible',exporting:false,exportModalOpen:false,exportTasks:[],exportHint:'导出在后台生成,成功后点「下载」;期间可以继续查看其它页面。',exportTimer:null,promotionModalOpen:false,promotionExpenseTab:'platform',promotionExpenseLoading:false,promotionExpenseError:false,promotionStoreSummary:[],promotionExpenseSummary:{income:0,expense:0,balance:0,count:0},promotionExpenseMessage:'',promotionPlatformFilter:'',promotionStoreFilter:'',promotionNoteFilter:'',promotionNoteTimer:null};
|
||||
},
|
||||
computed:{
|
||||
isDouyin(){return this.billType==='douyin';},
|
||||
@ -289,6 +289,7 @@ export default {
|
||||
// control avoids browser-native date inputs appearing on older tabs.
|
||||
usesStableDateControl(){return true;},
|
||||
usesMirrorOptions(){return ['douyin','pinduoduo','dewu','taobao-wechat','jd-transactions','jingxi','jd-wallet','vipshop','vipshop-jx','promotion-marketing'].indexOf(this.billType)!==-1;},
|
||||
canUseStoreSelect(){return !this.filterOptionsError&&(this.filterOptionsLoading||this.filterOptions.shops.length>0);},
|
||||
invalidDateRange(){return Boolean(this.filters.start&&this.filters.end&&this.filters.start>this.filters.end);},
|
||||
startDateConfig(){return {...dateConfig,maxDate:this.filters.end||null};},
|
||||
endDateConfig(){return {...dateConfig,minDate:this.filters.start||null};},
|
||||
@ -326,10 +327,10 @@ export default {
|
||||
mounted(){if(this.usesMirrorOptions&&!this.compact)this.fetchFilterOptions();this.fetch();},
|
||||
beforeDestroy(){if(this.promotionNoteTimer)window.clearTimeout(this.promotionNoteTimer);},
|
||||
methods:{
|
||||
async fetchFilterOptions(){this.filterOptionsLoading=true;this.filterOptionsError=false;try{const response=await window.axios.get(`${this.apiBase}/filter-options`,{params:{start:this.filters.start,end:this.filters.end}});const body=response.data||{};this.filterOptions={shops:Array.isArray(body.shops)?body.shops:[],bill_items:Array.isArray(body.bill_items)?body.bill_items:[],ledger_remarks:Array.isArray(body.ledger_remarks)?body.ledger_remarks:[]};}catch(error){this.filterOptionsError=true;}finally{this.filterOptionsLoading=false;}},
|
||||
async fetchFilterOptions(){const requestId=++this.filterOptionsRequestSerial;this.filterOptionsLoading=true;this.filterOptionsError=false;try{const response=await window.axios.get(`${this.apiBase}/filter-options`,{params:{start:this.filters.start,end:this.filters.end}});if(requestId!==this.filterOptionsRequestSerial)return;const body=response.data||{};const shops=Array.isArray(body.shops)?body.shops.slice():[];const selected=String(this.filters.store_name||'').trim();if(selected&&shops.indexOf(selected)===-1)shops.unshift(selected);this.filterOptions={shops,bill_items:Array.isArray(body.bill_items)?body.bill_items:[],ledger_remarks:Array.isArray(body.ledger_remarks)?body.ledger_remarks:[]};}catch(error){if(requestId===this.filterOptionsRequestSerial)this.filterOptionsError=true;}finally{if(requestId===this.filterOptionsRequestSerial)this.filterOptionsLoading=false;}},
|
||||
async fetch(){const requestId=++this.requestSerial;const requestedFilters={...this.queryFilters};this.loading=true;this.loadError=false;try{const response=await window.axios.get(this.apiBase,{params:{...requestedFilters,sort:this.sort.key,dir:this.sort.dir,limit:this.perPage,page:this.currentPage}});if(requestId!==this.requestSerial)return;const body=response.data||{};this.resultFilters=requestedFilters;this.sync=body.sync||null;this.rows=body.data||[];this.total=body.total||0;this.currentPage=body.current_page||1;this.lastPage=body.last_page||1;this.perPage=body.per_page||this.perPage;this.summary=body.summary||{income:0,expense:0,balance:0,count:0};if(this.isPromotionMarketing){this.promotionExpenseSummary={income:Number(this.summary.income||0),expense:Number(this.summary.expense||0),balance:Number(this.summary.balance||0),count:Number(this.summary.count||0)};}if(body.columns){this.columnsTitle=body.columns.title||'';this.sourceGroups=body.columns.groups||[];this.sourceColumns=this.attachGroups(body.columns.columns||body.columns||[],this.sourceGroups);}}catch(error){if(requestId!==this.requestSerial)return;this.rows=[];this.total=0;this.sync=null;this.summary={income:0,expense:0,balance:0,count:0};this.promotionExpenseSummary={income:0,expense:0,balance:0,count:0};this.loadError=true;}finally{if(requestId===this.requestSerial)this.loading=false;}},
|
||||
attachGroups(columns,groups){let index=0;return columns.map((column,columnIndex)=>{while(groups[index]&&columnIndex>=groups.slice(0,index+1).reduce((sum,group)=>sum+Number(group.span||0),0))index+=1;return{...column,key:column.field||`column-${columnIndex}`,group:groups[index]?groups[index].label:''};});},
|
||||
applyFilters(){if(this.invalidDateRange)return;this.queryFilters={...this.filters};this.currentPage=1;return this.fetch();},resetFilters(){this.filters=filtersForRange();return this.applyFilters();},changePage(page){this.currentPage=page;this.fetch();this.$nextTick(()=>{if(this.$refs.scroll)this.$refs.scroll.scrollTop=0;});},
|
||||
applyFilters(){if(this.invalidDateRange)return;const dateRangeChanged=this.queryFilters.start!==this.filters.start||this.queryFilters.end!==this.filters.end;this.queryFilters={...this.filters};this.currentPage=1;const requests=[this.fetch()];if(this.usesMirrorOptions&&!this.compact&&dateRangeChanged)requests.push(this.fetchFilterOptions());return Promise.all(requests);},resetFilters(){this.filters=filtersForRange();return this.applyFilters();},changePage(page){this.currentPage=page;this.fetch();this.$nextTick(()=>{if(this.$refs.scroll)this.$refs.scroll.scrollTop=0;});},
|
||||
openDatePicker(refName){const picker=this.$refs[refName];if(picker&&picker.fp)picker.fp.open();},
|
||||
async fetchPromotionExpenseDetails(filters=null){
|
||||
const requestId=++this.promotionRequestSerial;
|
||||
|
||||
@ -43,6 +43,32 @@ class AccountBillsTableTest extends TestCase
|
||||
);
|
||||
}
|
||||
|
||||
public function test_store_filter_remains_usable_when_options_are_empty_or_the_date_changes(): void
|
||||
{
|
||||
$source = file_get_contents(__DIR__ . '/../../../resources/assets/js/components/business/AccountBills.vue');
|
||||
|
||||
$this->assertStringContainsString('filterable allow-create default-first-option', $source);
|
||||
$this->assertStringContainsString('没有匹配的店铺,输入后回车使用', $source);
|
||||
$this->assertStringContainsString('暂无店铺,输入后回车使用', $source);
|
||||
$this->assertStringContainsString('placeholder="输入店铺名称"', $source);
|
||||
$this->assertStringContainsString(
|
||||
'canUseStoreSelect(){return !this.filterOptionsError&&(this.filterOptionsLoading||this.filterOptions.shops.length>0);}',
|
||||
$source,
|
||||
);
|
||||
$this->assertStringContainsString(
|
||||
'if(selected&&shops.indexOf(selected)===-1)shops.unshift(selected);',
|
||||
$source,
|
||||
);
|
||||
$this->assertStringContainsString(
|
||||
"const dateRangeChanged=this.queryFilters.start!==this.filters.start||this.queryFilters.end!==this.filters.end;",
|
||||
$source,
|
||||
);
|
||||
$this->assertStringContainsString(
|
||||
'if(this.usesMirrorOptions&&!this.compact&&dateRangeChanged)requests.push(this.fetchFilterOptions());',
|
||||
$source,
|
||||
);
|
||||
}
|
||||
|
||||
public function test_jd_and_jingxi_tabs_share_the_same_date_and_summary_behaviour(): void
|
||||
{
|
||||
$source = file_get_contents(__DIR__ . '/../../../resources/assets/js/components/business/AccountBills.vue');
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user