From 6f99dd70f9cc1c21e1960fa11968b04b662d07a3 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Wed, 29 May 2024 18:03:21 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E6=9C=8D=E5=8A=A1=E5=AF=B9=E8=B1=A1=20?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/cuser/serve/index.vue         |  4 +++-
 src/views/tenant/main/serve/index.vue          | 15 +++++++++++----
 src/views/tenant/main/talents/latent/index.vue |  4 +++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/manage/cuser/serve/index.vue b/src/views/manage/cuser/serve/index.vue
index f72470e..2fe2122 100644
--- a/src/views/manage/cuser/serve/index.vue
+++ b/src/views/manage/cuser/serve/index.vue
@@ -509,7 +509,7 @@ export default {
   components: {addGroups, transferGroups, Resume, ied, missionView, workView, Tinymce, PushService, TextTooltip},
   watch: {},
   computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(["permission", "userInfo"]),
     permissionList() {
       return {
         addBtn: this.vaildData(this.permission.tenant_main_serve_index_add, false),
@@ -982,6 +982,8 @@ export default {
         serveUserId: this.selectUserServeLog.serveUserId,
         talentsId: this.selectUserServeLog.id,
         idNumber: this.selectUserServeLog.idNumber,
+        toName: this.selectUserServeLog.name,
+        fromName: this.userInfo.real_name
       }
       let resData = await addServeLog(params)
       done()
diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue
index c926a1b..9725549 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -512,7 +512,7 @@ export default {
   components: {addGroups, transferGroups, Resume, ied, missionView, workView, Tinymce, PushService, TextTooltip},
   watch: {},
   computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(["permission", "userInfo"]),
     permissionList() {
       return {
         addBtn: this.vaildData(this.permission.tenant_main_serve_index_add, false),
@@ -875,18 +875,23 @@ export default {
           valueFormat: "yyyy-MM-dd HH:mm:ss",
         }, {
           label: '服务发起人',
-          prop: 'fromName'
+          prop: 'fromName',
+          display: false,
         }, {
           label: '服务对象',
-          prop: 'toName'
+          prop: 'toName',
+          display: false,
         }, {
           label: '服务主题',
           prop: 'serveTheme'
         }, {
           label: '服务内容',
+          span: 24,
           prop: 'serveContent'
         }, {
           label: '备注说明',
+          span: 24,
+          type: 'textarea',
           prop: 'bak1'
         }]
       }
@@ -984,6 +989,8 @@ export default {
         serveUserId: this.selectUserServeLog.serveUserId,
         talentsId: this.selectUserServeLog.id,
         idNumber: this.selectUserServeLog.idNumber,
+        toName: this.selectUserServeLog.name,
+        fromName: this.userInfo.real_name
       }
       let resData = await addServeLog(params)
       done()
@@ -1618,7 +1625,7 @@ export default {
     },
     // 服务日志
     serveLog(row) {
-      console.log('服务日志')
+      console.log('服务日志', row)
       this.selectUserServeLog = row
       getMatchServeList({
         id: row.id,
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index 315b5d9..a81c128 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/index.vue
@@ -247,7 +247,7 @@ export default {
   components: {addGroups, transferGroups, Resume, ied, TextTooltip},
   watch: {},
   computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(["permission", "userInfo"]),
     permissionList() {
       return {
         addBtn: this.vaildData(this.permission.tenant_main_talents_latent_index_add, false),
@@ -1119,6 +1119,8 @@ export default {
         serveUserId: this.selectUserServeLog.serveUserId,
         talentsId: this.selectUserServeLog.id,
         idNumber: this.selectUserServeLog.idNumber,
+        toName: this.selectUserServeLog.name,
+        fromName: this.userInfo.real_name
       }
       console.log(params)
       let resData = await addServeLog(params)