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

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

@@ -1,6 +1,6 @@
 <template>
   <section id="section">
-    <div class="sidebars" ref="sidebars" :style="'width: 180px;display: block;background: #fff;height:'+hubs+ 'px'">
+    <div class="sidebars" ref="sidebars" :style="'width: 180px;display: block;overflow:hidden;background: #fff;height:'+hubs+ 'px'">
       <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>请假管理</h3>
       <el-divider ></el-divider>
       <el-col :span="12">
@@ -124,7 +124,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <!-- 选择审批人 -->
-                <el-form-item label="审批人" style="width:300px" :prop="mustApprover">
+                <el-form-item label="审批人" style="width:300px" prop="projectAuditorJson">
                     <el-select style="display:inline-block;width:250px;" multiple v-model="addForm.projectAuditorJson" placeholder="请选择">
                       <el-option
                       v-for="item in approverList"
@@ -667,7 +667,7 @@ export default {
         tel: [{required: true, validator: checkTel, trigger: 'blur'}],
         timeDays: [{required: true, validator: checks, trigger: 'blur'}],
         leaveType: [{ required: true, message: "请选择请假类型", trigger: "blur" }],
-        approver: [{ required: true, message: "请选择审批人", trigger: "blur" }]
+        projectAuditorJson: [{ required: true, message: "请选择审批人", trigger: "blur" }]
       },
       user: JSON.parse(sessionStorage.getItem("user")),
       shuz: ['事假填报', '病假填报', '年假填报', '产假填报'],
@@ -813,7 +813,6 @@ export default {
       txselnum: 0,
 
       approverList: [],
-      mustApprover: '',
       isDingding: 0,
       vacationList: [],
       leaveTypeList: [],
@@ -987,8 +986,11 @@ export default {
       },res => {
         if(res.code == 'ok'){
           this.approverList = res.data
-          if(this.approverList.length != 0){
-            this.mustApprover = 'approver'
+          if(this.approverList.length == 0){
+            this.$message({
+              message: '当前无审批人，请联系管理员配置审批人',
+              type: 'warning'
+            })
           }
           // console.log('list',res.data);
         }else {

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

@@ -2714,7 +2714,10 @@ a {
             this.getProjectBaseConfigList();
             this.getClfConfigList()
             this.yanjiuzx()
-            this.getMainProject()
+            if(this.user,timeType.mainProjectState == 1){
+                this.getMainProject()
+            }
+            
         }
     };
 </script>

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

@@ -2,7 +2,7 @@
   <div>
       <!-- 表头 -->
       <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-          <el-form :inline="true" style="width: 100%">
+          <el-form :inline="true" style="width: 87%">
               <el-form-item label="角色权限">
               </el-form-item>
               <el-form-item >
@@ -12,7 +12,7 @@
                   </el-input>
                   </div>
               </el-form-item>
-              <el-form-item style="float: right;padding-right: 125px">
+              <el-form-item style="float: right">
                   <el-link type="primary" :underline="false" @click="handleAdd('添加角色', '立即添加')">添加角色</el-link>
                   <el-link type="primary" :underline="false" @click="modify()" style="margin-left: 20px;">修改默认角色</el-link>
               </el-form-item>
@@ -26,12 +26,14 @@
             </template>
         </el-table-column>
         <el-table-column prop="roleDescribe" label="描述"></el-table-column>
-        <el-table-column prop="date" label="操作" fixed="right" width="400px">
+        <el-table-column prop="date" label="操作">
             <template slot-scope="scope">
                 <div>
                     <el-button size="small" @click="handleAdd('编辑角色', '立即修改', scope.row)" :style="scope.row.rolename != '超级管理员' ? '' : 'visibility:hidden;'">编辑角色</el-button>
                     <el-button type="primary" size="small" @click="shisha(scope.row.id), roleName = scope.row.rolename" v-if="scope.row.rolename !='超级管理员' || (scope.row.rolename =='超级管理员' && user.roleName == '超级管理员')">分配权限</el-button>
+                    
                     <el-button type="danger" size="small" @click="deteHand(scope.row)" v-if="scope.row.rolename != '超级管理员'">删除</el-button>
+                    <el-button size="small" @click="exportAuthority(scope.row)" v-if="scope.row.rolename != '超级管理员'" style="margin-left:30px">导出权限</el-button>
                 </div>
             </template>
         </el-table-column>
@@ -457,6 +459,30 @@ export default {
                   type: "error"
               });
           });
+      },
+      exportAuthority(row){ // 导出权限
+      console.log(row);
+        this.http.post('permission/exportData',{
+          role: row.id,
+          companyId: this.user.companyId
+        },res => {
+          if(res.code == 'ok'){
+            var a = document.createElement('a');
+            a.download = "权限数据统计.xls";
+            a.href = res.data;
+            a.click();
+          }else{
+            this.$message({
+              message: res.msg,
+              type: 'error'
+            })
+          }
+        },err => {
+          this.$message({
+            message: err,
+            type: 'error'
+          })
+        })
       }
   },
 };

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -206,7 +206,7 @@
         <p style="margin-left:10px;color:#666;">普通员工填报日报时间限制</p>
         <el-row :gutter="20" style="padding-top:10px;width:100%;margin:0 auto;padding-left:10px;padding-right:10px;">
         <el-col :span="24" >
-            <div class="panel" style="height:60px;">
+            <div class="panel" style="height:120px;">
                 <el-form :inline="true" :model="timeType"  style="margin-top:10px;">
                  
                 <el-form-item label="补填时间" prop="fillMonths">
@@ -216,7 +216,7 @@
                     </el-select>
                     <span style="color:#666;margin-left:10px;">(说明：系统管理员为员工代填日报时不受补填时间的限制)</span>
                     <span class="lockworktime"><el-checkbox v-model="timeType.fillAhead" label="可提前填报" /></span>
-                </el-form-item>
+                </el-form-item><br>
                 <el-form-item label="员工填报及时日" prop="timeliness" v-if="user.company.packageProject">
                     <el-select v-model="timeType.timeliness">
                         <el-option label="当天" :value="0"></el-option>

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

@@ -4610,9 +4610,26 @@
 
             // 改变月份
             changeMonth() {
-                if (this.isBatch == 0 && !this.isSubstitude) {
+                if (this.isBatch == 0) {
+                    if(this.user.timeType.fillAhead == 0){
+                        let date_a = new Date(this.workForm.createDate)
+                        let date_b = new Date(sessionStorage.msg)
+                        if(date_a.getTime() > date_b.getTime()){
+                            this.workForm.createDate = sessionStorage.msg
+                        }
+                    }
                     //只有按天填报才能获取当天的日报
-                    this.getReport()
+                    if(!this.isSubstitude){
+                        this.getReport()
+                    }
+                }else {
+                    if(this.user.timeType.fillAhead == 0){
+                        let date_a = new Date(this.workForm.createDate[1])
+                        let date_b = new Date(sessionStorage.msg)
+                        if(date_a.getTime() > date_b.getTime()){
+                            this.workForm.createDate[1] = sessionStorage.msg
+                        }
+                    }
                 }
             },
             // 判断时间段