Skip to content

S
SuperMan
Commit 183fc7bc authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent 45b40909
Show whitespace changes
Inline Side-by-side
Showing with 356 additions and 230 deletions
src/components/SalesModule/passengerSaleList.vue
View file @ 183fc7bc
<template>
<!-- border-top: 1px solid #cccccc;margin-top: 5px -->
<!-- border-top: 1px solid #cccccc;margin-top: 5px -->
<div class="passengerSaleList">
<div v-if="OrderBackScenicList!=null&&OrderBackScenicList.length>0 " style="width: 70%;font-size:14px;float:left;margin-bottom: 10px;">
<el-collapse accordion v-model="activeName">
<el-collapse-item name="1">
<template slot="title" > &nbsp;&nbsp;{{$t('ground.tuiJingdian')}}<i class="header-icon el-icon-info"></i> </template>
<div style="margin:0px 10px;">
<span v-for="(childItem,subIndex) in OrderBackScenicList" >
<font style="color:green;">{{subIndex+1}}、{{ childItem.CouponsName }}</font>退票<font style="color:red;">{{childItem.Number}}</font>人：<font style="color: blue">{{childItem.GuestBackScenicName}}</font>
&nbsp;&nbsp; &nbsp;&nbsp;
</span></div>
</el-collapse-item>
</el-collapse >
</div>
<div class="passengerSaleList_topBtn" style="width: 30%;float:right;margin-bottom: 10px;">
<template v-if="isOrder==0">
<span style="color:red;">{{$t('objFill.opygbddcz')}}</span>
......@@ -28,9 +14,18 @@
<div v-if="isOrder==1 && isOneDay !== 1 && !isDis" @click="goUrlP()">{{$t('op.Fenfang')}}</div>
</div>
<div class="passengerSaleList_tableBox">
<table class="passengerSaleList_table" border="0" cellspacing="0" cellpadding="0" :loading="loading">
<thead>
<tr v-if="OrderBackScenicList!=null&&OrderBackScenicList.length>0 ">
<th colspan="19" style="text-align:left;padding:5px;">
<span v-for="(childItem,subIndex) in OrderBackScenicList">
<font style="color:green;">{{subIndex+1}}、{{ childItem.CouponsName }}</font>退<font style="color:red;">
{{childItem.Number}}</font>人：<font style="color: blue">{{childItem.GuestBackScenicName}}</font>
&nbsp;&nbsp; &nbsp;&nbsp;
</span>
</th>
</tr>
<tr>
<th width="2%">ID</th>
<th width="2%">{{$t('op.Fenfang')}}</th>
......@@ -91,8 +86,8 @@
<el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3'
icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
</el-tooltip>
<el-tooltip v-if="OrderBackScenicList!=null&&OrderBackScenicList.length>0 " class="item" effect="dark" :content="$t('ground.tuiJingdian')"
placement="top-start">
<el-tooltip v-if="OrderBackScenicList!=null&&OrderBackScenicList.length>0 " class="item" effect="dark"
:content="$t('ground.tuiJingdian')" placement="top-start">
<el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3'
icon="iconfont el-icon-notebook-2" @click="updateGuestBackScenic(item)"></el-button>
</el-tooltip>
......@@ -179,14 +174,12 @@
</div>
</div>
<el-dialog custom-class="w450" :title="$t('sm.exitsure')" :visible.sync="isShowOpSure" center style="padding:25px 25px 55px;">
<el-dialog custom-class="w450" :title="$t('sm.exitsure')" :visible.sync="isShowOpSure" center
style="padding:25px 25px 55px;">
<el-form label-width="110px">
<el-form-item :label="$t('ground.tuiJingdian')">
<el-select v-model="UpdateGuestBackScenic.CouponsIds" multiple collapse-tags placeholder="请选择">
<el-option
v-for="item in OrderBackScenicList"
:key="item.CouponsId"
:label="item.CouponsName"
<el-option v-for="item in OrderBackScenicList" :key="item.CouponsId" :label="item.CouponsName"
:value="item.CouponsId">
</el-option>
</el-select>
......@@ -209,9 +202,12 @@
data() {
return {
loading: false,
isShowOpSure:false,
activeName:"1",
UpdateGuestBackScenic:{Id:0,CouponsIds:[]},
isShowOpSure: false,
activeName: "1",
UpdateGuestBackScenic: {
Id: 0,
CouponsIds: []
},
msg: {
id: '0',
tcid: '0',
......@@ -225,7 +221,7 @@
guestNum: 0,
isOrder: 0,
tableList: [],
OrderBackScenicList:[],
OrderBackScenicList: [],
isOneDay: 0,
LineId: 0,
EndDateStr: "",
......@@ -267,7 +263,7 @@
};
},
methods: {
opSureAudit(){
opSureAudit() {
this.isSubmit = false;
this.apipost(
"sellorder_post_UpdateGuestBackScenic",
......@@ -286,15 +282,15 @@
(err) => {}
);
},
updateGuestBackScenic(item){
this.UpdateGuestBackScenic.CouponsIds=item.CouponsIds;
this.UpdateGuestBackScenic.Id=item.Id;
this.isShowOpSure=true;
updateGuestBackScenic(item) {
this.UpdateGuestBackScenic.CouponsIds = item.CouponsIds;
this.UpdateGuestBackScenic.Id = item.Id;
this.isShowOpSure = true;
},
GBGuestBackScenic(){
GBGuestBackScenic() {
this.isShowOpSure = false;
this.UpdateGuestBackScenic.Id=0;
this.UpdateGuestBackScenic.CouponsIds=[];
this.UpdateGuestBackScenic.Id = 0;
this.UpdateGuestBackScenic.CouponsIds = [];
},
//确定设置领队
setTheLeader() {
......@@ -385,7 +381,7 @@
if (res.data.resultCode == 1) {
this.guestNum = res.data.data.GuestNum;
this.tableList = res.data.data.list;
this.OrderBackScenicList=res.data.data.OrderBackScenicList;
this.OrderBackScenicList = res.data.data.OrderBackScenicList;
this.isOneDay = res.data.data.IsOneDay;
this.LineId = res.data.data.LineId;
this.EndDateStr = res.data.data.EndDateStr;
......
src/components/activity/autorelease.vue
View file @ 183fc7bc
......@@ -9,30 +9,17 @@
</ul>
</div>
<div class="_fnDm_content" v-loading='loading' style="padding-top: 20px;">
<el-table
:data="tableData"
style="width: 100%;"
border
v-loading="loading"
>
<el-table :data="tableData" style="width: 100%;" border v-loading="loading">
<el-table-column
prop="ID"
label="ID" width="100">
<el-table-column prop="ID" label="ID" width="100">
</el-table-column>
 
<el-table-column
prop="TriggerTypeStr"
label="触发事件">
<el-table-column prop="TriggerTypeStr" label="触发事件">
</el-table-column>
<el-table-column
prop="DiscountCouponName"
label="优惠券">
<el-table-column prop="DiscountCouponName" label="优惠券">
</el-table-column>
<el-table-column
prop="GrantNum"
:label="$t('objFill.v102.fafangcishu')">
<el-table-column prop="GrantNum" :label="$t('objFill.v102.fafangcishu')">
<template slot-scope="scope">
<div v-if="scope.row.GrantNum==0">
无限制
......@@ -43,13 +30,9 @@
</template>
</el-table-column>
<el-table-column
prop="GrantCouponNum"
:label="$t('objFill.v102.fafangzhangshu')">
<el-table-column prop="GrantCouponNum" :label="$t('objFill.v102.fafangzhangshu')">
</el-table-column>
<el-table-column
prop="GrantNum"
:label="$t('objFill.v102.fafangkeix')">
<el-table-column prop="GrantNum" :label="$t('objFill.v102.fafangkeix')">
<template slot-scope="scope">
<div v-if="scope.row.SelfMotionType==0">
{{$t('Operation.Op_fellow')}}
......@@ -59,64 +42,57 @@
</div>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作" width="100"
>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img src="../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top" >
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img src="../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">
</el-tooltip>
</template>
</el-table-column>
</el-table>
</div>
<el-pagination style="text-align:right"
background
@current-change="handleCurrentChange"
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="count">
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
layout="prev, pager, next" :total="count">
</el-pagination>
<addAutorelease v-if="addAutoreleaseShow"
:infoData="infoData"
@Success="infoData=null,addAutoreleaseShow=false,getDateList()"
@close="infoData=null,addAutoreleaseShow=false"/>
<addAutorelease v-if="addAutoreleaseShow" :infoData="infoData"
@Success="infoData=null,addAutoreleaseShow=false,getDateList()" @close="infoData=null,addAutoreleaseShow=false" />
</div>
</template>
</template>
<script>
<script>
import addAutorelease from "./components/addAutorelease";
export default {
name: "autorelease",
components: {addAutorelease},
data(){
return{
msg:{
pageIndex:1,
pageSize:20,
components: {
addAutorelease
},
data() {
return {
msg: {
pageIndex: 1,
pageSize: 20,
BranchId: -1,
TriggerType: -1
},
tableData:[],
count:0,
loading:false,
tableData: [],
count: 0,
loading: false,
addAutoreleaseShow: false,
infoData: null,
options: [],
}
},
created(){
created() {
this.getDateList();
},
methods:{
getrigger(){
this.apipost("coupon_post_GetTriggerTypeEnumList",{}, res => {
methods: {
getrigger() {
this.apipost("coupon_post_GetTriggerTypeEnumList", {}, res => {
if (res.data.resultCode == 1) {
this.options = res.data.data;
this.options.unshift({
......@@ -129,32 +105,33 @@
})
},
getDateList(){
this.loading=true;
getDateList() {
this.loading = true;
this.apipost("coupon_post_GetSelfMotionPageLis", this.msg, res => {
this.loading=false;
if(res.data.resultCode==1){
this.loading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data.pageData;
this.count = res.data.data.count;
}else {
} else {
this.Info(res.data.message);
}
})
},
addRecharge(){
addRecharge() {
this.addAutoreleaseShow = true
},
Edit(row){
Edit(row) {
this.infoData = row
this.addAutoreleaseShow = true
},
delete_b(row){
let that=this;
delete_b(row) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost(
"coupon_post_DelDiscountSelfMotion",
{Id:row.ID},
"coupon_post_DelDiscountSelfMotion", {
Id: row.ID
},
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
......@@ -172,13 +149,15 @@
},
}
}
</script>
<style scoped>
</script>
<style scoped>
/deep/.el-table th.el-table__cell {
background-color: #E6E6E6;
}
.el-form-item{
margin-bottom:5px;
.el-form-item {
margin-bottom: 5px;
}
</style>
</style>
src/components/administrative/templateStatic.vue 0 → 100644
View file @ 183fc7bc
<template>
<div class="flexOne">
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<span><em>{{$t('sm.company')}}</em>
<el-select filterable @change='getUser' v-model='msg.RB_BranchId'>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select>
</span>
</li>
<li>
<span><em>上传人</em>
<el-select filterable v-model='msg.QCreateBy' clearable @clear="getList()">
<el-option v-for='item in userList' :label='item.name' :value='item.empId' :key='item.empId'></el-option>
</el-select>
</span>
</li>
<li><span><em>{{$t('salesModule.ApplyTime')}}</em>
<el-date-picker :picker-options="pickerOptions0" v-model='msg.QStartDate' class='w135'
value-format="yyyy-MM-dd" type="date">
</el-date-picker>
-
<el-date-picker :picker-options="pickerOptions1" v-model='msg.QEndDate' class='w135'
value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="normalBtn" value="下载" @click="downLoadTemplateStatic()" />
</li>
</ul>
</div>
<div style="width: 100%; overflow: auto;">
<el-table :data="tableData" style="width: 100%;" height="650" border v-loading="loading">
<el-table-column prop="CreateByName" label="上传人" width="200">
</el-table-column>
<el-table-column prop="CreateTime" label="上传时间">
</el-table-column>
<el-table-column prop="TripCount" label="行程模版数量">
</el-table-column>
<el-table-column prop="AdCount" label="广告模版数量">
</el-table-column>
<el-table-column prop="TotalCount" label="上传总数量">
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
export default {
data() {
return {
pickerOptions0: {
disabledDate: (time) => {
let endTime = new Date(this.msg.QEndDate)
return time.getTime() > Date.now() || time.getTime() > endTime.getTime()
}
},
pickerOptions1: {
disabledDate: (time) => {
let starTime = new Date(this.msg.QStartDate)
return time.getTime() > Date.now() || time.getTime() < starTime.getTime()
}
},
loading: true,
//请求数据
msg: {
RB_BranchId: '-1',
QCreateBy: '',
QStartDate: '',
QEndDate: '',
},
getCompanyMsg: {
RB_Group_Id: '0',
Status: '0',
},
getUserMsg: {
RB_Branch_id: '-1',
},
//返回数据
tableData: [],
companyList: [],
userList: [],
}
},
methods: {
//Excel下载
downLoadTemplateStatic() {
this.loading = true;
let fileName = "模板统计下载"+ this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("template_post_GetDownloadTemplateStatic", this.msg, fileName,
res => {
this.loading = false;
});
},
getCompany() {
this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
}
})
},
getUser() {
this.msg.QCreateBy = '';
this.getUserMsg.RB_Branch_id = this.msg.RB_BranchId;
this.apipost('app_get_company_employee', this.getUserMsg, res => {
if (res.data.resultCode == 1) {
this.userList = res.data.data;
}
})
},
getList() {
this.loading = true;
this.apipost('triptemplate_GetTemplateStatic', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data;
}
})
},
},
created() {
let myDate = new Date();
let _year = myDate.getFullYear();
let _month = myDate.getMonth() >= 9 ? myDate.getMonth() + 1 : '0' + (myDate.getMonth() + 1);
let _date = myDate.getDate() > 9 ? myDate.getDate() : '0' + myDate.getDate();
this.msg.QStartDate = _year + '-' + _month + '-' + '01';
this.msg.QEndDate = _year + '-' + _month + '-' + _date;
//this.msg.QStartDate = "2025-06-01";
},
mounted() {
let userInfo = this.getLocalStorage();
this.getUserMsg.RB_Group_id = this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.getCompany()
this.getUser()
this.getList()
}
}
</script>
src/router/config.js
View file @ 183fc7bc
......@@ -678,6 +678,14 @@ export default {
title: '审批统计'
},
},
{
path: '/templateStatic', //模板统计
name: 'templateStatic',
component: resolve => require(['@/components/administrative/templateStatic'], resolve),
meta: {
title: '模板统计'
},
},
{
path: '/LianMengManagement', //联盟管理
name: 'LianMengManagement',
......
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