Jelajahi Sumber

写日志修改

duy 2 tahun lalu
induk
melakukan
8a42a4dd9b

+ 1 - 0
src/views/program/project/form.vue

@@ -430,6 +430,7 @@ const tabChange = ({ key }) => {
     } else if (key === 'construction') {
         const res = getArrValue(constructionData.value[radioType.value]?.length > 0 ? constructionData.value : originTableData.value)
         tableData.value = res
+        console.log(res, 'res')
         detailData.value.constructUnit = res
     } else if (key === 'bulid') {
         const res = getArrValue(buildData.value[radioType.value]?.length > 0 ? buildData.value : originTableData.value)

+ 14 - 6
src/views/task/logs/components/logs-content.vue

@@ -36,6 +36,9 @@
             <div class="title">
                 今日工作范围
             </div>
+            <div v-if="undefinedNum > 0" class="warning-tip">
+                警告:有{{ undefinedNum }}条任务已超期逾期未完成,请及时完成!
+            </div>
             <div class="extra-tip">
                 提示:如果该任务已完成,则点击【变更已完成】进行提交部门领导审批
             </div>
@@ -43,7 +46,7 @@
                 <HcTable :is-index="false" :column="tableColumn" :datas="tableData">
                     <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)">-->
+                        <!-- <el-button size="small" type="primary" :disabled="row.status === 1 || row.status === 2" @click="statusClick(row)"> -->
                         <el-button size="small" type="primary" :disabled="row.statusName === '已完成' || row.statusName === '待审批' || row.statusName === '已审批' || row.status === 1 || row.status === 2" @click="statusClick(row)">
                             变更已完成
                         </el-button>
@@ -70,7 +73,7 @@
 <script setup>
 import { onMounted, ref, watch } from 'vue'
 import logsApi from '~api/task/logs'
-import { deepClone, getArrValue } from 'js-fast-way'
+import { deepClone, getArrValue, isArray } from 'js-fast-way'
 import avatarPng from '~src/assets/images/avatar.png'
 
 //参数
@@ -155,7 +158,7 @@ const tableColumn = [
 ]
 const tableData = ref([])
 const getTableData = async () => {
-    if (!ismyEdit.value) {
+  
         const { error, code, data, msg } = await logsApi.getLogTaskList()
         //判断状态
         if (!error && code === 200) {
@@ -164,9 +167,14 @@ const getTableData = async () => {
             tableData.value = []
             window.$message?.error(msg)
         }
-    } else {
-        tableData.value = logData.value.taskList
-    }
+        let arr = []
+        arr = tableData.value.filter((ele)=>{
+            if (ele?.isOverdue === 1) {
+                return ele
+            }
+        })
+        undefinedNum.value = arr.length
+    
 
 
 }