Merge branch 'base-modify'

src/views/baseInfo/generalSetting.vue

@@ -110,8 +110,9 @@
 				<el-row v-if="dialogFrom.type==88">
 					<el-col :span="12">
 						<el-form-item label="提现方式" prop="withdrawWay">
-							<el-radio v-model="dialogFrom.withdrawWay" label="1">线上</el-radio>
-							<el-radio v-model="dialogFrom.withdrawWay" label="2">线下</el-radio>
+							<el-radio v-model="dialogFrom.withdrawWay" label="3">线上</el-radio>
+							<el-radio v-model="dialogFrom.withdrawWay" label="1">线下自动</el-radio>
+							<el-radio v-model="dialogFrom.withdrawWay" label="2">线下手动</el-radio>
 						</el-form-item>
 					</el-col>
 				</el-row>

src/views/purseManage/commissionSettings.vue

@@ -3,10 +3,10 @@
 		<el-form ref="form" label-width="140px" style="margin-top: 20px;">
 			<el-row v-for="(item,index) in settingList" :key="index">
 				<el-col :span="24" v-if="item.level==1">
-					<el-form-item label="股东分销提成">
+					<el-form-item label="svip分销提成">
 						<el-input
 							v-model="item.extract"
-							placeholder="请输入股东分销提成"
+							placeholder="请输入svip分销提成"
 							type="number"
 							v-enterNumber
 							style="width:200px"
@@ -14,8 +14,19 @@
 						<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" v-if="item.level==2">
+					<el-form-item label="vip分销提成">
+						<el-input
+							v-model="item.extract"
+							placeholder="请输入vip分销提成"
+							type="number"
+							v-enterNumber
+							style="width:200px"
+						></el-input>
+						<span style="color:#bfcbd9;">用户消费，其上线所得提成。提成为百分比，取值0到100之间，超出取值范围按0计算，无上线时无提成</span>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" v-if="item.level==3">
 					<el-form-item label="合伙人分销提成">
 						<el-input
 							v-model="item.extract"
@@ -28,7 +39,7 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="24" v-if="item.level==3">
+				<el-col :span="24" v-if="item.level==5">
 					<el-form-item label="代理人分销提成">
 						<el-input
 							v-model="item.extract"

src/views/purseManage/discountRecord.vue

 <template>
-	<div class="app-container calendar-list-container" v-loading.body="showLoadingBody">
+	<div class="app-container calendar-list-container" v-loading="showLoadingBody">
 		<div>
 			<div class="filter-container" ref="filter-container">
 				<el-form ref="queryForm" :inline="inline" :model="listQuery" label-width="100px">
@@ -25,12 +25,22 @@
 							></el-option>
 						</el-select>
 					</el-form-item>
-
+					<el-form-item label="付款方式" prop="type">
+						<el-select class="filter-item" v-model="listQuery.withdrawWay" placeholder="请输入状态">
+							<el-option
+								v-for="(item,index) in withdrawWayArr"
+								:key="index"
+								:label="item.name"
+								:value="item.val"
+							></el-option>
+						</el-select>
+					</el-form-item>
 					<el-form-item label="提现时间">
 						<el-date-picker v-model="time" type="datetimerange" placeholder="选择时间范围"></el-date-picker>
 					</el-form-item>
 
 					<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
+					<el-button class="filter-item" type="primary" v-waves icon="search" @click="clearSearch">清空搜索</el-button>
 				</el-form>
 			</div>
 			<el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%;">
@@ -82,6 +92,11 @@
 						<p>{{scope.row.finishTimeStr}}</p>
 					</template>
 				</el-table-column>
+				<el-table-column align="center" label="付款方式">
+					<template scope="scope">
+						<p>{{scope.row.withdrawWay == 1 ? '线下自动' : scope.row.withdrawWay == 2 ? '线下手动' : '线上'}}</p>
+					</template>
+				</el-table-column>
 				<el-table-column align="center" label="操作" width="65" fixed="right">
 					<template scope="scope">
 						<el-button
@@ -155,8 +170,18 @@ export default {
 	},
 	data() {
 		return {
+			withdrawWayArr:[{
+				name:'线上',
+				val:'3'
+			},{
+				name:'线下自动',
+				val:'1'
+			},{
+				name:'线下手动',
+				val:'2'
+			}],
 			submitBtn:false,
-      time:[],//提现时间
+      		time:[],//提现时间
 			typeOptions: [
 				{
 					name: '全部',
@@ -183,9 +208,10 @@ export default {
 				limit: 20,
 				phone: '', //手机号
 				username: '', //姓名
-        state: '', //状态
-        startTime:null,
-        endTime:null,
+				withdrawWay:'',
+				state: '', //状态
+				startTime:null,
+				endTime:null,
 				orderNo: '', //提现单号
 			},
 			inline: true,
@@ -204,10 +230,25 @@ export default {
 		...mapGetters(['elements'])
 	},
 	methods: {
+		clearSearch(){
+			this.listQuery= {
+				page: 1,
+				limit: 20,
+				phone: '', //手机号
+				username: '', //姓名
+				withdrawWay:'',
+				state: '', //状态
+				startTime:null,
+				endTime:null,
+				orderNo: '', //提现单号
+			}
+			this.getList()
+		},
 		/**
 		 * 获取提现列表
 		 * */
 		getList() {
+			this.showLoadingBody = true
 			this.listLoading = true
 			discountList(this.listQuery).then(response => {
 				let totalCountRs = undefined
@@ -229,6 +270,9 @@ export default {
 				this.list = listRs
 				this.total = totalCountRs
 			})
+			setTimeout(() => {
+				this.showLoadingBody = false
+			}, 300);
 		},
 		handleFilter() {
       this.listQuery.page = 1
@@ -256,7 +300,7 @@ export default {
 		},
 		handleUpdate(row) {
 			this.dialogFrom.cathId = row.id
-			this.activeOfflineWay = row.offlineWay
+			this.activeOfflineWay = row.withdrawWay
 			this.dialogVisible = true
 		},
 		edit(formName) {

src/views/purseManage/gainRecord.vue

@@ -55,7 +55,7 @@
 
 				<el-table-column align="center" label="来源">
 					<template scope="scope">
-						<span>{{scope.row.sourceUserName || '-'}}</span>
+						<span>{{scope.row.sourceName || '-'}}</span>
 					</template>
 				</el-table-column>
 

src/views/vehicle/bookRecord/index.vue

@@ -120,6 +120,7 @@
 					<span v-if="scope.row.bookType==8">禁用</span>
 					<span v-if="scope.row.bookType==9">客户用车</span>
 					<span v-if="scope.row.bookType==10">其他</span>
+					<span v-if="scope.row.bookType==11">调度</span>
 				</template>
 			</el-table-column>
 			<el-table-column align="center" label="预定取/还时间" width="200">
@@ -925,6 +926,10 @@ export default {
 				{
 					id: '10',
 					name: '其他'
+				},
+				{
+					id: '11',
+					name: '调度'
 				}
 			],
 			detailId: '',

src/views/vehicleType/priceList.vue

@@ -514,9 +514,10 @@ export default {
 					this.formatDate(now.getFullYear(), now.getMonth(), 1)
 				)
 				d.setDate(35)
-				date = new Date(
-					this.formatDate(d.getFullYear(), d.getMonth() + 1, 1)
-				)
+				console.log(d);
+				
+				date = new Date()
+				// date = new Date(this.formatDate(d.getFullYear(), d.getMonth() + 1, 1))
 			}
 			this.currentDay = date.getDate()
 			this.currentYear = date.getFullYear()