Skip to content

X
xoadoPlatform
Commit 81d55c03 by 吕海涛
Options

项目改进

parent 0c8567df
Showing with 547 additions and 266 deletions
ip.js
......@@ -35,4 +35,23 @@ VUE_APP_BASE_API12 = 'https://payment.sdk.xoado.com'
VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'https://aitransport.xoado.com/smart'
VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
\ No newline at end of file
VUE_APP_BASE_API16 = 'https://proclamations.xoado.com/anc'
VUE_APP_BASE_API1 = 'https://apps.xoado.com'
VUE_APP_BASE_API2 = 'https://core.xoado.com'
VUE_APP_BASE_API2_ = 'https://core.xoado.com'
VUE_APP_BASE_API3 = 'https://api.xoado.com'
VUE_APP_BASE_API4 = 'https://hgxd.99zcx.com'
VUE_APP_BASE_API5 = 'hhttp://xoado.tpddns.net:10001/brand'
VUE_APP_BASE_API6 = 'http://xoado.tpddns.net:10001/transport'
VUE_APP_BASE_API7 = 'http://xoado.tpddns.net:10001/operate'
VUE_APP_BASE_API8 = 'http://xoado.tpddns.net:10001/trace'
VUE_APP_BASE_API9 = 'http://xoado.tpddns.net:10001/payment/'
VUE_APP_BASE_API10 = 'http://192.168.0.251:8195/payment/v1/'
VUE_APP_BASE_API11 = 'https://oss.xoado.com/v1/'
VUE_APP_BASE_API12 = 'http://xoado.tpddns.net:10001'
VUE_APP_BASE_API13 = 'https://projects.xoado.com/invoice'
VUE_APP_BASE_API14 = 'https://projects.xoado.com/message'
VUE_APP_BASE_API15 = 'http://xoado.tpddns.net:10001/smart'
VUE_APP_BASE_API16 = 'http://xoado.tpddns.net:10001/anc'
\ No newline at end of file
package-lock.json
......@@ -1715,6 +1715,16 @@
"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
"dev": true
},
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"cacache": {
"version": "13.0.1",
"resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
......@@ -1741,6 +1751,53 @@
"unique-filename": "^1.1.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz",
"integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
......@@ -1757,6 +1814,16 @@
"minipass": "^3.1.1"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"terser-webpack-plugin": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
......@@ -1773,6 +1840,18 @@
"terser": "^4.6.12",
"webpack-sources": "^1.4.3"
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -11797,87 +11876,6 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-quill-editor": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
......
src/App.vue
......@@ -30,6 +30,12 @@ export default {
await this.$store.dispatch("user/PlatformCode");
await this.mustFun();
await this.getCarTypeInfo();
window.addEventListener('hashchange', () => {
let currentPath = window.location.hash.slice(1)
if (this.$route.path !== currentPath) {
this.$router.push(currentPath)
}
}, false)
},
mounted() {
// console.log(process.env.VUE_APP_BASE_API5)
......@@ -58,6 +64,7 @@ export default {
list.push({
id: item.vehicleFlag,
name: item.vehicleName,
type:item.type
});
});
......
src/components/NotificatBar/index.vue
......@@ -25,30 +25,7 @@ export default {
data() {
return {
msgList: [
{
id: "1",
content: "优惠券到期提醒",
link: "",
time: "2019-06-01",
},
{
id: "2",
content: "618大促，请查看活动具体信息",
link: "",
time: "2019-06-02",
},
{
id: "3",
content: "充值成功",
link: "",
time: "2019-07-02",
},
{
id: "4",
content: "密码充值成功！",
link: "",
time: "2019-07-02",
},
],
};
},
......@@ -57,6 +34,15 @@ export default {
if (res.status === 200 && res.data.length > 0) {
this.msgList = res.data;
this.$store.commit("app/SET_MSGOPEN");
this.$store.commit(
"app/SET_LISTmsgIsShow",
res.data
);
} else {
this.$store.commit(
"app/SET_LISTmsgIsShow",
[]
);
}
});
},
......
src/layout/components/header/index.vue
......@@ -12,9 +12,9 @@
<div class="headr_d2">
<ul class="headrUl clearFixed">
<li id="domMessage">
<!-- <el-badge is-dot @click.native="toggleMsgShow">-->
<!-- <i class="el-icon-message-solid iconFont"></i>-->
<!-- </el-badge>-->
<el-badge :is-dot="ListmsgIsShow.length>0?true:false" @click.native="toggleMsgShow">
<i class="el-icon-message-solid iconFont"></i>
</el-badge>
</li>
<li id="domFullScreen">
<full-screen></full-screen>
......@@ -33,7 +33,7 @@ import BreadCrumb from '@/components/BreadCrumb/index.vue'
import FullScreen from '@/components/FullScreen/index.vue'
import UserDropdown from '@/components/UserDropdown/index.vue'
import {title, logoUrl} from '@/config/index'
import { mapGetters } from 'vuex'
export default {
components: {
SideCollapse,
......@@ -41,12 +41,18 @@ export default {
UserDropdown,
BreadCrumb
},
computed: {
...mapGetters(['ListmsgIsShow'])
},
data() {
return {
title,
logoUrl
}
},
created() {
console.log(this.ListmsgIsShow);
},
methods: {
toggleMsgShow() {
this.$store.commit('app/SET_MSGISOPEN')
......
src/libs/ChineseHelper.js 0 → 100644
/**
* 封装 中文转英文方法
*/
// 引入字符编码（JSON）
import PinYin from './ChineseHelperStr.js'
// 定义方法
const loadPinYinInit = {}
// 获取所有编码
loadPinYinInit.GetPinyinStr = function() {
return PinYin;
}
// 汉字转拼音
loadPinYinInit.ConvertPinyin = function(l1) {
var l2 = l1.length;
var I1 = "";
var reg = new RegExp('[a-zA-Z0-9]');
for (var i = 0; i < l2; i++) {
var val = l1.substr(i, 1);
var name = loadPinYinInit.arraySearch(val, PinYin);
if (reg.test(val)) {
I1 += val;
} else if (name !== false) {
I1 += name;
}
}
I1 = I1.replace(/ /g, ' ');
while (I1.indexOf('--') > 0) {
I1 = I1.replace('--', '-');
}
return I1;
}
// 在对象中搜索
loadPinYinInit.arraySearch = function(l1) {
let needName = ''
for (var name in PinYin) {
if (PinYin[name].indexOf(l1) != -1) {
needName = loadPinYinInit.ucfirst(name);
break;
}
}
return needName;
}
// 首字母大写
loadPinYinInit.ucfirst = function(l1) {
if (l1.length > 0) {
var first = l1.substr(0, 1).toUpperCase();
var spare = l1.substr(1, l1.length);
return first + spare;
}
}
export default loadPinYinInit
\ No newline at end of file
src/libs/screen.js
......@@ -97,6 +97,10 @@ const dataSource = {
'name': '已完成'
},
{
'id': '7',
'name': '派单失败'
},
{
'id': '11',
'name': '用户已取消'
},
......
src/mixins/judgeType.js
......@@ -172,6 +172,8 @@ export default {
return '飞猪旅行'
default:
'/'
}
},
orderSourcesSpecial(orderSource) {
......
src/port/order-select.js
......@@ -949,4 +949,42 @@ export function setcodeajx(data) {
export function getcodeajx(data) {
const url = process.env.VUE_APP_BASE_API8 + `/gaode/address?address=${data}`
return get(url, {})
}
// 查询车辆品牌
export function modeltreeData(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/car/modeltree';
return post(url, data)
}
// 新增车辆品牌
export function autobrandAdd(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/car/autobrand';
return post(url, data)
}
// 删除车辆品牌
export function autobranddel(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/car/autobrand';
return deletes(url, data)
}
// 修改车辆品牌
export function autobrandPut(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/car/autobrand';
return put(url, data)
}
// 新增车辆型号
export function autobrandAddmodel(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/car/automodel';
return post(url, data)
}
// 修改车辆型号
export function autobrandAddmodelPut(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/car/automodel';
return put(url, data)
}
// 删除车辆型号
export function autobrandAddmodelDel(data) {
const url = process.env.VUE_APP_BASE_API6 + '/new/car/automodel';
return deletes(url, data)
}
\ No newline at end of file
src/port/set-request.js
......@@ -542,8 +542,8 @@ export function getCompanyDepartment(data) {
}
/* 区域树查询 */
export function getAreaTree(platformId) {
const url = process.env.VUE_APP_BASE_API5 + `/xoadoTranAreaOpen/querytree?platformId=${platformId}`
export function getAreaTree(u, platformId) {
const url = (u ? u : process.env.VUE_APP_BASE_API5) + `/xoadoTranAreaOpen/querytree?platformId=${platformId}`
return post(url, {})
}
......@@ -1184,4 +1184,16 @@ export function getPlatformListInfo() {
export function delcar(data) {
const url = process.env.VUE_APP_BASE_API6 + `/vehicle?platenumber=${data.platenumber}`
return deletes(url)
}
// 点在围栏
export function getpolygon(data) {
const url = process.env.VUE_APP_BASE_API8 + `/polygon/fence/point?lon=${data.lon}&lat=${data.lat}&platformId=${data.platformId}`;
return get(url)
}
// 点在围栏
export function subAndOrderInsert(u, data) {
console.log(u);
const url = (u ? u : process.env.VUE_APP_BASE_API5) + `/xoado/order/subAndOrderInsert/batch`
return post(url, data)
}
\ No newline at end of file
src/router/index.js
......@@ -132,6 +132,13 @@ export const routes = [{
import ('@/views/configure/CarModel.vue'),
meta: { title: '车型管理', icon: 'el-icon-s-data' }
},
{
path: 'vehicleSeries',
name: 'vehicleSeries',
component: () =>
import ('@/views/vehicleSeries/index.vue'),
meta: { title: '车系管理', icon: 'el-icon-edit-outline' }
},
]
},
{
......@@ -422,6 +429,10 @@ export const routes = [{
import ('@/views/operation/mapcode.vue'),
meta: { title: '区域码管理', icon: 'el-icon-s-home' }
},
// 批量生成账单
{
path: 'operationindex',
name: 'operationindex',
......@@ -457,6 +468,13 @@ export const routes = [{
import ('@/views/maintenance/waybill/index.vue'),
meta: { title: '运单运维管理', icon: 'el-icon-s-home' }
},
{
path: 'Newbill',
name: 'Newbill',
component: () =>
import ('@/views/operation/Newbill.vue'),
meta: { title: '批量生成账单', icon: 'el-icon-s-home' }
},
]
}
]
......
src/store/getters.js
......@@ -10,6 +10,7 @@ const getters = {
routes: state => state.permission.routes,
orderStatus: state => state.business.orderStatus,
msgIsShow: state => state.app.msgIsShow,
ListmsgIsShow: state => state.app.ListmsgIsShow,
runTypeAndChannel: state => {
let arr = Object.keys(state.business.runTypeAndChannel);
if (arr.length > 0) {
......
src/store/modules/app.js
......@@ -7,12 +7,11 @@
const state = {
opened: sessionStorage.getItem('open') ?
sessionStorage.getItem('open') :
'false',
sessionStorage.getItem('open') : 'false',
msgIsShow: false,
showDriver: localStorage.getItem('driver') ?
localStorage.getItem('driver') :
'yes'
localStorage.getItem('driver') : 'yes',
ListmsgIsShow: localStorage.getItem('ListmsgIsShow') ? localStorage.getItem('ListmsgIsShow') : [],
}
const mutations = {
SET_OPENED(state, payload) {
......@@ -25,6 +24,10 @@ const mutations = {
SET_MSGOPEN(state) {
state.msgIsShow = true;
},
SET_LISTmsgIsShow(state, list) {
state.ListmsgIsShow = list;
localStorage.setItem('ListmsgIsShow', list)
},
SET_DRIVER(state, payload) {
state.showDriver = payload
localStorage.setItem('driver', payload)
......
src/store/modules/business.js
......@@ -62,6 +62,7 @@ const actions = {
await getplatformList()
.then((res) => {
if (res.status === 200) {
/** 正式环境注释 */
// res.data.forEach(item => {
// if (item.brandName.indexOf('玖玖') !== -1) {
......
src/views/business/complaintList/components/item.vue
......@@ -70,7 +70,7 @@
</el-table-column>
<el-table-column align="center" label="来源" width="160" prop="orderSource">
<template slot-scope="scope">
{{orderSources(scope.row.orderSource)}}
{{orderSourcesNew(scope.row.orderSource)}}
</template>
</el-table-column>
<el-table-column align="center" label="控诉时间" width="160" prop="complaintTime">
......@@ -95,13 +95,20 @@
</el-table>
<div class="pagination" v-if="total > 10">
<el-pagination
<!-- <el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="page"
@current-change="current_change"
:total="total">
</el-pagination>
</el-pagination> -->
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background
:page-size="rows" :current-page="page"
layout="total, prev, pager, next, jumper, sizes" :total="total" :page-sizes="[10, 20, 50,100]">
</el-pagination>
</div>
</el-row>
</template>
......@@ -183,6 +190,11 @@ export default {
this.page = page;
this.getTableList();
},
handleSizeChange(val){
this.page = 1;
this.size = val;
this.getTableList();
},
getTableList() {
this.tableLoading = true;
let search = this.searchInfo;
......@@ -254,4 +266,7 @@ export default {
cursor: pointer;
}
}
.pagination{
text-align: center;
}
</style>
src/views/business/orderManagement/orderDetail.vue
......@@ -62,7 +62,7 @@
<div>
<span
>订单来源：{{
orderSources(dataSource.orderSource)
orderSourcesNew(dataSource.orderSource)
}}{{ dataSource.channelNumber }}</span
>
<CopyIcon
......
src/views/business/waybillManagement/index.vue
......@@ -115,13 +115,17 @@
</div>
<div class="bottom-part" v-if="total>=0">
<div class="count-part">
<span>共计</span>
<!-- <span>共计</span>
<span>{{ total }}</span>
<span>条数据</span>
<span>条数据</span> -->
</div>
<div>
<el-pagination background :total="total" :hide-on-single-page="show" :current-page="page"
<!-- <el-pagination background :total="total" :hide-on-single-page="show" :current-page="page"
@current-change="handleCurrentChange" layout="prev, pager, next">
</el-pagination> -->
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" background
:page-size="rows" :current-page="page"
layout="total, prev, pager, next, jumper, sizes" :total="total" :page-sizes="[10, 20, 50,100]">
</el-pagination>
</div>
</div>
......@@ -950,17 +954,23 @@ export default {
},
getAllData() {
this.selectResult.runTypeList = [this.activeName]
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(255, 255, 255, 0.7)'
});
this.selectResult['platformId'] = [JSON.parse(this.platformId).platformId];
let json = {
pageVo: {
page: this.page,
rows: 10
rows: this.rows,
},
...this.selectResult,
}
getAllWaybillList(json).then(res => {
this.loading = false
loading.close();
if (res.status == 200) {
this.config.data = []
this.config.data = res.data.content
......@@ -998,11 +1008,16 @@ export default {
})
},
handleCurrentChange(val) {
this.page = val
this.loading = true
this.getAllData()
},
handleSizeChange(val){
this.page = 1
this.rows=val;
this.loading = true
this.getAllData()
},
handlechangeList(val) {
let source = JSON.parse(JSON.stringify(val))
let type = source.type
......@@ -1134,7 +1149,7 @@ export default {
},
sourcefun({ data }) {
let code = ''
let orderSourcesText = this.orderSources(data.orderSource)
let orderSourcesText = this.orderSourcesNew(data.orderSource)
code = `<div>${orderSourcesText}</div>`
return code
},
......@@ -1206,7 +1221,7 @@ export default {
},
orderSourcefun({ data }) {
let code = ''
let orderSourcesText = this.orderSources(data.detail.orderSource)
let orderSourcesText = this.orderSourcefun(data.detail.orderSource)
code = `<div>${orderSourcesText}</div>`
return code
},
......
src/views/business/waybillManagement/waybillDetail.vue
......@@ -147,7 +147,7 @@
</div>
<div style="display: flex">
<span v-if="dataSource.orderSource"
>订单来源：{{ orderSources(dataSource.orderSource) }}</span
>订单来源：{{ orderSourcesNew(dataSource.orderSource) }}</span
>
<div
class="overText"
......@@ -418,7 +418,7 @@
<div>
<span
>订单来源：<span
v-text="orderSources(dataSource.orderSource)"
v-text="orderSourcesNew(dataSource.orderSource)"
></span
></span>
</div>
......
src/views/configure/BasicsCartype.vue
......@@ -67,13 +67,11 @@
</el-table-column>
</el-table>
<div class="pagination" v-if="total > 10">
<el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="page"
:total="total"
@current-change="current_change"
>
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background :page-size="size"
:current-page="page" layout="total, prev, pager, next, jumper, sizes" :total="total"
:page-sizes="[10, 20, 50, 100]">
</el-pagination>
</div>
......@@ -119,6 +117,11 @@ export default {
this.page = page;
this.initTable();
},
handleSizeChange(val){
this.page = 1;
this.size=val
this.initTable();
},
delRow(row) {
this.$confirm('删除后不可撤回，确定删除车辆？', '删除提示', {
confirmButtonText: '确定',
......@@ -194,6 +197,6 @@ export default {
.pagination {
margin-top: 16px;
text-align: right;
text-align: center;
}
</style>
src/views/configure/componenets/platformCarType/addDialog.vue
......@@ -120,8 +120,14 @@ export default {
created() {
},
methods: {
getSetArr(arr) {
return [...new Set(arr)]
},
saveInfo() {
this.$refs.form.validate(valid => {
if (valid) {
let item = JSON.parse(this.form.typeName);
let params = {
......@@ -132,8 +138,8 @@ export default {
typeContent: this.form.definition,
typeItem: item.typeItem,
typeName: item.typeItemName,
rangeOfApplication: this.form.runTypes.concat(item.typeItem),
rangeOfApplicationAdd: this.form.runTypes2.concat(item.typeItem),
rangeOfApplication: this.getSetArr(this.form.runTypes.concat(item.typeItem)),
rangeOfApplicationAdd: this.getSetArr(this.form.runTypes2.concat(item.typeItem)),
}
if (this.form.hasOwnProperty('id')) {
......@@ -259,8 +265,11 @@ export default {
return item != row.typeItem
})
let arr=!row.rangeOfApplicationAdd?[]:row.rangeOfApplicationAdd;
let range2 = arr.filter(item => {
return item != row.typeItem
let arrData=typeof arr=='string'?JSON.parse(row.rangeOfApplicationAdd):row.rangeOfApplicationAdd;
let range2 = arrData.filter(item => {
return item*1 != row.typeItem*1
})||[];
this.form = {
id: row.id,
......
src/views/configure/platformCarType.vue
......@@ -65,6 +65,13 @@
</span>
</template>
</el-table-column>
<el-table-column label="可派单车型" align="center" prop="runTypes">
<template slot-scope="scope">
<span v-for="(item, index) in scope.row.rangeOfApplicationAddName" :key="'runTypes' + index">
{{ index === 0 ? item : "、" + item }}
</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="120">
<template slot-scope="scope">
<el-button size="small" type="text" @click="() => $refs.addDialog.showDialog(scope.row)">
......@@ -77,9 +84,13 @@
</el-table-column>
</el-table>
<div class="pagination" v-if="total > 10">
<el-pagination background layout="prev, pager, next, jumper, total" :total="total" :current-page="page"
@current-change="current_change">
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background :page-size="size"
:current-page="page" layout="total, prev, pager, next, jumper, sizes" :total="total"
:page-sizes="[10, 20, 50, 100]">
</el-pagination>
</div>
<addDialog ref="addDialog" :platformList="brandListss" @reLoadTable="reLoadTable"></addDialog>
</div>
......@@ -116,6 +127,7 @@ export default {
carTypeList: [1, 2, 3],
platformListInfo: "",
},
page: 1,
size: 10,
};
......@@ -143,7 +155,9 @@ export default {
this.form.platformListInfo = brandList.length > 0 ? brandList[0].id : '';
this.brandListss = brandList;
this.initTable();
return brandList;
},
methods: {
delRow(id) {
......@@ -168,10 +182,17 @@ export default {
reLoadTable() {
this.initTable();
},
// 查询品牌车型
searchInfo() {
this.page = 1;
this.initTable();
},
handleSizeChange(val){
this.page = 1;
this.size=val
this.initTable();
},
current_change(page) {
this.page = page;
this.initTable();
......@@ -241,6 +262,6 @@ export default {
.pagination {
margin-top: 16px;
text-align: right;
text-align: center;
}
</style>
src/views/configure/site.vue
......@@ -9,7 +9,8 @@
<el-row type="flex" align="center">
<el-col :span="6">
<el-form-item>
<el-input v-model="form.siteName" size="mini" style="max-width: 260px;" suffix-icon="el-icon-search" placeholder="请输入站点/围栏名称搜索">
<el-input v-model="form.siteName" size="mini" style="max-width: 260px;"
suffix-icon="el-icon-search" placeholder="请输入站点/围栏名称搜索">
</el-input>
</el-form-item>
</el-col>
......@@ -18,13 +19,14 @@
<span style="margin-right: 16px;">
站点区域：
</span>
<el-cascader clearable v-model="form.penCity" :show-all-levels="false" style="max-width: 190px;" :props="props"></el-cascader>
<el-cascader clearable v-model="form.penCity" :show-all-levels="false" style="max-width: 190px;"
:props="props"></el-cascader>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<Selects :options="dataSource.hotType"
:selectName="'站点类型：'" :type="'hotType'" @changeList="handlechangeList"></Selects>
<Selects :options="dataSource.hotType" :selectName="'站点类型：'" :type="'hotType'"
@changeList="handlechangeList"></Selects>
</el-form-item>
</el-col>
<el-col :span="6" style="display: flex;align-items: center;">
......@@ -37,15 +39,8 @@
</el-col>
</el-row>
</el-form>
<el-table
stripe
:data="data"
v-loading="tableLoading"
border
style="margin-top: 10px;"
:row-style="tableRowStyle"
:header-cell-style="tableHeaderColor"
>
<el-table stripe :data="data" v-loading="tableLoading" border style="margin-top: 10px;"
:row-style="tableRowStyle" :header-cell-style="tableHeaderColor">
<el-table-column label="序号" align="center" type="index" width="50">
</el-table-column>
......@@ -61,13 +56,13 @@
<el-table-column label="站点专线" align="center" prop="stationList">
<template slot-scope="scope">
<span v-for="(item, index) in JSON.parse(scope.row.stationList)">
<span v-if="index > 0">、</span>{{item.pointsName}}
<span v-if="index > 0">、</span>{{ item.pointsName }}
</span>
</template>
</el-table-column>
<el-table-column label="录入时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
{{dateTime2Str(scope.row.createTime, 'yyyy-mm-dd hh:mm:ss')}}
{{ dateTime2Str(scope.row.createTime, 'yyyy-mm-dd hh:mm:ss') }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="120">
......@@ -83,13 +78,15 @@
</el-table>
<div class="pagination" v-if="total > 10">
<el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="pageNum"
@current-change="current_change"
:total="total">
<!-- <el-pagination background layout="prev, pager, next, jumper, total" :current-page="pageNum"
@current-change="current_change" :total="total">
</el-pagination> -->
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background :page-size="size"
:current-page="pageNum" layout="total, prev, pager, next, jumper, sizes" :total="total"
:page-sizes="[10, 20, 50, 100]">
</el-pagination>
</div>
<addDialog ref="addDialog" @backInitTable="backInitTable"></addDialog>
......@@ -101,7 +98,7 @@ import {
selectHotAreaList,
getAllprovinceAndCity
} from "@/port/set-request";
import {delSite} from "@/port/site/site";
import { delSite } from "@/port/site/site";
import Selects from '@/components/Selects'
import dataSource from "@/libs/screen";
import JudgeType from "@/mixins/judgeType";
......@@ -165,23 +162,23 @@ export default {
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
delSite({sId: id})
.then((res) => {
if(res.status === 200) {
this.$message.success('删除成功');
this.initTable();
}else {
this.$message.error(res.msg);
}
})
.catch(() => {
.then(() => {
delSite({ sId: id })
.then((res) => {
if (res.status === 200) {
this.$message.success('删除成功');
this.initTable();
} else {
this.$message.error(res.msg);
}
})
.catch(() => {
})
})
.catch(() => {
})
})
.catch(() => {
})
})
},
backInitTable() {
......@@ -191,13 +188,18 @@ export default {
let source = JSON.parse(JSON.stringify(val));
this.form.siteTypeList = this.filftersFun(source.data);
},
handledbClick(){
handledbClick() {
},
current_change(page) {
this.pageNum = page;
this.initTable();
},
handleSizeChange(val){
this.pageNum = 1;
this.size=val
this.initTable();
},
searchByInfo() {
this.pageNum = 1;
this.initTable();
......@@ -212,7 +214,7 @@ export default {
siteName: this.form.siteName
}
if(this.form.penCity.length > 0) {
if (this.form.penCity.length > 0) {
params['provinceCode'] = this.form.penCity[0];
params['areaCode'] = this.form.penCity[1];
}
......@@ -221,10 +223,10 @@ export default {
selectHotAreaList(params)
.then((res) => {
if(res.status === 200) {
if (res.status === 200) {
this.total = res.data.total;
this.data = res.data.content;
}else {
} else {
this.$message.error(res.msg);
}
this.tableLoading = false;
......@@ -234,14 +236,14 @@ export default {
})
},
// table变色，行
tableRowStyle({row, rowIndex}) {
tableRowStyle({ row, rowIndex }) {
if (rowIndex % 2 !== 0) {
return {'background-color': '#e3f4ff'};
return { 'background-color': '#e3f4ff' };
}
},
// table变色，头
tableHeaderColor({row, column, rowIndex, columnIndex}) {
return {'background-color': '#0099ff', color: '#ffffff'};
tableHeaderColor({ row, column, rowIndex, columnIndex }) {
return { 'background-color': '#0099ff', color: '#ffffff' };
},
}
}
......@@ -256,7 +258,7 @@ export default {
.pagination {
margin-top: 16px;
text-align: right;
text-align: center;
}
.title-left::before {
......
src/views/disposition/disposition.vue
......@@ -56,14 +56,18 @@
</el-table-column>
</el-table>
<div class="pagination" v-if="total > 10">
<el-pagination
<!-- <el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="page"
@current-change="current_change"
:total="total"
>
</el-pagination>
</el-pagination> -->
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background
:page-size="size" :current-page="page"
layout="total, prev, pager, next, jumper, sizes" :total="total" :page-sizes="[10, 20, 50,100]">
</el-pagination>
</div>
<addDialog
ref="addDialog"
......@@ -101,6 +105,11 @@
this.page = page;
this.initTable();
},
handleSizeChange(val){
this.page = 1;
this.size=val
this.initTable();
},
reLoadTable() {
this.initTable();
},
......
src/views/disposition/passRotation.vue
......@@ -148,15 +148,19 @@
</el-table-column>
</el-table>
<div class="pagination" v-if="total > 10">
<el-pagination
<div class="pagination" v-if="total > 10">
<!-- <el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="page"
@current-change="current_change"
:total="total"
>
</el-pagination>
</el-pagination> -->
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background
:page-size="rows" :current-page="page"
layout="total, prev, pager, next, jumper, sizes" :total="total" :page-sizes="[10, 20, 50,100]">
</el-pagination>
</div>
</el-card>
</template>
......@@ -211,6 +215,11 @@ export default {
this.page = page;
this.getAllData();
},
handleSizeChange(val){
this.page = 1;
this.rows=val;
this.getAllData();
},
delRow(row) {
this.$confirm('是否删除', "提示", {
confirmButtonText: "确定",
......@@ -237,6 +246,7 @@ export default {
this.$router.push('/disposition/pass-detail')
},
async getAllData() {
let json = {
platformId: this.$store.getters.platformId,
startPage: this.page,
......@@ -293,5 +303,7 @@ export default {
</script>
<style scoped lang="scss">
.pagination{
text-align: center;
}
</style>
src/views/login/index.vue
......@@ -657,7 +657,7 @@
this.Isregister = false
},
Wangji() {
bus.$emit('ForgetPass', 2)
bus.$emit("ForgetPass", {"type":2,"phone":this.AccountruleForm.phoneNumber});
}
}
}
......
src/views/notice/allNoticeList.vue
......@@ -146,7 +146,7 @@
</el-table-column>
</el-table>
<div class="pagination" style="text-align: right; margin-top: 10px">
<div class="pagination" style="text-align: center; margin-top: 10px" v-if="total > 10">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......
src/views/notice/noticeDrafts.vue
......@@ -102,7 +102,7 @@
</el-table-column>
</el-table>
<div class="pagination" style="text-align: right; margin-top: 10px">
<div class="pagination" style="text-align: center; margin-top: 10px" v-if="total > 10">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......
src/views/notice/pushNoticeList.vue
......@@ -110,7 +110,7 @@
</el-table-column>
</el-table>
<div class="pagination" style="text-align: right; margin-top: 10px">
<div class="pagination" style="text-align: center; margin-top: 10px" v-if="total > 10">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......
src/views/operation/driverPhone.vue
......@@ -172,14 +172,18 @@
</el-table>
<div class="pagination" v-if="total > 10">
<el-pagination
<!-- <el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="page"
@current-change="current_change"
:total="total"
>
</el-pagination>
</el-pagination> -->
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background
:page-size="size" :current-page="page"
layout="total, prev, pager, next, jumper, sizes" :total="total" :page-sizes="[10, 20, 50,100]">
</el-pagination>
</div>
</el-card>
</template>
......@@ -370,6 +374,11 @@ export default {
this.page = page;
this.initTable();
},
handleSizeChange(val){
this.size=val;
this.page = 1;
this.initTable();
},
async initTable() {
let json = {
commercialTypeList: this.selectResult.auditStatusList,
......@@ -436,6 +445,6 @@ export default {
}
.pagination {
margin-top: 16px;
text-align: right;
text-align: center;
}
</style>
src/views/operation/index.vue
......@@ -867,7 +867,7 @@ export default {
},
sourcefun({data}) {
let code = "";
let orderSourcesText = this.orderSources(data.orderSource);
let orderSourcesText = this.orderSourcesNew(data.orderSource);
code = `<div>${orderSourcesText}</div>`;
return code;
},
......
src/views/operation/orderDetail.vue
......@@ -176,7 +176,7 @@
text-align: right;
"
>订单来源：</span
>{{ orderSources(payData.orderSource)
>{{ orderSourcesNew(payData.orderSource)
}}{{ payData.channelNumber }}
</div>
<div>车牌号：{{ payData.tplateNumber }}</div>
......@@ -426,7 +426,7 @@
</div>
<div>
<span
>订单来源：{{ orderSources(dataSource.orderSource)
>订单来源：{{ orderSourcesNew(dataSource.orderSource)
}}{{ dataSource.channelNumber }}</span
>
<CopyIcon
......
src/views/platform/setting.vue
......@@ -10,38 +10,31 @@
添加
</el-button>
</el-row>
<el-table
:data="data"
v-loading="tableLoading"
stripe
border
style="margin-top: 10px;"
@row-dblclick="handledbClick"
:header-cell-style="tableHeaderColor"
>
<el-table :data="data" v-loading="tableLoading" stripe border style="margin-top: 10px;"
@row-dblclick="handledbClick" :header-cell-style="tableHeaderColor">
<el-table-column label="序号" align="center" type="index" width="50">
</el-table-column>
<el-table-column label="公开类型" align="center" prop="platformOvertType" width="80">
<template slot-scope="scope">
{{platformOvertTypeText(scope.row.baseInfo.platformOvertType)}}
{{ platformOvertTypeText(scope.row.baseInfo.platformOvertType) }}
</template>
</el-table-column>
<el-table-column label="品牌名称" align="center" prop="baseInfo">
<template slot-scope="scope">
{{scope.row.baseInfo.brandName}}
{{ scope.row.baseInfo.brandName }}
</template>
</el-table-column>
<el-table-column label="网站门户" align="center" prop="baseInfo">
<template slot-scope="scope">
{{scope.row.baseInfo.domain.length > 0 ? scope.row.baseInfo.domain[0] : ''}}
{{ scope.row.baseInfo.domain.length > 0 ? scope.row.baseInfo.domain[0] : '' }}
</template>
</el-table-column>
<el-table-column label="开通业务渠道" align="center" prop="allowRunType">
<template slot-scope="scope">
<div class="text-left-div">
<p v-for="(item, index) in scope.row.allowRunType" :key="'allowRunType'+index">
{{item.name}}
<p v-for="(item, index) in scope.row.allowRunType" :key="'allowRunType' + index">
{{ item.name }}
</p>
</div>
</template>
......@@ -49,8 +42,8 @@
<el-table-column label="对接渠道" align="center" prop="allowChannel">
<template slot-scope="scope">
<div class="text-left-div">
<p v-for="(item, index) in scope.row.allowChannel" :key="'allowChannel'+index">
{{item.name}}
<p v-for="(item, index) in scope.row.allowChannel" :key="'allowChannel' + index">
{{ item.name }}
</p>
</div>
</template>
......@@ -58,24 +51,25 @@
<el-table-column label="运营联系人" align="center" prop="siteName">
<template slot-scope="scope">
<div class="text-left-div">
<p>{{scope.row.operateName}}</p>
<p>{{scope.row.operatePhone}}</p>
<p>{{scope.row.operateEmail}}</p>
<p>{{ scope.row.operateName }}</p>
<p>{{ scope.row.operatePhone }}</p>
<p>{{ scope.row.operateEmail }}</p>
</div>
</template>
</el-table-column>
<el-table-column label="财务联系人" align="center" prop="siteName">
<template slot-scope="scope">
<div class="text-left-div">
<p>{{scope.row.financeName}}</p>
<p>{{scope.row.financePhone}}</p>
<p>{{scope.row.financeEmail}}</p>
<p>{{ scope.row.financeName }}</p>
<p>{{ scope.row.financePhone }}</p>
<p>{{ scope.row.financeEmail }}</p>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="80">
<template slot-scope="scope">
<el-button size="small" type="text" @click="() => $router.push({path: '/platform/setting-info', query: {platformId: scope.row.platformId}})">
<el-button size="small" type="text"
@click="() => $router.push({ path: '/platform/setting-info', query: { platformId: scope.row.platformId } })">
编辑
</el-button>
</template>
......@@ -83,19 +77,16 @@
</el-table>
<div class="pagination" v-if="total > 10">
<el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="pageNum"
@current-change="current_change"
:total="total">
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background :page-size="size"
:current-page="pageNum" layout="total, prev, pager, next, jumper, sizes" :total="total"
:page-sizes="[10, 20, 50, 100]">
</el-pagination>
</div>
</el-card>
</template>
<script>
import {platformList, platformInfosList} from "@/port/platfrom/setting";
import { platformList, platformInfosList } from "@/port/platfrom/setting";
import JudgeType from "@/mixins/judgeType";
......@@ -119,47 +110,57 @@ export default {
this.pageNum = page;
this.initTable();
},
handleSizeChange(val) {
this.pageNum = 1;
this.size = val
this.initTable();
},
handledbClick(row) {
this.$router.push({path: '/platform/setting-detail', query: {platformId: row.platformId}})
this.$router.push({ path: '/platform/setting-detail', query: { platformId: row.platformId } })
},
initTable() {
this.tableLoading = true;
platformList({pageNum: this.pageNum, pageSize: this.size})
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(255, 255, 255, 0.7)'
});
platformList({ pageNum: this.pageNum, pageSize: this.size })
.then((res) => {
if(res.status === 200) {
loading.close();
if (res.status === 200) {
this.data = res.data.contents;
this.total = res.data.total;
}else {
} else {
this.$message.error(res.msg);
}
this.tableLoading = false;
})
.catch(() => {
this.tableLoading = false;
loading.close();
})
},
addSettingInfo() {
this.$router.push('/platform/setting-info')
},
// table变色，行
tableRowStyle({row, rowIndex}) {
tableRowStyle({ row, rowIndex }) {
if (rowIndex % 2 !== 0) {
return {'background-color': '#e3f4ff'};
return { 'background-color': '#e3f4ff' };
}
},
// table变色，头
tableHeaderColor({row, column, rowIndex, columnIndex}) {
return {'background-color': '#0099ff', color: '#ffffff'};
tableHeaderColor({ row, column, rowIndex, columnIndex }) {
return { 'background-color': '#0099ff', color: '#ffffff' };
},
}
}
</script>
<style scoped lang="scss">
.pagination {
margin-top: 16px;
text-align: right;
text-align: center;
}
.title-left::before {
......
src/views/transports/car.vue
......@@ -132,9 +132,16 @@
<div class="pagination" v-if="total > 10">
<el-pagination background layout="prev, pager, next, jumper, total" :current-page="page"
<!-- <el-pagination background layout="prev, pager, next, jumper, total" :current-page="page"
@current-change="current_change" :total="total">
</el-pagination>
</el-pagination> -->
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background
:page-size="rows" :current-page="page"
layout="total, prev, pager, next, jumper, sizes" :total="total" :page-sizes="[10, 20, 50,100]">
</el-pagination>
</div>
</el-card>
</template>
......@@ -293,6 +300,11 @@ export default {
this.page = page;
this.initTable();
},
handleSizeChange(val){
this.page = 1;
this.size=val
this.initTable();
},
async initTable() {
let json = {
commercialTypeList: this.selectResult.auditStatusList,
......@@ -355,6 +367,6 @@ export default {
.pagination {
margin-top: 16px;
text-align: right;
text-align: center;
}
</style>
src/views/transports/components/platformName.vue
......@@ -62,7 +62,8 @@ export default {
type: "warning",
})
.then(() => {
removetransport(element.otaToken,this.transport)
console.log(element);
removetransport(element.otaToken,element.organizeId)
.then((res) => {
if(res.status === 200) {
this.$message.success('解除成功')
......
src/views/transports/driver.vue
......@@ -163,13 +163,18 @@
<div class="pagination" v-if="total > 10">
<el-pagination
<!-- <el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="page"
@current-change="current_change"
:total="total">
</el-pagination>
</el-pagination> -->
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background
:page-size="size" :current-page="page"
layout="total, prev, pager, next, jumper, sizes" :total="total" :page-sizes="[10, 20, 50,100]">
</el-pagination>
</div>
</el-card>
</template>
......@@ -287,6 +292,11 @@ export default {
this.page = page;
this.initTable();
},
handleSizeChange(val){
this.page = 1;
this.size=val
this.initTable();
},
async initTable() {
let json = {
commercialTypeList: this.selectResult.auditStatusList,
......@@ -345,6 +355,6 @@ export default {
}
.pagination {
margin-top: 16px;
text-align: right;
text-align: center;
}
</style>
src/views/transports/transport.vue
......@@ -51,14 +51,16 @@
<el-table-column prop="productCount" label="开通产品数" align="center" width="100"></el-table-column>
</el-table>
<div style="text-align: right;margin-top: 5px;">
<el-pagination
background
layout="prev, pager, next, jumper, total"
:current-page="page"
@current-change="current_change"
:total="total">
</el-pagination>
<div style="text-align: center;margin-top: 5px;" v-if="total > 10">
<el-pagination @size-change="handleSizeChange" @current-change="current_change" background
:page-size="rows" :current-page="page"
layout="total, prev, pager, next, jumper, sizes" :total="total" :page-sizes="[10, 20, 50,100]">
</el-pagination>
</div>
</el-card>
</template>
......@@ -121,6 +123,11 @@ export default {
this.page = page;
this.initTable();
},
handleSizeChange(val){
this.page = 1;
this.rows=val
this.initTable();
},
handledbClick(row) {
this.$router.push({path: '/transports/transport-detail', query: {row: JSON.stringify(row)}})
},
......
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