日志修改

src/views/task/logs/components/logs-content.vue

@@ -43,7 +43,7 @@
                 提示：如果该任务已完成，则点击【变更已完成】进行提交部门领导审批
             </div>
             <div class="content">
-                <HcTable :is-index="false" :column="tableColumn" :datas="tableData">
+                <HcTable :is-index="false" :column="tableColumn" :datas="tableData" :row-style="tableRowStyle">
                     <template #action="{ row }">
                         <!-- <el-button size="small" type="primary" @click="statusClick(row)">{{row.statusName === '未完成' ? '变更已完成': '已完成' }}</el-button> -->
                         <!-- <el-button size="small" type="primary" :disabled="row.status === 1 || row.status === 2" @click="statusClick(row)"> -->
@@ -94,6 +94,10 @@ const props = defineProps({
         type: Number,
         default: 0,
     },
+    taskList:{
+        type:Array,
+        default:[],
+    },
 })
 
 //变量
@@ -101,6 +105,7 @@ const isEditState = ref(props.edit)
 const logData = ref(props.data)
 const ismyEdit = ref(props.isShowmyEdit)
 const undefinedNum = ref(props.undefinedNum)//未完成数量
+const taskList = ref(props.taskList)//修改日志任务
 
 //渲染完成
 onMounted(() => {
@@ -124,12 +129,13 @@ watch(() => [
     props.data,
     props.isShowmyEdit,
     props.undefinedNum,
+    props.taskList,
 
-], ([data, edit, num]) => {
+], ([data, edit, num, list]) => {
     logData.value = data
     undefinedNum.value = num
-    console.log(edit, 'edit')
-    console.log(ismyEdit.value, 'ismyEdit')
+    taskList.value = list
+console.log(data, 'data11111')
 }, { deep: true })
 
 //表格
@@ -158,7 +164,8 @@ const tableColumn = [
 ]
 const tableData = ref([])
 const getTableData = async () => {
-  
+  console.log(ismyEdit.value, '是否修改自己的日志')
+
         const { error, code, data, msg } = await logsApi.getLogTaskList()
         //判断状态
         if (!error && code === 200) {
@@ -174,6 +181,15 @@ const getTableData = async () => {
             }
         })
         undefinedNum.value = arr.length
+        if (ismyEdit.value) {
+            tableData.value = taskList.value
+            arr = taskList.value.filter((ele)=>{
+                if (ele?.isOverdue === 1) {
+                    return ele
+                }
+            })
+            undefinedNum.value = arr.length
+        }
     
 
 

src/views/task/logs/index.vue

@@ -46,7 +46,7 @@
                 <!-- 修改自己的日志 -->
                 <el-button v-else size="large" type="primary" @click="editmyLog">
                     <HcIcon name="add" />
-                    <span>写日志</span>
+                    <span>修改日志</span>
                 </el-button>
             </template>
           
@@ -80,7 +80,7 @@
                 </HcCardItem>
             </div>
             <div v-loading="logLoading" class="hac-logs-content-body">
-                <HcLogsContent v-if="isEditState" ref="logsRef" :data="logForm" :is-showmy-edit="isShowEdit" />
+                <HcLogsContent v-if="isEditState" ref="logsRef" :data="logForm" :is-showmy-edit="isShowEdit" :task-list="taskList" />
                 <HcLogsContent v-else :data="logDetail" :edit="false" :undefined-num="undefinedNum" />
             </div>
         </div>
@@ -260,6 +260,7 @@ const logForm = ref({
 const isEditState = ref(false)
 const editLogsClick = () => {
     console.log('写日志')
+    isShowEdit.value = false
     logForm.value = {
     headPicture: '',
     logTitle: '',
@@ -275,11 +276,13 @@ const editLogsClick = () => {
     logForm.value.createTime = dayjs().format('YYYY-MM-DD')
 }
 //修改自己的日志
-
+const taskList = ref([])
 const editmyLog = ()=>{
     console.log('修改自己的')
     isEditState.value = true
+    isShowEdit.value = true
     logForm.value = logDetail.value
+    taskList.value = logDetail.value.taskList
   
 }
 //返回到查看日志界面