Skip to content

C
cloud-platform-ui
Commit 4a7325f2 authored by xiaosl's avatar xiaosl
Browse files
Options

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

Conflicts:
	config/dev.env.js
	src/views/summit/model/reviewPopup.vue
	src/views/summit/model/summitPopup.vue
	src/views/vehicle/bookRecord/index.vue
	src/views/vehicle/vehicleInfo/index.vue
parents 1915df9b ed66af1f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 895 additions and 554 deletions
config/dev.env.js
View file @ 4a7325f2
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
<<<<<<< HEAD
BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威) BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
=======
BASE_API:'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
config/sit.env.js
View file @ 4a7325f2
module.exports = { module.exports = {
NODE_ENV: '"sit"', NODE_ENV: '"sit"',
BASE_API: '"https://xxtest.upyuns.com"', BASE_API: '"https://dev.dfangche.com"',
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
}; };
src/api/admin/userManagement/index.js
View file @ 4a7325f2
...@@ -99,15 +99,32 @@ export function postions(obj) { ...@@ -99,15 +99,32 @@ export function postions(obj) {
}); });
} }
// 身份列表
export function jobs(obj) {
return fetch({
url: '/api/admin/postion/admin/jobs',
method: 'get',
data: obj
});
}
// 添加员工 // 添加员工
export function addEditor(obj) { export function addEditor(obj) {
return fetch({ return fetch({
url: '/api/admin/postion/admin/add', url: '/api/admin/postion/admin/addUserPostion',
method: 'post', method: 'post',
data: obj data: obj
}); });
} }
// 编辑员工
export function editorUpd(obj) {
return fetch({
url: '/api/admin/postion/admin/updUserPostion',
method: 'post',
data: obj
});
}
//删除员工 //删除员工
export function deleteStaffs(id) { export function deleteStaffs(id) {
return fetch({ return fetch({
......
src/api/base_info/constant/index.js
View file @ 4a7325f2
...@@ -80,7 +80,6 @@ function loadFromServer(type) { ...@@ -80,7 +80,6 @@ function loadFromServer(type) {
}); });
} }
console.log(rs);
return rs; return rs;
} }
......
src/api/base_info/region/index.js
View file @ 4a7325f2
...@@ -80,7 +80,6 @@ export function getSonRegionByCodes(code) { ...@@ -80,7 +80,6 @@ export function getSonRegionByCodes(code) {
if (!actualCode) { if (!actualCode) {
actualCode = rsCode.REGION_CODE_CHAINA; actualCode = rsCode.REGION_CODE_CHAINA;
} }
let sonRegions = store.getters.sonRegions(actualCode); let sonRegions = store.getters.sonRegions(actualCode);
if (!sonRegions) { if (!sonRegions) {
let datas = loadSonsFromServer(actualCode); let datas = loadSonsFromServer(actualCode);
......
src/api/vehicle/vehicleInfo/index.js
View file @ 4a7325f2
...@@ -98,3 +98,19 @@ export function checkCode(code, id) { ...@@ -98,3 +98,19 @@ export function checkCode(code, id) {
method: 'get' method: 'get'
}); });
} }
//检查车架号是否存在
export function checkVin(vin, id) {
return fetch({
url: '/vehicle/vehicleInfo/exist_vin/' + vin + '?id=' + id,
method: 'get'
});
}
//检查车辆发动机号是否存在
export function checkEngineNum(engineNum, id) {
return fetch({
url: '/vehicle/vehicleInfo/exist_engineNum/' + engineNum + '?id=' + id,
method: 'get'
});
}
\ No newline at end of file
src/views/summit/model/reviewPopup.vue
View file @ 4a7325f2
...@@ -170,7 +170,10 @@ export default { ...@@ -170,7 +170,10 @@ export default {
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
var index = file.name.lastIndexOf('.') var index = file.name.lastIndexOf('.')
var ext = file.name.substr(index + 1) var ext = file.name.substr(index + 1)
<<<<<<< HEAD
console.log(ext) console.log(ext)
=======
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (ext != 'zip') { if (ext != 'zip') {
this.$message.error('上传压缩包只能是 zip 格式!') this.$message.error('上传压缩包只能是 zip 格式!')
return false return false
...@@ -197,7 +200,11 @@ export default { ...@@ -197,7 +200,11 @@ export default {
cre() { cre() {
let zipPic = [] let zipPic = []
this.list.forEach(element => { this.list.forEach(element => {
<<<<<<< HEAD
zipPic.push(element.url) zipPic.push(element.url)
=======
zipPic.push(element.response.data)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
}) })
let mp4Vadio = [] let mp4Vadio = []
this.vadio.forEach(element => { this.vadio.forEach(element => {
...@@ -219,6 +226,11 @@ export default { ...@@ -219,6 +226,11 @@ export default {
: zipPic.join(',') + ',' + this.oldList : zipPic.join(',') + ',' + this.oldList
: zipPic.join(',') : zipPic.join(',')
} }
<<<<<<< HEAD
=======
// console.log(params);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
save(params).then(res => { save(params).then(res => {
this.responseResult(res) this.responseResult(res)
}) })
......
src/views/summit/model/summitPopup.vue
View file @ 4a7325f2
...@@ -105,12 +105,16 @@ ...@@ -105,12 +105,16 @@
<el-form-item label="活动id:"> <el-form-item label="活动id:">
<!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> --> <!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> -->
<el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id"> <el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id">
<<<<<<< HEAD
<el-option <el-option
v-for="(item,index) in optionsId" v-for="(item,index) in optionsId"
:key="index" :key="index"
:label="item" :label="item"
:value="item" :value="item"
></el-option> ></el-option>
=======
<el-option v-for="(item,index) in optionsId" :key="index" :label="item" :value="item"></el-option>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -151,20 +155,20 @@ ...@@ -151,20 +155,20 @@
<div> <div>
<el-row> <el-row>
<el-col> <el-col>
<<<<<<< HEAD
<el-form-item label="房车介绍:"> <el-form-item label="房车介绍:">
=======
<el-form-item label="房车介绍:" style="margin-top:20px">
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
<el-upload <el-upload
class="upload-demo"
:headers="getHeaderWithToken"
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'" :action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
:on-remove="handleRemove" list-type="picture-card"
:file-list="fileList2" :file-list="fileList2"
:on-success="handleBannerSuccess" :on-success="handleBannerSuccess"
list-type="picture" :on-remove="handleRemove"
:headers="getHeaderWithToken"
> >
<div slot="tip" class="el-upload__tip"> <i class="el-icon-plus"></i>
<span style="color: red;">建议尺寸：1080*644px</span>
</div>
<el-button size="small" type="primary">点击上传</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="峰会流程:"> <el-form-item label="峰会流程:">
...@@ -205,8 +209,8 @@ ...@@ -205,8 +209,8 @@
<el-row> <el-row>
<el-col> <el-col>
<el-button class="button" @click="cancelHandel">取 消</el-button> <el-button class="button" @click="cancelHandel">取 消</el-button>
<el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确 定</el-button> <el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确定</el-button>
<el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确 定</el-button> <el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确定</el-button>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -287,7 +291,11 @@ export default { ...@@ -287,7 +291,11 @@ export default {
created() { created() {
activityIds().then(data => { activityIds().then(data => {
if (data.status == 200) { if (data.status == 200) {
<<<<<<< HEAD
this.optionsId = data.data; this.optionsId = data.data;
=======
this.optionsId = data.data
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
} }
}) })
}, },
...@@ -306,11 +314,14 @@ export default { ...@@ -306,11 +314,14 @@ export default {
} }
}, },
methods: { methods: {
handleBannerSuccess(res, file) { handleBannerSuccess(res, file, fileList) {
this.fileList2.push({ url: res.data }) console.log(fileList);
this.form.vehicleImgs = this.fileList2 this.fileList2 = fileList
// this.form.vehicleImgs = this.fileList2
},
handleRemove(res, file, fileList) {
this.fileList2 = file
}, },
handleRemove() {},
getOrderInfo() { getOrderInfo() {
this.title = this.titleNme this.title = this.titleNme
if (this.title === '编辑峰会') { if (this.title === '编辑峰会') {
...@@ -384,7 +395,11 @@ export default { ...@@ -384,7 +395,11 @@ export default {
}, },
getState(status) { getState(status) {
if (this.$utils.isInteger(status)) { if (this.$utils.isInteger(status)) {
<<<<<<< HEAD
console.log(status); console.log(status);
=======
console.log(status)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (status == 0) { if (status == 0) {
return '默认' return '默认'
} else { } else {
...@@ -450,10 +465,24 @@ export default { ...@@ -450,10 +465,24 @@ export default {
? (this.form.bmCloseTime = this.form.bmCloseTime) ? (this.form.bmCloseTime = this.form.bmCloseTime)
: (this.form.bmCloseTime = this.form.bmCloseTime.getTime()) : (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
let pic = [] let pic = []
<<<<<<< HEAD
if (!!this.form.vehicleImgs) { if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => { this.form.vehicleImgs.forEach(element => {
pic.push(element.url) pic.push(element.url)
}) })
=======
if (this.fileList2 != '') {
console.log(this.fileList2);
this.fileList2.forEach(element => {
if (!!element.response) {
pic.push(element.response.data)
}else{
pic.push(element.url);
}
});
console.log(pic);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.form.vehicleImgs = pic.join(',') this.form.vehicleImgs = pic.join(',')
} }
...@@ -501,12 +530,27 @@ export default { ...@@ -501,12 +530,27 @@ export default {
this.form.startTime = this.form.startTime.getTime() this.form.startTime = this.form.startTime.getTime()
this.form.bmCloseTime = this.form.bmCloseTime.getTime() this.form.bmCloseTime = this.form.bmCloseTime.getTime()
let pic = [] let pic = []
<<<<<<< HEAD
if (!!this.form.vehicleImgs) { if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => { this.form.vehicleImgs.forEach(element => {
pic.push(element.url) pic.push(element.url)
}) })
this.form.vehicleImgs = pic.join(',') this.form.vehicleImgs = pic.join(',')
} }
=======
if (this.fileList2 != '') {
this.fileList2.forEach(element => {
pic.push(element.response.data);
});
this.form.vehicleImgs = pic.join(',')
}
// if (!!this.form.vehicleImgs) {
// this.form.vehicleImgs.forEach(element => {
// pic.push(element.url)
// })
// this.form.vehicleImgs = pic.join(',')
// }
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.dataProcessing() this.dataProcessing()
add(this.form).then(res => { add(this.form).then(res => {
this.responseResult(res) this.responseResult(res)
...@@ -516,7 +560,11 @@ export default { ...@@ -516,7 +560,11 @@ export default {
dataProcessing() { dataProcessing() {
if (this.form.state === '默认') { if (this.form.state === '默认') {
this.form.status = '0' this.form.status = '0'
<<<<<<< HEAD
}else{ }else{
=======
} else {
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.form.status = this.statusRadio this.form.status = this.statusRadio
} }
this.form.processJson = JSON.stringify(this.processJson) this.form.processJson = JSON.stringify(this.processJson)
......
src/views/userManagement/employeesInput.vue
View file @ 4a7325f2
This diff is collapsed.
src/views/vehicle/bookRecord/index.vue
View file @ 4a7325f2
...@@ -104,11 +104,24 @@ ...@@ -104,11 +104,24 @@
<span v-if="scope.row.bookType==10">其他</span> <span v-if="scope.row.bookType==10">其他</span>
</template> </template>
</el-table-column> </el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="预定时间" width="220"> <el-table-column align="center" label="预定时间" width="220">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.bookStartDate}} 至 {{scope.row.bookEndDate}}</span> <span>{{scope.row.bookStartDate}} 至 {{scope.row.bookEndDate}}</span>
</template> </template>
</el-table-column> </el-table-column>
=======
<el-table-column align="center" label="预定取/还时间" width="200">
<template scope="scope">
<span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="实际取/还时间" width="200">
<template scope="scope">
<span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
</template>
</el-table-column>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
<!-- <el-table-column align="center" label="预定时间" width="220"> <!-- <el-table-column align="center" label="预定时间" width="220">
<template scope="scope"> <template scope="scope">
<span <span
...@@ -177,11 +190,7 @@ ...@@ -177,11 +190,7 @@
<span>{{scope.row.reviewerNameReturn}}</span> <span>{{scope.row.reviewerNameReturn}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="还车时间" width="120">
<template scope="scope">
<span>{{scope.row.actualEndDate}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="随车物品" width="120"> <el-table-column align="center" label="随车物品" width="120">
<template scope="scope"> <template scope="scope">
...@@ -301,7 +310,11 @@ ...@@ -301,7 +310,11 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="车辆编号"> <el-form-item label="车辆编号">
<<<<<<< HEAD
<span>{{detailItem.vehicleId}}</span> <span>{{detailItem.vehicleId}}</span>
=======
<span>{{detailItem.code}}</span>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="7"> <!-- <el-col :span="7">
......
src/views/vehicle/vehicleDepartureLog/index.vue
View file @ 4a7325f2
...@@ -4,29 +4,41 @@ ...@@ -4,29 +4,41 @@
<el-form> <el-form>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item label="车辆编码" prop="code">
<el-date-picker
v-model="listQuery.time"
type="date"
:editable="false"
format="yyyy-MM-dd"
prop="time"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item>
<el-input type="number" style="width: 200px;" v-model.number="listQuery.code" <el-input type="number" style="width: 200px;" v-model.number="listQuery.code"
placeholder="请输入车辆编码"></el-input> placeholder="请输入车辆编码"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item label="车牌号" prop="code">
<el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号" <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
v-model="listQuery.numberPlate"></el-input> v-model="listQuery.numberPlate"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="出车日期" prop="startTime">
<el-date-picker
v-model="listQuery.startTime"
type="date"
:editable="false"
format="yyyy-MM-dd"
prop="startTime"
placeholder="请选择出车日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="还车日期" prop="endTime">
<el-date-picker
v-model="listQuery.endTime"
type="date"
:editable="false"
format="yyyy-MM-dd"
prop="endTime"
placeholder="请选择还车日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
...@@ -79,8 +91,8 @@ ...@@ -79,8 +91,8 @@
label="编号" label="编号"
width="65"> width="65">
</el-table-column> </el-table-column>
<!--<el-table-column align="center" label="编号" width="65">--> <!-- <el-table-column align="center" label="编号" width="65">
<!--<template scope="scope">--> --> <!--<template scope="scope">-->
<!--<span>{{scope.row.id}}</span>--> <!--<span>{{scope.row.id}}</span>-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
...@@ -214,10 +226,10 @@ ...@@ -214,10 +226,10 @@
import { import {
toEast8Date, toEast8Date,
deepCopyDate, deepCopyDate,
newEast8Date newEast8Date,
getYMD_date
} from 'utils/dateUtils'; } from 'utils/dateUtils';
export default {
export default {
name: 'vehicleDepartureLog', name: 'vehicleDepartureLog',
data() { data() {
return { return {
...@@ -262,7 +274,8 @@ ...@@ -262,7 +274,8 @@
listQuery: { listQuery: {
page: 1, page: 1,
limit: 20, limit: 20,
time: "", startTime: undefined,
endTime:undefined,
numberPlate: undefined, numberPlate: undefined,
departureId:undefined, departureId:undefined,
}, },
...@@ -329,9 +342,12 @@ ...@@ -329,9 +342,12 @@
if (!this.listQuery.numberPlate) { if (!this.listQuery.numberPlate) {
this.statisticVisiable = false; this.statisticVisiable = false;
} }
if (this.listQuery.time) { if (this.listQuery.startTime) {
this.listQuery.time = this.dateToString(this.listQuery.time); this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
} }
if(this.listQuery.endTime) {
this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
}
if (!this.state1) { if (!this.state1) {
this.listQuery.departureId = undefined; this.listQuery.departureId = undefined;
} }
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 4a7325f2
This diff is collapsed.
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