Commit 0d723de6 authored by limengyang's avatar limengyang

fix:(lmy) bug修复

parent da2a4784
const RoleEnum = { const RoleEnum = {
JS0000: ['super', 'supplier'], JS0000: ['super'],
JS0001: ['supplier'], JS0001: ['supplier'],
}; };
......
...@@ -47,14 +47,11 @@ ...@@ -47,14 +47,11 @@
total: 0, total: 0,
showTotal: (total) => `共 ${total} 条`, showTotal: (total) => `共 ${total} 条`,
hideOnSinglePage: false, hideOnSinglePage: false,
showQuickJumper: true, showQuickJumper: false,
showSizeChanger: true, showSizeChanger: true,
pageSizeOptions: ['10', '20', '30', '50', '100'], pageSizeOptions: ['10', '20', '30', '50', '100'],
onChange: (current) => { onChange: (current, size) => {
pagination.value.current = current; pagination.value.current = current;
getLeftData();
},
onShowSizeChange: (size) => {
pagination.value.pageSize = size; pagination.value.pageSize = size;
getLeftData(); getLeftData();
}, },
...@@ -78,8 +75,10 @@ ...@@ -78,8 +75,10 @@
const res = await regionalSpotManageProductListApi(param); const res = await regionalSpotManageProductListApi(param);
if (res.success) { if (res.success) {
leftData.value = res.data; leftData.value = res.data;
pagination.value.total = res.data[0].total;
} else { } else {
leftData.value = []; leftData.value = [];
pagination.value.total = 0;
} }
leftLoading.value = false; leftLoading.value = false;
if (rightData.value.length > 0) { if (rightData.value.length > 0) {
...@@ -100,7 +99,6 @@ ...@@ -100,7 +99,6 @@
} }
} }
leftData.value = [...leftData.value]; leftData.value = [...leftData.value];
pagination.value.total = leftData.value.length;
}; };
const selectedRowKeys = ref<any[]>([]); const selectedRowKeys = ref<any[]>([]);
const selectedRows = ref<any[]>([]); const selectedRows = ref<any[]>([]);
...@@ -290,7 +288,7 @@ ...@@ -290,7 +288,7 @@
placeholder="请输入品牌名称" placeholder="请输入品牌名称"
style="width: 200px" style="width: 200px"
:default-active-first-option="false" :default-active-first-option="false"
:show-arrow="false" :show-arrow="true"
:filter-option="false" :filter-option="false"
:not-found-content="null" :not-found-content="null"
@search="handleSearch" @search="handleSearch"
...@@ -406,7 +404,8 @@ ...@@ -406,7 +404,8 @@
<a-alert type="warning"> <a-alert type="warning">
<template #message> <template #message>
<span style="color: red">特别提醒:</span <span style="color: red">特别提醒:</span
>北京市-直辖市;天津市-直辖市。本次设置为,北京市-直辖市;四川省-成都市。提交后,商品现货区域将更新为 >若商品之前已设置现货区域,则本次设置为在之前设置基础上新增。例如,原来商品设置为
北京市-直辖市;天津市-直辖市。本次设置为,北京市-直辖市;四川省-成都市。提交后,商品现货区域将更新为
北京市-直辖市;天津市-直辖市;四川省-成都市。 北京市-直辖市;天津市-直辖市;四川省-成都市。
</template> </template>
</a-alert> </a-alert>
......
...@@ -318,8 +318,8 @@ ...@@ -318,8 +318,8 @@
}); });
delLoading.value = true; delLoading.value = true;
const res = await getAreaList(param.value); const res = await getAreaList(param.value);
if (res.success) { if (res) {
delAreaList.value = res.data; delAreaList.value = res;
} }
delLoading.value = false; delLoading.value = false;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment