'1.1.2.3'

src/views/abPoint/apply_list.vue

@@ -75,7 +75,7 @@
 			</template>
 		</el-table>
 
-		<el-table :data="dataList" stripe fit v-loading="table_loading" v-if="tabs == 'refuse'" @row-click="openDetail">
+		<el-table :data="dataList" stripe fit v-loading="table_loading" v-show="tabs == 'refuse'" @row-click="openDetail">
 			<el-table-column label="申请内容" prop="remark">
 				<template slot-scope="scope">
 					{{ scope.row.remark.customize || scope.row.remark.rule }}

src/views/abPoint/award_punish.vue

@@ -177,8 +177,9 @@
 										<!-- <span v-show="item.point !== 0">{{item.point}}</span> -->
 									</div>
 								</template>
-								<template slot="description">
-									<div style="color:rgb(130 130 130)">{{ item.time }}</div>
+								<template slot="description" style="display:flex;">
+									<div style="color:rgb(130 130 130);">{{ item.time }}</div>
+									<div style="color:rgb(113 113 113);font-size:14px;">{{item.review_remark}}</div>
 								</template>
 							</el-step>
 						</el-steps>

src/views/ranking/custom_rank.vue

@@ -1,10 +1,10 @@
 <template>
 	<div class="all-box">
 		<div class="all">
-			<div class="flex-box">
+			<div class="flex-box" v-loading="groups_loading">
 				<div class="terr-left">
-					<el-button v-if="!this.$authoritys('employee') && !this.$authoritys('dept_manager')" size="medium" @click="addGroup" type="primary">新建分组</el-button>
-					<el-menu default-active="0" class="el-menu-vertical-demo" style="border: none" v-if="groups_list.length>0" v-loading="groups_loading">
+					<el-button v-if="employeeOrdept" size="medium" @click="addGroup" type="primary">新建分组</el-button>
+					<el-menu default-active="0" class="el-menu-vertical-demo" style="border: none" v-if="groups_list.length>0">
 						<el-menu-item
 							style="height: 47px;line-height: 47px;"
 							:index="index.toString()"
@@ -23,12 +23,12 @@
 						还没有自定义分组
 					</div>
 				</div>
-				<div class="terr-right border-right flex-1">
-					<div class="listData" v-loading="table_loading" v-if="table_list.length > 0">
+				<div class="terr-right border-right flex-1" v-loading="table_loading">
+					<div class="listData" v-if="table_list.length > 0">
 						<div class="flex-box">
 							<div class="flex-box flex-v-ce margin-bottom">
 								<div class="groupsName">{{groups_info.name}}<span class="blue">({{total}}人)</span></div>
-								<el-button v-if="!this.$authoritys('employee') && !this.$authoritys('dept_manager')" @click="editGroup" size="medium">编辑</el-button>
+								<el-button v-if="employeeOrdept" @click="editGroup" size="medium">编辑</el-button>
 							</div>
 						</div>
 						<!-- form -->
@@ -79,7 +79,7 @@
 					<div v-else style="margin-top: 10%;">
 						<noData :isSolt="true">
 							<template v-slot:default>
-								<div style="text-align: center;">还没有分组,<span style="color:#26A2FF;cursor:pointer" @click="addGroup">去添加 >></span></div>
+								<div style="text-align: center;">还没有分组<span v-if="employeeOrdept">,</span><span v-if="employeeOrdept" style="color:#26A2FF;cursor:pointer" @click="addGroup">去添加 >></span></div>
 							</template>
 						</noData>
 					</div>
@@ -264,6 +264,7 @@ export default {
 			treedata: [],
 			isEmployeeShow:false,
 			employeeNames:'',
+			employeeOrdept:!this.$authoritys('employee') && !this.$authoritys('dept_manager'),
 		};
 	},
 	created() {

src/views/ranking/manager_statistics.vue

@@ -582,7 +582,7 @@ export default {
   height: 110px;
   line-height: none;
   margin: 22px auto 16px;
-  background: url("/static/images/noperson_default.png") no-repeat center;
+  background: url("../../assets/image/nodata_default.png") no-repeat center;
   background-size: 99%;
 }
 .title {

src/views/set/check.vue

@@ -2,7 +2,7 @@
  <div>
 	 <div v-loading="loading" v-if="ding_enable">
 	   <workpoints :initia_arr="initia_arr" v-if="!loading" :initia_head="initia_head" :obj="obj" @initia="initia" />
-  	   <div class="all" v-else></div>
+  	   <div class="all" v-else><workpoints :initia_arr="initia_arr" :initia_head="initia_head" :obj="obj" @initia="initia" /></div>
 	 </div>
 	 <div v-else class="all">
 		 <div class="nullD">请到钉钉考勤管理后台-<span class="blue"> 工作台 </span>-<span class="blue"> 考勤打卡 </span>-<span class="blue"> 考勤报表 </span>-<span class="blue">切换新版 </span>-开启新版考勤报表功能</div>

src/views/set/jurisdiction.vue

@@ -4,9 +4,9 @@
 			<p>功道云积分系统共有5种角色，不同角色拥有不同的权限</p>
 		</el-alert>
 		<div class="all">
-			<div class="flex-box">
+			<div class="flex-box" v-loading="role_loading">
 				<div class="terr-left">
-					<el-menu default-active="0" class="el-menu-vertical-demo" style="border: none" v-loading="role_loading">
+					<el-menu default-active="0" class="el-menu-vertical-demo" style="border: none">
 						<el-menu-item
 							style="height: 47px;line-height: 47px;"
 							:index="index.toString()"
@@ -460,7 +460,9 @@ export default {
 			role_loading: false,
 			table_loading: false,
 			setUser_loading:false,
-			item_info: {},
+			item_info: {
+				// code: 'creator'
+			},
 			rules_employee_arr: { employee: [], dept: [] },
 
 			//添加人员相关

src/views/task/my_task.vue

@@ -24,6 +24,7 @@
           <el-table-column label="积分">
             <template slot-scope="scope">
               <span>{{scope.row.point_config.base_point}}</span>
+              <!-- {{scope.row.pt_name}} -->
             </template>
           </el-table-column>
           <el-table-column label="截止时间" prop="expire_time"></el-table-column>