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

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

@@ -597,8 +597,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                                 .setDepartmentId(departmentId == null ? 0 : departmentId)
                                 .setDepartmentCascade(departmentId == null ?
                                         convertDepartmentIdToCascade(0) :
-                                        convertDepartmentIdToCascade(departmentId))
-                                .setInductionDate(LocalDate.parse(inductionDate,dtf));
+                                        convertDepartmentIdToCascade(departmentId));
+                        if(inductionDate!=null&&inductionDate!=""){
+                            user.setInductionDate(LocalDate.parse(inductionDate,dtf));
+                        }
                         if (userMapper.insert(user) == 0) {
                             httpRespMsg.setError("操作失败");
                         } else {
@@ -632,6 +634,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
 
                 String oldCostApplyDate = oldUser.getCostApplyDate();
+                if(inductionDate!=null&&inductionDate!=""){
+                    oldUser.setInductionDate(LocalDate.parse(inductionDate,dtf));
+                }
                 userMapper.updateById(oldUser
                         .setName(name)
                         .setPhone(phone)
@@ -645,8 +650,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         .setDepartmentId(departmentId == null ? 0 : departmentId)
                         .setDepartmentCascade(departmentId == null ?
                                 convertDepartmentIdToCascade(0) :
-                                convertDepartmentIdToCascade(departmentId))
-                        .setInductionDate(LocalDate.parse(inductionDate,dtf)));
+                                convertDepartmentIdToCascade(departmentId)));
                 if (salaryChange) {
                     UserSalary userSalary = UserSalary.copyFromUser(oldUser);
                     userSalaryMapper.insert(userSalary);

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

@@ -299,7 +299,7 @@
                 <!-- <el-table-column prop="workingTime" label="加班时长" width="180"></el-table-column>  -->
                 <el-table-column prop="overtimeHours" label="加班时长" width="180"></el-table-column> 
                 <el-table-column prop="cost" label="成本" width="180" v-if="permissions.reportCost"></el-table-column> 
-                <el-table-column prop="cost" label="操作" width="180" v-if="permissions.reportCost">
+                <el-table-column prop="cost" label="操作" width="180">
                     <template slot-scope="scope">
                       <div>
                         <el-button icon="el-icon-search" size="mini" circle @click="costBtn(scope.row)"></el-button>
@@ -431,7 +431,7 @@
                 <el-table-column prop="workingTime" label="当天工作时长（h）" width="160"></el-table-column>
                 <el-table-column prop="username" label="姓名" width="120"></el-table-column>
                 <el-table-column prop="overtimeHours" label="加班时长（h）" width="130"></el-table-column>
-                <el-table-column prop="cost" label="加班成本" width="120"></el-table-column>
+                <el-table-column prop="cost" label="加班成本" width="120" v-if="permissions.reportCost"></el-table-column>
              </el-table>
           </div>
         </el-dialog>

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -532,7 +532,13 @@
                     highlight-current-row
                     max-height="240"
                     style="width: 100%;margin-top:10px;margin-bottom:15px">
-                    <el-table-column label="序号" prop="documentType" min-width="40" align="center"></el-table-column>
+                    <el-table-column label="序号" prop="documentType" min-width="40" align="center">
+                        <template slot-scope="scope">
+                            <div>
+                                {{scope.$index + 1}}
+                            </div>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="文件名称" prop="documentName" min-width="180"></el-table-column>
                     <el-table-column label="文件大小" prop="size" min-width="60" align="center"></el-table-column>
                     <el-table-column label="创建人" prop="creatorName" min-width="60" align="center"></el-table-column>

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

@@ -269,6 +269,9 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="入职时间" prop="phone">
+                    <el-date-picker v-model="insertForm.inductionDate" value-format="yyyy-MM-dd"></el-date-picker>
+                </el-form-item>
                 <el-form-item label="岗位职级" prop="phone">
                     <el-input v-model="insertForm.position" placeholder="请输入岗位职级别" clearable></el-input>
                 </el-form-item>
@@ -515,6 +518,7 @@
                     departmentId: null,
                     salaryType:0,
                     costApplyDate: '2021-04-09',
+                    inductionDate: '2021-04-09',
                     position: '',
                     certJson: []
                 },
@@ -1166,6 +1170,7 @@
                                 departmentId: array.reverse(),
                                 salaryType: res.data.salaryType,
                                 costApplyDate: res.data.costApplyDate,
+                                inductionDate: res.data.inductionDate,
                                 position: res.data.position,
                                 certJson: res.data.certList
                             };
@@ -1197,6 +1202,7 @@
                         departmentId: null,
                         salaryType:0,
                         costApplyDate: util.formatDate.format(new Date(), 'yyyy-MM-dd'),
+                        inductionDate: util.formatDate.format(new Date(), 'yyyy-MM-dd'),
                         position: '',
                         certJson: [],
                     };
@@ -1242,8 +1248,9 @@
                             cost: this.insertForm.cost,
                             salaryType: this.insertForm.salaryType,
                             position: this.insertForm.position,
-                            certJson: JSON.stringify(this.insertForm.certJson)
+                            certJson: JSON.stringify(this.insertForm.certJson),
                             // certJson: this.insertForm.certJson
+                            inductionDate: this.insertForm.inductionDate
                         };
                         if (this.insertForm.id != null) {
                             form.id = this.insertForm.id;
@@ -1400,7 +1407,8 @@
                             monthCost: this.insertForm.monthCost,
                             cost: this.insertForm.cost,
                             position: this.insertForm.position,
-                            certJson: this.insertForm.certJson
+                            certJson: this.insertForm.certJson,
+                            inductionDate: this.insertForm.inductionDate
                         };
                         if (this.insertForm.departmentId != null) {
                             form.departmentId = this.insertForm.departmentId[this.insertForm.departmentId.length-1];