sc

4 weeks ago · 8a2d976552
parent f1d2449599
commit 8a2d976552
5 changed files with 137 additions and 62 deletions
--- a/src/api/okr/comment.js
+++ b/src/api/okr/comment.js
@ -0,0 +1,29 @@
+import request from '@/config/axios'
+
+// 创建
+export const createComment = (data) => {
+  return request.post({
+    url: '/admin-api/okr/comments/create',
+    data,
+    isSubmitForm: true,
+    headers: { 'instance-id': 1016 }
+  })
+}
+
+// 分页
+export const getCommentPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/comments/page',
+    params,
+    headers: { 'instance-id': 1016 }
+  })
+}
+
+// 获取评论类型
+export const getCommentTypeOptions = () => {
+  return request.get({
+    url: '/admin-api/okr/dict-data/get-by-type',
+    params: { dictType: 'comment_type' }
+    // headers: { 'instance-id': 1016 }
+  })
+}
--- a/src/api/okr/okr.js
+++ b/src/api/okr/okr.js
@ -5,8 +5,8 @@ export const createOkrNode = (data) => {
  return request.post({
    url: '/admin-api/okr/node/add',
    data,
-    isSubmitForm: true,
-    headers: { 'instance-id': 1016 }
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -14,8 +14,8 @@ export const createOkrNode = (data) => {
 export const updateOkrNode = (data) => {
  return request.put({
    url: '/admin-api/okr/node/update',
-    data,
-    headers: { 'instance-id': 1016 }
+    data
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -23,8 +23,8 @@ export const updateOkrNode = (data) => {
 export const getOkrNodeDetail = (nodeId) => {
  return request.get({
    url: '/admin-api/okr/node/get',
-    params: { nodeId },
-    headers: { 'instance-id': 1016 }
+    params: { nodeId }
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -32,8 +32,8 @@ export const getOkrNodeDetail = (nodeId) => {
 export const getMyNodeTree = (params) => {
  return request.get({
    url: '/admin-api/okr/node/my/list',
-    params,
-    headers: { 'instance-id': 1016 }
+    params
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -41,8 +41,8 @@ export const getMyNodeTree = (params) => {
 export const getMyOkrPage = (params) => {
  return request.get({
    url: '/admin-api/okr/node/my/object/list',
-    params,
-    headers: { 'instance-id': 1016 }
+    params
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -50,8 +50,8 @@ export const getMyOkrPage = (params) => {
 export const getAllNodeTree = (params) => {
  return request.get({
    url: '/admin-api/okr/node/all/list',
-    params,
-    headers: { 'instance-id': 1016 }
+    params
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -59,8 +59,8 @@ export const getAllNodeTree = (params) => {
 export const getAllOkrPage = (params) => {
  return request.get({
    url: '/admin-api/okr/node/all/object/list',
-    params,
-    headers: { 'instance-id': 1016 }
+    params
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -68,8 +68,8 @@ export const getAllOkrPage = (params) => {
 export const getOkrNodeHistory = (nodeId) => {
  return request.get({
    url: '/admin-api/okr/record/list',
-    params: { nodeId },
-    headers: { 'instance-id': 1016 }
+    params: { nodeId }
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -77,8 +77,8 @@ export const getOkrNodeHistory = (nodeId) => {
 export const getDefaultOkrOptions = () => {
  return request.get({
    url: '/admin-api/okr/dict-data/get-by-type',
-    params: { dictType: 'key_result_source' },
-    headers: { 'instance-id': 1016 }
+    params: { dictType: 'key_result_source' }
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -86,7 +86,7 @@ export const getDefaultOkrOptions = () => {
 export const updateOkrProgress = (data) => {
  return request.put({
    url: '/admin-api/okr/node/progress/update',
-    data,
-    headers: { 'instance-id': 1016 }
+    data
+    // headers: { 'instance-id': 1016 }
  })
 }
--- a/src/api/okr/wait.js
+++ b/src/api/okr/wait.js
@ -5,8 +5,8 @@ export const createWait = (data) => {
  return request.post({
    url: '/admin-api/okr/agent-work/create',
    data,
-    isSubmitForm: true,
-    headers: { 'instance-id': 1016 }
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -14,8 +14,8 @@ export const createWait = (data) => {
 export const updateWait = (data) => {
  return request.put({
    url: '/admin-api/okr/agent-work/update',
-    data,
-    headers: { 'instance-id': 1016 }
+    data
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -23,8 +23,8 @@ export const updateWait = (data) => {
 export const getWaitPage = (params) => {
  return request.get({
    url: '/admin-api/okr/agent-work/page',
-    params,
-    headers: { 'instance-id': 1016 }
+    params
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -32,8 +32,8 @@ export const getWaitPage = (params) => {
 export const getWaitDetail = (id) => {
  return request.get({
    url: '/admin-api/okr/agent-work/get',
-    params: { id },
-    headers: { 'instance-id': 1016 }
+    params: { id }
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -41,8 +41,8 @@ export const getWaitDetail = (id) => {
 export const deleteWait = (id) => {
  return request.delete({
    url: '/admin-api/okr/agent-work/delete',
-    params: { id },
-    headers: { 'instance-id': 1016 }
+    params: { id }
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -50,8 +50,8 @@ export const deleteWait = (id) => {
 export const urgeWait = (workId) => {
  return request.get({
    url: '/admin-api/okr/agent-work/urge',
-    params: { workId },
-    headers: { 'instance-id': 1016 }
+    params: { workId }
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -60,8 +60,8 @@ export const followWait = (data) => {
  return request.post({
    url: '/admin-api/okr/agent-work-follow/create',
    data,
-    isSubmitForm: true,
-    headers: { 'instance-id': 1016 }
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
  })
 }

@ -69,15 +69,15 @@ export const followWait = (data) => {
 export const getFollowWaitPage = (params) => {
  return request.get({
    url: '/admin-api/okr/agent-work-follow/list',
-    params,
-    headers: { 'instance-id': 1016 }
+    params
+    // headers: { 'instance-id': 1016 }
  })
 }

 export const getWaitCount = (params) => {
  return request.get({
    url: '/admin-api/okr/agent-work/getAgentWorkNum',
-    params,
-    headers: { 'instance-id': 1016 }
+    params
+    // headers: { 'instance-id': 1016 }
  })
 }
--- a/src/views/OKR/Management/Components/DialogOkr.vue
+++ b/src/views/OKR/Management/Components/DialogOkr.vue
@ -134,11 +134,12 @@
                    style="width: 120px"
                    @change="getCommentTemplate"
                  >
-                    <el-option label="总结" :value="1" />
-                    <el-option label="日报" :value="2" />
-                    <el-option label="周报" :value="3" />
-                    <el-option label="月报" :value="4" />
-                    <!-- <el-option label="评论" :value="5" disabled /> -->
+                    <el-option
+                      v-for="it in commentTypeOptions"
+                      :label="it.label"
+                      :value="it.id"
+                      :key="it.id"
+                    />
                  </el-select>

                  <div v-if="addNewComment">
@ -158,7 +159,12 @@
                    :toolbarConfig="toolbarConfig"
                  />
                </div>
-                <div v-for="index in 12" :key="index" class="border-b-1" style="padding: 10px 5px">
+                <div
+                  v-for="it in commentList"
+                  :key="it.commentId"
+                  class="border-b-1"
+                  style="padding: 10px 5px"
+                >
                  <div
                    class="flex items-center justify-between overflow-hidden text-16px"
                    style="line-height: 30px"
@ -173,13 +179,13 @@
                        "
                        fit="fill"
                      >
-                        <span class="text-12px">门庆</span>
+                        <span class="text-12px">{{ it.creatorName }}</span>
                      </el-avatar>
-                      <div class="ml-10px text-16px">西门庆</div>
+                      <div class="ml-10px text-16px">{{ it.creatorName }}</div>
                    </div>
-                    <div class="ml-10px text-13px text-gray-400">01-01 12:15</div>
+                    <div class="ml-10px text-13px text-gray-400">{{ it.createTime }}</div>
                  </div>
-                  <div class="ml-10px" v-dompurify-html="commentListVal"></div>
+                  <div class="ml-10px" v-dompurify-html="it.content"></div>
                  <div
                    class="ml-10px mt-10px flex items-center text-12px"
                    style="line-height: 20px; color: #aaa"
@ -188,13 +194,13 @@
                      <el-button link @click="good(index)">
                        <Icon icon="fa:thumbs-o-up" :size="16" />
                      </el-button>
-                      <span class="ml-5px">6</span>
+                      <span class="ml-5px">{{ it.likeCount }}</span>
                    </div>
                    <div class="flex items-center mr-50px">
                      <el-button link @click="showComment(index)">
                        <Icon icon="ep:chat-dot-square" :size="16" />
                      </el-button>
-                      <span class="ml-5px">1</span>
+                      <span class="ml-5px">{{ it.commentCount }}</span>
                    </div>
                  </div>
                  <!-- 评论 -->
@ -271,6 +277,7 @@ import { formatDate } from '@/utils/formatTime'
 import OkrTable from './OkrTable.vue'

 import { getOkrNodeDetail, getOkrNodeHistory } from '@/api/okr/okr'
+import { getCommentTypeOptions, createComment, getCommentPage } from '@/api/okr/comment'

 const emit = defineEmits(['edit'])

@ -302,12 +309,14 @@ const okrTableRef = ref(null)
 const nodeInfo = ref({})

 const nodeRecords = ref([])
+const commentTypeOptions = ref([])

 async function open(curNode) {
  canEdit.value = curNode.canEdit
+  nodeInfo.value.nodeId = curNode.nodeId
+  // 获取数据详情
  searchInfo(curNode)
  show.value = true
-  // 获取数据详情
 }

 function searchInfo(curNode) {
@ -330,6 +339,10 @@ function searchInfo(curNode) {
    getOkrNodeHistory(curNode.nodeId).then((resp) => {
      nodeRecords.value = resp
    })
+    getCommentTypeOptions().then((resp) => {
+      commentTypeOptions.value = resp
+    })
+    searchCommentList()
  } finally {
  }
 }
@ -354,28 +367,60 @@ function handleChildItem() {
 const addNewComment = ref(false)
 const form = ref({
  commentValue: '',
-  commentType: 1
+  commentType: undefined
 })
 function handleInsertComment() {
  addNewComment.value = true
-  form.value = {
-    commentValue: '',
-    commentType: 1
+  const defaultComment = commentTypeOptions.value[0]
+  if (defaultComment) {
+    form.value = {
+      commentType: defaultComment.id,
+      mentionedUserIdList: []
+    }
  }
  getCommentTemplate()
 }

 function getCommentTemplate() {
-  form.value.commentValue = `<h2 style=\"text-align: start;\">一、工作概况</h2><p> &nbsp; &nbsp;</p><h2 style=\"text-align: start;\">二、数据统计</h2><ol><li>呼出电话数：</li><li>有效沟通数：</li><li>销售成果</li></ol><h2 style=\"text-align: start;\">三、问题与改进方案</h2><p><br></p>`
+  if (form.value.commentType) {
+    form.value.commentValue = commentTypeOptions.value.find(
+      (item) => item.id == form.value.commentType
+    ).remark
+  } else {
+    form.value.commentValue = `<h2 style=\"text-align: start;\">一、工作概况</h2><p> &nbsp; &nbsp;</p><h2 style=\"text-align: start;\">二、数据统计</h2><ol><li>呼出电话数：</li><li>有效沟通数：</li><li>销售成果</li></ol><h2 style=\"text-align: start;\">三、问题与改进方案</h2><p><br></p>`
+  }
 }

 function handleSaveComment() {
  addNewComment.value = false
+  try {
+    const data = {
+      businessType: 1,
+      businessId: nodeInfo.value.nodeId,
+      contentType: 1,
+      content: form.value.commentValue,
+      mentionedUserIdList: form.value.mentionedUserIdList
+    }
+    createComment(data).then(() => {
+      message.success('评论成功')
+      searchCommentList()
+    })
+  } catch (error) {
+    message.error('评论失败')
+  }
 }
+const commentList = ref([])

-const commentListVal = ref(
-  `<h2 style=\"text-align: start;\">一、工作概况</h2><p> &nbsp; 刷牙洗脸吃饭穿鞋出门开车上班捣台球&nbsp;</p><h2 style=\"text-align: start;\">二、数据统计</h2><ol><li>呼出电话数：666</li><li>有效沟通数：123</li><li>销售成果：今日成交20，本月成交120，距离目标还差888</li></ol><h2 style=\"text-align: start;\">三、问题与改进方案</h2><p>无<br></p>`
-)
+function searchCommentList() {
+  getCommentPage({
+    businessType: 1,
+    businessId: nodeInfo.value.nodeId,
+    pageNum: 1,
+    pageSize: 100
+  }).then((resp) => {
+    commentList.value = resp.list
+  })
+}

 function good(index) {
  console.log(index)
--- a/src/views/OKR/Management/Components/OkrTable.vue
+++ b/src/views/OKR/Management/Components/OkrTable.vue
@ -41,8 +41,8 @@
                v-model="row.currentValue"
                size="small"
              >
-                <el-radio :value="true">是</el-radio>
-                <el-radio :value="false">否</el-radio>
+                <el-radio :value="1">是</el-radio>
+                <el-radio :value="0">否</el-radio>
              </el-radio-group>
            </div>
          </template>
@ -99,7 +99,8 @@ function prepareData(list) {
          executorName: child.executorName,
          type: '关键成果',
          resultType: child.resultType,
-          targetValue: child.targetValue
+          targetValue: child.targetValue,
+          currentValue: Number(child.currentValue)
        }
        helpList.value.push(kr)
        return kr