调整user.role

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

@@ -12,7 +12,7 @@
           text-color="#666666"
           active-text-color="#20A0FF"
           style="width:100%">
-          <el-submenu index="1" v-if="permissions.costFil">
+          <el-submenu index="1">
             <template slot="title">
               <i class="iconfont firerock-icontianbao"></i>
               <span>员工费用填报</span>
@@ -24,7 +24,8 @@
           <el-submenu index="2">
             <template slot="title">
               <i class="iconfont firerock-iconbaoxiaodan"></i>
-              <span>{{user.role == 0?"我的报销凭证":"报销凭证列表"}}</span>
+              <!-- <span>{{user.role == 0?"我的报销凭证":"报销凭证列表"}}</span> -->
+              <span>{{"报销凭证列表"}}</span>
             </template>
             <el-menu-item index="2-1" v-if="permissions.costAll"><p @click="bills(false)" >单据列表</p></el-menu-item>
             <el-menu-item index="2-2" v-if="permissions.costAudit"><p @click="bills(true)">单据审核</p></el-menu-item>
@@ -56,7 +57,7 @@
             <!-- 报销人 -->
             <el-form-item label="报销人" prop="ownerId">
               <!--普通员工只能自己填报自己的 -->
-              <el-select v-model="addForm.ownerId" placeholder="请选择报销人" style="width: 150px" :disabled="user.role == 0" filterable="true">
+              <el-select v-model="addForm.ownerId" placeholder="请选择报销人" style="width: 150px" :disabled="!permissions.costFil" filterable="true">
                 <span v-for="(item, index) in users" :key="index">
                   <el-option :label="item.name" :value="item.id"></el-option>
                 </span> 
@@ -187,7 +188,7 @@
           <el-form label-width="70px" inline >
             <!-- 报销人 -->
             <el-form-item label="报销人">
-              <el-select v-model="ownerId" size="small" clearable placeholder="选择报销人" style="width: 120px" :disabled="user.role == 0" filterable="true">
+              <el-select v-model="ownerId" size="small" clearable placeholder="选择报销人" style="width: 120px" :disabled="!permissions.costFil" filterable="true">
                 <span v-for="(item, index) in users" :key="index">
                   <el-option :label="item.name" :value="item.id"></el-option>
                 </span> 
@@ -248,12 +249,12 @@
                   <span v-if="scope.row.status == 0 || scope.row.status == 3" >{{statusTxt[scope.row.status]}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" :width="isAuditList?220:160" v-if="user.role != 6">
+              <el-table-column label="操作" :width="isAuditList?220:160">
                   <template slot-scope="scope" >
                       <div v-if="!isAuditList">
                       <el-button icon="el-icon-view"  circle size="mini"  @click.stop.native="downloadByA(scope.row)" ></el-button>
-                      <el-button icon="el-icon-edit" circle size="mini" style="margin-left:10px;" @click.stop.native="showEditName(scope.row)" v-show="(scope.row.status == 1 || scope.row.status == 2) || user.role > 0 "></el-button>
-                      <el-button icon="el-icon-delete"  circle size="mini" style="margin-left:10px;" @click.stop.native="deleteItem(scope.row)" v-show="(scope.row.status == 1 || scope.row.status == 2) || user.role > 0 "></el-button>
+                      <el-button icon="el-icon-edit" circle size="mini" style="margin-left:10px;" @click.stop.native="showEditName(scope.row)" v-show="scope.row.status == 1 || scope.row.status == 2 "></el-button>
+                      <el-button icon="el-icon-delete"  circle size="mini" style="margin-left:10px;" @click.stop.native="deleteItem(scope.row)" v-show="scope.row.status == 1 || scope.row.status == 2 "></el-button>
                       </div>
                       <div v-if="isAuditList">
                         <el-button  size="mini"  @click.stop.native="downloadByA(scope.row)" >查看</el-button>
@@ -678,7 +679,7 @@ export default {
         res => {
             if (res.code == "ok") {
                 this.users = res.data.records;
-                if (this.user.role == 0) {
+                if (!this.permissions.costFil) {
                     this.addForm.ownerId = this.user.id;
                     this.addForm.status = 1;
                 }
@@ -950,7 +951,7 @@ export default {
       this.addForm.type = index
       this.ins = index;
       this.expenseTypeList = this.allExpList.filter(a=>a.mainType == this.ins);
-      if (this.user.role == 0) {
+      if (!this.permissions.costFil) {
          this.addForm.ownerId = this.user.id;
       }
       

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

@@ -19,10 +19,10 @@
             <i class="iconfont firerock-icontianbao"></i>
             <span slot="title">员工请假填报</span>
           </el-menu-item>
-          <el-submenu index="2" v-if="user.role != 0">
+          <el-submenu index="2" v-if="permissions.leaveAll">
             <template slot="title">
               <i class="iconfont firerock-iconbaoxiaodan"></i>
-              <span>{{user.role == 0?"我的请假单":"请假单列表"}}</span>
+              <span>{{"请假单列表"}}</span>
             </template>
             <el-menu-item index="2-1" ><p @click="bills(false, 2)" v-if="permissions.leaveAll">全部</p></el-menu-item>
             <el-menu-item index="2-2" ><p @click="bills(true, 1)" v-if="permissions.leaveAudit">待审核</p></el-menu-item>
@@ -82,7 +82,7 @@
                 <!-- 请假人 -->
                 <el-form-item label="请假人" prop="ownerId"  style="width: 300px">
                     <!--普通员工只能自己填报自己的 -->
-                    <el-select v-model="addForm.ownerId" @change="selts()" placeholder="请选择请假人" style="width: 240px" :disabled="user.role == 0" filterable="true">
+                    <el-select v-model="addForm.ownerId" @change="selts()" placeholder="请选择请假人" style="width: 240px" :disabled="!permissions.leaveFil" filterable="true">
                         <span v-for="(item, index) in users" :key="index">
                         <el-option :label="item.name" :value="item.id"></el-option>
                         </span> 
@@ -140,7 +140,7 @@
         <div class="ctons">
           <div class="flex">
             <div>
-              <el-select v-model="ownerIds" placeholder="请选择请假人" clearable @change="chufas()" style="width: 180px" size="small" :disabled="user.role == 0" filterable="true">
+              <el-select v-model="ownerIds" placeholder="请选择请假人" clearable @change="chufas()" style="width: 180px" size="small" :disabled="!permissions.leaveFil" filterable="true">
                   <span v-for="(item, index) in users" :key="index">
                   <el-option :label="item.name" :value="item.id"></el-option>
                   </span> 
@@ -221,22 +221,22 @@
                 </el-table-column>
                 <el-table-column label="操作" width="180" fixed="right" v-if="isAuditList">
                     <template slot-scope="scope">
-                      <div v-if="user.role != 0">
+                      <div>
                         <el-button icon="el-icon-check" circle size="mini" @click.stop.native="approve(scope.row)"></el-button>
                         <el-button icon="el-icon-close" circle size="mini"  @click.stop.native="deny(scope.row)"></el-button>
                       </div>
-                      <div v-else>
+                      <div>
                         <el-button type="danger" size="mini">撤销</el-button>
                       </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="180" fixed="right" v-if="!isAuditList && user.role != 6">
+                <el-table-column label="操作" width="180" fixed="right">
                     <template slot-scope="scope">
-                      <div v-if="user.role == 0 ">
+                      <div>
                         <el-button icon="el-icon-delete" circle size="mini"  @click.stop.native="deletes(scope.row)" v-if="scope.row.status != 0"></el-button>
                         <el-button icon="el-icon-edit" circle size="mini" @click.stop.native="editor(scope.row)" v-if="scope.row.status != 0"></el-button>
                       </div>
-                      <div v-if="user.role != 0 ">
+                      <div>
                         <el-button icon="el-icon-delete" circle size="mini"  @click.stop.native="deletes(scope.row)"></el-button>
                         <el-button icon="el-icon-edit" circle size="mini" @click.stop.native="editor(scope.row)"></el-button>
                       </div>

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

@@ -13,7 +13,7 @@
                     </el-input>
                     </div>
                 </el-form-item>
-                <el-form-item style="float:right;" v-if="user.role == 1||user.role == 2||user.role == 5">
+                <el-form-item style="float:right;">
                     <el-link type="primary" :underline="false" @click="handleAdd(-1,null)">新增专业</el-link>
                 </el-form-item>
             </el-form>
@@ -29,10 +29,10 @@
             <el-table-column prop="name" label="专业名称" >
             </el-table-column>
             
-            <el-table-column label="操作" width="150" v-if="user.role == 1||user.role == 2||user.role == 5">
+            <el-table-column label="操作" width="150">
                 <template slot-scope="scope">
-                    <el-button size="mini" v-if="user.role>0" 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 size="mini" type="primary" @click="handleAdd(scope.$index, scope.row)">编辑</el-button>
+                    <el-button size="mini"  @click="deletePro(scope.$index, scope.row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -54,7 +54,7 @@
         <el-dialog :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="600px">
             <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
                 <el-form-item label="专业名称" prop="name">
-                    <el-input v-model="addForm.name" :max="20" :disabled="user.role==0" placeholder="请输入专业名称" clearable></el-input>
+                    <el-input v-model="addForm.name" :max="20" placeholder="请输入专业名称" clearable></el-input>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer;">

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

@@ -34,7 +34,7 @@
             <el-form-item style="float:right;" v-if="permissions.financialCustom">
                 <el-link type="primary" :underline="false" @click="showItemDialog">自定义薪资项</el-link>
             </el-form-item>
-            <el-form-item style="float:right;" v-if="(user.role == 1 || user.role == 2 || user.role == 4) && user.timeType.financeAudit == '1'">
+            <el-form-item style="float:right;" v-if="user.timeType.financeAudit == '1'">
                 <el-link type="primary" :underline="false" @click="reviewerVisible = true">设置审核人</el-link>
             </el-form-item>
             
@@ -115,7 +115,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="indate" label="上传时间"></el-table-column>
-                    <el-table-column prop="date" label="操作" v-if="(tabPosition == 1 || tabPosition == 0) && (reviewerRuleForm.auditorId == user.id || user.role == 1 || user.role == 2)">
+                    <el-table-column prop="date" label="操作" v-if="(tabPosition == 1 || tabPosition == 0) && (reviewerRuleForm.auditorId == user.id)">
                         <template slot-scope="scope">
                             <div>
                                 <el-button type="primary" size="small" v-if="tabPosition == 0" @click="operationList(0, scope.row.id)">通过</el-button>
@@ -274,7 +274,7 @@
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-link v-if="(user.role == 1 || user.role == 2 || user.role == 4) && user.timeType.financeAudit == '0'"
+                <el-link v-if="user.timeType.financeAudit == '0'"
                 style="float:left;"
                     type="primary" :underline="false" @click="xzjl(),xzImportVisible = true">查看导入历史记录</el-link>