fix
This commit is contained in:
@@ -5,6 +5,9 @@
|
||||
<div class="list_top_search_content">
|
||||
<div class="search_content_left">
|
||||
<filterComponent :title="'Date'"><a-range-picker v-model:value="addTime" size="large" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"/></filterComponent>
|
||||
<filterComponent :title="'Name'">
|
||||
<a-input v-model:value="salesmanName" size="large" placeholder="Please enter your name"/>
|
||||
</filterComponent>
|
||||
</div>
|
||||
</div>
|
||||
<div class="list_top_button_content">
|
||||
@@ -51,13 +54,11 @@ export default defineComponent({
|
||||
components:{filterComponent},
|
||||
setup(){
|
||||
let filter:any = reactive({
|
||||
addTime:ref<Moment[]>([])
|
||||
addTime:ref<Moment[]>([]),
|
||||
salesmanName:''
|
||||
})
|
||||
let tableLoading = ref(false)
|
||||
let columns = reactive([
|
||||
{ title: 'Ranking', align:'center', ellipsis: true, dataIndex: 'ranking', key: 'ranking',sorter: {
|
||||
compare: (a:any, b:any) => a.incentiveNum - b.incentiveNum,
|
||||
}, },
|
||||
{ title: 'Sales Name', align:'center', ellipsis: true, dataIndex: 'salesmanName', key: 'salesmanName' },
|
||||
{ title: 'Target Value', align:'center', ellipsis: true, dataIndex: 'incentiveNum', key: 'incentiveNum'},
|
||||
// { title: 'Add Time', align:'center', ellipsis: true, dataIndex: 'createDate', key: 'createDate',customRender:(record:any)=>{
|
||||
@@ -95,6 +96,7 @@ export default defineComponent({
|
||||
// startTime:filter.addTime && filter.addTime.length ? startTime(filter.addTime[0]) : '',
|
||||
// endTime:filter.addTime && filter.addTime.length ? endTime(filter.addTime[1]) : '',
|
||||
endTime:endTime,
|
||||
salesmanName:filter.salesmanName,
|
||||
page:currentPage.value,
|
||||
size:pageSize.value
|
||||
}
|
||||
@@ -103,9 +105,6 @@ export default defineComponent({
|
||||
(rv: any) => {
|
||||
if (rv) {
|
||||
tableLoading.value = false
|
||||
rv.forEach((item:any,index:any) => {
|
||||
item.ranking = index +1
|
||||
});
|
||||
collectionList.value = rv
|
||||
// total.value = rv.total
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@ module.exports = defineConfig({
|
||||
proxy: {
|
||||
"/api": {
|
||||
// target: 'http://18.167.251.121:5568', //后端接口地址
|
||||
target: 'http://192.168.1.9:5560/', //后端接口地址
|
||||
// target: 'http://18.167.251.121:10220/', //后端接口地址
|
||||
// target: 'http://192.168.1.9:5560/', //后端接口地址
|
||||
target: 'http://18.167.251.121:10220/', //后端接口地址
|
||||
changeOrigin: true, //是否允许跨越
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user