钉钉第三期

src/components/EmployeeSelector.vue

@@ -8,7 +8,7 @@
 							<el-input v-model="keyword" placeholder="请输入姓名" clearable></el-input>
 						</div>
 						<div class="search flex-box" v-if="can_select_dept">
-						    <el-cascader class="date-picker-width" 
+						    <el-cascader 
 								v-model="dept_id" 
 								ref="dept" 
 								:options="dept_list" 
@@ -36,7 +36,6 @@
 								</a>
 							</div>
 							<div v-else class="fontColorF" style="text-align: center;margin-top: 50px;">暂无可选人员</div>
-							<!-- <div v-else class="fontColorF" style="text-align: center;margin-top: 50px;">暂无可选人员，请先在<span class="blue"> “设置-组织架构” </span>中为员工【开启积分管理】</div> -->
 						</div>
 					</el-scrollbar>
 				</el-col>
@@ -82,12 +81,6 @@ export default {
       type: Boolean,
       default: true
     },
-    dept_not_select: {//排除部门的ID，包含ID时不出现在选择列表中
-      type: Array,
-      default: () => {
-        return []
-      }
-    },
     selected: {//已经选择的员工和部门
       type: Object,
       default: () => {
@@ -381,17 +374,6 @@ export default {
 	  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 = []
@@ -436,9 +418,6 @@ export default {
   created() {
 	var that=this;
 	that.checked=false;
-    if (document.documentElement.style.height) {
-      this.com_height = document.documentElement.style.height
-    }
     setTimeout(() => {
       that.get_user_list();
 	  if(that.can_select_dept){

src/views/set/log.vue

@@ -44,12 +44,10 @@
 					</div>
 					<el-dialog title="设置名称" :visible.sync="isShowName" top="25vh" width="520px" append-to-body>
 						<div style="text-align: center;">
+							<el-alert class="el-dialog__body" title="日志名称必须与钉钉日志模板名称一致，否则设置无效，不会产生积分" type="warning"  :closable="false" show-icon></el-alert>
 							<!-- <el-popover placement="top-start" title="温馨提示" width="200" trigger="hover" content="日志名称必须与钉钉预设模板名称一致,否则可能会无法同步钉钉的日志记录"> -->
 							<el-input style="width: 200px;" v-model="nameVal" slot="reference"></el-input>
 							<!-- </el-popover> -->
-							<div class="yellow" style="margin-top: 10px;">
-								*日志名称必须与钉钉日志模板名称一致，否则设置无效，不会产生积分*
-							</div>
 							<div class="flex-box-end" style="margin-top: 20px;">
 								<el-button @click="isShowName = false">取消</el-button>
 								<el-button type="primary" @click="submitName()">确定</el-button>
@@ -216,7 +214,7 @@ export default {
 	font-family: PingFangSC-Regular;
 }
 .initia_title_1 {
-	color: #606266;
+	color: #E6A23C;
 	font-size: 14px;
 	margin-top: 10px;
 }

src/views/task/get_task.vue

@@ -12,7 +12,11 @@
 							<span class="font-flex-word" style="max-width: 200px;">{{scope.row.task_name}}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="积分" prop="base_point"></el-table-column>
+					<el-table-column label="积分" prop="base_point">
+						<template slot-scope="scope">
+							<span class="red">+{{scope.row.base_point}} {{$getTypsName(scope.row.pt_id)}}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="截止时间" prop="expire_time"></el-table-column>
 					<el-table-column label="操作" prop="owner_id">
 						<template slot-scope="scope">
@@ -47,7 +51,11 @@
 							<span class="font-flex-word" style="max-width: 200px;">{{scope.row.task_name}}</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="积分" prop="base_point"></el-table-column>
+					<el-table-column label="积分" prop="base_point">
+						<template slot-scope="scope">
+							<span class="red">+{{scope.row.base_point}} {{$getTypsName(scope.row.pt_id)}}</span>
+						</template>
+					</el-table-column>
 					<el-table-column label="截止时间" prop="expire_time"></el-table-column>
 					<template slot="empty">
 						<noData></noData>

src/views/task/my_issue.vue

@@ -55,8 +55,8 @@
           </el-table-column>
           <el-table-column label="积分" prop="point_config.base_point" width="100px">
             <template slot-scope="scope">
-              <span v-if="scope.row.point_config?scope.row.point_config.base_point >= 0 && scope.row.status == 2 :false">+ {{scope.row.point_config.base_point}}</span>
-              <span v-else>{{scope.row.point_config?scope.row.point_config.base_point:''}}</span>
+		      <span v-if="scope.row.point_config.review_point>0" class="red">+{{scope.row.point_config.review_point}} {{scope.row.pt_name}}</span>
+			  <span v-else class="red">+{{scope.row.point_config.base_point}} {{scope.row.pt_name}}</span>
             </template>
           </el-table-column>
           <el-table-column label="截止时间" prop="expire_time">
@@ -66,7 +66,11 @@
           </el-table-column>
           <el-table-column label="状态" prop="owner_id" width="100px">
             <template slot-scope="scope">
-              <span :class="scope.row.status == 1?'yellow':scope.row.status == 2?'green':scope.row.status == 3?'color_3':scope.row.status == 4?'color_4':scope.row.status == 5?'color_5':''">{{scope.row.status == 1?'进行中':scope.row.status == 2?'已完成':scope.row.status == 3?'已退回':scope.row.status == 4?'已审批':scope.row.status == 5?'已撤销':''}}</span>
+              <span class="yellow" v-if="scope.row.status==1">进行中</span>
+              <span class="green" v-else-if="scope.row.status==2">已完成</span>
+              <span class="red" v-else-if="scope.row.status==3">退回</span>
+              <span class="green" v-else-if="scope.row.status==4">已审批</span>
+              <span class="textBox" v-else>已撤回</span>
             </template>
           </el-table-column>
 
@@ -105,8 +109,7 @@
           </el-table-column>
           <el-table-column label="积分" prop="base_point" width="100px">
             <template slot-scope="scope">
-              <span v-if="scope.row.status == 3 && scope.row.base_point >= 0">+ {{scope.row.base_point}}</span>
-              <span v-else>{{scope.row.base_point}}</span>
+		      <span v-if="scope.row.base_point>0" class="red">+{{scope.row.base_point}} {{scope.row.pt_name}}</span>
             </template>
           </el-table-column>
           <el-table-column label="截止时间" prop="expire_time">
@@ -116,11 +119,11 @@
           </el-table-column>
           <el-table-column label="状态" prop="owner_id" width="100px">
             <template slot-scope="scope">
-              <span class="color_3" v-show="scope.row.status == -1">已过期</span>
-              <span class="color_yelllo" v-show="scope.row.status == 1">待领取</span>
-              <span class="color_yelllo2"  v-show="scope.row.status == 2">待处理</span>
-              <span class="green" v-show="scope.row.status == 3">已完成</span>
-              <span class="color_5" v-show="scope.row.status == 4">已撤回</span>
+				<span class="yellow" v-if="scope.row.status==1">待领取</span>
+				<span class="yellow" v-else-if="scope.row.status==2">进行中</span>
+				<span class="green" v-else-if="scope.row.status==3">已完成</span>
+				<span class="fontColorZ" v-else-if="scope.row.status==4">已撤回</span>
+				<span class="red" v-else>已过期</span>
             </template>
           </el-table-column>
 
@@ -159,7 +162,7 @@
           </el-table-column>
           <el-table-column label="任务积分" prop="point_config.base_point">
             <template slot-scope="scope">
-              <span>{{scope.row.point_config.base_point}}</span>
+				<span class="red">+{{scope.row.point_config.base_point}} {{$getTypsName(scope.row.pt_id)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="重复周期" prop="task_cycle">

src/views/task/my_task.vue

@@ -26,9 +26,9 @@
 			  </template>
 		  </el-table-column>
           <el-table-column label="积分">
-            <template slot-scope="scope">
-              <span>{{scope.row.point_config.base_point}}</span>
-            </template>
+				<template slot-scope="scope">
+					<span class="red">+{{scope.row.point_config.base_point}} {{scope.row.pt_name}}</span>
+				</template>
           </el-table-column>
           <el-table-column label="截止时间" prop="expire_time"></el-table-column>
           <el-table-column label="操作" prop="owner_id">
@@ -37,7 +37,7 @@
             </template>
           </el-table-column>
           <template slot="empty">
-						<noData></noData>
+				<noData></noData>
           </template>
         </el-table>
       </div>
@@ -51,7 +51,7 @@
 		  </el-table-column>
           <el-table-column label="积分">
             <template slot-scope="scope">
-              <span>{{scope.row.point_config.base_point}}</span>
+              <span class="red">+{{scope.row.point_config.base_point}} {{scope.row.pt_name}}</span>
             </template>
           </el-table-column>
           <el-table-column label="截止时间" prop="expire_time"></el-table-column>