From 6e8c0cd37ea2bcf5709b0e645e2ce0082fff009e Mon Sep 17 00:00:00 2001
From: HuskyOo <1145804501@qq.com>
Date: Fri, 13 May 2022 15:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=89=A3=E5=88=86=E6=93=8D=E4=BD=9C=20=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/convenience.js                        |  27 +-
 src/api/fingertipIntegral.js                  |  32 +
 src/router/index.js                           |  43 ++
 src/views/convenience/list.vue                | 604 +++++++++---------
 src/views/fingertipIntegral/recordList.vue    |   4 +
 .../fingertipIntegral/settlementList.vue      |   7 +-
 6 files changed, 422 insertions(+), 295 deletions(-)

diff --git a/src/api/convenience.js b/src/api/convenience.js
index c87eb97..d6b2cec 100644
--- a/src/api/convenience.js
+++ b/src/api/convenience.js
@@ -77,8 +77,8 @@ export function communicationList(data) {
 }
 /**
  * 监察工单列表
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
 export function listOnlyLook(data) {
   return request({
@@ -91,8 +91,8 @@ export function listOnlyLook(data) {
 // /convenience/v2/services/listForData
 /**
  * 统计数据工单列表筛选
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
 export function listForData(data) {
   return request({
@@ -104,8 +104,8 @@ export function listForData(data) {
 
 /**
  * LeaderTv
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
 export function leaderTVData(data) {
   return request({
@@ -113,4 +113,17 @@ export function leaderTVData(data) {
     method: 'post',
     data
   })
-}
\ No newline at end of file
+}
+
+/**
+ * LeaderTv
+ * @param {*} data
+ * @returns
+ */
+export function leaderDeal(data) {
+  return request({
+    url: '/api/convenience/v2/services/leaderDeal',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/fingertipIntegral.js b/src/api/fingertipIntegral.js
index 05dbb58..2f1ea5a 100644
--- a/src/api/fingertipIntegral.js
+++ b/src/api/fingertipIntegral.js
@@ -47,3 +47,35 @@ export function settlementDeal(data) {
     data
   })
 }
+
+export function activityList(data) {
+  return request({
+    url: '/api/convenience/fingertipIntegralActivity/list',
+    method: 'post',
+    data
+  })
+}
+
+export function activityUpdate(data) {
+  return request({
+    url: '/api/convenience/fingertipIntegralActivity',
+    method: 'post',
+    data
+  })
+}
+
+export function activityInfo(params) {
+  return request({
+    url: '/api/convenience/fingertipIntegralActivity/info',
+    method: 'get',
+    params
+  })
+}
+
+export function activityDel(params) {
+  return request({
+    url: '/api/convenience/fingertipIntegralActivity',
+    method: 'DELETE',
+    params
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 5b36446..3b18f9c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -408,6 +408,49 @@ export const asyncRoutes = [
           affix: true,
           parentTitle: '积分结算'
         }
+      },
+      {
+        path: 'activityList',
+        component: () => import('@/views/fingertipIntegral/activity/list'),
+        name: 'FingertipIntegralActivityList',
+        meta: {
+          title: '活动列表',
+          affix: true,
+          parentTitle: '活动列表'
+        }
+      },
+      {
+        path: 'activityCreate',
+        component: () => import('@/views/fingertipIntegral/activity/detail'),
+        name: 'FingertipIntegralActivityCreate',
+        meta: {
+          title: '创建活动',
+          affix: true,
+          parentTitle: '创建活动'
+        },
+        hidden: true
+      },
+      {
+        path: 'activityDetail',
+        component: () => import('@/views/fingertipIntegral/activity/detail'),
+        name: 'FingertipIntegralActivityDetail',
+        meta: {
+          title: '活动详情',
+          affix: true,
+          parentTitle: '活动详情'
+        },
+        hidden: true
+      },
+      {
+        path: 'activityChange',
+        component: () => import('@/views/fingertipIntegral/activity/detail'),
+        name: 'FingertipIntegralActivityChange',
+        meta: {
+          title: '活动修改',
+          affix: true,
+          parentTitle: '活动修改'
+        },
+        hidden: true
       }
     ]
   },
diff --git a/src/views/convenience/list.vue b/src/views/convenience/list.vue
index fed14c1..306b3a3 100644
--- a/src/views/convenience/list.vue
+++ b/src/views/convenience/list.vue
@@ -5,8 +5,7 @@
         type="primary"
         style="position:absolute;right:50px;margin-top:80px"
         @click="$router.push('/convenience/add')"
-        ><i class="el-icon-plus" /> 直接建立工单</el-button
-      >
+      ><i class="el-icon-plus" /> 直接建立工单</el-button>
       <div class="title">工单列表</div>
       <div style="margin-bottom:15px;margin-top:15px" />
       <el-radio-group v-model="listQuery.phase">
@@ -16,23 +15,23 @@
         <el-radio-button label="PROCESSING">办理中</el-radio-button>
         <el-radio-button label="FINISH">已办结</el-radio-button>
       </el-radio-group>
-      <br />
-      <br />
+      <br>
+      <br>
       <el-radio-group v-model="listQuery.status">
         <el-radio-button :label="undefined">全部状态</el-radio-button>
         <el-radio-button label="MINE">我处理</el-radio-button>
         <el-radio-button label="FORWARDED">已转交</el-radio-button>
-        <el-radio-button label="FORWARDED_APPLY"
-          >转交超限审批中</el-radio-button
-        >
+        <el-radio-button
+          label="FORWARDED_APPLY"
+        >转交超限审批中</el-radio-button>
         <el-radio-button label="SUBMIT_APPLY">已提交审批</el-radio-button>
         <el-radio-button label="WAIT_APPLY">待我审批</el-radio-button>
       </el-radio-group>
-      <br />
-      <br />
+      <br>
+      <br>
     </div>
 
-    <div class="convenienceList" v-loading="listLoading">
+    <div v-loading="listLoading" class="convenienceList">
       <div
         v-for="(item, index) in list"
         :key="item.id"
@@ -58,15 +57,15 @@
             <p>
               阶段：{{ item.phase | phaseFilter }}
               <i
-                class="icon_timeout"
                 v-if="timers && timers[index].status !== null"
-              ></i>
+                class="icon_timeout"
+              />
               <span style="color:#ff3000">{{
                 timers && timers[index].status === null
                   ? ""
                   : timers && timers[index].status
-                  ? "已超时"
-                  : "即将超时"
+                    ? "已超时"
+                    : "即将超时"
               }}</span>
             </p>
           </div>
@@ -99,13 +98,20 @@
                 <!-- v-has="!'WORKORDER_ADMIN'" -->
                 <el-button
                   v-if="listQuery.status!==undefined&&item.phase === 'PENDING_ORDER'"
-                  
+
                   style="margin-left:44px;font-size:14px;padding:7px 10px;width:70px;margin-top:12px"
                   type="primary"
                   size="mini"
                   @click.stop="handleUpdate(item, 5)"
-                  >接单</el-button
-                >
+                >接单</el-button>
+                <el-button
+                  v-if="isLeader && !item.fingertipIntegralUpdate"
+
+                  style="margin-left:44px;font-size:14px;padding:7px 10px;width:70px;margin-top:12px"
+                  type="warning"
+                  size="mini"
+                  @click.stop="handleDeal(item)"
+                >扣分</el-button>
               </div>
             </div>
           </div>
@@ -113,6 +119,14 @@
       </div>
     </div>
 
+    <pagination
+      v-if="total > 0"
+      :total="total"
+      :page.sync="listQuery.lastPageIndex"
+      :limit.sync="listQuery.size"
+      @pagination="getList"
+    />
+
     <el-dialog
       class="dialog"
       :title="updateType | typeFilter"
@@ -183,62 +197,62 @@
 </template>
 
 <script>
-// import Pagination from "@/components/Pagination";
-import { list, listOnlyLook, typeList, update } from "@/api/convenience";
-import { parseTime } from "@/utils";
-import { staffList } from "@/api/staff";
-import AliOss from "@/components/AliOSS/index.vue";
+import Pagination from '@/components/Pagination'
+import { list, listOnlyLook, typeList, update, leaderDeal } from '@/api/convenience'
+// import { parseTime } from '@/utils'
+import { staffList } from '@/api/staff'
+import AliOss from '@/components/AliOSS/index.vue'
 
 export default {
   components: {
-    AliOss
+    AliOss,
+    Pagination
   },
-  //   components: { Pagination },
   filters: {
     sponsorFilter(status) {
       const statusMap = {
-        SELF: "群众",
-        STAFF: "工作人员"
-      };
-      return statusMap[status];
+        SELF: '群众',
+        STAFF: '工作人员'
+      }
+      return statusMap[status]
     },
     phaseFilter(status) {
       const statusMap = {
-        PENDING_ORDER: "待接单",
-        PREREQUISITES: "要件准备中",
-        PROCESSING: "办理中",
-        FINISH: "办结"
-      };
-      return statusMap[status];
+        PENDING_ORDER: '待接单',
+        PREREQUISITES: '要件准备中',
+        PROCESSING: '办理中',
+        FINISH: '办结'
+      }
+      return statusMap[status]
     },
     statusFilter(status) {
       const statusMap = {
-        MINE: "我处理",
-        FORWARDED: "已转交",
-        FORWARDED_APPLY: "转交超限审批中",
-        SUBMIT_APPLY: "已提交审批",
-        WAIT_APPLY: "待审核"
-      };
-      return statusMap[status];
+        MINE: '我处理',
+        FORWARDED: '已转交',
+        FORWARDED_APPLY: '转交超限审批中',
+        SUBMIT_APPLY: '已提交审批',
+        WAIT_APPLY: '待审核'
+      }
+      return statusMap[status]
     },
     typeFilter(status) {
       const statusMap = {
-        1: "建立工单",
-        2: "撤销工单",
-        3: "沟通",
-        4: "调整工单类别",
-        5: "接单",
-        6: "要件齐备",
-        7: "办结",
-        8: "转交超限审批提交",
-        9: "转交超限审批撤销",
-        10: "转交超限审批",
-        11: "发起审批",
-        12: "撤销审批",
-        13: "审批操作",
-        14: "转交"
-      };
-      return statusMap[status];
+        1: '建立工单',
+        2: '撤销工单',
+        3: '沟通',
+        4: '调整工单类别',
+        5: '接单',
+        6: '要件齐备',
+        7: '办结',
+        8: '转交超限审批提交',
+        9: '转交超限审批撤销',
+        10: '转交超限审批',
+        11: '发起审批',
+        12: '撤销审批',
+        13: '审批操作',
+        14: '转交'
+      }
+      return statusMap[status]
     }
   },
   data() {
@@ -247,10 +261,10 @@ export default {
       loading: false,
       list: [],
       total: 0,
-      listQuery: {},
+      // listQuery: {},
       selectType: [],
       types: [],
-      rules: {},
+      // rules: {},
       applyDialog: false,
       payload: {
         id: undefined,
@@ -264,462 +278,467 @@ export default {
       staffOptions: [],
       updateType: undefined,
       listQuery: {
+        lastPageIndex: 1,
+        size: 10,
+        pageType: 'WEB',
+
         status: undefined,
         phase: undefined
       },
       msec: 0,
       rules: {
-        ids: [{ required: true, message: "请选择操作对象", trigger: "change" }]
+        ids: [{ required: true, message: '请选择操作对象', trigger: 'change' }]
       },
       timers: undefined,
       timersInterval: undefined,
       isLeader: false,
       isStatusFilter: false
-    };
+    }
   },
   watch: {
-    "listQuery.phase": {
+    'listQuery.phase': {
       // 深度监听，可监听到对象、数组的变化
       handler(val) {
-        this.listQuery.phase = val;
-        this.getList();
+        this.listQuery.phase = val
+        this.getList()
       },
       deep: true // true 深度监听
     },
-    "listQuery.status": {
+    'listQuery.status': {
       // 深度监听，可监听到对象、数组的变化
       handler(val) {
-        this.listQuery.status = val;
-        this.getList();
+        this.listQuery.status = val
+        this.getList()
       },
       deep: true // true 深度监听
     }
   },
   created() {
     this.isLeader = sessionStorage
-      .getItem("Permissions")
-      .includes("WORKORDER_ADMIN");
+      .getItem('Permissions')
+      .includes('WORKORDER_ADMIN')
       // console.log(this.isLeader);
-    this.getList();
-    this.getStaffList();
+    this.getList()
+    this.getStaffList()
   },
   methods: {
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
       if (this.isLeader) {
         if (this.listQuery.status) {
           list(this.listQuery).then(res => {
-            this.list = res.d.records;
-            this.listLoading = false;
-            clearInterval(this.timersInterval);
-            const tempData = res.d.records;
-            const now = Date.parse(new Date()).toString() / 1000;
-            const arr = [];
+            this.list = res.d.records
+            this.listLoading = false
+            clearInterval(this.timersInterval)
+            const tempData = res.d.records
+            const now = Date.parse(new Date()).toString() / 1000
+            const arr = []
             tempData.map((item, index) => {
-              let msec = [];
-              let obj = {};
+              let msec = []
+              let obj = {}
               switch (item.phase) {
-                case "PENDING_ORDER":
+                case 'PENDING_ORDER':
                   // 待接单
-                  msec = now - item.createDate;
+                  msec = now - item.createDate
                   obj = {
                     time: msec,
                     phase: item.phase,
                     status: null
-                  };
-                  arr.push(obj);
-                  break;
-                case "PREREQUISITES":
+                  }
+                  arr.push(obj)
+                  break
+                case 'PREREQUISITES':
                   // 要件准备
-                  msec = now - item.createDate;
+                  msec = now - item.createDate
                   obj = {
                     time: msec,
                     phase: item.phase,
                     status: null
-                  };
-                  arr.push(obj);
-                  break;
-                case "PROCESSING":
+                  }
+                  arr.push(obj)
+                  break
+                case 'PROCESSING':
                   // 办理中
-                  msec = now - item.createDate;
+                  msec = now - item.createDate
                   obj = {
                     time: msec,
                     phase: item.phase,
                     status: null
-                  };
-                  arr.push(obj);
-                  break;
-                case "FINISH":
+                  }
+                  arr.push(obj)
+                  break
+                case 'FINISH':
                   msec =
                     item.acceptanceTime +
                     item.prerequisitesTime +
-                    item.finishTime;
+                    item.finishTime
                   obj = {
                     time: msec,
                     phase: item.phase,
                     status: null
-                  };
-                  arr.push(obj);
+                  }
+                  arr.push(obj)
                   // 办结
-                  break;
+                  break
                 default:
-                  break;
+                  break
               }
-            });
+            })
             if (arr.length > 0) {
               arr.map((item, index) => {
-                if (item.phase !== "FINISH") {
-                  item.time++;
-                  if (this.list[index].phase === "PENDING_ORDER") {
+                if (item.phase !== 'FINISH') {
+                  item.time++
+                  if (this.list[index].phase === 'PENDING_ORDER') {
                     if (item.status == null) {
                       if (item.time > 57600) {
-                        item.status = false;
+                        item.status = false
                         if (item.time >= 86400) {
-                          item.status = true;
+                          item.status = true
                         }
                       }
                     }
                   }
-                  if (this.list[index].phase === "PROCESSING") {
+                  if (this.list[index].phase === 'PROCESSING') {
                     if (item.status == null) {
                       // &&item.time<this.list[index].eventType.commitmentTimeLimit
                       if (
                         item.time >
                         this.list[index].eventType.timeoutReminder * 3600
                       ) {
-                        item.status = false;
+                        item.status = false
                         if (
                           item.time >=
                           this.list[index].eventType.commitmentTimeLimit * 3600
                         ) {
-                          item.status = true;
+                          item.status = true
                         }
                       }
                     }
                   }
                 }
-              });
+              })
             }
-            this.timers = arr;
+            this.timers = arr
 
             this.timersInterval = setInterval(() => {
               if (arr.length > 0) {
                 arr.map((item, index) => {
-                  if (item.phase !== "FINISH") {
-                    item.time++;
-                    if (this.list[index].phase === "PENDING_ORDER") {
+                  if (item.phase !== 'FINISH') {
+                    item.time++
+                    if (this.list[index].phase === 'PENDING_ORDER') {
                       if (item.status == null) {
                         if (item.time > 57600) {
-                          item.status = false;
+                          item.status = false
                           if (item.time >= 86400) {
-                            item.status = true;
+                            item.status = true
                           }
                         }
                       }
                     }
-                    if (this.list[index].phase === "PROCESSING") {
+                    if (this.list[index].phase === 'PROCESSING') {
                       if (item.status == null) {
                         // &&item.time<this.list[index].eventType.commitmentTimeLimit
                         if (
                           item.time >
                           this.list[index].eventType.timeoutReminder * 3600
                         ) {
-                          item.status = false;
+                          item.status = false
                           if (
                             item.time >=
                             this.list[index].eventType.commitmentTimeLimit *
                               3600
                           ) {
-                            item.status = true;
+                            item.status = true
                           }
                         }
                       }
                     }
                   }
-                });
+                })
               }
-              this.timers = arr;
-            }, 1000);
-          });
+              this.timers = arr
+            }, 1000)
+          })
         } else {
           listOnlyLook(this.listQuery).then(res => {
-            this.list = res.d.records;
-            this.listLoading = false;
-            clearInterval(this.timersInterval);
-            const tempData = res.d.records;
-            const now = Date.parse(new Date()).toString() / 1000;
-            const arr = [];
+            this.list = res.d.records
+            this.total = res.d.total
+            this.listLoading = false
+            clearInterval(this.timersInterval)
+            const tempData = res.d.records
+            const now = Date.parse(new Date()).toString() / 1000
+            const arr = []
             tempData.map((item, index) => {
               if (item.residentInformation === null) {
-                console.log(index);
+                console.log(index)
               }
-              let msec = [];
-              let obj = {};
+              let msec = []
+              let obj = {}
               switch (item.phase) {
-                case "PENDING_ORDER":
+                case 'PENDING_ORDER':
                   // 待接单
-                  msec = now - item.createDate;
+                  msec = now - item.createDate
                   obj = {
                     time: msec,
                     phase: item.phase,
                     status: null
-                  };
-                  arr.push(obj);
-                  break;
-                case "PREREQUISITES":
+                  }
+                  arr.push(obj)
+                  break
+                case 'PREREQUISITES':
                   // 要件准备
-                  msec = now - item.createDate;
+                  msec = now - item.createDate
                   obj = {
                     time: msec,
                     phase: item.phase,
                     status: null
-                  };
-                  arr.push(obj);
-                  break;
-                case "PROCESSING":
+                  }
+                  arr.push(obj)
+                  break
+                case 'PROCESSING':
                   // 办理中
-                  msec = now - item.createDate;
+                  msec = now - item.createDate
                   obj = {
                     time: msec,
                     phase: item.phase,
                     status: null
-                  };
-                  arr.push(obj);
-                  break;
-                case "FINISH":
+                  }
+                  arr.push(obj)
+                  break
+                case 'FINISH':
                   msec =
                     item.acceptanceTime +
                     item.prerequisitesTime +
-                    item.finishTime;
+                    item.finishTime
                   obj = {
                     time: msec,
                     phase: item.phase,
                     status: null
-                  };
-                  arr.push(obj);
+                  }
+                  arr.push(obj)
                   // 办结
-                  break;
+                  break
                 default:
-                  break;
+                  break
               }
-            });
+            })
             if (arr.length > 0) {
               arr.map((item, index) => {
-                if (item.phase !== "FINISH") {
-                  item.time++;
-                  if (this.list[index].phase === "PENDING_ORDER") {
+                if (item.phase !== 'FINISH') {
+                  item.time++
+                  if (this.list[index].phase === 'PENDING_ORDER') {
                     if (item.status == null) {
                       if (item.time > 57600) {
-                        item.status = false;
+                        item.status = false
                         if (item.time >= 86400) {
-                          item.status = true;
+                          item.status = true
                         }
                       }
                     }
                   }
-                  if (this.list[index].phase === "PROCESSING") {
+                  if (this.list[index].phase === 'PROCESSING') {
                     if (item.status == null) {
                       // &&item.time<this.list[index].eventType.commitmentTimeLimit
                       if (
                         item.time >
                         this.list[index].eventType.timeoutReminder * 3600
                       ) {
-                        item.status = false;
+                        item.status = false
                         if (
                           item.time >=
                           this.list[index].eventType.commitmentTimeLimit * 3600
                         ) {
-                          item.status = true;
+                          item.status = true
                         }
                       }
                     }
                   }
                 }
-              });
+              })
             }
-            this.timers = arr;
+            this.timers = arr
 
             this.timersInterval = setInterval(() => {
               if (arr.length > 0) {
                 arr.map((item, index) => {
-                  if (item.phase !== "FINISH") {
-                    item.time++;
-                    if (this.list[index].phase === "PENDING_ORDER") {
+                  if (item.phase !== 'FINISH') {
+                    item.time++
+                    if (this.list[index].phase === 'PENDING_ORDER') {
                       if (item.status == null) {
                         if (item.time > 57600) {
-                          item.status = false;
+                          item.status = false
                           if (item.time >= 86400) {
-                            item.status = true;
+                            item.status = true
                           }
                         }
                       }
                     }
-                    if (this.list[index].phase === "PROCESSING") {
+                    if (this.list[index].phase === 'PROCESSING') {
                       if (item.status == null) {
                         // &&item.time<this.list[index].eventType.commitmentTimeLimit
                         if (
                           item.time >
                           this.list[index].eventType.timeoutReminder * 3600
                         ) {
-                          item.status = false;
+                          item.status = false
                           if (
                             item.time >=
                             this.list[index].eventType.commitmentTimeLimit *
                               3600
                           ) {
-                            item.status = true;
+                            item.status = true
                           }
                         }
                       }
                     }
                   }
-                });
+                })
               }
-              this.timers = arr;
-            }, 1000);
-          });
+              this.timers = arr
+            }, 1000)
+          })
         }
       } else {
         // console.log('else:'+this.isLeader);
         list(this.listQuery).then(res => {
-          this.list = res.d.records;
-          this.listLoading = false;
-          clearInterval(this.timersInterval);
-          const tempData = res.d.records;
-          const now = Date.parse(new Date()).toString() / 1000;
-          const arr = [];
+          this.list = res.d.records
+          this.listLoading = false
+          clearInterval(this.timersInterval)
+          const tempData = res.d.records
+          const now = Date.parse(new Date()).toString() / 1000
+          const arr = []
           tempData.map((item, index) => {
-            let msec = [];
-            let obj = {};
+            let msec = []
+            let obj = {}
             switch (item.phase) {
-              case "PENDING_ORDER":
+              case 'PENDING_ORDER':
                 // 待接单
-                msec = now - item.createDate;
+                msec = now - item.createDate
                 obj = {
                   time: msec,
                   phase: item.phase,
                   status: null
-                };
-                arr.push(obj);
-                break;
-              case "PREREQUISITES":
+                }
+                arr.push(obj)
+                break
+              case 'PREREQUISITES':
                 // 要件准备
-                msec = now - item.createDate;
+                msec = now - item.createDate
                 obj = {
                   time: msec,
                   phase: item.phase,
                   status: null
-                };
-                arr.push(obj);
-                break;
-              case "PROCESSING":
+                }
+                arr.push(obj)
+                break
+              case 'PROCESSING':
                 // 办理中
-                msec = now - item.createDate;
+                msec = now - item.createDate
                 obj = {
                   time: msec,
                   phase: item.phase,
                   status: null
-                };
-                arr.push(obj);
-                break;
-              case "FINISH":
+                }
+                arr.push(obj)
+                break
+              case 'FINISH':
                 msec =
                   item.acceptanceTime +
                   item.prerequisitesTime +
-                  item.finishTime;
+                  item.finishTime
                 obj = {
                   time: msec,
                   phase: item.phase,
                   status: null
-                };
-                arr.push(obj);
+                }
+                arr.push(obj)
                 // 办结
-                break;
+                break
               default:
-                break;
+                break
             }
-          });
+          })
           if (arr.length > 0) {
             arr.map((item, index) => {
-              if (item.phase !== "FINISH") {
-                item.time++;
-                if (this.list[index].phase === "PENDING_ORDER") {
+              if (item.phase !== 'FINISH') {
+                item.time++
+                if (this.list[index].phase === 'PENDING_ORDER') {
                   if (item.status == null) {
                     if (item.time > 57600) {
-                      item.status = false;
+                      item.status = false
                       if (item.time >= 86400) {
-                        item.status = true;
+                        item.status = true
                       }
                     }
                   }
                 }
-                if (this.list[index].phase === "PROCESSING") {
+                if (this.list[index].phase === 'PROCESSING') {
                   if (item.status == null) {
                     // &&item.time<this.list[index].eventType.commitmentTimeLimit
                     if (
                       item.time >
                       this.list[index].eventType.timeoutReminder * 3600
                     ) {
-                      item.status = false;
+                      item.status = false
                       if (
                         item.time >=
                         this.list[index].eventType.commitmentTimeLimit * 3600
                       ) {
-                        item.status = true;
+                        item.status = true
                       }
                     }
                   }
                 }
               }
-            });
+            })
           }
-          this.timers = arr;
+          this.timers = arr
 
           this.timersInterval = setInterval(() => {
             if (arr.length > 0) {
               arr.map((item, index) => {
-                if (item.phase !== "FINISH") {
-                  item.time++;
-                  if (this.list[index].phase === "PENDING_ORDER") {
+                if (item.phase !== 'FINISH') {
+                  item.time++
+                  if (this.list[index].phase === 'PENDING_ORDER') {
                     if (item.status == null) {
                       if (item.time > 57600) {
-                        item.status = false;
+                        item.status = false
                         if (item.time >= 86400) {
-                          item.status = true;
+                          item.status = true
                         }
                       }
                     }
                   }
-                  if (this.list[index].phase === "PROCESSING") {
+                  if (this.list[index].phase === 'PROCESSING') {
                     if (item.status == null) {
                       // &&item.time<this.list[index].eventType.commitmentTimeLimit
                       if (
                         item.time >
                         this.list[index].eventType.timeoutReminder * 3600
                       ) {
-                        item.status = false;
+                        item.status = false
                         if (
                           item.time >=
                           this.list[index].eventType.commitmentTimeLimit * 3600
                         ) {
-                          item.status = true;
+                          item.status = true
                         }
                       }
                     }
                   }
                 }
-              });
+              })
             }
-            this.timers = arr;
-          }, 1000);
-        });
+            this.timers = arr
+          }, 1000)
+        })
       }
     },
     // getList2() {},
     getTypeList() {
       typeList().then(res => {
         // console.log(res);
-      });
+      })
     },
     getStaffList() {
       staffList().then(res => {
@@ -727,10 +746,10 @@ export default {
           const obj = {
             label: item.name,
             value: item.id
-          };
-          this.staffOptions.push(obj);
-        });
-      });
+          }
+          this.staffOptions.push(obj)
+        })
+      })
     },
     handleTypeChange() {},
     resetPayload() {
@@ -742,80 +761,95 @@ export default {
         attachmentList: undefined,
         approve: undefined,
         evaluation: undefined
-      };
+      }
     },
     handleUpdate(row, type) {
-      this.resetPayload();
+      this.resetPayload()
       this.$nextTick(() => {
-        this.$refs.applyForm.clearValidate();
-      });
-      this.updateType = type;
-      this.payload.id = row.id;
-      this.payload.version = row.version;
-      this.payload.type = type;
+        this.$refs.applyForm.clearValidate()
+      })
+      this.updateType = type
+      this.payload.id = row.id
+      this.payload.version = row.version
+      this.payload.type = type
       switch (type) {
         case 5:
-          this.applyDialog = true;
-          break;
+          this.applyDialog = true
+          break
         case 6:
-          this.applyDialog = true;
-          break;
+          this.applyDialog = true
+          break
         case 11:
-          this.applyDialog = true;
-          break;
+          this.applyDialog = true
+          break
         case 13:
-          this.applyDialog = true;
-          break;
+          this.applyDialog = true
+          break
         case 14:
-          this.applyDialog = true;
-          break;
+          this.applyDialog = true
+          break
         default:
-          this.updateData();
-          break;
+          this.updateData()
+          break
       }
     },
+    handleDeal(item) {
+      this.$confirm('是否进行扣分操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        leaderDeal({ id: item.id }).then(() => {
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          })
+          this.getList()
+        })
+      })
+    },
     updateData() {
       update(this.payload).then(res => {
         if (res.c === 200) {
-          this.$notify.success("操作成功");
-          this.getList();
-        }else{
-              this.$notify.error(res.m)
-            }
-      });
+          this.$notify.success('操作成功')
+          this.getList()
+        } else {
+          this.$notify.error(res.m)
+        }
+      })
     },
     apply() {
       this.$nextTick(() => {
         this.$refs.applyForm.validate(valid => {
           if (valid) {
-            this.updateData();
-            this.applyDialog = false;
+            this.updateData()
+            this.applyDialog = false
           }
-        });
-      }, 100);
+        })
+      }, 100)
     },
     handleFilterPhase(phase, event) {
-      if (event.target.tagName === "SPAN") {
+      if (event.target.tagName === 'SPAN') {
         event.target.parentElement.setAttribute(
-          "class",
-          "el-button el-button--" +
-            (phase === undefined ? "primary" : "default") +
-            " el-button--medium is-round"
-        );
+          'class',
+          'el-button el-button--' +
+            (phase === undefined ? 'primary' : 'default') +
+            ' el-button--medium is-round'
+        )
       } else {
         event.target.setAttribute(
-          "class",
-          "el-button el-button--" +
-            (phase === undefined ? "primary" : "default") +
-            " el-button--medium is-round"
-        );
+          'class',
+          'el-button el-button--' +
+            (phase === undefined ? 'primary' : 'default') +
+            ' el-button--medium is-round'
+        )
       }
-      this.listQuery.phase = phase;
-      this.getList();
+      this.listQuery.phase = phase
+      this.getList()
     },
     handleFilterStatus(status) {
-      this.listQuery.status = status;
-      this.getList();
+      this.listQuery.status = status
+      this.getList()
     },
     handlePreview() {},
     handleRemove() {},
@@ -824,21 +858,21 @@ export default {
     timeFormat(timeStamp) {
       const timeStr = `${
         Math.floor(timeStamp / 3600) < 9
-          ? "0" + Math.floor(timeStamp / 3600)
+          ? '0' + Math.floor(timeStamp / 3600)
           : Math.floor(timeStamp / 3600)
       }:${
         Math.floor(((timeStamp % 86400) % 3600) / 60) < 9
-          ? "0" + Math.floor(((timeStamp % 86400) % 3600) / 60)
+          ? '0' + Math.floor(((timeStamp % 86400) % 3600) / 60)
           : Math.floor(((timeStamp % 86400) % 3600) / 60)
       }:${
         Math.floor(((timeStamp % 86400) % 3600) % 60) < 9
-          ? "0" + Math.floor(((timeStamp % 86400) % 3600) % 60)
+          ? '0' + Math.floor(((timeStamp % 86400) % 3600) % 60)
           : Math.floor(((timeStamp % 86400) % 3600) % 60)
-      }`;
-      return timeStr;
+      }`
+      return timeStr
     }
   }
-};
+}
 </script>
 
 <style scope>
diff --git a/src/views/fingertipIntegral/recordList.vue b/src/views/fingertipIntegral/recordList.vue
index 0b5d24c..cda87e9 100644
--- a/src/views/fingertipIntegral/recordList.vue
+++ b/src/views/fingertipIntegral/recordList.vue
@@ -131,6 +131,10 @@ export default {
         {
           value: 'SPECIAL_WORK_TYPE',
           label: '特殊工单类型奖励积分(医保卫生)'
+        },
+        {
+          value: 'TITLE_EVALUATION',
+          label: '称号评比'
         }
       ]
     }
diff --git a/src/views/fingertipIntegral/settlementList.vue b/src/views/fingertipIntegral/settlementList.vue
index 2c6fcbe..e7527d5 100644
--- a/src/views/fingertipIntegral/settlementList.vue
+++ b/src/views/fingertipIntegral/settlementList.vue
@@ -22,6 +22,7 @@
     </div>
     <el-table :data="list" border style="width: 100%">
       <el-table-column label="用户名" prop="residentInformation.name" />
+      <el-table-column label="店名" prop="residentInformation.speciallyBusinessInfo.name" />
       <el-table-column label="结算积分数" prop="num" />
 
       <el-table-column label="提交时间">
@@ -56,7 +57,7 @@
       <el-table-column label="操作" width="300px" fixed="right" align="center">
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.dealStatus != '0'"
+            v-if="scope.row.invoiceStatus == '1' && scope.row.dealStatus != '0'"
             type="primary"
             size="mini"
             style="font-size:12px;padding:10px 20px"
@@ -68,7 +69,7 @@
             size="mini"
             style="font-size:12px;padding:10px 20px;border-radius:21px"
             @click="handleDelivery(scope.row)"
-          >交付发票</el-button>
+          >收到发票</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -244,7 +245,7 @@ export default {
       this.diaVisible = false
     },
     handleDelivery(item) {
-      this.$confirm('是否交付发票?', '提示', {
+      this.$confirm('是否收到发票?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'