diff --git a/src/api/tenant/personnelserve.js b/src/api/tenant/personnelserve.js
new file mode 100644
index 0000000..27bef42
--- /dev/null
+++ b/src/api/tenant/personnelserve.js
@@ -0,0 +1,10 @@
+import request from "@/router/axios";
+
+/*获取人才列表*/
+export const getList = (current, size, params, groupId) => {
+ return request({
+ url: "/api/jobslink-api/serve/list",
+ method: "get",
+ params: {...params, current, size, groupId}
+ });
+};
diff --git a/src/api/tenant/serve.js b/src/api/tenant/serve.js
index b51a84b..3e28b1b 100644
--- a/src/api/tenant/serve.js
+++ b/src/api/tenant/serve.js
@@ -262,3 +262,11 @@ export const removeServeLog = data =>
params: data
});
+/*服务日志*/
+export const getMainServeUserLog = params => {
+ return request({
+ url: "/api/jobslink-api/tenant/mainserveuserlog/listUserLog",
+ method: "get",
+ params: params
+ });
+};
diff --git a/src/views/manage/cuser/serve/Dialog/pushService.vue b/src/views/manage/cuser/serve/Dialog/pushService.vue
index f57faf4..3154e21 100644
--- a/src/views/manage/cuser/serve/Dialog/pushService.vue
+++ b/src/views/manage/cuser/serve/Dialog/pushService.vue
@@ -438,11 +438,12 @@ export default {
},
async getRightSearchByUserId() {
const {currentPage, size} = this.rightPages
- const ids = this.leftUserSelections.map(item => item.userId).join(',');
+ const idNumbers = this.leftUserSelections.map(item => item.idNumber).join(',');
const createTime = Date.now() + 3000
this.rightLoading = true
let params = {
- ids, current: currentPage,
+ idNumbers,
+ current: currentPage,
size,
}
let resData = await getSearchAllByUserId(params)
diff --git a/src/views/tenant/main/serve/Dialog/pushService.vue b/src/views/tenant/main/serve/Dialog/pushService.vue
index b0940d7..271fe38 100644
--- a/src/views/tenant/main/serve/Dialog/pushService.vue
+++ b/src/views/tenant/main/serve/Dialog/pushService.vue
@@ -56,6 +56,9 @@
+
+
+
@@ -220,6 +223,10 @@ let rightPostOptions = {
}, {
label: '用工单位',
prop: 'companyName',
+ }, {
+ label: '详细地址',
+ prop: 'address',
+ slot: true,
}, {
label: '岗位描述',
prop: 'jobDescription',
@@ -438,12 +445,13 @@ export default {
},
async getRightSearchByUserId() {
const {currentPage, size} = this.rightPages
- const ids = this.leftUserSelections.map(item => item.userId).join(',');
+ const idNumbers = this.leftUserSelections.map(item => item.idNumber).join(',');
const willingJobs = this.leftUserSelections.map(item => item.willingJob);
const createTime = Date.now() + 3000
this.rightLoading = true
let params = {
- ids, current: currentPage,
+ idNumbers,
+ current: currentPage,
size,
}
let paramsBody = {
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index 822a1f9..581574f 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/index.vue
@@ -104,6 +104,14 @@
+
+ 查看日志
+
+
@@ -118,6 +126,36 @@
+
+
+
+
+
+
+
@@ -154,7 +192,13 @@ import ied from "@/views/util/import-error-dialog";
import {excelAccept} from "@/common/accept";
import TextTooltip from '@/components/text-tooltip'
import {exportList} from "@/api/workstation/post";
+import {addServeLog, getMainServeUserLog, removeServeLog, updateServeLog} from "@/api/tenant/serve";
+let page = {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+}
export default {
filters: {
ellipsis(value) {
@@ -184,11 +228,11 @@ export default {
personTotal: 0,
treeData: [],
tenantId: "",
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
+ page: Object.assign({}, page),
+ logPage: Object.assign({}, page),
+ logDataSource: [],
+ innerDrawerLog: false,
+ selectUserServeLog: null,
tempWorkType: [],
worktypeDic: {},
arr: [],//////
@@ -569,6 +613,43 @@ export default {
}
return rel;
},
+ logOption() {
+ return {
+ editBtn: true,
+ delBtn: true,
+ addBtn: true,
+ viewBtn: true,
+ border: true,
+ index: true,
+ indexLabel: "序号",
+ refreshBtn: false,
+ dialogType: "drawer",
+ addBtnText: "新增日志",
+ height: '100',
+ column: [{
+ label: '服务时间',
+ prop: 'createTime',
+ type: 'date',
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ }, {
+ label: '服务发起人',
+ prop: 'fromName'
+ }, {
+ label: '服务对象',
+ prop: 'toName'
+ }, {
+ label: '服务主题',
+ prop: 'serveTheme'
+ }, {
+ label: '服务内容',
+ prop: 'serveContent'
+ }, {
+ label: '备注说明',
+ prop: 'bak1'
+ }]
+ }
+ }
},
created() {
this.initDept();
@@ -1031,6 +1112,91 @@ export default {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
+ async saveLog(row, index, done, loading) {
+ let params = {
+ ...row,
+ serveId: this.selectUserServeLog.serveId,
+ serveUserId: this.selectUserServeLog.serveUserId,
+ }
+ console.log(params)
+ 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: "操作成功!",
+ });
+ });
+ },
+ handleCloseLog() {
+ this.innerDrawerLog = false
+ },
+ logSizeChange(pageSize) {
+ this.logPage.pageSize = pageSize;
+ this.serveLog(this.selectUserServeLog)
+ },
+ logCurrentChange(currentPage) {
+ this.logPage.currentPage = currentPage;
+ this.serveLog(this.selectUserServeLog)
+ },
+ serveLog(row) {
+ console.log('服务日志', row)
+ this.selectUserServeLog = row
+ getMainServeUserLog({
+ idNumber: row.id,
+ current: this.logPage.currentPage,
+ size: this.logPage.pageSize
+ }).then(res => {
+ let _this = this;
+ const {records, current, size, total} = res.data.data
+ console.log(records, total)
+ _this.logDataSource = records
+ _this.innerDrawerLog = true
+ _this.logPage = {
+ pageSize: size,
+ currentPage: current,
+ total: total,
+ }
+ })
+ },
/*加载人才列表 */
onLoad(page, params = {}) {
const paramsd = {
diff --git a/src/views/tenant/main/talents/personnelserve/index.vue b/src/views/tenant/main/talents/personnelserve/index.vue
new file mode 100644
index 0000000..3fe762c
--- /dev/null
+++ b/src/views/tenant/main/talents/personnelserve/index.vue
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
+