增加小程序预约管理修改菜单管理

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  BASE_API: '"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+  BASE_API: '"http://10.1.37.246:8765"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/api/login.js

@@ -32,7 +32,7 @@ export function getMenus(token) {
   return fetch({
     url: '/api/admin/user/front/menus',
     method: 'get',
-    params: { token }
+    params: {token: token,state:'0,1' }
   });
 }
 
@@ -41,4 +41,4 @@ export function getAllMenus() {
     url: '/api/admin/user/front/menu/all',
     method: 'get'
   });
-}
\ No newline at end of file
+}

src/api/vehicle/smallProgram/bookingManagement.js

+import fetch from 'utils/fetch';
+
+export function page(query) {
+  return fetch({
+    url: '/vehicle/reserve/list',
+    method: 'get',
+    params: query
+  });
+}

src/router/index.js

@@ -337,6 +337,12 @@ export const asyncRouterMap = [{
       name: '车辆申请管理',
       authority: 'bookRecord'
     },
+    {
+      path: 'bookingManagement',
+      component: _import('vehicle/smallProgram/bookingManagement'),
+      name: '小程序车辆申请管理',
+      authority: 'bookingManagement'
+    },
     {
       path: 'vehicleWarningMsg',
       component: _import('vehicle/vehicleWarningMsg/index'),

src/views/admin/menu/index.vue

@@ -50,6 +50,12 @@
           <el-option v-for="item in  typeOptions" :key="item" :label="item" :value="item"> </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="菜单类型" prop="state">
+          <el-select class="filter-item" :disabled="formEdit" v-model="form.state" placeholder="请选菜单类型">
+            <el-option v-for="(val, key, index) in stateOptions " :key="val.id" :label="val.name"
+                       :value="val.id"></el-option>
+          </el-select>
+      </el-form-item>
       <el-form-item label="排序" prop="orderNum">
           <el-input v-model="form.orderNum" :disabled="formEdit" placeholder="请输入排序"></el-input>
       </el-form-item>
@@ -98,6 +104,11 @@ export default {
       formStatus: '',
       showElement: false,
       typeOptions: ['menu', 'dirt'],
+      stateOptions: [
+        {id:'0',name:'全部'},
+        {id:'1',name:'后台菜单'},
+        {id:'2',name:'管家菜单'}
+        ],
       listQuery: {
         name: undefined
       },
@@ -118,7 +129,8 @@ export default {
         path: undefined,
         enabled: undefined,
         type: undefined,
-        attr1: undefined
+        attr1: undefined,
+        state:undefined
       },
       currentId: -1,
       menuManager_btn_add: false,
@@ -145,7 +157,9 @@ export default {
   methods: {
     getList() {
       fetchTree(this.listQuery).then(data => {
+
         this.treeData = data;
+        this.treeData.state=data.state
       });
     },
     filterNode(value, data) {

src/views/vehicle/smallProgram/bookingManagement.vue

+<template>
+  <div class="app-container calendar-list-container">
+    <div class="filter-container" ref="filter-container">
+    </div>
+
+
+    <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
+              style="width: 100%">
+      <el-table-column
+        type="index"
+        align="center" label="序号" width="65">
+      </el-table-column>
+      <el-table-column align="center" label="预约下单时间" width="200">
+        <template scope="scope">
+          <span>{{timeCycle(scope.row.crtTime)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="姓名" width="200">
+        <template scope="scope">
+          <span>{{scope.row.name}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="联系电话" width="200">
+        <template scope="scope">
+          <span>{{scope.row.phone}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="取车时间" width="200">
+        <template scope="scope">
+          <span>{{timeCycle(scope.row.startTime)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="还车时间" width="200">
+        <template scope="scope">
+          <span>{{timeCycle(scope.row.endTime)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="预约取车城市" width="200">
+        <template scope="scope">
+          <span>{{scope.row.provinceName}}-{{scope.row.cityName}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="车辆型号" width="300">
+        <template scope="scope">
+          <span>{{scope.row.modelName}}</span>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column align="center" label="详情" width="100" fixed="right">-->
+      <!--        <template scope="scope">-->
+      <!--          <span style="color: #13CE66;cursor: pointer;" @click="handleDetail(scope.row)">订单详情</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+    </el-table>
+
+    <div v-show="!listLoading" class="pagination-container">
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-page.sync="listQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="listQuery.limit"
+                     layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+
+<!--    <book-info-viewer ref="bookInfoViewer"></book-info-viewer>-->
+<!--    <acc-item-selector :selectedAccItem="selectedAccItem" :isReadOnly="true" ref="accItemSelector"></acc-item-selector>-->
+  </div>
+</template>
+
+<script>
+  import {
+    page,
+  } from 'src/api/vehicle/smallProgram/bookingManagement';
+  import {mapGetters} from 'vuex';
+  import {
+    getToken
+  } from '../../../utils/auth';
+
+   import { timestamp2Date} from 'src/utils/dateUtils'
+
+  import bookInfoViewer from '../bookInfoViewer';
+  import accItemSelector from '../accompanyingItem/accItemSelector.vue';
+
+  export default {
+    name: 'bookRecord',
+    components: {
+      bookInfoViewer,
+      accItemSelector
+    },
+    data() {
+      return {
+        listQuery: {
+          page: 1,
+          limit: 10
+        },
+        total: 0,
+        listLoading: true,
+        list: [],
+        tableKey:0,
+        selectedAccItem: undefined
+      }
+
+    },
+    created() {
+      this.getList();
+    },
+    computed: {
+      ...mapGetters([
+        'elements',
+
+      ]),
+      getHeaderWithToken() {
+        return {Authorization: getToken()};
+      }
+    },
+    methods: {
+      getList() {
+        page(this.listQuery)
+          .then(response => {
+            this.list = response.data.data;
+            this.total = response.data.totalCount;
+            this.listLoading = false;
+          })
+      },
+      timeCycle(element) {
+        return timestamp2Date(element);
+      },
+      handleSizeChange(val) {
+        this.listQuery.limit = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.listQuery.page = val;
+        this.getList();
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .order-details .el-form-item {
+    margin-bottom: 0px !important;
+  }
+
+  .order-details hr {
+    height: 1px;
+    background-color: #ccc;
+    border: none;
+  }
+
+  .image {
+    width: 100%;
+    height: 110px;
+    display: block;
+  }
+
+  .el-card__body, .el-card {
+    padding: 0px !important;
+    width: 150px;
+    text-align: center;
+  }
+</style>