Browse Source

菜单权限

zhangdan 4 years ago
parent
commit
5df8870781

+ 5 - 5
src/config/router.config.js

@@ -75,17 +75,17 @@ export const asyncRouterMap = [{
     component: PageView,
     component: PageView,
     meta: {
     meta: {
       title: '订单中心',
       title: '订单中心',
-      icon: 'snippets'
-      // permission: 'M_setting_0'
+      icon: 'snippets',
+      permission: 'M_order_0'
     },
     },
     children: [{
     children: [{
       path: '/Order/OrderCenter',
       path: '/Order/OrderCenter',
       name: 'OrderCenter',
       name: 'OrderCenter',
       component: () => import('@/views/Order/OrderCenter.vue'),
       component: () => import('@/views/Order/OrderCenter.vue'),
       meta: {
       meta: {
-        title: '订单中心',
-        icon: 'snippets'
-        // permission: 'M_sys_dataDictionary'
+        title: '订单记录',
+        icon: 'file-text',
+        permission: 'M_order_list'
       }
       }
     }]
     }]
   },
   },

+ 4 - 6
src/views/Order/OrderCenter.vue

@@ -111,8 +111,6 @@
           customerMobile: '', // 手机号码
           customerMobile: '', // 手机号码
           orderStatus: '' // 状态
           orderStatus: '' // 状态
         },
         },
-        pageNo: 1, // 列表当前页
-        pageSize: 10, // 列表当前页码
         orderTotal: '', // 合计开单数量
         orderTotal: '', // 合计开单数量
         paymentAmountTotal: '', // 合计实收金额
         paymentAmountTotal: '', // 合计实收金额
         itemOptionData: [], // 服务项目数据
         itemOptionData: [], // 服务项目数据
@@ -227,8 +225,8 @@
       // 获取服务项目数据
       // 获取服务项目数据
       getItemListData() {
       getItemListData() {
         itemList({
         itemList({
-          pageNo: this.pageNo,
-          pageSize: this.pageSize
+          pageNo: 1,
+          pageSize: 1000
         }).then(res => {
         }).then(res => {
           // console.log(res, '-----------')
           // console.log(res, '-----------')
           if (res.status == 200) {
           if (res.status == 200) {
@@ -239,8 +237,8 @@
       // 获取网点名称数据
       // 获取网点名称数据
       getStoreListData() {
       getStoreListData() {
         storeList({
         storeList({
-          pageNo: this.pageNo,
-          pageSize: this.pageSize
+          pageNo: 1,
+          pageSize: 1000
         }).then(res => {
         }).then(res => {
           // console.log(res, '-----------')
           // console.log(res, '-----------')
           if (res.status == 200) {
           if (res.status == 200) {

+ 1 - 1
src/views/Order/OrderDetailModal.vue

@@ -50,7 +50,7 @@
                 <span v-else-if=" orderDetailData.payStatus != 'PAID' ">{{ 0 }} 元</span>
                 <span v-else-if=" orderDetailData.payStatus != 'PAID' ">{{ 0 }} 元</span>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :span="8" v-if="orderDetailData.beginImage">
+            <a-col :span="8" v-if="orderDetailData.beginImage || orderDetailData.endImage">
               <a-form-item label="洗车照片" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
               <a-form-item label="洗车照片" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
                 <div style="display: flex;">
                 <div style="display: flex;">
                   <div>
                   <div>

+ 1 - 0
vue.config.js

@@ -110,6 +110,7 @@ const vueConfig = {
       '/api': {
       '/api': {
         target: 'http://192.168.16.102:8101/cw-admin/',
         target: 'http://192.168.16.102:8101/cw-admin/',
         // target: 'https://zyyc.chelingzhu.com/cw-admin/',
         // target: 'https://zyyc.chelingzhu.com/cw-admin/',
+        // target: 'http://carwash.test.zyucgj.com/cw-admin/',
         ws: false,
         ws: false,
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {