'1.1.2.2'

src/assets/css/reset.css

@@ -2,8 +2,8 @@ body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, dl, dt, dd, ul, ol, li, pre, fo
 body, button, input, select, textarea {
 	font-size:14px;
   color: #303133;
-    font-family:"楷体","楷体_GB2312";
-    /* font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif; */
+    /* font-family:"楷体","楷体_GB2312"; */
+    font-family: "Source Sans Pro", "Helvetica Neue", Arial, sans-serif;
 	-webkit-font-smoothing: antialiased;
 	-webkit-tap-highlight-color: transparent;
 }

src/router/index.js

@@ -161,7 +161,7 @@ const routes = [{
 					icon: 'icon-shezhi_jichushezhi',
 					groupCode:'ranking',
 					identification:3,
-					jurisdiction :['employee']
+					jurisdiction :['dept_manager','employee']
 				}
 			  },
 			{

src/views/ranking/lotteryTicket_statistics.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row :span="24" style="display:flex;min-width:650px;">
-      <el-col style="width:200px;">
+      <el-col style="width:200px;padding-right:5px;">
         <el-date-picker
           v-model="formData.month"
           type="month"

src/views/set/jurisdiction.vue

@@ -13,7 +13,6 @@
 							v-for="(item, index) in role_list"
 							:key="index"
 							@click="open_right(item)"
-							v-show="item.code !== 'employee'"
 						>
 							<i class="el-icon-s-custom"></i>
 							<span slot="title">{{ item.name }}</span>
@@ -26,7 +25,7 @@
 							<div class="name">{{ item_info.name }}</div>
 							<div class="flex-1"></div>
 							<el-button type="text" size="medium" style=" padding: 0; line-height: initial;" v-show="item_info.code !== 'creator'" @click="dataAccessPopup">数据查看权限</el-button>
-							<el-button type="text" size="medium" plain @click="open_right(item_info)">刷新</el-button>
+							<el-button type="text" size="medium" plain v-if="item_info.code != 'employee'" @click="open_right(item_info)">刷新</el-button>
 						</div>
 						<div class="user_text fontColorF" v-if="item_info.code == 'creator'">创始人默认为开通【功道云积分制】的人，拥有所有的功能及管理权限</div>
 						<div class="user_text fontColorF" v-if="item_info.code == 'admin'">公司管理员一般为合伙人、股东等高级管理人员，可管理多个部门和人员</div>
@@ -34,13 +33,13 @@
 						<div class="user_text fontColorF" v-if="item_info.code == 'dept_manager'">部门管理员一般为部门/团队经理、主管、组长，可管理一部分人员</div>
 						<div class="user_text fontColorF" v-if="item_info.code == 'employee'">员工为默认角色，每个人都拥有员工角色的功能权限，该角色不可修改</div>
 					</div>
-					<div class="flex-box btns flex-v-ce margin-bottom">
+					<div class="flex-box btns flex-v-ce margin-bottom" v-if="item_info.code != 'employee'">
 							<el-button size="small" v-show="item_info.code == 'creator' && table_list.length > 1 && isStart" @click="del_creator" type="danger">删除</el-button>
 							<el-button size="small" v-show="item_info.code == 'creator' && isStart" @click="dialogFormVisible=true" type="primary">添加</el-button>
 							<el-button size="small" v-show="item_info.code != 'creator' && table_list.length > 0" @click="del_item" type="danger">删除</el-button>
 							<el-button size="small" v-show="item_info.code != 'creator'" @click="add_item" type="primary">添加</el-button>
 					</div>
-					<div v-if="item_info.code == 'creator'||item_info.code == 'employee'">
+					<div v-if="item_info.code == 'creator'">
 						<el-table :data="table_list"  v-loading="table_loading">
 							<el-table-column width="40" fixed  v-if="item_info.code == 'creator' && table_list.length > 1 && isStart">
 								<template slot-scope="scope">
@@ -78,6 +77,9 @@
 							</template>
 						</div> -->
 					</div>
+					<div v-else-if="item_info.code == 'employee'" style="text-align:center;margin-top:200px;">
+						未设置管理角色的人员，都是普通员工
+					</div>
 
 					<el-table :data="table_list" fit v-else   v-loading="table_loading">
 						<el-table-column width="40" fixed>
@@ -563,15 +565,15 @@ export default {
 			      {name: '查看全员数据', id: 3}
 			    ]
 			  },
-			  {
-			    title: '团队绩效',
-			    name: 'performance_range',
-			    code: 0,
-			    list: [
-			      {name: '仅查看自己的数据', id: 1},
-			      {name: '查看全员数据', id: 2},
-			    ]
-			  }
+			//   {
+			//     title: '团队绩效',
+			//     name: 'performance_range',
+			//     code: 0,
+			//     list: [
+			//       {name: '仅查看自己的数据', id: 1},
+			//       {name: '查看全员数据', id: 2},
+			//     ]
+			//   }
 			],
 		};
 	},
@@ -600,19 +602,21 @@ export default {
 		  self.dataAccessLoading = true
 		  self.$axios('get','/api/role/range',{role_id: self.item_info.id}).then((res) => {
 		    if (res.data.code == 1) {
-		      const resData = res.data.data
-		      if(this.item_info.id != '909'){
+			  const resData = res.data.data
+			  console.log(this.item_info)
+		      if(this.item_info.code != 'employee'){
 		        self.dataAccessList.forEach(element => {
 		          element.name == 'event_range'?element.code = resData.event_range:''
 		          element.name == 'prize_range'?element.code = resData.prize_range:''
-		          element.name == 'performance_range'?element.code = resData.performance_range:''
-		          element.name == 'statistics_range'?element.code = resData.statistics_range:''
+		        //   element.name == 'performance_range'?element.code = resData.performance_range:''
+		        //   element.name == 'statistics_range'?element.code = resData.statistics_range:''
 		        });
 		      }else{
 		        self.dataAccessListEmployee.forEach(element => {
 		          element.name == 'event_range'?element.code = resData.event_range:''
-		          element.name == 'performance_range'?element.code = resData.performance_range:''
-		        });
+		        //   element.name == 'performance_range'?element.code = resData.performance_range:''
+				});
+				console.log(self.dataAccessListEmployee)
 		      }
 		    } else {
 		      self.$message.error(res.data.msg)
@@ -631,9 +635,8 @@ export default {
 		  self.jurisdiction.forEach(element => {
 		    data[element.name] = element.code
 		  });
-		  if(self.item_info.id == '909'){
-		    data.prize_range = '1',
-		    data.statistics_range = '1'
+		  if(self.item_info.code == 'employee'){
+		    data.prize_range = '1';
 		  }
 		  data.performance_range="1";
 		  data.statistics_range="1";
@@ -942,7 +945,9 @@ export default {
 		open_right(data) {
 			this.jurisdiction=data.code=='employee'? this.dataAccessListEmployee:this.dataAccessList;
 			this.item_info = data;
-			this.get_table_list();
+			if(data.code!='employee'){
+				this.get_table_list();
+			}
 		},
 		get_table_list() {
 			this.table_loading = true;

src/views/set/rule.vue

@@ -76,8 +76,8 @@
 			</div>
 		</el-dialog> -->
 		
-		<el-dialog @close="closeCode" :visible.sync="innerVisible" width="400px" append-to-body>
-			<div style="border-radius: 15px;border: 1px solid #f1f1f1;padding: 10px; width: 223px;box-sizing: border-box;margin: 0 auto;">
+		<el-dialog @close="closeCode" :visible.sync="innerVisible" width="444px" append-to-body>
+			<div style="border-radius: 15px;border: 1px solid #f1f1f1;padding: 10px; width: 346px;box-sizing: border-box;margin: 0 auto;">
 				<div id="qrcode" ref="qrcode"></div>
 			</div>
 			<div class="qrcodesave" ><span @click.stop="downloadE">下载保存此二维码</span></div>
@@ -397,7 +397,7 @@ export default {
 			var canvasData = this.$refs.qrcode.getElementsByTagName('canvas')
 			var a = document.createElement("a");
 			var event = new MouseEvent("click"); // 创建一个单击事件
-			a.href = canvasData[0].toDataURL("image/png");;
+			a.href = canvasData[0].toDataURL("image/png");
 			a.download = rule_remark;
 			a.dispatchEvent(event); // 触发a的单击事件
 		},
@@ -410,9 +410,9 @@ export default {
 			let urls = url+appid+corpId+page
 			var qrcode = new QRCode('qrcode', {
 				text: urls, // 二维码内容
-				width: 200,
-				height: 200,
-				// render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
+				width: 325,
+				height: 325,
+				render: 'table', // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
 				colorDark: '#34373e', // 二维码色
 				colorLight: '#ffffff', // 背景色
 				correctLevel: QRCode.CorrectLevel.H // 容错等级，H是heigh，最高，所以二维码看起来很密

src/views/task/my_issue.vue

@@ -96,7 +96,7 @@
 
       <div v-if="status == 'reward'">
         <el-table :data="list" style="width: 100%" v-loading="loading" @row-click="rewardTasksClick">
-          <el-table-column label="执行人" prop="employee_id">
+          <el-table-column label="发布人" prop="employee_id">
             <template slot-scope="scope">
               <div style="display:flex">
                 <userImage class="fl" width="50px" height="50px" :id="scope.row.owner_id" :img_url="scope.row.owner_img_url" :user_name="scope.row.owner_name" ></userImage>