flat: 添加期望薪资等等

src/api/tenant/serve.js

@@ -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 =>
@@ -239,3 +240,25 @@ export const getListAllTalents = params =>
     method: "get",
     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/serve/index.vue

@@ -34,7 +34,8 @@
               <div class="footer" style="padding-left: 6px">
                 <el-button type="text" icon="el-icon-plus"
                            v-if="vaildData(permission.tenant_main_serve_index_groupadd, false)"
-                         @click="updateGroups('add')">新建分组</el-button>
+                           @click="updateGroups('add')">新建分组
+                </el-button>
               </div>
             </el-scrollbar>
           </div>
@@ -68,7 +69,9 @@
             <template slot="worktypes" slot-scope="{ row }">
               <el-tooltip effect="dark" :content="row.worktypes" placement="top">
                 <div slot="content">
-                <div v-for="(item, index) in clipStr(row.worktypes)" :key="index"><div>{{item}}</div></div>
+                  <div v-for="(item, index) in clipStr(row.worktypes)" :key="index">
+                    <div>{{ item }}</div>
+                  </div>
                 </div>
                 <div>{{ row.worktypes | ellipsis }}</div>
               </el-tooltip>
@@ -86,16 +89,21 @@
             <template slot="resume" slot-scope="{ row }">
               <div>
                 <el-button type="text" size="mini" @click="$refs.resume.openDialog(row)"
-                v-if="row.userId && row.userId !== '0'">查看简历</el-button>
+                           v-if="row.userId && row.userId !== '0'">查看简历
+                </el-button>
                 <div v-else>暂无简历</div>
               </div>
             </template>
             <template slot="serveLabels" slot-scope="{ row }">
               <el-tooltip effect="dark" placement="top">
                 <div slot="content">
-                  <div v-for="(item, index) in clipStr(row.serveLabels)" :key="index"><div>{{item}}</div></div>
+                  <div v-for="(item, index) in clipStr(row.serveLabels)" :key="index">
+                    <div>{{ item }}</div>
                   </div>
-                <span>{{ row.serveLabels.length > 20 ? `${row.serveLabels.substring(0, 20)}...` :  row.serveLabels}}</span>
+                </div>
+                <span>{{
+                    row.serveLabels.length > 20 ? `${row.serveLabels.substring(0, 20)}...` : row.serveLabels
+                  }}</span>
               </el-tooltip>
             </template>
             <!--/自定义列-->
@@ -105,12 +113,16 @@
             </template>
             <!--自定义按钮-->
             <template slot="menuLeft">
-            <el-button type="primary" size="small" icon="el-icon-delete" @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}"
+              <el-button type="primary" size="small" icon="el-icon-edit"
+                         @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}"
                          v-if="vaildData(permission.tenant_main_serve_index_add, false)">
-              新增</el-button>
+                新增
+              </el-button>
               <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+                         :disabled="!selectionList.length" plain
-              删除</el-button>
+                         v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+                删除
+              </el-button>
             </template>
             <template slot="name" slot-scope="{row}">
               <span>{{ row.name }}</span>
@@ -122,6 +134,7 @@
                 :options="listAllPolicyTree"
                 :props="{ expandTrigger: 'hover', multiple: true, label: 'name', value: 'value', children: 'child'}"
                 @change="handleChange"
+                filterable
               ></el-cascader>
             </template>
             <!--/自定义按钮-->
@@ -131,26 +144,30 @@
                          size="small"
                          v-show="vaildData(permission.tenant_main_serve_index_pushserve, false)"
                          @click="selectPushService(row)"
-            >推送服务</el-button>
+              >推送服务
+              </el-button>
               <el-button type="text"
                          icon="el-icon-document"
                          size="small"
                          @click="showKeyAudience(row)"
-            >服务详情</el-button>
+              >服务详情
+              </el-button>
               <el-button type="text"
                          v-if="row.status == 0"
                          icon="el-icon-video-play"
                          size="small"
                          v-show="vaildData(permission.tenant_main_serve_index_off, false)"
                          @click="playServe(row)"
-            >启用</el-button>
+              >启用
+              </el-button>
               <el-button type="text"
                          v-if="row.status == 1"
                          icon="el-icon-video-pause"
                          size="small"
                          v-show="vaildData(permission.tenant_main_serve_index_off, false)"
                          @click="pauseServe(row)"
-            >关闭</el-button>
+              >关闭
+              </el-button>
             </template>
             <template slot="talentsNamesForm" slot-scope="{row}">
               <el-button type="text"
@@ -158,7 +175,8 @@
                          icon="el-icon-video-pause"
                          size="small"
                          @click="pauseServe(row)"
-            >关闭</el-button>
+              >关闭
+              </el-button>
             </template>
             <!--/父子表-->
           </avue-crud>
@@ -211,17 +229,20 @@
                      icon="el-icon-document"
                      size="small"
                      @click="matchWorkStation(row)"
-              >匹配任务/岗位</el-button>
+          >匹配任务/岗位
+          </el-button>
           <el-button type="text"
                      icon="el-icon-document"
                      size="small"
                      @click="matchPolicy(row)"
-              >匹配政策</el-button>
+          >匹配政策
+          </el-button>
           <el-button type="text"
                      icon="el-icon-document"
                      size="small"
                      @click="serveLog(row)"
-              >服务日志</el-button>
+          >服务日志
+          </el-button>
         </template>
       </avue-crud>
       <el-drawer
@@ -245,7 +266,8 @@
                        icon="el-icon-document"
                        size="small"
                        @click="toWorkMissionDetail(row)"
-            >查看详情</el-button>
+            >查看详情
+            </el-button>
           </template>
         </avue-crud>
       </el-drawer>
@@ -265,7 +287,9 @@
           <template slot="policyContent" slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" placement="top-start">
               <div slot="content">
-                    <div v-for="(item, index) in clipStr(row.policyContent)" :key="index"><div>{{item}}</div></div>
+                <div v-for="(item, index) in clipStr(row.policyContent)" :key="index">
+                  <div>{{ item }}</div>
+                </div>
               </div>
               <span>{{ row.policyContent.length > 50 ? row.policyContent.substring(0, 50) : row.policyContent }}</span>
             </el-tooltip>
@@ -273,14 +297,19 @@
           <template slot="labelName" slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" placement="top-start">
               <div slot="content">
-                    <div v-for="(item, index) in clipStr(row.labelName)" :key="index"><div>{{item}}</div></div>
+                <div v-for="(item, index) in clipStr(row.labelName)" :key="index">
+                  <div>{{ item }}</div>
+                </div>
               </div>
               <span>{{ row.labelName.length > 50 ? row.labelName.substring(0, 50) : row.labelName }}</span>
             </el-tooltip>
           </template>
           <template slot="labelNameForm" slot-scope="{row}">
             <div>
-                  <el-tag style="margin: 4px 10px" v-for="(item, index) in row.labelName.split(',')" :key="index">{{ item }}</el-tag>
+              <el-tag style="margin: 4px 10px" v-for="(item, index) in row.labelName.split(',')" :key="index">{{
+                  item
+                }}
+              </el-tag>
             </div>
           </template>
 
@@ -311,6 +340,9 @@
           :data="logData"
           :option="logOption"
           :page.sync="logPage"
+          @row-save="saveLog"
+          @row-update="saveUpdateLog"
+          @row-del="removeLog"
           @size-change="logSizeChange"
           @current-change="logCurrentChange"
         >
@@ -348,7 +380,7 @@ import {
   getMatchPolicy,
   getMatchServeList,
   getListAllPolicy,
-  getListUserAllTalents
+  getListUserAllTalents, addServeLog, updateServeLog, removeServeLog
 } from "@/api/tenant/serve";
 import {detail as missionDetail} from "@/api/tenant/mission";
 import {detail as workDetail} from "@/api/tenant/postzp";
@@ -368,6 +400,7 @@ import Tinymce from "@/components/Tinymce";
 import {deepClone} from "@/util/util";
 import PushService from "@/views/tenant/main/serve/Dialog/pushService.vue";
 import TextTooltip from "@/components/text-tooltip/index.vue";
+
 const page = {
   pageSize: 10,
   currentPage: 1,
@@ -469,7 +502,8 @@ export default {
       excelForm: {isCovered: 1},
       listAllPolicyTree: [],
       selectPolicyTree: [],
-      talentsList: []
+      talentsList: [],
+      selectUserServeLog: null,
     };
   },
   components: {addGroups, transferGroups, Resume, ied, missionView, workView, Tinymce, PushService, TextTooltip},
@@ -555,7 +589,7 @@ export default {
               {
                 required: true,
                 whitespace: true,
-                message: "请输入姓名",
+                message: "请输入服务名称",
                 trigger: "blur",
               },
             ],
@@ -832,7 +866,10 @@ export default {
         height: '100',
         column: [{
           label: '服务时间',
-          prop: 'createTime'
+          prop: 'createTime',
+          type: 'datetime',
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
         }, {
           label: '服务发起人',
           prop: 'fromName'
@@ -937,8 +974,72 @@ export default {
     this.ListAllTalents()
   },
   methods: {
-    workSizeChange() {},
+    async saveLog(row, index, done, loading) {
-    workCurrentChange() {},
+      console.log(row)
+      let params = {
+        ...row,
+        serveId: this.selectUserServeLog.serveId,
+        serveUserId: this.selectUserServeLog.serveUserId,
+      }
+      let resData = await addServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "添加成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    async saveUpdateLog(row, index, done, loading) {
+      let params = {
+        id: row.id,
+        createTime: row.createTime,
+        fromName: row.fromName,
+        toName: row.toName,
+        serveTheme: row.serveTheme,
+        serveContent: row.serveContent,
+        bak1: row.bak1,
+      }
+      let resData = await updateServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "修改成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    removeLog(row, index, done, loading) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return removeServeLog({ids: row.id});
+        })
+        .then(() => {
+          this.serveLog(this.selectUserServeLog)
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    workSizeChange() {
+    },
+    workCurrentChange() {
+    },
+    logSizeChange(pageSize) {
+      this.logPage.pageSize = pageSize;
+      this.serveLog(this.selectUserServeLog)
+    },
+    logCurrentChange(currentPage) {
+      this.logPage.currentPage = currentPage;
+      this.serveLog(this.selectUserServeLog)
+    },
     async ListAllTalents() {
       let resData = await getListUserAllTalents()
       if (resData.data.code === 200) {
@@ -1481,7 +1582,11 @@ export default {
     // 匹配任务和岗位
     matchWorkStation(row) {
       console.log('匹配任务和岗位')
-      getMatchWorkStation({serveUserId: row.serveUserId, serveId: this.selectInfo.id, companyId: this.selectInfo.companyId}).then(res => {
+      getMatchWorkStation({
+        serveUserId: row.serveUserId,
+        serveId: this.selectInfo.id,
+        companyId: this.selectInfo.companyId
+      }).then(res => {
         const {records, current, size, total} = res.data.data
         this.innerDrawer1 = true
         this.workData = records
@@ -1510,7 +1615,14 @@ export default {
     // 服务日志
     serveLog(row) {
       console.log('服务日志')
-      getMatchServeList({id: row.id, serveId: this.selectInfo.id, companyId: this.selectInfo.companyId, current: 1, size: 10}).then(res => {
+      this.selectUserServeLog = row
+      getMatchServeList({
+        id: row.id,
+        serveId: this.selectInfo.id,
+        companyId: this.selectInfo.companyId,
+        current: this.logPage.currentPage,
+        size: this.logPage.pageSize
+      }).then(res => {
         let _this = this;
         const {records, current, size, total} = res.data.data
         _this.logData = records

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/serve/index.vue

@@ -34,7 +34,8 @@
               <div class="footer" style="padding-left: 6px">
                 <el-button type="text" icon="el-icon-plus"
                            v-if="vaildData(permission.tenant_main_serve_index_groupadd, false)"
-                         @click="updateGroups('add')">新建分组</el-button>
+                           @click="updateGroups('add')">新建分组
+                </el-button>
               </div>
             </el-scrollbar>
           </div>
@@ -68,7 +69,9 @@
             <template slot="worktypes" slot-scope="{ row }">
               <el-tooltip effect="dark" :content="row.worktypes" placement="top">
                 <div slot="content">
-                <div v-for="(item, index) in clipStr(row.worktypes)" :key="index"><div>{{item}}</div></div>
+                  <div v-for="(item, index) in clipStr(row.worktypes)" :key="index">
+                    <div>{{ item }}</div>
+                  </div>
                 </div>
                 <div>{{ row.worktypes | ellipsis }}</div>
               </el-tooltip>
@@ -86,16 +89,21 @@
             <template slot="resume" slot-scope="{ row }">
               <div>
                 <el-button type="text" size="mini" @click="$refs.resume.openDialog(row)"
-                v-if="row.userId && row.userId !== '0'">查看简历</el-button>
+                           v-if="row.userId && row.userId !== '0'">查看简历
+                </el-button>
                 <div v-else>暂无简历</div>
               </div>
             </template>
             <template slot="serveLabels" slot-scope="{ row }">
               <el-tooltip effect="dark" placement="top">
                 <div slot="content">
-                  <div v-for="(item, index) in clipStr(row.serveLabels)" :key="index"><div>{{item}}</div></div>
+                  <div v-for="(item, index) in clipStr(row.serveLabels)" :key="index">
+                    <div>{{ item }}</div>
                   </div>
-                <span>{{ row.serveLabels.length > 20 ? `${row.serveLabels.substring(0, 20)}...` :  row.serveLabels}}</span>
+                </div>
+                <span>{{
+                    row.serveLabels.length > 20 ? `${row.serveLabels.substring(0, 20)}...` : row.serveLabels
+                  }}</span>
               </el-tooltip>
             </template>
             <!--/自定义列-->
@@ -105,12 +113,16 @@
             </template>
             <!--自定义按钮-->
             <template slot="menuLeft">
-            <el-button type="primary" size="small" icon="el-icon-delete" @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}"
+              <el-button type="primary" size="small" icon="el-icon-delete"
+                         @click="() => { $refs.crud.rowAdd(); selectPolicyTree = []}"
                          v-if="vaildData(permission.tenant_main_serve_index_add, false)">
-              新增</el-button>
+                新增
+              </el-button>
               <el-button type="danger" size="small" icon="el-icon-delete" @click="handleDelete"
-              :disabled="!selectionList.length" plain v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+                         :disabled="!selectionList.length" plain
-              删除</el-button>
+                         v-show="vaildData(permission.tenant_talents_groupdelete, false)">
+                删除
+              </el-button>
             </template>
             <template slot="name" slot-scope="{row}">
               <span>{{ row.name }}</span>
@@ -122,6 +134,7 @@
                 :options="listAllPolicyTree"
                 :props="{ expandTrigger: 'hover', multiple: true, label: 'name', value: 'value', children: 'child'}"
                 @change="handleChange"
+                filterable
               ></el-cascader>
             </template>
             <!--/自定义按钮-->
@@ -131,26 +144,30 @@
                          size="small"
                          v-show="vaildData(permission.tenant_main_serve_index_pushserve, false)"
                          @click="selectPushService(row)"
-            >推送服务</el-button>
+              >推送服务
+              </el-button>
               <el-button type="text"
                          icon="el-icon-document"
                          size="small"
                          @click="showKeyAudience(row)"
-            >服务详情</el-button>
+              >服务详情
+              </el-button>
               <el-button type="text"
                          v-if="row.status == 0"
                          icon="el-icon-video-play"
                          size="small"
                          v-show="vaildData(permission.tenant_main_serve_index_off, false)"
                          @click="playServe(row)"
-            >启用</el-button>
+              >启用
+              </el-button>
               <el-button type="text"
                          v-if="row.status == 1"
                          icon="el-icon-video-pause"
                          size="small"
                          v-show="vaildData(permission.tenant_main_serve_index_off, false)"
                          @click="pauseServe(row)"
-            >关闭</el-button>
+              >关闭
+              </el-button>
             </template>
             <template slot="talentsNamesForm" slot-scope="{row}">
               <el-button type="text"
@@ -158,7 +175,8 @@
                          icon="el-icon-video-pause"
                          size="small"
                          @click="pauseServe(row)"
-            >关闭</el-button>
+              >关闭
+              </el-button>
             </template>
             <!--/父子表-->
           </avue-crud>
@@ -211,17 +229,20 @@
                      icon="el-icon-document"
                      size="small"
                      @click="matchWorkStation(row)"
-              >匹配任务/岗位</el-button>
+          >匹配任务/岗位
+          </el-button>
           <el-button type="text"
                      icon="el-icon-document"
                      size="small"
                      @click="matchPolicy(row)"
-              >匹配政策</el-button>
+          >匹配政策
+          </el-button>
           <el-button type="text"
                      icon="el-icon-document"
                      size="small"
                      @click="serveLog(row)"
-              >服务日志</el-button>
+          >服务日志
+          </el-button>
         </template>
       </avue-crud>
       <el-drawer
@@ -245,7 +266,8 @@
                        icon="el-icon-document"
                        size="small"
                        @click="toWorkMissionDetail(row)"
-            >查看详情</el-button>
+            >查看详情
+            </el-button>
           </template>
         </avue-crud>
       </el-drawer>
@@ -265,7 +287,9 @@
           <template slot="policyContent" slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" placement="top-start">
               <div slot="content">
-                    <div v-for="(item, index) in clipStr(row.policyContent)" :key="index"><div>{{item}}</div></div>
+                <div v-for="(item, index) in clipStr(row.policyContent)" :key="index">
+                  <div>{{ item }}</div>
+                </div>
               </div>
               <span>{{ row.policyContent.length > 50 ? row.policyContent.substring(0, 50) : row.policyContent }}</span>
             </el-tooltip>
@@ -273,14 +297,19 @@
           <template slot="labelName" slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" placement="top-start">
               <div slot="content">
-                    <div v-for="(item, index) in clipStr(row.labelName)" :key="index"><div>{{item}}</div></div>
+                <div v-for="(item, index) in clipStr(row.labelName)" :key="index">
+                  <div>{{ item }}</div>
+                </div>
               </div>
               <span>{{ row.labelName.length > 50 ? row.labelName.substring(0, 50) : row.labelName }}</span>
             </el-tooltip>
           </template>
           <template slot="labelNameForm" slot-scope="{row}">
             <div>
-                  <el-tag style="margin: 4px 10px" v-for="(item, index) in row.labelName.split(',')" :key="index">{{ item }}</el-tag>
+              <el-tag style="margin: 4px 10px" v-for="(item, index) in row.labelName.split(',')" :key="index">{{
+                  item
+                }}
+              </el-tag>
             </div>
           </template>
 
@@ -310,6 +339,9 @@
         <avue-crud
           :data="logData"
           :option="logOption"
+          @row-save="saveLog"
+          @row-update="saveUpdateLog"
+          @row-del="removeLog"
           :page.sync="logPage"
           @size-change="logSizeChange"
           @current-change="logCurrentChange"
@@ -348,7 +380,10 @@ import {
   getMatchPolicy,
   getMatchServeList,
   getListAllPolicy,
-  getListAllTalents
+  getListAllTalents,
+  addServeLog,
+  updateServeLog,
+  removeServeLog
 } from "@/api/tenant/serve";
 import {detail as missionDetail} from "@/api/tenant/mission";
 import {detail as workDetail} from "@/api/tenant/postzp";
@@ -368,6 +403,7 @@ import Tinymce from "@/components/Tinymce";
 import {deepClone} from "@/util/util";
 import PushService from "@/views/tenant/main/serve/Dialog/pushService.vue";
 import TextTooltip from "@/components/text-tooltip/index.vue";
+
 const page = {
   pageSize: 10,
   currentPage: 1,
@@ -469,7 +505,8 @@ export default {
       excelForm: {isCovered: 1},
       listAllPolicyTree: [],
       selectPolicyTree: [],
-      talentsList: []
+      talentsList: [],
+      selectUserServeLog: null,
     };
   },
   components: {addGroups, transferGroups, Resume, ied, missionView, workView, Tinymce, PushService, TextTooltip},
@@ -832,7 +869,10 @@ export default {
         height: '100',
         column: [{
           label: '服务时间',
-          prop: 'createTime'
+          prop: 'createTime',
+          type: 'datetime',
+          format: "yyyy-MM-dd HH:mm:ss",
+          valueFormat: "yyyy-MM-dd HH:mm:ss",
         }, {
           label: '服务发起人',
           prop: 'fromName'
@@ -937,8 +977,71 @@ export default {
     this.ListAllTalents()
   },
   methods: {
-    workSizeChange() {},
+    async saveLog(row, index, done, loading) {
-    workCurrentChange() {},
+      let params = {
+        ...row,
+        serveId: this.selectUserServeLog.serveId,
+        serveUserId: this.selectUserServeLog.serveUserId,
+      }
+      let resData = await addServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "添加成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    async saveUpdateLog(row, index, done, loading) {
+      let params = {
+        id: row.id,
+        createTime: row.createTime,
+        fromName: row.fromName,
+        toName: row.toName,
+        serveTheme: row.serveTheme,
+        serveContent: row.serveContent,
+        bak1: row.bak1,
+      }
+      let resData = await updateServeLog(params)
+      done()
+      if (resData.data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "修改成功!",
+        });
+        this.serveLog(this.selectUserServeLog)
+      }
+    },
+    removeLog(row, index, done, loading) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return removeServeLog({ids: row.id});
+        })
+        .then(() => {
+          this.serveLog(this.selectUserServeLog)
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    workSizeChange() {
+    },
+    workCurrentChange() {
+    },
+    logSizeChange(pageSize) {
+      this.logPage.pageSize = pageSize;
+      this.serveLog(this.selectUserServeLog)
+    },
+    logCurrentChange(currentPage) {
+      this.logPage.currentPage = currentPage;
+      this.serveLog(this.selectUserServeLog)
+    },
     async ListAllTalents() {
       let resData = await getListAllTalents()
       if (resData.data.code === 200) {
@@ -1481,7 +1584,11 @@ export default {
     // 匹配任务和岗位
     matchWorkStation(row) {
       console.log('匹配任务和岗位')
-      getMatchWorkStation({serveUserId: row.serveUserId, serveId: this.selectInfo.id, companyId: this.selectInfo.companyId}).then(res => {
+      getMatchWorkStation({
+        serveUserId: row.serveUserId,
+        serveId: this.selectInfo.id,
+        companyId: this.selectInfo.companyId
+      }).then(res => {
         const {records, current, size, total} = res.data.data
         this.innerDrawer1 = true
         this.workData = records
@@ -1510,7 +1617,14 @@ export default {
     // 服务日志
     serveLog(row) {
       console.log('服务日志')
-      getMatchServeList({id: row.id, serveId: this.selectInfo.id, companyId: this.selectInfo.companyId, current: 1, size: 10}).then(res => {
+      this.selectUserServeLog = row
+      getMatchServeList({
+        id: row.id,
+        serveId: this.selectInfo.id,
+        companyId: this.selectInfo.companyId,
+        current: this.logPage.currentPage,
+        size: this.logPage.pageSize
+      }).then(res => {
         let _this = this;
         const {records, current, size, total} = res.data.data
         _this.logData = records

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,