Commit 285fe2fa authored by 黄奎's avatar 黄奎

页面修改

parent dffe0052
...@@ -1553,7 +1553,6 @@ ...@@ -1553,7 +1553,6 @@
F_ContractManagement: false, //合同权限 F_ContractManagement: false, //合同权限
F_Finance_Create: false, F_Finance_Create: false,
HOTEL_memorandum: false, HOTEL_memorandum: false,
}; };
}, },
filters: { filters: {
...@@ -1858,8 +1857,6 @@ ...@@ -1858,8 +1857,6 @@
} else { } else {
this.userInfo.UserPhoto = ""; this.userInfo.UserPhoto = "";
} }
this.userId = this.userInfo.EmployeeId; this.userId = this.userInfo.EmployeeId;
this.allPartMsg.RB_Group_Id = this.deleteMsg.groupId = this.likeMsg.groupId = this.addDynamicMsg.rB_GroupId = this this.allPartMsg.RB_Group_Id = this.deleteMsg.groupId = this.likeMsg.groupId = this.addDynamicMsg.rB_GroupId = this
.dynamicMsg.groupId = .dynamicMsg.groupId =
...@@ -1948,8 +1945,6 @@ ...@@ -1948,8 +1945,6 @@
} }
} }
} }
// 获取改价及审核提醒 每月1到10号提示 // 获取改价及审核提醒 每月1到10号提示
let DateTime = new Date(); let DateTime = new Date();
let Year = DateTime.getFullYear() let Year = DateTime.getFullYear()
...@@ -1995,7 +1990,6 @@ ...@@ -1995,7 +1990,6 @@
this.ExamineThePriceMsg.ApplyType = 2; this.ExamineThePriceMsg.ApplyType = 2;
this.GetExaminePriceOrderPageList() this.GetExaminePriceOrderPageList()
} }
} }
}, },
created() { created() {
...@@ -2059,7 +2053,6 @@ ...@@ -2059,7 +2053,6 @@
} }
} }
); );
}, },
GetExaminePriceOrderPageList(type) { GetExaminePriceOrderPageList(type) {
this.apipost( this.apipost(
...@@ -2126,7 +2119,6 @@ ...@@ -2126,7 +2119,6 @@
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("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format( localStorage.setItem("ChangeThePriceDataTime", this.getBeforeDate(0, new Date().Format(
"yyyy-MM-dd"))); "yyyy-MM-dd")));
this.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData this.ChangeThePriceObj.ChangeThePriceData = res.data.data.pageData
...@@ -2136,7 +2128,6 @@ ...@@ -2136,7 +2128,6 @@
if (type == 1) { if (type == 1) {
// this.$message.info('暂无订单改价数据') // this.$message.info('暂无订单改价数据')
} }
// localStorage.removeItem("ChangeThePriceData");
localStorage.removeItem("ChangeThePriceDataTime"); localStorage.removeItem("ChangeThePriceDataTime");
} }
} }
...@@ -2188,7 +2179,7 @@ ...@@ -2188,7 +2179,7 @@
var cmd = ""; var cmd = "";
cmd = "ppt_trip_DeleteTripMain"; cmd = "ppt_trip_DeleteTripMain";
postMsg = { postMsg = {
MainId:1, MainId: 1,
} }
this.apipost( this.apipost(
cmd, postMsg, cmd, postMsg,
...@@ -2273,7 +2264,6 @@ ...@@ -2273,7 +2264,6 @@
this.outerVisibleNot = false this.outerVisibleNot = false
}, },
closeChangeMachie(done) { //弹出框关闭初始化弹框内表单 closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
// done();
this.saleRnkShow = false this.saleRnkShow = false
}, },
GetUserIsRead() { GetUserIsRead() {
...@@ -2353,12 +2343,9 @@ ...@@ -2353,12 +2343,9 @@
} else { } else {
this.logsShow = false; this.logsShow = false;
} }
} else {
//this.Error(res.data.message);
} }
}, err => {}); }, err => {});
}, },
CloseZip() { CloseZip() {
this.mazip = 1; this.mazip = 1;
localStorage.setItem("mazip", 1); localStorage.setItem("mazip", 1);
...@@ -2402,7 +2389,6 @@ ...@@ -2402,7 +2389,6 @@
clearInterval(this.douTimer) clearInterval(this.douTimer)
this.douTimer = null this.douTimer = null
} }
}, 25) }, 25)
} }
}, },
...@@ -2414,7 +2400,6 @@ ...@@ -2414,7 +2400,6 @@
} else { } else {
url = "http://yx.oytour.com/#/"; url = "http://yx.oytour.com/#/";
} }
let path = url + s.Link; let path = url + s.Link;
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: path name: path
...@@ -2435,7 +2420,6 @@ ...@@ -2435,7 +2420,6 @@
null null
); );
} }
}, },
refreshSysNoteDate(add) { refreshSysNoteDate(add) {
this.sysMsgList = []; this.sysMsgList = [];
...@@ -2466,6 +2450,9 @@ ...@@ -2466,6 +2450,9 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.MsgCount = res.data.data.count; this.MsgCount = res.data.data.count;
if (this.MsgCount && this.MsgCount > 0) {
this.hasNewMsg = this.MsgCount;
}
if (res.data.data.count > 0) { if (res.data.data.count > 0) {
let data = res.data.data.pageData; let data = res.data.data.pageData;
data.forEach(x => { data.forEach(x => {
...@@ -2694,7 +2681,6 @@ ...@@ -2694,7 +2681,6 @@
this.addOrUpdate = 0; this.addOrUpdate = 0;
this.GroupMemberList = []; this.GroupMemberList = [];
this.oldGroupMemberList.forEach(x => { this.oldGroupMemberList.forEach(x => {
//Icon:obj.Icon,IMAccount:obj.IMAccount,Name:obj.Name
let obj = {}; let obj = {};
obj.Icon = x.avatar; obj.Icon = x.avatar;
obj.IMAccount = x.account; obj.IMAccount = x.account;
...@@ -2771,7 +2757,6 @@ ...@@ -2771,7 +2757,6 @@
x.name = this.currentSession.name; x.name = this.currentSession.name;
} }
}); });
this.delAccountList.forEach(x => { this.delAccountList.forEach(x => {
this.deleteFriend(x); this.deleteFriend(x);
}); });
...@@ -2899,7 +2884,6 @@ ...@@ -2899,7 +2884,6 @@
this.oldGroupMemberList.splice(index, 1); this.oldGroupMemberList.splice(index, 1);
} }
}); });
this.$store.state.teamMembers[ this.$store.state.teamMembers[
this.currentSession.teamInfo.teamId this.currentSession.teamInfo.teamId
] = this.oldGroupMemberList; ] = this.oldGroupMemberList;
...@@ -2913,7 +2897,6 @@ ...@@ -2913,7 +2897,6 @@
} }
}); });
}, },
deleteOldFriend(obj) {}, deleteOldFriend(obj) {},
addFriend(type, obj) { addFriend(type, obj) {
if (obj.imAccount) { if (obj.imAccount) {
...@@ -2939,9 +2922,6 @@ ...@@ -2939,9 +2922,6 @@
accounts: imList, accounts: imList,
done: (error, obj2) => { done: (error, obj2) => {
if (!error) { if (!error) {
// this.$message.success('成功!')
// this.clearBuildGroup()
// this.IM_navType=1
let demoObj = { let demoObj = {
Icon: obj.icon, Icon: obj.icon,
IMAccount: obj.imAccount, IMAccount: obj.imAccount,
...@@ -3054,7 +3034,6 @@ ...@@ -3054,7 +3034,6 @@
saveGroup() { saveGroup() {
if (this.newGroup) { if (this.newGroup) {
if (this.IMList.length < 1) { if (this.IMList.length < 1) {
//
this.$message.warning("建群至少要有一个成员!"); this.$message.warning("建群至少要有一个成员!");
return; return;
} }
...@@ -3073,7 +3052,6 @@ ...@@ -3073,7 +3052,6 @@
this.$message.success("成功!"); this.$message.success("成功!");
this.$store.state.teamlist.push(obj.team); this.$store.state.teamlist.push(obj.team);
this.searchUsers(obj.accounts); this.searchUsers(obj.accounts);
this.clearBuildGroup(); this.clearBuildGroup();
this.IM_navType = 1; this.IM_navType = 1;
this.$store.dispatch("createTeam", obj); this.$store.dispatch("createTeam", obj);
...@@ -3113,7 +3091,6 @@ ...@@ -3113,7 +3091,6 @@
}); });
} }
}, },
buildGroup() { buildGroup() {
this.IM_Chatlayer = false; this.IM_Chatlayer = false;
this.IM_navType = 4; this.IM_navType = 4;
...@@ -3201,7 +3178,6 @@ ...@@ -3201,7 +3178,6 @@
lt(obj) { lt(obj) {
this.MsgBus.$emit('imgprevclear') this.MsgBus.$emit('imgprevclear')
if (obj.account && obj.account != "") { if (obj.account && obj.account != "") {
obj.imAccount = obj.account; obj.imAccount = obj.account;
obj.name = obj.alias; obj.name = obj.alias;
obj.avatar = obj.avatar; obj.avatar = obj.avatar;
...@@ -3413,7 +3389,6 @@ ...@@ -3413,7 +3389,6 @@
err => {} err => {}
); );
}, },
getWebAllPart() { getWebAllPart() {
this.apipost( this.apipost(
"admin_Get_GetCompanyDepartMentEmployeeForChar", {}, "admin_Get_GetCompanyDepartMentEmployeeForChar", {},
...@@ -3425,7 +3400,6 @@ ...@@ -3425,7 +3400,6 @@
err => {} err => {}
); );
}, },
deleteComments(id, index, aId) { deleteComments(id, index, aId) {
//从全部动态删除评论 //从全部动态删除评论
this.isAppend = false; this.isAppend = false;
...@@ -3510,7 +3484,6 @@ ...@@ -3510,7 +3484,6 @@
this.isAppend = false; this.isAppend = false;
this.isAppendOne = false; this.isAppendOne = false;
this.dynamicMsg.pageIndex = Math.ceil((index + 1) / 10); this.dynamicMsg.pageIndex = Math.ceil((index + 1) / 10);
//this.myDynamicMsg.pageIndex=Math.ceil((index+1)/10)
this.likeMsg.articleId = id; this.likeMsg.articleId = id;
this.apipost( this.apipost(
"user_dynamic_like", "user_dynamic_like",
...@@ -3554,7 +3527,6 @@ ...@@ -3554,7 +3527,6 @@
err => {} err => {}
); );
}, },
disLikeArticle(id, index) { disLikeArticle(id, index) {
//从全部取消点赞 //从全部取消点赞
this.isAppend = false; this.isAppend = false;
...@@ -3579,7 +3551,6 @@ ...@@ -3579,7 +3551,6 @@
err => {} err => {}
); );
}, },
disLikeArticleOne(id, index) { disLikeArticleOne(id, index) {
//从我发布的取消点赞 //从我发布的取消点赞
this.isAppend = false; this.isAppend = false;
...@@ -4216,7 +4187,6 @@ ...@@ -4216,7 +4187,6 @@
case "/HotelPrice": //酒店报价 case "/HotelPrice": //酒店报价
path = "/HotelManagement"; path = "/HotelManagement";
break; break;
case "/detailsInventory": //酒店总库存看板详情 case "/detailsInventory": //酒店总库存看板详情
path = "/HotelTotalStock"; path = "/HotelTotalStock";
break; break;
...@@ -4226,7 +4196,6 @@ ...@@ -4226,7 +4196,6 @@
case "/HotelAccountInfo": //酒店核算详情 case "/HotelAccountInfo": //酒店核算详情
path = "/HotelAccounting"; path = "/HotelAccounting";
break; break;
case "/restaurantInfoManage": //餐厅新增修改 case "/restaurantInfoManage": //餐厅新增修改
path = "/restaurantList"; path = "/restaurantList";
break; break;
...@@ -4239,7 +4208,6 @@ ...@@ -4239,7 +4208,6 @@
case "/RestauranAccountingDetail": //餐厅内部核算详情 case "/RestauranAccountingDetail": //餐厅内部核算详情
path = "/RestauranAccounting"; path = "/RestauranAccounting";
break; break;
case "/scenicSpotInfoManage": //票劵新增修改 case "/scenicSpotInfoManage": //票劵新增修改
path = "/scenicSpotList"; path = "/scenicSpotList";
break; break;
...@@ -4252,7 +4220,6 @@ ...@@ -4252,7 +4220,6 @@
case "/scenicSpotDetails": //票劵内部核算详情 case "/scenicSpotDetails": //票劵内部核算详情
path = "/scenicSpotAccounting"; path = "/scenicSpotAccounting";
break; break;
case "/TicketAccountingDetails": //机票核算详情 case "/TicketAccountingDetails": //机票核算详情
path = "/TicketAccounting"; path = "/TicketAccounting";
break; break;
...@@ -4408,6 +4375,7 @@ ...@@ -4408,6 +4375,7 @@
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.msgList = []; this.msgList = [];
this.MsgCount = this.msgList.length; this.MsgCount = this.msgList.length;
this.hasNewMsg = this.MsgCount;
} else { } else {
this.$message.error(r.data.message); this.$message.error(r.data.message);
} }
......
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