Sfoglia il codice sorgente

要事日记 查看

zxr 3 anni fa
parent
commit
f5223f34d4

+ 8 - 5
src/components/look_word/bdgldiary.vue

@@ -55,7 +55,7 @@
             {{ message.blogDate | dataFormat }}
           </td>
           <td colspan="2" style="border: none; font-family: 'songti'">
-            <span style="font-family: 'fangsong'">{{ message.weekworkRegisters[0].week }}</span>
+            <span style="font-family: 'fangsong'">{{ message.week }}</span>
           </td>
           <td colspan="6" style="border: none; font-family: 'songti'">
             天气:<span style="font-family: 'fangsong'">{{
@@ -375,7 +375,7 @@
             <p align="center">{{ item.peopleName }}</p>
           </td>
           <td class="JR_right">
-            <p align="center">{{ item.examineDate | dataFormat }}</p>
+            <p align="center">{{ item.examineDate }}</p>
           </td>
           <td class="JR_right">
             <p align="center">{{ item.foremanName }}</p>
@@ -557,10 +557,10 @@
             <p align="center">{{ item1.relation }}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.comeDate | dataFormat }}</p>
+            <p align="center">{{ item1.comeDate}}</p>
           </td>
           <td class="JR_right" height="30">
-            <p align="center">{{ item1.leaveDate | dataFormat }}</p>
+            <p align="center">{{ item1.leaveDate }}</p>
           </td>
         </tr>
 
@@ -846,9 +846,12 @@ export default {
     xunlian(){
       
         console.log(this.message)
-      if (this.message.weekworkRegisters.length > 4){
+        if(this.message.weekworkRegisters!= null){
+           if (this.message.weekworkRegisters.length > 4){
         this.number += (this.message.weekworkRegisters.length - 4)
       }
+        }
+     
     },
     /*
       获取当前星期几

+ 18 - 0
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -1506,7 +1506,25 @@ export default {
       this.statusShen = false;
       const id = row.id || this.ids;
       getBdgldiary(id).then(response => {
+        let week=['']
+        if(new Date(response.data.blogDate).getDay()==0){
+          response.data.week='星期日'
+        }else if(new Date(response.data.blogDate).getDay()==1){
+          response.data.week='星期一'
+        }else if(new Date(response.data.blogDate).getDay()==2){
+          response.data.week='星期二'
+        }else if(new Date(response.data.blogDate).getDay()==3){
+          response.data.week='星期三'
+        }else if(new Date(response.data.blogDate).getDay()==4){
+          response.data.week='星期四'
+        }else if(new Date(response.data.blogDate).getDay()==5){
+          response.data.week='星期五'
+        }else if(new Date(response.data.blogDate).getDay()==6){
+          response.data.week='星期六'
+        }
+        
         this.wordInfo = response.data;
+      //  response.data.blogDate
         this.title = "查看要事日记";
         this.menuRoleVisible = true;
       });