flat: 添加期望薪资等等

src/api/tenant/serve.js

@@ -5,7 +5,7 @@ export const getList = (current, size, params, groupId) => {
   return request({
     url: "/api/jobslink-api/serve/list",
     method: "get",
-    params: { ...params, current, size, groupId }
+    params: {...params, current, size, groupId}
   });
 };
 
@@ -14,7 +14,7 @@ export const getUserList = (current, size, params, groupId) => {
   return request({
     url: "/api/jobslink-api/serve/user/list",
     method: "get",
-    params: { ...params, current, size, groupId }
+    params: {...params, current, size, groupId}
   });
 };
 
@@ -41,7 +41,7 @@ export const remove = ids => {
   return request({
     url: "/api/jobslink-api/serve/remove",
     method: "post",
-    params: { ids }
+    params: {ids}
   });
 };
 
@@ -50,7 +50,7 @@ export const detail = id => {
   return request({
     url: "/api/jobslink-api/serve/detail",
     method: "get",
-    params: { id }
+    params: {id}
   });
 };
 
@@ -104,7 +104,7 @@ export const removeDept = ids => {
   return request({
     url: "/api/jobslink-api/serve/group/remove",
     method: "post",
-    params: { ids }
+    params: {ids}
   });
 };
 
@@ -113,7 +113,7 @@ export const transferDept = (groupIds, ids) => {
   return request({
     url: "/api/jobslink-api/serve/updateAllGroup",
     method: "post",
-    params: { groupIds, ids }
+    params: {groupIds, ids}
   });
 };
 
@@ -205,11 +205,12 @@ export const getSearchAll = params =>
     method: "get",
     params: params
   });
-export const getSearchAllByUserId = params =>
+export const getSearchAllByUserId = (params, body) =>
   request({
     url: "/api/jobslink-api/serve/pushSearchList",
-    method: "get",
+    method: "post",
-    params: params
+    data: body,
+    params: params,
   });
 
 export const pushPolicyUserServe = params =>
@@ -233,9 +234,31 @@ export const getListAllTalents = params =>
     params
   });
 
-  export const getListUserAllTalents = params =>
+export const getListUserAllTalents = params =>
-    request({
+  request({
-      url: "/api/jobslink-api/serve/user/listAllTalents",
+    url: "/api/jobslink-api/serve/user/listAllTalents",
-      method: "get",
+    method: "get",
-      params
+    params
-    });
+  });
+
+export const addServeLog = data =>
+  request({
+    url: "/api/jobslink-api/tenant/mainserveuserlog/save",
+    method: "post",
+    data
+  });
+
+export const updateServeLog = data =>
+  request({
+    url: "/api/jobslink-api/tenant/mainserveuserlog/update",
+    method: "post",
+    data
+  });
+
+export const removeServeLog = data =>
+  request({
+    url: "/api/jobslink-api/tenant/mainserveuserlog/remove",
+    method: "post",
+    params: data
+  });
+

src/components/city-cascader/label.vue

@@ -40,12 +40,15 @@ export default {
     county: {
       get() {
         if (this.value) {
-          return this.value.split(this.splicer);
+          console.log('enum', this.area)
+          console.log('getvalue', this.value.split(this.splicer))
+          return this.value.split(this.splicer).map((item) => item.replace(/\s+/g, ""));
         } else {
           return []
         }
       },
       set(val) {
+        console.log('setvalue', val, val.join(this.splicer))
         this.$emit("input", val.join(this.splicer));
       },
     },

src/views/manage/cuser/serve/Dialog/pushService.vue

@@ -137,6 +137,9 @@ let leftUserOptions = {
     }, {
       label: '手机号',
       prop: 'telphone',
+    }, {
+      label: "求职意愿",
+      prop: "willingJob",
     }, {
       label: "民族",
       prop: "aac005",

src/views/manage/cuser/talents/index.vue

@@ -402,6 +402,22 @@ export default {
             ],
             span: 24,
           },
+          {
+            label: "求职意愿",
+            prop: "willingJob",
+            span: 24,
+            rules: [
+              {required: true, message: "请输入求职意愿", trigger: "blur"},
+            ],
+          },
+          {
+            label: "期望薪资",
+            prop: "wage",
+            span: 24,
+            rules: [
+              {required: true, message: "请输入期望薪资", trigger: "blur"},
+            ],
+          },
           // {
           //   label: "经办时间",
           //   prop: "aae036",

src/views/tenant/main/serve/Dialog/pushService.vue

@@ -137,6 +137,9 @@ let leftUserOptions = {
     }, {
       label: '手机号',
       prop: 'telphone',
+    }, {
+      label: "求职意愿",
+      prop: "willingJob",
     }, {
       label: "民族",
       prop: "aac005",
@@ -436,13 +439,18 @@ export default {
     async getRightSearchByUserId() {
       const {currentPage, size} = this.rightPages
       const ids = this.leftUserSelections.map(item => item.userId).join(',');
+      const willingJobs = this.leftUserSelections.map(item => item.willingJob);
       const createTime = Date.now() + 3000
       this.rightLoading = true
       let params = {
         ids, current: currentPage,
         size,
       }
-      let resData = await getSearchAllByUserId(params)
+      let paramsBody = {
+        willingJobs: willingJobs
+      }
+      console.log(params, paramsBody)
+      let resData = await getSearchAllByUserId(params, paramsBody)
       if (resData.data.code === 200) {
         const timed = createTime - Date.now() > 0 ? createTime - Date.now() : 0
         setTimeout(() => {

src/views/tenant/main/talents/certain/index.vue

@@ -371,6 +371,14 @@ export default {
             ],
             span: 24,
           },
+          {
+            label: "求职意愿",
+            prop: "willingJob",
+            span: 24,
+            rules: [
+              {required: true, message: "请输入求职意愿", trigger: "blur"},
+            ],
+          },
           {
             label: "户口所在地",
             prop: "aac010",

src/views/tenant/works/Dialog/CopyMission.vue

@@ -56,6 +56,14 @@
           placeholder="请选择 工作地址"
         ></jl-cityLabel-cascader>
       </template>
+      <template slot="cityIdFrom" slot-scope="{ disabled }">
+        <jl-cityLabel-cascader
+          :disabled="disabled"
+          filterable
+          v-model="obj.cityId"
+          placeholder="请选择 工作地址"
+        ></jl-cityLabel-cascader>
+      </template>
       <template slot-scope="{ row }" slot="wage">
         <el-input placeholder="请输入工资" type="number" v-model="obj.wage" class="input-with-select">
           <el-select v-model="obj.wageUnitCategory" slot="append" placeholder="请选择" @change="getMaxAndMin">
@@ -810,7 +818,7 @@ export default {
                   },
                   {
                     min: 1,
-                    max: 5,
+                    max: 8,
                     message: "长度在 1 到 5 个字",
                     trigger: "blur",
                   },
@@ -1170,7 +1178,7 @@ export default {
               callName: row.callName,
               callTel: row.callTel,
               callNumber: row.callNumber,
-              cityId: row.cityId,
+              cityId: row.cityId.replace(/\s+/g, ""),
               address: row.address,
               lat: row.lat,
               lon: row.lon,
@@ -1207,6 +1215,7 @@ export default {
           tradeNames: row.tradeNames,
           worktypeIds: row.worktypeIds,
           worktypeNames: row.worktypeNames,
+          jobCompanyScale: row.jobCompanyScale,
           skillIds: row.workSkills[1],
           skillNames: row.skillNames,
           jobDescription: row.jobDescription,
@@ -1219,7 +1228,7 @@ export default {
           callName: row.callName,
           callTel: row.callTel,
           callNumber: row.callNumber,
-          cityId: row.cityId,
+          cityId: row.cityId.replace(/\s+/g, ""),
           address: row.address,
           lat: row.lat,
           lon: row.lon,