Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/api/cunponManagements.js

+import fetch from 'utils/fetch';
+
+/**
+ * 获取优惠券管理列表
+ * @param query
+ */
+export function cunponManagementList(query) {
+    return fetch({
+      url: '',
+      method: 'get',
+      params: query
+    });
+  }
\ No newline at end of file

src/api/purseManage.js

@@ -47,3 +47,15 @@ export function rewardSetting(data) {
     data: data
   });
 }
+
+/**
+ * 获取收益流水列表
+ * @param query
+ */
+export function discountList(query) {
+  return fetch({
+    url: '/api/admin/walletcath/admin/page',
+    method: 'get',
+    params: query
+  });
+}
\ No newline at end of file

src/router/index.js

@@ -336,12 +336,12 @@ export const asyncRouterMap = [{
       name: '车辆保养记录',
       authority: 'vehicleUpkeepLog'
     },
-    // {
-    //   path: 'vehicleSchedulManage',
-    //   component: _import('vehicle/vehicleSchedulManage/index'),
-    //   name: '车辆排班管理',
-    //   authority: 'vehicleSchedulManage'
-    // }
+    {
+      path: 'vehicleSchedulManage',
+      component: _import('vehicle/vehicleSchedulManage/index'),
+      name: '车辆排班管理',
+      authority: 'vehicleSchedulManage'
+    }
   ]
 },
 {
@@ -416,6 +416,12 @@ export const asyncRouterMap = [{
       component: _import('purseManage/commissionSettings'),
       name: '佣金设置比例',
       authority: 'commissionSettings'
+    },
+    {
+      path: 'discountRecord',
+      component: _import('purseManage/discountRecord'),
+      name: '提现记录',
+      authority: 'discountRecord'
     }
   ]
 },
@@ -460,4 +466,20 @@ export const asyncRouterMap = [{
       authority: 'appVersion'
     }
   ]
-}];
+},
+{
+  path: '/cunponManagements',
+  component: Layout,
+  name: '优惠券管理',
+  icon: 'setting',
+  authority: 'cunponManagements',
+  children: [
+    {
+      path: 'cunponManagement',
+      component: _import('cunponManagements/cunponManagement'),
+      name: '优惠券管理',
+      authority: 'cunponManagement'
+    }
+  ]
+}
+];

src/utils/dateUtils.js

@@ -41,3 +41,36 @@ export function timestamp2Date(timestamp) {
   let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
   return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
 }
+
+/*
+  num 获取当天多少天后的日期
+*/
+export function getTimeByDay(num) {
+  const today = new Date().getTime()
+  const tempTime = new Date(today + 60 * 60 * 1000 * 24 * num);
+  return formatDate(tempTime, 'dd');
+}
+/*
+  num 获取当天多少天后的日期 yyyy-MM-dd hh:mm
+*/
+export function getymdTimeByDay(num) {
+  const today = new Date().getTime()
+  const tempTime = new Date(today + 60 * 60 * 1000 * 24 * num);
+  return formatDate(tempTime, 'yyyy-MM-dd');
+}
+
+/**
+ * 获取月份
+ * */
+export function getMonth(num) {
+  const today = new Date().getTime()
+  const tempTime = new Date(today + 60 * 60 * 1000 * 24 * num);
+  return formatDate(tempTime, 'MM');
+}
+/**
+ * 获取当前月
+ * */
+export function getCurrentMonth() {
+  const today = new Date();
+  return formatDate(today, 'MM');
+}

src/views/campsiteManage/modal/oneCampsiteModal.vue

@@ -225,11 +225,13 @@
       },
     },
     mounted() {
+      this.cleanForm();
       if(this.title == "编辑"){
         let row = this.oneRow;
         this.getOne(row.id);
+      } else {
+        this.activeName2 = "first";
       }
-      this.cleanForm();
       this.oneTourDialogVisible = true;
     },
     computed: {

src/views/order/rentVehicleInfo/index.vue

@@ -107,10 +107,10 @@
 			</el-table-column>
      <el-table-column align="center" label="操作" width="400">
           <template scope="scope">          
-					 <el-button  size="small" type="success" @click="handleHandoverOrderVehicle(scope.row)">交车记录</el-button>
-					 <el-button  size="small" type="success" @click="handleReturnOrderVehicle(scope.row)">还车记录</el-button>
-					 <el-button  size="small" type="success" @click="handleRefundVehicle(scope.row)">押金记录</el-button>
-					 <el-button size="small" v-if="scope.row.status == 6" type="success" @click="illegalInquiry(scope.row)">违章查询</el-button>
+					 <el-button  size="small" v-if="scope.row.status >=4" type="success" @click="handleHandoverOrderVehicle(scope.row)">交车记录</el-button>
+					 <el-button  size="small" v-if="scope.row.status == 6" type="success" @click="handleReturnOrderVehicle(scope.row)">还车记录</el-button>
+					 <el-button  size="small" v-if="scope.row.status > 3" type="success" @click="handleRefundVehicle(scope.row)">押金记录</el-button>
+					 <el-button 	size="small" v-if="scope.row.status == 6" type="success" @click="illegalInquiry(scope.row)">违章查询</el-button>
 					</template>
       </el-table-column>
     </el-table>

src/views/order/tourOrderInfo/detail.vue

@@ -60,14 +60,23 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <!--<el-table :data="tableData" border fit highlight-current-row style="width: 100%">
-        <el-table-column width="200" align="center" label="房车">
-            <template scope="scope">
-                <span>{{scope.no}}</span>
-            </template>
-        </el-table-column>
-        
-       </el-table>-->
+      <!--<table class="orderDetail">
+				<tr>
+					<td>房车</td>
+					<td>租借天数</td>
+					<td>费用明细</td>
+				</tr>
+				<tr>
+					<td>{{form.name}}{{tourCostDetail}}</td>
+					<td>{{form.orderRentVehicleDetail.dayNum}}天</td>
+					<td>{{tourCostDetail}}</td>
+				</tr>
+				<tr>
+					<td ></td>
+					<td ></td>
+					<td >共计:{{form.realAmount}}</td>
+				</tr>
+			</table>-->
     </el-form>
 
     <div slot="footer" class="dialog-footer">

src/views/purseManage/discountRecord.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="100px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="姓名">
+                <el-input v-model.number="listQuery.username" placeholder="请输入姓名"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="手机号">
+                <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="状态" prop="type">
+                <el-select class="filter-item" v-model="listQuery.state" placeholder="请输入状态">
+                  <el-option v-for="(item,index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
+      </div>
+      <el-table :key='tableKey' :data="list" border fit highlight-current-row
+                style="width: 100%;">
+        <el-table-column type="index" width="150" align="center" label="姓名">
+          <template scope="scope">
+            <span>{{scope.row.username}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column width="200" align="center" label="手机号">
+          <template scope="scope">
+            <span>{{scope.row.phone}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column width="200" align="center" label="金额">
+          <template scope="scope">
+            <span>{{scope.row.amount}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column width="200" align="center" label="状态">
+          <template scope="scope">
+            <span v-if="scope.row.stauts==0">未到帐</span>
+            <span v-if="scope.row.stauts==1">已到账</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="200" align="center" label="申请时间">
+          <template scope="scope">
+            <span>{{scope.row.crtTimeStr}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column width="200" align="center" label="到账时间">
+          <template scope="scope">
+            <span>{{scope.row.finishTimeStr}}</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 rsCode from '../../utils/rsCode';
+
+  import {mapGetters} from 'vuex';
+  import {
+    getToken
+  } from 'utils/auth';
+  import {
+    discountList
+  } from 'api/purseManage';
+  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: 'discountRecord',
+    components: {
+      ElCol,
+      ElRow,
+      Element1,
+    },
+    data() {
+      return {
+        typeOptions: [
+          {
+            "name":'全部',
+            "val":''
+          },
+          {
+            "name":'未到账',
+            "val":'0'
+          },
+          {
+            "name":'已到账',
+            "val":'1'
+          },
+        ],
+        BASE_API: process.env.BASE_API,
+        showLoadingBody: false,
+        list: null,
+        total: null,
+        listLoading: true,
+        listQuery: {
+          page: 1,
+          limit: 20,
+          phone: '',//手机号
+          username: '',//姓名
+          state:'',//状态
+        },
+        inline: true,
+        tableKey: 0
+      }
+    },
+    created() {
+      this.getList();
+    },
+    computed: {
+      ...mapGetters([
+        'elements'
+      ])
+    },
+    methods: {
+      /**
+       * 获取提现列表
+       * */
+      getList() {
+        this.listLoading = true;
+        discountList(this.listQuery).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);
+              item.finishTimeStr = timestamp2Date(item.finishTime);
+            });
+          }
+          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();
+      }
+    }
+  }
+</script>

src/views/purseManage/gainRecord.vue

 <template>
   <div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
-    <div v-if="!oneCampsiteDialogVisible">
+    <div>
       <div class="filter-container" ref="filter-container">
         <el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
           <el-row>
@@ -17,7 +17,7 @@
             <el-col :span="8">
               <el-form-item label="流水类型" prop="type">
                 <el-select class="filter-item" v-model="listQuery.source" placeholder="请输入资源类型">
-                  <el-option v-for="item in typeOptions" :key="item" :label="item.name" :value="item.val"> </el-option>
+                  <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.name" :value="item.val"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>

src/views/tourManage/modal/oneTourModal.vue

@@ -274,12 +274,12 @@ import UE from '../../modal/Ueditor';//百度ue富文本
           childPrice: undefined,//儿童价
           isOutside:"0",
           tourDepartVo:undefined,//type：0出发地  1途径地  2目的地
-          content: undefined,//行程亮点
+          content: "",//行程亮点
           cover:undefined,//封面图
           describe: undefined,//描述
-          introduce: undefined,//行程介绍
+          introduce: "",//行程介绍
           crtTime: undefined,
-          explain: undefined,//费用说明
+          explain: "",//费用说明
           name: undefined,//旅行名称
           price: undefined,//成人价
           rank: undefined,
@@ -348,11 +348,13 @@ import UE from '../../modal/Ueditor';//百度ue富文本
       },
     },
     mounted() {
+      this.cleanForm();
       if(this.title == "编辑"){
         let row = this.oneTourRow;
         this.getOneGoods(row.id);
+      } else{
+        this.activeName2 = "first";
       }
-      this.cleanForm();
       this.oneTourDialogVisible = true;
     },
     computed: {
@@ -863,7 +865,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
         this.$emit("oneTourDialogEvent", false);
       },
       /**
-       * 富文本  营地详情
+       * 富文本  旅游
        * */
       editorReadyEvent(instance){
         let t = this;
@@ -943,14 +945,14 @@ import UE from '../../modal/Ueditor';//百度ue富文本
           this.activeName2= '',//行程亮点
           this.form= {
             isOutside: "0",//省内、省外
-          childPrice: undefined,//儿童价
+            childPrice: undefined,//儿童价
             tourDepartVo:undefined,//type：0出发地  1途径地  2目的地
-            content: undefined,//行程亮点
+            content: "",//行程亮点
             cover:undefined,//封面图
             describe: undefined,//描述
-            introduce: undefined,//行程介绍
+            introduce: "",//行程介绍
             crtTime: undefined,
-            explain: undefined,//费用说明
+            explain: "",//费用说明
             name: undefined,//旅行名称
             price: undefined,//成人价
             rank: undefined,
@@ -966,9 +968,10 @@ import UE from '../../modal/Ueditor';//百度ue富文本
             bannerDTOS:[],//banner轮播
             tourDepartTimeVo:[],//活动时间
         },
-          this.showDestinationVisible= false,//编辑目的地
-          this.showPathWayVisible= false,//编辑途径地
-          this.showTimeVisible= false;//编辑时间
+        this.showDestinationVisible= false,//编辑目的地
+        this.showPathWayVisible= false,//编辑途径地
+        this.showTimeVisible= false;//编辑时间
+        this.activeName2 = "";
       }
     }
   }

src/views/vehicleType/modal/oneType.vue

@@ -350,6 +350,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
             let row = this.oneRow;
             this.getOne(row.id);
           } else {
+            this.activeName2 = "first";
             let tagArr = [];
             this.labelList.map(function(iitem){
               if(iitem.children.length >0){
@@ -778,6 +779,7 @@ import UE from '../../modal/Ueditor';//百度ue富文本
        * 清空旅游弹框数据
        */
       cleanForm() {
+        this.activeName2 = "";
         this.form = {
           name: undefined,//房车名称
             config: "",//房车配置