Skip to content

C
cloud-platform-ui
Commit a2ec419f authored by denghr's avatar denghr
Browse files
Options

活动行为记录、按钮权限

parent 992ce157
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 62 deletions
src/api/activityManagement.js
View file @ a2ec419f
......@@ -33,4 +33,15 @@ export function editObj(data) {
method: 'put',
data: data
})
}
\ No newline at end of file
}
/**
* 获取活动数据
* @param query
*/
export function getActivityData(query) {
return fetch({
url: '/api/user/behavior/admin/customerBehaviorNotes/collect/' + query.activityId + '?startTime=' + query.startTime + '&endTime=' + query.endTime,
method: 'Get'
})
}
src/views/activityManagement/activityList.vue
View file @ a2ec419f
......@@ -98,41 +98,40 @@
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleNewPeopelFilter" style="margin-left:20px">搜索</el-button>
</el-row>
</el-form>
<el-table :key='newPeopeltableKey' :data="list" border fit highlight-current-row style="width: 100%;">
<el-table :key='newPeopeltableKey' :data="newPeopelDataList" border fit highlight-current-row style="width: 100%;">
<el-table-column type="index" align="center" label="数据描述" width="200">
<template scope="scope">
<span>{{scope.row.id}}</span>
<span>{{scope.row.behavior}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(总)">
<template scope="scope">
<span>{{scope.row.name}}</span>
<span>{{scope.row.p_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(日均)">
<template scope="scope">
<div v-if="scope.row.title">永久</div>
<div v-else><span>{{scope.row.startTimeStr}}</span> ~ <span>{{scope.row.endTimeStr}}</span></div>
<span>{{scope.row.p_avg_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(总)">
<template scope="scope">
<span>{{scope.row.numLimit}}</span>
<span>{{scope.row.u_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(日均)">
<template scope="scope">
<span>{{scope.row.hasJoinNum}}</span>
<span>{{scope.row.u_avg_count}}</span>
</template>
</el-table-column>
</el-table>
<div class="pagination-container">
<!-- <div class="pagination-container">
<el-pagination @size-change="newPeopelDataSizeChange" @current-change="newPeopelDataCurrentChange"
:current-page.sync="newPeopelDataQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="newPeopelDataQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="newPeopelDataTotal"></el-pagination>
</div>
</div> -->
</el-dialog>
......@@ -146,41 +145,40 @@
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleShareDataFilter" style="margin-left:20px">搜索</el-button>
</el-row>
</el-form>
<el-table :key='shareDatatableKey' :data="list" border fit highlight-current-row style="width: 100%;">
<el-table :key='shareDatatableKey' :data="shareDataList" border fit highlight-current-row style="width: 100%;">
<el-table-column type="index" align="center" label="数据描述" width="200">
<template scope="scope">
<span>{{scope.row.id}}</span>
<span>{{scope.row.behavior}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(总)">
<template scope="scope">
<span>{{scope.row.name}}</span>
<span>{{scope.row.p_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pv(日均)">
<template scope="scope">
<div v-if="scope.row.title">永久</div>
<div v-else><span>{{scope.row.startTimeStr}}</span> ~ <span>{{scope.row.endTimeStr}}</span></div>
<span>{{scope.row.p_avg_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(总)">
<template scope="scope">
<span>{{scope.row.numLimit}}</span>
<span>{{scope.row.u_count}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="uv(日均)">
<template scope="scope">
<span>{{scope.row.hasJoinNum}}</span>
<span>{{scope.row.u_avg_count}}</span>
</template>
</el-table-column>
</el-table>
<div class="pagination-container">
<!-- <div class="pagination-container">
<el-pagination @size-change="shareDataSizeChange" @current-change="shareDataCurrentChange"
:current-page.sync="shareDataQuery.page" :page-sizes="[10,20,30,40,50]" :page-size="shareDataQuery.limit"
layout="total, sizes, prev, pager, next, jumper" :total="shareDataTotal"></el-pagination>
</div>
</div> -->
</el-dialog>
</div>
</template>
......@@ -208,7 +206,8 @@
import {
activityList,
getObj,
editObj
editObj,
getActivityData
} from 'api/activityManagement';
import Element1 from "../admin/menu/components/element";
import ElRow from "element-ui/packages/row/src/row";
......@@ -256,12 +255,14 @@
newPeopelDataQuery:{
page: 1,
limit: 20,
activityId:'',
starTimeStr:'',
endTimeStr:''
},
shareDataQuery:{
page: 1,
limit: 20,
activityId:'',
starTimeStr:'',
endTimeStr:''
},
......@@ -378,21 +379,16 @@
type: 'warning',
duration: 2000
});
this.listLoading = false;
return false;
}
}
// activityList(this.listQuery).then(response => {
// let totalCountRs = undefined;
// let listRs = undefined;
// if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
// listRs = response.data.list;
// totalCountRs = response.data.total;
// }
// this.listLoading = false;
// this.newPeopelDataList = listRs;
// this.newPeopelDataTotal = totalCountRs;
// })
this.newPeopelDataQuery.startTime = this.newPeopelDataQuery.starTimeStr?new Date(this.newPeopelDataQuery.starTimeStr).getTime():''
this.newPeopelDataQuery.endTime = this.newPeopelDataQuery.endTimeStr?new Date(this.newPeopelDataQuery.endTimeStr).getTime():''
getActivityData(this.newPeopelDataQuery).then(response => {
let listRs = undefined;
listRs = response.data;
this.newPeopelDataList = listRs;
})
},
//邀请有礼-活动数据弹窗
......@@ -419,21 +415,16 @@
type: 'warning',
duration: 2000
});
this.listLoading = false;
return false;
}
}
// activityList(this.listQuery).then(response => {
// let totalCountRs = undefined;
// let listRs = undefined;
// if (!this.$utils.isEmpty(response.data.list) && this.$utils.isInteger(response.data.total)) {
// listRs = response.data.list;
// totalCountRs = response.data.total;
// }
// this.listLoading = false;
// this.shareDataList = listRs;
// this.shareDataTotal = totalCountRs;
// })
this.shareDataQuery.startTime = this.shareDataQuery.starTimeStr?new Date(this.shareDataQuery.starTimeStr).getTime():''
this.shareDataQuery.endTime = this.shareDataQuery.endTimeStr?new Date(this.shareDataQuery.endTimeStr).getTime():''
getActivityData(this.shareDataQuery).then(response => {
let listRs = undefined;
listRs = response.data;
this.shareDataList = listRs;
})
},
handleUpdate(row){
......@@ -463,18 +454,22 @@
this.newPeopelDataQuery={
page: 1,
limit: 20,
activityId:row.id,
starTimeStr:'',
endTimeStr:''
}
this.getNewPeopelDataList();
this.newPeopelDataVisible = true;
}
if(row.type==2){
this.shareDataQuery={
page: 1,
limit: 20,
activityId:row.id,
starTimeStr:'',
endTimeStr:''
}
this.getShareDataList();
this.shareDataVisible = true;
}
},
......
src/views/index/index.vue
View file @ a2ec419f
......@@ -524,7 +524,7 @@
if (res.status == 200) {
that.totalGmv = res.data.totalGmv
that.totalSecurityDeposit = res.data.totalSecurityDeposit
that.peichang = Number(res.data.totalCompensation)+Number(res.data.totalForfeit)+Number(res.data.totalPenalSum)+Number(res.data.totalPostpone)
that.peichang = Number(Number(res.data.totalCompensation)+Number(res.data.totalForfeit)+Number(res.data.totalPenalSum)+Number(res.data.totalPostpone)).toFixed(2)
} else {
this.$notify({
title: '失败',
......
src/views/vehicle/vehicleSchedulManage/disableModal.vue
View file @ a2ec419f
......@@ -22,7 +22,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel()">取消禁用</el-button>
<el-button @click="cancel()" v-if="bookRecord_btn_unbook">取消禁用</el-button>
</div>
</el-dialog>
</template>
......@@ -46,9 +46,16 @@
data() {
return {
jinyong:false,
bookRecord_btn_unbook:false,
}
},
created() {
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
},
computed: {
...mapGetters([
'elements',
]),
},
watch: {
jinyong(newValue, oldValue){
......
src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue
View file @ a2ec419f
......@@ -27,12 +27,12 @@
<span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
</el-form-item>
</el-form>
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2' class="dialog-footer">
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook' class="dialog-footer">
<el-button @click="cancel()">取消用车</el-button>
</div>
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer">
<el-button type="primary" @click="agree()">同 意</el-button>
<el-button @click="notAgree()">不同意</el-button>
<el-button type="primary" @click="agree()" v-if="bookRecord_btn_prove">同 意</el-button>
<el-button @click="notAgree()" v-if="bookRecord_btn_reject">不同意</el-button>
</div>
</el-dialog>
</template>
......@@ -56,11 +56,22 @@
data() {
return {
zhanlan:false,
bookRecord_btn_prove:false,
bookRecord_btn_reject:false,
bookRecord_btn_unbook:false,
}
},
created() {
this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove'];
this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject'];
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
console.log(this.currentItem);
},
computed: {
...mapGetters([
'elements',
]),
},
watch: {
zhanlan(newValue, oldValue){
if(!newValue){
......
src/views/vehicle/vehicleSchedulManage/vehicleMaintenanceModal.vue
View file @ a2ec419f
......@@ -27,12 +27,12 @@
<span>{{upkeepStr}}</span>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer" v-if="currentItem.ii.vehicleBookRecord.status==2">
<div slot="footer" class="dialog-footer" v-if="currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook">
<el-button @click="cancel()">取消用车</el-button>
</div>
<div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer">
<el-button type="primary" @click="agree()">同 意</el-button>
<el-button @click="notAgree()">不同意</el-button>
<el-button type="primary" @click="agree()" v-if="bookRecord_btn_prove">同 意</el-button>
<el-button @click="notAgree()" v-if="bookRecord_btn_reject">不同意</el-button>
</div>
</el-dialog>
</template>
......@@ -57,10 +57,16 @@
data() {
return {
baoyang:false,
upkeepStr:''
upkeepStr:'',
bookRecord_btn_prove:false,
bookRecord_btn_reject:false,
bookRecord_btn_unbook:false,
}
},
created() {
this.bookRecord_btn_prove = this.elements['bookRecord:btn_prove'];
this.bookRecord_btn_reject = this.elements['bookRecord:btn_reject'];
this.bookRecord_btn_unbook = this.elements['bookRecord:btn_unbook'];
getUpkeepAll().then(response => {
var arr = this.currentItem.ii.vehicleBookRecord.upkeepIds.split(",");
var str = '';
......@@ -76,6 +82,11 @@
})
console.log(this.currentItem);
},
computed: {
...mapGetters([
'elements',
]),
},
watch: {
baoyang(newValue, oldValue){
if(!newValue){
......
src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue
View file @ a2ec419f
......@@ -74,7 +74,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel()">取消</el-button>
<el-button type="primary" @click="handelOk('form')">确 定</el-button>
<el-button type="primary" @click="handelOk('form')" v-if="vehicleInfo_btn_apply">确 定</el-button>
</div>
</el-dialog>
</template>
......@@ -177,11 +177,13 @@
required: true,
message: '请选择时间',
}
}
},
vehicleInfo_btn_apply: false,//申请预定
}
},
created() {
console.log(this.currentItem);
this.vehicleInfo_btn_apply = this.elements['vehicleInfo:btn_apply'];
getAll()
.then(response => {
this.allCompaniesArr = response.data;
......@@ -193,6 +195,11 @@
this.upkeepList = response.data
})
},
computed: {
...mapGetters([
'elements',
]),
},
watch: {
anpai(newValue, oldValue){
if(!newValue){
......
src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue
View file @ a2ec419f
......@@ -23,7 +23,7 @@
<el-table-column width="150" align="center" label="用途">
<template scope="scope">
<!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
<span>{{scope.row.bookType==1?"租房车":scope.row.bookType==3?"维修":scope.row.bookType==8?"禁用":scope.row.bookType==9?"客户用车":scope.row.bookType==10?"其他":scope.row.bookType==4?"展览":scope.row.bookType==5?"房车游":scope.row.bookType==6?"保养":scope.row.bookType==7?"预约中":scope.row.bookType==8?"禁用":scope.row.bookType==2?"分公司使用":'未知用途'}}</span>
<span>{{scope.row.bookType==1?"租房车":scope.row.bookType==3?"维修":scope.row.bookType==8?"禁用":scope.row.bookType==9?"客户用车":scope.row.bookType==10?"其他":scope.row.bookType==4?"展览":scope.row.bookType==5?"旅游":scope.row.bookType==6?"保养":scope.row.bookType==7?"预约中":scope.row.bookType==8?"禁用":scope.row.bookType==2?"分公司使用":'未知用途'}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="订单号">
......@@ -76,7 +76,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel()">取消</el-button>
<el-button type="primary" @click="handelOk('form')">确 定</el-button>
<el-button type="primary" @click="handelOk('form')" v-if="vehicleInfo_btn_apply">确 定</el-button>
</div>
</el-dialog>
......@@ -96,6 +96,7 @@
</div>
</template>
<script>
import {mapGetters} from 'vuex';
import vehicleMaintenanceModal from './vehicleMaintenanceModal';//车辆保养弹框
import vehicleExhibitionModal from './vehicleExhibitionModal';//车辆展览弹框
import vehiclePlanModal from './vehiclePlanModal';//安排用车
......@@ -178,10 +179,17 @@
required: true,
message: '请选择时间',
}
}
},
vehicleInfo_btn_apply:false,
}
},
created() {
this.vehicleInfo_btn_apply = this.elements['vehicleInfo:btn_apply'];
},
computed: {
...mapGetters([
'elements',
]),
},
mounted() {
this.listQuery.selectedMonth = this.$route.query.selectedMonth;
......@@ -245,7 +253,7 @@
let ii = {
vehicleBookRecord: cc
};
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用-->
// <!--bookType 1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用、9、客户用车、10、其他-->
item.numberPlate = this.listQuery.numberPlate;//车牌号
item.parkCompanyName = cc.parkCompanyName;//当前停靠公司
item.subordinateBranchName = cc.subordinateBranchName;//所属公司
......@@ -253,16 +261,23 @@
//保养
this.baoyang = true;
this.currentItem = {item: item, iitem: iitem, ii: ii};
} else if(cc.bookType == 3){
//维修
this.zhanlan = true;
this.currentItem = {item: item, ii: ii,title: "维修",upkeepName:'维修'};
} else if(cc.bookType == 4){
//展览
this.zhanlan = true;
this.currentItem = {item: item, ii: ii, title: "展览用车"};
this.currentItem = {item: item, ii: ii, title: "展览用车",upkeepName:'展览'};
} else if(cc.bookType == 7){
this.zhanlan = true;
this.currentItem = {item: item, ii: ii, title: "预定用车"};
this.currentItem = {item: item, ii: ii, title: "预定用车",upkeepName:'预定'};
} else if(cc.bookType == 1){
this.getOneVechi(cc.orderNo);
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "租车订单"};
} else if(cc.bookType == 9){
this.zhanlan = true;
this.currentItem = {item: item, ii: ii,title: "客户用车",upkeepName:'客户用车'};
} else if(cc.bookType == 5) {
//房车游订单详情
this.tourRow = {no: cc.vehicleBookRecord.orderNo};
......@@ -271,7 +286,10 @@
//禁用
this.jinyong = true;
this.currentItem = {item: item, iitem: iitem, ii: ii, title: "禁用"};
}
} else if(cc.bookType == 10){
this.zhanlan = true;
this.currentItem = {item: item, ii: ii,title: "其他",upkeepName:'其他'};
}
},
/**
* 根据订单号获取订单详情
......
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