Skip to content

C
cloud-platform-ui
Commit 09484cbc authored by guoyou's avatar guoyou
Browse files
Options

Merge branch 'base-modify'

parents ff0eb9a4 83566b2d
Show whitespace changes
Inline Side-by-side
Showing with 668 additions and 43 deletions
src/App.vue
View file @ 09484cbc
<template>
<div id="app">
<router-view></router-view>
<keep-alive>
<router-view />
</keep-alive>
<!-- <router-view></router-view> -->
</div>
</template>
......
src/api/admin/userManagement/index.js
View file @ 09484cbc
......@@ -196,3 +196,48 @@ export function updAddPositionChangeRecord(params) {
// data: params
// });
// }
// 股东列表
export function stockholderList(query) {
return fetch({
url: 'api/admin/appShareholder/page',
method: 'post',
data: query
});
}
// 新增股东
export function addUserPostion(query) {
return fetch({
url: 'api/admin/appShareholder/addUserPostion',
method: 'post',
data: query
});
}
// 批量导入股东
export function exports(query) {
return fetch({
url: 'api/admin/appShareholder/export',
method: 'post',
data: query
});
}
// 编辑股东信息
export function updUserPostionEditor(query) {
return fetch({
url: 'api/admin/appShareholder/updUserPostion',
method: 'post',
data: query
});
}
// 股东信息变更记录
export function findShareholderChangeRecord(query) {
return fetch({
url: 'api/admin/appShareholder/findShareholderChangeRecord',
method: 'get',
params: query
});
}
\ No newline at end of file
src/router/index.js
View file @ 09484cbc
......@@ -582,13 +582,13 @@ export const asyncRouterMap = [{
component: _import('appManagement/selectedActivities/index'),
name: '首页精选活动',
authority: 'selectedActivities'
},
{
path: 'pushManagement',
component: _import('appManagement/pushManagement/index'),
name: '消息推送',
authority: 'pushManagement'
}
// {
// path: 'pushManagement',
// component: _import('appManagement/pushManagement/index'),
// name: '消息推送',
// authority: 'pushManagement'
// }
]
},
{
......@@ -801,6 +801,12 @@ export const asyncRouterMap = [{
component: _import('interior/employeesInput'),
name: '员工录入',
authority: 'employeesInput'
},
{
path: 'shareholder',
component: _import('interior/shareholder'),
name: '股东列表',
authority: 'shareholder'
}
]
}
......
src/views/appManagement/pushManagement/index.vue
View file @ 09484cbc
......@@ -399,6 +399,8 @@
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
console.log(this.form);
editObj(this.form).then(response => {
if (response.status === 200) {
this.bannerDialogVisible = false;
......
src/views/financial/branchCompany.vue
View file @ 09484cbc
......@@ -53,13 +53,21 @@
<el-table-column prop="companyName" label="公司" align="center"></el-table-column>
<el-table-column prop="memberAmount" label="会员费" align="center"></el-table-column>
<el-table-column prop="rentVehilceAmount" label="租车费" align="center"></el-table-column>
<el-table-column prop="depositAmount" label="押金" align="center"></el-table-column>
<el-table-column prop="noDeductibleAmount" label="不计免赔费" align="center"></el-table-column>
<el-table-column prop="travelAmount" label="旅游费" align="center"></el-table-column>
<el-table-column prop="rentDays" label="租借天数" align="center"></el-table-column>
<!-- <el-table-column prop="extralAmount" label="其他费用" align="center"></el-table-column> -->
<el-table-column prop="departureNum" label="出车服务次数" align="center"></el-table-column>
<el-table-column prop="arrivalNum" label="收车服务次数" align="center"></el-table-column>
<el-table-column prop="lossSpecifiedAmount" label="定损金额" align="center"></el-table-column>
<el-table-column prop="lateFeeAmount" label="违约金额" align="center"></el-table-column>
<el-table-column label="押金" align="center">
<template scope="scope">
<span>{{ Math.round((scope.row.depositAmount+scope.row.depositRefundAmount)*100)/100}}</span>
</template>
</el-table-column>
<el-table-column prop="depositRefundAmount" label="已退押金" align="center"></el-table-column>
</el-table>
<el-pagination
......
src/views/interior/employeesInput.vue
View file @ 09484cbc
......@@ -5,12 +5,12 @@
<el-row>
<el-col :span="4">
<el-form-item label="姓名">
<el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input>
<el-input v-model="listQuery.name" placeholder="请输入姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
<el-input v-model="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
</el-col>
......@@ -103,10 +103,10 @@
<el-dialog :title="staffTitle" :visible.sync="bulkUploadMember" class="member" @close="closeAdd">
<el-form :model="staffTitleFrom" ref="userMembership" :rules="rules" label-width="100px">
<el-form-item label="员工姓名">
<el-input v-model.number="staffTitleFrom.name" placeholder="请输入姓名"></el-input>
<el-input v-model="staffTitleFrom.name" placeholder="请输入姓名"></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model.number="staffTitleFrom.phone" placeholder="请输入手机号"></el-input>
<el-input v-model="staffTitleFrom.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
<el-form-item label="入职日期" v-show="staffTitle == '新增员工'">
<el-date-picker
......@@ -246,7 +246,8 @@
<span v-else-if="item.jobRemark == 4">(人事调动) {{item.oldCompanyName}} => {{item.newCompanyName}}</span>
<span v-else-if="item.jobRemark == 2">(职位变更) {{item.oldJobName}} => {{item.newJobName}}</span>
<span v-else-if="item.jobRemark == 3">(身份变更) {{item.oldPositionName}} => {{item.newPositionName}}</span>
<span v-if="item.jobRemark == 5">离职</span>
<span v-else-if="item.jobRemark == 5">离职</span>
<span v-else-if="item.jobRemark == 6">复职</span>
<!-- <span v-else></span> -->
</p>
</el-dialog>
......@@ -258,12 +259,12 @@
<div v-if="isShow == 4">
<el-form :model="amendCompany" ref="amendCompany" label-width="80px">
<el-form-item label="修改原因" style="width:80%">
<el-radio-group v-model="amendCompany.changeStatus" prop="changeStatus">
<el-radio-button label="3">人事调动</el-radio-button>
<el-radio-button label="2">信息修改</el-radio-button>
<el-radio-group v-model="amendStatus" prop="changeStatus">
<el-radio-button label="0">人事调动</el-radio-button>
<el-radio-button label="1">信息修改</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="调动日期" v-show="amendCompany.changeStatus == 3" prop="relTime">
<el-form-item label="调动日期" v-show="amendStatus == 0" prop="relTime">
<el-date-picker v-model="amendCompany.relTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
</el-form-item>
<el-form-item label="分公司" prop="companyId">
......@@ -403,12 +404,11 @@ export default {
position:{
relTime: null, //修改时间
jobId:null,//职位
},
loading:true,
amendStatus:0,//0人事调动 1信息修改
//修改分公司
amendCompany: {
changeStatus: 3,
companyId: null, //公司id
relTime: null //修改时间
},
......@@ -486,7 +486,6 @@ export default {
this.amendContent = '修改所属公司'
this.isShow = val
this.amendCompany= {
changeStatus: 3,
companyId: null, //公司id
relTime: null //修改时间
}
......@@ -517,7 +516,7 @@ export default {
if (!this.amendCompany.companyId) {
this.$message('分公司不能为空')
return false
} else if (this.amendCompany.changeStatus == 3) {
} else if (this.amendStatus == 0) {
if (!this.amendCompany.relTime) {
this.$message('调动日期不能为空')
return false
......@@ -527,24 +526,21 @@ export default {
this.amendCompany.companyName = name[0].name
this.amendCompany.jobId = this.staffTitleFrom.jobId
this.amendCompany.positionId = this.staffTitleFrom.positionId
this.amendCompany.changeStatus = 4
this.amendCompany.isQuit = this.staffTitleFrom.isQuit == '在职' ? 0 : 1
this.setApi(this.amendCompany)
}
} else {
//信息修改
let params = {};
let name = this.companyList.filter(item => item.id == this.amendCompany.companyId)
console.log(name)
params.companyName = name[0].name
params.companyId = name[0].id
params.positionId = this.staffTitleFrom.positionId
// params.isQuit = this.staffTitleFrom.isQuit == '在职' ? 0 : 1
// params.changeStatus = 2
// params.jobId = this.staffTitleFrom.jobId
params.name = this.staffTitleFrom.name
params.phone = this.staffTitleFrom.phone
params.id = this.staffTitleFrom.id
console.log(params)
// this.setApi(this.amendCompany)
params.userId = this.staffTitleFrom.userId
editorUpd(params).then(data=>{
if (data.status == 200) {
this.$message.success('编辑成功')
......@@ -561,6 +557,7 @@ export default {
params.phone = this.staffTitleFrom.phone
params.id = this.staffTitleFrom.id
params.name = this.staffTitleFrom.name
params.userId = this.staffTitleFrom.userId
updUserChange(params).then(data => {
if (data.status == 200) {
this.$message.success('编辑成功')
......@@ -574,7 +571,7 @@ export default {
},
//身份修改
amendIdentityBtn() {
this.amendIdentity.changeStatus = 2
this.amendIdentity.changeStatus = 3
if (!this.amendIdentity.positionId || !this.amendIdentity.relTime ) {
this.$message('身份和变更日期不能为空')
return false
......@@ -604,17 +601,22 @@ export default {
this.isJobForm.jobId = this.staffTitleFrom.jobId
if(val == '离职时间'){
this.setApi(this.isJobForm)
}else{
}else{//复职
// this.isJobForm.isQuit = 2
// this.isJobForm.changeStatus = 6
// this.setApi(this.isJobForm)
let params = {}
params.phone = this.staffTitleFrom.phone
params.relTime = formatDate(new Date(this.isJobForm.relTime), 'yyyy-MM-dd hh:mm:ss')
params.id = this.staffTitleFrom.id
params.companyName = this.staffTitleFrom.companyName
params.positionId = this.staffTitleFrom.positionId
params.companyId = this.staffTitleFrom.companyId
params.isQuit = 0
params.changeStatus = 2
params.changeStatus = 6
params.jobId = this.staffTitleFrom.jobId
params.name = this.staffTitleFrom.name
params.userId = this.staffTitleFrom.userId
updAddPositionChangeRecord(params).then(data=>{
if (data.status == 200) {
this.$message.success('编辑成功')
......@@ -851,6 +853,7 @@ export default {
companyName: row.companyName,
relTime: row.relTime,
id:row.id,
userId:row.userId,
jobId:row.jobId ==0 ? null : row.jobId,
isQuit: row.isQuit == 1 ? '离职' : '在职'
}
......@@ -859,11 +862,10 @@ export default {
infoStaff(row) {
this.infoPop = true
this.staffInfo.info = row
findPositionChangeRecord({ phone: row.phone }).then(data => {
findPositionChangeRecord({ id: row.id }).then(data => {
if(data.status == 200){
this.staffInfo.record = data.data
}
})
},
//确定
......
src/views/interior/shareholder.vue 0 → 100644
View file @ 09484cbc
<template>
<div class="app-container calendar-list-container">
<div class="filter-container" v-loading="loading">
<el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item label="姓名">
<el-input v-model="listQuery.name" placeholder="请输入股东姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="手机号">
<el-input v-model="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="分公司">
<el-select v-model="listQuery.companyId" clearable filterable placeholder="请选择">
<el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="身份">
<el-select class="filter-item" v-model="listQuery.positionId" placeholder="请选员工身份">
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in statusList"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button class="filter-item" type="primary" @click="cleaningQuery">清除搜索条件</el-button>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="addData">新增股东</el-button>
<el-button class="filter-item" type="primary" @click="toLoad">批量导入股东</el-button>
</el-form>
<!--批量导入会员窗口-->
<el-dialog title="导入股东" :visible.sync="tolead">
<el-form :model="fileForm">
<el-form-item label="上传文件" label-width="80px">
<el-button type="primary" icon="el-icon-download" @click="download">
下载模板
<!-- <a class="el-icon-download" href="https://mgmt.dfangche.com/axshare/gudongdaoru.xlsx">下载模板</a> -->
</el-button>
<el-upload
ref="uploadExcel"
:limit="limitNum"
action
:headers="getHeaderWithToken"
accept=".xlsx"
:http-request="upLoad"
:on-remove="handleRemove"
:before-remove="beforeRemove"
:before-upload="beforeUploadFile"
:on-change="fileChange"
:on-exceed="exceedFile"
:file-list="fileList"
>
<el-button size="small" type="primary" icon="el-icon-edit">
上传文件
<i class="el-icon-upload el-icon--right"></i>
</el-button>
<div slot="tip" class="el-upload__tip">只能上传xlsx(Excel2007以上版本)文件，且不超过10M</div>
</el-upload>
<el-button size="small" class="filter-item" type="primary" @click="cancelNotDeleteForm">取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
<!-- 提示 -->
<el-dialog title="上传提示" :visible.sync="uploadHiut">
<p>
上传成功:
<b>{{uploadListHiut.success}}</b>条,上传失败:
<b>{{uploadListHiut.error}}</b>条,重复:
<b>{{uploadListHiut.exist}}</b>
</p>
<ul class="defeated">
<li v-for="(item,index) in uploadListHiut.uploadList" :key="index">
<p>
失败行数:
<span>{{item.num}}</span>,失败原因:
<span>{{item.msg}}</span>
</p>
</li>
</ul>
</el-dialog>
<!-- 新增 || 编辑股东 -->
<el-dialog :title="addPopTitle" :visible.sync="addPop" class="member" @close="closeAdd">
<el-form
:model="ruleForm"
:rules="rules"
ref="ruleForm"
label-width="100px"
class="demo-ruleForm"
>
<el-form-item label="姓名">
<el-input v-model="ruleForm.name" placeholder="请输入股东姓名"></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model="ruleForm.phone" placeholder="请输入股东手机号"></el-input>
</el-form-item>
<el-form-item label="入股日期" v-show="addPopTitle == '新增'">
<el-date-picker v-model="time" type="date" placeholder="选择日期" style="width:100%"></el-date-picker>
</el-form-item>
<el-form-item label="入股公司">
<el-select v-model="ruleForm.companyList" filterable multiple placeholder="请选择" style="width:100%">
<el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" v-show="addPopTitle == '编辑'">
<el-input :placeholder="ruleForm.isQuit == 0 ? '持股中' : '已退股'" style="width:90%" disabled></el-input>
<el-button type="text" @click="amend">修改</el-button>
</el-form-item>
<el-row style="text-align:center">
<el-button type="primary" @click="submitBtn">确定</el-button>
<el-button type="primary" @click="addPop = false">取消</el-button>
</el-row>
</el-form>
</el-dialog>
<el-dialog :title="ruleForm.isQuit == 1 ? '入股时间' : '退股时间'" :visible.sync="sharePop" class="member" @close="closeShare">
<el-date-picker
v-model="times"
type="date"
:placeholder="ruleForm.isQuit == 1 ? '请选择入股时间' : '请选择退股时间'"
style="width:100%"
></el-date-picker>
<el-row style="text-align:center;margin-top:20px">
<el-button type="primary" @click="shareBtn">确定</el-button>
<el-button type="primary" @click="sharePop = false">取消</el-button>
</el-row>
</el-dialog>
<!-- 表格数据 -->
<el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%">
<el-table-column label="序号" align="center" width="70">
<template scope="scope">
<span>{{scope.$index+(listQuery.page - 1) * listQuery.limit + 1}}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="姓名" width="180" align="center"></el-table-column>
<el-table-column prop="phone" label="手机号" align="center"></el-table-column>
<el-table-column prop="companyName" label="入股公司" align="center"></el-table-column>
<el-table-column prop="positionName" label="身份" align="center"></el-table-column>
<el-table-column prop="isQuit" label="状态" align="center">
<template scope="scope">
<span>{{scope.row.isQuit == 0 ? '持股中' :'已退股'}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<template scope="scope">
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="infoStaff(scope.row)"
>详情</el-button>
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="editorStaff(scope.row)"
>编辑</el-button>
</template>
</el-table-column>
</el-table>
<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"
style="margin-top:20px"
></el-pagination>
<!-- 股东详情 S -->
<el-dialog title="股东信息详情" :visible.sync="infoPop" class="member">
<p class="title">基础信息</p>
<p class="staff-info">
<span>
<b>姓名：</b>
{{staffInfo.info.name}}
</span>
<span>
<b>手机号：</b>
{{staffInfo.info.phone}}
</span>
<span>
<b>状态：</b>
{{staffInfo.info.isQuit == 1?"已退股":'持股中'}}
</span>
<span>
<b>入股公司：</b>
{{staffInfo.info.companyName}}
</span>
</p>
<p class="title" style="margin-top:20px">股权变动</p>
<p v-for="(item,index) in staffInfo.record" :key="index">
<b>{{item.relTime}}</b>
<span style="margin-left:10px">{{item.isQuit == 0 ? '(入股)' : "(退股)"}}</span>
<span>{{item.companyName}}</span>
</p>
</el-dialog>
<!-- 股东详情 E -->
</div>
</div>
</template>
<script>
import { getAll } from 'api/base_info/branch_company'
import { getrewardSetting } from 'api/purseManage'
import { getToken } from 'src/utils/auth'
import {
stockholderList,
addUserPostion,
exports,
updUserPostionEditor,
findShareholderChangeRecord
} from 'src/api/admin/userManagement/index'
import { formatDate } from 'utils/dateFormattor'
export default {
created() {
this.getList()
this.getAllFn()
this.getRank()
},
computed: {
getHeaderWithToken() {
return { Authorization: getToken() }
}
},
data() {
return {
times:null,
infoPop: false,
time: null,
sharePop: false,
shareTitle: 1,
BASE_API: process.env.BASE_API,
tableKey: 0,
total: null,
list: [],
ruleForm: {
name: null,
phone: null,
companyList: [],
relTime: null,
isQuit: 0
},
rules: {},
addPopTitle: '新增',
addPop: false,
uploadListHiut: {
uploadList: [],
success: '',
error: '',
exist:''
},
uploadHiut: false,
limitNum: 1,
fileList: [],
tolead: false, //批量导入
loading: false,
companyList: [], //分公司
statusList: [], //身份
listQuery: {
name: null,
phone: null,
companyId: null,
positionId: null,
page: 1,
limit: 10
},
fileForm: {
file: ''
},
staffInfo: {
info: {},
record: []
}
}
},
methods: {
closeShare(){
this.times = null
},
//下载模板
download() {
window.location.href =
'https://mgmt.dfangche.com/axshare/gudongdaoru.xlsx'
},
closeAdd() {
this.time = null
this.ruleForm = {
name: null,
phone: null,
companyList: [],
relTime: null
}
},
//入股 退股时间
shareBtn() {
this.ruleForm.isQuit == 1 ? this.ruleForm.changeState = 3 : this.ruleForm.changeState = 2
this.ruleForm.relTime = formatDate(this.times, 'yyyy-MM-dd') + ' 00:00:00'
updUserPostionEditor(this.ruleForm).then(data=>{
if (data.status == 200) {
this.$message.success('编辑成功')
this.addPop = false
this.sharePop = false
this.getList()
}else{
this.$message(data.message)
}
})
},
//详情
infoStaff(row) {
this.infoPop = true
this.staffInfo.info = row
findShareholderChangeRecord({id:row.id,phone:row.phone}).then(data=>{
if (data.status == 200) {
this.staffInfo.record = data.data
}
})
},
//编辑
editorStaff(row) {
this.addPopTitle = '编辑'
this.$nextTick(()=>{
this.ruleForm = {
name: row.name,
phone: row.phone,
isQuit:row.isQuit,
companyList: row.companyIdArray.split(',').map(Number),
// companyList:['1,1'],
id:row.id
}
this.addPop = true
})
},
//新增,编辑
submitBtn() {
if (this.addPopTitle == '新增') {
if (
!this.ruleForm.name ||
!this.ruleForm.phone ||
!this.ruleForm.companyList ||
!this.time
) {
this.$message('必填项不能为空')
} else {
this.ruleForm.relTime =
formatDate(this.time, 'yyyy-MM-dd') + ' 00:00:00'
addUserPostion(this.ruleForm).then(data => {
if (data.status == 200) {
this.$message.success('新增成功')
this.addPop = false
this.getList()
} else {
this.$message.error(data.message)
}
})
}
} else {
if (
!this.ruleForm.name ||
!this.ruleForm.phone ||
!this.ruleForm.companyList
) {
this.$message('必填项不能为空')
}else{
this.ruleForm.changeState =1
updUserPostionEditor(this.ruleForm).then(data=>{
if (data.status == 200) {
this.$message.success('编辑成功')
this.addPop = false
this.getList()
}else{
this.$message(data.message)
}
})
}
}
},
handleSizeChange(val) {
this.listQuery.limit = val
this.getList()
},
handleCurrentChange(val) {
this.listQuery.page = val
this.getList()
},
//修改分公司
amend() {
this.sharePop = true
},
//新增股东
addData() {
this.addPopTitle = '新增'
this.addPop = true
},
//分公司
getAllFn() {
getAll().then(data => {
if (data.status == 200) {
this.companyList = data.data
this.companyList.unshift({ name: '全部', id: '' })
}
})
},
//搜索
handleFilter() {
this.listQuery.page = 1
this.getList()
},
//清空搜索
cleaningQuery() {
this.listQuery = {
name: null,
phone: null,
companyId: null,
positionId: null,
page: 1,
limit: 10
}
this.getList()
},
getList() {
this.loading = true
stockholderList(this.listQuery).then(data => {
if (data.status == 200) {
this.list = data.data.data
this.total = data.data.totalCount
}
setTimeout(() => {
this.loading = false
}, 300)
})
},
//获取身份
getRank() {
getrewardSetting().then(data => {
if (data.status == 200) {
this.statusList = data.data
}
})
},
upLoad(file) {
var form = new FormData()
// 文件对象
form.append('file', file.file)
exports(form).then(res => {
this.uploadHiut = true
;(this.uploadListHiut = {
uploadList: res.data.data,
success: res.data.success,
error: res.data.error,
exist: res.data.exist
}),
this.getList()
})
},
// 文件超出个数限制时的钩子
exceedFile(files, fileList) {
this.$notify.warning({
title: '警告',
message: `只能选择 ${
this.limitNum
} 个文件，当前共选择了 ${files.length + fileList.length} 个`
})
},
cancelNotDeleteForm() {
this.tolead = false
this.$refs.uploadExcel.clearFiles()
},
//批量导入员工
toLoad() {
this.tolead = true
},
fileChange(file, fileList) {
//console.log("change");
//console.log(file);
this.fileForm.file = file.raw
//console.log(this.fileForm.file);
// console.log(fileList);
},
//excel上传
handleRemove(file, fileList) {
//console.log(file, fileList);
},
handlePreview(file) {
//console.log(file);
},
beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`)
},
// 上传文件之前的钩子, 参数为上传的文件,若返回 false 或者返回 Promise 且被 reject，则停止上传
beforeUploadFile(file) {
//console.log("before upload");
//console.log(file);
let extension = file.name.substring(file.name.lastIndexOf('.') + 1)
let size = file.size / 1024 / 1024
if (extension !== 'xlsx') {
this.$notify.warning({
title: '警告',
message: `只能上传Excel 2007以上版本（即后缀是.xlsx）的文件`
})
}
if (size > 10) {
this.$notify.warning({
title: '警告',
message: `文件大小不得超过10M`
})
}
}
}
}
</script>
<style>
.title {
color: #666;
border-bottom: 1px solid #d9d9d9;
padding-bottom: 10px;
}
.staff-info span {
display: inline-block;
margin: 10px 20px 0 0;
}
.member .el-dialog--small {
width: 500px;
}
.defeated {
padding: 0;
}
.defeated li {
list-style: none;
}
</style>
\ No newline at end of file
src/views/order/memberOrderInfo/index.vue
View file @ 09484cbc
......@@ -253,7 +253,9 @@
<el-row>
<el-col :span="6">
<el-form-item label="注册终端:">
<span>{{userDetails.channel == 1 ? 'app' : '小程序'}}</span>
<span v-if="userDetails.channel == 1">安卓</span>
<span v-else-if="userDetails.channel == 2">小程序</span>
<span v-else-if="userDetails.channel == 3">ios</span>
</el-form-item>
</el-col>
<el-col :span="8">
......
src/views/statistics/orderStatistics.vue
View file @ 09484cbc
......@@ -53,7 +53,7 @@
<el-checkbox-group v-model="listQuery.statisticalSigns">
<span v-for="(item,index) in checkArr" :key="index" class="checkStyle">
<el-checkbox :label="item.id">{{item.name}}</el-checkbox>
<p v-show="item.id== 'ac_oavgq' || item.id== 'bc_rvavgq' || item.id== 'cd_tavgq'"></p>
<p v-show="item.id== 'ad_oavga' || item.id== 'ce_tavga' || item.id== 'bd_rvavga'"></p>
</span>
</el-checkbox-group>
</div>
......@@ -63,7 +63,6 @@
</el-row>
</el-form>
<!-- <p v-for="(item,index) in chartArr" :key="index">{{item.row}}</p> -->
<div v-for="(item,index) in chartArr" :key="index">
<p style="text-align:center">{{checkArr.filter(val => val.id == item.title)[0].name}}</p>
<ve-line
......@@ -111,19 +110,23 @@ export default {
{ name: '订单总额 ', id: 'aa_ota' },
{ name: '订单量 ', id: 'ab_otq' },
{ name: '订单平均量 ', id: 'ac_oavgq' },
{ name: '订单平均金额 ', id: 'ad_oavga' },
{ name: '租车订单总额 ', id: 'ba_rvta' },
{ name: '租车订单量', id: 'bb_rvtq' },
{ name: '租车订单平均量 ', id: 'bc_rvavgq' },
{ name: '租车平均金额 ', id: 'bd_rvavga' },
{ name: '旅游订单总额', id: 'ca_tta' },
{ name: '旅游订单量 ', id: 'cb_ttq' },
{ name: '旅游订单平均量 ', id: 'cd_tavgq' },
{ name: '旅游平均金额 ', id: 'ce_tavga' },
{ name: '会员订单总额 ', id: 'da_mta' },
{ name: '普通会员订单总额 ', id: 'db_cmta' },
{ name: '普通会员订单量 ', id: 'dc_cmtq' },
{ name: '黄金会员订单总额 ', id: 'dd_gmta' },
{ name: '黄金会员订单量 ', id: 'de_mgtq' },
{ name: '钻石会员订单总额 ', id: 'df_dmta' },
{ name: '钻石会员订单量 ', id: 'dg_dmtq' }
{ name: '钻石会员订单量 ', id: 'dg_dmtq' },
{ name: '会员平均金额 ', id: 'dh_mavga' },
],
//快捷筛选
listQuery: {
......
src/views/userManagement/userList/index.vue
View file @ 09484cbc
......@@ -92,7 +92,9 @@
</el-table-column>
<el-table-column width="110" align="center" label="注册终端">
<template scope="scope">
<span>{{scope.row.channel}}</span>
<span v-if="scope.row.channel == 1">安卓</span>
<span v-else-if="scope.row.channel == 2">小程序</span>
<span v-else-if="scope.row.channel == 3">ios</span>
</template>
</el-table-column>
<el-table-column width="90" align="center" label="来源">
......@@ -148,9 +150,9 @@
<el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">
查看详情
</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" v-if="admin_btn_user_postion_put"
<!-- <el-button size="small" class="el-button el-button--text el-button--small" v-if="admin_btn_user_postion_put"
@click="peopleSetting(scope.row)">身份设置
</el-button>
</el-button> -->
<el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1&&userList_btn_edit"
size="small" @click=" setMember(scope.row)">设置会员信息
</el-button>
......@@ -226,7 +228,9 @@
<el-row>
<el-col :span="6">
<el-form-item label="注册终端:">
<span>{{userDetails.channel == 1 ? 'app' : '小程序'}}</span>
<span v-if="userDetails.channel == 1">安卓</span>
<span v-else-if="userDetails.channel == 2">小程序</span>
<span v-else-if="userDetails.channel == 3">ios</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -1127,7 +1131,7 @@
listKey.lastTime = listKey.lastTime ? timestamp2Date(listKey.lastTime) : '';
listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime * 1000) : '';
listKey.buyCount = listKey.buyCount ? listKey.buyCount : 0;
listKey.channel = this.terminal[listKey.channel];
// listKey.channel = this.terminal[listKey.channel];
listKey.source = this.source[listKey.source];
listKey.validTime = listKey.validTime ? ((listKey.validTime == 0) ? '永久' : listKey.validTime) : '无';
listKey.visible2 = false
......
src/views/vehicle/vehicleInfo/index.vue
View file @ 09484cbc
......@@ -681,7 +681,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="交强险单号" prop="strongInsuranceNo">
<el-input v-model.number="form.strongInsuranceNo" placeholder="请输入交强险单号"></el-input>
<el-input v-model="form.strongInsuranceNo" placeholder="请输入交强险单号"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......
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