'BUG'

src/components/EmployeeSelector.vue

@@ -336,14 +336,33 @@ export default {
         dept: this.dept_selected_list
       })
       this.close()
-    },
-    //获取员工详情
-    get_user_list() {
-      this.table_loading = true;
-      var that=this;
-	  var employee_selected_list=this.employee_selected_list;
-      if (this.employee_list.length > 0||this.isCreatorSelect) {
-        let list = this.employee_list
+	},
+	filtration(){//获取员工列表,限制已禁用的员工
+      this.$axios('get','/api/employee/index',{ dept_id: 0, page: 0,page_size: 2000}).then((res) => {
+		  if(res.data.code == 1){
+			let list = res.data.data.list
+			let data = []
+			list.forEach((item,index)=>{
+				if(item.is_official == 1){
+					data.push(item)
+				}
+			})
+			this.userdatars(data)
+		  }else{
+			this.userdatars()
+		  }
+	  }).catch(()=>{
+		this.userdatars()
+	  }).finally(()=>{
+
+	  })
+	},
+	userdatars(userlist){
+	  	var employee_selected_list=this.employee_selected_list;
+		let list = this.employee_list
+		if(userlist){
+			list = [...list].filter(x => [...userlist].some(y => y.id === x.id))
+		}
 	    list.map((item)=>{
 			 item['checked'] = false;
 			 for(var i in employee_selected_list){//判断传进来的员工是否是员工集合里的，是就设为已点击状态
@@ -354,6 +373,25 @@ export default {
 	    })
 		this.list=list;
 		this.table_loading = false;
+	},
+    //获取员工详情
+    get_user_list() {
+      this.table_loading = true;
+      var that=this;
+	  var employee_selected_list=this.employee_selected_list;
+      if (this.employee_list.length > 0||this.isCreatorSelect) {
+		this.filtration()
+		// let list = this.employee_list
+	    // list.map((item)=>{
+		// 	 item['checked'] = false;
+		// 	 for(var i in employee_selected_list){//判断传进来的员工是否是员工集合里的，是就设为已点击状态
+		// 	   if(employee_selected_list[i].id==item.id){
+		// 		 item['checked'] = true;
+		// 	   }
+		// 	 }
+	    // })
+		// this.list=list;
+		// this.table_loading = false;
         return false
       }
       this.list = []

src/home.vue

@@ -1614,16 +1614,17 @@ export default {
 	// min-height: calc(60vh - 160px);
 	margin: 10px 0 0 0;
   }
+//   ::v-deep .announDetails{
+// 	max-height: 410px;
+//   	overflow-y: auto;
+// 	*{
+// 		color: #8c8c8c !important;
+// 	}
+//   }
   .announDetails{
 	max-height: 410px;
   	overflow-y: auto;
-	//   div,p,span,ul,li{
-	// 		color: springgreen;
-	//   }
   }
-//   .announDetails *{
-// 			color: springgreen;
-//   }
 .announDetails::-webkit-scrollbar {
 	width: 9px;
 	height: 9px;

src/init.vue

@@ -44,7 +44,8 @@ export default {
 	},
 	methods: {
 		bundleOfServices(){
-			this.$dd.biz.util.openLink({
+			// this.$dd.biz.util.openLink({
+			this.$dd.biz.util.openSlidePanel({
 				url:"https://page.dingtalk.com/wow/dingtalk/act/serviceconversation?wh_biz=tm&showmenu=false&goodsCode=DT_GOODS_881607043109331&corpId="+localStorage.getItem('corpId')+"&token=5784a3e6b5e025ee891517ea814180f4",
 				onSuccess : function(result) {
 				/**/

src/views/ranking/attendance_rating.vue

@@ -228,7 +228,7 @@ export default {
       dialogVisible: false,
       checkingInGroup: [],
       event_type: [
-        { id: 0, name: "全部" },
+        { id: 0, name: "总分" },
         { id: 1, name: "迟到" },
         { id: 2, name: "早退" },
         { id: 6, name: "准时打卡" },

src/views/ranking/integral_event.vue

@@ -190,7 +190,7 @@
 									<div style="color: #303133;font-size:14px;margin-top:-2px;">
 										{{ item.name }} {{ item.remark }}
 										<strong v-show="item.point !== 0" style="font-weight: 500;">
-											<span class="color_red point" v-show="item.review_point >= 0">+{{ item.review_point }}</span>
+											<span class="color_red point" v-show="item.review_point > 0">+{{ item.review_point }}</span>
 											<span class="color_green point" v-show="item.review_point < 0">{{ item.review_point }}</span>
 										</strong>
 									</div>

src/views/subassembly/update_notice.vue

@@ -32,6 +32,7 @@
 </template>
 
 <script>
+var aS = null;
 export default {
 	data() {
 		return {
@@ -43,7 +44,7 @@ export default {
 			defaultProps: {
 				label: 'title',
 			},
-			aAtripOfDetails:{},
+			aAtripOfDetails:'',
 			detailsLoad:false,
 		};
 	},
@@ -91,8 +92,14 @@ export default {
 		},
 
 		dept_click(item) {
+			this.detailsLoad = true
 			this.articleOne = item
-			this.noticeDetails()
+			if(aS!=null){
+				clearTimeout(aS)
+			}
+			aS=setTimeout(()=>{
+				this.noticeDetails()
+			},500)
 		},
 	},
 };