修改我的客户默认列表页的筛选查询逻辑

src/store/index.ts

@@ -94,7 +94,7 @@ const store = createStore<RootState>({
     },
     async updatePositionList({commit,state},data){
       if(data){
-        commit('updatePositionList')
+        commit('updatePositionList',data)
       }else{
         if(state.positionList?.length > 0){
           return
@@ -119,7 +119,7 @@ const store = createStore<RootState>({
     },
     async updateProductList({commit,state},data){
       if(data){
-        commit('updateProductList')
+        commit('updateProductList',data)
       }else{
         if(state.productList?.length > 0){
           return
@@ -144,7 +144,7 @@ const store = createStore<RootState>({
     },
     async updateFollowUpStatus({commit,state},data){
       if(data){
-        commit('updateFollowUpStatus')
+        commit('updateFollowUpStatus',data)
       }else{
         if(state.followUpStatus?.length > 0){
           return
@@ -169,7 +169,7 @@ const store = createStore<RootState>({
     },
     async updateSchoolStageList({commit,state},data){
       if(data){
-        commit('updateSchoolStageList')
+        commit('updateSchoolStageList',data)
       }else{
         if(state.schoolStageList?.length > 0){
           return
@@ -195,7 +195,7 @@ const store = createStore<RootState>({
 
     async updateConfigedProvinceCityList({commit,state},data){
       if(data){
-        commit('updateConfigedProvinceCityList')
+        commit('updateConfigedProvinceCityList',data)
       }else{
         if(state.configedProvinceCityList?.length > 0){
           return

src/views/myCustomer/index.vue

@@ -29,6 +29,10 @@
                     <span class="two_line_ellipsis">{{ row.followUpContent }}</span>
                 </template>
 
+                <template #lastFollowDatetime="{row}">
+                    {{ row.lastFollowDatetime || '-' }}
+                </template>
+
                 <template #operation="{row}">
                     <div class="table_row_option">
                         <span class="option_button_editor" @click="OpenFormDialog(row)">编辑</span>
@@ -86,29 +90,31 @@ const searchParams = ref({
     queryStr:'',
 })
 const provinceConfig = ref([])  //省份的配置列表
+const memberConfigList = ref([]) //所有的人员配置列表
+
 
 // 获取头部筛选配置
 const GetHeaderSearchOptions = async ()=>{
     let res = await getPrivateHeaderSearchParamsApi()
     if(res?.code == 200){
         const { groupData, memberData, regionData, stageData, typeData} = res.data
-        let typeDataOption = typeData?.slice(1)?.map(item=>{
+        let typeDataOption = typeData?.map(item=>{
             return {
                 label:item.name,
                 value:item.id
             }
         }) || []
-        let stageOption = stageData?.slice(1)?.map(item=>{
+        let stageOption = stageData?.map(item=>{
             return {
                 label:item.name,
                 value:item.id
             }
         }) || []
-        provinceConfig.value = regionData?.slice(1)?.map(item=>{
+        provinceConfig.value = regionData?.map(item=>{
             return {
                 label:item.name,
                 value:item.id,
-                subData:item.subData?.slice(1)?.map(city=>{
+                subData:item.subData?.map(city=>{
                     return {
                         label:city.name,
                         value:city.id
@@ -122,17 +128,20 @@ const GetHeaderSearchOptions = async ()=>{
         }).flat() || []
 
 
-        let groupDataOption = groupData?.slice(1)?.map(item=>{
+        let groupDataOption = groupData?.map(item=>{
             return {
                 label:item.name,
                 value:item.id,
             }
         }) || []
 
-        let personOption = memberData?.slice(1)?.map(item=>{
+        memberConfigList.value =  memberData?.map(item=>{
             return{
                 label:item.username,
                 value:item.id,
+                groupIds:item.groupIds || [],
+                cityIds:item.cityIds || [],
+                provinceIds:item.provinceIds || []
             }
         })
 
@@ -176,7 +185,7 @@ const GetHeaderSearchOptions = async ()=>{
                 case 'personnel':
                     item.options = [
                         { label: '全部', value: 'all' },
-                        ...personOption,
+                        ...memberConfigList.value,
                     ]
                     item.defaultValue = searchParams.value[item.key]
                     break
@@ -193,7 +202,9 @@ const HandleBlockSearchChange = (params,key)=>{
         ...params
     }
     if(key == 'province'){
-        let cityOption = []
+        let cityOption = []  //市区配置
+        let filterProvinceMemberOption = []  //人员配置
+
         if(searchParams.value.province !== 'all'){
             // 重新修改当前市区的 配置
             cityOption = provinceConfig.value.find(item=>{
@@ -204,6 +215,13 @@ const HandleBlockSearchChange = (params,key)=>{
                 return item.subData
             }).flat() || []
         }
+
+        // 过滤当前 省+分组 下的人员
+        filterProvinceMemberOption = memberConfigList.value.filter(item=>{
+            return (params.group == 'all' ? 1 : item.groupIds.includes(params.group)) 
+                && (params.province == 'all' ? 1 : item.provinceIds.includes(params.province) )
+        }) || []
+
         headerSearchList.value = headerSearchList.value.map(item=>{
             switch(item.key){
                 case 'city':
@@ -211,6 +229,14 @@ const HandleBlockSearchChange = (params,key)=>{
                         { label: '全部', value: 'all' },
                         ...cityOption,
                     ]
+                    item.defaultValue = 'all'
+                    break
+                case 'personnel':
+                    item.options = [
+                        { label: '全部', value: 'all' },
+                        ...filterProvinceMemberOption,
+                    ]
+                    item.defaultValue = 'all'
                     break
                 default:
                     item.defaultValue = searchParams.value[item.key]
@@ -218,6 +244,55 @@ const HandleBlockSearchChange = (params,key)=>{
             return item
         })
         searchParams.value.city = 'all'
+        searchParams.value.personnel = 'all'
+    }else if(key == 'city'){
+        let filterCityMemberOption = []  //人员配置
+
+        // 过滤当前 省+地区+分组 下的人员
+        filterCityMemberOption = memberConfigList.value.filter(item=>{
+            return  (params.group == 'all' ? 1 : item.groupIds.includes(params.group) )
+                    && (params.province == 'all' ? 1 : item.provinceIds.includes(params.province) )
+                    && (params.city == 'all' ? 1 :  item.cityIds.includes(params.city) )
+        }) || []
+
+        headerSearchList.value = headerSearchList.value.map(item=>{
+            switch(item.key){
+                case 'personnel':
+                    item.options = [
+                        { label: '全部', value: 'all' },
+                        ...filterCityMemberOption,
+                    ]
+                    item.defaultValue = 'all'
+                    break
+                default:
+                    item.defaultValue = searchParams.value[item.key]
+            }
+            return item
+        })
+        searchParams.value.personnel = 'all'
+    }else if(key == 'group'){
+        let filterMemberOption = []
+
+        filterMemberOption = memberConfigList.value.filter(item=>{
+            return  (params.group == 'alll' ? 1 :  item.groupIds.includes(params.group))
+        }) || []
+        
+        // 这里边的 分组变更的时候，需要 过滤对应分组下的人员
+        headerSearchList.value = headerSearchList.value.map(item=>{
+            switch(item.key){
+                case 'personnel':
+                    item.options = [
+                        { label: '全部', value: 'all' },
+                        ...filterMemberOption,
+                    ]
+                    item.defaultValue = 'all'
+                    break
+                default:
+                    item.defaultValue = searchParams.value[item.key]
+            }
+            return item
+        })
+        searchParams.value.personnel = 'all'
     }
     GetCustomerList()
 }

src/views/myCustomer/table.ts

@@ -92,7 +92,7 @@ export const tableColumns = ref([
         fixed: '',
         align: 'center',
         minWidth: '',
-        custom: false,
+        custom: true,
     },
     {
         name: 'operation',