Browse Source

日志修改

duy 2 years ago
parent
commit
2e0ded7fed
1 changed files with 17 additions and 2 deletions
  1. 17 2
      src/views/task/logs/index.vue

+ 17 - 2
src/views/task/logs/index.vue

@@ -62,8 +62,8 @@
                             <div class="user-item" :class="userItemId.id === items.id?'cur':''" @click="userItemClick(items)">
                                 <img class="avatar" :src="items?.headPicture || avatarPng" alt=""/>
                                 <div class="name">{{items?.logTitle}}</div>
-                                <div class="state">
-                                    <span class="text-xl text-red mr-2">
+                                <div class="state" v-if="items?.isEdit === 0">
+                                    <span class="text-xl text-red mr-2" v-if="items?.isRead === 0">
                                         <HcIcon name="alarm-warning"/>
                                     </span>
                                     <span>{{items?.isRead === 0 ?'未读': '已读'}}</span>
@@ -99,6 +99,7 @@ onActivated(() => {
     isEditState.value = false
     getLogList()
     getDepartmentDict()
+    getUserDict()
    
 
 })
@@ -130,6 +131,18 @@ const getDepartmentuserDict=async(id)=>{
 
     }
 }
+//获取所有员工
+
+const getUserDict=async()=>{
+    const {error, code, data} = await getuserList({tenantId:useAppState.tenantId})
+    if (!error && code === 200) {
+        departmentPeople.value = getArrValue(data)
+
+    } else {
+        departmentPeople.value = []
+
+    }
+}
 //搜索表单
 const searchForm = ref({orgDept: null, userId: null, startTime: null, endTime: null})
 
@@ -145,6 +158,7 @@ const searchClick = () => {
 //重置
 const resetClick = () => {
     searchForm.value = {}
+    getLogList()
 }
 
 //日志填报列表查询
@@ -175,6 +189,7 @@ const userItemClick = (item) => {
     if (!isEditState.value) {
         userItemId.value = item
         isShowEdit.value=false
+        item.isRead=1
         getLogDetail()
     } else {
         window.$message?.warning('请先提交日志或退出填写日志状态')