8.25 入驻申请

src/api/applyManagements.js

@@ -5,9 +5,9 @@ export function getAllBranchCompanyByZoneId(query) {
   return fetch({
     url: '/vehicle/branchCompany/app/unauth/getByZone',
     method: 'get',
-          params:query
+    params: query
   });
-  }
+}
 
 /**
  * 获取申请列表--申请列表
@@ -19,9 +19,9 @@ export function getApplyList(query) {
     method: 'POST',
     data: query
   });
-  }
+}
 
-  /**
+/**
  * 处理
  * @param query
  */
@@ -106,3 +106,21 @@ export function infoPrize(query) {
     data: query
   });
 }
+
+// 入驻申请列表
+export function settlement_list(query) {
+  return fetch({
+    url: 'vehicle/company/apply/selectList',
+    method: 'get',
+    params: query
+  });
+}
+
+// 设为已读
+export function set_to_read(query) {
+  return fetch({
+    url: 'vehicle/company/apply/upd',
+    method: 'post',
+    data: query
+  });
+}

src/router/index.js

@@ -20,70 +20,70 @@ export const constantRouterMap = [{
     path: '/login',
     component: _import('login/index'),
     hidden: true
-},
-{
+  },
+  {
     path: '/authredirect',
     component: _import('login/authredirect'),
     hidden: true
-},
-{
+  },
+  {
     path: '/map',
     component: _import('map'),
     name: '地图',
     hidden: true
-},
-{
+  },
+  {
     path: '/stockCrowd',
     component: _import('baseInfo/stockCrowd/stockCrowd'),
     name: '分公司入股',
     hidden: true
     // authority: 'stockCrowd'
-},
-{
+  },
+  {
     path: '/stockCrowdDetail',
     component: _import('baseInfo/stockCrowdDetail/index'),
     name: '入股申请',
     hidden: true
     // authority: 'stockCrowd'
-},
-{
+  },
+  {
     path: '/campsite',
     component: _import('baseInfo/campsite/campsite'),
     name: '营地',
     hidden: true
     // authority: 'stockCrowd'
-},
-{
+  },
+  {
     path: '/companyInfo',
     component: _import('baseInfo/companyInfo/index'),
     name: '公司信息',
     hidden: true
     // authority: 'companyInfo'
-},
-{
+  },
+  {
     path: '/companyDetail',
     component: _import('baseInfo/companyInfo/companyDetail'),
     name: '公司详情',
     hidden: true
     // authority: 'companyInfo'
-},
-{
+  },
+  {
     path: '/provinceMap',
     component: _import('baseInfo/companyInfo/provinceMap'),
     name: '省市分布',
     hidden: true
     // authority: 'stockCrowd'
-},
-{
+  },
+  {
     path: '/404',
     component: _import('error/404'),
     hidden: true
-},
-{
+  },
+  {
     path: '/401',
     component: _import('error/401'),
     hidden: true
-},
+  },
   // {
   //   path: '/',
   //   component: Layout,
@@ -96,7 +96,7 @@ export const constantRouterMap = [{
   //   }]
   // },
 
-{
+  {
     path: '/',
     component: Layout,
     redirect: '/index',
@@ -106,8 +106,8 @@ export const constantRouterMap = [{
       path: 'index',
       component: _import('index/index')
     }]
-},
-{
+  },
+  {
     path: '/introduction',
     component: Layout,
     redirect: '/introduction/index',
@@ -118,7 +118,7 @@ export const constantRouterMap = [{
       component: _import('introduction/index'),
       name: '简述'
     }]
-}
+  }
 ]
 
 export default new Router({
@@ -172,8 +172,8 @@ export const asyncRouterMap = [{
       name: '操作日志管理',
       authority: 'gateLogManager'
     }]
-},
-{
+  },
+  {
     path: '/authManager',
     component: Layout,
     name: '基础配置管理',
@@ -185,8 +185,8 @@ export const asyncRouterMap = [{
       name: '用户管理',
       authority: 'serviceManager'
     }]
-},
-{
+  },
+  {
     path: '/memberManager',
     component: Layout,
     name: '会员管理',
@@ -197,8 +197,8 @@ export const asyncRouterMap = [{
       component: _import('member/info/index'),
       authority: 'memberInfo'
     }]
-},
-{
+  },
+  {
     path: '/monitorManager',
     component: Layout,
     name: '监控模块管理',
@@ -220,7 +220,7 @@ export const asyncRouterMap = [{
       name: '服务状态监控',
       authority: 'serviceZipkinManager'
     }]
-}, {
+  }, {
     path: '/baseInfo',
     component: Layout,
     name: '基础信息',
@@ -275,15 +275,14 @@ export const asyncRouterMap = [{
         authority: 'bannerSetting'
       }
     ]
-},
-{
+  },
+  {
     path: '/vehicleType',
     component: Layout,
     name: '车型管理',
     icon: 'setting',
     authority: 'vehicleType',
-  children: [
-    {
+    children: [{
         path: 'vehicleTypeList',
         component: _import('vehicleType/index'),
         name: '车型列表',
@@ -308,15 +307,14 @@ export const asyncRouterMap = [{
         authority: 'mockSun'
       }
     ]
-},
-{
+  },
+  {
     path: '/discoveryModule',
     component: Layout,
     name: '发现模块',
     icon: 'setting',
     authority: 'discoveryModule',
-  children: [
-    {
+    children: [{
         path: 'clapIndex',
         component: _import('discoveryModule/clapIndex'),
         name: '拍拍',
@@ -335,15 +333,14 @@ export const asyncRouterMap = [{
         authority: 'questionsAndAnswers'
       }
     ]
-},
-{
+  },
+  {
     path: '/campsiteManage',
     component: Layout,
     name: '营地管理',
     icon: 'setting',
     authority: 'campsiteManage',
-  children: [
-    {
+    children: [{
         path: 'campsiteList',
         component: _import('campsiteManage/index'),
         name: '营地列表',
@@ -356,15 +353,14 @@ export const asyncRouterMap = [{
         authority: 'campsiteLabel'
       }
     ]
-},
-{
+  },
+  {
     path: '/vehicle',
     component: Layout,
     name: '车辆管理',
     icon: 'setting',
     authority: 'vehicle',
-  children: [
-    {
+    children: [{
         path: 'vehicleInfo',
         component: _import('vehicle/vehicleInfo/index'),
         name: '车辆信息管理',
@@ -425,15 +421,14 @@ export const asyncRouterMap = [{
       //   authority: 'dispatchApply'
       // }
     ]
-},
-{
+  },
+  {
     path: '/tourManage',
     component: Layout,
     name: '旅行管理',
     icon: 'setting',
     authority: 'tourManage',
-  children: [
-    {
+    children: [{
         path: 'tourList',
         component: _import('tourManage/index'),
         name: '旅行列表',
@@ -446,15 +441,14 @@ export const asyncRouterMap = [{
         authority: 'tourLabel'
       }
     ]
-},
-{
+  },
+  {
     path: '/order',
     component: Layout,
     name: '订单管理',
     icon: 'setting',
     authority: 'order',
-  children: [
-    {
+    children: [{
         path: 'rentVehicleInfo',
         component: _import('order/rentVehicleInfo/index'),
         name: '租车订单管理',
@@ -491,15 +485,14 @@ export const asyncRouterMap = [{
         authority: 'orderActiveInfo'
       },
     ]
-},
-{
+  },
+  {
     path: '/purseManage',
     component: Layout,
     name: '钱包管理',
     icon: 'setting',
     authority: 'purseManage',
-  children: [
-    {
+    children: [{
         path: 'incomeOverview',
         component: _import('purseManage/incomeOverview'),
         name: '收益总览',
@@ -530,15 +523,14 @@ export const asyncRouterMap = [{
         authority: 'commissionRecord'
       }
     ]
-},
-{
+  },
+  {
     path: '/userManagement',
     component: Layout,
     name: '用户管理',
     icon: 'setting',
     authority: 'userManagement',
-  children: [
-    {
+    children: [{
         path: 'userList',
         component: _import('userManagement/userList/index'),
         name: '用户列表',
@@ -563,15 +555,14 @@ export const asyncRouterMap = [{
         authority: 'imCustomerServiceManger'
       }
     ]
-},
-{
+  },
+  {
     path: '/appManagement',
     component: Layout,
     name: 'app管理',
     icon: 'setting',
     authority: 'appManagement',
-  children: [
-    {
+    children: [{
         path: 'appVersion',
         component: _import('appManagement/appVersion/index'),
         name: 'app版本管理',
@@ -602,30 +593,27 @@ export const asyncRouterMap = [{
         authority: 'pushManagement'
       }
     ]
-},
-{
+  },
+  {
     path: '/summit',
     component: Layout,
     name: '峰会管理',
     icon: 'setting',
     authority: 'summit',
-  children: [
-    {
+    children: [{
       path: 'index',
       component: _import('summit/index'),
       name: '峰会列表',
       authority: 'index'
-    }
-  ]
-},
-{
+    }]
+  },
+  {
     path: '/cunponManagements',
     component: Layout,
     name: '优惠券管理',
     icon: 'setting',
     authority: 'cunponManagements',
-  children: [
-    {
+    children: [{
         path: 'cunponManagement',
         component: _import('cunponManagements/cunponManagement'),
         name: '优惠券管理',
@@ -638,30 +626,27 @@ export const asyncRouterMap = [{
         authority: 'conponList'
       }
     ]
-},
-{
+  },
+  {
     path: '/activityManagement',
     component: Layout,
     name: '活动管理',
     icon: 'setting',
     authority: 'activityManagement',
-  children: [
-    {
+    children: [{
       path: 'activityList',
       component: _import('activityManagement/activityList'),
       name: '活动列表',
       authority: 'activityList'
-    }
-  ]
-},
-{
+    }]
+  },
+  {
     path: '/casual',
     component: Layout,
     name: '发布会现金活动',
     icon: 'setting',
     authority: 'casual',
-  children: [
-    {
+    children: [{
         path: 'index',
         component: _import('conference/activeData/index'),
         name: '活动数据',
@@ -686,30 +671,34 @@ export const asyncRouterMap = [{
         authority: 'awardSet'
       }
     ]
-},
-{
+  },
+  {
     path: '/applyManagements',
     component: Layout,
     name: '申请管理',
     icon: 'setting',
     authority: 'applyManagements',
-  children: [
-    {
+    children: [{
         path: 'carApplyList',
         component: _import('applyManagements/carApplyList'),
         name: '购房车申请列表',
         authority: 'carApplyList'
+      },
+      {
+        path: 'Settlement',
+        component: _import('applyManagements/Settlement'),
+        name: '入驻申请',
+        authority: 'Settlement'
       }
     ]
-},
-{
+  },
+  {
     path: '/xxOfficialWebsite',
     component: Layout,
     name: '欣新房车官网管理',
     icon: 'setting',
     authority: 'xxOfficialWebsite',
-  children: [
-    {
+    children: [{
         path: 'activityList',
         component: _import('xxOfficialWebsite/activityList'),
         name: '活动管理',
@@ -740,45 +729,40 @@ export const asyncRouterMap = [{
         authority: 'friendLinkList'
       }
     ]
-},
-{
+  },
+  {
     path: '/summit',
     component: Layout,
     name: '峰会管理',
     icon: 'setting',
     authority: 'summit',
-  children: [
-    {
+    children: [{
       path: 'summitList',
       component: _import('summit/index'),
       name: '峰会列表',
       authority: 'summitList'
-    }
-  ]
-},
-{
+    }]
+  },
+  {
     path: '/statistics',
     component: Layout,
     name: '数据统计',
     icon: 'setting',
     authority: 'statistics',
-  children: [
-    {
+    children: [{
       path: 'orderStatistics',
       component: _import('statistics/orderStatistics'),
       name: '订单统计',
       authority: 'orderStatistics'
-    }
-  ]
-},
-{
+    }]
+  },
+  {
     path: '/financial',
     component: Layout,
     name: '财务报表',
     icon: 'setting',
     authority: 'financial',
-  children: [
-    {
+    children: [{
       path: 'staffPerformance',
       component: _import('financial/staffPerformance'),
       name: '员工业绩报表',
@@ -798,17 +782,15 @@ export const asyncRouterMap = [{
       component: _import('financial/vehicleStatistics'),
       name: '车辆统计',
       authority: 'vehicleStatistics'
-		}
-  ]
-},
-{
+    }]
+  },
+  {
     path: '/interior',
     component: Layout,
     name: '内部人员管理',
     icon: 'setting',
     authority: 'interior',
-  children: [
-    {
+    children: [{
         path: 'employeesInput',
         component: _import('interior/employeesInput'),
         name: '员工录入',
@@ -821,5 +803,5 @@ export const asyncRouterMap = [{
         authority: 'shareholder'
       }
     ]
-}
+  }
 ];

src/views/applyManagements/Settlement.vue

+<template>
+  <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
+    <div>
+      <div class="filter-container" ref="filter-container">
+        <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="80px">
+          <el-row>
+            <el-form-item label="状态">
+              <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择">
+                <el-option :key="undefined" label="无" :value="undefined"></el-option>
+                <el-option label="已读" value="1"></el-option>
+                <el-option label="未读" value="0"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="类型">
+              <el-select class="filter-item" v-model="listQuery.type" placeholder="请选择">
+                <el-option :key="undefined" label="无" :value="undefined"></el-option>
+                <el-option label="公司入驻" value="1"></el-option>
+                <el-option label="个人房车入驻" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="时间筛选">
+              <el-col :span="11">
+                <el-date-picker
+                  type="datetime"
+                  placeholder="选择时间"
+                  v-model="listQuery.startTime"
+                  style="width: 100%;"
+                ></el-date-picker>
+              </el-col>
+              <el-col class="line" :span="1">至</el-col>
+              <el-col :span="11">
+                <el-date-picker
+                  type="datetime"
+                  placeholder="选择时间"
+                  v-model="listQuery.endTime"
+                  style="width: 100%;"
+                ></el-date-picker>
+              </el-col>
+            </el-form-item>
+
+            <el-button
+              class="filter-item"
+              type="primary"
+              v-waves
+              icon="search"
+              @click="handleFilter"
+            >搜索</el-button>
+          </el-row>
+        </el-form>
+      </div>
+      <el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
+        <el-table-column align="center" label="类型">
+          <template scope="{row}">
+            <span v-if="row.type==1">公司入驻</span>
+            <span v-else>个人房车入驻</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="联系人" prop="contact"></el-table-column>
+        <el-table-column align="center" label="联系人手机" prop="moblie"></el-table-column>
+        <el-table-column align="center" label="公司名称">
+          <template scope="{row}">
+            <span v-if="row.name">{{row.name}}</span>
+            <span v-else>/</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="提交时间" prop="crtTimeStr"></el-table-column>
+        <el-table-column align="center" label="状态">
+          <template scope="{row}">
+            <span v-if="row.status==0">未读</span>
+            <span v-else>已读</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作">
+          <template scope="{row}">
+            <span v-if="row.status==0">
+              <el-button type="text" @click="set_to_readed(row)">设为已读</el-button>
+            </span>
+            <span v-else>/</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>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate } from "utils/dateFormattor";
+
+import {
+  toEast8Date,
+  deepCopyDate,
+  newEast8Date,
+  convertDate2Str,
+  timestamp2Date,
+} from "utils/dateUtils";
+
+import { mapGetters } from "vuex";
+
+import { settlement_list, set_to_read } from "api/applyManagements";
+import { getAllZone } from "api/base_info/constant/";
+import Element1 from "../admin/menu/components/element";
+import ElRow from "element-ui/packages/row/src/row";
+import ElCol from "element-ui/packages/col/src/col";
+
+export default {
+  name: "carApplyList",
+  components: {
+    ElCol,
+    ElRow,
+    Element1,
+  },
+  data() {
+    return {
+      starTimeStr: "",
+      endTimeStr: "",
+      newPeopelpickerOptionsEnd: {
+        disabledDate: (time) => {
+          const beginDateVal = new Date(this.starTimeStr).getTime();
+          if (beginDateVal) {
+            return time.getTime() < beginDateVal + 8.64e7;
+          }
+        },
+      },
+      statusList: [
+        {
+          name: "未处理",
+          id: "0",
+        },
+        {
+          name: "已处理",
+          id: "1",
+        },
+      ],
+      BASE_API: process.env.BASE_API,
+      showLoadingBody: false,
+      list: null,
+      total: null,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 10,
+        startTime: undefined,
+        endTime: undefined,
+        status: undefined,
+        type: undefined,
+      },
+      inline: true,
+      tableKey: 0,
+      baranchQuery: {
+        zoneId: null,
+      },
+      allBranchCompany: [],
+      app_btn_buy_vehicle_status_update: false,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  computed: {
+    ...mapGetters(["elements"]),
+  },
+  methods: {
+    /**
+     * 获取列表
+     * */
+    getList() {
+      this.listLoading = true;
+      let start = "";
+      let end = "";
+      if (this.listQuery.startTime) {
+        start = Date.parse(this.listQuery.startTime);
+      }
+      if (this.listQuery.endTime) {
+        end = Date.parse(this.listQuery.endTime);
+      }
+      let data = {
+        page: this.listQuery.page,
+        limit: this.listQuery.limit,
+        startTime: start,
+        endTime: end,
+        type: this.listQuery.type,
+        status: this.listQuery.status,
+      };
+      settlement_list(data).then((response) => {
+        let totalCountRs = undefined;
+        let listRs = undefined;
+        if (
+          !this.$utils.isEmpty(response.data.data) &&
+          this.$utils.isInteger(response.data.totalCount)
+        ) {
+          listRs = response.data.data;
+          totalCountRs = response.data.totalCount;
+          listRs.map(function (item) {
+            item.crtTimeStr = timestamp2Date(item.crtTime);
+          });
+        }
+        this.listLoading = false;
+        this.list = listRs;
+        this.total = totalCountRs;
+      });
+    },
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.$refs.queryForm.validate((valid) => {
+        if (valid) {
+          this.getList();
+        } else {
+          return false;
+        }
+      });
+    },
+    handleSizeChange(val) {
+      this.listQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    set_to_readed(row) {
+      console.log(row);
+      this.$confirm("确定设为已读?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        set_to_read({ id: row.id, status: 1 }).then((response) => {
+          if (response.status == 200) {
+            this.$notify({
+              title: "成功",
+              message: "处理成功",
+              type: "success",
+              duration: 2000,
+            });
+            this.getList();
+          } else {
+            this.$notify({
+              title: "失败",
+              message: response.message,
+              type: "error",
+              duration: 2000,
+            });
+          }
+        });
+      });
+    },
+  },
+};
+</script>