Skip to content

S
SuperMan
Commit 69e450d9 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents b1de4e5e 1d474342
Hide whitespace changes
Inline Side-by-side
Showing with 1854 additions and 1294 deletions
src/components/EducationvideoList.vue
View file @ 69e450d9
<template>
<div class="EducationvideoList">
<!-- <div class="left">
......@@ -9,682 +8,718 @@
</ul>
</div> -->
<div class="right">
<div class="search">
<el-input size="small" style="width:600px" placeholder="请输入内容" v-model="msg.Name" class="input-with-select">
<el-button @click="Search" slot="append" icon="el-icon-search"></el-button>
</el-input>
<el-button style="margin-left:20px" size="small" type="danger" @click="addList" round>新增</el-button>
<!-- <el-button style="margin-left:20px" size="small" type="primary" @click="goUrlHome" round>返回</el-button> -->
</div>
<div v-loading="loading" class="Content">
<ul class="videoUl">
<li v-for="(item,index) in dataList" :key="index">
<div :style="{backgroundImage: 'url(' + item.background + ')', backgroundSize:'cover'}" @click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
<!-- <img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="min-height: 199px;width:100%" :src="item.Cover" alt="">
<div class="search">
<el-input size="small" style="width:600px" placeholder="请输入内容" v-model="msg.Name" class="input-with-select">
<el-button @click="Search" slot="append" icon="el-icon-search"></el-button>
</el-input>
<el-button style="margin-left:20px" size="small" type="danger" @click="addList" round>新增</el-button>
<!-- <el-button style="margin-left:20px" size="small" type="primary" @click="goUrlHome" round>返回</el-button> -->
</div>
<div v-loading="loading" class="Content">
<ul class="videoUl">
<li v-for="(item,index) in dataList" :key="index">
<div :style="{backgroundImage: 'url(' + item.background + ')', backgroundSize:'cover'}"
@click.prevent="goUrl('EducationvideoSee',item)" class="imgDiv">
<!-- <img v-if="item.Cover && item.Cover!=''" :onerror="defaultImg" style="min-height: 199px;width:100%" :src="item.Cover" alt="">
<img v-else style="height:199px;width:100%" src="../assets/img/hotel/biefu.png" alt=""> -->
<div class="backDiv">
<span class="iconfont icon-ico_bofang"></span>
<div class="icon">
<el-tooltip class="item" effect="dark" content="编辑" placement="left">
<div v-if="item.VideoStatus==2 || item.VideoStatus==3" class="iconDiv" @click.prevent="Edit(item,$event)">
<span class="iconfont icon-bianji-smal"></span>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="left">
<div class="iconDiv" v-if="item.VideoStatus==2 || item.VideoStatus==3" style="top:35px" @click.prevent="Delete(item,$event)">
<span class="iconfont icon-shanchu"></span>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="撤回" placement="left">
<div class="iconDiv" v-if="item.VideoStatus!=3" style="top:70px" @click.prevent="Chehui(item,$event)">
<span class="iconfont icon-chehui"></span>
</div>
</el-tooltip>
</div>
</div>
<div class="backDiv">
<span class="iconfont icon-ico_bofang"></span>
<div class="icon">
<el-tooltip class="item" effect="dark" content="编辑" placement="left">
<div v-if="item.VideoStatus==2 || item.VideoStatus==3" class="iconDiv"
@click.prevent="Edit(item,$event)">
<span class="iconfont icon-bianji-smal"></span>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="left">
<div class="iconDiv" v-if="item.VideoStatus==2 || item.VideoStatus==3" style="top:35px"
@click.prevent="Delete(item,$event)">
<span class="iconfont icon-shanchu"></span>
</div>
<div class="contentDiv">
<img v-if="item.EmPhoto && item.EmPhoto!=''" :src="item.EmPhoto" alt="">
<img v-else src="../assets/img/default.png" alt="">
<div class="DesDiv">
<el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start">
<p style="font-size:14px" class="bold text1">{{item.Name}}</p>
</el-tooltip>
<p class="wryh" style="color:#aaaaaa">{{item.EmName}}
<span class="bold" style="color:#f56c6c">(
<span v-if="item.VideoStatus==1">发布</span>
<span v-if="item.VideoStatus==2">草稿</span>
<span v-if="item.VideoStatus==3">撤回</span>
)
</span>
</p>
<p class="wryh" style="color:#aaaaaa">{{item.WatchNum}}次观看
<span stryle="margin-left:5px"> </span>
<span>{{item.UpdateDate}}</span>
</p>
</div>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="撤回" placement="left">
<div class="iconDiv" v-if="item.VideoStatus!=3" style="top:70px"
@click.prevent="Chehui(item,$event)">
<span class="iconfont icon-chehui"></span>
</div>
</li>
</ul>
<div v-if="dataList.length==0" style="text-align:center;padding-top:40px">
<span style="font-size:60px;color:#ccc" class="iconfont icon-wushuju"></span>
</el-tooltip>
</div>
</div>
</div>
<div class="contentDiv">
<img v-if="item.EmPhoto && item.EmPhoto!=''" :src="item.EmPhoto" alt="">
<img v-else src="../assets/img/default.png" alt="">
<div class="DesDiv">
<el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start">
<p style="font-size:14px" class="bold text1">{{item.Name}}</p>
</el-tooltip>
<p class="wryh" style="color:#aaaaaa">{{item.EmName}}
<span class="bold" style="color:#f56c6c">(
<span v-if="item.VideoStatus==1">发布</span>
<span v-if="item.VideoStatus==2">草稿</span>
<span v-if="item.VideoStatus==3">撤回</span>
)
</span>
</p>
<p class="wryh" style="color:#aaaaaa">{{item.WatchNum}}次观看
<span stryle="margin-left:5px"> </span>
<span>{{item.UpdateDate}}</span>
</p>
</div>
</div>
<!-- <el-pagination background @current-change="handleCurrentChange"
</li>
</ul>
<div v-if="dataList.length==0" style="text-align:center;padding-top:40px">
<span style="font-size:60px;color:#ccc" class="iconfont icon-wushuju"></span>
</div>
<!-- <el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination> -->
<div v-show="nodata && msg.pageIndex>1" class="wryh" style="text-align:center;padding:15px 0;font-size:12px;color:#aaaaaa">无更多数据</div>
<div style="opacity: 0;" ref="bottomDiv">1111</div>
</div>
<div v-show="nodata && msg.pageIndex>1" class="wryh"
style="text-align:center;padding:15px 0;font-size:12px;color:#aaaaaa">无更多数据</div>
<div style="opacity: 0;" ref="bottomDiv">1111</div>
</div>
</div>
<el-dialog
title="上传"
:visible.sync="dialogVisible"
width="800px">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-dialog title="上传" :visible.sync="dialogVisible" width="800px">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item style="display:inline-block;" label="标题" prop="Name">
<el-input style="width:220px" v-model="addMsg.Name"></el-input>
<el-input style="width:220px" v-model="addMsg.Name"></el-input>
</el-form-item>
<el-form-item style="display:inline-block" label="标签" prop="Label">
<!-- <el-input style="width:220px" v-model="addMsg.Label"></el-input> -->
<el-select style="width:220px" v-model="addMsg.Label" placeholder="请选择状态">
<el-option label="酒店" value="酒店"></el-option>
<el-option label="景点" value="景点"></el-option>
<el-option label="餐食" value="餐食"></el-option>
<el-option label="交通" value="交通"></el-option>
<el-option label="专辑" value="专辑"></el-option>
<el-option label="其他" value="其他"></el-option>
</el-select>
<el-form-item style="display:inline-block" label="标签" prop="Label">
<!-- <el-input style="width:220px" v-model="addMsg.Label"></el-input> -->
<el-select style="width:220px" v-model="addMsg.Label" placeholder="请选择状态">
<el-option label="酒店" value="酒店"></el-option>
<el-option label="景点" value="景点"></el-option>
<el-option label="餐食" value="餐食"></el-option>
<el-option label="交通" value="交通"></el-option>
<el-option label="专辑" value="专辑"></el-option>
<el-option label="其他" value="其他"></el-option>
</el-select>
</el-form-item>
<el-form-item style="display:inline-block" label="状态" prop="VideoStatus">
<el-select style="width:220px" v-model="addMsg.VideoStatus" placeholder="请选择状态">
<el-option label="发布" :value="1"></el-option>
<el-option label="草稿" :value="2"></el-option>
<el-option label="撤回" :value="3"></el-option>
</el-select>
<el-form-item style="display:inline-block" label="状态" prop="VideoStatus">
<el-select style="width:220px" v-model="addMsg.VideoStatus" placeholder="请选择状态">
<el-option label="发布" :value="1"></el-option>
<el-option label="草稿" :value="2"></el-option>
<el-option label="撤回" :value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item style="display:inline-block" label="线路" prop="LineId">
<el-select style="width:220px" v-model="addMsg.LineId" placeholder="请选择线路">
<el-option v-for="(item,index) in LineList" :key="index" :label="item.LineName" :value="item.LineID"></el-option>
</el-select>
<el-form-item style="display:inline-block" label="线路" prop="LineId">
<el-select style="width:220px" v-model="addMsg.LineId" placeholder="请选择线路">
<el-option v-for="(item,index) in LineList" :key="index" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="视频地址" style="margin-bottom:0px;display:inline-block;">
<div v-if="addMsg.VideoAddress!=''" class="shipinDiv deleteDiv" style="position:relative">
<span class="iconfont icon-shipin"></span>
<div class="iconfontDiv">
<span @click="DeleteSrc(2)" class="iconfont icon-bumenguanli-shanchu"></span>
</div>
<div v-if="addMsg.VideoAddress!=''" class="shipinDiv deleteDiv" style="position:relative">
<span class="iconfont icon-shipin"></span>
<div class="iconfontDiv">
<span @click="DeleteSrc(2)" class="iconfont icon-bumenguanli-shanchu"></span>
</div>
<el-upload v-else style="display:inline-block;" class="EducationvideoListupload"
drag
:http-request="uploadFileBtn"
:multiple="false" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
<p style="font-size:12px;color:#e95252" v-show="scLoad">
<span v-loading="scLoad" style="display:inline-block;width:50px;height:50px"></span>
<span style="position: relative;top: -23px;">上传中，请稍后...</span>
</p>
</div>
<el-upload v-else style="display:inline-block;" class="EducationvideoListupload" drag
:http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
<p style="font-size:12px;color:#e95252" v-show="scLoad">
<span v-loading="scLoad" style="display:inline-block;width:50px;height:50px"></span>
<span style="position: relative;top: -23px;">上传中，请稍后...</span>
</p>
</el-form-item>
</el-form>
<div style="text-align:right;margin-bottom:10px">
</el-form>
<div style="text-align:right;margin-bottom:10px">
<el-button style="font-size:12px" size="samll" @click="dialogVisible = false">取 消</el-button>
<el-button style="font-size:12px" size="samll" type="danger" @click="submitForm('addMsg')">确 定</el-button>
</div>
</div>
</el-dialog>
<div class="videoDiv" v-show="videoDivState">
<div style="text-align:right;padding-right:15px;cursor:pointer"><span @click="Setvideo" style="font-size:30px;color:#fff" class="iconfont icon-bumenguanli-shanchu"></span></div>
<video ref="myVideo" autoplay="autoplay" width="100%" height="90%" :src="thisVideoAddress" controls="controls"></video>
<div class="videoDiv" v-show="videoDivState">
<div style="text-align:right;padding-right:15px;cursor:pointer"><span @click="Setvideo"
style="font-size:30px;color:#fff" class="iconfont icon-bumenguanli-shanchu"></span></div>
<video ref="myVideo" autoplay="autoplay" width="100%" height="90%" :src="thisVideoAddress"
controls="controls"></video>
</div>
</div>
</template>
<script>
export default {
name: 'Educationvideo',
export default {
name: 'Educationvideo',
created() {
created() {
let userInfo = this.getLocalStorage()
this.msg.CreateBy=userInfo.EmployeeId
},
data () {
return {
scLoad:false,
videoDivState:false,
thisVideoAddress:'',
this.msg.CreateBy = userInfo.EmployeeId
},
data() {
return {
scLoad: false,
videoDivState: false,
thisVideoAddress: '',
defaultImg: 'this.src="' + require("../assets/img/bg_z1@2x.png") + '"',
val:'',
LineList:[],
dialogVisible:false,
dataList:[],
msg:{
pageIndex:1,
pageSize:20,
Name:'',
UserType:1,
VideoStatus:'',
CreateBy:'',
LineId:-1,
val: '',
LineList: [],
dialogVisible: false,
dataList: [],
msg: {
pageIndex: 1,
pageSize: 20,
Name: '',
UserType: 1,
VideoStatus: '',
CreateBy: '',
LineId: -1,
},
addMsg:{
Id:0,
Name:'',
Cover:'',
VideoAddress:'',
Label:'',
VideoStatus:1,
LineId:'',
UserType:1,
addMsg: {
Id: 0,
Name: '',
Cover: '',
VideoAddress: '',
Label: '',
VideoStatus: 1,
LineId: '',
UserType: 1,
},
total:0,
total: 0,
rules: {
Name: [
{ required: true, message: '请输入标题', trigger: 'blur' },
],
Label: [
{ required: true, message: '请选择标签', trigger: 'change' }
],
VideoStatus: [
{ required: true, message: '请选择状态', trigger: 'change' }
],
LineId: [
{ required: true, message: '请选择线路', trigger: 'change' }
],
},
loading:false,
baseurl:'http://vt-im-bucket.oss-cn-chengdu.aliyuncs.com',
windowHeight:0,
nodata:false,
}
},
mounted() {
this.getLineList();
this.getList();
this.$nextTick(()=>{
window.addEventListener('scroll',this.ScrollTop)
})
let h = document.documentElement.clientHeight || document.body.clientHeight;
this.windowHeight=h;
},
destroyed(){
window.removeEventListener('scroll',this.ScrollTop)
},
methods: {
Search(){
this.msg.pageIndex=1;
this.nodata=false;
this.dataList=[];
this.getList();
Name: [{
required: true,
message: '请输入标题',
trigger: 'blur'
}, ],
Label: [{
required: true,
message: '请选择标签',
trigger: 'change'
}],
VideoStatus: [{
required: true,
message: '请选择状态',
trigger: 'change'
}],
LineId: [{
required: true,
message: '请选择线路',
trigger: 'change'
}],
},
loading: false,
baseurl: 'http://vt-im-bucket.oss-cn-chengdu.aliyuncs.com',
windowHeight: 0,
nodata: false,
}
},
mounted() {
this.getLineList();
this.getList();
this.$nextTick(() => {
window.addEventListener('scroll', this.ScrollTop)
})
let h = document.documentElement.clientHeight || document.body.clientHeight;
this.windowHeight = h;
},
destroyed() {
window.removeEventListener('scroll', this.ScrollTop)
},
methods: {
Search() {
this.msg.pageIndex = 1;
this.nodata = false;
this.dataList = [];
this.getList();
},
Setvideo(){
this.videoDivState=false;
let myVideo=this.$refs.myVideo;
Setvideo() {
this.videoDivState = false;
let myVideo = this.$refs.myVideo;
myVideo.pause();
},
ScrollTop(){
ScrollTop() {
var that = this;
if(that.$refs.bottomDiv.getBoundingClientRect()){
if (that.$refs.bottomDiv.getBoundingClientRect()) {
var bottomDiv = that.$refs.bottomDiv.getBoundingClientRect().top;
if(this.windowHeight-50 < bottomDiv){
this.handleCurrentChange();
if (this.windowHeight - 50 < bottomDiv) {
this.handleCurrentChange();
}
}
},
DeleteSrc(num){
if(num==1){
this.addMsg.Cover='';
}else{
this.addMsg.VideoAddress='';
}
},
addList(){
this.dialogVisible=true;
this.addMsg={
Id:0,
Name:'',
Cover:'',
VideoAddress:'',
Label:'',
VideoStatus:1,
LineId:'',
UserType:1,
}
},
// uploadFileBtn1(file) {
// let typeArr=[
// {stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
// ]
// let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
// let typeOk = false;
// typeArr.forEach(x => {
// if (x.stringArr.indexOf(ft) != "-1") {
// typeOk = true;
// }
// });
// if (!typeOk) return this.$message.error(this.$t('tips.qsctpian'));
// let newArr = [];
// newArr.push(file.file);
// let path = "/Sale/Uploadvideo/";
// this.uploadFile(path, newArr, x => {
// this.addMsg.Cover=x.res.requestUrls[0];
// });
// },
uploadFileBtn(file) {
if (['video/mp4', 'video/ogg','video/webm','video/avi', 'video/wmv', 'video/rmvb', 'video/mov'].indexOf(file.file.type) == -1) {
this.Error("请上传正确的视频格式");
return;
}
let newArr = [];
newArr.push(file.file);
let path = "/Sale/Uploadvideo/";
this.scLoad=true;
this.uploadFile(path, newArr, x => {
this.scLoad=false;
this.addMsg.VideoAddress=this.baseurl+x.name;
let lastUrl="?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
this.addMsg.Cover=this.addMsg.VideoAddress+lastUrl;
});
},
handleCurrentChange() {
this.msg.pageIndex = this.msg.pageIndex +1;
this.getList();
},
DeleteSrc(num) {
if (num == 1) {
this.addMsg.Cover = '';
} else {
this.addMsg.VideoAddress = '';
}
},
addList() {
this.dialogVisible = true;
this.addMsg = {
Id: 0,
Name: '',
Cover: '',
VideoAddress: '',
Label: '',
VideoStatus: 1,
LineId: '',
UserType: 1,
}
},
uploadFileBtn(file) {
if (['video/mp4', 'video/ogg', 'video/webm', 'video/avi', 'video/wmv', 'video/rmvb', 'video/mov'].indexOf(file
.file.type) == -1) {
this.Error("请上传正确的视频格式");
return;
}
let newArr = [];
newArr.push(file.file);
let path = "/Sale/Uploadvideo/";
this.scLoad = true;
this.uploadFile(path, newArr, x => {
this.scLoad = false;
this.addMsg.VideoAddress = this.baseurl + x.name;
let lastUrl = "?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
this.addMsg.Cover = this.addMsg.VideoAddress + lastUrl;
});
},
handleCurrentChange() {
this.msg.pageIndex = this.msg.pageIndex + 1;
this.getList();
},
//获取列表
getList() {
if(this.nodata){
return;
}
this.loading=true;
this.apipost(
"Video_get_GetPCVideoPageList",this.msg,
res => {
this.loading=false;
if (res.data.resultCode == 1) {
let data= res.data.data.pageData;
if(data.length==0 && this.msg.pageIndex>1){
this.nodata=true;
}
else{
data.forEach(item=>{
let lastUrl="?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
item.background=item.VideoAddress+lastUrl;
})
this.dataList = this.dataList.concat(data)
}
}
}
);
},
Chehui(item,e){
e.stopPropagation()
this.$confirm("是否撤回?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('Video_post_CancelVidelInfo', {VideoId:item.Id}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.dataList=[];
this.msg.pageIndex=1;
this.nodata=false;
this.getList()
}else{
this.Error(res.data.message)
}
})
})
.catch(() => {});
},
Delete(item,e){
e.stopPropagation()
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('Video_post_DelVidelInfo', {VideoId:item.Id}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.dataList=[];
this.msg.pageIndex=1;
this.nodata=false;
this.getList()
}else{
this.Error(res.data.message)
}
})
getList() {
if (this.nodata) {
return;
}
this.loading = true;
this.apipost(
"Video_get_GetPCVideoPageList", this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;
if (data.length == 0 && this.msg.pageIndex > 1) {
this.nodata = true;
} else {
data.forEach(item => {
let lastUrl = "?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
item.background = item.VideoAddress + lastUrl;
})
.catch(() => {});
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if(this.scLoad){
this.Error("上传中，请稍候...")
return;
}
let Label=this.addMsg.Label;
if (['酒店','景点','餐食','交通','专辑','其他'].indexOf(Label) == -1) {
this.Error("请选择正确的标签！");
return;
}
if(this.addMsg.VideoAddress==''){
this.Error("请上传视频！");
return;
}
this.apipost('Video_post_SetPCVideoInfo', this.addMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.dialogVisible=false;
this.dataList=[];
this.msg.pageIndex=1;
this.nodata=false;
this.getList()
}else{
this.Error(res.data.message)
}
})
} else {
this.dataList = this.dataList.concat(data)
}
}
});
},
Edit(item,e){
e.stopPropagation()
this.addMsg.Cover=item.Cover;
this.addMsg.Id=item.Id;
this.addMsg.LineId=item.LineId;
this.addMsg.Name=item.Name;
this.addMsg.VideoAddress=item.VideoAddress;
this.addMsg.VideoStatus=item.VideoStatus;
this.addMsg.Label=item.Label;
this.dialogVisible=true;
},
goUrlHome(){
this.$router.push({
name:'Educationvideo',
query: {
blank: "y"
}
});
},
goUrl(path,item){
let that=this;
this.videoDivState=true;
this.thisVideoAddress=item.VideoAddress;
this.AddList(item.Id)
let myVideo=this.$refs.myVideo;
myVideo.play();
if(!item.VideoWH || item.VideoWH==''){
myVideo.addEventListener('canplay', function () {
let VideoWH=this.videoWidth+','+this.videoHeight;
that.AddWidthHeight(VideoWH,item.Id)
});
}
);
},
Chehui(item, e) {
e.stopPropagation()
this.$confirm("是否撤回?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('Video_post_CancelVidelInfo', {
VideoId: item.Id
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.dataList = [];
this.msg.pageIndex = 1;
this.nodata = false;
this.getList()
} else {
this.Error(res.data.message)
}
})
})
.catch(() => {});
},
Delete(item, e) {
e.stopPropagation()
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('Video_post_DelVidelInfo', {
VideoId: item.Id
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.dataList = [];
this.msg.pageIndex = 1;
this.nodata = false;
this.getList()
} else {
this.Error(res.data.message)
}
})
})
.catch(() => {});
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.scLoad) {
this.Error("上传中，请稍候...")
return;
}
},
AddWidthHeight(VideoWH,id) {
let msg={
Id:id,
VideoWH:VideoWH
let Label = this.addMsg.Label;
if (['酒店', '景点', '餐食', '交通', '专辑', '其他'].indexOf(Label) == -1) {
this.Error("请选择正确的标签！");
return;
}
if (this.addMsg.VideoAddress == '') {
this.Error("请上传视频！");
return;
}
this.apipost(
"Video_set_SetPCVideoWHInfo",msg,
res => {
this.apipost('Video_post_SetPCVideoInfo', this.addMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.dialogVisible = false;
this.dataList = [];
this.msg.pageIndex = 1;
this.nodata = false;
this.getList()
} else {
this.Error(res.data.message)
if (res.data.resultCode == 1) {
}
})
} else {}
});
},
Edit(item, e) {
e.stopPropagation()
this.addMsg.Cover = item.Cover;
this.addMsg.Id = item.Id;
this.addMsg.LineId = item.LineId;
this.addMsg.Name = item.Name;
this.addMsg.VideoAddress = item.VideoAddress;
this.addMsg.VideoStatus = item.VideoStatus;
this.addMsg.Label = item.Label;
}
}
);
},
AddList(id) {
this.apipost(
"Video_post_SetVideoWatch",{VideoId:id},
res => {
this.dialogVisible = true;
},
goUrlHome() {
this.$router.push({
name: 'Educationvideo',
query: {
blank: "y"
}
});
},
goUrl(path, item) {
let that = this;
this.videoDivState = true;
this.thisVideoAddress = item.VideoAddress;
this.AddList(item.Id)
let myVideo = this.$refs.myVideo;
myVideo.play();
if (!item.VideoWH || item.VideoWH == '') {
myVideo.addEventListener('canplay', function () {
let VideoWH = this.videoWidth + ',' + this.videoHeight;
that.AddWidthHeight(VideoWH, item.Id)
if (res.data.resultCode == 1) {
});
}
},
AddWidthHeight(VideoWH, id) {
let msg = {
Id: id,
VideoWH: VideoWH
}
this.apipost(
"Video_set_SetPCVideoWHInfo", msg,
res => {
if (res.data.resultCode == 1) {
}
}
}
);
},
//获取线路列表
getLineList() {
this.apipost(
"Video_get_GetPCVideoLineList", {},
res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
},
AddList(id) {
this.apipost(
"Video_post_SetVideoWatch", {
VideoId: id
},
res => {
if (res.data.resultCode == 1) {
}
);
},
}
);
},
//获取线路列表
getLineList() {
this.apipost(
"Video_get_GetPCVideoLineList", {},
res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
}
);
},
},
}
}
</script>
<style>
.EducationvideoList .el-loading-spinner .circular{
width:20px!important;
height:20px!important;
}
.EducationvideoList .el-loading-mask{
background-color: rgba(255,255,255,.1)!important;
}
.text1{
overflow: hidden;
.EducationvideoList .el-loading-spinner .circular {
width: 20px !important;
height: 20px !important;
}
.EducationvideoList .el-loading-mask {
background-color: rgba(255, 255, 255, .1) !important;
}
.text1 {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
height:20px;
}
.EducationvideoList .el-upload-dragger .el-upload__text{
height: 20px;
}
.EducationvideoList .el-upload-dragger .el-upload__text {
font-family: '微软雅黑';
font-size: 12px;
}
.EducationvideoList .el-form-item__label{
}
.EducationvideoList .el-form-item__label {
font-family: '微软雅黑';
font-size: 12px;
}
.wryh{
font-family: '微软雅黑'
}
.EducationvideoList .right .Content .videoUl li .backDiv{
display: flex;
align-items: center;
justify-content: center;
position: absolute;
width: 100%;
height: 100%;
background: rgba(0,0,0,0.3);
top: 0;
}
.EducationvideoList .right .Content .videoUl li .imgDiv .icon-ico_bofang{
position: absolute;
font-size: 36px;
color:#fff;
}
.videoDiv{
position: fixed;
top: 0;
width: 100%;
height: 100%;
z-index: 999999999;
background: #000;
}
.EducationvideoList .contentDiv img{
width:35px;height:35px;border-radius:50%;
position: absolute;
}
.EducationvideoList .contentDiv .DesDiv{
padding-left: 45px;
box-sizing: border-box;
width: 100%;
}
.EducationvideoList .contentDiv{
position: relative;
margin-top:5px;
}
.EducationvideoList .bold{
font-family: "pingfangR"
}
.EducationvideoList .el-pagination.is-background .el-pager li:not(.disabled).active{
background-color: #f56c6c!important;
}
.EducationvideoList .deleteDiv:hover .iconfontDiv{
}
.wryh {
font-family: '微软雅黑'
}
.EducationvideoList .right .Content .videoUl li .backDiv {
display: flex;
align-items: center;
justify-content: center;
position: absolute;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.3);
top: 0;
}
.EducationvideoList .right .Content .videoUl li .imgDiv .icon-ico_bofang {
position: absolute;
font-size: 36px;
color: #fff;
}
.videoDiv {
position: fixed;
top: 0;
width: 100%;
height: 100%;
z-index: 999999999;
background: #000;
}
.EducationvideoList .contentDiv img {
width: 35px;
height: 35px;
border-radius: 50%;
position: absolute;
}
.EducationvideoList .contentDiv .DesDiv {
padding-left: 45px;
box-sizing: border-box;
width: 100%;
}
.EducationvideoList .contentDiv {
position: relative;
margin-top: 5px;
}
.EducationvideoList .bold {
font-family: "pingfangR"
}
.EducationvideoList .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #f56c6c !important;
}
.EducationvideoList .deleteDiv:hover .iconfontDiv {
display: block;
}
.EducationvideoList .deleteDiv .iconfontDiv{
}
.EducationvideoList .deleteDiv .iconfontDiv {
position: absolute;
right: 0;
top: 0;
width:160px;height:120px;
background: rgba(0,0,0,0.5);
width: 160px;
height: 120px;
background: rgba(0, 0, 0, 0.5);
text-align: center;
padding-top: 42px;
display: none;
z-index:100;
}
.EducationvideoList .deleteDiv .iconfontDiv .icon-bumenguanli-shanchu{
color:#f56c6c;
z-index: 100;
}
.EducationvideoList .deleteDiv .iconfontDiv .icon-bumenguanli-shanchu {
color: #f56c6c;
font-size: 24px;
}
.EducationvideoList .shipinDiv .icon-shipin{
}
.EducationvideoList .shipinDiv .icon-shipin {
font-size: 95px;
position: relative;
top: -20px;
}
.EducationvideoList .shipinDiv{
}
.EducationvideoList .shipinDiv {
display: inline-flex;
align-items: center;
width:160px;height:160px;
width: 160px;
height: 160px;
justify-content: center;
position: relative;
}
.EducationvideoList .right .Content .circle{
}
.EducationvideoList .right .Content .circle {
display: inline-block;
width: 3px;
height:3px;
height: 3px;
background: #666666;
border-radius: 50%;
}
.EducationvideoListupload .el-upload .el-upload-dragger{
width: 160px!important;
height: 115px!important;
}
.EducationvideoList .right .Content .videoUl li .imgDiv:hover .icon{
}
.EducationvideoListupload .el-upload .el-upload-dragger {
width: 160px !important;
height: 115px !important;
}
.EducationvideoList .right .Content .videoUl li .imgDiv:hover .icon {
display: block;
}
.EducationvideoList .right .Content .videoUl li .imgDiv .icon{
}
.EducationvideoList .right .Content .videoUl li .imgDiv .icon {
position: absolute;
right: 3px;
top: 3px;
display: none;
}
.EducationvideoList .right .Content .videoUl li .imgDiv .iconDiv{
}
.EducationvideoList .right .Content .videoUl li .imgDiv .iconDiv {
padding: 2px 6px;
background: #000;
margin-top: 5px;
}
.EducationvideoList .right .Content .videoUl li .imgDiv .icon .iconfont{
color:#fff;
}
.EducationvideoList .right .Content .videoUl li .imgDiv{
}
.EducationvideoList .right .Content .videoUl li .imgDiv .icon .iconfont {
color: #fff;
}
.EducationvideoList .right .Content .videoUl li .imgDiv {
position: relative;
cursor: pointer;
height:199px;
overflow:hidden;
}
.EducationvideoList .right .Content .videoUl li p{
height: 199px;
overflow: hidden;
}
.EducationvideoList .right .Content .videoUl li p {
font-size: 12px;
padding-left:6px;
padding-left: 6px;
box-sizing: border-box;
}
.EducationvideoList .right .Content .videoUl li{
}
.EducationvideoList .right .Content .videoUl li {
display: inline-block;
width: 300px;
padding: 5px;
box-sizing: border-box;
margin-bottom:15px;
}
.EducationvideoList .right .Content{
padding:15px 15px 10px 15px;
box-sizing: border-box;
}
*{
margin:0;
margin-bottom: 15px;
}
.EducationvideoList .right .Content {
padding: 15px 15px 10px 15px;
box-sizing: border-box;
}
* {
margin: 0;
padding: 0;
}
.EducationvideoList .left .lineUl li:hover{
background: #f5f5f5;
}
.EducationvideoList .left .lineUl li{
padding:10px 35px;
}
.EducationvideoList .left .lineUl li:hover {
background: #f5f5f5;
}
.EducationvideoList .left .lineUl li {
padding: 10px 35px;
box-sizing: border-box;
font-size: 14px;
}
li{
}
li {
list-style: none;
}
.EducationvideoList .right .search{
padding: 15px 0;
padding-left: 50px;
box-sizing: border-box;
/* position: fixed; */
/* top: 50px; */
width: 100%;
background: #fff;
/* left: 240px; */
}
.EducationvideoList{
position: relative;
min-height: 100%;
background: #f5f5f5;
}
.EducationvideoList .left{
position: fixed;
min-height: 100%;
width: 240px;
z-index: 100;
background: #fff;
}
.EducationvideoList .right{
background: #f5f5f5;
/* padding-left: 250px; */
box-sizing: border-box;
min-height: 100%;
}
.EducationvideoList .right .search {
padding: 15px 0;
padding-left: 50px;
box-sizing: border-box;
/* position: fixed; */
/* top: 50px; */
width: 100%;
background: #fff;
/* left: 240px; */
}
.EducationvideoList {
position: relative;
min-height: 100%;
background: #f5f5f5;
}
.EducationvideoList .left {
position: fixed;
min-height: 100%;
width: 240px;
z-index: 100;
background: #fff;
}
.EducationvideoList .right {
background: #f5f5f5;
/* padding-left: 250px; */
box-sizing: border-box;
min-height: 100%;
}
</style>
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ 69e450d9
......@@ -518,6 +518,8 @@
export default {
data() {
return {
crmOrderObj:null,
InvoiceApplyType: 0,
detail: {},
orderList: {},
loading: true,
......@@ -652,13 +654,13 @@
blank: 'y',
tab: ''
}
if(this.$route.query.InvoiceApplyType){
if(this.$route.query.InvoiceApplyType == 1) query2.OrderType = 2 // 团队
if(this.$route.query.InvoiceApplyType == 2) query2.OrderType = 6 // 签证
if(this.$route.query.InvoiceApplyType == 4) query2.OrderType = 1 // 机票
if(this.$route.query.InvoiceApplyType == 5) query2.OrderType = 5 // 车
if(this.$route.query.InvoiceApplyType == 6) query2.OrderType = 3 // 酒店
if(this.$route.query.InvoiceApplyType == 7) query2.OrderType = 4 // 门票
if(this.InvoiceApplyType){
if(this.InvoiceApplyType == 1) query2.OrderType = 2 // 团队
if(this.InvoiceApplyType == 2) query2.OrderType = 6 // 签证
if(this.InvoiceApplyType == 4) query2.OrderType = 1 // 机票
if(this.InvoiceApplyType == 5) query2.OrderType = 5 // 车
if(this.InvoiceApplyType == 6) query2.OrderType = 3 // 酒店
if(this.InvoiceApplyType == 7) query2.OrderType = 4 // 门票
}else{
query2.OrderType = 2
}
......@@ -673,7 +675,7 @@
blank: 'y',
tab: '报名统计'
}
if(this.$route.query.InvoiceApplyType&&this.$route.query.InvoiceApplyType == 4){
if(this.InvoiceApplyType&&this.InvoiceApplyType == 4){
query.tab = '单机票详情'
this.$router.push({
name: 'CRMTicketOrderOP',
......@@ -697,7 +699,7 @@
})
},
goSaleFinacial: function () { // 跳转销售财务单据
if (this.$route.query.InvoiceApplyType && this.$route.query.InvoiceApplyType == 4) {
if (this.InvoiceApplyType && this.InvoiceApplyType == 4) {
this.$router.push({
name: 'CRMTicketOrderOP',
query: {
......@@ -750,7 +752,7 @@
}, null)
},
getDetail: function (id) { // 获取详情
let InvoiceApplyType = this.$route.query.InvoiceApplyType ? this.$route.query.InvoiceApplyType : 1
let InvoiceApplyType = this.InvoiceApplyType ? this.InvoiceApplyType : 1
this.apipost('InvoiceApply_get_GetDetails', {
ID: id,
InvoiceApplyType: InvoiceApplyType
......@@ -775,15 +777,15 @@
done();
},
getOrderDetail: function () { // 获取交易信息详情
// let OrderResource = this.$route.query.InvoiceApplyType ? 10 : 8
// let OrderResource = this.InvoiceApplyType ? 10 : 8
let OrderResource = 8 //团队订
if(this.$route.query.InvoiceApplyType){
if(this.$route.query.InvoiceApplyType == 1) OrderResource = 8 // 团队
if(this.$route.query.InvoiceApplyType == 2) OrderResource = 10 // 签证
if(this.$route.query.InvoiceApplyType == 4) OrderResource = 12 // 机票
if(this.$route.query.InvoiceApplyType == 5) OrderResource = 5 // 车
if(this.$route.query.InvoiceApplyType == 6) OrderResource = 1 // 酒店
if(this.$route.query.InvoiceApplyType == 7) OrderResource = 3 // 门票
if(this.InvoiceApplyType){
if(this.InvoiceApplyType == 1) OrderResource = 8 // 团队
if(this.InvoiceApplyType == 2) OrderResource = 10 // 签证
if(this.InvoiceApplyType == 4) OrderResource = 12 // 机票
if(this.InvoiceApplyType == 5) OrderResource = 5 // 车
if(this.InvoiceApplyType == 6) OrderResource = 1 // 酒店
if(this.InvoiceApplyType == 7) OrderResource = 3 // 门票
}
this.apipost(
'InvoiceApply_get_GetOrderFinanceList', {
......@@ -817,7 +819,18 @@
mounted() {
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
let id = this.$route.query.id
let id
if(this.$route.query.id){
id = this.$route.query.id
}
if(this.$route.query.InvoiceApplyType){
this.InvoiceApplyType = this.InvoiceApplyType
}
if(this.$route.query.crmOrderObj){
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.InvoiceApplyType = this.crmOrderObj.InvoiceApplyType
id = this.crmOrderObj.id
}
//是否显示审核按钮
this.noDetail = this.$route.query.noDetail ? true : false
this.msg.ID = id
......
src/components/Hotel/reservation/HotelOrderList.vue
View file @ 69e450d9
......@@ -340,7 +340,7 @@
DueInMoney:item.DueInMoney,
...item
}
item.list.push(datas)
item.list.push(JSON.parse(JSON.stringify(datas)))
})
this.total = res.data.data.count;
}else {
......
src/components/Hotel/reservation/correlationOP.vue
View file @ 69e450d9
......@@ -85,7 +85,7 @@
},
},
mounted() {
this.msg.OrderId = this.CorrelationObj.OrderId
this.msg.OrderId = this.CorrelationObj.OrderId?this.CorrelationObj.OrderId:0
this.msg.OpEmpId = this.CorrelationObj.OpEmpId?this.CorrelationObj.OpEmpId:null
if(this.CorrelationObj.TypeNum==4 || this.CorrelationObj.TypeNum==5 || this.CorrelationObj.TypeNum==6){
this.msg.Money = this.CorrelationObj.Money
......
src/components/administrative/model/ChangeThePriceMessage.vue
View file @ 69e450d9
......@@ -2,17 +2,18 @@
<el-dialog custom-class='PingFangSC' title="订单改价提醒"
:visible.sync="outerVisibleNot" center
:before-close="closeChangeMachie" width="1100px">
<div>
<div v-if="ChangeThePriceObj.ChangeThePriceData.length>0"
style="margin-bottom: 25px;">
<p style="color: red;font-size: 16px;">
提示：
改价提示：
<span>一共有 <span class="c059FF6 fz16"
style="padding: 0 10px;cursor: pointer;font-weight: bold;display: inline-block;"
@click="ckChangePrice">
{{ChangeThePriceData.length}}
@click="ckChangePrice({},1)">
{{msg.total2}}
</span>
条账未平数据，快去
<span class="c059FF6 fz16"
style="margin-left: 10px;margin-right: 10px;cursor: pointer;font-weight: bold;" @click="ckChangePrice">申请改价</span>
style="margin-left: 10px;margin-right: 10px;cursor: pointer;font-weight: bold;" @click="ckChangePrice({},1)">申请改价</span>
吧
</span>
</p>
......@@ -22,7 +23,7 @@
<el-table
border
ref="multipleTable"
:data="ChangeThePriceData"
:data="ChangeThePriceObj.ChangeThePriceData"
style="width: 100%"
:default-sort="{ prop: 'null', order: 'null' }"
:sort-by="[
......@@ -41,6 +42,7 @@
prop="CreateTimeStr"
label="订单Id"
show-overflow-tooltip
fixed="left"
>
<template slot-scope="scope">
<div>
......@@ -62,6 +64,7 @@
prop="CreateTimeStr"
label="团号"
show-overflow-tooltip
fixed="left"
>
<template slot-scope="scope">
<div>
......@@ -182,18 +185,26 @@
prop="ApplyForState"
label="改价状态"
show-overflow-tooltip
min-width="110"
>
<template slot-scope="scope">
<span
>{{
scope.row.ApplyForState == 1
? "待审核"
: scope.row.ApplyForState == 2
? "已通过"
: scope.row.ApplyForState == 3
? "已拒绝"
: ""
}}
>
<template v-if="scope.row.OrderChangePriceId==0">
待申请
</template>
<template v-if="scope.row.ApplyForState==1">
待主管审核
</template>
<template v-else-if="scope.row.ApplyForState==2">
主管审核通过
</template>
<template v-else-if="scope.row.ApplyForState==3">
审核通过
</template>
<template v-else-if="scope.row.ApplyForState==4">
拒绝
</template>
</span>
</template>
</el-table-column>
......@@ -204,7 +215,7 @@
<p
class="c059FF6 fz14"
style="cursor: pointer;font-weight: bold;"
@click="ckChangePrice(scope.row)"
@click="ckChangePrice(scope.row,1)"
>
申请改价
</p>
......@@ -212,6 +223,228 @@
</el-table-column>
</el-table>
</div>
<div v-if="ChangeThePriceObj.ExamineThePriceData.length>0">
<p style="color: red;font-size: 16px;">
审核提示：
<span>一共有 <span class="c059FF6 fz16"
style="padding: 0 10px;cursor: pointer;font-weight: bold;display: inline-block;"
@click="ckChangePrice({},2)">
{{msg.total}}
</span>
条改价申请待审核，快去
<span class="c059FF6 fz16"
style="margin-left: 10px;margin-right: 10px;cursor: pointer;font-weight: bold;" @click="ckChangePrice({},2)">审核</span>
吧
</span>
</p>
<p style="font-size: 18px;font-weight: bold;background: #d1d1d1;padding: 5px 10px;margin-top: 5px;">审核改价列表
</p>
<el-table
border
ref="multipleTable"
:data="ChangeThePriceObj.ExamineThePriceData"
style="width: 100%"
:default-sort="{ prop: 'null', order: 'null' }"
:sort-by="[
'Money',
'Income',
'PreferTipAmount',
'PlatformTax',
'Refund',
'CostMoney',
'OrderProfit',
'DueInMoney'
]"
>
<el-table-column
width="200"
prop="CreateTimeStr"
label="订单Id"
show-overflow-tooltip
fixed="left"
>
<template slot-scope="scope">
<div>
<p
class="cursor-pointer c059FF6 fz18 row-c"
@click="goDetails(scope.row)"
>
<el-tag style="margin-right: 5px;" size="mini">{{
scope.row.OrderTypeName
}}</el-tag>
<span>{{ scope.row.OrderId }}</span>
</p>
<p>{{ scope.row.CreateTimeStr }}</p>
</div>
</template>
</el-table-column>
<el-table-column
width="200"
prop="CreateTimeStr"
label="团号"
show-overflow-tooltip
fixed="left"
>
<template slot-scope="scope">
<div>
<p
class=" fz14"
:class="{ 'cursor-pointer c059FF6': scope.row.OrderType == 2 }"
@click="scope.row.OrderType == 2 ? goTuanDetails(scope.row) : ''"
>
{{ scope.row.TCNUM }}
</p>
<p>出发日期：{{ scope.row.StartDate }}</p>
<p v-if="scope.row.OrderType == 2 && scope.row.Status >= 0">
{{
scope.row.Status == 1
? "未结团"
: scope.row.Status == 2
? "已结团 "
: scope.row.Status == 5
? "待结团审核"
: ""
}}{{ scope.row.Status == 2 ? scope.row.OutGroupAuditDate : "" }}
</p>
</div>
</template>
</el-table-column>
<el-table-column label="客人" show-overflow-tooltip>
<template slot-scope="scope">
<span>
{{ scope.row.GuestName }}
</span>
</template>
</el-table-column>
<el-table-column prop="SaleName" label="销售"> </el-table-column>
<el-table-column prop="LureEmpName" label="引流"> </el-table-column>
<el-table-column label="商品名称" show-overflow-tooltip>
<template slot-scope="scope">
<div
style="max-width: 100px;overflow: hidden;text-overflow: ellipsis"
>
{{ scope.row.Name }}
</div>
</template>
</el-table-column>
<el-table-column label="商品详情" show-overflow-tooltip>
<template slot-scope="scope">
<div
style="max-width: 100px;overflow: hidden;text-overflow: ellipsis"
>
{{ scope.row.Description }}
</div>
</template>
</el-table-column>
<el-table-column
sortable
prop="Money"
label="总金额"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ scope.row.Money }}&ensp;({{ scope.row.CurrencyName }})
</template>
</el-table-column>
<el-table-column sortable prop="Income" label="实收"> </el-table-column>
<el-table-column
sortable
prop="PlatformTax"
label="手续费"
min-width="100"
>
</el-table-column>
<el-table-column sortable prop="Refund" label="退款"> </el-table-column>
<!-- <el-table-column sortable prop="CostMoney" label="成本" >
</el-table-column> -->
<el-table-column sortable prop="DueInMoney" label="待收">
<template slot-scope="scope">
<span :class="{ red: scope.row.DueInMoney > 0 }">{{
scope.row.DueInMoney
}}</span>
</template>
</el-table-column>
<el-table-column
sortable
prop="OrderProfit"
label="预期利润"
min-width="110"
>
<template slot-scope="scope">
<span :class="{ red: scope.row.OrderProfit > 0 }">{{
scope.row.OrderProfit
}}</span>
</template>
</el-table-column>
<el-table-column sortable prop="DiscountsMoney" label="优惠">
</el-table-column>
<el-table-column
prop="Money"
label="申请金额"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
<span> {{ scope.row.ApplyForMoney }}</span>
</template>
</el-table-column>
<el-table-column
prop="ApplyForReason"
label="申请理由"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ scope.row.ApplyForReason }}
</template>
</el-table-column>
<el-table-column
prop="ApplyForState"
label="改价状态"
show-overflow-tooltip
min-width="110"
>
<template slot-scope="scope">
<span
><template v-if="scope.row.ApplyForState==1">
待主管审核
</template>
<template v-else-if="scope.row.ApplyForState==2">
主管审核通过
</template>
<template v-else-if="scope.row.ApplyForState==3">
审核通过
</template>
<template v-else-if="scope.row.ApplyForState==4">
拒绝
</template>
</span>
</template>
</el-table-column>
<el-table-column label="操作"
show-overflow-tooltip
fixed="right">
<template slot-scope="scope">
<p
class="c059FF6 fz14"
style="cursor: pointer;font-weight: bold;"
@click="ckChangePrice(scope.row,2)"
>
审核
</p>
</template>
</el-table-column>
</el-table>
</div>
<!--
<el-pagination background
v-if="ChangeThePriceObj.ExamineThePriceData.length>0"
@current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total">
</el-pagination> -->
<!-- <div v-if="ChangeThePriceData.length==0" style="padding: 40px 0;text-align: center;">
暂无数据
</div> -->
......@@ -220,7 +453,7 @@
<script>
export default {
props:["ChangeThePriceData"],
props:["ChangeThePriceObj","msg"],
data() {
return {
outerVisibleNot: true
......@@ -233,7 +466,7 @@
goDetails(row){
},
ckChangePrice(row){
ckChangePrice(row,type){
this.closeChangeMachie()
let obj
if(row.OrderId){
......@@ -250,13 +483,16 @@
}
}
this.$router.push({
name: 'erpChangePricehOrder',
name: type==1?'erpChangePricehOrder':'erpExaminePricehOrder',
query: obj
});
},
closeChangeMachie(done) {
this.$emit('ChangeThePriceVisible')
},
handleCurrentChange(val) {
this.$emit('GetList',val)
},
}
}
</script>
src/components/index.vue
View file @ 69e450d9
......@@ -222,7 +222,8 @@
机票未绑团查看
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="GetChangeThePrice(1)">
<el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other"
@click.native="GetChangeThePrice(1),GetExaminePriceOrderPageList(1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
订单改价查看
<i class="iconfont icon-right1"></i>
......@@ -1177,7 +1178,7 @@
<div class="tsContent">
<div style="width:100%;height:372px;position:relative">
<p style="text-align:center;font-size:14px;z-index:100;">投诉案例</p>
<img @click="CloseTs" class="tsClose" style="width:11px;height:11px;pointer" src="../assets/img/tsclose.png"
<img @click="CloseTs" class="tsClose" style="width:11px;height:11px;cursor: pointer;" src="../assets/img/tsclose.png"
alt="">
<img class="tsbg" style="width:100%;height:100%" src="../assets/img/ts.png" alt="">
</div>
......@@ -1204,9 +1205,12 @@
<unbundlingMessage v-if="unbundlingVisible"
:UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage>
<!-- 改价提醒 -->
<ChangeThePriceMessage v-if="ChangeThePriceVisible" :ChangeThePriceData="ChangeThePriceData"
@ChangeThePriceVisible="ChangeThePriceVisible=false"></ChangeThePriceMessage>
<!-- 改价提醒/审核改价提醒 -->
<ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible"
:type="1"
:msg="ExamineThePriceMsg"
:ChangeThePriceObj="ChangeThePriceObj"
@ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
</div>
</template>
......@@ -1243,13 +1247,31 @@
commissionDetail,
Voting,
unbundlingMessage,
ChangeThePriceMessage
ChangeThePriceMessage,
},
data() {
return {
ExamineThePriceMsg:{
Q_IsCollect: '2',//收款状态
DepartSTime: '', //出发时间
DepartETime: '',
EnterId: 0,//销售
RB_Branch_Id: '-1',//公司
OrderId:"",
TicketStatus:"1",
OrderType:"0",
pageIndex:1,
pageSize:5,
total: 0,
total2: 0,
},
ExamineThePriceVisible: false,//审核改价提醒
ChangeThePriceList: [],
ChangeThePriceData:[],
ChangeThePriceVisible: false,//改价提醒
ChangeThePriceObj:{
ExamineThePriceData:[],
ChangeThePriceData:[],
},
UnboundDate: {},
unbundlingVisible: false,//未绑团提醒
b2bDomain: "",
......@@ -1874,7 +1896,7 @@
}
// 获取改价提醒 每月1到10号提示
// 获取改价及审核提醒 每月1到10号提示
let DateTime = new Date();
let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()+1
......@@ -1888,21 +1910,37 @@
return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
})
if(this.ChangeThePriceList.length>0){
if(!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
if((!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))){
this.GetChangeThePrice()
}
// 两小时请求一次改价提醒
if((!localStorage.getItem("ExamineThePriceDataTime")||
(localStorage.getItem("ExamineThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))))){
this.GetExaminePriceOrderPageList()
}
// 两小时请求一次改价、审核改价提醒
setInterval(()=>{
if(!this.ChangeThePriceVisible){
this.GetChangeThePrice()
}else{
clearInterval()
}
if(!this.ExamineThePriceVisible){
this.GetExaminePriceOrderPageList()
}else{
clearInterval()
}
},7200000)
}
},
created() {
let DateTime = new Date();
let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()
let Months = Month>9?Month:'0'+Month
let day = new Date(Year, Month, 0).getDate()
let DepartETime = Year+'-'+Months+'-'+day
this.ExamineThePriceMsg.DepartETime = DepartETime
if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
this.tsState = true;
}
......@@ -1935,17 +1973,34 @@
}
},
methods: {
GetExaminePriceOrderPageList(type){
this.apipost(
"CarSingle_post_GetExaminePriceOrderPageList",this.ExamineThePriceMsg,
res => {
if(res.data.resultCode==1){
if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){
if(!this.ExamineThePriceMsg.total) this.ExamineThePriceMsg.total = res.data.data.count
// localStorage.setItem("ExamineThePriceData", JSON.stringify(res.data.data.pageData));
localStorage.setItem("ExamineThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
this.ChangeThePriceObj.ExamineThePriceData = res.data.data.pageData
this.ExamineThePriceVisible = true
}else{
this.ExamineThePriceVisible = false
if(type==1){
// this.$message.info('暂无订单审核数据')
}
// localStorage.removeItem("ExamineThePriceData");
localStorage.removeItem("ExamineThePriceDataTime");
}
}
}
);
},
// 获取改价提醒的数据
GetChangeThePrice(type){
let DateTime = new Date();
let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()
let Months = Month>9?Month:'0'+Month
let day = new Date(Year, Month, 0).getDate()
let DepartETime = Year+'-'+Months+'-'+day
let msg = {
pageIndex:1,
pagesize:15,
pagesize:5,
OrderId:0,
GuestId:0,
EnterId:0,
......@@ -1954,7 +2009,7 @@
FinishsTime:"",
FinishETime:"",
DepartSTime:"",
DepartETime:DepartETime,
DepartETime: this.ExamineThePriceMsg.DepartETime,
TCNUM:"",
ProductName: "",
CustomerWame:"",
......@@ -1974,15 +2029,17 @@
res => {
if(res.data.resultCode==1){
if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){
localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData));
if(!this.ExamineThePriceMsg.total2) this.ExamineThePriceMsg.total2 = res.data.data.count
// localStorage.setItem("ChangeThePriceData", JSON.stringify(res.data.data.pageData));
localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
this.ChangeThePriceData = res.data.data.pageData
this.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData
this.ChangeThePriceVisible = true
}else{
this.ChangeThePriceVisible = false
if(type==1){
this.$message.info('暂无订单改价数据')
// this.$message.info('暂无订单改价数据')
}
localStorage.removeItem("ChangeThePriceData");
// localStorage.removeItem("ChangeThePriceData");
localStorage.removeItem("ChangeThePriceDataTime");
}
}
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ 69e450d9
......@@ -6,17 +6,6 @@
ref="multipleTable"
:data="[item]"
style="width: 100%"
:default-sort="{ prop: 'null', order: 'null' }"
:sort-by="[
'Money',
'Income',
'PreferTipAmount',
'PlatformTax',
'Refund',
'CostMoney',
'OrderProfit',
'DueInMoney'
]"
>
<el-table-column
width="130"
......@@ -198,7 +187,7 @@
审核通过
</template>
<template v-else-if="scope.row.ApplyForState==4">
拒绝
驳回
</template>
</span>
</template>
......@@ -243,14 +232,16 @@
>申请改价</el-button
>
<el-button
v-if="scope.row.ApplyForState<2&&scope.row.OrderChangePriceId>0"
v-if="((scope.row.ApplyForState==1&&scope.row.ManagerExamineBy>0)
||(scope.row.ApplyForState==2&&scope.row.ManagerExamineBy==0)||scope.row.ApplyForState==4)
&&scope.row.OrderChangePriceId>0"
size="mini"
type="primary"
@click="ckChangePrice(scope.row, 1)"
>修改改价</el-button
>
<p
v-if="scope.row.ApplyForState>1"
v-if="scope.row.ApplyForState!=2&&scope.row.ApplyForState!=4&&scope.row.ManagerExamineBy!=0"
class=" fz14"
:class="{ 'cursor-pointer c059FF6': scope.row.OrderType > 0 }"
@click="ckChangePrice(scope.row, 3)"
......@@ -295,13 +286,25 @@
}}</span>
</p>
</div>
<div style="margin-top: 10px;" v-if="item.ApplyForState==4">
<span v-if="item.ManagerRefuseReason" style="margin-right: 20px;">
主管审核意见：<span style="color: red;">{{item.ManagerRefuseReason}}</span>
</span>
<span v-if="item.RefuseReason">
总经理审核意见：<span style="color: red;">{{item.RefuseReason}}</span>
</span>
</div>
<div style="margin-top: 10px;" v-if="item.ApplyForState
||(item.ApplyForState==1&&item.ManagerExamineName)
||item.ApplyForState==2||item.ApplyForState==4
||(userInfo.EmployeeId==1&&item.ManagerExamineName)">
<template v-if="item.ApplyForState">
<span>
申请改价金额：<span style="color: red;">{{item.ApplyForMoney}}</span>
</span>
<span style="margin-left: 20px;">
申请时间：<span style="color: red;">{{item.ApplyCreateTimeStr}}</span>
</span>
<span style="margin-left: 20px;">
申请理由：<span style="color: red;">{{item.ApplyForReason}}</span>
</span>
......@@ -309,28 +312,37 @@
<span style="margin-left: 20px;" v-if="item.ApplyForState==1&&item.ManagerExamineName">
<span style="color: red;">待主管 {{item.ManagerExamineName}} 审核</span>
</span>
<span v-if="pagesTitle=='审核'" style="margin-left: 20px;">
改价状态：<span style="color: red;"
>
<template v-if="item.ApplyForState==1">
待主管审核
</template>
<template v-else-if="item.ApplyForState==2">
主管审核通过
</template>
<template v-else-if="item.ApplyForState==3">
审核通过
</template>
<template v-else-if="item.ApplyForState==4">
拒绝
<span style="margin-left: 20px;" v-if="pagesTitle=='申请'&&item.ApplyForState==2">
<span style="color: red;">待徐总审核</span>
</span>
<span v-if="item.ApplyForState==4" style="margin-left: 20px;">
审核状态：
<span style="color: red;">已驳回</span>
</span>
<template v-if="pagesTitle=='审核'">
<span style="margin-left: 20px;">
改价状态：<span style="color: red;"
>
<template v-if="item.ApplyForState==1">
待主管审核
</template>
<template v-else-if="item.ApplyForState==2">
主管审核通过
</template>
<template v-else-if="item.ApplyForState==3">
审核通过
</template>
<template v-else-if="item.ApplyForState==4">
驳回
</template>
</span>
</span>
<span v-if="userInfo.EmployeeId==1&&item.ManagerExamineName" style="margin-left: 20px;">
审核人：
<span v-if="item.ManagerExamineName" style="color: red;">{{item.ManagerExamineName }}</span>
<span v-if="item.ManagerExamineTimeStr">/ {{item.ManagerExamineTimeStr}}</span>
</span>
</template>
</span>
</span>
<span v-if="pagesTitle == '审核'&&userInfo.EmployeeId==1&&item.ManagerExamineName" style="margin-left: 20px;">
审核人：
<span v-if="item.ManagerExamineName" style="color: red;">{{item.ManagerExamineName }}</span>
<span v-if="item.ManagerExamineTimeStr">/ {{item.ManagerExamineTimeStr}}</span>
</span>
</div>
</div>
</template>
......@@ -392,7 +404,7 @@
>
{{ scope.row.TCNUM }}
</p>
<p>出发日期：{{ scope.row.StartDate }}</p>
<p v-if="scope.row.OrderType == 2">出发日期：{{ scope.row.StartDate }}</p>
<p v-if="scope.row.OrderType == 2 && scope.row.Status >= 0">
{{
scope.row.Status == 1
......@@ -535,7 +547,7 @@
审核通过
</template>
<template v-else-if="scope.row.ApplyForState==4">
拒绝
驳回
</template>
</span>
</template>
......@@ -619,6 +631,14 @@
方可帐平</span>
</span>
</div>
<div style="padding:0 0 10px 0;" v-if="changePriceObj.ApplyForState==4">
<span v-if="changePriceObj.ManagerRefuseReason" style="margin-right: 20px;">
主管审核意见：<span style="color: red;">{{changePriceObj.ManagerRefuseReason}}</span>
</span>
<span v-if="changePriceObj.RefuseReason">
总经理审核意见：<span style="color: red;">{{changePriceObj.RefuseReason}}</span>
</span>
</div>
<div slot="footer" class="dialog-footer"
style="float: right;margin-right: 5%;position: relative; z-index: 1;">
<button
......@@ -627,9 +647,11 @@
>
{{ $t("pub.cancelBtn") }}
</button>
<button class="normalBtn" type="primary" @click="setChangePrice">
<el-button
:loading="loading"
class="normalBtn" type="primary" @click="setChangePrice">
{{ $t("pub.sureBtn") }}
</button>
</el-button>
</div>
<el-form label-width="100px">
<el-row>
......@@ -668,11 +690,10 @@
class="dialog-footer"
style="float: right;margin-right: 5%;position: relative; z-index: 1;"
>
<button
<el-button
:loading="loading"
class="normalBtn"
v-if="titlePrice != '改价详情'"
:class="[
changePriceMsg.ApplyForState == 2||changePriceMsg.ApplyForState == 3 ? 'normalBtn' : 'hollowFixedBtn'
]"
type="primary"
@click="
changePriceMsg.DialogType == 1
......@@ -681,21 +702,20 @@
"
>
通过
</button>
<button
</el-button>
<el-button
:loading="loading"
class="normalBtn"
v-if="titlePrice != '改价详情'"
:class="[
changePriceMsg.ApplyForState == 4 ? 'normalBtn' : 'hollowFixedBtn'
]"
type="primary"
@click="
changePriceMsg.DialogType == 1
? ''
:setChangePrice('拒绝')
:setChangePrice('驳回')
"
>
拒绝
</button>
驳回
</el-button>
<button
class="hollowFixedBtn"
@click="changePriceMsg.outerVisible2 = false"
......@@ -744,7 +764,7 @@
:readonly="changePriceMsg.DialogType == 1 ? true : false"
>
<el-radio :label="2">通过</el-radio>
<el-radio :label="3">拒绝</el-radio>
<el-radio :label="3">驳回</el-radio>
</el-radio-group>
</el-form-item></el-col
>
......@@ -777,6 +797,7 @@ export default {
queryObj: null,
cdState: false,
copyId: 0,
loading: true,
loading0: false,
loading1: false,
loading2: false,
......@@ -942,14 +963,20 @@ export default {
},
OrderList: {
handler(val, oldVal) {
if(this.pagesTitle=='申请'&&this.msgObj.OrderId!=0&&this.$route.query.OrderId
if((this.pagesTitle=='申请'||this.pagesTitle=='审核')&&this.msgObj.OrderId!=0&&this.$route.query.OrderId
&&this.$route.query.OrderType
&&this.$route.query.DepartSTime
&&this.$route.query.DepartSTime
&&val&&val.length==1){
this.ckChangePrice(val[0])
if(this.pagesTitle=='审核'){
this.ckChangePrice(val[0],2)
}else{
this.ckChangePrice(val[0])
}
}
}
},
deep: true,
immediate: true
}
},
methods: {
......@@ -960,28 +987,45 @@ export default {
return Money
},
setChangePrice(type) {
let that = this
if(this.titlePrice == "申请改价"||this.titlePrice == "修改改价"){
this.changePriceMsg.ApplyForState=1
this.SetOrderChangePrice()
let text = ''
if(this.changePriceMsg.Money!=this.getChangePriceObj()){
text = `此单应收总金额应改为 ${this.getChangePriceObj()} 方可帐平，目前申请 ${this.changePriceMsg.Money} 确认提交吗？`
this.$confirm(`${text}`, '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
that.SetOrderChangePrice()
}).catch(() => {
});
}else{
that.SetOrderChangePrice()
}
}
if(this.titlePrice == "应收总金额改价审核"){
if(this.changePriceObj.ApplyForState==1){
if(type=='通过') this.changePriceMsg.ApplyForState = 2
if(type=='拒绝') this.changePriceMsg.ApplyForState = 4
if(type=='驳回') this.changePriceMsg.ApplyForState = 4
}
if(this.changePriceObj.ApplyForState==2){
if(type=='通过') this.changePriceMsg.ApplyForState = 3
if(type=='拒绝') this.changePriceMsg.ApplyForState = 4
if(type=='驳回') this.changePriceMsg.ApplyForState = 4
}
this.ExamineOrderChangePrice()
}
},
// 审核接口
ExamineOrderChangePrice(){
this.loading = true
this.apipost(
"CarSingle_post_ExamineOrderChangePrice",
this.changePriceMsg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
this.changePriceMsg.setPlatDialog = true;
this.changePriceMsg.outerVisible = false;
......@@ -992,14 +1036,16 @@ export default {
this.$message.info(res.data.message);
}
}
);
)
},
// 申请接口
SetOrderChangePrice(){
this.loading = true
this.apipost(
"CarSingle_post_SetOrderChangePrice",
this.changePriceMsg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
this.changePriceMsg.setPlatDialog = true;
this.changePriceMsg.outerVisible = false;
......@@ -1019,7 +1065,6 @@ export default {
if (type == 2) this.titlePrice = "应收总金额改价审核";
if (type == 3) this.titlePrice = "改价详情";
this.changePriceObj = item
console.log(this.changePriceObj.ApplyForState,'======')
this.changePriceMsg.ID = type ? item.OrderChangePriceId : 0;
this.changePriceMsg.OrderId = item.OrderId;
this.changePriceMsg.OrderType = item.OrderType;
......
src/components/myOrdersAllType/components/allList.vue
View file @ 69e450d9
......@@ -90,9 +90,9 @@
<li v-if="Title=='审核'">
<span>
<em>审核状态</em>
<el-select v-model='msg2.OrderState' class="w200" @change="msg2.papageIndex==1,GetList()">
<el-select v-model='msg2.TicketStatus' class="w200" @change="msg2.papageIndex==1,GetList()">
<!-- <el-option :value="0" label="不限"></el-option> -->
<el-option v-for='item in OrderStatusList'
<el-option v-for='item in TicketStatusList2'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
......@@ -128,7 +128,51 @@
<el-input clearable type="" v-model="msg.TCNUM" placeholder="请输入团号" class="w200"/>
</span>
</li>
<li v-if="Title!='销售'&&Title!='申请'&&Title!='审核'">
<template v-if="Title=='审核'">
<li>
<span>
<em>公司</em>
<el-select filterable v-model='msg2.RB_Branch_Id' class="w200">
<el-option value="-1" label="不限"></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='msg2.EnterId' class="w200">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>出发时间</em>
<el-date-picker
style="height: 34px;"
value-format="yyyy-MM-dd"
v-model="DatelistUse"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker>
</span>
</li>
</template>
<li v-if="Title=='OP'">
<span>
<em>业务员</em>
<el-select filterable v-model='msg.EnterId' class="w200" clearable>
......@@ -353,7 +397,7 @@
</el-pagination>
<el-pagination v-if="OrderList&&OrderList.length>0&&pagesTitle=='审核'" background
@current-change="handleCurrentChange2" :current-page.sync="currentPage2"
layout="total,prev, pager, next, jumper" :page-size="msg2.pagesize" :total=total2>
layout="total,prev, pager, next, jumper" :page-size="msg2.pageSize" :total=total2>
</el-pagination>
</div>
......@@ -365,14 +409,24 @@
components: { OrderList },
data() {
return {
companyList:[],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
total2:0,
currentPage2: 1,
msg2:{
Q_IsCollect: '2',//收款状态
DepartSTime: '', //出发时间
DepartETime: '',
EnterId: 0,//销售
RB_Branch_Id: '-1',//公司
OrderId: '',
OrderState: '1',
TicketStatus: '1',//审核状态
OrderType: '0',
papageIndex: 1,
pagesize: 15
pageIndex: 1,
pageSize: 15
},
CommissionTypeList:[
{Name: '不限',Id:'-1'},
......@@ -432,7 +486,7 @@
IsSelectCRM: 0,//1来源crm
IsMyOrder: 1,//1我的订单
CommissionType: '-1',//提成类型 1出境 2国内
TicketStatus: '1',
TicketStatus: '1',//申请状态
},
total: 0,
currentPage: 1,
......@@ -476,18 +530,20 @@
],
LineList: [],
SummaryList: [],
OrderStatusList: [
TicketStatusList2: [
{ Name: "不限", Id: "0" },
{ Name: "待审核", Id: "1" },
{ Name: "已通过", Id: "2" },
{ Name: "已取消", Id: "3" },
{ Name: "已驳回", Id: "3" },
],
TicketStatusList: [
{ Name: "不限", Id: "0" },
{ Name: "待申请", Id: "1" },
{ Name: "已申请", Id: "2" },
// { Name: "已驳回", Id: "3" },
],
changePriceOuterVisible: true
changePriceOuterVisible: true,
};
},
watch: {
......@@ -496,11 +552,15 @@
},
dataObj:{
handler(val, oldVal) {
this.msg.OrderType = val.tab
this.msg.OrderType = String(val.tab)
this.msg.OrderId = val.OrderId
this.msg2.OrderType = String(val.tab)
this.msg2.OrderId = val.OrderId
if(val.DepartSTime&&val.DepartSTime){
this.msg.DepartSTime = val.DepartSTime;
this.msg.DepartETime = val.DepartSTime;
this.msg2.DepartSTime = val.DepartSTime;
this.msg2.DepartETime = val.DepartSTime;
this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime]
}
this.GetList()
......@@ -511,8 +571,10 @@
methods: {
search(){
this.changePriceOuterVisible = false
if(this.dataObj&&this.dataObj.OrderId){
this.msg.OrderId=0
if(this.dataObj&&this.dataObj.OrderId&&this.dataObj.DepartSTime&&this.dataObj.DepartETime){
this.msg.OrderId = 0
this.msg2.OrderId = 0
this.msg2.OrderType = '0'
}
this.msg.pageIndex=1,
this.currentPage=1,
......@@ -520,6 +582,14 @@
this.currentPage2=1,
this.GetList()
},
// 公司
getCompany(){
this.apipost('admin_get_BranchGetList',{},res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
},
exportExcel() { //导出
if (!this.msg.StartTime || !this.msg.EndTime) {
this.$message.info('请选择开始时间、结束时间！')
......@@ -600,9 +670,13 @@
if(this.DatelistUse){
this.msg.DepartSTime = this.DatelistUse[0]
this.msg.DepartETime = this.DatelistUse[1]
this.msg2.DepartSTime = this.DatelistUse[0]
this.msg2.DepartETime = this.DatelistUse[1]
}if(!this.DatelistUse){
this.msg.DepartSTime = ''
this.msg.DepartETime = ''
this.msg2.DepartSTime = ''
this.msg2.DepartETime = ''
}
},
getDates(){
......@@ -657,6 +731,7 @@
}else if(this.pagesTitle=='申请'){
url = "CarSingle_post_GetChangePriceOrderPageList"
this.msg.IsMyOrder = '1'
this.msg.Q_IsCollect = '2'
}else if(this.pagesTitle=='审核'){
url = "CarSingle_post_GetExaminePriceOrderPageList"
} else{
......@@ -668,6 +743,7 @@
res => {
if (res.data.resultCode == 1) {
this.changePriceOuterVisible = true
// 数据统计
if(this.pagesTitle=='销售'||this.pagesTitle=='OP'){
this.getSummaryData()
}
......@@ -740,6 +816,8 @@
if(!this.$route.query.DepartSTime&&!this.$route.query.DepartSTime){
this.msg.DepartSTime = '2023-04-01';//[year,month,1].join('-')
this.msg.DepartETime = [year,month,monthLast].join('-');
this.msg2.DepartSTime = '2023-04-01';//[year,month,1].join('-')
this.msg2.DepartETime = [year,month,monthLast].join('-');
// this.msg.DepartSTime = this.getBeforeDate(200, new Date())
// this.msg.DepartETime = this.getBeforeDate(0, new Date())
}
......@@ -756,6 +834,8 @@
if(this.$route.query.DepartSTime){
this.msg.DepartSTime=this.$route.query.DepartSTime
this.msg.DepartETime=this.$route.query.DepartETime
this.msg2.DepartSTime=this.$route.query.DepartSTime
this.msg2.DepartETime=this.$route.query.DepartETime
this.msg.CommissionType = this.$route.query.CommissionType
this.msg.StartTime = ''
this.msg.EndTime = ''
......@@ -766,8 +846,11 @@
},
mounted() {
this.Title = this.pagesTitle
if(this.Title=='OP'){
if(this.Title=='OP'||this.Title=='审核'){
this.getEmployee()
if(this.Title=='审核'){
this.getCompany()
}
}
// this.GetOrderStatusEnumList()//订单状态
// this.GetTicketStatusEnumList()//出票状态
......
src/components/newTravelmanager/travelLineTrip/components/travelDays.vue
View file @ 69e450d9
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ 69e450d9
......@@ -448,7 +448,7 @@ export default {
let DaiShou
DaiShou = Number(item.Money-item.Income-item.PlatformTax-item.PlatformMoney+item.Refund)
item.DaiShou = DaiShou.toFixed(2)==='-0.00'?'0.00':DaiShou.toFixed(2)
item.list.push(datas)
item.list.push(JSON.parse(JSON.stringify(datas)))
})
this.total = res.data.data.count;
} else {
......
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