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

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -3952,7 +3952,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全公司工时");
             //获取部门的所有子部门
             List<Department> departments = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
-            List<Integer> branchDepartment = departments.stream().map((d) -> d.getDepartmentId()).collect(Collectors.toList());
+            List<Integer> branchDepartment = null;
             if(departmentId != null){
                 branchDepartment = departmentService.getBranchDepartment(departmentId,departments);
             }

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

@@ -1811,7 +1811,6 @@ export default {
       return zong
     },
     submits(){
-      // console.log(this.addForm)
       // return
         this.$refs.addForm.validate(valid => {
           this.addForm.endDate = this.buling(this.addForm.endDate)
@@ -1907,12 +1906,37 @@ export default {
     // 计算日期
     datas() {
         // this.addForm.timeDays = this.DateDiff(this.addForm.startDate, this.addForm.endDate)
+
         if(this.addForm.startDate > this.addForm.endDate) {
           this.addForm.endDate = this.addForm.startDate
         }
         this.addForm.timeDays = this.countWorkDay(this.addForm.startDate, this.addForm.endDate)
         this.timeChoose = this.addForm.timeDays
         this.addForm.timeHours = this.addForm.timeDays * 8
+
+        // 调用接口获取请假天数
+        let startDateData = this.buling(this.addForm.startDate)
+        let endDateData = this.buling(this.addForm.endDate)
+        this.http.post('/leave-sheet/leaveDays', {
+          startDate: startDateData,
+          endDate: endDateData
+        },
+          res => {
+              if (res.code == "ok") {
+                  this.addForm.timeDays = res.data
+              } else {
+                  this.$message({
+                    message: res.msg,
+                    type: "error"
+                  });
+              }
+          },
+          error => {
+              this.$message({
+                  message: error,
+                  type: "error"
+              });
+          });
     },
     datasss() {
       // console.log(123)

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

@@ -102,6 +102,13 @@
                     </el-table-column>
                     <el-table-column prop="stagesName" :label="$t('taskstage')" sortable width="180" @mouseover="mouseOver">
                     </el-table-column>
+                    <el-table-column prop="taskLevel" label="优先级" sortable width="180">
+                        <template slot-scope="scope">
+                            <div>
+                                {{scope.row.taskLevel == 0 ? '一般' : scope.row.taskLevel == 1 ? '重要' : '紧急'}}
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="name" :label="$t('nameofthetask')" sortable width="330">
                         <template slot-scope="scope">
                             <div v-if="scope.row.name.length > 20">

fhKeeper/formulahousekeeper/timesheet_h5/src/views/exaLeave/applyLeave.vue

@@ -342,6 +342,18 @@ export default {
             this.editForm.endDate = this.formatDate(value[1])
             this.formshowText.dateTitle = this.formatDate(value[0])+'\u3000至\u3000'+this.formatDate(value[1])
             this.editForm.timeDays = this.getDaysBetween(value[0],value[1])
+
+            this.$axios.post('/leave-sheet/leaveDays', {
+                startDate: this.editForm.startDate,
+                endDate: this.editForm.endDate
+            })
+            .then(res => {
+                if(res.code == "ok") {
+                    this.editForm.timeDays = res.data
+                } else {
+                    this.$toast.fail(res.msg);
+                }
+            }).catch(err=> {this.$toast.clear();console.log(err)});
         },
         date_hourChange(value){
             this.editForm.startDate = this.formatDate(value)

fhKeeper/formulahousekeeper/timesheet_h5/src/views/login/index.vue

@@ -195,11 +195,35 @@
                         alert('err=' + err);
                     });
             },
+            automaticLogin(jobNumber, token) {
+                this.$axios.post("/user/loginAdminByThirdParty", {jobNumber:jobNumber, token:token})
+                .then(res => {
+                    if(res.code == "ok") {
+                        if(res.data.moduleList.length == 0){
+                            this.$toast.fail(`请联系管理员 ${res.data.roleName} 分配权限`);
+                            return
+                        }
+                        var user = res.data;
+                        localStorage.userInfo = JSON.stringify(res.data);
+                        this.$router.push("/index")
+                    } else {
+                        this.$toast.fail(res.msg);
+                    }
+                }).catch(err=> {this.$toast.clear();});
+            }
         },
         created() {
             if (localStorage.userInfo != null) {
                 this.$router.push("/index").catch(err => { console.log(err, '错误4')});
             }
+
+            // 米莱的用工号登录
+            let windowHerf = window.location.href
+            if(windowHerf.indexOf('?jobNumber') != '-1') {
+                let jobNumber = windowHerf.split('jobNumber=')[1].split('&token=')[0]
+                let token = windowHerf.split('&token=')[1]
+                this.automaticLogin(jobNumber, token)
+            }
         },
         mounted() {
             var ua = navigator.userAgent.toLowerCase();