Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -678,10 +678,20 @@ export default {
             });
         });
     },
+    // 判断日期是否补零了
+    buling(das) {
+      var rqi = das.split('-')
+      rqi[1].length <= 1 ? rqi[1] = '0' + rqi[1] : rqi[1] = rqi[1]
+      rqi[2].length <= 1 ? rqi[2] = '0' + rqi[2] : rqi[2] = rqi[2]
+      var zong = rqi[0] + '-' + rqi[1] + '-' + rqi[2]
+      return zong
+    },
     submits(){
       console.log(this.addForm)
       // return
         this.$refs.addForm.validate(valid => {
+          this.addForm.endDate = this.buling(this.addForm.endDate)
+          this.addForm.startDate = this.buling(this.addForm.startDate)
           if (valid) {
             this.http.post('/leave-sheet/add', this.addForm,
             res => {

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -817,6 +817,7 @@
                                 });
                                 this.dialogVisible = false;
                                 this.getUser();
+                                this.getUsers()
                             } else {
                                 this.$message({
                                     message: res.msg,
@@ -960,6 +961,7 @@
                                 this.dialogVisible1 = false;
                                 //重新读取列表
                                 this.getUser();
+                                this.getUsers()
                             } else {
                                 this.$message({
                                     message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1809,7 +1809,7 @@
             getDepartment() {
                 let day = (this.choseDay+1) > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
                 var param = {date:this.date + day};
-                if (this.user.manageDeptId != 0) {
+                if (this.user.manageDeptId != 0 && this.user.role < 2) {
                     param.manageDeptId = this.user.manageDeptId;
                 }
                 this.http.post("/report/getMembList", param,