Skip to content

C
cloud-platform-ui
Commit 9c4a71b5 authored by guoyou's avatar guoyou
Browse files
Options

租车订单管理

parent 999cdedd
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 134 deletions
src/api/vehicleType.js
View file @ 9c4a71b5
...@@ -191,10 +191,13 @@ export function dayList(day) { ...@@ -191,10 +191,13 @@ export function dayList(day) {
} }
// 日历价格设置 // 日历价格设置
export function add_edit(params) { export function add_edit(params, date) {
return fetch({ return fetch({
url: '/vehicle/admin/vehicle_model/calendar_price/add_edit', url: '/vehicle/admin/vehicle_model/calendar_price/add_edit/' + date,
method: 'post', method: 'post',
headers: {
'Content-Type': 'application/json;charset=UTF-8'
},
data: params data: params
}); });
} }
......
src/views/purseManage/commissionRecord.vue
View file @ 9c4a71b5
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="来源"> <el-table-column align="center" label="来源">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.sourceName}}</span> <span>{{scope.row.sourceName == '' ? scope.row.phone : scope.row.sourceName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="订单金额"> <el-table-column align="center" label="订单金额">
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 9c4a71b5
...@@ -9,99 +9,81 @@ ...@@ -9,99 +9,81 @@
label-width="100px" label-width="100px"
> >
<el-row> <el-row>
<el-col :span="5"> <el-form-item label="车牌">
<el-form-item label="车牌"> <el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input> </el-form-item>
</el-form-item> <el-form-item label="车辆编码">
</el-col> <el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
<el-col :span="5"> </el-form-item>
<el-form-item label="车辆编码"> <el-form-item label="车辆状态">
<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
</el-form-item> <el-option :key="undefined" label="全部" :value="undefined"></el-option>
</el-col> <el-option
<el-col :span="5"> v-for="(val,index) in getAllVehicleStatus() "
<el-form-item label="车辆状态"> :key="index"
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态"> :label="val.val"
<el-option :key="undefined" label="全部" :value="undefined"></el-option> :value="val.code"
<el-option ></el-option>
v-for="(val,index) in getAllVehicleStatus() " </el-select>
:key="index" </el-form-item>
:label="val.val" <el-form-item label="分公司" prop="subordinateBranch">
:value="val.code" <el-autocomplete
></el-option> class="inline-input"
</el-select> v-model="state1"
</el-form-item> :fetch-suggestions="querySearch"
</el-col> placeholder="请输入分公司"
<el-col :span="5"> @select="handleSelect"
<el-form-item label="分公司" prop="subordinateBranch"> ></el-autocomplete>
<el-autocomplete </el-form-item>
class="inline-input" <el-form-item label="区域" prop="zoneId">
v-model="state1" <el-select
:fetch-suggestions="querySearch" class="filter-item"
placeholder="请输入分公司" v-model="listQuery.zoneId"
@select="handleSelect" placeholder="请选择"
></el-autocomplete> @change="getProvinceRegions()"
</el-form-item> >
</el-col> <el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
</el-row> </el-select>
<el-row> </el-form-item>
<el-col :span="5"> <el-form-item label="省份" prop="addrProvince">
<el-form-item label="区域" prop="zoneId"> <el-autocomplete
<el-select class="inline-input"
class="filter-item" v-model="listQuery.addrProvinceName"
v-model="listQuery.zoneId" :fetch-suggestions="querySearchProvinceName"
placeholder="请选择" placeholder="请输入省份（直辖市）"
@change="getProvinceRegions()" @select="handleSelectProvince"
> ></el-autocomplete>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option> </el-form-item>
</el-select> <!--<el-form-item label="省份" prop="addrProvince">-->
</el-form-item> <!--<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change="cityRegions4Query()">-->
</el-col> <!--<el-option v-for="item in provinceArr" :key="item.id" :label="item.name"-->
<el-col :span="5"> <!--:value="item.id"></el-option>-->
<el-form-item label="省份" prop="addrProvince"> <!--</el-select>-->
<el-autocomplete <!--</el-form-item>-->
class="inline-input" <el-form-item label="城市" prop="addrCity">
v-model="listQuery.addrProvinceName" <el-autocomplete
:fetch-suggestions="querySearchProvinceName" class="inline-input"
placeholder="请输入省份（直辖市）" v-model="listQuery.addrCityName"
@select="handleSelectProvince" :fetch-suggestions="querySearchCityName"
></el-autocomplete> placeholder="请输入城市"
</el-form-item> @select="handleSelectCity"
<!--<el-form-item label="省份" prop="addrProvince">--> ></el-autocomplete>
<!--<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change="cityRegions4Query()">--> </el-form-item>
<!--<el-option v-for="item in provinceArr" :key="item.id" :label="item.name"--> <!--<el-form-item label="城市" prop="addrCity">-->
<!--:value="item.id"></el-option>--> <!--<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">-->
<!--</el-select>--> <!--<el-option v-for="item in cityArr" :key="item.id" :label="item.name"-->
<!--</el-form-item>--> <!--:value="item.id"></el-option>-->
</el-col> <!--</el-select>-->
<el-col :span="5"> <!--</el-form-item>-->
<el-form-item label="城市" prop="addrCity"> <el-form-item label="车型" prop="modelId">
<el-autocomplete <el-autocomplete
class="inline-input" class="inline-input"
v-model="listQuery.addrCityName" v-model="vehicleArr"
:fetch-suggestions="querySearchCityName" :fetch-suggestions="queryVehicleModelSearch"
placeholder="请输入城市" placeholder="请选择车型"
@select="handleSelectCity" @select="handleVehicleModelSelect"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<!--<el-form-item label="城市" prop="addrCity">-->
<!--<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">-->
<!--<el-option v-for="item in cityArr" :key="item.id" :label="item.name"-->
<!--:value="item.id"></el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
</el-col>
<el-col :span="5">
<el-form-item label="车型" prop="modelId">
<el-autocomplete
class="inline-input"
v-model="vehicleArr"
:fetch-suggestions="queryVehicleModelSearch"
placeholder="请选择车型"
@select="handleVehicleModelSelect"
></el-autocomplete>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-button <el-button
class="filter-item" class="filter-item"
...@@ -417,14 +399,14 @@ ...@@ -417,14 +399,14 @@
</el-table> </el-table>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="listQuery.page" :current-page.sync="listQuery.page"
:page-sizes="[10,20,30, 50]" :page-sizes="[10,20,30, 50]"
:page-size="listQuery.limit" :page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
></el-pagination> ></el-pagination>
<!-- 对话框相关html元素 --> <!-- 对话框相关html元素 -->
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="closePop"> <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="closePop">
...@@ -540,16 +522,14 @@ ...@@ -540,16 +522,14 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="年审日期" prop="manufacturer"> <el-form-item label="年审日期" prop="manufacturer">
<el-date-picker <el-date-picker
v-model="form.annualVerificationDate" v-model="form.annualVerificationDate"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
style="width:100%"> style="width:100%"
</el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">用途、位置及里程</p> <p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">用途、位置及里程</p>
...@@ -745,11 +725,10 @@ ...@@ -745,11 +725,10 @@
<!--</el-col>--> <!--</el-col>-->
</el-row> </el-row>
<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">其他</p> <p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">其他</p>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}"> <el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}">
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'" :action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
...@@ -765,7 +744,15 @@ ...@@ -765,7 +744,15 @@
class="avatar" class="avatar"
:style="{display:'block'}" :style="{display:'block'}"
/> />
<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}" style="position: relative;"><br/><span class="driving-title">行驶证正面</span></i> <i
v-else
class="el-icon-plus avatar-uploader-icon"
:style="{lineHeight:'350px'}"
style="position: relative;"
>
<br />
<span class="driving-title">行驶证正面</span>
</i>
</el-upload> </el-upload>
<el-upload <el-upload
...@@ -783,8 +770,15 @@ ...@@ -783,8 +770,15 @@
class="avatar" class="avatar"
:style="{display:'block'}" :style="{display:'block'}"
/> />
<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}" style="position: relative;"><br/><span class="driving-title">行驶证副本</span></i> <i
v-else
class="el-icon-plus avatar-uploader-icon"
:style="{lineHeight:'350px'}"
style="position: relative;"
>
<br />
<span class="driving-title">行驶证副本</span>
</i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1059,7 +1053,7 @@ export default { ...@@ -1059,7 +1053,7 @@ export default {
showLoadingBody: false, showLoadingBody: false,
allVehicleList: [], //全部车型 allVehicleList: [], //全部车型
form: { form: {
insuranceEndDate:null,//商业险日期 insuranceEndDate: null, //商业险日期
vehicleModelName: '', //车型 vehicleModelName: '', //车型
subordinateBranchName: '', //所属分公司 subordinateBranchName: '', //所属分公司
subordinateBranch: undefined, subordinateBranch: undefined,
...@@ -2579,7 +2573,7 @@ export default { ...@@ -2579,7 +2573,7 @@ export default {
// console.log(this.getAllVehicleStatus()[1].val); // console.log(this.getAllVehicleStatus()[1].val);
// let demo = this.getAllVehicleStatus.filter(item => item) // let demo = this.getAllVehicleStatus.filter(item => item)
// console.log(this.vehicleStatus[code]); // console.log(this.vehicleStatus[code]);
return this.getAllVehicleStatus()[code].val return this.getAllVehicleStatus()[code].val
}, },
getAllVehicleStatus: function() { getAllVehicleStatus: function() {
...@@ -2621,7 +2615,8 @@ export default { ...@@ -2621,7 +2615,8 @@ export default {
VEHICLE_CONSTANT_VEHICLE_BRAND, VEHICLE_CONSTANT_VEHICLE_BRAND,
code code
) )
? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_BRAND, code).val ? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_BRAND, code)
.val
: '品牌不存在' : '品牌不存在'
}, },
getAllBranch: () => { getAllBranch: () => {
...@@ -2635,7 +2630,8 @@ export default { ...@@ -2635,7 +2630,8 @@ export default {
return '未知' return '未知'
} }
return getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code) return getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code)
? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code).val ? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code)
.val
: '用途未知' : '用途未知'
}, },
getAllUseType: () => { getAllUseType: () => {
...@@ -2671,8 +2667,7 @@ export default { ...@@ -2671,8 +2667,7 @@ export default {
if (!this.listQuery.belongToName) { if (!this.listQuery.belongToName) {
this.listQuery.belongToName = undefined this.listQuery.belongToName = undefined
} }
page(listQueryTemp).then(response => { page(listQueryTemp).then(response => {
if (response.code == 1) { if (response.code == 1) {
let totalCountRs = undefined let totalCountRs = undefined
...@@ -2688,8 +2683,8 @@ export default { ...@@ -2688,8 +2683,8 @@ export default {
// }) // })
// } // }
this.listLoading = false this.listLoading = false
console.log(response.data.data); console.log(response.data.data)
this.list = response.data.data this.list = response.data.data
this.total = response.data.totalCount this.total = response.data.totalCount
} else { } else {
...@@ -3057,12 +3052,12 @@ export default { ...@@ -3057,12 +3052,12 @@ export default {
mileageLastUpdate: undefined, mileageLastUpdate: undefined,
// receiveTime: undefined, // receiveTime: undefined,
drivingLicensePath: undefined, drivingLicensePath: undefined,
drivingLicenseDuplicatePath:undefined, drivingLicenseDuplicatePath: undefined,
remark: undefined, remark: undefined,
strongInsuranceEndDate: undefined, strongInsuranceEndDate: undefined,
strongInsuranceNo: undefined, strongInsuranceNo: undefined,
strongInsuranceCompany: undefined, strongInsuranceCompany: undefined,
insuranceEndDate:null insuranceEndDate: null
} }
}, },
resetTemp4Apply() { resetTemp4Apply() {
...@@ -3098,10 +3093,10 @@ export default { ...@@ -3098,10 +3093,10 @@ export default {
} }
</script> </script>
<style> <style>
.driving-title{ .driving-title {
position: absolute; position: absolute;
top: 34px; top: 34px;
left: 140px; left: 140px;
font-size: 14px; font-size: 14px;
} }
</style> </style>
\ No newline at end of file
src/views/vehicleType/priceList.vue
View file @ 9c4a71b5
...@@ -366,12 +366,18 @@ export default { ...@@ -366,12 +366,18 @@ export default {
} }
}) })
} }
if (params == '') { if (params == '') {
this.$message.error('请设置不同车型不同价格4') add_edit('',this.activeTime).then(data => {
return false if (data.status == 200) {
this.$message.success('设置成功')
this.chooseData = []
this.getList()
} else {
this.$message.error(data.message)
}
})
} else { } else {
add_edit(params).then(data => { add_edit(params,this.activeTime).then(data => {
if (data.status == 200) { if (data.status == 200) {
this.$message.success('设置成功') this.$message.success('设置成功')
this.chooseData = [] this.chooseData = []
...@@ -398,8 +404,8 @@ export default { ...@@ -398,8 +404,8 @@ export default {
data.data.forEach(element => { data.data.forEach(element => {
element.multiple = element.multiple || '' element.multiple = element.multiple || ''
element.price = element.price || '' element.price = element.price || ''
element.level = element.level||'' element.level = element.level || ''
element.freeDays = element.freeDays||'' element.freeDays = element.freeDays || ''
}) })
this.dayListData = data.data this.dayListData = data.data
this.setMultiplePop = true this.setMultiplePop = true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment