chenrui 4 سال پیش
والد
کامیت
29b1e08087
2فایلهای تغییر یافته به همراه22 افزوده شده و 23 حذف شده
  1. 21 20
      src/config/router.config.js
  2. 1 3
      src/views/SetmealSales/SetmealDetailModal.vue

+ 21 - 20
src/config/router.config.js

@@ -136,28 +136,29 @@ export const asyncRouterMap = [{
     ]
   },
   {
-	  path: '/FinancialManagement',
-	  name: 'FinancialManagement',
-	  component: PageView,
-	  meta: { title: '财务管理', icon: 'account-book', permission: 'M_cwgn' },
-	  children: [
+    path: '/FinancialManagement',
+    name: 'FinancialManagement',
+    redirect: '/FinancialManagement/VerificationRecords',
+    component: PageView,
+    meta: { title: '财务管理', icon: 'account-book', permission: 'M_cwgn' },
+    children: [
       {
-			  path: '/SetmealSales/VerificationRecords',
-			  name: 'VerificationRecords',
-			  component: () => import('@/views/SetmealSales/VerificationRecords.vue'),
-			  meta: {
-			    title: '核销记录',
-			    icon: 'file-text',
-			    permission: 'M_hxjl_list'
-			  }
+        path: '/FinancialManagement/VerificationRecords',
+        name: 'VerificationRecords',
+        component: () => import('@/views/SetmealSales/VerificationRecords.vue'),
+        meta: {
+          title: '核销记录',
+          icon: 'file-text',
+          permission: 'M_hxjl_list'
+        }
       },
-	    {
-	      path: 'PaySettlementRecords/list',
-	      name: 'PaySettlementRecords',
-	      component: () => import(/* webpackChunkName: "writeOff" */ '@/views/FinancialManagement/PaySettlementRecords.vue'),
-	      meta: { title: '应付结算记录-套餐', icon: 'form', permission: 'M_yfjs_js_list' }
-	    }
-	  ]
+      {
+        path: '/FinancialManagement/PaySettlementRecords',
+        name: 'PaySettlementRecords',
+        component: () => import(/* webpackChunkName: "writeOff" */ '@/views/FinancialManagement/PaySettlementRecords.vue'),
+        meta: { title: '应付结算记录-套餐', icon: 'form', permission: 'M_yfjs_js_list' }
+      }
+    ]
   },
   {
     path: '/auth',

+ 1 - 3
src/views/SetmealSales/SetmealDetailModal.vue

@@ -94,8 +94,6 @@
             :dataSource="recordData"
             :pagination="false"
             bordered>
-            <!-- 车牌号 -->
-            <span slot="vehicleNum" slot-scope="text, record">{{ record.vehicleNum || '--' }}</span>
             <!-- 服务门店 -->
             <span slot="usedStoreName" slot-scope="text, record">{{ record.usedStoreName || '--' }}</span>
           </a-table>
@@ -147,7 +145,7 @@ export default {
       recordColumns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '使用时间', dataIndex: 'usedTime', width: 100, align: 'center' },
-        { title: '服务内容', dataIndex: 'itemName', width: 100, align: 'center' },
+        { title: '服务内容', dataIndex: 'itemName', width: 100, align: 'center', customRender: function (text) { return (text || '--') } },
         { title: '服务门店', scopedSlots: { customRender: 'usedStoreName' }, width: 100, align: 'center' },
         { title: '核销单号', dataIndex: 'bizNum', width: 100, align: 'center' }
       ],