再次提交权限控制

fhKeeper/formulahousekeeper/timesheet/src/main.js

@@ -153,12 +153,16 @@ router.beforeEach((to, from, next) => {
                     for(var i in user.moduleList) {
                         if(user.moduleList[i].isMenu) {
                             for(var s in filterRouter) {
+                                if(filterRouter[s].name == '审批流设置') {
+                                    console.log(user.moduleList[i].name, '-----', filterRouter[s].name)
+                                }
                                 if(user.moduleList[i].name == filterRouter[s].name) {
                                     arr.push(filterRouter[s])
                                 }
                             } 
                         } 
                     }
+                    console.log(arr, '来的数据', filterRouter)
 
                     getRoutes = arr;
 

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -45,7 +45,7 @@ const StringUtil = {
         leaveAudit : false, // 请假审核 //
         leaveAll : false, // 查看全部请假单 //
         leaveStatistical : false, // 请假统计 //
-        leaveProcess : false, // 审批流程设置 // 
+        leaveProcess : false, // 请假流程设置 // 
         leaveAnnual : false, // 年假管理 //
 
         // 费用报销
@@ -91,8 +91,8 @@ const StringUtil = {
         arr[i] == '请假审核' ? obj.leaveAudit = true : ''
         arr[i] == '查看全部请假单' ? obj.leaveAll = true : ''
         arr[i] == '请假统计' ? obj.leaveStatistical = true : ''
-        arr[i] == '审批流程设置' ? obj.leaveProcess = true : ''
-        arr[i] == '年假管理' ? obj.reportTask = true : ''
+        arr[i] == '请假流程设置' ? obj.leaveProcess = true : ''
+        arr[i] == '年假管理' ? obj.leaveAnnual = true : ''
         arr[i] == '费用填报' ? obj.costFil = true : ''
         arr[i] == '费用审核' ? obj.costAudit = true : ''
         arr[i] == '查看全部报销单' ? obj.costAll = true : ''

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

@@ -149,21 +149,21 @@
                     {{scope.row.progress==null?"-":scope.row.progress}}%
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="390"  align="left" v-if="permissions.projectManagement">
+            <el-table-column label="操作" width="390"  align="left">
                 <template slot-scope="scope">
-                    <el-button v-if="user.role>0" size="mini"  @click="subProject(scope.row)">子项目</el-button>
-                    <el-button size="mini" v-if="user.role>0 || user.id==scope.row.inchargerId" type="primary" @click="handleAdd(scope.$index, scope.row)">编辑</el-button>
-                    <el-button v-if="user.role>0" size="mini"  @click="deletePro(scope.$index, scope.row)">删除</el-button>
+                    <el-button v-if="permissions.projectManagement || user.id==scope.row.creatorId" size="mini"  @click="subProject(scope.row)">子项目</el-button>
+                    <el-button size="mini" v-if="permissions.projectManagement || user.id==scope.row.inchargerId || user.id==scope.row.creatorId" type="primary" @click="handleAdd(scope.$index, scope.row)">编辑</el-button>
+                    <el-button v-if="permissions.projectManagement || user.id==scope.row.creatorId" size="mini"  @click="deletePro(scope.$index, scope.row)">删除</el-button>
                     <!-- 111 -->
-                    <el-dropdown class="customdropdown" split-button size="mini" @click="finishPro(scope.row)" v-if="user.role>0 && scope.row.status == 1" placement="bottom-start">
+                    <el-dropdown class="customdropdown" split-button size="mini" @click="finishPro(scope.row)" v-if="(permissions.projectManagement || user.id==scope.row.creatorId || user.id==scope.row.inchargerId) && scope.row.status == 1" placement="bottom-start">
                         完成
                         <el-dropdown-menu slot="dropdown" class="customdropdown_menu">
                             <el-button size="mini"  @click="cancelPro(scope.row)" class="customdropdown_menu_btn">撤销</el-button>
                         </el-dropdown-menu>
                     </el-dropdown>
-                    <!-- <el-button v-if="user.role>0 && scope.row.status == 1" size="mini"  @click="cancelPro(scope.row)">撤销</el-button>
-                    <el-button v-if="user.role>0 && scope.row.status == 1" size="mini"  @click="finishPro(scope.row)">完成</el-button> -->
-                    <el-button v-if="user.role>0 && scope.row.status >= 2" size="mini"  @click="restartPro(scope.row)">重启</el-button>
+                    <!-- <el-button v-if="permissions.projectManagement && scope.row.status == 1" size="mini"  @click="cancelPro(scope.row)">撤销</el-button>
+                    <el-button v-if="permissions.projectManagement && scope.row.status == 1" size="mini"  @click="finishPro(scope.row)">完成</el-button> -->
+                    <el-button v-if="permissions.projectManagement && scope.row.status >= 2" size="mini"  @click="restartPro(scope.row)">重启</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -185,7 +185,7 @@
         <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="960px">
             <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
                 <el-form-item label="项目编号" >
-                    <el-input v-model="addForm.code" :disabled="user.role==0" placeholder="请输入项目编号" clearable></el-input>
+                    <el-input v-model="addForm.code" :disabled="!permissions.projectManagement" placeholder="请输入项目编号" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="项目分类">
                     <el-select v-model="addForm.category" clearable>
@@ -193,7 +193,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="项目名称" prop="name">
-                    <el-input v-model="addForm.name" :disabled="user.role==0" placeholder="请输入项目名称" clearable></el-input>
+                    <el-input v-model="addForm.name" :disabled="!permissions.projectManagement" placeholder="请输入项目名称" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="项目类型" prop="isPublic">
                     <el-select v-model="addForm.isPublic" style="width:32%;" @change="selectPublic">
@@ -226,12 +226,12 @@
                     <el-input  @focus="showChooseMembTree" v-model="addForm.userNames"></el-input>
                 </el-form-item>
                 <el-form-item label="负责人" >
-                    <el-select v-model="addForm.inchargerId"  :disabled="(addForm.userId.length==0 ||  user.role==0) && addForm.isPublic == 0" filterable placeholder="请选择负责人" style="width:32%;" >
+                    <el-select v-model="addForm.inchargerId"  :disabled="(addForm.userId.length==0 ||  permissions.projectManagement) && addForm.isPublic == 0" filterable placeholder="请选择负责人" style="width:32%;" >
                         <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="日报审核人" >
-                    <el-select v-model="addForm.auditUserIds" multiple="true" :disabled=" !(user.role==1 ||user.role==2|| user.id == addForm.inchargerId || user.id == addForm.creatorId)" filterable placeholder="默认为项目负责人" style="width:100%;" >
+                    <el-select v-model="addForm.auditUserIds" multiple="true" :disabled=" !(permissions.projectManagement|| user.id == addForm.inchargerId || user.id == addForm.creatorId)" filterable placeholder="默认为项目负责人" style="width:100%;" >
                         <el-option v-for="item in participator" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>

fhKeeper/formulahousekeeper/timesheet/src/views/quanx/quanx.vue

@@ -107,6 +107,7 @@
                       <el-option v-for="item in auseList" :key="item.id" :label="item.rolename" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>
+                <div class="daoru"><el-link type="info">导入人员时的默认角色</el-link></div>
               </el-form>
             </div>
             <span slot="footer" class="dialog-footer">
@@ -457,4 +458,7 @@ export default {
     display: inline-block;
     width: 500px;
   }
+  .daoru {
+    margin-left: 10px;
+  }
 </style>

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

@@ -139,7 +139,7 @@
                     <span v-else-if="scope.row.state == 2" style="color:#FF0000;">已驳回</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="220">
+            <el-table-column label="操作" width="220" v-if="permissions.projectReportReview">
                 <template slot-scope="scope">
                     <el-button v-if="scope.row.state == 0" type="primary" :loading="logining" size="small" @click="approve(scope.row.id,scope.row.date, scope.row)">通过</el-button>
                     <el-button v-if="scope.row.state == 0" type="danger" :loading="logining" size="small" @click="showDenyDialog(scope.row.id,0,scope.row.dateStr, scope.row)">驳回</el-button>
@@ -184,7 +184,7 @@
                 denyReasonDialog:false,
                 isAllSelect:false,
                 user: JSON.parse(sessionStorage.getItem("user")),
-
+                permissions: JSON.parse(sessionStorage.getItem("permissions")),
                 search: {
                     projectId:null,
                     departmentIdArray: null,