|
|
@@ -174,16 +174,7 @@ const GetHeaderSearchOptions = async ()=>{
|
|
|
provinceIds:item.provinceIds,
|
|
|
}
|
|
|
}) || []
|
|
|
- memberOption.value = memberData?.map(item=>{
|
|
|
- return{
|
|
|
- label:item.username,
|
|
|
- value:item.id,
|
|
|
- cityIds:item.cityIds,
|
|
|
- groupIds:item.groupIds,
|
|
|
- provinceIds:item.provinceIds,
|
|
|
- }
|
|
|
- }) || []
|
|
|
-
|
|
|
+
|
|
|
productOption.value = productData?.map(item=>{
|
|
|
return {
|
|
|
label:item.name,
|
|
|
@@ -204,6 +195,11 @@ const GetHeaderSearchOptions = async ()=>{
|
|
|
}
|
|
|
}) || []
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
provinceOption.value = regionData?.map(item=>{
|
|
|
return{
|
|
|
label:item.name,
|
|
|
@@ -223,6 +219,21 @@ const GetHeaderSearchOptions = async ()=>{
|
|
|
value:item.id,
|
|
|
}
|
|
|
}) || []
|
|
|
+
|
|
|
+ // 下面两个动态变更
|
|
|
+ // 地区
|
|
|
+ let regionOption = defaultProvinceOption.value.find(item=>{
|
|
|
+ return item.value == listSearchParams.value.province
|
|
|
+ })?.subData || []
|
|
|
+ cityOption.value = [...regionOption]
|
|
|
+
|
|
|
+ // 人员
|
|
|
+ let finalOption = defaultMemberOption.value.filter(item=>{
|
|
|
+ return (listSearchParams.value.group == 'all' ? true : item.groupIds.includes(listSearchParams.value.group))
|
|
|
+ && (listSearchParams.value.province == 'all' ? true : item.provinceIds.includes(listSearchParams.value.province))
|
|
|
+ && (listSearchParams.value.region == 'all' ? true : item.cityIds.includes(listSearchParams.value.region))
|
|
|
+ }) || []
|
|
|
+ memberOption.value = [...finalOption]
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -319,6 +330,11 @@ const HandleBlockSearchChange = async (params,key)=>{
|
|
|
listSearchParams.value.personnel = 'all'
|
|
|
break
|
|
|
}
|
|
|
+ switch(key){
|
|
|
+ case 'province':
|
|
|
+ listSearchParams.value.region = 'all'
|
|
|
+ break
|
|
|
+ }
|
|
|
|
|
|
let finalOption = defaultMemberOption.value.filter(item=>{
|
|
|
return (listSearchParams.value.group == 'all' ? true : item.groupIds.includes(listSearchParams.value.group))
|