ソースを参照

Merge remote-tracking branch 'origin/master'

yurk 2 年 前
コミット
3a6eb3c1fa

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -834,7 +834,7 @@ export default {
           label: "停用",
         },
       ],
-      status: "",
+      status: "1",
       role: "",
       jDarr: [],
       handleSelectionZzjgDate: [],

+ 3 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -3499,15 +3499,16 @@
                         
                         let monthdate = new Date(sessionStorage.msg)
                         this.curDate = (monthdate.getMonth() + 1) + '月' + monthdate.getDate() + '日'
-                        console.log('choseday',sessionStorage.msg,this.choseDay,monthdate.getDate());
+                        
                     }else{
                         if(e && sessionStorage.msg){
                         }else{
                             sessionStorage.msg = this.date + '-01'
                         }
-                        this.choseDay = day - 1
                         let monthdate = new Date(sessionStorage.msg)
+                        this.choseDay = monthdate.getDate() - 1
                         this.curDate = (monthdate.getMonth() + 1) + '月' + monthdate.getDate() + '日'
+                        console.log('choseday',sessionStorage.msg,this.choseDay,monthdate.getDate());
                     }
                 }else{
                     this.choseDay = parseInt(sessionStorage.msg.split('-')[2]) - 1