0.0

src/App.vue

@@ -6,19 +6,13 @@
 <style>
   @import "assets/css/reset.css";
   @import "assets/css/iconfont.css";
+  /* @import "assets/css/iconfont.js"; */
 </style>
 <style lang="scss">
 	#app{
 		width: 100%;
 		height: 100%;
 	}
-	.icon {
-	  width: 1em;
-	  height: 1em;
-	  vertical-align: -0.15em;
-	  fill: currentColor;
-	  overflow: hidden;
-	}
 	.el-image-viewer__wrapper{
 	  z-index: 9999 !important;
 	}

src/assets/css/iconfont.svg

@@ -1,57 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2013-9-30: Created.
--->
-<svg>
-<metadata>
-Created by iconfont
-</metadata>
-<defs>
-
-<font id="iconfont" horiz-adv-x="1024" >
-  <font-face
-    font-family="iconfont"
-    font-weight="500"
-    font-stretch="normal"
-    units-per-em="1024"
-    ascent="896"
-    descent="-128"
-  />
-    <missing-glyph />
-    
-    <glyph glyph-name="xuanzhong_shouye1" unicode="&#58897;" d="M453 260.5c0 0.2 0 0.3 0.2 0.5 0.3 1.5 1.2 3.8 3.2 6.3 4.1 5.4 17.7 18.1 56 18.1 33.1 0 47.4-10 52.8-15.9 5-5.3 5.7-10 5.9-11.2V49H453V260.5z m502.2 159.6L527.9 790.5c-10.9 9.4-27 9.4-37.7-0.2L68.7 417.1c-6-5.4-9.7-13.1-9.7-21.3 0-15.7 12.8-28.5 28.5-28.5h59.2v-293.5c-1.1-10.4-3-47.9 21-75.5 11-12.5 31.6-27.6 67.2-27.6h533.6c1.4 0 2.7-0.2 4.2-0.2 12.8 0 43.9 2.6 68.6 25.2 13.6 12.7 29.9 36.2 29.9 77.2V368.3l66 2c8 0.3 15.6 3.8 20.7 9.8 10.4 11.8 9.2 29.8-2.7 40z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="kaoqin_kaoqinyuebaobiao" unicode="&#59144;" d="M768 810.7H256c-70.6 0-128-57.4-128-128v-597.3c0-70.6 57.4-128 128-128h512c70.6 0 128 57.4 128 128V682.7c0 70.5-57.4 128-128 128z m42.7-725.4c0-23.5-19.1-42.7-42.7-42.7H256c-23.5 0-42.7 19.1-42.7 42.7V682.7c0 23.5 19.1 42.7 42.7 42.7h512c23.5 0 42.7-19.1 42.7-42.7v-597.4zM640 256H384c-23.6 0-42.7-19.1-42.7-42.7s19.1-42.7 42.7-42.7h256c23.6 0 42.7 19.1 42.7 42.7S663.6 256 640 256zM695.3 619.4L557.5 482.8l-115.3 45c-15 5.9-32.2 2.7-44.2-8.2L277.1 409.5c-17.4-15.9-18.7-42.9-2.8-60.3 8.4-9.2 20-13.9 31.6-13.9 10.2 0 20.5 3.7 28.7 11.1l101.3 92.3 116.5-45.5c15.7-6.1 33.6-2.5 45.5 9.5l157.5 156.2c16.8 16.6 16.8 43.6 0.2 60.3-16.5 16.7-43.5 16.8-60.3 0.2z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shezhi_jichushezhi" unicode="&#59148;" d="M341.3 213.3c31.6 0 59.2-17.2 73.9-42.7H896c23.6 0 42.7-19.1 42.7-42.7s-19.1-42.7-42.7-42.7H415.2c-14.8-25.5-42.3-42.6-73.9-42.6s-59.1 17.1-73.9 42.6H128c-23.6 0-42.7 19.1-42.7 42.7s19.1 42.7 42.7 42.7h139.4c14.8 25.6 42.3 42.7 73.9 42.7z m341.4 256c31.6 0 59.2-17.2 73.9-42.7H896c23.6 0 42.7-19.1 42.7-42.7s-19.1-42.7-42.7-42.7H756.6c-14.8-25.5-42.3-42.6-73.9-42.6s-59.1 17.1-73.9 42.6H128c-23.6 0-42.7 19.1-42.7 42.7s19.1 42.7 42.7 42.7h480.8c14.7 25.6 42.3 42.7 73.9 42.7z m-341.4 256c31.6 0 59.2-17.2 73.9-42.7H896c23.6 0 42.7-19.1 42.7-42.7s-19.1-42.7-42.7-42.7H415.2c-14.8-25.5-42.3-42.6-73.9-42.6s-59.1 17.1-73.9 42.6H128c-23.6 0-42.7 19.1-42.7 42.7s19.1 42.7 42.7 42.7h139.4c14.8 25.6 42.3 42.7 73.9 42.7z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shezhi_jifenguize" unicode="&#59149;" d="M806.2 810.7H262.7C181.2 810.4 128 764 128 725.3v-682.6c0-38.9 53.2-85.3 134.7-85.3h498.5c81.6 0 134.7 46.4 134.7 85.3V725.3c0.1 36.7-48.4 81.4-89.7 85.4zM640 725.3v-213.1l-41.9 31.5c-25.2 18.9-60.6 19-85.9 0.1l-42.9-32.1V725.3H640z m166.2-682.6H217.8V725.3H384V469c0-24.4 13.5-46.3 35.3-57.2 9.1-4.6 18.9-6.8 28.7-6.8 13.5 0 26.9 4.3 38.2 12.8l68.9 51.5 67.9-51c19.5-14.6 45.1-17 67-6.1 21.8 10.9 35.4 32.8 35.4 57.2v256h80.8v-682.7z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shezhi_jiaose" unicode="&#59151;" d="M338.1 42.7H213.3l-5 0.3c-21.2 2.5-37.7 20.5-37.7 42.4V682.7l0.3 5c2.5 21.2 20.5 37.7 42.4 37.7H768l5-0.3c21.2-2.5 37.7-20.5 37.7-42.4V599l0.3-5c2.5-21.2 20.5-37.7 42.4-37.7 23.6 0 42.7 19.1 42.7 42.7v83.7l-0.2 7.5c-4 67.2-59.7 120.5-127.9 120.5H213.3l-7.5-0.2c-67.2-3.9-120.5-59.6-120.5-127.8v-597.3l0.2-7.5c3.9-67.2 59.6-120.5 127.8-120.5h124.8l5 0.3c21.2 2.5 37.7 20.5 37.7 42.4 0 23.5-19.1 42.6-42.7 42.6zM822.7 196.5h-64.5c53.5 22.2 91.2 74.9 91.2 136.1V480H701.2C619.5 480 553 413.8 553 332.5c0-61.2 37.7-113.8 91.2-136.1h-64.5c-66.8 0-121.1-54-121.1-120.5V20c0-40 32.7-72.6 72.9-72.6h340.3c39.6 0 71.9 32.5 71.9 72.6v56c0.1 66.4-54.2 120.5-121 120.5z m-54.8 135.1c0-37.1-29.2-66.2-66.6-66.2s-66.7 29.1-66.7 66.2c0 36.5 29.9 66.2 66.7 66.2h66.6v-66.2zM540.2 75c0 22 17.4 39.2 39.5 39.2h243c22.2 0 39.5-17.2 39.5-39.2v-47.2h-322V75zM725.3 597.3c0 23.6-19.1 42.7-42.7 42.7h-384c-23.6 0-42.7-19.1-42.7-42.7s19.1-42.7 42.7-42.7h384c23.6 0.1 42.7 19.2 42.7 42.7zM298.7 469.3c-23.6 0-42.7-19.1-42.7-42.7s19.1-42.7 42.7-42.7h170.7c23.6 0 42.7 19.1 42.7 42.7s-19.1 42.7-42.7 42.7H298.7z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shezhi_zidongjifen" unicode="&#59152;" d="M380.9 733.8C438.6 834 582.3 836.5 640.4 739.9l4.2-7.4 0.4-0.8 51.7-103.3c6.2-13.5 20.9-24.4 39.4-28.7l6.3-1.2L856 582.1c117.1-15.8 165.1-153 86.6-239l-5.4-5.7-82.8-76.7c-12.6-12.2-19.3-28.6-18.8-43.7l0.6-5.6L855 101c19-114.6-98.4-199.8-204.1-153.6l-6.9 3.2-101.7 50.7c-16.8 8.1-34.8 9-51.4 3l-6.1-2.6-104.2-52.8c-105-51.8-225 29.8-211.8 143.2l1 7.4 19 111.7c3.2 15.3-1.3 30.5-13.3 43L86.9 338c-85 82.1-40.7 219.3 73.7 242.6l7.7 1.4 114 16.4c18.5 2.7 33.9 12.2 43.1 25.8l3.1 5.3 52.4 104.3z m188.3-41.3c-22.3 42.1-82.9 43.9-109.8 6l-3.3-5.2-51.3-102.5c-20.3-39.2-57.4-66.4-101.3-75.4l-8.9-1.5L181 497.6c-49-7.6-68.6-59.8-38.9-93.9l3.8-4 81.5-77.2c35.5-29.7 52.9-74.7 46.7-118.8L254 85.4c-7.5-45.5 39.1-80.1 83.3-62.5l5.1 2.3 104.6 53c39.5 19.1 83.7 20.4 124.3 3.6l8.6-3.9 102-50.9c44.4-21.9 92.9 10.2 89.5 54.7l-0.6 5.2L752 197.3c-6.9 42.1 7.1 85.8 37.1 118.5l6.7 6.8 82.3 76.3c33.6 33.4 17.3 87.5-28.3 97.6l-5.6 1L730.1 514c-45.7 6.6-86 32.5-106.5 69.8l-54.4 108.7z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="shezhi_zuzhijiagou" unicode="&#59153;" d="M628.4 810.7c42.8 0 77.6-34.7 77.6-77.6v-155.2c0-42.8-34.7-77.6-77.6-77.6h-77.6v-77.6h196.5c18.6 0 33.9-15 36-34.3l0.2-4.5v-116.4h77.6c42.8 0 77.6-34.7 77.6-77.6v-155.2c0-42.8-34.7-77.6-77.6-77.6H628.4c-42.8 0-77.6 34.7-77.6 77.6V190.1c0 42.8 34.7 77.6 77.6 77.6h82.7v77.6H312.9v-77.6h82.8c42.8 0 77.6-34.7 77.6-77.6v-155.2c0-42.8-34.7-77.6-77.6-77.6H162.9c-42.8 0-77.6 34.7-77.6 77.6V190.1c0 42.8 34.7 77.6 77.6 77.6h77.6V384.1c0 19.9 14 36.3 32 38.5l4.2 0.3h196.5v77.6h-77.5c-42.8 0-77.6 34.7-77.6 77.6v155c0 42.8 34.7 77.6 77.6 77.6h232.7zM395.6 190.1H162.9v-155.2h232.7V190.1z m465.5 0H628.4v-155.2h232.7V190.1z m-232.7 543H395.6v-155.2h232.7V733.1z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="PC_gongzuotai_ABfen" unicode="&#59165;" d="M512 810.7c235.6 0 426.7-191 426.7-426.7S747.6-42.7 512-42.7 85.3 148.4 85.3 384 276.4 810.7 512 810.7z m0-76.8c-193.2 0-349.9-156.6-349.9-349.9S318.8 34.1 512 34.1 861.9 190.8 861.9 384 705.2 733.9 512 733.9zM753.4 384L512 142.6 270.6 384 512 625.4 753.4 384z m-108.7 0L512 516.7 379.3 384 512 251.3 644.7 384z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="dingdingPC_shezhi1" unicode="&#59173;" d="M516.8 745.5c-153.2 0-277.4-124.1-277.4-277.4 0-153.2 124.1-277.4 277.4-277.4 153.2 0 277.4 124.1 277.4 277.4-0.1 153-124.2 277.4-277.4 277.4z m0-408.9c-72.4 0-131.4 58.9-131.4 131.4s58.9 131.4 131.4 131.4S648.2 540.5 648.2 468s-59-131.4-131.4-131.4z m-251.9-46.1l-94.4-94.3c-7.5-7.5-10.4-18.5-7.6-28.8 2.7-10.2 10.9-18.2 21.2-21l80.6-21.2 21.2-80.6c2.7-10.2 10.5-18.4 21-21.2 2.6-0.6 5.2-0.9 7.7-0.9 7.7 0 15.2 3 21.1 8.8L468 163.7c-83.9 13.4-156.3 60.5-203.1 126.8z m588.4-94.3l-88.6 88.6c-48.5-65.6-122.6-111.2-207.3-122.3l131.2-131.2c5.5-5.5 13.2-8.8 21.1-8.8 2.6 0 5.2 0.3 7.7 0.9 10.2 2.7 18.2 10.9 21 21.2l21.1 80.7 80.6 21.1c10.2 2.7 18.4 10.5 21.2 21 2.5 10.2-0.5 21.2-8 28.8z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="dingdingPC_tongji1" unicode="&#59174;" d="M534.7 747.7h-45.5c-25.1 0-45.5-20.3-45.5-45.5v-636.3c0-25.1 20.3-45.5 45.5-45.5h45.5c25.1 0 45.5 20.3 45.5 45.5V702.2c0 25.1-20.4 45.5-45.5 45.5zM762 384h-45.5c-25.1 0-45.5-20.3-45.5-45.5v-272.7c0-25.1 20.3-45.5 45.5-45.5H762c25.1 0 45.5 20.3 45.5 45.5V338.5c0 25.2-20.4 45.5-45.5 45.5zM307.5 543.1H262c-25.1 0-45.5-20.3-45.5-45.5v-431.8c0-25.1 20.3-45.5 45.5-45.5h45.5c25.1 0 45.5 20.3 45.5 45.5V497.7c-0.1 25.1-20.5 45.4-45.5 45.4z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="PC_gongzuotai_renwu" unicode="&#59167;" d="M736.4 481.4L497.9 242.9 390.1 350.6c-13.7 13.7-35.9 13.7-49.6 0-13.7-13.7-13.7-35.9 0-49.6l132.3-132.3c6.9-6.9 16-10.3 25-10.2 9.1-0.1 18.2 3.3 25.1 10.2L786 431.8c13.7 13.7 13.7 35.9 0 49.6-13.7 13.7-35.9 13.7-49.6 0zM855.1 779.5H725.3v28c0 24.8-20.2 45-45 45h-301c-24.8 0-45-20.2-45-45v-27.9H204.5c-42.1 0-76.4-34.3-76.4-76.4v-708c0-42.1 34.3-76.4 76.4-76.4h650.6c42.1 0 76.4 34.3 76.4 76.4v708c0 42.1-34.3 76.3-76.4 76.3zM400 786.8h259.6v-74.7H400v74.7z m465.8-791.6c0-5.9-4.8-10.8-10.8-10.8H204.5c-5.9 0-10.8 4.8-10.8 10.8v708c0 5.9 4.8 10.8 10.8 10.8h129.8v-22.4c0-24.8 20.2-45 45-45h301c24.8 0 45 20.2 45 45V714h129.8c5.9 0 10.8-4.8 10.8-10.8l-0.1-708z"  horiz-adv-x="1024" />
-
-
-  </font>
-</defs></svg>

src/assets/css/reset.css

@@ -19,6 +19,14 @@ legend { color:#000; }
 fieldset, img { border:0; }
 button, input, select, textarea { font-size:100%; }
 table { border-collapse:collapse; border-spacing:0; }
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+
 .el-form-item__content{
 	line-height:36px !important;
 }

src/index.vue

@@ -132,6 +132,7 @@ export default {
 		}
 	},
 	created() {
+		console.log("123")
 		this.initRouter();
 		this.getEmployee()//缓存人员列表
 	},
@@ -160,17 +161,18 @@ export default {
 	methods: {
 		initRouter() {
 			this.routers = [
-				{ name: '首页', children: this.returnRoutersArr('home'), icon: 'icon-xuanzhong_shouye' },
+				{ name: '首页', children: this.returnRoutersArr('home'), icon: 'icon-shouye' },
 				{ name: 'A/B分', children: this.returnRoutersArr('abPoint'), icon: 'icon-PC_gongzuotai_ABfen' },
 				{ name: '任务', children: this.returnRoutersArr('task'), icon: 'icon-kaoqin_kaoqinyuebaobiao' },
-				{ name: '统计', children: this.returnRoutersArr('ranking'), icon: 'icon-dingdingPC_tongji' }
+				{ name: '统计', children: this.returnRoutersArr('ranking'), icon: 'icon-dingdingPC_tongji1' },
+				{ name: '福利', children: this.returnRoutersArr('welfare'), icon: 'icon-fulizhongxin'}
 			];
 			//this.$authoritys('权限名') 判断权限
 			if (this.$authoritys('creator') || this.$authoritys('admin') || this.$authoritys('point_manager') || this.$authoritys('dept_manager')) {
-				this.routers.splice(3, 0, { name: '工作台', children: this.returnRoutersArr('workbench'), icon: 'icon-PC_gongzuotai_renwu' });
+				this.routers.splice(3, 0, { name: '工作台', children: this.returnRoutersArr('workbench'), icon: 'icon-shezhi_jifenguize' });
 			}
 			if (this.$authoritys('creator') || this.$authoritys('admin') || this.$authoritys('point_manager')) {
-				this.routers.push({ name: '设置', children: this.returnRoutersArr('set'), icon: 'icon-dingdingPC_shezhi' });
+				this.routers.push({ name: '设置', children: this.returnRoutersArr('set'), icon: 'icon-dingdingPC_shezhi1' });
 			}
 			//this.returnRoutersArr('set',true) 加true表示不限制路由
 			this.routers_one = this.returnRoutersArr('set', true);

src/router/index.js

@@ -310,6 +310,42 @@ const routes = [{
 					groupCode: 'workbench',
 				}
 			},
+			{
+				path: '/flManagement',
+				name: '功勋点管理',
+				component: () => import( /* webpackChunkName: "approval_list" */'@/views/welfare/flManagement.vue'),
+				meta: {
+					icon: 'icon-shezhi_gongdaolbiao',
+					groupCode: 'welfare',
+				}
+			},
+			{
+				path: '/flStatistics',
+				name: '功勋点统计',
+				component: () => import( /* webpackChunkName: "approval_list" */'@/views/welfare/flStatistics.vue'),
+				meta: {
+					icon: 'icon-shezhi_gongdaolbiao',
+					groupCode: 'welfare',
+				}
+			},
+			{
+				path: '/prize',
+				name: '奖票清单',
+				component: () => import( /* webpackChunkName: "approval_list" */'@/views/welfare/prize.vue'),
+				meta: {
+					icon: 'icon-shezhi_gongdaolbiao',
+					groupCode: 'welfare',
+				}
+			},
+			{
+				path: '/conversion',
+				name: '兑换记录',
+				component: () => import( /* webpackChunkName: "approval_list" */'@/views/welfare/conversion.vue'),
+				meta: {
+					icon: 'icon-shezhi_gongdaolbiao',
+					groupCode: 'welfare',
+				}
+			},
 		]
 	},
 	{

src/views/set/framework.vue

@@ -157,17 +157,10 @@
 		
 		<el-dialog :close-on-click-modal="false" ref="EditInformation_list" title="员工详情" width="500px" :before-close="detailFormreturn" :visible.sync="diaTableVisible">
 			<div style="padding-right:50px;">
-				<!-- <el-table-column prop="id" label="员工标识" width="80">
-					<template slot-scope="scope">
-						<el-button size="mini" type="primary">复制</el-button>
-					</template>
-				</el-table-column> -->
-				
 			<el-form ref="detailForm" :model="messageMore"  @submit.native.prevent v-loading="show_loading">
 				<el-form-item label="员工标识" prop="id" :label-width="'100px'">
 					<el-input v-model="copyIds" disabled auto-complete="off"></el-input>
 					<span style="position:absolute;top:1px;right:7px;font-size:12px;color:#61aeff;cursor:pointer;" @click="copyToClipboard()">点击复制</span>
-					<!-- <el-button size="mini" type="primary" @click="copyId(messageMore.id)">复制</el-button> -->
 				</el-form-item>
 				<el-form-item label="姓名" prop="name" :label-width="'100px'">
 					<el-input v-model="messageMore.name" disabled ref="inputName" auto-complete="off"></el-input>
@@ -186,14 +179,12 @@
 					<el-input v-model="deptList" disabled ref="inputName" placeholder="暂无部门"  auto-complete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="是否参与排名" prop="name" :label-width="'100px'">
-					<span v-if="messageMore.is_creator != 1"
-						class="participateRank"
+					<span v-if="messageMore.is_creator != 1" class="participateRank"
 						:style="messageMore.is_ranking == 1 ? 'color:#409eff' : 'color:#F56C6C'"
 						@click="rankingtakePartIn(messageMore.id, messageMore.is_ranking)">
 							{{ messageMore.is_ranking == 1 ? '参与' : '不参与' }}
 					</span>
 					<span v-else class="fontColorB">不参与</span>
-					<!-- <div class="rankingcla">参与排名在排名中显示此人</div> -->
 				</el-form-item>
 				<el-form-item label="管理上级" prop="name" :label-width="'100px'">
 					<el-input auto-complete="off" v-model="propList" :disabled="messageMore.is_creator == 1 || messageMore.is_official == 0"  placeholder="暂无管理上级"></el-input>
@@ -254,6 +245,7 @@
 				ref="Employee2"
 				:employee_list="employeeList"
 				:user_no_select="false"
+				:close_clear_data="false"
 				isCreatorSelect
 				createDimness
 				:selected="selected_manage"
@@ -264,12 +256,14 @@
 				<el-button type="primary" :loading="scope_loading" :disabled="scope_loading" @click="sub_manageScope">完成</el-button>
 			</span>
 		</el-dialog>
+		
 		<el-dialog title="设置直属上级" :visible.sync="dirSupScope_show" :before-close="publicClose3" top="5vh" width="700px">
 			<EmployeeSelector
 				v-if="dirSupScope_show"
 				:max="1"
 				ref="Employee3"
 				:multi="false"
+				:close_clear_data="false"
 				:employee_list="dirSupList"
 				isCreatorSelect
 				:selected="selected_dirSup"
@@ -413,11 +407,6 @@ export default {
 			})
 		},
 		dirSup_confirm(date){
-			// if(date.employee.length == 0) {
-			// 	this.$message.warning('请选择上级')
-			// 	this.scope_loading = false
-			// 	return
-			// }
 			let data = {
 				employee_ids: [this.newId],
 				superior_id: date.employee.length > 0 ? date.employee[0].id : null
@@ -974,23 +963,6 @@ export default {
 		font-weight: normal;
 		transition: 0.35s ease-in-out;
 	}
-	// ::v-deep .is-current .el-tree-node__content .el-icon-caret-right {
-	// 	color: #409eff !important;
-	// }
-	// ::v-deep .is-current .el-tree-node__content .el-tree-node__label {
-	// 	color: #409eff !important;
-	// }
-	// ::v-deep .is-current .el-tree-node__children .el-icon-caret-right {
-	// 	color: #c0c4cc !important;
-	// }
-	// ::v-deep .is-current .el-tree-node__children .el-tree-node__label {
-	// 	color: #606266 !important;
-	// }
-	// ::v-deep .is-current .name {
-	// 	color: #409eff !important;
-	// 	font-weight: normal;
-	// 	transition: 0.35s ease-in-out;
-	// }
 }
 .participateRank {
 	cursor: pointer;