0.0

src/api/axios.js

@@ -47,7 +47,7 @@ service.interceptors.response.use(
 				type: 'error',
 			})
 			return Promise.reject(response.data.msg)
-		}else if(response.data.code === 2001){ //免登时用，2001为过期
+		}else if(response.data.code === 5555){ //免登时用，5555为过期
 			if(url=='/api/ding/login'){
 				return response;
 			}else{

src/components/evaluate/BasicMessage.vue

@@ -5,7 +5,7 @@
       <div class="title">分组信息</div>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
         <el-form-item label="考核表名称:" prop="name">
-          <el-popover placement="right" width="400" trigger="hover" v-model="visible">
+          <el-popover placement="right" width="400" trigger="hover" key="2">
             <div class="fontColorB">
               考核表用来做什么？
               <br />
@@ -18,6 +18,7 @@
             show-word-limit maxlength="100"
             ></el-input>
           </el-popover>
+		  <span style=" position: relative;left:10px;top:-10px;cursor: pointer;" class="blue" @click="isRule=true">示例</span>
         </el-form-item>
         <el-form-item label="考核周期">
           <el-radio-group v-model="ruleForm.cycle_type">
@@ -26,7 +27,7 @@
         </el-form-item>
         <el-form-item label="考核表管理员">
 			
-		<el-popover placement="right" key="1" width="400" trigger="hover" v-model="visible">
+		<el-popover placement="right" key="1" width="400" trigger="hover" >
 		  <div class="fontColorB">
 			考核表管理员用来做什么？
 			<br />
@@ -60,6 +61,18 @@
         </el-form-item>
       </el-form>
     </div>
+	
+	<!-- 示例 -->
+	<el-dialog title="示例" :visible.sync="isRule" width="700px" :close-on-click-modal="false">
+		<div>
+		<img src="@/assets/image/sl2.png" alt="" srcset="" style="width: 100%;">
+		</div>
+		<span slot="footer" class="dialog-footer">
+			<div class="flex-box-end">
+				<el-button @click="isRule = false">关 闭</el-button>
+			</div>
+		</span>
+	</el-dialog>
 
     <!-- 选择子管理员 -->
     <EmployeeSelector :selected="selected"  title="选择被考核人" :visible.sync="setAdministrator" :is_filtration_creator="false" @confirm="confirmAdministrator" />
@@ -112,7 +125,9 @@ export default {
   props:{
     data:{
       type:Object,
-      default:{}
+      default:()=>{
+		  return {}
+	  }
     }
   },
   data() {
@@ -134,6 +149,7 @@ export default {
         name: [{ required: true, message: '请输入考核表名称', trigger: 'blur' }, { min: 2, message: '长度最少为2个字符', trigger: 'blur' }],
         employee_ids: [{ required: true, message: '请选择被考核人员', trigger: 'change' }],
       },
+	  isRule:false,
     };
   },
   watch: {

src/components/evaluate/Flow.vue

@@ -114,7 +114,10 @@
 							<el-form-item>
 								<div class="form-titem">抄送人:</div>
 								<el-radio-group v-model="cc.type">
-									<el-radio :label="1">管理员</el-radio>
+									<el-radio :label="1">部门主管（指定一级）
+									<el-tooltip class="item" effect="dark" content="指定某一级主管" placement="top-start">
+										<i class="fontColorF el-icon-warning"></i>
+									</el-tooltip></el-radio>
 									<el-radio :label="2">指定成员</el-radio>
 								</el-radio-group>
 								<div class="flex-box-ce" style="margin-top: 10px;" v-show="cc.type == 1">

src/components/evaluate/Template.vue

@@ -77,7 +77,7 @@
 		</div>
 		<div class="flex-box-ce pop-up">
 			<el-button type="primary" @click="addDimensionality = true"><i class="el-icon-plus"></i>添加考核维度</el-button>
-			<el-popover placement="bottom" width="500" trigger="hover">
+			<el-popover placement="bottom" width="600" trigger="click">
 				<div>考核维度是考核指标的归类和大纲，可包含硬指标和软指标，也可以有业绩或者行为考核，如下图的业务员考核，划分两大维度：【工作能力】和【行为素养】</div>
 				<img  src="@/assets/image/sltw.png" style="width: 100%;"/>
 				<span class="blue" slot="reference">示例说明</span>

src/components/public/TrackManagement.vue

@@ -262,6 +262,7 @@ export default {
 						isFiltration = false;
 						this.isOperation = false;
 					}
+					
 					if (this.recordMemberIds.length > 0) {
 						//指定管理记录人中包含自己，就可操作
 						this.recordMemberIds.some(item => {
@@ -271,7 +272,7 @@ export default {
 								return true;
 							}
 						});
-					}
+					}	
 					let superior_list = res.data.data;
 					superior_list.some(item => {
 						//判断被考核人的上级是否包含登录者
@@ -283,7 +284,7 @@ export default {
 					});
 					if (this.$getEmployeeList()[this.userData.id].is_creator == 1) {
 						//如果是创始人也可以操作
-						isFiltration = false;
+						isFiltration = false;	
 						this.isOperation = true;
 					}
 					if (this.$isAuthoritys(3)) {
@@ -291,7 +292,6 @@ export default {
 						isFiltration = false;
 						this.isOperation = true;
 					}
-
 					if (isFiltration) {
 						//当只是管理记录人员时设置指定数据
 						let actionPlanList = JSON.parse(JSON.stringify(this.apList));
@@ -395,9 +395,7 @@ export default {
 		},
 		//获取上级列表
 		async superiorList(id) {
-			return this.$axios('get', '/api/per/user/manager_list', {
-				id_code: this.$returnCode(id)
-			});
+			return this.$axios('get', '/api/per/user/manager_list', {id_code: this.$returnCode(id)});
 		},
 		// 图片上传
 		beforeUpload(file) {
@@ -632,6 +630,7 @@ export default {
 		activeItem(index, index2, item) {
 			this.selectItemIndex = item.dimension_xb;
 			this.isOperationTwo = item.isOperation;
+			console.log(item)
 			if (this.activeDrawerIndex == index + '-' + index2) {
 				return false;
 			}

src/components/set/EvaluateSet.vue

@@ -10,7 +10,10 @@
     </header>
     <div class="main">
       <div style="margin-top: 20px;">
-        <div class="yellow" v-if="isUpdata">刚刚操作了【{{isUpdata}}】，你可以 “<span class="blue" @click="$router.push({ path: '/sponsorAssess' })">发起考核</span>” 或继续 “<span class="blue" @click="handleCommand('A')">新增考核表</span>” </div>
+		<template v-if="isUpdata">
+			<div class="yellow" v-if="$isAuthoritys($7)">刚刚操作了【{{isUpdata}}】，你可以 “<span class="blue" @click="$router.push({ path: '/sponsorAssess' })">发起考核</span>” 或继续 “<span class="blue" @click="handleCommand('A')">新增考核表</span>” </div>
+			<div class="yellow" v-else>刚刚操作了【{{isUpdata}}】，你可以继续 “<span class="blue" @click="handleCommand('A')">新增考核表</span>” </div>
+		</template>
         <el-table stripe :data="tableData" class="table-box scroll-bar" style="width: 100%;" v-loading="loading">
           <el-table-column prop="name" width="600px" sortable label="名称">
             <template slot-scope="scope">

src/hint.vue

@@ -29,10 +29,8 @@ export default {
 		var url = window.location.href;
 		// let url='https://test-ding.g107.com/?purchaseToken=$PURCHASE_TOKEN$&corpId=$CORPID$&appEntityType=PC#/hint';
 		var data = this.GetRequest(url);
-		console.log(JSON.stringify(data))
 		this.corpId = data.corpId;
 		this.token = data.purchaseToken;
-		console.log(this.token)
 		if(data.appEntityType.indexOf('APP')>=0){
 			this.type ='APP';
 		}else{
@@ -61,13 +59,13 @@ export default {
 			// 开发者自行判断调用这个方法的时机
 			openTryoutSku({
 				// corpId可以从应用首页的url上获取到
-				// corpId: this.corpId,
-				corpId:'ding92ee17791e311bdfa1320dcb25e91351',
+				corpId: this.corpId,
+				// corpId:'ding033cf29e58adb277f2c783f7214b6d69',
 				// 应用的appId
 				appId: 109758,
 				// 从应用首页的url上获取到，url上参数名为 purchaseToken。
 				// purchaseToken如何配置参照下文”配置入口地址“章节。
-				// token: this.token,
+				token: this.token,
 				miniAppId: this.type == 'APP' ? 5000000002664231 : '' // 如果是三方小程序应用，需要设置一下自身的miniAppId。H5微应用可以不设置这个参数
 			}).then(res => {
 				const {

src/main.js

@@ -70,7 +70,7 @@ Vue.component('BrawerBox', BrawerBox)
 Vue.use(ElementUI);
 
 if (process.env.NODE_ENV === 'development') {
-  new VConsole()
+  // new VConsole()
 }
 
 Vue.prototype.$moment = moment

src/views/assessManagement/assessDetails.vue

@@ -19,7 +19,7 @@
 						<img v-if="all_finish" src="@/assets/image/guidang.png" class="guidang" />
 					</div>
 					 <el-alert v-if="isShowText"
-					    title="考核发起成功后，系统将通知到相关员工并在【钉钉待办】中生成绩效待办事项"
+					    title="考核发起成功，系统将通知到相关员工并在【钉钉待办】中生成绩效待办事项"
 					    type="success">
 					  </el-alert>
 					<!-- <div v-if="!isShowText" style="padding-left: 20px;" class="blue">考核发起成功后，系统将通知到相关员工并在【钉钉待办】中生成绩效待办事项</div> -->

src/views/assessManagement/sponsor/sponsorAssess.vue

@@ -66,6 +66,13 @@
           <div class="title" style="margin-bottom: 20px;">考核设置</div>
           <el-form class="drawerForm" label-width="120px">
             <el-form-item label="沟通反馈">
+				<template slot="label">
+					<div>沟通反馈
+						<el-tooltip class="item" effect="dark" content="在整个考核过程中，若有需要反馈的内容可在【沟通反馈】处留言，支持发钉钉通知" placement="top-start">
+							<i class="fontColorF el-icon-warning"></i>
+						</el-tooltip>
+					</div>
+				</template>
                 <el-radio-group v-model="drawer_switch1">
                   <el-radio :label="true">开启</el-radio>
                   <el-radio :label="false">关闭</el-radio>

src/views/assessManagement/staffAssDet.vue

@@ -56,7 +56,7 @@
 						<el-button v-if="recordsManagement" @click="isTrack = true">管理记录</el-button>
 						<el-button v-if="actionButShow" @click="isPlan = true">执行计划</el-button>
 						<el-button v-if="feedbackBut" @click="communication = true">沟通反馈
-							<el-tooltip class="item" effect="dark" content="指定某一级主管" placement="top-start">
+							<el-tooltip class="item" effect="dark" content="在整个考核过程中，若有需要反馈的内容可在【沟通反馈】处留言，支持发钉钉通知" placement="top-start">
 								<i class="fontColorF el-icon-warning"></i>
 							</el-tooltip>
 						</el-button>
@@ -525,9 +525,9 @@
 				<el-button type="primary" @click="updateText()">确 定</el-button>
 			</span>
 		</el-dialog>
-		<!-- 撤销操作 -->
-		<el-dialog title="撤销" :visible.sync="isShowCx" width="500px" :close-on-click-modal="false">
-			<el-input type="textarea" v-model="cxText" rows="4" placeholder="请输入撤销理由" maxlength="200" show-word-limit></el-input>
+		<!-- 重新评分操作 -->
+		<el-dialog title="重新评分" :visible.sync="isShowCx" width="500px" :close-on-click-modal="false">
+			<el-input type="textarea" v-model="cxText" rows="4" placeholder="请输入重新评分理由" maxlength="200" show-word-limit></el-input>
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="isShowCx = false">取 消</el-button>
 				<el-button type="primary" @click="revocation()">确 定</el-button>