Skip to content

C
cloud-platform-ui
Commit 6b228177 authored by hanfeng's avatar hanfeng
Browse files
Options

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

# Conflicts:
#	src/router/index.js
#	src/views/admin/user/index.vue
parents 2cae7524 876f3491
Expand all Show whitespace changes
Inline Side-by-side
Showing with 311 additions and 141 deletions
config/prod.env.js
View file @ 6b228177
module.exports = {
NODE_ENV: '"production"',
// BASE_API: '"http://113.105.137.152:9800"',
BASE_API: '"https://xxfcmgmt.upyuns.com"',
BASE_API: '"https://mgmt.dfangche.com"',
APP_ORIGIN: '"https://wallstreetcn.com"'
};
src/api/vehicle/bookRecord/index.js
View file @ 6b228177
......@@ -53,3 +53,30 @@ export function ret(data) {
data: data
});
}
/**
* 根据id获取一条违章查询记录
* @param query
*/
export function getOneIllegalRow(id) {
return fetch({
url: '/api/order/orderViolation/getOne/' + id,
method: 'get'
});
}
/**
* 保存违章记录
* @param query
* {price:图片地址(多个逗号分割)
price:退款总金额
detailId:租车订单id
}
*/
export function saveOrderViolation(params) {
return fetch({
url: '/vehicle/departure/app/save',
method: 'post',
data: params
});
}
\ No newline at end of file
src/router/index.js
View file @ 6b228177
......@@ -77,7 +77,7 @@ export const constantRouterMap = [{
component: _import('error/401'),
hidden: true
},
{
{
path: '/',
component: Layout,
redirect: '/dashboard',
......@@ -87,7 +87,19 @@ export const constantRouterMap = [{
path: 'dashboard',
component: _import('dashboard/index')
}]
},
},
// {
// path: '/',
// component: Layout,
// redirect: '/baseManager/userManager',
// name: '首页',
// hidden: true,
// children: [{
// path: 'userManager',
// component: _import('admin/user/index')
// }]
// },
{
path: '/introduction',
component: Layout,
......
src/views/admin/user/index.vue
View file @ 6b228177
<template>
<div class="app-container calendar-list-container">
<div class="app-container calendar-list-container">
<div class="filter-container">
<el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="姓名或账户"
v-model="listQuery.name"></el-input>
<el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="姓名或账户" v-model="listQuery.name"> </el-input>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" v-if="userManager_btn_add" style="margin-left: 10px;" @click="handleCreate"
type="primary" icon="edit">添加
</el-button>
<el-button class="filter-item" v-if="userManager_btn_add" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="edit">添加</el-button>
</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="65">
<template scope="scope">
<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="65"> <template scope="scope">
<span>{{scope.row.id}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="姓名">
<template scope="scope">
</template> </el-table-column>
<el-table-column width="200" align="center" label="姓名"> <template scope="scope">
<span>{{scope.row.name}}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="账户">
<template scope="scope">
</template> </el-table-column>
<el-table-column width="110" align="center" label="账户"> <template scope="scope">
<span>{{scope.row.username}}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="性别">
<template scope="scope">
</template> </el-table-column>
<el-table-column width="110" align="center" label="性别"> <template scope="scope">
<span>{{scope.row.sex}}</span>
</template>
</el-table-column>
<el-table-column width="300" align="center" label="备注">
<template scope="scope">
</template> </el-table-column>
<el-table-column width="300" align="center" label="备注"> <template scope="scope">
<span>{{scope.row.description}}</span>
</template>
</el-table-column>
<el-table-column width="180" align="center" label="最后时间">
<template scope="scope">
</template> </el-table-column>
<el-table-column width="180" align="center" label="最后时间"> <template scope="scope">
<span>{{scope.row.updTime}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="最后更新人">
<template scope="scope">
</template> </el-table-column>
<el-table-column width="200" align="center" label="最后更新人"> <template scope="scope">
<span>{{scope.row.updName}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="150">
<template scope="scope">
</template> </el-table-column>
<el-table-column align="center" label="操作" width="150"> <template scope="scope">
<el-button v-if="userManager_btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑
</el-button>
<el-button v-if="userManager_btn_del" size="small" type="danger" @click="handleDelete(scope.row)">删除
</el-button>
</template>
</el-table-column>
</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, 50]" :page-size="listQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" 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">
......@@ -77,17 +55,17 @@
</el-form-item>
<el-form-item label="性别">
<el-select class="filter-item" v-model="form.sex" placeholder="请选择">
<el-option v-for="item in sexOptions" :key="item" :label="item" :value="item"></el-option>
<el-option v-for="item in sexOptions" :key="item" :label="item" :value="item"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="是否开启" prop="status">
<el-radio-group class="filter-item" v-model.number="form.status">
<el-radio-group class="filter-item" v-model.number="form.status" >
<el-radio v-for="item in statusOptions" :key="item.val" :label="item.id">{{item.val}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="所属片区" prop="zoneId">
<el-select class="filter-item" v-model="form.zoneId" clearable placeholder="请选择" @change="getProvinceRegions">
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="所属分公司" prop="companyId">
......@@ -99,7 +77,7 @@
<!--@select="handleSelectSubordinate"-->
<!--&gt;</el-autocomplete>-->
<el-select class="filter-item" v-model="form.companyId" clearable filterable placeholder="请选择分公司">
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"></el-option>
<el-option v-for="val in allBranchCompany" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="所属角色" prop="members">
......@@ -434,6 +412,7 @@
for (let i = 0; i < result.data.length; i++) {
mems.push(result.data[i].id);
}
this.membersName = result.data[0].name
this.$set(this.form, "members", mems)
}
});
......
src/views/baseInfo/stockCrowd/index.vue
View file @ 6b228177
......@@ -357,7 +357,7 @@
res.data.list.forEach(function (item) {
item.price = item.price / 1000 + ",000";
item.width = (item.total - item.balance) / item.total * 100 + "px";
item.companyPic = "https://xxfcmgmt.upyuns.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
item.companyPic = "https://mgmt.dfangche.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
allList.push(item);
});
this.lastPage = res.data.lastPage;
......@@ -394,7 +394,7 @@
res.data.list.forEach(function (item) {
item.price = item.price / 1000 + ",000";
item.width = (item.total - item.balance) / item.total * 100 + "px";
item.companyPic = "https://xxfcmgmt.upyuns.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
item.companyPic = "https://mgmt.dfangche.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
allList.push(item);
});
this.list = allList;
......
src/views/baseInfo/stockCrowd/stockCrowd.vue
View file @ 6b228177
......@@ -231,7 +231,7 @@
res.data.list.forEach(function (item) {
item.price = item.price / 10000;
item.width = (item.total - item.balance) / item.total * 100 + "px";
item.companyPic = "https://xxfcmgmt.upyuns.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
item.companyPic = "https://mgmt.dfangche.com/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=" + item.companyPic;
allList.push(item);
});
if(res.data.list.length< this.listQuery.limit && allList.length>0){
......
src/views/vehicle/bookRecord/index.vue
View file @ 6b228177
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