Merge remote-tracking branch 'origin/master'

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

@@ -15,7 +15,7 @@
               <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-link type="primary" :underline="false" @click="exportAuthority()" style="margin-left:20px">导出权限</el-link>
+                  <!-- <el-link type="primary" :underline="false" @click="exportAuthority()" style="margin-left:20px">导出所有权限</el-link> -->
               </el-form-item>
           </el-form>
       </el-col>
@@ -32,7 +32,7 @@
                 <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 size="small" @click="exportAuthority(scope.row)" >导出权限</el-button>
                     <el-button type="danger" size="small" @click="deteHand(scope.row)" v-if="scope.row.rolename != '超级管理员'">删除</el-button>
                 </div>
             </template>
@@ -153,7 +153,6 @@ export default {
         auseList: [],
         defaultRole: false,
         roleId: '',
-        cgRoleParamer: null,
         roleName: '',
         rules: {
           rolename: [{
@@ -268,8 +267,6 @@ export default {
               console.log(res.data, '数据来源')
               this.tableData = res.data
               this.auseList = res.data
-              let item = this.tableData.filter(item => item.rolename == '超级管理员')
-              this.cgRoleParamer = item[0].id
             } else {
                 this.$message({
                     message: res.msg,
@@ -463,9 +460,9 @@ export default {
               });
           });
       },
-      exportAuthority(){ // 导出权限
+      exportAuthority(row){ // 导出权限
         this.http.post('/permission/exportData',{
-          role: this.cgRoleParamer,
+          role: row.id,
           companyId: this.user.companyId
         },res => {
           if(res.code == 'ok'){

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -136,13 +136,18 @@
                         <el-link v-if="user.timeType.isSecretSalary==0" @click.native="showSalaryList(scope.row)"><i class="iconfont firerock-iconrecord"></i></el-link>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="330">
+                <el-table-column label="状态" width="160">
+                    <template slot-scope="scope">
+                        <span>{{scope.row.isActive==0 ? '离职(' + scope.row.inactiveDate + ')' : '在职'}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" width="300">
                     <template slot-scope="scope">
                         <el-button size="mini" type="default" v-if="scope.row.roleName == '超级管理员' && user.id == scope.row.id" @click="transferRole(scope.row)">转让</el-button>
                         <el-button size="mini" type="default" v-if="scope.row.roleName != '超级管理员'" @click="resetPwd(scope.row)">重置</el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.roleName != '超级管理员'" @click="openInsertDialog(scope.row)">编辑</el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.roleName == '超级管理员'" @click="openInsertDialog1(scope.row)">编辑</el-button>
-                        <el-button size="mini" type="danger"  v-if="scope.row.roleName != '超级管理员'" @click="deleteUser(scope.row)">删除</el-button>
+                        <!-- <el-button size="mini" type="danger"  v-if="scope.row.roleName != '超级管理员'" @click="deleteUser(scope.row)">删除</el-button> -->
                         <el-button size="mini" type="default" v-if="scope.row.roleName != '超级管理员' && scope.row.isActive==1" @click="showDeactiveDialog(scope.row)">停用</el-button>
                         <el-button size="mini" type="success" v-if="scope.row.roleName != '超级管理员' && scope.row.isActive==0" @click="setActive(scope.row, 1)">启用</el-button>
                     </template>
@@ -309,6 +314,7 @@
 
             </el-form>
             <span slot="footer" class="dialog-footer">
+                <el-button type="danger" @click="deleteUser(insertForm)" style="float:left;">删除</el-button>
                 <el-button @click="dialogVisible=false">取消</el-button>
                 <el-button type="primary" @click="submitInsert('insertForm')" :loading="submitLoading">提交</el-button>
             </span>
@@ -1717,6 +1723,7 @@
                     // console.log('insertForm',this.insertForm);
                 }
                 this.dialogVisible = true;
+                console.log(this.insertForm);
             },
 
             submitInsert() {

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

@@ -1831,12 +1831,9 @@
                 if(this.isBatch == 0) {
                     return
                 }
-                var stat = this.workForm.createDate[0]
-                var end = this.workForm.createDate[1]
-                // this.jsDay = 10
                 this.http.post('/report/getWorkDays',{ 
-                    startDate: stat,
-                    endDate: end
+                    startDate: this.workForm.createDate[0],
+                    endDate: this.workForm.createDate[1]
                 },
                 res => {
                     if (res.code == "ok") {