1

src/components/public/EmployeeSelector.vue

@@ -212,7 +212,12 @@ export default {
       //是否必须选择人员或者部门
       type: Boolean,
       default: false
-    }
+    },
+	include_deleted:{
+		//是否查询已被删除的人员
+		type: Boolean,
+		default: false
+	}
   },
   name: 'EmployeeSelector',
   data() {
@@ -575,8 +580,17 @@ export default {
     //获取人员
     get_user_list() {
       this.table_loading = true;
-      this.$axios('get', '/api/per/user/employee_list', { dept_id: this.dept_select_id,page: 1, page_size: 10000,official:1})
-        .then(res => {
+	  let data={
+		dept_id: this.dept_select_id,
+		page: 1,
+		page_size: 10000,
+		official:1
+	  }
+	  if(this.include_deleted){
+		  data.include_deleted=1;
+		  data.official=2;
+	  }
+      this.$axios('get', '/api/per/user/employee_list', data).then(res => {
           let list = this.filtration(res.data.data.list);
           // 当有指定显示列表时
           if (this.is_employee_list) {

src/index.vue

@@ -259,7 +259,7 @@ export default {
 				this.$setDeptTree(res.data.data);
 			});
 			//获取绩效人员列表（包含已被删除的人员）
-			this.$axios('get', '/api/per/user/employee_list', { page_size: 0, page: 0 }).then(res => {
+			this.$axios('get', '/api/per/user/employee_list', { page_size: 0, page: 0,include_deleted:1 }).then(res => {
 				if (res.data.code == 1) {
 					var list = res.data.data.list;
 					const data = {};

src/views/assessManagement/assessDetails.vue

@@ -267,6 +267,7 @@
 			:can_select_employee="true"
 			:isRequired="true"
 			:is_employee_list="true"
+			:include_deleted="true"
 			:employee_list="employee_list"
 			:visible.sync="isShowUser2"
 			@confirm="confirmUser2"

src/views/assessManagement/staffAssDet.vue

@@ -176,9 +176,6 @@
 								  结果值： <span>{{ scope.row.result + '' + scope.row.unit }}</span>
 							  </template>
 							  <template v-if="scope.row.result_file">
-<!-- 								<div v-if="scope.row.result_file.images.length>0">
-								  <div style="margin-bottom: 3px;cursor: pointer;" class="blue" v-for="(item, index) in scope.row.result_file.images" :key="index" @click="onFilePreView(item)">{{ item.name }}</div>
-								</div> -->
 								<div v-if="scope.row.result_file.append.length>0">
 								  <div style="margin-bottom: 3px;cursor: pointer;" class="blue" v-for="(item, index) in scope.row.result_file.append" :key="index" @click="openImg(item)">{{ item.fileName }}</div>
 								</div>
@@ -1444,7 +1441,6 @@ export default {
 								}
 								this.nowFLow = item.code;
 								this.atPresentFlow = item.id;
-								
 								this.setBtn(item); //其他按钮控制
 								if (item.code == 'target' || item.code == 'confirm') {
 									//当是目标制定，目标确认时，隐藏调整目标按钮
@@ -1472,18 +1468,19 @@ export default {
 							item.remarks = remName;
 							item.remarkDel = item.remark.split('：')[0];
 						});
-						
 						if (this.atPresentFlow == 0) {
 							//如果当前节点id为0，代表此考核详情已完毕，把最后一个节点作为当前节点
 							this.atPresentFlow = data.flow[data.flow.length - 1].id;
 							// 判断抄送节点里是否包含当前登录者
 							let cs = data.flow[data.flow.length - 1];
-							cs.target.some(item => {
-								if (item.employee_id == this.userInfo.id) {
-									this.isCs = true;
-									return true;
-								}
-							});
+							if(cs.code=='cc'){  //判断最后一个节点是否抄送节点
+								cs.target.some(item => {
+									if (item.employee_id == this.userInfo.id) {
+										this.isCs = true;
+										return true;
+									}
+								});
+							}
 						}
 
 						//整合表格格式
@@ -1588,6 +1585,7 @@ export default {
 									}
 								}
 							}
+							
 							if (item.employee_id == executor.employee_id) {
 								//判断当前评分数据是否 与 执行节点的当前帐号一致
 								if (poiSco[executor.newCode] == '2') {
@@ -1616,7 +1614,6 @@ export default {
 							if (poiSco[item.newCode] == '1' && item.employee_id == this.userInfo.id) {
 								item.poiSco = true;
 							} else if (poiSco[item.newCode] == '2') {
-								
 								//当前 评分 数据权限等于2时并且 （当前数据id为登陆账号  或  执行中权限等于2（代表当前登陆账号为执行中的一员 或 审批权限等于2（代表当前登陆账号为审批中的一员）） 时，所有评分都可见
 								if (item.employee_id == this.userInfo.id || poiSco[executor.newCode] == '2' || poiSco[review.newCode] == '2') {
 									poiSOk = true;
@@ -1640,6 +1637,8 @@ export default {
 								item.poicom = true;
 							}
 						});
+						// console.log(poiSOk,this.isCs,this.$getRole(1))
+						// return false
 						//遍历列表总分
 						let scoreListInfo = [];
 						let totSco = false;
@@ -1669,8 +1668,13 @@ export default {
 						});
 						points.sort(this.rule('id')); //跟距ID排序
 						
+						console.log(points)
 						this.lingScore_infos = points; //表格   评分、说明    头部
 
+
+
+
+
 						let toScore = {
 							theDimension: '总分',
 							wdLeg: 0,