Explorar o código

修改日志逾期

duy %!s(int64=2) %!d(string=hai) anos
pai
achega
1bab88ab71

+ 3 - 0
src/views/project/list/list-info.vue

@@ -332,6 +332,9 @@ const updateProjectInfo=async()=>{
     saveLoading.value=false;
     if (!error && code === 200) {
        window.$message.success(msg)
+       router.push({
+            name: 'project',
+        })
     } 
 
 }

+ 11 - 5
src/views/task/logs/components/logs-content.vue

@@ -16,7 +16,7 @@
 
         <div class="hc-logs-content-item" v-if="!isEditState">
             <div class="title">今日工作内容</div>
-            <div class="warning-tip">警告:有{{undefinedNum}}条任务已超期逾期未完成,请及时完成!</div>
+            <div class="warning-tip" v-if="undefinedNum>0">警告:有{{undefinedNum}}条任务已超期逾期未完成,请及时完成!</div>
             <div class="content">
                 <HcTable :isIndex="false" :column="taskColumn" :datas="logData?.taskList ?? []" :row-style="tableRowStyle"/>
             </div>
@@ -49,7 +49,7 @@
 </template>
 
 <script setup>
-import {ref, watch, onMounted} from "vue";
+import {ref, watch, onActivated, onMounted} from "vue";
 import logsApi from "~api/task/logs";
 import {deepClone, getArrValue} from "js-fast-way"
 import avatarPng from '~src/assets/images/avatar.png';
@@ -67,6 +67,10 @@ const props = defineProps({
     isShowmyEdit:{
         type: Boolean,
         default: false
+    },
+    undefinedNum:{
+        type: Number,
+        default: 0
     }
 })
 
@@ -74,7 +78,7 @@ const props = defineProps({
 const isEditState = ref(props.edit);
 const logData = ref(props.data);
 const ismyEdit=ref(props.isShowmyEdit)
-const undefinedNum=ref(null)//未完成数量
+const undefinedNum=ref(props.undefinedNum)//未完成数量
 
 //渲染完成
 onMounted(() => {
@@ -96,10 +100,12 @@ watch(() => [
 //深度监听
 watch(() => [
     props.data,
-    props.isShowmyEdit
+    props.isShowmyEdit,
+    props.undefinedNum
     
-], ([data,edit]) => {
+], ([data,edit,num]) => {
     logData.value = data
+    undefinedNum.value=num
     console.log(edit,'edit');
     console.log(ismyEdit.value,'ismyEdit');
 }, {deep: true})

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

@@ -74,8 +74,8 @@
                 </HcCardItem>
             </div>
             <div class="hac-logs-content-body" v-loading="logLoading">
-                <HcLogsContent :data="logForm" ref="logsRef" v-if="isEditState" :isShowmyEdit="isShowEdit"/>
-                <HcLogsContent :data="logDetail" :edit="false" v-else/>
+                <HcLogsContent :data="logForm" ref="logsRef" v-if="isEditState" :isShowmyEdit="isShowEdit" />
+                <HcLogsContent :data="logDetail" :edit="false" v-else :undefinedNum="undefinedNum"/>
             </div>
         </div>
     </HcCard>
@@ -174,6 +174,7 @@ const userItemId = ref({})
 const userItemClick = (item) => {
     if (!isEditState.value) {
         userItemId.value = item
+        isShowEdit.value=false
         getLogDetail()
     } else {
         window.$message?.warning('请先提交日志或退出填写日志状态')
@@ -182,6 +183,7 @@ const userItemClick = (item) => {
 
 //日志填报详情
 const logDetail = ref({})
+const undefinedNum=ref(null)
 const getLogDetail = async () => {
     const item = userItemId.value
     if(item.id){
@@ -196,6 +198,7 @@ const getLogDetail = async () => {
             console.log(logTitle,'logTitle');
             let index = logTitle.lastIndexOf("的");
             let str = logTitle.substring(0,index);
+            //判断是否编辑自己的日志
             if(real_name===str){
                 isShowEdit.value=true
             }
@@ -203,6 +206,16 @@ const getLogDetail = async () => {
             logDetail.value = {}
             window.$message?.error(msg)
         }
+        //计算未完成数量
+        console.log(logDetail.value.taskList,'taskList');
+        let arr=[]
+        arr=logDetail.value.taskList.filter((ele)=>{
+            if(ele?.isOverdue==1){
+                return ele
+            }
+        })
+        undefinedNum.value=arr.length
+       console.log( undefinedNum.value,' undefinedNum.value');
     }
 
 }
@@ -220,6 +233,7 @@ const logForm = ref({
 //当前状态,false查看模式,true写日志模式
 const isEditState = ref(false)
 const editLogsClick = () => {
+    console.log('写日志');
     logForm.value={
     headPicture: '',
     logTitle: '',
@@ -237,6 +251,7 @@ const editLogsClick = () => {
 //修改自己的日志
 
 const editmyLog=()=>{
+    console.log('修改自己的');
     isEditState.value = true
     logForm.value=logDetail.value
   
@@ -244,6 +259,7 @@ const editmyLog=()=>{
 //返回到查看日志界面
 const gobackLog=()=>{
     isEditState.value = false
+    isShowEdit.value=false
 }
 const logsRef = ref(null)
 const logLoading = ref(false)