Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

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

@@ -1606,16 +1606,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/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/custom_rank.vue

@@ -53,7 +53,7 @@
               value-format="Q"
             ></el-date-picker> -->
 
-            <Season :defaultHint="true" :isActive="true" class="date-picker-width" @confirm="export_quarter_confirm"></Season>
+            <Season ref="Seasons" :defaultHint="true" :isActive="true" class="date-picker-width" @confirm="export_quarter_confirm"></Season>
           </el-form-item>
 
           <!-- <el-form-item label="规则分类" label-width="70px" >
@@ -407,8 +407,6 @@ export default {
       this.open_right(this.clickItem);
     },
     // "time.quarter"(val, old_val) {
-    //   console.log(val)
-    //   console.log(old_val)
     //   this.params.quarter = val
     //   // this.params.page = 1;
     //   // this.open_right(this.clickItem);
@@ -547,7 +545,6 @@ export default {
     recursion(data, arr) {
       for (let i in data.child) {
         if (data.child.length != 0) {
-          console.log(data.id);
           arr.push(data.id);
         } else {
           arr.push(data.id);
@@ -608,7 +605,6 @@ export default {
     },
     //默认选中
     toggleSelection(rows, selected) {
-      // console.log(rows)
       if (rows) {
         this.$nextTick(() => {
           rows.forEach(row => {
@@ -669,7 +665,6 @@ export default {
     export_quarter_confirm(val) {
       this.time.quarter = val;
       this.params.page = 1;
-      console.log("1")
       this.open_right(this.clickItem);
     },
     // 树型菜单点击筛选
@@ -746,7 +741,7 @@ export default {
             self.newGroupForm.group_name = res.data.data.name;
             this.loading = false;
             if (!ifs) {
-              this.open_right(item);
+              this.open_right(item,true);
             }
           } else {
             self.$message.error(res.data.data.msg);
@@ -833,6 +828,8 @@ export default {
             if (self.popupType) {
               self.popupType = false;
               this.getGroupsList();
+            }else{
+              self.getGroupsList(self.clickItem.id); //传入当前ID.为了修改后页面不切换
             }
             self.$message.success(res.data.msg);
             const resData = res.data.data;
@@ -843,7 +840,6 @@ export default {
             }); //左边分组
             self.groupShow = false;
             // if (!self.popupType) {
-            self.getGroupsList(self.clickItem.id); //传入当前ID.为了修改后页面不切换
             // self.open_right(self.clickItem)
             // }
             this.employees = '';
@@ -895,7 +891,20 @@ export default {
       this.params.page_size = val;
       this.open_right(this.clickItem);
     },
-    open_right(item) {
+    open_right(item,tim) {
+      if(tim){
+        // console.log(this.newGroupForm.date_interval)
+        this.time = {
+          year: moment().format('YYYY'), //年
+          quarter: moment().format('YYYYQ'), //季度
+          month: moment().format('YYYY-MM') //月
+        }
+        if(this.$refs.Seasons){
+          if(this.newGroupForm.date_interval == 2){
+            this.$refs.Seasons.choseQuarter = ''
+          }
+        }
+      }
       this.valuesOrLength = [];
       let self = this;
       self.table_loading = true;
@@ -955,7 +964,7 @@ export default {
               if (atPresent) {
                 for (let i in self.groups_list) {
                   if (atPresent == self.groups_list[i].id) {
-                    self.open_right(self.groups_list[i]);
+                    // self.open_right(self.groups_list[i]);
                     self.getGroupsInfo(self.groups_list[i]);
                   }
                 }

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/set/rule.vue

@@ -405,7 +405,6 @@ export default {
 			// let corpId = '&corpId=ding011f57ab048cf202ffe93478753d9884'
 			let page = '&page='+encodeURIComponent(`pages/workbench/apply/apply?id=${encodeURIComponent(row)}`)//encodeURIComponent('小米')
 			let urls = url+appid+corpId+page
-			console.log(urls)
 			var qrcode = new QRCode('qrcode', {
 				text: urls, // 二维码内容
 				width: 325,
@@ -806,15 +805,19 @@ export default {
 		},
 
 		handleNodeClick(e) {
-			var items = this.getItemData(e);
-			this.selectItem = {
-				child: e.child,
-				id: e.id,
-				name: e.name,
-				pid: e.pid
-			};
-			this.flName = e.name;
-			this.item_list = items;
+			if(e.id){
+				var items = this.getItemData(e);
+				this.selectItem = {
+					child: e.child,
+					id: e.id,
+					name: e.name,
+					pid: e.pid
+				};
+				this.flName = e.name;
+				this.item_list = items;
+			}else{
+				this.selectItem = { name: '积分规则' };
+			}
 		},
 		getItemData(e) {
 			var ids = [];
@@ -867,8 +870,6 @@ export default {
 					that.rule_tree = res.data.data.rule_tree || [];
 					that.item_list = list;
 					that.all_item_list = list;
-					
-					// console.log(this.selectItem)
 					if (is) {
 						that.handleNodeClick(that.selectItem);
 					} else {

src/views/set/systemLayout.vue

@@ -4,7 +4,7 @@
         <el-tab-pane label="基本设置" name="first">
             <div class="integralApproval">
                 <b>积分审批</b>
-                <p>当前系统审批流程<a>查看图例</a></p>
+                <p>当前系统审批流程<a @click="approvalProcess">查看图例</a></p>
                 <div style="margin-top:10px;"><span>指定规则的审批或奖扣分，均可直接通过</span>
 					<el-tooltip placement="top">
 					  <div class="toolCont" slot="content">开启后，按照系统已有的积分规则制度提交的审批或者奖扣可即使审批人/录分人的权限分不足，也能审批通过</div>
@@ -30,6 +30,17 @@
             <el-button type="primary" class="save" @click="saveFirst('second')">保存</el-button>
         </el-tab-pane>
     </el-tabs>
+
+    <el-dialog
+    title="系统审批流程"
+    :visible.sync="dialogVisible"
+    width="770px"
+    top="3vh"
+    :before-close="handleClose">
+    <svg-icon icon-class="approval_process" style="font-size:730px;"/>
+            <!-- <img src="@/assets/image/approval_process.png" alt="" style="width:100%;height:100%;"> -->
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -51,7 +62,8 @@ export default {
             {title:'管理者奖扣分执行情况通知',switchs:1,ram:'每周给管理者推送当月的奖扣分执行情况'},
             {title:'任务通知',switchs:2,ram:'每天定时推送收到任务的通知'},
             {title:'审批通知',switchs:3,ram:'每天定时推送收到审批的通知'},
-        ]
+        ],
+        dialogVisible:false,
     };
   },
   components: {
@@ -64,6 +76,12 @@ export default {
       this.cheakAx('first')
   },
   methods: {
+    approvalProcess(){
+        this.dialogVisible = true
+    },
+    handleClose(none){
+        none()
+    },
     handleClick(tab, event) {
         this.cheakAx(this.activeName)
     },

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)
 		},
 	},
 };