Преглед изворни кода

修改项目中阶段删除时全部阶段消失的bug, 请假单加上时间单位,前端路由增加对请假模块的判断

seyason пре 3 година
родитељ
комит
418e3fce54

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -102,7 +102,7 @@ router.beforeEach((to, from, next) => {
                         filterRouter = filterRouter.filter(r=>{return r.name != '工程专业管理' && r.name != '专业审核' && r.name != '部门审核'});
                     }
                     if (user.company.packageProject == 0) {
-                        filterRouter = filterRouter.filter(r=>{return r.name != '待办任务'});
+                        filterRouter = filterRouter.filter(r=>{return r.name != '待办任务' && r.name != '请假管理'});
                     }
 
                     if (user.role == 1 || user.role == 2) {

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -66,7 +66,7 @@
                     <el-input ref="ipts" v-model="addForm.tel" placeholder="请输入手机号" style="width: 250px"></el-input>
                 </el-form-item>
                 <!-- 单选 -->
-                <el-form-item style="display: block">
+                <el-form-item style="display: block" label="时长单位">
                     <el-radio-group v-model="addForm.timeType" @change="chanRadio()">
                         <el-radio label="0">按天请假</el-radio>
                         <el-radio label="1">按小时请假</el-radio>

+ 2 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -1517,7 +1517,8 @@
                     this.http.post('/stages/delete',param,
                         res => {
                             if (res.code == "ok") {
-                                this.stageList = res.data;
+                                // this.stageList = res.data;
+                                this.getStageList();
                             } else {
                                 this.$message({
                                 message: res.msg,