Skip to content

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

页面修改

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