工单管理添加扣分操作 一些页面添加字段

src/api/convenience.js

@@ -77,8 +77,8 @@ export function communicationList(data) {
 }
 /**
  * 监察工单列表
- * @param {*} data 
+ * @param {*} data
- * @returns 
+ * @returns
  */
 export function listOnlyLook(data) {
   return request({
@@ -91,8 +91,8 @@ export function listOnlyLook(data) {
 // /convenience/v2/services/listForData
 /**
  * 统计数据工单列表筛选
- * @param {*} data 
+ * @param {*} data
- * @returns 
+ * @returns
  */
 export function listForData(data) {
   return request({
@@ -104,8 +104,8 @@ export function listForData(data) {
 
 /**
  * LeaderTv
- * @param {*} data 
+ * @param {*} data
- * @returns 
+ * @returns
  */
 export function leaderTVData(data) {
   return request({
@@ -113,4 +113,17 @@ export function leaderTVData(data) {
     method: 'post',
     data
   })
-}
+}
+
+/**
+ * LeaderTv
+ * @param {*} data
+ * @returns
+ */
+export function leaderDeal(data) {
+  return request({
+    url: '/api/convenience/v2/services/leaderDeal',
+    method: 'post',
+    data
+  })
+}

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
+  })
+}

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
       }
     ]
   },

src/views/fingertipIntegral/recordList.vue

@@ -131,6 +131,10 @@ export default {
         {
           value: 'SPECIAL_WORK_TYPE',
           label: '特殊工单类型奖励积分(医保卫生)'
+        },
+        {
+          value: 'TITLE_EVALUATION',
+          label: '称号评比'
         }
       ]
     }

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'