init

src/constant/statusMap.js

@@ -454,6 +454,22 @@ export const userAuthStatusList = [
   { value: 3, label: '审核不通过',listClass: listClass.danger},
 ]
 
+export const userFilterCarStatusList = [
+  { value: 1, label: '要求经济型以上配置车辆'},
+  { value: 2, label: '要求中档型以上配置车辆'},
+  { value: 3, label: '要求豪车型车辆'},
+]
+
+export const userFilterChildStatusList = [
+  { value: 1, label: '只接受无小孩'},
+  { value: 2, label: '不介意小孩，但不能住一起'},
+]
+
+export const userFilterHouseStatusList = [
+  { value: 1, label: '必须有房无贷款'},
+  { value: 2, label: '必须有房(不介意贷款)'},
+]
+
 
 // 1-正常 2-已过期 3-已取消
 export const userVipStatusList = [

src/views/xq/user/user-info-dialog.vue

@@ -175,7 +175,7 @@
           </el-descriptions-item>
           <el-descriptions-item label="择偶条件-学历">
             <span v-if="!info.userInfo.filterEducation">不限</span>
-            <cai-dict-tag v-if="info.userInfo.filterEducation" :options="userEducationList" :value="info.userInfo.filterEducation" />
+            <cai-dict-tag v-if="info.userInfo.filterEducation" :options="userEducationList" :value="info.userInfo.filterEducation" empty-value="-" split-value="&" />
           </el-descriptions-item>
           <el-descriptions-item label="择偶条件-地区">
             <span v-if="!info.userInfo.filterResidence">不限</span>
@@ -187,15 +187,15 @@
           </el-descriptions-item>
           <el-descriptions-item label="择偶条件-小孩情况">
             <span v-if="!info.userInfo.filterChildStatus">不限</span>
-            <cai-dict-tag v-if="info.userInfo.filterChildStatus" :options="userChildStatusList" :value="info.userInfo.filterChildStatus" />
+            <cai-dict-tag v-if="info.userInfo.filterChildStatus" :options="userFilterChildStatusList" :value="info.userInfo.filterChildStatus" />
           </el-descriptions-item>
           <el-descriptions-item label="择偶条件-住房情况">
             <span v-if="!info.userInfo.filterHousingStatus">不限</span>
-            <cai-dict-tag v-if="info.userInfo.filterHousingStatus" :options="userHousingStatusList" :value="info.userInfo.filterHousingStatus" />
+            <cai-dict-tag v-if="info.userInfo.filterHousingStatus" :options="userFilterHouseStatusList" :value="info.userInfo.filterHousingStatus" />
           </el-descriptions-item>
           <el-descriptions-item label="择偶条件-购车情况">
             <span v-if="!info.userInfo.filterCarStatus">不限</span>
-            <cai-dict-tag v-if="info.userInfo.filterCarStatus" :options="userCarStatusList" :value="info.userInfo.filterCarStatus" />
+            <cai-dict-tag v-if="info.userInfo.filterCarStatus" :options="userFilterCarStatusList" :value="info.userInfo.filterCarStatus" />
           </el-descriptions-item>
         </el-descriptions>
       </el-collapse-item>
@@ -241,7 +241,7 @@ import {
   userDrinkStatusList,
   userEducationList,
   userFamilyBackgroundList,
-  userFamilyRankingList,
+  userFamilyRankingList, userFilterCarStatusList, userFilterChildStatusList, userFilterHouseStatusList,
   userFindTagList,
   userForPersonalsList,
   userHousingStatusList,
@@ -270,6 +270,7 @@ export default {
       userLoveAtDistanceList,userWhenMarriageList,userWantChildList,userLiveAtParentList,
       userFindTagList,appUserTypeList,
       videoStatusList,onlineStatusList,memberTypeList,
+      userFilterCarStatusList,userFilterChildStatusList,userFilterHouseStatusList,
       booleanList,
       activeName:['base','account','userAlbums'],
       CS: {

src/views/xq/userInfo/index.vue

@@ -199,7 +199,7 @@
         </el-table-column>
         <el-table-column label="学历" align="center" prop="filterEducation" >
           <template v-slot="scope">
-            <cai-dict-tag :options="userEducationList" :value="scope.row.filterEducation" empty-value="不限" />
+            <cai-dict-tag :options="userEducationList" :value="scope.row.filterEducation" empty-value="不限" split-value="&" />
           </template>
         </el-table-column>
 <!--        <el-table-column label="地区" align="center" prop="filterResidenceName" />-->
@@ -210,17 +210,17 @@
         </el-table-column>
         <el-table-column label="小孩情况" align="center" prop="filterChildStatus" >
           <template v-slot="scope">
-            <cai-dict-tag :options="userChildStatusList" :value="scope.row.filterChildStatus" empty-value="不限"/>
+            <cai-dict-tag :options="userFilterChildStatusList" :value="scope.row.filterChildStatus" empty-value="不限"/>
           </template>
         </el-table-column>
         <el-table-column label="住房情况" align="center" prop="filterHousingStatus" >
           <template v-slot="scope">
-            <cai-dict-tag :options="userHousingStatusList" :value="scope.row.filterHousingStatus" empty-value="不限" />
+            <cai-dict-tag :options="userFilterHouseStatusList" :value="scope.row.filterHousingStatus" empty-value="不限" />
           </template>
         </el-table-column>
         <el-table-column label="购车情况" align="center" prop="filterCarStatus" >
           <template v-slot="scope">
-            <cai-dict-tag :options="userCarStatusList" :value="scope.row.filterCarStatus" empty-value="不限" />
+            <cai-dict-tag :options="userFilterCarStatusList" :value="scope.row.filterCarStatus" empty-value="不限" />
           </template>
         </el-table-column>
       </el-table-column>
@@ -270,7 +270,7 @@ import {
   userDrinkStatusList,
   userEducationList,
   userFamilyBackgroundList,
-  userFamilyRankingList,
+  userFamilyRankingList, userFilterCarStatusList, userFilterChildStatusList, userFilterHouseStatusList,
   userFindTagList,
   userForPersonalsList,
   userHousingStatusList,
@@ -298,6 +298,7 @@ export default {
       userLiveAtParentList, userLoveAtDistanceList, userSmokeStatusList,
       userSomatotypeList,userMarriageList,userAnnualIncomeList,userZodiacList,
       userWantChildList, userWhenMarriageList,userFindTagList,userSignList,
+      userFilterCarStatusList,userFilterChildStatusList,userFilterHouseStatusList,
       updateUserInfoDialogVisible: false,
       userInfoDialogVisible: false,
       updateUserFilterInfoDialogVisible: false,

src/views/xq/userInfo/update-user-filter-info-dialog.vue

@@ -78,14 +78,19 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="学历" prop="filterEducation">
-            <el-select v-model="form.filterEducation" clearable size="small" style="width: 95%">
+            <el-col :span="4">
-              <el-option
+              <el-checkbox v-model="form.filterEducationBx">不限</el-checkbox>
-                v-for="dict in userEducationList"
+            </el-col>
-                :key="dict.value"
+            <el-col :span="20">
-                :label="dict.label"
+              <el-select v-if="form.filterEducationBx === false" v-model="form.filterEducation" clearable size="small" style="width: 95%">
-                :value="dict.value"
+                <el-option
-              />
+                  v-for="dict in userEducationList"
-            </el-select>
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-col>
           </el-form-item>
         </el-col>
       </el-row>
@@ -106,7 +111,7 @@
           <el-form-item label="小孩情况" prop="filterChildStatus">
             <el-select v-model="form.filterChildStatus" clearable size="small" style="width: 95%">
               <el-option
-                v-for="dict in userChildStatusList"
+                v-for="dict in userFilterChildStatusList"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -120,7 +125,7 @@
           <el-form-item label="住房情况" prop="filterHousingStatus">
             <el-select v-model="form.filterHousingStatus" clearable size="small" style="width: 95%">
               <el-option
-                v-for="dict in userHousingStatusList"
+                v-for="dict in userFilterHouseStatusList"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -132,7 +137,7 @@
           <el-form-item label="购车情况" prop="filterCarStatus">
             <el-select v-model="form.filterCarStatus" clearable size="small" style="width: 95%">
               <el-option
-                v-for="dict in userCarStatusList"
+                v-for="dict in userFilterCarStatusList"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -165,7 +170,7 @@ import {
   userDrinkStatusList,
   userEducationList,
   userFamilyBackgroundList,
-  userFamilyRankingList,
+  userFamilyRankingList, userFilterCarStatusList, userFilterChildStatusList, userFilterHouseStatusList,
   userFindTagList,
   userForPersonalsList,
   userHousingStatusList,
@@ -196,6 +201,7 @@ export default {
       userLoveAtDistanceList,userWhenMarriageList,userWantChildList,userLiveAtParentList,
       userFindTagList,appUserTypeList,professionList,
       videoStatusList,onlineStatusList,memberTypeList,
+      userFilterCarStatusList,userFilterChildStatusList,userFilterHouseStatusList,
       booleanList,
       open:false,
       buttonLoading: false,
@@ -213,6 +219,7 @@ export default {
         somatotypeFilter: undefined,
         marriageFilterBx: false,
         marriageFilter: undefined,
+        filterEducationBx: undefined,
         filterEducation: undefined,
         filterAnnualIncome: undefined,
         filterChildStatus: undefined,
@@ -264,7 +271,13 @@ export default {
             this.form.marriageFilterBx = true
             this.form.marriageFilter = undefined
           }
-          this.form.filterEducation = response.data.filterEducation;
+          if(response.data.filterEducation){
+            this.form.filterEducationBx = false
+            this.form.filterEducation = response.data.filterEducation.split('&').map(i => parseInt(i))
+          }else{
+            this.form.filterEducationBx = true
+            this.form.filterEducation = undefined
+          }
           this.form.filterAnnualIncome = response.data.filterAnnualIncome;
           this.form.filterChildStatus = response.data.filterChildStatus;
           this.form.filterHousingStatus = response.data.filterHousingStatus;
@@ -279,7 +292,7 @@ export default {
         filterHeight : this.form.heightBx ? "" : this.form.heightFilter.join("-"),
         filterSomatotype : this.form.somatotypeFilterBx ? "" : this.form.somatotypeFilter.join("&"),
         filterMarriage : this.form.marriageFilterBx ? "" : this.form.marriageFilter.join("&"),
-        filterEducation: this.form.filterEducation,
+        filterEducation: this.form.filterEducationBx ? "" : this.form.filterEducation.join("&"),
         filterAnnualIncome: this.form.filterAnnualIncome,
         filterChildStatus: this.form.filterChildStatus,
         filterHousingStatus: this.form.filterHousingStatus,