图标添加

src/layout/components/Sidebar/Item.vue

@@ -69,6 +69,15 @@ export default {
 .icon_menu_townRanking {
   background: url("./img/icon_twonRanking.png") no-repeat;
 }
+.icon_menu_dept {
+  background: url("./img/icon_dept.png") no-repeat;
+}
+.icon_menu_speciallyBusiness {
+  background: url("./img/icon_speciallyBusiness.png") no-repeat;
+}
+.icon_menu_fingertipIntegral {
+  background: url("./img/icon_fingertipIntegral.png") no-repeat;
+}
 .sub-el-icon {
   color: currentColor;
   width: 1em;

src/router/index.js

@@ -337,7 +337,7 @@ export const asyncRoutes = [
     redirect: '/dept/list',
     meta: {
       title: '县级部门管理',
-      icon: 'townRanking',
+      icon: 'dept',
       roles: ['SSS']
     },
     hidden: false,
@@ -348,7 +348,7 @@ export const asyncRoutes = [
         name: 'DeptList',
         meta: {
           title: '部门列表',
-          icon: 'townRanking',
+          icon: 'dept',
           affix: true,
           parentTitle: '县级部门管理'
         }
@@ -359,7 +359,7 @@ export const asyncRoutes = [
         name: 'DeptStaff',
         meta: {
           title: '人员列表',
-          icon: 'townRanking',
+          icon: 'dept',
           affix: true,
           parentTitle: '县级部门管理'
         },
@@ -374,7 +374,7 @@ export const asyncRoutes = [
     redirect: '/fingertipIntegral/list',
     meta: {
       title: '积分管理',
-      icon: 'townRanking',
+      icon: 'fingertipIntegral',
       roles: ['SSS']
     },
     hidden: false,
@@ -461,7 +461,7 @@ export const asyncRoutes = [
     redirect: '/speciallyBusiness/list',
     meta: {
       title: '特约商户管理',
-      icon: 'townRanking',
+      icon: 'speciallyBusiness',
       roles: ['SSS']
     },
     hidden: false,
@@ -472,7 +472,7 @@ export const asyncRoutes = [
         name: 'speciallyBusinessList',
         meta: {
           title: '商户列表',
-          icon: 'townRanking',
+          icon: 'speciallyBusiness',
           affix: true,
           parentTitle: '特约商户管理'
         }

src/views/fingertipIntegral/settlementList.vue

@@ -75,7 +75,7 @@
       <el-table-column label="操作" width="300px" fixed="right" align="center">
         <template slot-scope="scope">
           <el-button
-            v-if="scope.row.invoiceStatus == '1' && scope.row.dealStatus != '0'"
+            v-if="scope.row.invoiceStatus == '1' && scope.row.dealStatus == null"
             type="primary"
             size="mini"
             style="font-size:12px;padding:10px 20px"
@@ -232,8 +232,8 @@ export default {
       const listQuery = JSON.parse(JSON.stringify(this.listQuery))
       const { dateArr } = listQuery
       if (dateArr) {
-        listQuery.startDate = dateArr[0]
+        listQuery.startDate = dateArr[0] / 1000
-        listQuery.endDate = dateArr[1]
+        listQuery.endDate = dateArr[1] / 1000
       }
       settlementList(listQuery).then(res => {
         this.list = res.d.records
@@ -280,8 +280,8 @@ export default {
         const listQuery = JSON.parse(JSON.stringify(this.listQuery))
         const { dateArr } = listQuery
         if (dateArr) {
-          listQuery.startDate = dateArr[0]
+          listQuery.startDate = dateArr[0] / 1000
-          listQuery.endDate = dateArr[1]
+          listQuery.endDate = dateArr[1] / 1000
         }
         listQuery.size = 999999
         settlementList(listQuery).then(res => {