Skip to content

C
cloud-platform-ui
Commit 4d36fc91 authored by youjj's avatar youjj
Browse files
Options

车辆出车相关修改

parent b9f4469d
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 24 deletions
package-lock.json
View file @ 4d36fc91
......@@ -11221,6 +11221,11 @@
"integrity": "sha1-G6ZxIWYYL9ZRdTgEudjY0C2FVXk=",
"dev": true
},
"vue-infinite-loading": {
"version": "2.4.4",
"resolved": "https://registry.npm.taobao.org/vue-infinite-loading/download/vue-infinite-loading-2.4.4.tgz",
"integrity": "sha1-ip3vuc7up5fAV8s2vfVYpLLOQJ8="
},
"vue-infinite-scroll": {
"version": "2.0.2",
"resolved": "https://registry.npm.taobao.org/vue-infinite-scroll/download/vue-infinite-scroll-2.0.2.tgz",
......
src/api/vehicle/departureLog/index.js
View file @ 4d36fc91
......@@ -8,3 +8,12 @@ export function page(param) {
});
}
export function statistic(param) {
return fetch({
url: '/vehicle/departure/statistic',
method: 'get',
params: param
})
}
src/views/baseInfo/stockCrowd/index.vue
View file @ 4d36fc91
......@@ -5,7 +5,7 @@
<!--<img @click="goBack()" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfCAYAAADqUJ2JAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjU0OTNGQTA2QTEwNTExRTg4M0E3OUI4RkYwRDg3RUU4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjU0OTNGQTA3QTEwNTExRTg4M0E3OUI4RkYwRDg3RUU4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTQ5M0ZBMDRBMTA1MTFFODgzQTc5QjhGRjBEODdFRTgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NTQ5M0ZBMDVBMTA1MTFFODgzQTc5QjhGRjBEODdFRTgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4bKBAsAAAAzklEQVR42qzWWQrCMBDG8VzCtVb01ZuIFJUq4nU8l+AlXEsFXz2CC+iXB2EYgjBL4P/6o4Qk0xD0q4G2aBSMyB590F2LNQkSe6OFFGmhA0PWUqSNjgxZWZEXWkqRDjpZkS46E+Sp2diIXAjyQKUUyRLIXIr0UMWQmQapGTKVInkCKaTIAF0ZMtEgN4aMNZdwR5DYRvskuH1RXEOPPfqtfgIrtFjucY5cTza9a5X1rv27uKUWc3mPXF9I+ma7YuYp4jrXXCet6+xP/o18BRgA2Nl6bmmSdvgAAAAASUVORK5CYII=" size="25" style="width: 15px; height: 20px; margin: 10px">-->
<span class="header-title">分公司入股</span>
</div>
<!--众筹列表数据-->
<!--入股列表数据-->
<div class="shoppings main-container">
<div class="filter-container" ref="filter-container">
<el-form ref="queryForm" :inline="inline" :model="listQuery">
......@@ -331,7 +331,7 @@
}
},
view(id, name) {
//众筹详情页
//入股详情页
console.log(id + "----" + name);
this.$router.push({path: '/stockCrowdDetail?id=' + id + "&name=" + name})
},
......
src/views/baseInfo/stockCrowdDetail/index.vue
View file @ 4d36fc91
......@@ -5,14 +5,14 @@
<img @click="goBack()" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAfCAYAAADqUJ2JAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjU0OTNGQTA2QTEwNTExRTg4M0E3OUI4RkYwRDg3RUU4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjU0OTNGQTA3QTEwNTExRTg4M0E3OUI4RkYwRDg3RUU4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTQ5M0ZBMDRBMTA1MTFFODgzQTc5QjhGRjBEODdFRTgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NTQ5M0ZBMDVBMTA1MTFFODgzQTc5QjhGRjBEODdFRTgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4bKBAsAAAAzklEQVR42qzWWQrCMBDG8VzCtVb01ZuIFJUq4nU8l+AlXEsFXz2CC+iXB2EYgjBL4P/6o4Qk0xD0q4G2aBSMyB590F2LNQkSe6OFFGmhA0PWUqSNjgxZWZEXWkqRDjpZkS46E+Sp2diIXAjyQKUUyRLIXIr0UMWQmQapGTKVInkCKaTIAF0ZMtEgN4aMNZdwR5DYRvskuH1RXEOPPfqtfgIrtFjucY5cTza9a5X1rv27uKUWc3mPXF9I+ma7YuYp4jrXXCet6+xP/o18BRgA2Nl6bmmSdvgAAAAASUVORK5CYII=" size="25" style="width: 15px; height: 20px; margin: 10px">
<span class="header-title">入股申请</span>
</div>
<!--众筹详情页-->
<!--入股详情页-->
<!--我要参与-->
<div class="shoppings main-container" v-if="optionName=='detail'">
<div class="first" >
<h3>{{companyName}}</h3>
<div class="pad10 tips">
<p>参与须知：</p>
<p>本次提交为意向参与，后续会有专门的工作人员联系您，联系您，最终的参与众筹成功，需要线下确认。</p>
<p>本次提交为意向参与，后续会有专门的工作人员联系您，联系您，最终的入股申请参与成功，需要线下确认。</p>
</div>
<el-form :model="form" :rules="rules" ref="form" label-width="100px">
<el-input v-model="form.companyId" hidden></el-input>
......@@ -38,7 +38,7 @@
<img class="success-tip" v-else="!img" src="../../../assets/images/error.png"/>
<h5 v-if="img">感谢您的参与，后续会有专门的客服与您联系！</h5>
<h5 v-if="!img">出错啦，请联系客服！</h5>
<el-button @click="goBack()">返回股权众筹页</el-button>
<el-button @click="goBack()">返回股权入股申请页</el-button>
</div>
</div>
</template>
......@@ -151,7 +151,7 @@
let that = this;
that.msg = "";
if(!that.form.companyId){
that.msg = "请选择待申请的众筹项目！"
that.msg = "请选择待申请的入股项目！"
}
var isPhone = false;
var isNum = false;
......
src/views/vehicle/vehicleDepartureLog/index.vue
View file @ 4d36fc91
......@@ -5,6 +5,25 @@
v-model="listQuery.numberPlate"></el-input>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</div>
<div v-show="statisticVisiable">
<el-row style="text-align: center;margin-top: 10px;margin-bottom: 10px">
<el-col :span="8">
<span class="statistic_number">{{statisticData.departureCount}}</span>
<br><br>
<span class="statistic_title">出行次数</span>
</el-col>
<el-col :span="8">
<span class="statistic_number">{{statisticData.departureDay}}</span>
<br><br>
<span class="statistic_title">出行天数</span>
</el-col>
<el-col :span="8">
<span class="statistic_number">{{statisticData.departureMileage}}</span>
<br><br>
<span class="statistic_title">公里</span>
</el-col>
</el-row>
</div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
style="width: 100%">
<el-table-column align="center" label="车牌号" width="120">
......@@ -65,26 +84,36 @@
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div>
<!-- <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">-->
<!-- <el-form :model="form" :rules="rules" ref="form" label-width="100px">-->
<!-- <el-form-item label="姓名" prop="name">-->
<!-- <el-input v-model="form.name" placeholder="请输入姓名"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button @click="cancel('form')">取 消</el-button>-->
<!-- <el-button v-if="dialogStatus=='create'" type="primary" @click="create('form')">确 定</el-button>-->
<!-- <el-button v-else type="primary" @click="update('form')">确 定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
<!-- <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">-->
<!-- <el-form :model="form" :rules="rules" ref="form" label-width="100px">-->
<!-- <el-form-item label="姓名" prop="name">-->
<!-- <el-input v-model="form.name" placeholder="请输入姓名"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button @click="cancel('form')">取 消</el-button>-->
<!-- <el-button v-if="dialogStatus=='create'" type="primary" @click="create('form')">确 定</el-button>-->
<!-- <el-button v-else type="primary" @click="update('form')">确 定</el-button>-->
<!-- </div>-->
<!-- </el-dialog>-->
</div>
</template>
<style>
.statistic_number {
font-size: x-large;
font-weight: bolder;
}
.statistic_title {
font-size: x-large;
}
</style>
<script>
import {mapGetters} from 'vuex';
import {
page
} from 'api/vehicle/departureLog';
page,
statistic
} from '../../../api/vehicle/departureLog';
export default {
name: 'vehicleDepartureLog',
......@@ -130,7 +159,13 @@
create: '创建'
},
tableKey: 0,
dialogFormVisible: null
dialogFormVisible: null,
statisticVisiable: true,
statisticData: {
departureCount: null,
departureDay: null,
departureMileage: null
}
}
},
created() {
......@@ -138,7 +173,7 @@
if (numberPlate) {
this.listQuery.numberPlate = numberPlate;
}
this.getList();
this.handleFilter();
},
computed: {
...mapGetters([
......@@ -148,9 +183,18 @@
methods: {
handleFilter() {
this.getList();
if (this.listQuery.numberPlate) {
statistic({numberPlate: this.listQuery.numberPlate}).then(response => {
this.statisticData = response.data;
});
this.statisticVisiable = true;
}
},
getList() {
this.listLoading = true;
if (!this.listQuery.numberPlate) {
this.statisticVisiable = false;
}
page(this.listQuery)
.then(response => {
this.list = response.data.list;
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 4d36fc91
......@@ -561,6 +561,15 @@
<el-form-item label="车牌号">
<el-input v-model="departureForm.numberPlate" disabled></el-input>
</el-form-item>
<el-form-item label="出车时间" prop="departureDate">
<el-date-picker v-model="departureForm.departureDate" type="date" disabled
format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="出车分公司" prop="departureBranchCompanyId">
<el-select class="filter-item" v-model="departureForm.departureBranchCompanyId" placeholder="请选择分公司">
<el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="用途" prop="use">
<el-input v-model="departureForm.use" placeholder="请输入出车用途"></el-input>
</el-form-item>
......@@ -579,6 +588,11 @@
<el-form-item label="公里数" prop="mileage">
<el-input v-model="departureForm.mileage" placeholder="请输入出车时公里数"></el-input>
</el-form-item>
<el-form-item label="预计还车分公司" prop="expectArrivalBranchCompanyId">
<el-select class="filter-item" v-model="departureForm.expectArrivalBranchCompanyId" placeholder="请选择分公司">
<el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelDeparture">取 消</el-button>
......@@ -592,6 +606,10 @@
<el-form-item label="车牌号">
<el-input v-model="arrivalForm.numberPlate" disabled></el-input>
</el-form-item>
<el-form-item label="出车时间" prop="arrivalDate">
<el-date-picker v-model="arrivalForm.arrivalDate" type="date" disabled
format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="收车人" prop="checkMan">
<el-input v-model="arrivalForm.recycleMan" placeholder="请输入收车人"></el-input>
</el-form-item>
......@@ -601,6 +619,11 @@
<el-form-item label="公里数" prop="mileage">
<el-input v-model="arrivalForm.mileage" placeholder="请输入收车时公里数"></el-input>
</el-form-item>
<el-form-item label="还车分公司" prop="arrivalBranchCompanyId">
<el-select class="filter-item" v-model="arrivalForm.arrivalBranchCompanyId" placeholder="请选择分公司">
<el-option v-for="item in allCompanies" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelArrival">取 消</el-button>
......@@ -967,20 +990,25 @@
departureForm: {
vehicleId: null,
numberPlate: null,
departureDate: null,
departureBranchCompanyId: null,
use: null,
user: null,
userTel: null,
checkMan: null,
checkManTel: null,
expectArrivalBranchCompanyId: null,
mileage: null
},
arrivalDialogVisible: false,
arrivalForm: {
vehicleId: null,
numberPlate: null,
arrivalDate: null,
recycleMan: null,
recycleManTel: null,
mileage: null
mileage: null,
arrivalBranchCompanyId: null
},
upkeepDialogVisible: false,
upkeepForm: {
......@@ -1194,6 +1222,7 @@
this.clearArrivalForm();
this.arrivalForm.vehicleId = row.id;
this.arrivalForm.numberPlate = row.numberPlate;
this.arrivalForm.vehicleDate = Date();
},
cancelArrival() {
this.arrivalDialogVisible = false;
......@@ -1223,9 +1252,11 @@
this.arrivalForm = {
vehicleId: null,
numberPlate: null,
arrivalDate: null,
recycleMan: null,
recycleManTel: null,
mileage: null
mileage: null,
arrivalBranchCompanyId: null
};
},
departureHandler(row) {
......@@ -1234,6 +1265,7 @@
this.clearDepartureForm();
this.departureForm.vehicleId = row.id;
this.departureForm.numberPlate = row.numberPlate;
this.departureForm.departureDate = Date();
},
cancelDeparture() {
this.departureDialogVisible = false;
......@@ -1243,11 +1275,14 @@
this.departureForm = {
vehicleId: null,
numberPlate: null,
departureDate: null,
departureBranchCompanyId: null,
use: null,
user: null,
userTel: null,
checkMan: null,
checkManTel: null,
expectArrivalBranchCompanyId: null,
mileage: null
}
},
......
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