Skip to content

C
cloud-platform-ui
Commit ed66af1f authored by jiaorz's avatar jiaorz
Browse files
Options

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

parents c3392610 37817dfe
Hide whitespace changes
Inline Side-by-side
Showing with 991 additions and 805 deletions
config/dev.env.js
View file @ ed66af1f
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
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(小威)
APP_ORIGIN: '"https://wallstreetcn.com"' APP_ORIGIN: '"https://wallstreetcn.com"'
} }
src/api/admin/userManagement/index.js
View file @ ed66af1f
...@@ -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/summit/activity.js
View file @ ed66af1f
...@@ -38,4 +38,11 @@ export function activityIds() { ...@@ -38,4 +38,11 @@ export function activityIds() {
url: '/api/summit/imxr/ids', url: '/api/summit/imxr/ids',
method: 'get' method: 'get'
}) })
}
export function remove(id) {
return fetch({
url: '/api/summit/activity/remove/' + id,
method: 'delete'
})
} }
\ No newline at end of file
src/views/order/rentVehicleInfo/index.vue
View file @ ed66af1f
...@@ -398,8 +398,9 @@ ...@@ -398,8 +398,9 @@
<span class="label-text">拍照取证*:</span> <span class="label-text">拍照取证*:</span>
<br /> <br />
<img <img
v-for="item in otherImg" v-for="(item,index) in otherImg"
:src="item" :src="item"
:key="index"
style="width: 100px; height: 100px;margin-left:110px;" style="width: 100px; height: 100px;margin-left:110px;"
/> />
<!-- <img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/> <!-- <img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/>
......
src/views/summit/index.vue
View file @ ed66af1f
<template> <template>
<div class="app-container calendar-list-container"> <div class="app-container calendar-list-container">
<div class="filter-container"> <div class="filter-container">
<el-form ref="queryForm" :inline="inline" :model="query" label-width="100px"> <el-form ref="queryForm" :inline="inline" :model="query" label-width="100px">
<el-row> <el-row>
<el-form-item label="峰会名称"> <el-form-item label="峰会名称">
<el-input v-model="query.title" placeholder="请输入峰会名称"></el-input> <el-input v-model="query.title" placeholder="请输入峰会名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="开始时间"> <el-form-item label="开始时间">
<el-date-picker <el-date-picker
v-model="query.startTime" v-model="query.startTime"
type="datetime" type="datetime"
format="yyyy-MM-dd HH" format="yyyy-MM-dd HH"
placeholder="报名截止时间" placeholder="报名截止时间"
@change="changeTime" @change="changeTime"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="峰会状态"> <el-form-item label="峰会状态">
<el-select class="filter-item" v-model="query.status" placeholder="状态"> <el-select class="filter-item" v-model="query.status" placeholder="状态">
<el-option <el-option v-for="(val,index) in status" :key="index" :label="val.name" :value="val.id"></el-option>
v-for="(val,index) in status" </el-select>
:key="index" </el-form-item>
:label="val.name" </el-row>
:value="val.id" </el-form>
></el-option> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</el-select> <el-button class="filter-item" type="primary" v-waves icon="search" @click="createSummit">创建峰会</el-button>
</el-form-item> </div>
</el-row> <el-table
</el-form> :key="tableKey"
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> :data="list"
<el-button class="filter-item" type="primary" v-waves icon="search" @click="createSummit">创建峰会</el-button> v-loading="listLoading"
</div> border
<el-table fit
:key="tableKey" highlight-current-row
:data="list" style="width: 100%"
v-loading="listLoading" >
border <el-table-column align="center" width="150px" label="id">
fit <template scope="scope">
highlight-current-row <span>{{scope.row.id}}</span>
style="width: 100%" </template>
> </el-table-column>
<el-table-column align="center" width="150px" label="id"> <el-table-column align="center" width="500px" label="标题">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.id}}</span> <span>{{scope.row.title}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="500px" label="标题"> <el-table-column align="center" width="400" label="开始-结束时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.title}}</span> <span>{{timestamp2Date(scope.row.startTime)}}</span>
</template> <span>-</span>
</el-table-column> <span>{{timestamp2Date(scope.row.endTime)}}</span>
<el-table-column align="center" width="400" label="开始-结束时间"> </template>
<template scope="scope"> </el-table-column>
<span>{{timestamp2Date(scope.row.startTime)}}</span> <el-table-column align="center" label="当前状态">
<span>-</span> <template scope="scope">
<span>{{timestamp2Date(scope.row.endTime)}}</span> <span>{{getStatusName(scope.row.status)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="当前状态"> <el-table-column align="center" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<span>{{getStatusName(scope.row.status)}}</span> <el-button
</template> size="small"
</el-table-column> class="el-button el-button--text el-button--small"
<el-table-column align="center" label="操作" fixed="right"> v-if="scope.row.isPublish===1"
<template scope="scope"> @click="viewDetails({id:scope.row.id,isPublish:0})"
<el-button >取消发布</el-button>
size="small" <el-button
class="el-button el-button--text el-button--small" size="small"
v-if="scope.row.isPublish===1" class="el-button el-button--text el-button--small"
@click="viewDetails({id:scope.row.id,isPublish:0})" v-if="scope.row.isPublish===0"
>取消发布</el-button> @click="viewDetails({id:scope.row.id,isPublish:1})"
<el-button >发布</el-button>
size="small" <el-button
class="el-button el-button--text el-button--small" size="small"
v-if="scope.row.isPublish===0" class="el-button el-button--text el-button--small"
@click="viewDetails({id:scope.row.id,isPublish:1})" @click="enrollData(scope.row)"
>发布</el-button> >报名信息</el-button>
<el-button <!-- <el-button
size="small"
class="el-button el-button--text el-button--small"
@click="enrollData(scope.row)"
>报名信息</el-button>
<!-- <el-button
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="applyPage(scope.row)" @click="applyPage(scope.row)"
>报名页面</el-button> --> >报名页面</el-button>-->
<el-button <el-button
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
size="small" size="small"
@click="edit(scope.row)" @click="edit(scope.row)"
>编辑</el-button> >编辑</el-button>
<el-button <el-button
size="small" size="small"
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
@click="review(scope.row)" @click="review(scope.row)"
>回顾页面</el-button> >回顾页面</el-button>
<el-button <el-button
class="el-button el-button--text el-button--small" class="el-button el-button--text el-button--small"
style="color:red" style="color:red"
size="small" size="small"
v-if="scope.row.isPublish==0" v-if="scope.row.isPublish==0"
@click="deleteSummit(scope.row)" @click="deleteSummit(scope.row)"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-show="!listLoading" class="pagination-container"> <div v-show="!listLoading" class="pagination-container">
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="query.page" :current-page.sync="query.page"
:page-sizes="[10,20,30, 50]" :page-sizes="[10,20,30, 50]"
:page-size="query.limit" :page-size="query.limit"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
></el-pagination> ></el-pagination>
</div> </div>
<summitPopup <summitPopup
v-if="popupShow" v-if="popupShow"
:popupRow="popupRow" :popupRow="popupRow"
:titleNme="titleNme" :titleNme="titleNme"
v-on:summitDialogEvent="summitDialogEvent" v-on:summitDialogEvent="summitDialogEvent"
/> />
<enrollDataPopup <enrollDataPopup
v-if="enrollShow" v-if="enrollShow"
:enrollRow="enrollRow" :enrollRow="enrollRow"
v-on:enrollDialogEvent="enrollDialogEvent" v-on:enrollDialogEvent="enrollDialogEvent"
/> />
<reviewPopup <reviewPopup v-if="reviewShow" :reviewRow="reviewRow" v-on:reviewDialogEvent="reviewDialogEvent" />
v-if="reviewShow"
:reviewRow="reviewRow"
v-on:reviewDialogEvent="reviewDialogEvent"
/>
<!-- <applyPage :applyInfo='applyInfo'></applyPage> --> <!-- <applyPage :applyInfo='applyInfo'></applyPage> -->
</div> </div>
</template> </template>
<script> <script>
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex'
import { timestamp2Date } from "src/utils/dateUtils"; import { timestamp2Date } from 'src/utils/dateUtils'
import { page, update } from "src/api/summit/activity"; import { page, update, remove } from 'src/api/summit/activity'
import summitPopup from "src/views/summit/model/summitPopup"; import summitPopup from 'src/views/summit/model/summitPopup'
import enrollDataPopup from "src/views/summit/model/enrollDataPopup"; import enrollDataPopup from 'src/views/summit/model/enrollDataPopup'
import reviewPopup from "src/views/summit/model/reviewPopup"; import reviewPopup from 'src/views/summit/model/reviewPopup'
// import applyPage from "src/views/summit/model/applyPage"; // import applyPage from "src/views/summit/model/applyPage";
import { getToken } from "src/utils/auth"; import { getToken } from 'src/utils/auth'
export default { export default {
name: "summitList", name: 'summitList',
components: { components: {
summitPopup, summitPopup,
enrollDataPopup, enrollDataPopup,
reviewPopup, reviewPopup
// applyPage // applyPage
}, },
data() { data() {
return { return {
applyInfo:{ applyInfo: {
dialogVisible:false, dialogVisible: false
}, },
query: { query: {
page: 1, page: 1,
limit: 10, limit: 10,
title: "", title: '',
startTime: "", startTime: '',
status: undefined, status: undefined,
type: 1 type: 1
}, },
tableKey: 0, tableKey: 0,
list: [], list: [],
listLoading: true, listLoading: true,
status: [ status: [
{ id: 0, name: "全部" }, { id: 0, name: '全部' },
{ id: 1, name: "报名中" }, { id: 1, name: '报名中' },
{ id: 2, name: "进行中" }, { id: 2, name: '进行中' },
{ id: 3, name: "已结束" } { id: 3, name: '已结束' }
], ],
total: 0, total: 0,
inline: true, inline: true,
popupShow: false, popupShow: false,
titleNme: "创建峰会", titleNme: '创建峰会',
popupRow: undefined, popupRow: undefined,
enrollRow: undefined, enrollRow: undefined,
enrollShow: false, enrollShow: false,
reviewRow: undefined, reviewRow: undefined,
reviewShow: false, reviewShow: false,
statusNameList: { statusNameList: {
1: "默认", 1: '默认',
2: "报名中", 2: '报名中',
3: "进行中", 3: '进行中',
4: "已结束" 4: '已结束'
} }
}; }
}, },
created() { created() {
this.getList(); this.getList()
}, },
computed: { computed: {
...mapGetters(["elements"]), ...mapGetters(['elements']),
getHeaderWithToken() { getHeaderWithToken() {
return { Authorization: getToken() }; return { Authorization: getToken() }
} }
}, },
methods: { methods: {
//报名页面 //报名页面
// applyPage(){ // applyPage(){
// this.applyInfo.dialogVisible = true; // this.applyInfo.dialogVisible = true;
// }, // },
getList() { getList() {
this.listLoading = true; this.listLoading = true
page(this.query).then(res => { page(this.query).then(res => {
this.list = res.data.list; this.list = res.data.list
this.total = res.data.total; this.total = res.data.total
}); })
setTimeout(() => { setTimeout(() => {
this.listLoading = false; this.listLoading = false
}, 500); }, 500)
}, },
changeTime(val) { changeTime(val) {
!!val !!val
? (this.query.startTime = Date.now(val)) ? (this.query.startTime = Date.now(val))
: this.query.startTime == ""; : this.query.startTime == ''
}, },
handleFilter() { handleFilter() {
this.getList(); this.getList()
}, },
viewDetails(row) { viewDetails(row) {
update(row).then(res => { update(row).then(res => {
if (res.rel) { if (res.rel) {
this.$notify.success({ this.$notify.success({
title: "编辑成功", title: '编辑成功',
message: `success` message: `success`
}); })
this.getList(); this.getList()
} else { } else {
this.$notify.warning({ this.$notify.warning({
title: "编辑失败", title: '编辑失败',
message: `failed` message: `failed`
}); })
} }
}); })
}, },
handleSizeChange(val) { handleSizeChange(val) {
this.query.limit = val; this.query.limit = val
this.getList(); this.getList()
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.query.page = val; this.query.page = val
this.getList(); this.getList()
}, },
timestamp2Date(timeStamp) { timestamp2Date(timeStamp) {
return timestamp2Date(timeStamp); return timestamp2Date(timeStamp)
}, },
enrollData(row) { enrollData(row) {
this.enrollRow = row; this.enrollRow = row
this.enrollShow = true; this.enrollShow = true
}, },
edit(row) { edit(row) {
// debugger; // debugger;
this.popupRow = row; this.popupRow = row
this.titleNme = "编辑峰会"; this.titleNme = '编辑峰会'
this.popupShow = true; this.popupShow = true
}, },
createSummit() { createSummit() {
this.popupRow = {}; this.popupRow = {}
this.titleNme = "创建峰会"; this.titleNme = '创建峰会'
this.popupShow = true; this.popupShow = true
}, },
review(row) { review(row) {
this.reviewRow = row; this.reviewRow = row
this.reviewShow = true; this.reviewShow = true
console.log(this.reviewRow); },
}, deleteSummit(row) {
deleteSummit() {}, this.$confirm('此操作将删除该峰会, 是否继续?', '提示', {
getStatusName(status) { confirmButtonText: '确定',
return status + 1 ? this.statusNameList[status + 1] : ""; cancelButtonText: '取消',
}, type: 'warning'
summitDialogEvent(e) { }).then(() => {
this.popupShow = false; remove(row.id).then(data => {
if (e) { if (data.status == 200) {
this.getList(); this.getList()
} this.$message({
}, type: 'success',
enrollDialogEvent(e) { message: '删除成功!'
this.enrollShow = false; })
}, } else {
reviewDialogEvent(e) { this.$message({
this.reviewShow = false; type: 'error',
} message: data.message
} })
}; }
})
})
},
getStatusName(status) {
return status + 1 ? this.statusNameList[status + 1] : ''
},
summitDialogEvent(e) {
this.popupShow = false
if (e) {
this.getList()
}
},
enrollDialogEvent(e) {
this.enrollShow = false
},
reviewDialogEvent(e) {
this.reviewShow = false
}
}
}
</script> </script>
src/views/summit/model/reviewPopup.vue
View file @ ed66af1f
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
list-type="picture-card" list-type="picture-card"
:file-list="list" :file-list="list"
:on-success="handlePictureCardPreview" :on-success="handlePictureCardPreview"
:on-remove="handleRemove" :on-remove="handleRemoveZip"
:before-upload="beforeAvatarUpload" :before-upload="beforeAvatarUpload"
> >
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
...@@ -64,11 +64,11 @@ ...@@ -64,11 +64,11 @@
> >
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
<video <!-- <video
v-if="$utils.isString(form.videoPath) && !$utils.isEmpty(form.videoPath) && !imgFlag" v-if="$utils.isString(form.videoPath) && !$utils.isEmpty(form.videoPath) && !imgFlag"
:src="form.videoPath" :src="form.videoPath"
style="width:300px;max-height:300px;" style="width:300px;max-height:300px;"
/> />-->
<!-- <i <!-- <i
v-else-if="!imgFlag" v-else-if="!imgFlag"
class="el-icon-plus avatar-uploader-icon" class="el-icon-plus avatar-uploader-icon"
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
</el-col> </el-col>
<el-col> <el-col>
<el-form-item> <el-form-item>
<el-button class="button" type="primary" @click="cre">确 定</el-button>
<el-button class="button" @click="cancelHandel">取 消</el-button> <el-button class="button" @click="cancelHandel">取 消</el-button>
<!-- <el-button class="button" type="primary" @click="cre">确 定</el-button> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -117,12 +117,14 @@ export default { ...@@ -117,12 +117,14 @@ export default {
imgFlag: false, imgFlag: false,
BASE_API: process.env.BASE_API, BASE_API: process.env.BASE_API,
percent: 0, //上传进度 percent: 0, //上传进度
list: [], list: [], //压缩包
oldList: '',
oldVadio: '',
vadio: [], //视频
activeId: '', //峰会id
form: { form: {
id: undefined, id: undefined,
banner: undefined, banner: undefined,
activityId: undefined,
banner: undefined,
videoPath: undefined, videoPath: undefined,
picturePath: undefined picturePath: undefined
} }
...@@ -151,44 +153,74 @@ export default { ...@@ -151,44 +153,74 @@ export default {
// }, // },
mounted() { mounted() {
this.getOrderInfo() this.getOrderInfo()
console.log(this.reviewRow)
}, },
methods: { methods: {
vidioSuccess(res) { vidioSuccess(res, file, fileList) {
this.$notify({ if (res.status == 200) {
title: '提示', this.$notify({
message: res.message, title: '提示',
type: 'success', message: res.message,
duration: 2000 type: 'success',
}) duration: 2000
})
this.vadio = fileList
}
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
// const zip = file.type === 'application/zip' var index = file.name.lastIndexOf('.')
// if (!zip) { var ext = file.name.substr(index + 1)
// this.$message.error('上传头像图片只能是 zip 格式!') if (ext != 'zip') {
// } this.$message.error('上传压缩包只能是 zip 格式!')
// return zip return false
}
return true
}, },
videoUpload(file) { videoUpload(file) {
console.log(file.type)
const isJPG = file.type === 'video/mp4' const isJPG = file.type === 'video/mp4'
if (!isJPG) { if (!isJPG) {
this.$message.error('上传头像图片只能是 mp4 格式!') this.$message.error('上传压缩包只能是 mp4 格式!')
} }
return isJPG return isJPG
}, },
getOrderInfo() { getOrderInfo() {
console.log(this.reviewRow.id)
one(this.reviewRow.id).then(res => { one(this.reviewRow.id).then(res => {
this.form = res.data this.form = res.data
this.activeId = res.data.id //峰会id
this.oldList = res.data.picturePath || '' //压缩包
this.oldVadio = res.data.videoPath || '' //视频
this.dialogVisible = true this.dialogVisible = true
this.imgDialogVisible = true this.imgDialogVisible = true
}) })
}, },
cre() { cre() {
console.log(this.form.picturePath) let zipPic = []
save(this.form).then(res => { this.list.forEach(element => {
zipPic.push(element.response.data)
})
let mp4Vadio = []
this.vadio.forEach(element => {
mp4Vadio.push(element.response.data)
})
let params = {
id: this.activeId, //回顾id
banner: this.form.banner,
activityId: this.reviewRow.id, //峰会id
videoPath: this.oldVadio
? mp4Vadio == ''
? this.oldVadio
: mp4Vadio.join(',') + ',' + this.oldVadio
: mp4Vadio.join(','),
picturePath: this.oldList
? zipPic == ''
? this.oldList
: zipPic.join(',') + ',' + this.oldList
: zipPic.join(',')
}
// console.log(params);
save(params).then(res => {
this.responseResult(res) this.responseResult(res)
}) })
}, },
...@@ -241,20 +273,22 @@ export default { ...@@ -241,20 +273,22 @@ export default {
this.form.videoPath = file.data this.form.videoPath = file.data
this.imgDialogVisible = true this.imgDialogVisible = true
}, },
handleRemoveZip(file, fileList) {
this.list = fileList
},
handleRemove(file, fileList) { handleRemove(file, fileList) {
// console.log(file) this.vadio = fileList
console.log(file, fileList)
}, },
handlePictureCardPreview(res, file) { handlePictureCardPreview(res, file, fileList) {
this.$notify({ if (res.status == 200) {
title: '提示', this.$notify({
message: res.message, title: '提示',
type: 'success', message: '上传成功',
duration: 2000 type: 'success'
}) })
this.list.push({ url: res.data }) this.list = fileList
// this.imgDialogVisible = true; }
}, },
cleanForm() { cleanForm() {
this.form = { this.form = {
......
src/views/summit/model/summitPopup.vue
View file @ ed66af1f
...@@ -105,12 +105,7 @@ ...@@ -105,12 +105,7 @@
<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">
<el-option <el-option v-for="(item,index) in optionsId" :key="index" :label="item" :value="item"></el-option>
v-for="(item,index) in optionsId"
:key="index"
:label="item"
:value="item"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -151,20 +146,16 @@ ...@@ -151,20 +146,16 @@
<div> <div>
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="房车介绍:"> <el-form-item label="房车介绍:" style="margin-top:20px">
<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 +196,8 @@ ...@@ -205,8 +196,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 +278,7 @@ export default { ...@@ -287,7 +278,7 @@ export default {
created() { created() {
activityIds().then(data => { activityIds().then(data => {
if (data.status == 200) { if (data.status == 200) {
this.optionsId = data.data; this.optionsId = data.data
} }
}) })
}, },
...@@ -306,11 +297,14 @@ export default { ...@@ -306,11 +297,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 +378,7 @@ export default { ...@@ -384,7 +378,7 @@ export default {
}, },
getState(status) { getState(status) {
if (this.$utils.isInteger(status)) { if (this.$utils.isInteger(status)) {
console.log(status); console.log(status)
if (status == 0) { if (status == 0) {
return '默认' return '默认'
} else { } else {
...@@ -450,10 +444,17 @@ export default { ...@@ -450,10 +444,17 @@ 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 = []
if (!!this.form.vehicleImgs) { if (this.fileList2 != '') {
this.form.vehicleImgs.forEach(element => { console.log(this.fileList2);
pic.push(element.url) this.fileList2.forEach(element => {
}) if (!!element.response) {
pic.push(element.response.data)
}else{
pic.push(element.url);
}
});
console.log(pic);
this.form.vehicleImgs = pic.join(',') this.form.vehicleImgs = pic.join(',')
} }
...@@ -501,12 +502,18 @@ export default { ...@@ -501,12 +502,18 @@ 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 = []
if (!!this.form.vehicleImgs) { if (this.fileList2 != '') {
this.form.vehicleImgs.forEach(element => { this.fileList2.forEach(element => {
pic.push(element.url) pic.push(element.response.data);
}) });
this.form.vehicleImgs = pic.join(',') this.form.vehicleImgs = pic.join(',')
} }
// if (!!this.form.vehicleImgs) {
// this.form.vehicleImgs.forEach(element => {
// pic.push(element.url)
// })
// this.form.vehicleImgs = pic.join(',')
// }
this.dataProcessing() this.dataProcessing()
add(this.form).then(res => { add(this.form).then(res => {
this.responseResult(res) this.responseResult(res)
...@@ -516,7 +523,7 @@ export default { ...@@ -516,7 +523,7 @@ export default {
dataProcessing() { dataProcessing() {
if (this.form.state === '默认') { if (this.form.state === '默认') {
this.form.status = '0' this.form.status = '0'
}else{ } else {
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 @ ed66af1f
<template> <template>
<div class="app-container calendar-list-container"> <div class="app-container calendar-list-container">
<div class="filter-container"> <div class="filter-container">
<el-form ref="queryForm" :model="listQuery" label-width="100px"> <el-form ref="queryForm" :model="listQuery" label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input> <el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input> <el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="状态"> <el-form-item label="状态">
<el-select class="filter-item" v-model="listQuery.status" placeholder="请选员工状态"> <el-select class="filter-item" v-model="listQuery.status" placeholder="请选员工状态">
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in statusList "
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="分公司">
<el-autocomplete
class="inline-input"
v-model="listQuery.companyName"
:fetch-suggestions="querySearch"
placeholder="请选择分公司"
@select="handleSelectPark"
clearable
></el-autocomplete>
<!-- <el-select class="filter-item" v-model="listQuery.status" placeholder="请选分公司">
<el-option :key="undefined" label="全部" :value="undefined"></el-option> <el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option <el-option
v-for="(item,index) in statusList " v-for="(item,index) in companyList "
:key="index" :key="index"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
></el-option> ></el-option>
</el-select> </el-select>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
<el-button <el-button class="filter-item" type="primary" v-waves icon="delete" @click="cleaningQuery">清除搜索条件</el-button>
class="filter-item"
type="primary" <el-button class="filter-item" type="primary" v-waves @click="addStaff">新增员工</el-button>
v-waves <el-button class="filter-item" type="primary" v-waves @click="toLoad">批量导入员工</el-button>
icon="delete"
@click="cleaningQuery"
>清除搜索条件</el-button>
<el-button class="filter-item" type="primary" v-waves @click="addStaff">新增员工</el-button> <el-table
<el-button class="filter-item" type="primary" v-waves @click="toLoad">批量导入员工</el-button> :key="tableKey"
:data="list"
v-loading="listLoading"
border
fit
highlight-current-row
style="width: 100%"
>
<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="jobName" 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 label="状态" align="center">
<template scope="scope">
<span v-if="scope.row.status == 1">已核销</span>
<span v-else>未核销</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="400" fixed="right">
<template scope="scope">
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="editorStaff(scope.row)"
v-if="scope.row.status != 1"
>编辑</el-button>
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="deleteStaff(scope.row)"
v-if="scope.row.status != 1"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<el-table <el-pagination
:key="tableKey" @size-change="handleSizeChange"
:data="list" @current-change="handleCurrentChange"
v-loading="listLoading" :current-page.sync="listQuery.page"
border :page-sizes="[10,20,30, 50]"
fit :page-size="listQuery.limit"
highlight-current-row layout="total, sizes, prev, pager, next, jumper"
style="width: 100%" :total="total"
> style="margin-top:20px"
<el-table-column prop="name" label="姓名" width="180" align="center"></el-table-column> ></el-pagination>
<el-table-column prop="phone" label="手机号" align="center"></el-table-column>
<el-table-column prop="positionName" label="身份" align="center"></el-table-column>
<el-table-column label="状态" align="center">
<template scope="scope">
<span v-if="scope.row.status == 1">已核销</span>
<span v-else>未核销</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="400" fixed="right">
<template scope="scope">
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="editorStaff(scope.row)"
v-if="scope.row.status != 1"
>编辑</el-button>
<el-button
size="small"
class="el-button el-button--text el-button--small"
@click="deleteStaff(scope.row)"
v-if="scope.row.status != 1"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination <!-- 新增编辑员工 -->
@size-change="handleSizeChange" <el-dialog :title="staffTitle" :visible.sync="bulkUploadMember" class="member" @close="closeAdd">
@current-change="handleCurrentChange" <el-form :model="staffTitleFrom" ref="userMembership" :rules="rules" label-width="100px">
:current-page.sync="listQuery.page" <el-form-item label="员工姓名">
:page-sizes="[10,20,30, 50]" <el-input v-model.number="staffTitleFrom.name" placeholder="请输入姓名"></el-input>
:page-size="listQuery.limit" </el-form-item>
layout="total, sizes, prev, pager, next, jumper" <el-form-item label="手机号">
:total="total" <el-input v-model.number="staffTitleFrom.phone" placeholder="请输入手机号"></el-input>
style="margin-top:20px" </el-form-item>
></el-pagination> <el-form-item label="员工身份">
<el-select
class="filter-item"
v-model="staffTitleFrom.positionId"
placeholder="请选择员工身份"
style="width:100%"
>
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in postionsList "
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<!-- 新增编辑员工 --> <el-form-item label="员工职位">
<el-dialog <el-select
:title="staffTitle" class="filter-item"
:visible.sync="bulkUploadMember" v-model="staffTitleFrom.jobId"
class="member" placeholder="请选择员工身份"
@close="closeAdd" style="width:100%"
> >
<el-form :model="staffTitleFrom" ref="userMembership" :rules="rules" label-width="100px"> <el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-form-item label="员工姓名"> <el-option
<el-input v-model.number="staffTitleFrom.name" placeholder="请输入姓名"></el-input> v-for="(item,index) in jobsList "
</el-form-item> :key="index"
<el-form-item label="手机号"> :label="item.name"
<el-input v-model.number="staffTitleFrom.phone" placeholder="请输入手机号"></el-input> :value="item.id"
</el-form-item> ></el-option>
<el-form-item label="员工身份"> </el-select>
<el-select </el-form-item>
class="filter-item"
v-model="staffTitleFrom.positionId"
placeholder="请选择员工身份"
style="width:100%"
>
<el-option :key="undefined" label="全部" :value="undefined"></el-option>
<el-option
v-for="(item,index) in postionsList "
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<div style="text-align:center">
<el-button type="primary" @click="confirm">确 定</el-button>
<el-button type="primary" @click="bulkUploadMember = false">取消</el-button>
</div>
</el-form>
</el-dialog>
<!--批量导入会员窗口--> <el-form-item label="分公司">
<el-dialog title="导入会员" :visible.sync="tolead"> <el-autocomplete
<el-form :model="fileForm"> class="inline-input"
<el-form-item label="上传文件" label-width="80px"> v-model="staffTitleFrom.companyName"
<el-button type="primary" icon="el-icon-download"> :fetch-suggestions="querySearch"
<a placeholder="请选择分公司"
class="el-icon-download" style="width:100%"
href="https://mgmt.dfangche.com/axshare/userposition.xlsx" @select="handleSelectParks"
>下载模板</a> ></el-autocomplete>
</el-button> </el-form-item>
<div style="text-align:center">
<el-button type="primary" @click="confirm">确 定</el-button>
<el-button type="primary" @click="bulkUploadMember = false">取消</el-button>
</div>
</el-form>
</el-dialog>
<el-upload <!--批量导入会员窗口-->
ref="uploadExcel" <el-dialog title="导入会员" :visible.sync="tolead">
:limit="limitNum" <el-form :model="fileForm">
action="1111" <el-form-item label="上传文件" label-width="80px">
:headers="getHeaderWithToken" <el-button type="primary" icon="el-icon-download">
accept=".xlsx" <a class="el-icon-download" href="https://mgmt.dfangche.com/axshare/userposition.xlsx">下载模板</a>
:http-request="upLoad" </el-button>
: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-upload
<el-dialog title="上传提示" :visible.sync="uploadHiut"> ref="uploadExcel"
<p> :limit="limitNum"
上传成功: action="1111"
<b>{{uploadListHiut.success}}</b>条,上传失败: :headers="getHeaderWithToken"
<b>{{uploadListHiut.error}}</b>条 accept=".xlsx"
</p> :http-request="upLoad"
<ul class="defeated"> :on-remove="handleRemove"
<li v-for="(item,index) in uploadListHiut.uploadList" :key="index"> :before-remove="beforeRemove"
<p> :before-upload="beforeUploadFile"
失败行数: :on-change="fileChange"
<span>{{item.num}}</span>,失败原因: :on-exceed="exceedFile"
<span>{{item.msg}}</span> :file-list="fileList"
</p> >
</li> <el-button size="small" type="primary" icon="el-icon-edit">
</ul> 上传文件
</el-dialog> <i class="el-icon-upload el-icon--right"></i>
</div> </el-button>
</div> <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>条
</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>
</div>
</div>
</template> </template>
<script> <script>
import { import {
staffList, staffList,
postions, postions,
addEditor, addEditor,
deleteStaffs deleteStaffs,
} from "src/api/admin/userManagement/index"; jobs,editorUpd
import { getToken } from "src/utils/auth"; } from 'src/api/admin/userManagement/index'
import { mapGetters } from "vuex"; import { getToken } from 'src/utils/auth'
import { staffImport } from "src/api/admin/UserMember/index"; import { mapGetters } from 'vuex'
import { staffImport } from 'src/api/admin/UserMember/index'
import { getAll } from 'api/base_info/branch_company'
export default { export default {
created() { created() {
this.getList(); this.getList()
this.postionsFn(); this.postionsFn()
}, this.getAllFn()
computed: { this.jobsFn()
...mapGetters(["elements"]), },
/** computed: {
* 获取token ...mapGetters(['elements']),
*/ /**
* 获取token
*/
getHeaderWithToken() { getHeaderWithToken() {
return { Authorization: getToken() }; return { Authorization: getToken() }
} }
}, },
data() { data() {
return { return {
activeId: "", jobsList: [],
uploadListHiut: { activeId: '',
uploadList: [], uploadListHiut: {
success: "", uploadList: [],
error: "" success: '',
}, error: ''
uploadHiut: false, },
fileList: [], companyList: [],
BASE_API: process.env.BASE_API, uploadHiut: false,
limitNum: 1, fileList: [],
fileForm: { BASE_API: process.env.BASE_API,
file: "" limitNum: 1,
}, fileForm: {
tolead: false, file: ''
listQuery: { },
name: "", tolead: false,
phone: "", listQuery: {
status: null, name: '',
page: 1, phone: '',
limit: 10 status: null,
}, page: 1,
total: null, limit: 10,
tableKey: 0, companyId: '',
list: [], companyName: ''
listLoading: true, },
statusList: [ total: null,
{ tableKey: 0,
label: "未核销", list: [],
value: "0" listLoading: true,
}, statusList: [
{ {
label: "已核销", label: '未核销',
value: "1" value: '0'
} },
], {
postionsList: [], label: '已核销',
staffTitle: "新增员工", value: '1'
bulkUploadMember: false, }
staffTitleFrom: { ],
phone: "", postionsList: [],
name: "", staffTitle: '新增员工',
positionId: "" bulkUploadMember: false,
}, staffTitleFrom: {
rules: {} phone: '',
}; name: '',
}, positionId: '',
methods: { jobId: '',
//新增,编辑员工弹窗关闭 companyId: '',
closeAdd() { companyName: ''
this.staffTitleFrom = { },
phone: "", rules: {}
name: "", }
positionId: "" },
}; methods: {
}, handleSelectPark(item) {
upLoad(file) { this.listQuery.companyId = item.id
var form = new FormData(); },
// 文件对象 handleSelectParks(item) {
form.append("file", file.file); this.staffTitleFrom.companyId = item.id
staffImport(form).then(res => { this.staffTitleFrom.companyName = item.name
console.log(res); },
this.uploadHiut = true; createFilter(queryString) {
(this.uploadListHiut = { return restaurant => {
uploadList: res.data.data, return restaurant.name.indexOf(queryString.toLowerCase()) != -1
success: res.data.success, }
error: res.data.error },
}), querySearch(queryString, cb) {
this.getList(); let selectArry = []
}); this.companyList.map(function(item) {
}, item.value = item.name
//excel上传 selectArry.push(item)
handleRemove(file, fileList) { })
//console.log(file, fileList); this.selectArry = selectArry
}, var results = queryString
handlePreview(file) { ? selectArry.filter(this.createFilter(queryString))
//console.log(file); : selectArry
}, // 调用 callback 返回建议列表的数据
beforeRemove(file, fileList) { cb(results)
return this.$confirm(`确定移除 ${file.name}？`); },
}, //分公司
// 文件超出个数限制时的钩子 getAllFn() {
exceedFile(files, fileList) { getAll().then(data => {
this.$notify.warning({ if (data.status == 200) {
title: "警告", this.companyList = data.data;
message: `只能选择 ${ this.companyList.unshift({name:'全部',id:''})
this.limitNum console.log(this.companyList);
} 个文件，当前共选择了 ${files.length + fileList.length} 个`
}); }
}, })
// 文件状态改变时的钩子 },
fileChange(file, fileList) { //新增,编辑员工弹窗关闭
//console.log("change"); closeAdd() {
//console.log(file); this.staffTitleFrom = {
this.fileForm.file = file.raw; phone: '',
//console.log(this.fileForm.file); name: '',
// console.log(fileList); positionId: '',
}, jobId: '',
// 上传文件之前的钩子, 参数为上传的文件,若返回 false 或者返回 Promise 且被 reject，则停止上传 companyId: '',
beforeUploadFile(file) { companyName: ''
//console.log("before upload"); }
//console.log(file); },
let extension = file.name.substring(file.name.lastIndexOf(".") + 1); upLoad(file) {
let size = file.size / 1024 / 1024; var form = new FormData()
if (extension !== "xlsx") { // 文件对象
this.$notify.warning({ form.append('file', file.file)
title: "警告", staffImport(form).then(res => {
message: `只能上传Excel 2007以上版本（即后缀是.xlsx）的文件` console.log(res)
}); this.uploadHiut = true
} ;(this.uploadListHiut = {
if (size > 10) { uploadList: res.data.data,
this.$notify.warning({ success: res.data.success,
title: "警告", error: res.data.error
message: `文件大小不得超过10M` }),
}); this.getList()
} })
}, },
cancelNotDeleteForm() { //excel上传
this.tolead = false; handleRemove(file, fileList) {
this.$refs.uploadExcel.clearFiles(); //console.log(file, fileList);
}, },
//员工列表 handlePreview(file) {
getList() { //console.log(file);
staffList(this.listQuery).then(data => { },
this.listLoading = true; beforeRemove(file, fileList) {
if (data.status == 200) { return this.$confirm(`确定移除 ${file.name}？`)
console.log(data); },
this.list = data.data.data; // 文件超出个数限制时的钩子
this.total = data.data.totalCount; exceedFile(files, fileList) {
this.listLoading = false; this.$notify.warning({
} title: '警告',
}); message: `只能选择 ${
}, this.limitNum
handleSizeChange(val) { } 个文件，当前共选择了 ${files.length + fileList.length} 个`
this.listQuery.limit = val; })
this.getList(); },
}, // 文件状态改变时的钩子
handleCurrentChange(val) { fileChange(file, fileList) {
this.listQuery.page = val; //console.log("change");
this.getList(); //console.log(file);
}, this.fileForm.file = file.raw
//搜索 //console.log(this.fileForm.file);
handleFilter() { // console.log(fileList);
this.getList(); },
}, // 上传文件之前的钩子, 参数为上传的文件,若返回 false 或者返回 Promise 且被 reject，则停止上传
//清空搜索条件 beforeUploadFile(file) {
cleaningQuery() { //console.log("before upload");
this.listQuery.page = 1; //console.log(file);
this.listQuery.limit = 10; let extension = file.name.substring(file.name.lastIndexOf('.') + 1)
this.listQuery.name = ""; let size = file.size / 1024 / 1024
this.listQuery.phone = ""; if (extension !== 'xlsx') {
this.listQuery.status = ""; this.$notify.warning({
this.getList(); title: '警告',
}, message: `只能上传Excel 2007以上版本（即后缀是.xlsx）的文件`
//新增员工 })
addStaff() { }
this.staffTitle == "新增员工" if (size > 10) {
this.bulkUploadMember = true; this.$notify.warning({
}, title: '警告',
//批量导入员工 message: `文件大小不得超过10M`
toLoad() { })
this.tolead = true; }
}, },
//编辑员工 cancelNotDeleteForm() {
editorStaff(row) { this.tolead = false
this.activeId = row.id; this.$refs.uploadExcel.clearFiles()
this.staffTitle = "编辑员工"; },
this.bulkUploadMember = true; //员工列表
this.staffTitleFrom = { getList() {
phone: row.phone, staffList(this.listQuery).then(data => {
name: row.name, this.listLoading = true
positionId: row.positionId if (data.status == 200) {
}; console.log(data)
}, this.list = data.data.data
//删除员工 this.total = data.data.totalCount
deleteStaff(row) { this.listLoading = false
this.$confirm("确定删除吗?", "提示", { }
confirmButtonText: "确定", })
cancelButtonText: "取消", },
type: "warning" handleSizeChange(val) {
}).then(() => { this.listQuery.limit = val
deleteStaffs(row.id).then(data => { this.getList()
if (data.status == 200) { },
this.$notify({ handleCurrentChange(val) {
title: "成功", this.listQuery.page = val
message: "删除成功", this.getList()
type: "success", },
duration: 2000 //搜索
}); handleFilter() {
this.getList(); this.getList()
} else { },
this.$notify({ //清空搜索条件
title: "失败", cleaningQuery() {
message: "删除失败", this.listQuery.page = 1
type: "failed", this.listQuery.limit = 10
duration: 2000 this.listQuery.name = ''
}); this.listQuery.phone = ''
} this.listQuery.status = ''
}); this.listQuery.companyId = ''
}); this.listQuery.companyName = ''
}, this.getList()
//确定 },
confirm(formName) { //新增员工
if (this.staffTitle == "新增员工") { addStaff() {
addEditor(this.staffTitleFrom).then(data => { this.staffTitle = '新增员工'
if (data.status == 200) { this.bulkUploadMember = true
this.$notify({ },
title: "成功", //批量导入员工
message: "新增成功", toLoad() {
type: "success", this.tolead = true
duration: 2000 },
}); //编辑员工
this.bulkUploadMember = false; editorStaff(row) {
this.getList(); this.activeId = row.id
} this.staffTitle = '编辑员工'
}); this.bulkUploadMember = true
} else { this.staffTitleFrom = {
this.staffTitleFrom.id = this.activeId; phone: row.phone,
addEditor(this.staffTitleFrom).then(data => { name: row.name,
if (data.status == 200) { positionId: row.positionId,
this.$notify({ companyId:row.companyId,
title: "成功", companyName:row.companyName,
message: "编辑成功", }
type: "success", },
duration: 2000 //删除员工
}); deleteStaff(row) {
this.bulkUploadMember = false; this.$confirm('确定删除吗?', '提示', {
this.getList(); confirmButtonText: '确定',
} cancelButtonText: '取消',
}); type: 'warning'
} }).then(() => {
}, deleteStaffs(row.id).then(data => {
//身份列表 if (data.status == 200) {
postionsFn() { this.$notify({
postions().then(data => { title: '成功',
//console.log(data); message: '删除成功',
if (data.status == 200) { type: 'success',
this.postionsList = data.data; duration: 2000
} })
}); this.getList()
}, } else {
resetForm(formName) { this.$notify({
this.$refs[formName].resetFields(); title: '失败',
} message: '删除失败',
} type: 'failed',
}; duration: 2000
})
}
})
})
},
//确定
confirm(formName) {
if (this.staffTitle == '新增员工') {
addEditor(this.staffTitleFrom).then(data => {
if (data.status == 200) {
this.$notify({
title: '成功',
message: '新增成功',
type: 'success',
duration: 2000
})
this.bulkUploadMember = false
this.getList()
}else {
this.$notify({
title: '失败',
message: data.message,
type: 'failed',
duration: 2000
})
}
})
} else {
this.staffTitleFrom.id = this.activeId
editorUpd(this.staffTitleFrom).then(data => {
if (data.status == 200) {
this.$notify({
title: '成功',
message: '编辑成功',
type: 'success',
duration: 2000
})
this.bulkUploadMember = false
this.getList()
}else {
this.$notify({
title: '失败',
message: data.message,
type: 'failed',
duration: 2000
})
}
})
}
},
//身份列表
postionsFn() {
postions().then(data => {
//console.log(data);
if (data.status == 200) {
this.postionsList = data.data
}
})
},
jobsFn() {
jobs().then(data => {
//console.log(data);
if (data.status == 200) {
this.jobsList = data.data
}
})
},
resetForm(formName) {
this.$refs[formName].resetFields()
}
}
}
</script> </script>
<style> <style>
.member .el-dialog--small { .member .el-dialog--small {
width: 500px; width: 500px;
} }
.defeated { .defeated {
padding: 0; padding: 0;
} }
.defeated li { .defeated li {
list-style: none; list-style: none;
} }
</style> </style>
src/views/vehicle/vehicleInfo/index.vue
View file @ ed66af1f
...@@ -1541,11 +1541,11 @@ ...@@ -1541,11 +1541,11 @@
}, },
queryVehicleModelSearch(queryString, cb) { queryVehicleModelSearch(queryString, cb) {
let selectArry = []; let selectArry = [];
let iitem = { // let iitem = {
value: "全部", // value: "全部",
name: "全部" // name: "全部"
}; // };
selectArry.push(iitem); // selectArry.push(iitem);
this.allVehicleList.map(function (item) { this.allVehicleList.map(function (item) {
item.value = item.name; item.value = item.name;
selectArry.push(item); selectArry.push(item);
......
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