duy 2 vuotta sitten
vanhempi
commit
8af7f79996
2 muutettua tiedostoa jossa 23 lisäystä ja 6 poistoa
  1. 4 4
      src/views/task/logs/components/logs-content.vue
  2. 19 2
      src/views/task/logs/index.vue

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

@@ -96,7 +96,7 @@ const props = defineProps({
     },
     taskList:{
         type:Array,
-        default:[],
+        default: () => ([]),
     },
 })
 
@@ -135,7 +135,7 @@ watch(() => [
     logData.value = data
     undefinedNum.value = num
     taskList.value = list
-console.log(data, 'data11111')
+
 }, { deep: true })
 
 //表格
@@ -182,8 +182,8 @@ const getTableData = async () => {
         })
         undefinedNum.value = arr.length
         if (ismyEdit.value) {
-            tableData.value = taskList.value
-            arr = taskList.value.filter((ele)=>{
+            tableData.value = getArrValue( taskList.value)
+            arr = tableData.value.filter((ele)=>{
                 if (ele?.isOverdue === 1) {
                     return ele
                 }

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

@@ -81,7 +81,7 @@
             </div>
             <div v-loading="logLoading" class="hac-logs-content-body">
                 <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" />
+                <HcLogsContent v-else :data="logDetail" :edit="false" :undefined-num="undefinedNum" :task-list="taskList" />
             </div>
         </div>
     </HcCard>
@@ -169,6 +169,7 @@ const resetClick = () => {
 
 //日志填报列表查询
 const userList = ref({})
+const todayId = ref('')
 const getLogList = async () => {
     const { error, code, data, msg } = await logsApi.getLogList(searchForm.value)
     //判断状态
@@ -182,6 +183,15 @@ const getLogList = async () => {
             }
         })
         getLogDetail()
+        //判断今天是否填写日志
+      let todayLog = getArrValue(res['今天'])
+      if (todayLog.length > 0) {
+        if (todayLog[0]?.isRead === 0) {
+            todayId.value = todayLog[0].id
+        } else {
+            todayId.value = ''
+        }
+      }
     } else {
         userList.value = {}
         userItemId.value = {}
@@ -259,7 +269,10 @@ const logForm = ref({
 //当前状态,false查看模式,true写日志模式
 const isEditState = ref(false)
 const editLogsClick = () => {
-    console.log('写日志')
+    if (todayId.value.length > 0) {
+        window.$message.warning('今日日志已提交,请先选择今天的日志,再进行修改')
+    } else {
+        console.log('写日志')
     isShowEdit.value = false
     logForm.value = {
     headPicture: '',
@@ -268,12 +281,16 @@ const editLogsClick = () => {
     riskWarning: '',
     workDesc: '',
     expenseReimbursementAmount: '',
+ 
+
 }
     const { real_name, avatar } = userInfo.value
     isEditState.value = true
     logForm.value.headPicture = avatar || avatarPng
     logForm.value.logTitle = real_name + '的日志'
     logForm.value.createTime = dayjs().format('YYYY-MM-DD')
+    }
+ 
 }
 //修改自己的日志
 const taskList = ref([])