调整文字和样式

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

@@ -154,17 +154,17 @@
                 <el-table-column prop="monthCost" label="月成本"  v-if="permissions.structurePersonnel">
                     <template slot-scope="scope">{{user.timeType.isSecretSalary==0?(scope.row.monthCost==null?0:scope.row.monthCost):'*'}} 元</template>
                 </el-table-column>
-                <el-table-column prop="cost" label="时薪"  v-if="permissions.structurePersonnel">
+                <el-table-column prop="cost" label="时薪"  v-if="permissions.structurePersonnel" width="120">
                     <template slot-scope="scope">{{user.timeType.isSecretSalary==0?(scope.row.cost==null?0:scope.row.cost):'*'}} 元
                         <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="160">
                     <template slot-scope="scope">
-                        <span>{{scope.row.isActive==0 ? '停用(' + scope.row.inactiveDate + ')' : '活跃'}}</span>
+                        <span>{{scope.row.isActive==0 ? '停用(' + scope.row.inactiveDate + ')' : '在职'}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="300">
+                <el-table-column label="操作" width="300" fixed="right">
                     <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>
@@ -437,7 +437,7 @@
                 <el-form-item label="导出" >
                     <el-radio-group v-model="containInvalid" >
                     <el-radio  :label="1" >全部人员</el-radio>
-                    <el-radio  :label="0" >仅活跃人员</el-radio>
+                    <el-radio  :label="0" >仅在职人员</el-radio>
                     </el-radio-group>
                 </el-form-item>
             </el-form>
@@ -835,7 +835,7 @@ export default {
         },
         {
           value: "1",
-          label: "活跃",
+          label: "在职",
         },
         {
           value: "0",

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

@@ -835,9 +835,10 @@
     };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .propsbtn {
     display: inline-block;
     padding-left: 20px;
 }
+
 </style>