Skip to content

S
SuperMan
Commit 08a1060a authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 7fd2f0db
Show whitespace changes
Inline Side-by-side
Showing with 176 additions and 182 deletions
src/components/confirmationOrderDownLoadNew.vue
View file @ 08a1060a
......@@ -539,8 +539,14 @@
var title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
//欧洲
if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) {
title = this.orderMsg.startDate + this.dataAll.title;
title = this.orderMsg.startDate;
if (this.dataAll.title.length > 100) {
title += this.dataAll.title.substring(0, 100);
} else {
title += this.dataAll.title;
}
}
console.log("title", title);
var fileName = title + ".pdf";
if (this.orderId && this.orderId > 0) {
//出团通知书下载
......
src/components/index.vue
View file @ 08a1060a
......@@ -173,10 +173,8 @@
@click.native="goUrlT('FinancialDocuments',3,'财务单据')">
<i class="iconfont icon-nav-caiwu" style="color:#8e44ad"></i>
财务单
<el-badge v-if="NotDealCount8>0" class="mark" :value="NotDealCount8?NotDealCount8:0"
type="primary"
style="right: 65px;"
@click.native.stop="goUrlT('FinancialDocuments',8,'财务单据')"/>
<el-badge v-if="NotDealCount8>0" class="mark" :value="NotDealCount8?NotDealCount8:0" type="primary"
style="right: 65px;" @click.native.stop="goUrlT('FinancialDocuments',8,'财务单据')" />
<el-badge class="mark" :value="NotDealCount?NotDealCount:'0'" />
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
......@@ -218,8 +216,7 @@
CRM系统
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true"
v-if="userInfo&&userInfo.DepartName&&(userInfo.DepartName.indexOf('操作部')!=-1 || userInfo.DepartName.indexOf('总部财务部')!=-1) ||(userInfo.RB_Branch_id == 1245
<el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true" v-if="userInfo&&userInfo.DepartName&&(userInfo.DepartName.indexOf('操作部')!=-1 || userInfo.DepartName.indexOf('总部财务部')!=-1) ||(userInfo.RB_Branch_id == 1245
&& userInfo.DepartName.indexOf('引流')==-1
&& userInfo.DepartName.indexOf('市场')==-1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
......@@ -1182,8 +1179,8 @@
<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;cursor: pointer;" src="../assets/img/tsclose.png"
alt="">
<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>
<div style="text-align:center">
......@@ -1206,13 +1203,11 @@
<!-- 投票 -->
<Voting v-show="VotingShow" :NowVoteData="NowVoteData" :NowVoteType="NowVoteType"></Voting>
<!-- 机票未绑团提示 -->
<unbundlingMessage v-if="unbundlingVisible"
:UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false"></unbundlingMessage>
<unbundlingMessage v-if="unbundlingVisible" :UnboundDate="UnboundDate" @unbundlingVisible="unbundlingVisible=false">
</unbundlingMessage>
<!-- 改价提醒/审核改价提醒 -->
<ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible"
:type="1"
:msg="ExamineThePriceMsg"
<ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible" :type="1" :msg="ExamineThePriceMsg"
:ChangeThePriceObj="ChangeThePriceObj"
@ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
</div>
......@@ -1255,29 +1250,29 @@
},
data() {
return {
ExamineThePriceMsg:{
Q_IsCollect: '2',//收款状态
ExamineThePriceMsg: {
Q_IsCollect: '2', //收款状态
DepartSTime: '', //出发时间
DepartETime: '',
EnterId: 0,//销售
RB_Branch_Id: '-1',//公司
OrderId:"",
TicketStatus:"1",
OrderType:"0",
pageIndex:1,
pageSize:5,
EnterId: 0, //销售
RB_Branch_Id: '-1', //公司
OrderId: "",
TicketStatus: "1",
OrderType: "0",
pageIndex: 1,
pageSize: 5,
total: 0,
total2: 0,
},
ExamineThePriceVisible: false,//审核改价提醒
ExamineThePriceVisible: false, //审核改价提醒
ChangeThePriceList: [],
ChangeThePriceVisible: false,//改价提醒
ChangeThePriceObj:{
ExamineThePriceData:[],
ChangeThePriceData:[],
ChangeThePriceVisible: false, //改价提醒
ChangeThePriceObj: {
ExamineThePriceData: [],
ChangeThePriceData: [],
},
UnboundDate: {},
unbundlingVisible: false,//未绑团提醒
unbundlingVisible: false, //未绑团提醒
b2bDomain: "",
useRed: false,
//提成账单弹窗
......@@ -1476,7 +1471,7 @@
isFirstLoad: true,
unReadMsgId: [],
isFocus: true,
NotDealCount8:"",
NotDealCount8: "",
NotDealCount: "",
MyAuditCount: "",
sysMsgPageIndex: 1,
......@@ -1884,17 +1879,17 @@
this.GetSupperOrderEditAuth();
// 获取未绑定团的数据
if(!localStorage.getItem("UnboundDateTime")||
(localStorage.getItem("UnboundDateTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
if (!localStorage.getItem("UnboundDateTime") ||
(localStorage.getItem("UnboundDateTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))) {
this.GetTravelAirNotBind()
}else{
if(localStorage.getItem("UnboundDate")){
if(this.userInfo.DepartName.indexOf("操作部")!=-1 || this.userInfo.DepartName.indexOf("总部财务部")!=-1 ||
(this.userInfo.RB_Branch_id == 1245
&& this.userInfo.DepartName.indexOf("引流")==-1
&& this.userInfo.DepartName.indexOf("市场")==-1)){
} else {
if (localStorage.getItem("UnboundDate")) {
if (this.userInfo.DepartName.indexOf("操作部") != -1 || this.userInfo.DepartName.indexOf("总部财务部") != -1 ||
(this.userInfo.RB_Branch_id == 1245 &&
this.userInfo.DepartName.indexOf("引流") == -1 &&
this.userInfo.DepartName.indexOf("市场") == -1)) {
this.UnboundDate = JSON.parse(localStorage.getItem("UnboundDate"))
}else{
} else {
localStorage.removeItem("UnboundDate");
localStorage.removeItem("UnboundDateTime");
}
......@@ -1905,43 +1900,45 @@
// 获取改价及审核提醒 每月1到10号提示
let DateTime = new Date();
let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()+1
let Months = Month>9?Month:'0'+Month
let StartDate = Year+'-'+Months+'-01'
let Month = DateTime.getMonth() + 1
let Months = Month > 9 ? Month : '0' + Month
let StartDate = Year + '-' + Months + '-01'
let DateList = []
for(let i=0;i<10;i++){
for (let i = 0; i < 10; i++) {
DateList.push(this.getBeforeDate(-i, new Date(StartDate).Format("yyyy-MM-dd")))
}
this.ChangeThePriceList = DateList.filter(x=>{
return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
this.ChangeThePriceList = DateList.filter(x => {
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 (this.ChangeThePriceList.length > 0) {
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"))))){
if ((!localStorage.getItem("ExamineThePriceDataTime") ||
(localStorage.getItem("ExamineThePriceDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
)) {
this.GetExaminePriceOrderPageList()
}
// 两小时请求一次改价、审核改价提醒
setInterval(()=>{
if(!this.ChangeThePriceVisible&&!this.ExamineThePriceVisible){
setInterval(() => {
if (!this.ChangeThePriceVisible && !this.ExamineThePriceVisible) {
this.GetChangeThePrice()
this.GetExaminePriceOrderPageList()
}else{
} else {
clearInterval()
}
},7200000)
}, 7200000)
}
},
created() {
let DateTime = new Date();
let Year = DateTime.getFullYear()
let Month = DateTime.getMonth()
let Months = Month>9?Month:'0'+Month
let Months = Month > 9 ? Month : '0' + Month
let day = new Date(Year, Month, 0).getDate()
let DepartETime = Year+'-'+Months+'-'+day
let DepartETime = Year + '-' + Months + '-' + day
this.ExamineThePriceMsg.DepartETime = DepartETime
if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
this.tsState = true;
......@@ -1975,20 +1972,21 @@
}
},
methods: {
GetExaminePriceOrderPageList(type){
GetExaminePriceOrderPageList(type) {
this.apipost(
"CarSingle_post_GetExaminePriceOrderPageList",this.ExamineThePriceMsg,
"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
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")));
localStorage.setItem("ExamineThePriceDataTime", this.getBeforeDate(0, new Date().Format(
"yyyy-MM-dd")));
this.ChangeThePriceObj.ExamineThePriceData = res.data.data.pageData
this.ExamineThePriceVisible = true
}else{
} else {
this.ExamineThePriceVisible = false
if(type==1){
if (type == 1) {
// this.$message.info('暂无订单审核数据')
}
// localStorage.removeItem("ExamineThePriceData");
......@@ -1999,46 +1997,47 @@
);
},
// 获取改价提醒的数据
GetChangeThePrice(type){
GetChangeThePrice(type) {
let msg = {
pageIndex:1,
pagesize:5,
OrderId:0,
GuestId:0,
EnterId:0,
OrderState:"1",
EndTime:"",
FinishsTime:"",
FinishETime:"",
DepartSTime:"",
pageIndex: 1,
pagesize: 5,
OrderId: 0,
GuestId: 0,
EnterId: 0,
OrderState: "1",
EndTime: "",
FinishsTime: "",
FinishETime: "",
DepartSTime: "",
DepartETime: this.ExamineThePriceMsg.DepartETime,
TCNUM:"",
TCNUM: "",
ProductName: "",
CustomerWame:"",
LureEmpId:0,
LineId:0,
TravelType:0,
OrderType:2,
IsSelectCRM:0,
IsMyOrder:"1",
OrderType:"0",
Q_IsCollect:"2",
TicketStatus:'1',
CustomerWame: "",
LureEmpId: 0,
LineId: 0,
TravelType: 0,
OrderType: 2,
IsSelectCRM: 0,
IsMyOrder: "1",
OrderType: "0",
Q_IsCollect: "2",
TicketStatus: '1',
}
this.ChangeThePriceData = []
this.apipost(
"CarSingle_post_GetChangePriceOrderPageList", msg,
res => {
if(res.data.resultCode==1){
if(res.data.data&&res.data.data.count>0&&res.data.data.pageData.length>0){
if(!this.ExamineThePriceMsg.total2) this.ExamineThePriceMsg.total2 = res.data.data.count
if (res.data.resultCode == 1) {
if (res.data.data && res.data.data.count > 0 && res.data.data.pageData.length > 0) {
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")));
localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format(
"yyyy-MM-dd")));
this.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData
this.ChangeThePriceVisible = true
}else{
} else {
this.ChangeThePriceVisible = false
if(type==1){
if (type == 1) {
// this.$message.info('暂无订单改价数据')
}
// localStorage.removeItem("ChangeThePriceData");
......@@ -2049,18 +2048,18 @@
);
},
// 获取未绑定团的数据
GetTravelAirNotBind(){
GetTravelAirNotBind() {
this.UnboundDate = {}
if(this.userInfo.DepartName.indexOf("操作部")!=-1 || this.userInfo.DepartName.indexOf("总部财务部")!=-1 ||
(this.userInfo.RB_Branch_id == 1245
&& this.userInfo.DepartName.indexOf("引流")==-1
&& this.userInfo.DepartName.indexOf("市场")==-1)){
if (this.userInfo.DepartName.indexOf("操作部") != -1 || this.userInfo.DepartName.indexOf("总部财务部") != -1 ||
(this.userInfo.RB_Branch_id == 1245 &&
this.userInfo.DepartName.indexOf("引流") == -1 &&
this.userInfo.DepartName.indexOf("市场") == -1)) {
this.apipost(
"opcommission_GetTravelAirNotBind", {},
res => {
if(res.data.resultCode==1){
if((res.data.data.TravelList&&res.data.data.TravelList.length>0)
||(res.data.data.AirList&&res.data.data.AirList.length>0)){
if (res.data.resultCode == 1) {
if ((res.data.data.TravelList && res.data.data.TravelList.length > 0) ||
(res.data.data.AirList && res.data.data.AirList.length > 0)) {
localStorage.setItem("UnboundDate", JSON.stringify(res.data.data));
localStorage.setItem("UnboundDateTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
this.UnboundDate = res.data.data
......@@ -2072,29 +2071,18 @@
}
},
testApi() {
var postMsg = {};
var cmd = "";
cmd = "triptemplate_SetTripTemplate";
postMsg = {
TempId:0,
LineId:0,
LtId:0,
Title:"测试",
TempData:"JSON",
CoverImg:"封面图",
CountryName:"国家",
SeasonName:"季节",
ColorName:"颜色名称",
ColorStr:"颜色值",
LineName:"线路名称",
TempType:1,//类型
}
this.apipost(
cmd, postMsg,
res => {
console.log("testApi", res);
}
);
// var postMsg = {};
// var cmd = "";
// cmd = "admin_get_GetErpLoginInfoByUid";
// postMsg = {
// EmployeeId: 615
// }
// this.apipost(
// cmd, postMsg,
// res => {
// console.log("testApi", res);
// }
// );
},
//测试方法
testEmp() {
......@@ -2434,41 +2422,41 @@
// 发票审核提示
GetExamineFinanceInvoiceList() {
let msg = {
pageIndex:1,
pageSize:5,
FrID:"0",
sDate:"",
eDate:"",
Status:"-1",
TemplateId:"0",
RB_Branch_Id:-1,
RB_Depart_Id:0,
sTradeDate:"",
eTradeDate:"",
ClientType:0,
RemitterName:"",
ClientID:0,
sMoney:"",
eMoney:"",
CurrencyId:"0",
CostTypeID:0,
Conditon:1,
TCNUM:"",
TradeWay:0,
Type:"0",
AccountType:0,
QEndDate:"",
QStartDate:"",
UpdateBy:0,
IsFormRecPayQuery:"1",
KJCostTypeId:0,
IsSelectKJSetCostType:0,
Remark:"",
Sort:"2",
KingdeeMark:"0",
AuditId:"",
TCID:0,
OrderID:0,
pageIndex: 1,
pageSize: 5,
FrID: "0",
sDate: "",
eDate: "",
Status: "-1",
TemplateId: "0",
RB_Branch_Id: -1,
RB_Depart_Id: 0,
sTradeDate: "",
eTradeDate: "",
ClientType: 0,
RemitterName: "",
ClientID: 0,
sMoney: "",
eMoney: "",
CurrencyId: "0",
CostTypeID: 0,
Conditon: 1,
TCNUM: "",
TradeWay: 0,
Type: "0",
AccountType: 0,
QEndDate: "",
QStartDate: "",
UpdateBy: 0,
IsFormRecPayQuery: "1",
KJCostTypeId: 0,
IsSelectKJSetCostType: 0,
Remark: "",
Sort: "2",
KingdeeMark: "0",
AuditId: "",
TCID: 0,
OrderID: 0,
EmployeeId: this.userInfo.EmployeeId
}
this.apipost(
......
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