优化

src/components/AppealCreate.vue

@@ -39,7 +39,7 @@
         <el-card>
           <div slot="header">
             <span>共{{rewriteData.events.length}}条积分事件</span>
-            <el-button @click="openEventSelected" type="primary" size="mini" >选择积分</el-button>
+            <el-button @click="openEventSelected" type="primary" size="mini" >选择积分事件</el-button>
           </div>
           <IntegralEventSelector
             :visible.sync="showEventSelector"
@@ -86,7 +86,7 @@ export default {
     },
     title:{
       type: String,
-      default: '发起复议'
+      default: '发起申诉'
     },
     events:{
       type: Array,

src/components/AppealRewrite.vue

@@ -99,7 +99,7 @@ export default {
     },
     title:{
       type: String,
-      default: '复议记录'
+      default: '申诉记录'
     }
   },
   data(){

src/point/views/attendance/attendance_groupnew.vue

@@ -234,7 +234,7 @@
                   </div>
                 </div>
               </el-card>
-              <el-checkbox v-model="is_out_attendance">允许外勤打卡</el-checkbox>
+              <el-checkbox v-model="is_out_attendance">允许外勤打卡(外勤打卡不加分)</el-checkbox>
             </el-form-item>
 
             <el-form-item label="加班规则" prop="overtime_rule">

src/point/views/attendance/attendance_machinenew.vue

@@ -32,7 +32,7 @@
       @current-change="changePage"
     ></el-pagination>
 
-    <el-dialog :title="checkinMechForm.id ? '修改考勤机' : '增加考勤机'" :visible.sync="checkin_mech_add" width="730px" top="50px" @close="checkinMechCloseHandle">
+    <el-dialog title="考勤机设置" :visible.sync="checkin_mech_add" width="730px" top="50px" @close="checkinMechCloseHandle">
       <el-alert style="margin-bottom:15px;background:#fdf6ec!important;color:#E6A23C!important;" title="温馨提示：" type="success" description>
         <p class="diy-tip" style="color:#E6A23C!important;">序列号请在考勤机-设备信息里查找 如对考勤机设置项存在疑问，可联系“功道云”专属客服人员指导设置</p>
       </el-alert>

src/point/views/common/AppealPopup.vue

@@ -17,7 +17,7 @@
             <el-tag :type="appealStatusType(appealInfo.status)">{{appealStatusMap[appealInfo.status] || '--'}}</el-tag>
           </template>
           <div>
-            <p><el-tag>{{appealInfo.create_time}}</el-tag>&nbsp;发起复议申请</p>
+            <p><el-tag>{{appealInfo.create_time}}</el-tag>&nbsp;发起申诉</p>
             <p>共&nbsp;<el-tag>{{appealInfo.events.length}}</el-tag>&nbsp;条积分事件</p>
             <p v-if="appealInfo.global_remark">申请原因&nbsp;:&nbsp;<el-tag>{{appealInfo.global_remark}}</el-tag></p>
             <template v-if="appealInfo.complete_time">
@@ -61,7 +61,7 @@
         </div>
         <!--     隐藏信息     -->
         <el-collapse v-model="infoActiveNames">
-          <el-collapse-item :title="appealInfo.events.length + '条积分'" name="events" >
+          <el-collapse-item :title="appealInfo.events.length + '条积分事件'" name="events" >
             <el-descriptions class="detail_row" v-for="(item,index) in appealInfo.events" size="small" :key="index" :column="1" :label-style="{width : '80px'}"  border>
               <el-descriptions-item label="积分">
                 {{item.point + ' ' + ptName(item.pt_id)}}
@@ -69,7 +69,7 @@
               </el-descriptions-item>
               <el-descriptions-item label="积分备注">{{item.event_remark}}</el-descriptions-item>
               <el-descriptions-item label="时间">{{item.event_time}}</el-descriptions-item>
-              <el-descriptions-item v-if="item.appeal_remark" label="复议原因">{{item.appeal_remark}}</el-descriptions-item>
+              <el-descriptions-item v-if="item.appeal_remark" label="申诉原因">{{item.appeal_remark}}</el-descriptions-item>
               <el-descriptions-item v-if="item.delete_time" label="已删除">{{item.delete_time}}</el-descriptions-item>
             </el-descriptions>
           </el-collapse-item>
@@ -478,6 +478,7 @@ export default {
       self.$axiosUser('post','api/pro/integral/appeal/remove',params)
         .then(res => {
           if (res.data.code === 1){
+            self.$message.info('处理完毕')
             self.hasSubmit = true
             self.getAppealInfo()
           }else {

src/point/views/common/examinePopup.vue

@@ -21,15 +21,16 @@
                 </span>
                 <span class="color_green point" v-show="detail_info.point < 0 && detail_info.point">{{ detail_info.point }} {{ $getTypsName(detail_info.pt_id) }}</span>
               </template>
-              <br />
-              <template>
-                <b style="font-size:13px;position: absolute;left:65px;top:45px">
-                  <span v-if="detail_info.status == 1" class="green">审批通过</span>
-                  <span v-else-if="detail_info.status == 2" class="red">审批驳回</span>
-                  <span v-else-if="detail_info.status == 0" class="orange">待审批</span>
-                  <span v-else></span>
-                </b>
-              </template>
+<!--              <br />-->
+<!--              <template>-->
+<!--                <b style="font-size:13px;position: absolute;left:65px;top:45px">-->
+<!--                  <span v-if="detail_info.status == 1" class="green">审批通过</span>-->
+<!--                  <span v-else-if="detail_info.status == 2" class="red">拒绝</span>-->
+<!--                  <span v-else-if="detail_info.status == 0" class="orange">待审批</span>-->
+<!--                  <span v-else></span>-->
+<!--                </b>-->
+<!--              </template>-->
+              <el-tag :type="reviewStatusType(detail_info.review_status)" >{{reviewStatusMap[detail_info.review_status] || '--'}}</el-tag>
             </el-col>
           </el-row>
           <el-descriptions direction="vertical" :column="2" border title="审批信息" >
@@ -142,7 +143,7 @@
             <el-button v-if="detail_info.pt_id === 1" @click="closeDetail">取消</el-button>
 
             <el-button v-else @click="rejectBtn">
-              <el-tooltip content="拒绝申请并终止审批" placement="top"><span>拒绝</span></el-tooltip>
+              <el-tooltip content="拒绝并终止审批" placement="top"><span>拒绝</span></el-tooltip>
             </el-button>
 
             <el-button type="primary" @click="adoptBtn">
@@ -453,7 +454,13 @@ export default {
         remark:''
       },
       submitting:false,
-      infoActiveNames:[]
+      infoActiveNames:[],
+      reviewStatusMap:{
+        0:'待审批',
+        1:'已通过',
+        2:'拒绝',
+        3:'驳回重做',
+      }
     };
 
   },
@@ -898,6 +905,18 @@ export default {
 
 
     },
+    reviewStatusType(status){
+      switch (status) {
+        case 0:
+          return 'info'
+        case 1:
+          return 'success'
+        case 2:
+        case 3:
+        default:
+          return 'warning'
+      }
+    }
   }
 };
 </script>

src/point/views/common/rewardTask.vue

@@ -55,24 +55,29 @@
               default-time="18:00"
               :clearable="false"
             ></el-date-picker>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns1" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns2" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns3" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item prop="schedule_expire_date" label="有效日期">
@@ -88,7 +93,7 @@
               @change="scheduleExpireDateChange"
               @input="scheduleExpireDateInput"
             ></el-date-picker>
-            <el-tooltip placement="right" content="设置此选项,到了有效日期不再自动发布。默认一直重复发布悬赏" style="margin-left: 10px"><span class="tips">?</span></el-tooltip>
+            <el-tooltip placement="right" content="设置此选项,到了(不包含)有效日期不再自动发布。默认一直重复发布悬赏" style="margin-left: 10px"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="任务备注" prop="task_remark" :rules="[{ max: 300, message: '长度不能超过 300 个字'}]">

src/point/views/common/rewardTaskAmend.vue

@@ -52,6 +52,7 @@
               default-time="18:00"
               :clearable="false"
               ></el-date-picker>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间'}]">
@@ -63,6 +64,7 @@
                 :value="item.value">
               </el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间'}]">
@@ -74,6 +76,7 @@
                 :value="item.value">
               </el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间'}]">
@@ -85,6 +88,7 @@
                 :value="item.value">
               </el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="任务备注" prop="task_remark" :rules="[{ max: 300 ,message: '长度不能超过 300 个字'}]">

src/point/views/common/temporaryTask.vue

@@ -55,23 +55,27 @@
               default-time="18:00"
               :clearable="false"
             ></el-date-picker>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns1" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns2" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns3" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="有效日期" prop="schedule_expire_date" >
@@ -87,7 +91,7 @@
               @change="scheduleExpireDateChange"
               @input="scheduleExpireDateInput"
             ></el-date-picker>
-            <el-tooltip placement="right" content="设置此选项,到了有效日期不再自动发布。默认一直重复发布任务" style="margin-left: 10px"><span class="tips">?</span></el-tooltip>
+            <el-tooltip placement="right" content="设置此选项,到了(不包含)有效日期不再自动发布。默认一直重复发布任务" style="margin-left: 10px"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="任务备注" prop="task_remark" :rules="[{ max: 300, message: '长度不能超过 300 个字'}]">

src/point/views/common/temporaryTaskAmend.vue

@@ -61,23 +61,27 @@
               default-time="18:00"
               :clearable="false"
             ></el-date-picker>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns1" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns2" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns3" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
+            <el-tooltip placement="right" style="margin-left: 10px" content="任务截止时间是出发任务提前奖分/逾期扣分的关键属性"><span class="tips">?</span></el-tooltip>
           </el-form-item>
 
           <el-form-item label="任务备注" prop="task_remark" :rules="[{ max: 300, message: '长度不能超过 300 个字'}]">

src/point/views/pointHome.vue

@@ -147,7 +147,12 @@
 
           <div class="raiders_box" v-if="pkList.length > 0" v-loading="pkLoading">
             <div class="flex-box-ce">
-              <div class="flex-1"><b class="title">团队PK</b></div>
+              <div class="flex-1">
+                <b class="title">团队PK</b>
+                <el-tooltip placement="top" content="只针对B分">
+                  <i class="el-icon-question fontColorC"></i>
+                </el-tooltip>
+              </div>
             </div>
             <div>
               <div class="flex-1 scroll-bar" style="margin: 20px 0; overflow-x: auto; ">
@@ -2700,4 +2705,15 @@ box-sizing: content-box;
 /deep/ .el-dialog__body {
   padding: 0 80px 15px;
 }
+  .tips {
+    background: #409EFF;
+    border-radius: 50%;
+    width: 14px;
+    height: 14px;
+    color: #fff;
+    display: inline-block;
+    font-size: 12px;
+    line-height: 14px;
+    text-align: center;
+  }
 </style>

src/point/views/setting/pk.vue

@@ -5,7 +5,7 @@
       <el-alert class="diy-tip" type="success" :closable="false">
         <p><b>团队PK通过自定义档案配置、团队参与人员等。在相同积分规则内对团队进行积分对比</b></p>
         <p><b>PK配置流程</b></p>
-        <li class="headLi">指定档案在哪些积分规则分类或者积分规则内有效</li>
+        <li class="headLi">指定档案在哪些积分规则分类或者积分规则内有效,只针对B分</li>
         <li class="headLi">创建团队,指定参与者</li>
         <p><b>团队积分构成</b></p>
         <li class="headLi">团队参与者在档案配置中积分规则内的积分总和</li>

src/point/views/setting/set_basics.vue

@@ -124,9 +124,9 @@
             </el-form-item>
             <el-form-item prop="appeal">
               <template slot="label">
-                <span>积分复议</span>
+                <span>积分申诉</span>
                 <el-tooltip placement="top">
-                  <div slot="content">开启可对个人积分提起复议审批,通过后自动撤销积分事件</div>
+                  <div slot="content">开启可对个人积分提起申诉审批,通过后自动撤销积分事件</div>
                   <span class="tips">?</span>
                 </el-tooltip>
               </template>

src/point/views/statistics/appeal.vue

@@ -81,7 +81,7 @@
               <span style="margin-left: 10px; line-height: 50px; display: inline-block">{{scope.row.reviewer_name}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="积分记录" prop="event_count"></el-table-column>
+          <el-table-column label="积分事件数" prop="event_count"></el-table-column>
           <el-table-column label="状态">
             <template slot-scope="scope">
               {{appealStatusMap[scope.row.status] || "--"}}

src/point/views/statistics/integral_event.vue

@@ -795,7 +795,7 @@ export default {
       importErrorInfoShow: false,
       deriveNum: 0,
       selectionID: [] ,//删除的事件ID
-      appealSelectionEvents:[], //批量发起复议的事件ID
+      appealSelectionEvents:[], //批量发起申诉的事件ID
       source_type: [
       	{id: 0,name: '全部'},
       	{id: 1,name: '积分奖扣'},

src/point/views/workbench/task/my_task.vue

@@ -60,7 +60,7 @@
             <template slot-scope="scope">
               <div class="orange" v-if="scope.row.review_status == 0">待处理</div>
               <div class="green" v-if="scope.row.review_status == 1">已通过</div>
-              <div class="red" v-if="scope.row.review_status == 2">已驳回</div>
+              <div class="red" v-if="scope.row.review_status == 2">已拒绝</div>
             </template>
           </el-table-column>
           <el-table-column label="操作" prop="owner_id" fixed="right" v-if="['rewrite'].includes(formData.status)">