web-企业列表页面新增经济类型与行业查询

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -54,9 +54,10 @@ public class CompanyController {
                                                      @RequestParam(required = false) String createUserId, @RequestParam(required = false) String workTime,
                                                      @RequestParam(required = false) String loginUserID, @RequestParam(required = false) String siteID,
                                                      @RequestParam(required = false) Date startDate, @RequestParam(required = false) Date endDate,
-                                                     @RequestParam(required = false) String postCountSorter) { //loginUserID暂用来过滤app的当前登录人驿站的求职人员
+                                                     @RequestParam(required = false) String postCountSorter,@RequestParam(required = false)String companyTypeID,
+                                                     @RequestParam(required = false)String industryID) { //loginUserID暂用来过滤app的当前登录人驿站的企业信息
 
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, loginUserID, siteID, startDate, endDate, postCountSorter);
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, loginUserID, siteID, startDate, endDate, postCountSorter,companyTypeID,industryID);
 
         return RespGenerstor.success(result);
     }
@@ -160,8 +161,9 @@ public class CompanyController {
                                @RequestParam(required = false) String companyCode, @RequestParam(required = false) String recordStatus,
                                @RequestParam(required = false) String regionCode, @RequestParam(required = false) String streetCode,
                                @RequestParam(required = false) String siteID, @RequestParam(required = false) Date startDate,
-                               @RequestParam(required = false) Date endDate,@RequestParam(required = false) String postCountSorter) throws Exception {
-        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, null, null, null, siteID, startDate, endDate, postCountSorter);
+                               @RequestParam(required = false) Date endDate,@RequestParam(required = false) String postCountSorter,
+                               @RequestParam(required = false)String companyTypeID,@RequestParam(required = false)String industryID) throws Exception {
+        PageInfo<CompanyVo> result = companyService.getList(pageIndex, pageSize, companyIDList, companyName, companyCode, recordStatus, regionCode, streetCode, null, null, null, siteID, startDate, endDate, postCountSorter,companyTypeID,industryID);
         if (isExport == null || !isExport) {
             return RespGenerstor.success(result);
         } else {

src/main/java/com/hz/employmentsite/mapper/cquery/CompanyCQuery.java

@@ -15,7 +15,8 @@ public interface CompanyCQuery {
                             @Param("createUserId") String createUserId, @Param("workTime") String workTime,
                             @Param("curLoginUserSiteID") String curLoginUserSiteID, @Param("siteID") String siteID,
                             @Param("startDate") Date startDate, @Param("endDate") Date endDate,
-                            @Param("postCountSorter") String postCountSorter);
+                            @Param("postCountSorter") String postCountSorter, @Param("companyTypeID") String companyTypeID,
+                            @Param("industryID") String industryID);
 
     List<PcFirm> getFirmNameLikeList(@Param("firmName") String firmName);
 

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -82,7 +82,8 @@ public class CompanyServiceImpl implements CompanyService {
                                        String companyCode, String recordStatus,
                                        String regionCode, String streetCode,
                                        String createUserId, String workTime, String loginUserID,
-                                       String siteID, Date startDate, Date endDate, String postCountSorter) {
+                                       String siteID, Date startDate, Date endDate, String postCountSorter,
+                                       String companyTypeID,String industryID) {
         String curLoginUserSiteID = "";
         if (!stringUtils.IsNullOrEmpty(loginUserID)) {
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
@@ -90,7 +91,7 @@ public class CompanyServiceImpl implements CompanyService {
             curLoginUserSiteID = pcSiteUserMapper.selectByExample(siteUserExp).get(0).getSiteID();
         }
         PageHelper.startPage(pageIndex, pageSize);
-        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, curLoginUserSiteID, siteID, startDate, endDate, postCountSorter);
+        List<CompanyVo> dataList = companyCQuery.getList(stringUtils.ListToInSql(companyIDList), companyName, companyCode, recordStatus, regionCode, streetCode, createUserId, workTime, curLoginUserSiteID, siteID, startDate, endDate, postCountSorter, companyTypeID, industryID);
         PageInfo<CompanyVo> result = new PageInfo(dataList);
         return result;
     }
@@ -304,7 +305,7 @@ public class CompanyServiceImpl implements CompanyService {
             return null;
         }
 
-        CompanyVo data = companyCQuery.getList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null, null, null).stream().findFirst().orElse(null);
+        CompanyVo data = companyCQuery.getList(stringUtils.ListToInSql(Arrays.asList(id)), null, null, null, null, null, null, null, null, null, null, null, null,null,null).stream().findFirst().orElse(null);
         if(data!=null){
             data.listLabel = labelCQuery.getCompanyLabelList(id);
         }

src/main/java/com/hz/employmentsite/services/service/companyService/CompanyService.java

@@ -18,7 +18,8 @@ public interface CompanyService {
                                 String companyCode, String recordStatus,
                                 String regionCode, String streetCode,
                                 String createUserId, String workTime, String loginUserID,
-                                String siteID, Date startDate, Date endDate, String postCountSorter);
+                                String siteID, Date startDate, Date endDate, String postCountSorter,
+                                String companyTypeID,String industryID);
 
     PageInfo<PcFirm> getFirmNameLikeList(Integer pageIndex, Integer pageSize, String PcFirm);
 

src/main/resources/mapping/cquery/CompanyCQuery.xml

@@ -54,6 +54,12 @@
         <if test="createUserId!='' and createUserId!=null">
             and company.CreateUserID = #{createUserId}
         </if>
+        <if test="companyTypeID != '' and companyTypeID != null">
+            and company.CompanyType = #{companyTypeID}
+        </if>
+        <if test="industryID != '' and industryID != null">
+            and company.IndustryID = #{industryID}
+        </if>
         <if test="workTime!='' and workTime!=null">
             and Date(company.CreateTime) = Date(#{workTime})
         </if>

vue/src/views/companyService/company/edit.vue

@@ -193,7 +193,7 @@
             name="showIndustryName"
           >
             <a-cascader :load-data="loadLevelIndustryList" v-model:value="dataModel.showIndustryName"
-                        :options="IndustryList" change-on-select @change="industryChange">
+                        :options="industryList" change-on-select @change="industryChange">
             </a-cascader>
           </a-form-item>
         </a-col>
@@ -504,7 +504,7 @@ export default defineComponent(
       const streetList = ref<SelectProps['options']>();
       const companyTypeList = ref<SelectProps['options']>();
       const companyModelList = ref<SelectProps['options']>();
-      const IndustryList = ref<SelectProps["options"]>();
+      const industryList = ref<SelectProps["options"]>();
 
       const onClose = () => {
         tabsViewStore.closeCurrentTabByPath('/companyService/enterprise/add');
@@ -664,7 +664,7 @@ export default defineComponent(
 
       const getFirstIndustryList = () => {
         get("industry/getFirstIndustryList", null).then(data => {
-          IndustryList.value = (data as any[]).map((x) => {
+          industryList.value = (data as any[]).map((x) => {
             return {
               label: x.name,
               value: x.code,
@@ -694,7 +694,6 @@ export default defineComponent(
         }
       };
 
-      // 职业资格选择变更事件
       function industryChange(value: any, selectedOptions: any) {
         if (value.length >= 2) {
           formState.dataModel.industryName = selectedOptions[1].label;
@@ -836,7 +835,7 @@ export default defineComponent(
         getFirstIndustryList,
         industryChange,
         loadLevelIndustryList,
-        IndustryList,
+        industryList,
         operationType,
         normalFirm,
         normalBtnLoading,

vue/src/views/companyService/company/index.vue

@@ -32,7 +32,8 @@
             @click="
               () => {
                 formRef.resetFields();
-                loadData();
+                showIndustryName = undifined;
+                onSearch();
               }
             ">重置</a-button>
           <a style="font-size: 12px" @click="expand = !expand">
@@ -79,7 +80,7 @@
               ref="select"
               v-model:value="searchParams.siteID"
               :options="siteList"
-              :field-names="{ label: 'siteName', value: 'siteID' }"
+              :field-names="{ label: 'name', value: 'value' }"
               :allow-clear="true"
               @change="loadData"
             >
@@ -88,6 +89,26 @@
         </a-col>
       </a-row>
       <a-row :gutter="24" v-show="expand">
+        <a-col :span="6">
+          <a-form-item label="所属行业" :label-col="{span:6}" name="showIndustryName">
+            <a-cascader :load-data="loadLevelIndustryList" v-model:value="showIndustryName"
+                        :options="industryList" change-on-select @change="industryChange">
+            </a-cascader>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item label="经济类型" :label-col="{span:6}" name="companyTypeID">
+            <a-select
+              ref="select"
+              v-model:value="searchParams.companyTypeID"
+              :options="companyTypeList"
+              :field-names="{ label: 'name', value: 'value' }"
+              :allow-clear="true"
+              @change="loadData"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
         <a-col :span="6">
           <a-form-item label="登记时间" :label-col="{span:6}">
             <a-range-picker v-model:value="createDate" :placeholder="['开始日期', '结束日期']" format="YYYY-MM-DD"
@@ -159,6 +180,7 @@ import type {ImportProps} from '@/components/basic/excel/importExcel/ImportProps
 import PositionShowModal from './show.vue';
 import {getSiteList} from "@/api/baseSettings/siteInfo";
 import ColumnsSetting from "@/components/common/ColumnsSetting.vue";
+import {getSysDictionaryList} from "@/api/system/dictionary";
 
 export default defineComponent({
   name: 'CompanyList',
@@ -177,7 +199,9 @@ export default defineComponent({
       siteID: "",
       startDate: "",
       endDate: "",
-      postCountSorter: ""
+      postCountSorter: "",
+      companyTypeID:"",
+      industryID:"",
     });
     // 导出Excel查询参数
     const exportSearchParams = computed(() => {
@@ -191,6 +215,7 @@ export default defineComponent({
       loading: false
     });
     const expand = ref(false);
+    const showIndustryName = ref([]);
     const importOptions = ref<ImportProps>({
       title: '导入',
       url: 'companyService/company/importCompany',
@@ -244,62 +269,17 @@ export default defineComponent({
       {title: '企业名称', dataIndex: 'companyName', key: 'companyName',width: 200, align: "center"},
       {title: '所属县区', dataIndex: 'regionName', key: 'regionName', width: 120, align: "center"},
       {title: '所属驿站', dataIndex: 'siteName', key: 'siteName', width: 200, align: "center"},
-      {
-        title: '企业状态',
-        dataIndex: 'recordStatusName',
-        key: 'recordStatusName',
-        width: 120,
-        align: "center",
-      },
-      {
-        title: '企业规模',
-        dataIndex: 'companyModelType',
-        key: 'companyModelType',
-        width: 120,
-        align: "center",
-      },
-      {
-        title: '当前岗位数量',
-        dataIndex: 'postCount',
-        key: 'postCount',
-        width: 120,
-        align: "center",
-        sorter: true
-      },
-      {
-        title: '所属街道',
-        dataIndex: 'streetName',
-        key: 'streetName',
-        width: 120,
-        align: "center",
-        isDefaultClose: true
-      },
-      {
-        title: '统一信用代码',
-        dataIndex: 'companyCode',
-        key: 'companyCode',
-        width: 200,
-        align: "center",
-        isDefaultClose: true
-      },
-      {
-        title: '参保人数',
-        dataIndex: 'insuredCount',
-        key: 'insuredCount',
-        width: 100,
-        align: "center",
-        isDefaultClose: true
-      },
-      {
-        title: '录入人',
-        dataIndex: 'createUserName',
-        key: 'createUserName',
-        width: 120,
-        align: "center",
-        isDefaultClose: true
-      },
-      {
-        title: '录入时间   ', dataIndex: 'createTime', key: 'createTime',width: 120, align: "center", customRender: (item) => {
+      {title: '企业状态', dataIndex: 'recordStatusName', key: 'recordStatusName', width: 120, align: "center",},
+      {title: '企业规模', dataIndex: 'companyModelType', key: 'companyModelType', width: 120, align: "center",},
+      {title: '当前岗位数量', dataIndex: 'postCount', key: 'postCount', width: 120, align: "center", sorter: true},
+      {title: '所属街道', dataIndex: 'streetName', key: 'streetName', width: 120, align: "center", isDefaultClose: true},
+      {title: '统一信用代码', dataIndex: 'companyCode', key: 'companyCode', width: 200, align: "center", isDefaultClose: true},
+      {title: '所属行业', dataIndex: 'showIndustryName', key: 'showIndustryName', width: 200, align: "center", isDefaultClose: true},
+      {title: '经济类型', dataIndex: 'companyTypeName', key: 'companyTypeName', width: 240, align: "center", isDefaultClose: true},
+      {title: '参保人数', dataIndex: 'insuredCount', key: 'insuredCount', width: 100, align: "center", isDefaultClose: true},
+      {title: '录入人', dataIndex: 'createUserName', key: 'createUserName', width: 120, align: "center", isDefaultClose: true},
+      {title: '录入时间   ', dataIndex: 'createTime', key: 'createTime',width: 120, align: "center",
+        customRender: (item) => {
           return item.record.createTime == null ? "" : (dayjs(item.record.createTime).format('YYYY-MM-DD'))
         }, isDefaultClose: true
       },
@@ -316,10 +296,18 @@ export default defineComponent({
       showTotal: total => getPaginationTotalTitle(total)
     }));
 
-    const recordStatusList =ref<SelectProps['options']>([
-      { value: 1, name: '在营' },
-      { value: 0, name: '停业' },
-    ]);
+    const recordStatusList =ref<SelectProps['options']>();
+    const companyTypeList =ref<SelectProps['options']>();
+    const industryList = ref<SelectProps["options"]>();
+
+    const getCompanyStatusList = async function () {
+      const data: any = await getSysDictionaryList("CompanyStatus");
+      recordStatusList.value = data;
+    }
+    const getCompanyTypeList = async function () {
+      const data: any = await getSysDictionaryList("CompanyType");
+      companyTypeList.value = data;
+    }
     const regionList = ref<SelectProps['options']>();
     const streetList = ref<SelectProps['options']>();
     const dataList = ref([]);
@@ -327,12 +315,55 @@ export default defineComponent({
     const institutionEditModelRef = ref();
     const tabsViewStore = useTabsViewStore();
 
+    const getFirstIndustryList = () => {
+      get("industry/getFirstIndustryList", null).then(data => {
+        industryList.value = (data as any[]).map((x) => {
+          return {
+            label: x.name,
+            value: x.code,
+            isLeaf: false,
+            tag: 'firstLevel'
+          }
+        });
+      });
+    }
+
+    const loadLevelIndustryList = (selectedOptions) => {
+      let targetOption = selectedOptions[selectedOptions.length - 1];
+      if (targetOption) {
+        if (targetOption.tag == 'firstLevel') {
+          get("industry/getListByParentIndustryID", {parentIndustryID: targetOption.value}).then(data => {
+            targetOption.loading = false;
+            targetOption.children = (data as any[]).map((x) => {
+              return {
+                label: x.name,
+                value: x.code,
+                isLeaf: true,
+                tag: 'secondLevel'
+              };
+            });
+          });
+        }
+      }
+    };
+
+    function industryChange(value: any, selectedOptions: any) {
+      if(!value){
+        searchParams.industryID = "";
+        loadData();
+      }else{
+        if (value.length >= 2) {
+          showIndustryName.value = selectedOptions[1].label;
+          searchParams.industryID = selectedOptions[1].value;
+          loadData();
+        }
+      }
+    }
+
     const changeCity = () => {
       if(searchParams.regionCode){
         get('system/area/getAreaList', {code: searchParams.regionCode}).then(data => {
-          // console.log(data);
           streetList.value = data;
-          // console.log(streetList.value);
         })
       }
       loadData();
@@ -340,7 +371,6 @@ export default defineComponent({
 
     get('system/area/getCityList', {}).then(data => {
       regionList.value = data;
-      // console.log(regionList.value);
     });
 
     // 获取驿站数据
@@ -355,6 +385,9 @@ export default defineComponent({
 
     const loadData = async function () {
       formState.loading = true;
+      await getCompanyStatusList();
+      await getCompanyTypeList();
+      getFirstIndustryList();
       const result: any = await getList(searchParams);
       dataList.value = result.list;
       formState.total = result.total;
@@ -377,6 +410,7 @@ export default defineComponent({
     };
 
     const onSearch = () => {
+      if(!showIndustryName.value) searchParams.industryID = "";
       loadData();
     }
 
@@ -443,15 +477,19 @@ export default defineComponent({
     return {
       formRef,
       modalShowRef,
+      showIndustryName,
       searchParams,
       formState,
       columns,
       originalColumns,
-      columnsCheckSub,
       pagination,
       dataList,
       expand,
       institutionEditModelRef,
+      industryList,
+      industryChange,
+      columnsCheckSub,
+      loadLevelIndustryList,
       handleTableChange,
       loadData,
       onSelectChange,
@@ -463,6 +501,7 @@ export default defineComponent({
       onShowPosition,
       importOptions,
       recordStatusList,
+      companyTypeList,
       regionList,
       streetList,
       onDetail,

vue/src/views/companyService/post/index.vue

@@ -22,9 +22,12 @@
         </a-col>
         <a-col :span="6">
           <a-form-item label="招聘人数" :label-col="{span:6}" name="recruitCount">
-            <a-input type="number" v-model:value="searchParams.minCount" style="width:80px;" placeholder=""/>
-            <label style="margin:10px;">-</label>
-            <a-input type="number" v-model:value="searchParams.maxCount" style="width:80px;" placeholder=""/>
+            <a-input-group compact>
+              <a-input type="number" v-model:value="searchParams.minCount" style="width:80px;" placeholder=""/>
+              <a-input style="width: 30px; border-left: 0;border-right: 0; pointer-events: none; background-color: #fff;margin-left: 1px;"
+                       placeholder="——" disabled />
+              <a-input type="number" v-model:value="searchParams.maxCount" style="width:80px;" placeholder=""/>
+            </a-input-group>
           </a-form-item>
         </a-col>
         <a-col :span="6" style="text-align: left">

vue/src/views/jobUserManager/jobhunt/edit.vue

@@ -5,12 +5,6 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="姓名"  name="jobUserID" :label-col="{span:8}"  :rules="[{ required: true, message: '请输选择求职人员!' }]">
-<!--            <a-select ref="select" show-search optionFilterProp="label"  v-model:value="dataModel.jobUserID" >-->
-<!--              <a-select-option v-for="item in jobUserList" :label="item.text" :value="item.value"-->
-<!--                               :key="item.value">-->
-<!--                <span>{{ item.text }}</span>-->
-<!--              </a-select-option>-->
-<!--            </a-select>-->
             <a-auto-complete
               v-model:value="dataModel.jobUserName"
               :options="jobUserList"
@@ -45,24 +39,21 @@
       </a-col>
         <a-col :span="9">
           <a-form-item label="月薪要求" name="salary" style="overflow: hidden;line-height: 35px;height: 35px;" :label-col="{span:7}">
-            <label style="color:red;float: left;position:relative;right:80px;line-height: 35px;" >*</label>
-            <a-form-item name="minSalary" :rules="[{ required: true, message: '请输入最低月薪!' }]"  style="float:left;">
-              <a-input-number :controls="false" :min="0" name="minSalary" v-model:value="dataModel.minSalary"
-                              style="min-width: 145px;max-width: 150px;" placeholder=""/>
-            </a-form-item>
-            <label style="margin-right:10px;margin-left:10px;float: left;">-</label>
-            <a-form-item name="maxSalary"  :rules="[{ required: true, message: '请输入最高月薪!' }]" style="float: left;" >
-              <a-input-number :controls="false" :min="dataModel.minSalary" name="maxSalary"
-                              v-model:value="dataModel.maxSalary"
-                              style="min-width: 145px;max-width: 150px;" placeholder=""/>
-            </a-form-item>
+              <label style="color:red;float: left;position:relative;right:80px;line-height: 35px;" >*</label>
+              <a-input-group compact>
+                <a-input-number :min="0" :controls="false" v-model:value="dataModel.minSalary"
+                                style="min-width: 145px;max-width: 150px;" placeholder=""/>
+                <a-input placeholder="——" disabled style="width: 30px; border-left: 0;border-right: 0;
+                       pointer-events: none;background: #fff;margin-left: 1px; "/>
+                <a-input-number :min="dataModel.minSalary" :controls="false" v-model:value="dataModel.maxSalary"
+                                style="min-width: 145px;max-width: 150px;" placeholder=""/>
+              </a-input-group>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="工作年限"  name="workYear" :label-col="{span:8}" :rules="[{ required: true, message: '请输入工作年限!' }]">
-<!--            <label v-if="opCategory==3">{{dataModel.workYear}}</label>-->
             <a-input type="number" v-model:value="dataModel.workYear" placeholder="" />
           </a-form-item>
         </a-col>
@@ -88,8 +79,6 @@
       <a-row type="flex">
         <a-col :span="7">
           <a-form-item label="希望工作地区"  name="areaWork" :label-col="{span:8}" :rules="[{ required: true, message: '请输入工作地区!' }]">
-<!--            <label v-if="opCategory==3">{{dataModel.areaWork}}</label>-->
-<!--            <a-input v-model:value="dataModel.areaWork" placeholder=""/>-->
             <a-select
               ref="select"
               v-model:value="dataModel.areaWork"
@@ -205,10 +194,15 @@ export default defineComponent({
 
     const onFinish = () => {
       isAllowCommit.value = true;
-      if(formData.dataModel.minSalary!=""&&formData.dataModel.maxSalary!=""){
-        if(formData.dataModel.minSalary>formData.dataModel.maxSalary){
-          message.error("最低月薪不能大于最高月薪!");
-          isAllowCommit.value = false;
+      if(formData.dataModel.minSalary==null||formData.dataModel.maxSalary==null){
+        message.error("最低/最高月薪不能为空!");
+        isAllowCommit.value = false;
+      }else{
+        if(formData.dataModel.minSalary!=""&&formData.dataModel.maxSalary!=""){
+          if(formData.dataModel.minSalary>formData.dataModel.maxSalary){
+            message.error("最低月薪不能大于最高月薪!");
+            isAllowCommit.value = false;
+          }
         }
       }
 

vue/src/views/jobUserManager/jobhunt/index.vue

@@ -19,11 +19,14 @@
         </a-col>
         <a-col :span="8">
           <a-form-item label="工作年限" :label-col="{ span: 6 }" name="workYear">
-            <a-input-number :min="0" :controls="false" v-model:value="searchParamsState.minWorkYear"
-                            style="width:110px;" placeholder=""/>
-            <label style="margin:10px;">-</label>
-            <a-input-number :min="searchParamsState.minWorkYear" :controls="false"
-                            v-model:value="searchParamsState.maxWorkYear" style="width:110px;" placeholder=""/>
+            <a-input-group compact>
+              <a-input-number :min="0" :controls="false" v-model:value="searchParamsState.minWorkYear"
+                              style="width:110px;" placeholder=""/>
+              <a-input placeholder="——" disabled style="width: 30px; border-left: 0;border-right: 0;
+                       pointer-events: none;background: #fff;margin-left: 1px; "/>
+              <a-input-number :min="searchParamsState.minWorkYear" :controls="false" v-model:value="searchParamsState.maxWorkYear"
+                              style="width:110px;" placeholder=""/>
+            </a-input-group>
           </a-form-item>
         </a-col>
         <a-col :span="4" style="text-align: left">
@@ -78,12 +81,14 @@
         </a-col>
         <a-col :span="8">
           <a-form-item label="月薪要求" :label-col="{ span: 6 }" name="salary">
-            <a-input-number style="width: 110px" :controls="false" :min="0" v-model:value="searchParamsState.minSalary"
-                            placeholder=""/>
-            <label style="margin:10px;">-</label>
-            <a-input-number style="width: 110px" :controls="false" :min="searchParamsState.minSalary"
-                            v-model:value="searchParamsState.maxSalary"
-                            placeholder=""/>
+            <a-input-group compact>
+              <a-input-number :min="0" :controls="false" v-model:value="searchParamsState.minSalary"
+                              style="width:110px;" placeholder=""/>
+              <a-input placeholder="——" disabled style="width: 30px; border-left: 0;border-right: 0;
+                       pointer-events: none;background: #fff;margin-left: 1px; "/>
+              <a-input-number :min="searchParamsState.minSalary" :controls="false" v-model:value="searchParamsState.maxSalary"
+                              style="width:110px;" placeholder=""/>
+            </a-input-group>
           </a-form-item>
         </a-col>
         <a-col :span="4" style="text-align: left"></a-col>