提交

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

@@ -20,7 +20,11 @@
       </el-col>
       <!-- 表格 -->
       <el-table :data="tableData" style="width: 100%" height="615">
-        <el-table-column prop="rolename" label="角色"></el-table-column>
+        <el-table-column prop="rolename" label="角色">
+            <template slot-scope="scope">
+              {{scope.row.rolename}} <span v-if="scope.row.isDefault == 1" style="color: #909399;"> - (默认角色)</span>
+            </template>
+        </el-table-column>
         <el-table-column prop="roleDescribe" label="描述"></el-table-column>
         <el-table-column prop="date" label="操作">
             <template slot-scope="scope">
@@ -103,7 +107,7 @@
             <div>
               <el-form label-width="80px">
                 <el-form-item label="默认角色">
-                  <el-select v-model="roleId" placeholder="请选择默认角色" @change="getUser()">
+                  <el-select v-model="roleId" placeholder="请选择默认角色">
                       <el-option v-for="item in auseList" :key="item.id" :label="item.rolename" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>

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

@@ -86,7 +86,7 @@
                             <!-- <el-link type="primary" v-if="user.role==1||user.role==2||user.leader==1||user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,0)">代填日报</el-link> -->
                             <el-link type="primary" v-if="permissions.reportsFillOut" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,0)">代填日报</el-link>
                             <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,1)">批量填报</el-link>
-                            <el-link type="primary" v-if="user.role==1||user.role==2||user.role==6||user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="imports()">工时导入</el-link>
+                            <el-link type="primary" v-if="user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="imports()">工时导入</el-link>
                             <el-link type="primary" style="margin-right:10px;" :underline="false" @click="showExportDialog">导出日报</el-link>
                             <!--部门负责人给个导出工时的功能 -->
                             <el-link type="primary" v-if="user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="showExportTimeDialog">导出工时统计</el-link>
@@ -116,7 +116,8 @@
                             </span>
                             <div class="checkbtn" style="padding-right:20px;">
                                 <el-button v-if="item1.state >= 2 && user.id == item1.id" type="primary" size="small" @click="isSubstitude=false; fillInReport(index1,0)">编辑日报</el-button>
-                                <el-button v-if="(user.role == 1 || user.role == 2 || user.manageDeptId != 0) && item1.state != 1" size="small" @click="guanli(item1)" style="float: right;">删除</el-button>
+                                <!-- <el-button v-if="(user.role == 1 || user.role == 2 || user.manageDeptId != 0) && item1.state != 1" size="small" @click="guanli(item1)" style="float: right;">删除</el-button> -->
+                                <el-button v-if="(user.manageDeptId != 0) && item1.state != 1" size="small" @click="guanli(item1)" style="float: right;">删除</el-button>
                             </div>
                             <div class="one_daily_body">
                                 <el-timeline>
@@ -156,11 +157,14 @@
 
                                             <!--每个项目上单独审核 -->
                                             <span style="float:right;">
-                                                <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="primary" :loading="logining" 
+                                                <!-- <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="primary" :loading="logining"  -->
+                                                <el-button v-if="(user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="primary" :loading="logining" 
                                                 size="small" @click="approve(item1.id, item2)">通过</el-button>
-                                                <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="danger" :loading="logining" 
+                                                <!-- <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="danger" :loading="logining"  -->
+                                                <el-button v-if="(user.id == item2.projectAuditorId) && item2.state == 0 && item2.isDeptAudit==0 && item2.projectAuditState==0" type="danger" :loading="logining" 
                                                 size="small" @click="showDenyDialog(item1.id,0, item2)">驳回</el-button>
-                                                <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 1" type="normal" :loading="logining" size="small" 
+                                                <!-- <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item2.projectAuditorId) && item2.state == 1" type="normal" :loading="logining" size="small"  -->
+                                                <el-button v-if="(user.id == item2.projectAuditorId) && item2.state == 1" type="normal" :loading="logining" size="small" 
                                                 @click="showDenyDialog(item1.id,1, item2)">撤销</el-button>
                                                 <!--自己可以撤回待审核状态的报告 -->
                                                 <el-button v-if="user.id == item1.id && (item2.state == 0 || item2.state == -1)" type="normal" :loading="logining" size="small" @click="cancel(item1)">撤回</el-button>