Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/components/Enterprise/components/positions.vue

@@ -123,7 +123,7 @@ const show = ref(false)
 const showFilterList = ref([
   { key: 'expType', isSingle: false },
   { key: 'eduType', isSingle: true },
-  { key: 'payType', isSingle: true },
+  { key: 'payScope', isSingle: true },
 ])
 const getProvideData = (list) => {
   if (!list?.length) return
@@ -184,6 +184,7 @@ const dealRouteQuery = () => {
 const handleSearch = (key, { values = [] }) => {
   if (key) {
     if (values === -1 || !values || values[0] === -1 || !values.length) delete query[key]
+    else if (key === 'payScope') query[key] = values?.length ? values[values.length-1] : '' // 单选且传递字符串
     else query[key] = values
   }
   dealRouteQuery()

src/views/recruit/personal/position/components/dict.js

@@ -58,11 +58,12 @@ const dictList = [
   },
   { 
     dictShow: 'menduner_pay_scope',
-    key: 'payType',
+    key: 'payScope',
     itemKey: 'value',
     itemText: 'label',
     title: '薪资待遇',
     isSingle: true,
+    isString: true,
     path: commonPath,
     data: []
   },

src/views/recruit/personal/position/index.vue

@@ -53,7 +53,7 @@ const showFilterList = [
   { key: 'positionId', isSingle: true },
   { key: 'jobType' },
   { key: 'expType' },
-  { key: 'payType' },
+  { key: 'payScope' },
   { key: 'eduType' },
   { key: 'scale' },
   { key: 'financingStatus' },
@@ -72,7 +72,7 @@ const getData = async () => {
   const pageReqVO = { ...pageInfo }
   // route.query参数
   if (routeQuery && Object.keys(routeQuery).length) {
-    const passingStrings = ['content'] // 传递字符串
+    const passingStrings = ['content', 'payScope'] // 单选且传递字符串
     const passingOneId = ['positionId'] // 单选且传递整型
     Object.keys(routeQuery).forEach(key => {
       if (routeQuery[key] === '') return