Skip to content

S
SuperMan
Commit 80f8ac78 authored by Mac's avatar Mac
Browse files
Options

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

parents c1914762 a3ca71d9
Show whitespace changes
Inline Side-by-side
Showing with 4332 additions and 3889 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 80f8ac78
......@@ -1528,7 +1528,6 @@ export default {
if(x.ID==i){
if (type) {
this.payMsgList[index].Account = x.allName;
console.log(x)
this.payMsgList[index].CurrenName =x.CurrencyName;
this.payMsgList[index].Rate = x.PayRate;
this.payMsgList[index].CurrencyId = x.CurrencyId;
......@@ -1536,7 +1535,6 @@ export default {
this.Calculation(1, index);
} else {
this.payMsg.Account = x.allName;
console.log(x)
this.payMsg.CurrenName =x.CurrencyName;
this.payMsg.Rate = x.PayRate;
this.payMsg.CurrencyId = x.CurrencyId;
......@@ -1762,7 +1760,12 @@ export default {
// }
// }
// });
this.AuditOrRefundMsg.TradeDetailList = this.GetDetail.TradeDetailList;
this.AuditOrRefundMsg.TradeDetailList = [];
this.GetDetail.TradeDetailList.forEach(x=>{
if(x.isChecked){
this.AuditOrRefundMsg.TradeDetailList.push(x);
}
})
// if(this.allMoney!=this.currentMoney){
// this.Error('原路退款金额与单据总金额不一致');
// return;
......@@ -1982,7 +1985,21 @@ export default {
Trade_Order:subItem.Trade_Order,
show: false
}
if(this.payMsgList.length==0){
this.payMsgList.push(payMsg);
}else{
var isPush =false;
this.payMsgList.forEach(x=>{
if(x.Trade_Order==subItem.Trade_Order){
isPush=true;
x.OriginalMoney = subItem.RefundMoney;
x.allMoney = subItem.RefundMoney;
}
})
if(!isPush){
this.payMsgList.push(payMsg);
}
}
let total = 0;
this.payMsgList.forEach(x=>{
total +=parseFloat(x.OriginalMoney);
......
src/components/SalesModule/groupTourOrder.vue
View file @ 80f8ac78
......@@ -141,8 +141,6 @@
padding: 9px 15px;
}
.groupSuperSearchLayer {}
.groupSuperSearchLayer>p {
padding: 20px 0;
font-size: 14px;
......
src/components/SalesVisa/VisaProduct.vue
View file @ 80f8ac78
......@@ -301,15 +301,16 @@
<tr>
<th width="10%">产品名称</th>
<th width="8%">签证类型</th>
<th width="10%">价格有效日期</th>
<th width="8%">价格有效日期</th>
<th width="8%">成本价</th>
<th width="8%">同业价</th>
<th width="8%">直客价</th>
<th width="6%">状态</th>
<th width="6%">订单数</th>
<!-- <th width="12%">总人数（剩余人数）</th> -->
<th width="10%">创建者</th>
<th width="8%">创建者</th>
<th width="10%">广告图</th>
<th width="10%">申请表</th>
<th width="14%">操作</th>
</tr>
<tr v-for="item in dataList">
......@@ -355,7 +356,7 @@
<i
class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2)"
@click="delUnpload(item.Id,item2,'广告图',1)"
></i>
</p>
<el-upload
......@@ -366,7 +367,30 @@
:show-file-list="false"
action
>
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id)">上传广告图</span>
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id,1)">上传广告图</span>
</el-upload>
</td>
<td>
<p v-for="(item2, index2) in item.ApplyForCounterfoilList" :key="index2+100">
<span
style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)"
>{{item2.Name}}</span>
<i
class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2,'申请表',2)"
></i>
</p>
<el-upload
:http-request="uploadImg"
:data="item"
ref="upload"
:multiple="false"
:show-file-list="false"
action
>
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id,2)">上传申请表</span>
</el-upload>
</td>
<td class="groupTourOrderIcon">
......@@ -642,6 +666,7 @@ export default {
currentPage: 1,
VisaManagementList: [],
buttonshow:false,
Type:0,
};
},
created(){
......@@ -673,8 +698,9 @@ export default {
}
});
},
saveitem(tcid) {
saveitem(tcid,Type) {
this.uploadTCID = tcid;
this.Type=Type;
},
//上传
uploadImg(file) {
......@@ -688,7 +714,8 @@ export default {
Path: this.domainManager().ViittoFileUrl + x.data.FilePath,
FileName: file.file.name,
Status: 1,
VId: this.uploadTCID
VId: this.uploadTCID,
Type:this.Type,
},
res => {
if (res.data.resultCode === 1) {
......@@ -701,8 +728,8 @@ export default {
);
});
},
delUnpload: function(tcid, item) {
this.$confirm("是否删除该广告图?", "提示", {
delUnpload: function(tcid, item,str,Type) {
this.$confirm( `是否删除该${str}?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
......@@ -713,7 +740,8 @@ export default {
Path: item.FullUrl,
FileName: item.Name,
Status: 2,
VId: tcid
VId: tcid,
Type:Type,
},
res => {
if (res.data.resultCode === 1) {
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ 80f8ac78
......@@ -121,7 +121,7 @@
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="10%">单号</th>
<th width="10%">业务员</th>
<th width="8%">业务员</th>
<th width="4%">人数</th>
<th width="8%">出发日期</th>
<th width="8%">报名日期</th>
......@@ -133,7 +133,7 @@
<th width="5%">在途</th>
<th width="7%">订单状态</th>
<th width="5%">状态</th>
<th width="8%">操作</th>
<th width="12%">操作</th>
</tr>
<tbody v-for='item in dataList'>
<tr>
......@@ -192,6 +192,10 @@
<!-- 订单拆分 -->
<el-tooltip v-if="item.PeopleNum==item.GuestList.length" class="item" effect="dark" content="订单拆分" placement="top-start">
<el-button type="primary" style='background:#47BF8C; border-color:#47BF8C;' icon="el-icon-edit" @click="goUrl2('OrderSplitting',item.Id,'订单拆分')"></el-button>
</el-tooltip>
<!-- 修改金额 -->
<el-tooltip v-if="EmployeeId==1&& item.VisaType==1" class="item" effect="dark" content="修改金额" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px' icon="el-icon-edit" @click='Edit(item)'></el-button>
</el-tooltip>
</td>
</tr>
......@@ -247,6 +251,18 @@
:page-size="this.msg.pageSize"
:total="total">
</el-pagination>
<el-dialog
title="修改金额"
:visible.sync="EditVisible"
width="400px">
<div>
金额：<el-input style="width:300px" v-model="EditMsg.TotalPrice"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="EditVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="PerferPrice">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
......@@ -271,9 +287,31 @@ export default {
currentPage: 1,
isShow:0,
PreferPrice:0,
IncomePrice:0
IncomePrice:0,
EmployeeId:0,
EditVisible:false,
EditMsg:{
TotalPrice:0,
},
}
},methods:{
PerferPrice(){
this.apipost('dmc_get_visa_SetVisaOrderPrice',this.EditMsg,res=>{
if(res.data.resultCode==1){
this.EditVisible=false;
this.Success(res.data.message)
this.getList();
}else{
this.Error(res.data.message)
}
},err=>{})
},
Edit(item){
this.EditVisible=true;
this.EditMsg.OrderId=item.Id;
this.EditMsg.TotalPrice=item.TotalPrice;
},
goUrlVisaList(obj){
if(obj.VisaPlanIdStr=="" || obj.VisaPlanIdStr==null){
this.$router.push({ name: 'visaList2',query:{"visaPlanId":obj.VisaPlanId,blank:'y',tab:'签证详情'} })
......@@ -343,6 +381,8 @@ export default {
this.getList();
},
},mounted(){
let userinfo = this.getLocalStorage();
this.EmployeeId = userinfo.EmployeeId;
if (this.$route.query.name!==undefined) {
this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")"
this.nameShow = true
......
src/components/SalesVisa/salesOrderToday.vue
View file @ 80f8ac78
......@@ -109,11 +109,11 @@
<th width="10%">业务员</th>
<th width="5%">人数</th>
<th width="10%">出发日期</th>
<th width="10%">报名日期</th>
<th width="9%">报名日期</th>
<th width="15%">备注</th>
<th width="8%">应收金额</th>
<th width="7%">订单状态</th>
<!-- <th width="8%">操作</th> -->
<th width="10%">操作</th>
</tr>
<tr v-for='(item,index) in dataList' :key="index">
<td>
......@@ -144,7 +144,11 @@
</td>
<td>
{{item.OrderStateStr}}
<!-- <span class="fz12" v-if="item.VisaOrderStatus==2">操作：{{item.UpdateName}}</span> -->
</td>
<td>
<el-tooltip v-if="EmployeeId==1&& item.VisaType==1" class="item" effect="dark" content="修改金额" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px' icon="el-icon-edit" @click='Edit(item)'></el-button>
</el-tooltip>
</td>
<!-- <td class="groupTourOrderIcon">
<el-tooltip effect="dark" content="签证详情" placement="top-start">
......@@ -167,6 +171,19 @@
:page-size="this.msg.pageSize"
:total="total">
</el-pagination>
<el-dialog
title="修改金额"
:visible.sync="EditVisible"
width="400px">
<div>
金额：<el-input style="width:300px" v-model="EditMsg.TotalPrice"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="EditVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="PerferPrice">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
......@@ -194,8 +211,31 @@ export default {
total: 0,
currentPage: 1,
isShow:0,
EmployeeId:0,
EditVisible:false,
EditMsg:{
TotalPrice:0,
},
}
},methods:{
},
methods:{
PerferPrice(){
this.apipost('dmc_get_visa_SetVisaOrderPrice',this.EditMsg,res=>{
if(res.data.resultCode==1){
this.EditVisible=false;
this.Success(res.data.message)
this.getList();
}else{
this.Error(res.data.message)
}
},err=>{})
},
Edit(item){
this.EditVisible=true;
this.EditMsg.OrderId=item.OrderId;
this.EditMsg.TotalPrice=item.PreferPrice;
},
goUrlR: function (item) {
if (item.VisaType === 1) {
this.$router.push({ name: 'VisaProductOrder', query: { id: item.TCID, blank:'y', tab: '签证详情'} });
......@@ -250,7 +290,10 @@ export default {
this.msg.pageIndex = val;
this.getList();
},
},mounted(){
},
mounted(){
let userinfo = this.getLocalStorage();
this.EmployeeId = userinfo.EmployeeId;
if (this.$route.query.name!==undefined) {
this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")"
this.nameShow = true
......
src/components/Supplier/roomQuery.vue
View file @ 80f8ac78
......@@ -150,11 +150,63 @@
<template v-if="childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
<template
v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
</template>
</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<el-tooltip class="item" effect="dark" content="操作信息" placement="top-start" style="display:none;">
<el-popover placement="bottom" width="460" trigger="click">
<table>
<tr>
<th width="100">
时间
</th>
<th width="150">
酒店
</th>
<th width="100">
数量
</th>
<th width="100">
状态
</th>
</tr>
<tr v-for="opItem in subItem.hotelList">
<template v-if="opItem.SupplierId==UserInfo.SupplierId">
<td>
{{opItem.CheckInDateStr}}
</td>
<td>
{{opItem.NewHotelName}}
</td>
<td>
<el-input style="width:60px;" v-model='opItem.SupplierBookNum' type='text'
placeholder="预订数量">
</el-input> 间
</td>
<td>
<el-select v-model="opItem.SupplierHotelStatus" filterable class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option label='未操作' :value='0' :key='0'>
</el-option>
<el-option label='操作中' :value='1' :key='1'>
</el-option>
<el-option label='操作完成' :value='2' :key='2'>
</el-option>
</el-select>
</td>
</template>
</tr>
</table>
<p class="alcenter mt10">
<input type="button" value="保存" @click="SaveSupplierData(subItem.hotelList)" class="normalBtn" />
</p>
<a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference">操作</a>
</el-popover>
</el-tooltip>
<a style="text-decoration:underline;color:blue;cursor:pointer"
@click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
<template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
......@@ -164,6 +216,13 @@
@click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
</td>
</tr>
<template v-if="subItem.SupplierRemarks">
<tr v-if="subIndex==0" :class="{roomQuerySplitTrCss:index%2!=0}">
<td colspan="8" class="redTip">
<p>备注：{{subItem.SupplierRemarks}}</p>
</td>
</tr>
</template>
</template>
</template>
</table>
......@@ -201,7 +260,7 @@
PriceStatus: 0,
CombinationNum: ''
},
UserInfo:{},
UserInfo: {},
//分公司类表
companyList: [],
//酒店列表
......@@ -342,7 +401,6 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
console.log("dataList",this.dataList);
} else {
this.$message.error(res.data.message)
}
......@@ -363,13 +421,28 @@
err => {}
);
},
//保存酒店新
SaveSupplierData(hotelList) {
this.ApiPost2(
"dmcstatistics_post_SetNewHotelOrder_Supplier", hotelList,
res => {
if (res.data.resultCode == 1) {
this.Success("操作成功!");
this.getList();
} else {
this.Error("操作失败!");
}
},
err => {}
);
},
//下载Excel
DownLoadHotel() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.UserInfo.SupplierAccountId,
OPType:1
OPType: 1
};
let fileName = "订房查询" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
......@@ -459,7 +532,7 @@
},
},
mounted() {
this.UserInfo=this.getLocalStorageSupplier();
this.UserInfo = this.getLocalStorageSupplier();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -493,7 +566,7 @@
background: #eee !important;
}
.roomQuery_SupplierTable{
.roomQuery_SupplierTable {
width: 98%;
font-size: 12px;
color: #333;
......@@ -514,11 +587,17 @@
border: 1px solid #d1d1d1;
text-align: center;
padding: 5px 0;
}
}
.roomQuery_SupplierTable .tdLeft {
text-align: left;
padding-left: 5px;
}
.roomQuery_SupplierTable .redTip {
text-align: left;
color: red;
padding-left: 5px;
}
</style>
src/components/SupplierIndex.vue
View file @ 80f8ac78
......@@ -26,7 +26,7 @@
<i class="iconfont icon-menu-shezhi1"></i>
设置
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native ="exit">
<el-dropdown-item class="clearfix _dropdown_other" @click.native="exit">
<i class="iconfont icon-menu-tuichu"></i>
退出
</el-dropdown-item>
......@@ -34,7 +34,9 @@
</el-dropdown>
</li>
<li style="position: relative;">
<i class="iconfont icon-imessage_top" :class="[hasNewMsg>0&&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']" @click="IM_bodyIsShow=!IM_bodyIsShow,IM_navType=1"></i>
<i class="iconfont icon-imessage_top"
:class="[hasNewMsg>0&&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']"
@click="IM_bodyIsShow=!IM_bodyIsShow,IM_navType=1"></i>
</li>
<!-- <li><i class="iconfont icon-gonggao" @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i></li> -->
<li>
......@@ -44,8 +46,10 @@
<i v-if="language=='Japanese'" class="iconfont icon-icon-riyu"></i>
</span>
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'"
class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'"
class="iconfont icon-duigou"></i></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</li>
......@@ -80,46 +84,44 @@
<div class="IM_tool" style='top: 41px;z-index: 1;' v-if="IM_navType!==3 && IM_navType!==52">
<div class="search">
<i class='iconfont icon-search search'></i>
<input type="text" class='s-box' placeholder='搜索' v-model="newSearchContent" @keyup.enter="searchNameV2"/>
<input type="text" class='s-box' placeholder='搜索' v-model="newSearchContent" @keyup.enter="searchNameV2" />
<i class="close iconfont icon-close" v-if='newSearchContent.length>0' @click="changeTools(0)"></i>
</div>
</div>
<div v-show="imToolsType!=-1 && imToolsType!=52">
<div v-show="IM_navType==1" class="IM_messageList ">
<ul>
<li
v-for="(session, index) in sysMsgList"
class="u-list-item"
@click="enterSystemChat(session),refreshSysNoteDate()"
>
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;font-size: 14px; text-align: center; line-height: 38px; color: #fff; margin-right:10px">系统</div>
<li v-for="(session, index) in sysMsgList" class="u-list-item"
@click="enterSystemChat(session),refreshSysNoteDate()">
<div
style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;font-size: 14px; text-align: center; line-height: 38px; color: #fff; margin-right:10px">
系统</div>
<div class="cont">
<p class="name">{{session.name}}</p>
<p class="msg">{{session.lastMsgShow}}</p>
</div>
<div style="float: right; font-size: 12px; color: #999; margin: 0px 10px 0;">{{session.updateTimeShow}}</div>
<div style="float: right; background: #E95252;font-size: 12px;color: #fff;height:17px; min-width:17px; text-align:center;border-radius:17px;vertical-align: middle;" v-show="session.unread > 0">{{session.unread}}</div>
<div style="float: right; font-size: 12px; color: #999; margin: 0px 10px 0;">{{session.updateTimeShow}}
</div>
<div
style="float: right; background: #E95252;font-size: 12px;color: #fff;height:17px; min-width:17px; text-align:center;border-radius:17px;vertical-align: middle;"
v-show="session.unread > 0">{{session.unread}}</div>
</li>
<li
v-for="(session, index) in sessionlist"
class="u-list-item"
:inline-desc="session.lastMsgShow"
:key="session.id"
:sessionId="session.id"
@dblclick="enterChat(session)"
v-if="session.to!=''"
>
<img :src="session.avatar" width="24"/>
<li v-for="(session, index) in sessionlist" class="u-list-item" :inline-desc="session.lastMsgShow"
:key="session.id" :sessionId="session.id" @dblclick="enterChat(session)" v-if="session.to!=''">
<img :src="session.avatar" width="24" />
<div class="cont">
<p class="name">{{session.name}}</p>
<p class="msg">{{session.lastMsgShow}}</p>
</div>
<div style="float: right; font-size: 12px; color: #999;">
{{session.updateTimeShow}}&nbsp;
<i @click.stop="deleteSession(session)" style="color: #999; font-size: 14px!important; display: none;" class="el-icon-circle-close-outline"></i>
<i @click.stop="deleteSession(session)" style="color: #999; font-size: 14px!important; display: none;"
class="el-icon-circle-close-outline"></i>
</div>
<div style="position: absolute; right: 19px; bottom: 16px; background: #E95252; font-size: 12px; color: #fff;height:17px; min-width:17px; text-align:center;border-radius:17px;vertical-align: middle;" v-show="session.unread > 0">{{session.unread}}</div>
<div
style="position: absolute; right: 19px; bottom: 16px; background: #E95252; font-size: 12px; color: #fff;height:17px; min-width:17px; text-align:center;border-radius:17px;vertical-align: middle;"
v-show="session.unread > 0">{{session.unread}}</div>
</li>
</ul>
</div>
......@@ -142,7 +144,7 @@
</li>
</ul>
<div class="search-none-data" v-show="!isLoading&&searchList.length==0">
<i class="iconfont icon-zanwushuju"></i><br/>
<i class="iconfont icon-zanwushuju"></i><br />
抱歉，没有找到这位{{newSearchContent}}大侠
</div>
</div>
......@@ -154,16 +156,13 @@
<li><i class="iconfont icon-icon-"></i></li>
</ul>
<div class="search" v-show="imToolsType==1||imToolsType==-1">
<input type="text" v-model="newSearchContent" @keyup.enter="searchNameV2"/>
<input type="text" v-model="newSearchContent" @keyup.enter="searchNameV2" />
<i class="close iconfont icon-close" @click="changeTools(0)"></i>
</div>
</div>
<div v-show="IM_navType==52" class="IM_messageList IM_messageList2">
<ul class="_SysNoteDate_ul" v-loading="SystemLog">
<li @click="redNotice(item.noticeId, item.title)"
v-for="item in NoticeList"
class="u-list-item"
>
<li @click="redNotice(item.noticeId, item.title)" v-for="item in NoticeList" class="u-list-item">
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">通知</div>
<div class="cont sys_cont">
......@@ -186,35 +185,33 @@
</el-tooltip>
</div>
<div v-show='contactsType==0' class="el-tree-style-div">
<el-tree :data='webAllpartList'
:props="defaultProps1">
<el-tree :data='webAllpartList' :props="defaultProps1">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span class="fz14" v-if="data.Type==1">{{ node.label }}</span>
<span class="fz14" v-if="data.Type==2" @dblclick="lt(data)">
<img v-if='!data.Icon' src="../assets/img/litheader.png" style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/>
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon' style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/>
{{ node.label }} <span style="font-size: 12px; color: rgb(105, 105, 105);">{{data.IMAccount}}</span></span>
<img v-if='!data.Icon' src="../assets/img/litheader.png"
style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;" />
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon'
style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;" />
{{ node.label }} <span
style="font-size: 12px; color: rgb(105, 105, 105);">{{data.IMAccount}}</span></span>
</span>
</el-tree>
</div>
<div v-show="contactsType==1" class="IM_messageList" style='top:41px'>
<ul>
<li
v-for="(session, index) in teamList"
class="u-list-item"
:inline-desc="session.lastMsgShow"
:key="session.id"
:sessionId="session.id"
@dblclick="enterChat(session)"
>
<img :src="session.avatar" width="24"/>
<li v-for="(session, index) in teamList" class="u-list-item" :inline-desc="session.lastMsgShow"
:key="session.id" :sessionId="session.id" @dblclick="enterChat(session)">
<img :src="session.avatar" width="24" />
<div class="cont">
<p class="name team" :title='session.name'>{{session.name}}</p>
</div>
<div style="float: right; font-size: 12px; color: #999;height: 38px;line-height: 38px;">
{{diaplayTime(session.updateTime)}}
</div>
<div style="position: absolute; right: 19px; bottom: 16px; background: #E95252; font-size: 12px; color: #fff;height:17px; min-width:17px; text-align:center;border-radius:17px;vertical-align: middle;" v-show="session.unread > 0">{{session.unread}}</div>
<div
style="position: absolute; right: 19px; bottom: 16px; background: #E95252; font-size: 12px; color: #fff;height:17px; min-width:17px; text-align:center;border-radius:17px;vertical-align: middle;"
v-show="session.unread > 0">{{session.unread}}</div>
</li>
</ul>
</div>
......@@ -224,24 +221,27 @@
<div class='IM_contacts' v-show="IM_navType==4">
<div style="padding: 10px; border-bottom: 1px dashed rgba(134,142,148,.4); overflow: hidden;">
<div class="fl" style="width: 300px; margin-right: 10px;">
<el-input prefix-icon="el-icon-search" placeholder='员工姓名，回车搜索' v-model='searchKey' @input='isSearchType' @keyup.enter.native="searchName"></el-input>
<el-input prefix-icon="el-icon-search" placeholder='员工姓名，回车搜索' v-model='searchKey' @input='isSearchType'
@keyup.enter.native="searchName"></el-input>
</div>
<div class="fl" style="font-size: 12px; color: #1BC594; margin-top: 2px; text-align: center;">
<i class="iconfont icon-ico_commodity_defaul" @click="saveGroup" style="cursor: pointer;"></i>
<br/>
<br />
确定
</div>
</div>
<div v-if='!searchType' class="el-tree-style-div">
<el-tree :data='webAllpartList'
:props="defaultProps1">
<el-tree :data='webAllpartList' :props="defaultProps1">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span class="fz14" v-if="data.Type==1">{{ node.label }}</span><!--<span v-if='data.Type==1' class="fz14">({{data.Count}})</span>-->
<span class="fz14" v-if="data.Type==1">{{ node.label }}</span>
<!--<span v-if='data.Type==1' class="fz14">({{data.Count}})</span>-->
<span class="fz14" v-if="data.Type==2">
<label>
<input type="checkbox" :value="data.IMAccount" v-model="IMList" @click="addFriend(data)"/>
<img v-if='!data.Icon' src="../assets/img/litheader.png" style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/>
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon' style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/>
<input type="checkbox" :value="data.IMAccount" v-model="IMList" @click="addFriend(data)" />
<img v-if='!data.Icon' src="../assets/img/litheader.png"
style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;" />
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon'
style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;" />
{{ node.label }}
</label>
</span>
......@@ -252,7 +252,7 @@
<ul>
<li v-for="item in searchList">
<label>
<input type="checkbox" :value="item.imAccount" v-model="IMList" @click="addSearchFriend(item)"/>
<input type="checkbox" :value="item.imAccount" v-model="IMList" @click="addSearchFriend(item)" />
<img v-if="!item.icon" src="../assets/img/litheader.png" alt="">
<img v-else :src="item.icon" alt="" :onerror="defaultImg">
{{item.name}}
......@@ -271,10 +271,7 @@
</span>
</div>
<ul class="_SysNoteDate_ul" v-loading="SystemLog">
<li @click="LogSetReadStatus(session)"
v-for="(session, index) in msgList"
class="u-list-item"
>
<li @click="LogSetReadStatus(session)" v-for="(session, index) in msgList" class="u-list-item">
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">系统</div>
<div class="cont sys_cont">
......@@ -282,7 +279,9 @@
<p class="msg sys_msg">{{session.Content}}</p>
</div>
<div style="float: right; font-size: 12px; color: #999; margin: 12px 0 0;">{{session.CreateTime}}</div>
<div style="float: right; background: #00B5E9; margin: 2px 10px 0 0; font-size: 12px; padding:2px 7px; border-radius: 50%; color: #fff;" v-show="session.unread > 0">{{session.unread}}</div>
<div
style="float: right; background: #00B5E9; margin: 2px 10px 0 0; font-size: 12px; padding:2px 7px; border-radius: 50%; color: #fff;"
v-show="session.unread > 0">{{session.unread}}</div>
</li>
<li class="sysMsg_lod_more" @click="refreshSysNoteDate('a')">
<p>加载更多...</p>
......@@ -307,13 +306,19 @@
<img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg">
&nbsp;
{{item.createEmName}}
<span class="fr" style="font-size: 12px; color: #999;">{{item.createTime|diaplayTime(item.createTime)}}</span>
<span class="fr"
style="font-size: 12px; color: #999;">{{item.createTime|diaplayTime(item.createTime)}}</span>
</p>
<p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'>
<img @click="getPic(item.files,index)" v-if='item.files.length==1' v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_300'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==2||item.files.length==4' style="margin-right: 5px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,w_148,h_150,color_333333'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==3||item.files.length>=5' style="margin: 1px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,h_100,w_100,color_333333'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==1' v-for="(i,index) in item.files"
:src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_300'" />
<img @click="getPic(item.files,index)" v-if='item.files.length==2||item.files.length==4'
style="margin-right: 5px;" v-for="(i,index) in item.files"
:src="i+'?x-oss-process=image/resize,m_pad,w_148,h_150,color_333333'" />
<img @click="getPic(item.files,index)" v-if='item.files.length==3||item.files.length>=5'
style="margin: 1px;" v-for="(i,index) in item.files"
:src="i+'?x-oss-process=image/resize,m_pad,h_100,w_100,color_333333'" />
</p>
<p v-if='item.fileType==2&&item.files.length==1'>
<video :src="item.files[0]" controls="controls" style="width: 100%;">
......@@ -324,9 +329,12 @@
<span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr">
<!--{{item.hasLike}}-->
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike' @click="likeArticle(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticle(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;" @click="reviewIndex=index,reviewCont=''"></i>
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike'
@click="likeArticle(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike'
@click="disLikeArticle(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;"
@click="reviewIndex=index,reviewCont=''"></i>
</span>
</p>
<div class="praiseAndReview">
......@@ -342,14 +350,20 @@
</span>
<ul>
<li v-for="(i,index) in item.commentList">
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
<p v-if="i.byReplayEmpName==null">
<span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1"
@click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small'
@click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
<span>{{i.empName}}</span>&nbsp;回复&nbsp;
<span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1"
@click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small'
@click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
</li>
......@@ -371,12 +385,19 @@
<div class="iconOut">
<div class="iconIn"></div>
</div>
<div style="position: absolute; font-size: 14px; left: -60px; top:3px; width: 50px; height: 24px; text-align: right;">{{item.createTime|diaplayTime(item.createTime)}}</div>
<div
style="position: absolute; font-size: 14px; left: -60px; top:3px; width: 50px; height: 24px; text-align: right;">
{{item.createTime|diaplayTime(item.createTime)}}</div>
<p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'>
<img @click="getPic(item.files,index)" v-if='item.files.length==1' v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_273'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==2||item.files.length==4' style="margin-right: 5px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,w_130,h_120,color_333333'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==3||item.files.length>=5' style="margin: 1px;" v-for="(i,index) in item.files" :src="i+'?x-oss-process=image/resize,m_pad,h_80,w_90,color_333333'"/>
<img @click="getPic(item.files,index)" v-if='item.files.length==1' v-for="(i,index) in item.files"
:src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_273'" />
<img @click="getPic(item.files,index)" v-if='item.files.length==2||item.files.length==4'
style="margin-right: 5px;" v-for="(i,index) in item.files"
:src="i+'?x-oss-process=image/resize,m_pad,w_130,h_120,color_333333'" />
<img @click="getPic(item.files,index)" v-if='item.files.length==3||item.files.length>=5'
style="margin: 1px;" v-for="(i,index) in item.files"
:src="i+'?x-oss-process=image/resize,m_pad,h_80,w_90,color_333333'" />
</p>
<p v-if='item.fileType==2&&item.files.length==1'>
<video :src="item.files[0]" controls="controls" style="width: 100%;">
......@@ -386,9 +407,12 @@
<p class="artcleAddress">
<span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr">
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike' @click="likeArticleOne(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticleOne(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;" @click="reviewIndex=index,reviewCont=''"></i>
<i class="iconfont icon-zan_" style="cursor: pointer;" v-if='!item.hasLike'
@click="likeArticleOne(item.id,index)"></i>
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike'
@click="disLikeArticleOne(item.id,index)"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer;"
@click="reviewIndex=index,reviewCont=''"></i>
<i class="iconfont icon-img_delete_small" style="cursor: pointer;" @click="deleteArticle(item.id)"></i>
</span>
</p>
......@@ -405,15 +429,21 @@
<span class="sjx"></span>
</span>
<ul>
<li v-for="i in item.commentList" >
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
<li v-for="i in item.commentList">
<p v-if="i.byReplayEmpName==null">
<span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1"
@click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small'
@click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
<span>{{i.empName}}</span>&nbsp;回复&nbsp;
<span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1"
@click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small'
@click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
</p>
</li>
</ul>
......@@ -439,16 +469,20 @@
</div>
<div class="middleDiv">
<p>{{item.createEmName}}</p>
<p v-if='item.realtionType==1' style="line-height: 18px; font-size: 12px; color: #666;">{{item.commentContent|decodeURIComponent(item.commentContent)}}</p>
<p v-if='item.realtionType==2'><i class="iconfont icon-zan_" style="color: #E95252; font-size: 12px;"></i></p>
<p style="line-height: 18px; font-size: 12px; color: #999;">{{item.createTime|diaplayTime(item.createTime)}}</p>
<p v-if='item.realtionType==1' style="line-height: 18px; font-size: 12px; color: #666;">
{{item.commentContent|decodeURIComponent(item.commentContent)}}</p>
<p v-if='item.realtionType==2'><i class="iconfont icon-zan_"
style="color: #E95252; font-size: 12px;"></i></p>
<p style="line-height: 18px; font-size: 12px; color: #999;">
{{item.createTime|diaplayTime(item.createTime)}}</p>
</div>
<div class="rightDiv" v-if='item.fileList.length>0'>
<img :src="item.fileList[0]" width="60" height="60"/>
<img :src="item.fileList[0]" width="60" height="60" />
</div>
</div>
<div class="dynamicItembottom" v-if='item.realtionType==1'>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer; font-size: 12px; color: #666;" @click="reviewIndex=index,reviewMsg.commentId=item.commentId,reviewCont=''"></i>
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer; font-size: 12px; color: #666;"
@click="reviewIndex=index,reviewMsg.commentId=item.commentId,reviewCont=''"></i>
<el-input v-if='reviewIndex==index' :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticleTwo(item.id,index)'>确定</el-button>
</el-input>
......@@ -457,25 +491,21 @@
</div>
<div class="IM_cont" v-show="dynamicType==4">
<p style="line-height: 14px; height: 14px; border-left:3px solid #E95252; margin-bottom: 10px; font-size: 14px; text-indent: 10px;">发布动态</p>
<p
style="line-height: 14px; height: 14px; border-left:3px solid #E95252; margin-bottom: 10px; font-size: 14px; text-indent: 10px;">
发布动态</p>
<el-input type="textarea" :rows="4" maxlength='50' placeholder="这一刻你的想法..." v-model='dynamicCont'> </el-input>
<p style="margin: 10px 0;">
<el-upload
action=""
:file-list="imgList"
:http-request="uploadImg"
:multiple="false"
:limit="9"
accept="image/jpeg,image/gif,image/png,image/bmp"
list-type="picture-card"
:on-remove="handleRemoveImg">
<el-upload action="" :file-list="imgList" :http-request="uploadImg" :multiple="false" :limit="9"
accept="image/jpeg,image/gif,image/png,image/bmp" list-type="picture-card" :on-remove="handleRemoveImg">
<i class="el-icon-plus"></i>
</el-upload>
</p>
<input type="button" value="发布" class="normalBtn fr" @click="SaveDynamic"/>
<input type="button" value="发布" class="normalBtn fr" @click="SaveDynamic" />
</div>
<i v-show="dynamicType!=4" class="iconfont icon-fabu" @click="dynamicType=4" style="position: fixed; right: 10px; color: #E95252; font-size: 30px; bottom: 50px; cursor: pointer; z-index: 999999;"></i>
<i v-show="dynamicType!=4" class="iconfont icon-fabu" @click="dynamicType=4"
style="position: fixed; right: 10px; color: #E95252; font-size: 30px; bottom: 50px; cursor: pointer; z-index: 999999;"></i>
<div style="width: 100%; height: 50px;"></div>
</div>
</div>
......@@ -488,7 +518,7 @@
<div class="inlogs_Content" v-html="versionList[0].UpdateContent">
</div>
<input type="button" value="我知道了" class="normalBtn" style="margin:10px 0 15px 155px;" @click="logsShow=false"/>
<input type="button" value="我知道了" class="normalBtn" style="margin:10px 0 15px 155px;" @click="logsShow=false" />
</div>
</div>
<div class="listen">
......@@ -498,7 +528,7 @@
</div>
<div class="temDivs">
<!-- :key="key" -->
<router-view ></router-view>
<router-view></router-view>
<template v-if="showPage">
<div>
<div class="query-box" style="border-bottom: none;display:none;">
......@@ -744,7 +774,7 @@
<div :class="{viewBigPicLayer:true,viewBigPicLayerDisplayNone:dspNone}" @click="closePicLayer">
<i @click="closePicLayer" class="el-icon-circle-close-outline clolseViewBigPicLayer" ></i>
<i @click="closePicLayer" class="el-icon-circle-close-outline clolseViewBigPicLayer"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index">
<div class="inlineDiv ownScrollbarStyle"><img :src="item" /></div>
......@@ -752,15 +782,22 @@
</el-carousel>
</div>
<vue-draggable-resizable v-show="IM_Chatlayer" ref="resizeBox" class="im-box" style="z-index:9999999" active :parent="true" :minw="478" :minh="300" :w="boxInfo.width" :h="boxInfo.height" :x="boxInfo.x" :y="boxInfo.y" :z="9999" :handles="['bm','br','mr']" :drag-handle="'.drag-title'" @resizestop="onResizstop" @dragstop="onDragstop">
<vue-draggable-resizable v-show="IM_Chatlayer" ref="resizeBox" class="im-box" style="z-index:9999999" active
:parent="true" :minw="478" :minh="300" :w="boxInfo.width" :h="boxInfo.height" :x="boxInfo.x" :y="boxInfo.y"
:z="9999" :handles="['bm','br','mr']" :drag-handle="'.drag-title'" @resizestop="onResizstop"
@dragstop="onDragstop">
<div class="IM_message_box_left" v-if="openSessions.length>1">
<ul>
<li v-for="(item,index) in openSessions" :class="{active:item.id==currentSession.id}" @click="enterChat(item)">
<img :src="item.avatar" v-if='item.avatar' :alt='item.name'/>
<img src="../assets/img/litheader.png" v-if='!item.avatar' :alt='item.name'/>
<li v-for="(item,index) in openSessions" :class="{active:item.id==currentSession.id}"
@click="enterChat(item)">
<img :src="item.avatar" v-if='item.avatar' :alt='item.name' />
<img src="../assets/img/litheader.png" v-if='!item.avatar' :alt='item.name' />
<span class="name">{{item.name}}</span>
<i class="iconfont icon-close1" v-show="item.id==currentSession.id" @click.stop="deleteOpenSession(index)"></i>
<div style="position: absolute; right: 5px; bottom: 16px; background: #E95252; font-size: 12px; color: #fff;height:17px; min-width:17px; text-align:center;border-radius:17px;vertical-align: middle;line-height:17px;padding: 0px 3px;" v-if="item.unread>0">{{item.unread}}</div>
<i class="iconfont icon-close1" v-show="item.id==currentSession.id"
@click.stop="deleteOpenSession(index)"></i>
<div
style="position: absolute; right: 5px; bottom: 16px; background: #E95252; font-size: 12px; color: #fff;height:17px; min-width:17px; text-align:center;border-radius:17px;vertical-align: middle;line-height:17px;padding: 0px 3px;"
v-if="item.unread>0">{{item.unread}}</div>
</li>
</ul>
</div>
......@@ -797,7 +834,9 @@
<li v-for="item in oldGroupMemberList" @dbclick="lt(item)">
<img :src="item.avatar" />
<span>
<span style="background:rgb(32, 191, 107);padding:0px 5px; border-radius:5px;color:#F1f1f1;font-size:12px;magin-right:10px;display:inline" v-if="currentSession.teamInfo.owner==item.account">群主</span>
<span
style="background:rgb(32, 191, 107);padding:0px 5px; border-radius:5px;color:#F1f1f1;font-size:12px;magin-right:10px;display:inline"
v-if="currentSession.teamInfo.owner==item.account">群主</span>
{{item.alias}}
</span>
</li>
......@@ -810,14 +849,8 @@
</ul>
</div>
<div class="msg-content-box" id="msg-content">
<chat-list
type="session"
:msglist="msglist"
:userInfos="userInfos"
:robotInfos="robotInfos"
:myInfo="myInfo"
:isRobot="isRobot"
:canLoadMore="canLoadMore"></chat-list>
<chat-list type="session" :msglist="msglist" :userInfos="userInfos" :robotInfos="robotInfos"
:myInfo="myInfo" :isRobot="isRobot" :canLoadMore="canLoadMore"></chat-list>
</div>
<div class="msg-foot-box">
<chat-editor type="session" :isRobot="isRobot"></chat-editor>
......@@ -834,14 +867,17 @@
</div>
<div class="group-body">
<div class="group-body-item">
<input type="text" placeholder="搜索同事" v-model="newSearchContent" class="search-input" @keyup.enter="searchNameV3" @keyup="emptyChangeBox" />
<input type="text" placeholder="搜索同事" v-model="newSearchContent" class="search-input"
@keyup.enter="searchNameV3" @keyup="emptyChangeBox" />
<div class="search-result-box">
<el-tree :data='webAllpartList' v-show="groupboxSearch==0" :props="defaultProps1">
<span class="custom-tree-node" slot-scope="{ node, data }" :style="{'padding':data.Type==2?'5px 0':''}" >
<span class="custom-tree-node" slot-scope="{ node, data }" :style="{'padding':data.Type==2?'5px 0':''}">
<span class="fz14" v-if="data.Type==1">{{ node.label }}</span>
<span class="fz14" v-if="data.Type==2" @click="addFriend(0,data)">
<img v-if='!data.Icon' src="../assets/img/litheader.png" style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/>
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon' style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/>
<img v-if='!data.Icon' src="../assets/img/litheader.png"
style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;" />
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon'
style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;" />
{{ node.label }}</span>
</span>
</el-tree>
......@@ -862,7 +898,7 @@
</li>
</ul>
<div class="search-none-data" v-show="!isLoading&&groupSearchBox.length==0">
<i class="iconfont icon-zanwushuju"></i><br/>
<i class="iconfont icon-zanwushuju"></i><br />
抱歉，没有找到这位无名的大侠
</div>
</div>
......@@ -881,7 +917,8 @@
{{item.Name}}
</p>
</div>
<i class="close iconfont icon-close" @click="deleteFriend(item.IMAccount)" v-if="item.IMAccount!=userInfo.ImAccount"></i>
<i class="close iconfont icon-close" @click="deleteFriend(item.IMAccount)"
v-if="item.IMAccount!=userInfo.ImAccount"></i>
</li>
</ul>
</div>
......@@ -896,7 +933,7 @@
<el-dialog :visible.sync="isUpdateGroup" class="addGroupByAlex" :modal="false">
<div class="title">
修改群组信息
<i class="iconfont icon-jiesan" @click="dismissTeam" title="解散该群" ></i>
<i class="iconfont icon-jiesan" @click="dismissTeam" title="解散该群"></i>
</div>
<div class="cl-name">群组名称</div>
<div class="new-group-name">
......@@ -911,7 +948,8 @@
<span>
{{item.alias}}
</span>
<i class="iconfont icon-close1" v-if="currentSession.teamInfo.owner!=item.account" @click="addDelAccount(item.account)"></i>
<i class="iconfont icon-close1" v-if="currentSession.teamInfo.owner!=item.account"
@click="addDelAccount(item.account)"></i>
<!-- -->
</li>
</ul>
......@@ -922,22 +960,26 @@
<button class="normalBtn" @click="updateTeamName">保存</button>
</div>
</el-dialog>
<el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie2">
<el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center
:before-close="closeChangeMachie2">
<div>
<p style="text-align: right; padding: 5px 0;font-size: 12px;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
<p style="text-align: right; padding: 5px 0;font-size: 12px;">
{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
<div v-html="detailMessage.Content">
</div>
<!-- <pre style="letter-spacing: 1px; font-size: 14px; color: #333;line-height: 30px;">{{detailMessage.Content}}</pre> -->
<p style="padding:0 10px; margin: 10px 0; background: #f1f1f1;">{{$t('adm.adm_fujian')}}：</p>
<p style="height: 28px; padding: 0 10px; line-height: 28px; color: blue;" v-for="item in downLoadList" class="AnnFileListPMeta">
<p style="height: 28px; padding: 0 10px; line-height: 28px; color: blue;" v-for="item in downLoadList"
class="AnnFileListPMeta">
<i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>
</p>
</div>
</el-dialog>
<a class="weOytour" ref="weOytour" href="http://we.oytour.com:8110/" target="view_window">Preface</a>
<el-dialog custom-class='w800 PingFangSC _saleRnk' title="销售排行" :visible.sync="saleRnkShow" center :before-close="closeChangeMachie">
<saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie"/>
<el-dialog custom-class='w800 PingFangSC _saleRnk' title="销售排行" :visible.sync="saleRnkShow" center
:before-close="closeChangeMachie">
<saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie" />
</el-dialog>
<div v-show="mazip==0" id="downzip">
<div>
......@@ -955,19 +997,22 @@
</template>
<script>
import util from "../utils";
import config from "../configs";
import pageUtil from "../utils/page";
import ChatList from "./Chat/chatList";
import ChatEditor from "./Chat/ChatEditor";
//import md5 from 'js-md5'
import emojiObj from "../configs/emoji";
// import Vue from 'vue'
import loading from "./commonPage/loading";
import VueDraggableResizable from "vue-draggable-resizable";
import { setInterval, clearInterval } from 'timers';
import saleRnk from "./SalesModule/saleRnk";
export default {
import util from "../utils";
import config from "../configs";
import pageUtil from "../utils/page";
import ChatList from "./Chat/chatList";
import ChatEditor from "./Chat/ChatEditor";
//import md5 from 'js-md5'
import emojiObj from "../configs/emoji";
// import Vue from 'vue'
import loading from "./commonPage/loading";
import VueDraggableResizable from "vue-draggable-resizable";
import {
setInterval,
clearInterval
} from 'timers';
import saleRnk from "./SalesModule/saleRnk";
export default {
components: {
ChatList,
ChatEditor,
......@@ -981,11 +1026,10 @@ export default {
saleRnkShow: false,
dialogTitleNot: '',
outerVisibleNot: false,
mazip:localStorage.getItem("mazip") ? localStorage.getItem("mazip") : 0,
language:'zh-CN',
douTimer:null,
defaultHeadImg:
'this.src="' + require("../assets/img/default_head_img.jpg") + '"',
mazip: localStorage.getItem("mazip") ? localStorage.getItem("mazip") : 0,
language: 'zh-CN',
douTimer: null,
defaultHeadImg: 'this.src="' + require("../assets/img/default_head_img.jpg") + '"',
delAccountList: [],
isUpdateGroup: false,
groupName: "",
......@@ -1075,9 +1119,9 @@ export default {
displayNone: true,
dialogTitle: "",
outerVisible: false,
logsShow:false,
newVersion:'',
versionList:[],
logsShow: false,
newVersion: '',
versionList: [],
msg: {
ParentId: 0,
MenuStatus: "",
......@@ -1168,8 +1212,8 @@ export default {
NotDealCount: "",
MyAuditCount: "",
sysMsgPageIndex: 1,
firstMenuList:[],
allSsionList:[],
firstMenuList: [],
allSsionList: [],
allWindowWidth: '',
SetTimeout: null,
NoticeList: [],
......@@ -1184,7 +1228,7 @@ export default {
NewSaleRnkInfo: {},
showPage: true,
showPage: false,
tableHeight: 0,
Hotelmsg: {
//酒店选择数组
......@@ -1294,8 +1338,7 @@ export default {
var diffHour = diffValue / hour;
var diffMinute = diffValue / minute;
var result = "";
if (diffValue < 0) {
} else if (diffMonth > 3) {
if (diffValue < 0) {} else if (diffMonth > 3) {
result = timePublish.getFullYear() + "-";
result += timePublish.getMonth() + "-";
result += timePublish.getDate();
......@@ -1316,7 +1359,7 @@ export default {
}
},
computed: {
key(){
key() {
return this.$route.path + Math.random();
},
sysMsgUnread() {
......@@ -1436,7 +1479,7 @@ export default {
}
this.unReadMsgId.push(item.lastMsg.idServer);
}
if(item.lastMsg.tip && item.lastMsg.tip.indexOf('抖了一下')!=-1){
if (item.lastMsg.tip && item.lastMsg.tip.indexOf('抖了一下') != -1) {
this.dou()
this.enterChat(item)
}
......@@ -1497,26 +1540,26 @@ export default {
},
mounted() {
let that = this;
this.MsgBus.$on('doudong',function(){
this.MsgBus.$on('doudong', function () {
that.dou()
});
this.MsgBus.$on('openChat',function(obj){
this.MsgBus.$on('openChat', function (obj) {
that.lt(obj)
});
const permissionNow = Notification.requestPermission();
var hiddenProperty =
"hidden" in document
? "hidden"
: "webkitHidden" in document
? "webkitHidden"
: "mozHidden" in document
? "mozHidden"
: null;
"hidden" in document ?
"hidden" :
"webkitHidden" in document ?
"webkitHidden" :
"mozHidden" in document ?
"mozHidden" :
null;
var visibilityChangeEvent = hiddenProperty.replace(
/hidden/i,
"visibilitychange"
);
var onVisibilityChange = function() {
var onVisibilityChange = function () {
if (!document[hiddenProperty]) {
that.isFocus = true;
} else {
......@@ -1524,11 +1567,11 @@ export default {
}
};
document.addEventListener(visibilityChangeEvent, onVisibilityChange);
if(!localStorage.menu)
if (!localStorage.menu)
this.$store.dispatch("connect");
else{
this.firstMenuList=JSON.parse(localStorage.menu)
if(this.firstMenuList.indexOf('IM')!=-1){
else {
this.firstMenuList = JSON.parse(localStorage.menu)
if (this.firstMenuList.indexOf('IM') != -1) {
this.$store.dispatch("connect");
}
}
......@@ -1540,7 +1583,7 @@ export default {
this.getNoticeList()
document
.getElementById("allDynamic")
.addEventListener("scroll", function() {
.addEventListener("scroll", function () {
//全部动态
if (this.scrollHeight - this.scrollTop === this.clientHeight) {
that.isAppend = true;
......@@ -1550,7 +1593,7 @@ export default {
}
});
document.getElementById("myDynamic").addEventListener("scroll", function() {
document.getElementById("myDynamic").addEventListener("scroll", function () {
//我的动态
if (this.scrollHeight - this.scrollTop === this.clientHeight) {
that.isAppendOne = true;
......@@ -1562,7 +1605,7 @@ export default {
document
.getElementById("aboutMeDynamic")
.addEventListener("scroll", function() {
.addEventListener("scroll", function () {
//与我相关
if (this.scrollHeight - this.scrollTop === this.clientHeight) {
that.isAppendTwo = true;
......@@ -1583,12 +1626,6 @@ export default {
if (this.boxInfo.y == 0) {
this.boxInfo.y = 280;
}
//this.Financial_post_GetNotDealCount();
//this.app_user_workflow_MyAuditCount();
//this.refreshSysNoteDate();
//this.GetUserIsRead();
//this.getNewSaleRnkInfo()
document.title = this.userInfo.GroupName;
this.getMenu();
this.getBranchList();
......@@ -1608,7 +1645,6 @@ export default {
}
},
created() {
//页面刚进入时开启长连接
// this.initWebSocket()
this.userInfo = this.getLocalStorageSupplier();
......@@ -1623,7 +1659,7 @@ export default {
//IM_body
let allWindowWidth = window.innerWidth;
this.allWindowWidth = allWindowWidth - 50 - 220 - 60;
let maxLength = parseInt(allWindowWidth/100);
let maxLength = parseInt(allWindowWidth / 100);
this.maxLength = maxLength;
// this.new();
},
......@@ -1634,6 +1670,7 @@ export default {
},
methods: {
goUrl(url, id, index) {
this.showPage = false;
this.chosenIndex = id;
if (localStorage.openMode && localStorage.openMode == 1)
this.$router.push({
......@@ -1904,7 +1941,7 @@ export default {
this.tableHeight = h;
},
getNewSaleRnkInfo: function(){
getNewSaleRnkInfo: function () {
let msg = {
StartDate: ''
}
......@@ -1917,7 +1954,7 @@ export default {
let New = this.NewSaleRnkInfo.StartDateMonth + this.NewSaleRnkInfo.StartDateDay
let arr = localStorage.saleRnkInfo ? JSON.parse(localStorage.saleRnkInfo) : []
let rep = false
for(let i = 0; i < arr.length; i++){
for (let i = 0; i < arr.length; i++) {
if (arr[i] === New) {
rep = true
return
......@@ -1933,51 +1970,55 @@ export default {
err => {}
);
},
downloadSingle(obj){
downloadSingle(obj) {
let dom = document.querySelector("#groupTourOrderByTuan_DownLoad");
dom.href = obj.Url;
dom.click();
},
closeChangeMachie2(done){
closeChangeMachie2(done) {
this.outerVisibleNot = false
},
closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
this.saleRnkShow= false
this.saleRnkShow = false
},
GetUserIsRead(){
this.ApiPost2('app_user_notice_GetUserIsRead',{},res=>{
if(res.data.resultCode == 1) {
GetUserIsRead() {
this.ApiPost2('app_user_notice_GetUserIsRead', {}, res => {
if (res.data.resultCode == 1) {
if (res.data.data.IsRead === 0) {
this.dialogTitleNot = res.data.data.title;
this.getNotDetail(res.data.data.noticeId)
}
}else{
} else {
this.$message.error(res.data.message)
}
},err=>{})
}, err => {})
},
getNotDetail: function(id) {
this.ApiPost2('User_get_NoticeGet',{noticeId:id},res=>{
if(res.data.resultCode == 1) {
this.detailMessage=res.data.data
this.downLoadList=res.data.data.File_url ? JSON.parse(res.data.data.File_url) : []
this.downLoadList.forEach(item=>{
item.Url=this.domainManager().ViittoFileUrl+item.Url
getNotDetail: function (id) {
this.ApiPost2('User_get_NoticeGet', {
noticeId: id
}, res => {
if (res.data.resultCode == 1) {
this.detailMessage = res.data.data
this.downLoadList = res.data.data.File_url ? JSON.parse(res.data.data.File_url) : []
this.downLoadList.forEach(item => {
item.Url = this.domainManager().ViittoFileUrl + item.Url
})
this.outerVisibleNot = true;
}else{
} else {
this.$message.error(res.data.message)
}
},err=>{})
}, err => {})
},
// 阅读公告
redNotice: function (id, tit) {
this.dialogTitleNot = tit;
this.ApiPost2('app_user_notice_detial',{noticeId:id},res=>{
if(res.data.resultCode == 1) {
this.ApiPost2('app_user_notice_detial', {
noticeId: id
}, res => {
if (res.data.resultCode == 1) {
this.getNotDetail(id)
this.getNoticeList()
}else{
} else {
this.$message.error(res.data.message)
}
})
......@@ -1992,60 +2033,60 @@ export default {
this.NoticeList = res.data.data.pageData;
this.AllNoticeCount = res.data.data.pageCount;
}
},err => {}
);
}, err => {});
},
CloseZip(){
this.mazip=1;
localStorage.setItem("mazip",1);
CloseZip() {
this.mazip = 1;
localStorage.setItem("mazip", 1);
},
ChangeLan(str){
this.language=str;
ChangeLan(str) {
this.language = str;
this.$i18n.locale = str;
localStorage.language = str;
},
settingSys: function () {
this.MsgBus.$emit('settingOpen')
},
hideIM(){
if(this.IM_bodyIsShow){
this.IM_bodyIsShow=false
}
},
dou(){
if(!this.douTimer){
let x=this.boxInfo.x;
let y=this.boxInfo.y;
let t=0;
let c=0;
this.douTimer = setInterval(()=>{
if(t==0)
this.$refs.resizeBox._data.top=y+2
if(t==2)
this.$refs.resizeBox._data.top=y-2
if(t==1)
this.$refs.resizeBox._data.left=x-2
if(t==3){
this.$refs.resizeBox._data.left=x+2
t=0
}else{
hideIM() {
if (this.IM_bodyIsShow) {
this.IM_bodyIsShow = false
}
},
dou() {
if (!this.douTimer) {
let x = this.boxInfo.x;
let y = this.boxInfo.y;
let t = 0;
let c = 0;
this.douTimer = setInterval(() => {
if (t == 0)
this.$refs.resizeBox._data.top = y + 2
if (t == 2)
this.$refs.resizeBox._data.top = y - 2
if (t == 1)
this.$refs.resizeBox._data.left = x - 2
if (t == 3) {
this.$refs.resizeBox._data.left = x + 2
t = 0
} else {
t++
}
c++
if(c==40){
this.$refs.resizeBox._data.top=y
this.$refs.resizeBox._data.left=x
if (c == 40) {
this.$refs.resizeBox._data.top = y
this.$refs.resizeBox._data.left = x
clearInterval(this.douTimer)
this.douTimer=null
this.douTimer = null
}
},25)
}, 25)
}
},
LogSetReadStatus(s) {
this.ApiPost2(
"SystemLog_post_LogSetReadStatus",
{ LogId: s.ID },
"SystemLog_post_LogSetReadStatus", {
LogId: s.ID
},
r => {
if (s.Link) {
this.goUrl(s.Link);
......@@ -2129,8 +2170,7 @@ export default {
var diffHour = diffValue / hour;
var diffMinute = diffValue / minute;
var result = "";
if (diffValue < 0) {
} else if (diffMonth > 3) {
if (diffValue < 0) {} else if (diffMonth > 3) {
result = timePublish.getFullYear() + "-";
result += timePublish.getMonth() + "-";
result += timePublish.getDate();
......@@ -2151,8 +2191,7 @@ export default {
},
Financial_post_GetNotDealCount() {
this.ApiPost2(
"Financial_post_GetNotDealCount",
{},
"Financial_post_GetNotDealCount", {},
r => {
if (r.data.resultCode == 1) {
this.NotDealCount = r.data.data;
......@@ -2163,8 +2202,7 @@ export default {
},
app_user_workflow_MyAuditCount() {
this.ApiPost2(
"app_user_workflow_MyAuditCount",
{},
"app_user_workflow_MyAuditCount", {},
r => {
if (r.data.resultCode == 1) {
this.MyAuditCount = r.data.data;
......@@ -2315,8 +2353,8 @@ export default {
window.localStorage.msgBoxInfo = JSON.stringify(this.boxInfo);
},
changeTools(index) {
if(index==0)
this.newSearchContent='';
if (index == 0)
this.newSearchContent = '';
this.imToolsType = index;
this.searchList = [];
},
......@@ -2374,7 +2412,7 @@ export default {
},
dragDiv() {
if (this.isDrag == true) {
document.onmousemove = function(e) {
document.onmousemove = function (e) {
if (document.getElementById("IM_chatLayer").offsetWidth >= 600) {
document.getElementById("IM_chatLayer").style.width =
document.body.clientWidth - 360 - e.pageX + "px";
......@@ -2753,10 +2791,10 @@ export default {
this.openSessions.push(session);
}
this.currentSession = session;
if(!session.name || session.name==''){
if (!session.name || session.name == '') {
setTimeout(() => {
this.sessionlist.forEach(x=>{
if(session.id==x.id)
this.sessionlist.forEach(x => {
if (session.id == x.id)
this.currentSession = x;
})
}, 1000);
......@@ -2780,8 +2818,8 @@ export default {
obj.name = obj.Name;
obj.avatar = obj.Icon;
}
if(!obj.avatar && obj.icon){
obj.avatar=obj.icon
if (!obj.avatar && obj.icon) {
obj.avatar = obj.icon
}
if (obj.imAccount != null) { // 判断是否有im账号
let session = null;
......@@ -2883,8 +2921,9 @@ export default {
if (this.searchKey != "") {
this.searchType = true;
this.ApiPost2(
"admin_Get_Chat_All_SelectEmpName",
{ EmName: this.searchKey },
"admin_Get_Chat_All_SelectEmpName", {
EmName: this.searchKey
},
res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
......@@ -2901,8 +2940,9 @@ export default {
this.searchList = [];
this.isLoading = true;
this.ApiPost2(
"admin_Get_Chat_All_SelectEmpName",
{ EmName: this.newSearchContent },
"admin_Get_Chat_All_SelectEmpName", {
EmName: this.newSearchContent
},
res => {
if (res.data.resultCode == 1) {
if (res.data.data.length > 1) {
......@@ -2938,8 +2978,9 @@ export default {
this.groupSearchBox = [];
this.isLoading = true;
this.ApiPost2(
"admin_Get_Chat_All_SelectEmpName",
{ EmName: this.newSearchContent },
"admin_Get_Chat_All_SelectEmpName", {
EmName: this.newSearchContent
},
res => {
if (res.data.resultCode == 1) {
if (res.data.data.length > 1) {
......@@ -2983,15 +3024,14 @@ export default {
getWebAllPart() {
let msg = {
RB_Department_Id:240
RB_Department_Id: 240
}
this.ApiPost2(
"admin_Get_GetCompanyDepartMentEmployeeForChar_V2",msg,
"admin_Get_GetCompanyDepartMentEmployeeForChar_V2", msg,
res => {
if (res.data.resultCode == 1) {
this.webAllpartList = res.data.data;
} else {
}
} else {}
},
err => {}
);
......@@ -3003,8 +3043,9 @@ export default {
this.isAppendOne = false;
this.dynamicMsg.pageIndex = Math.ceil((index + 1) / 10);
this.ApiPost2(
"user_dynamic_delete_comment",
{ commentId: id },
"user_dynamic_delete_comment", {
commentId: id
},
res => {
if (res.data.resultCode == 1) {
this.getDynamic(index);
......@@ -3026,8 +3067,9 @@ export default {
this.isAppendOne = false;
this.myDynamicMsg.pageIndex = Math.ceil((index + 1) / 10);
this.ApiPost2(
"user_dynamic_delete_comment",
{ commentId: id },
"user_dynamic_delete_comment", {
commentId: id
},
res => {
if (res.data.resultCode == 1) {
this.getMyDynamic(index);
......@@ -3344,8 +3386,7 @@ export default {
this.aboutMyDynamicList = this.aboutMyDynamicList.concat(
res.data.data.pageData
);
} else {
}
} else {}
}
},
err => {}
......@@ -3359,7 +3400,9 @@ export default {
this.UploadSelfFileT(path, newArr, x => {
let url = this.domainManager().ViittoFileUrl + x.data.FilePath
this.addDynamicMsg.fileList.push(url);
this.imgList.push({ url: url });
this.imgList.push({
url: url
});
});
},
handleRemoveImg(file) {
......@@ -3383,7 +3426,9 @@ export default {
this.UploadSelfFileT(path, newArr, x => {
let src = this.domainManager().ViittoFileUrl + x.data.FilePath
this.appMsg.Image.push(src);
this.fileList.push({ url: src});
this.fileList.push({
url: src
});
});
},
handleRemove(file) {
......@@ -3481,8 +3526,10 @@ export default {
})
.then(() => {
this.ApiPost2(
"app_user_workflow_wndoaudit",
{ workFlowId: workFlowId, templateType: templateType },
"app_user_workflow_wndoaudit", {
workFlowId: workFlowId,
templateType: templateType
},
res => {
if (res.data.resultCode == 1) {
this.$message.success("撤回成功。");
......@@ -3513,8 +3560,7 @@ export default {
this.workFlowId = workFlowId;
this.templateType = templateType;
this.ApiPost2(
"WorkFlow_get_GetDepartMentEmployee",
{},
"WorkFlow_get_GetDepartMentEmployee", {},
res => {
if (res.data.resultCode == 1) {
this.memberList = res.data.data;
......@@ -3577,8 +3623,11 @@ export default {
let WorkFlowId = JSON.parse(link).workFlowId;
let TemplateType = JSON.parse(link).templateType;
this.ApiPost2(
"app_user_workflow_GetAuditInfo",
{ SysLogId: id, WorkFlowId: WorkFlowId, TemplateType: TemplateType },
"app_user_workflow_GetAuditInfo", {
SysLogId: id,
WorkFlowId: WorkFlowId,
TemplateType: TemplateType
},
res => {
if (res.data.resultCode == 1) {
this.detailList = res.data.data;
......@@ -3596,29 +3645,39 @@ export default {
},
closeLayer() {
let _this = this;
setTimeout(function() {
setTimeout(function () {
_this.showlayer = false;
}, 300);
this.isTransition = false;
this.displayNone = true;
},
goUrlT(url, index, name) {
let query={
let query = {
Conditon: index
}
if(localStorage.openMode && localStorage.openMode==1){
query.tab=name
query.blank='y'
if (localStorage.openMode && localStorage.openMode == 1) {
query.tab = name
query.blank = 'y'
}
// if (index!=-1) {
this.$router.push({ path: url, query });
this.$router.push({
path: url,
query
});
// } else {
// this.$router.push({ path: url });
// }
},
goUrlPayment() {
let eid=this.getLocalStorage().EmployeeId;
this.$router.push({ path: 'empBankAccount', query: { id: eid,type:10,blank:'y' } });
let eid = this.getLocalStorage().EmployeeId;
this.$router.push({
path: 'empBankAccount',
query: {
id: eid,
type: 10,
blank: 'y'
}
});
},
exit() {
......@@ -3641,8 +3700,9 @@ export default {
},
setMsgRead(id) {
this.ApiPost2(
"SystemLog_post_LogSetReadStatus",
{ LogId: id },
"SystemLog_post_LogSetReadStatus", {
LogId: id
},
res => {},
err => {}
);
......@@ -3673,14 +3733,16 @@ export default {
} else {
setPermission();
}
function setPermission() {
//请求获取通知权限
NotificationInstance.requestPermission(function(PERMISSION) {
NotificationInstance.requestPermission(function (PERMISSION) {
if (PERMISSION === "granted") {
CreatNotification();
}
});
}
function CreatNotification() {
const n = new NotificationInstance(msg.name, {
body: msg.lastMsgShow,
......@@ -3691,9 +3753,8 @@ export default {
session: msg
}
});
n.onshow = function() {
};
n.onclick = function(e) {
n.onshow = function () {};
n.onclick = function (e) {
//可以直接通过实例的方式获取data内自定义的数据
//也可以通过访问回调参数e来获取data的数据
_that.enterChat(e.data.session);
......@@ -3702,9 +3763,8 @@ export default {
_that.IM_bodyIsShow = true;
n.close();
};
n.onclose = function() {
};
n.onerror = function(err) {
n.onclose = function () {};
n.onerror = function (err) {
throw err;
};
setTimeout(() => {
......@@ -3716,134 +3776,157 @@ export default {
deletMsg(type) {
let LogStr = [],
ContentType = [];
this.msgList.forEach(x=>{
this.msgList.forEach(x => {
LogStr.push(x.ID)
ContentType.push(x.ContentType)
})
this.ApiPost2('SystemLog_post_SetReadStatusBatch',{LogStr:LogStr,ContentType:ContentType},r=>{
if(r.data.resultCode==1){
this.ApiPost2('SystemLog_post_SetReadStatusBatch', {
LogStr: LogStr,
ContentType: ContentType
}, r => {
if (r.data.resultCode == 1) {
this.msgList = [];
this.MsgCount = this.msgList.length;
}else{
} else {
this.$message.error(r.data.message);
}
},null)
}, null)
}
},
};
};
</script>
<style lang="less">
@import "../assets/css/main.less";
@import "../assets/css/cssReset.css";
@import "../assets/css/message.css";
#downzip{
@import "../assets/css/main.less";
@import "../assets/css/cssReset.css";
@import "../assets/css/message.css";
#downzip {
width: 100%;
height: 100%;
position: fixed;
background: rgba(0,0,0,0.3);
background: rgba(0, 0, 0, 0.3);
top: 0;
left: 0;
z-index: 2000;
display: table;
}
#downzip>div{
#downzip>div {
display: table-cell;
vertical-align: middle;
margin-top: 200px;
}
#downzip>div>div{
width:285px;
#downzip>div>div {
width: 285px;
height: 260px;
margin: 0 auto;
position: relative;
cursor: pointer;
}
.close{
.close {
position: absolute;
top: 0;
right: 0px;
width: 25px;
height: 25px;
}
.changelanguage{
width:124px;
}
.changelanguage .el-dropdown-menu__item .icon-duigou{
color:#000000;
.changelanguage {
width: 124px;
}
.changelanguage .el-dropdown-menu__item .icon-duigou {
color: #000000;
position: absolute;
right: 10px;
font-size: 14px;
}
.changelanguage .el-dropdown-menu__item{
padding:0;
padding-left:15px;
}
.changelanguage .el-dropdown-menu__item {
padding: 0;
padding-left: 15px;
font-size: 14px;
position: relative;
color:#333333;
}
.changelanguage .el-dropdown-menu__item:hover{
color: #333333;
}
.changelanguage .el-dropdown-menu__item:hover {
background: #D9D9D9;
color:#333333;
}
._dropdown.el-dropdown-menu {
color: #333333;
}
._dropdown.el-dropdown-menu {
padding: 0;
background-color: #1f2533 !important;
border-radius: 4px;
overflow: hidden;
width: 210px;
top: 40px !important;
}
._dropdown_f1.el-dropdown-menu__item {
}
._dropdown_f1.el-dropdown-menu__item {
background-color: #4d515b !important;
color: #ffffff !important;
cursor: default;
height: 50px;
line-height: 50px;
}
._dropdown_f1.el-dropdown-menu__item .company {
}
._dropdown_f1.el-dropdown-menu__item .company {
font-size: 14px;
display: flex;
justify-content: space-between;
align-items: center;
}
._dropdown_f1.el-dropdown-menu__item .company span:nth-child(2) {
}
._dropdown_f1.el-dropdown-menu__item .company span:nth-child(2) {
display: inline-block;
padding: 3px 8px;
background-color: #007eff;
border-radius: 9px;
line-height: 18px;
font-size: 12px;
}
._dropdown_f1.el-dropdown-menu__item:hover,
._dropdown_f1.el-dropdown-menu__item:focus {
}
._dropdown_f1.el-dropdown-menu__item:hover,
._dropdown_f1.el-dropdown-menu__item:focus {
background-color: #4d515b !important;
color: #ffffff !important;
}
._dropdown_other.el-dropdown-menu__item {
}
._dropdown_other.el-dropdown-menu__item {
color: #a9aaad;
position: relative;
}
._dropdown_other.el-dropdown-menu__item .el-badge {
}
._dropdown_other.el-dropdown-menu__item .el-badge {
position: absolute;
right: 20px;
top: 5px;
}
._dropdown_other.el-dropdown-menu__item i {
}
._dropdown_other.el-dropdown-menu__item i {
color: #a9aaad;
display: inline-block;
margin-right: 6px;
}
._dropdown_other.el-dropdown-menu__item:hover,
._dropdown_other.el-dropdown-menu__item:focus {
}
._dropdown_other.el-dropdown-menu__item:hover,
._dropdown_other.el-dropdown-menu__item:focus {
background-color: #6f737b !important;
color: #ffffff !important;
}
._dropdown .popper__arrow::after {
}
._dropdown .popper__arrow::after {
border-bottom-color: transparent !important;
}
.IM_body {
}
.IM_body {
position: absolute;
z-index: 9999;
right: 0;
......@@ -3858,36 +3941,39 @@ export default {
background-image: url("../assets/img/imbg/1.png");
box-shadow: 1px 1px 50px rgba(0, 0, 0, 0.3);
background-clip: content-box;
}
.myDocumentsLink {
}
.myDocumentsLink {
margin: 25px 0;
}
}
.myDocumentsLink > span {
.myDocumentsLink>span {
font-size: 12px;
cursor: pointer;
color: #e95252;
}
}
.myDocumentsLink > span:not(:last-of-type):hover {
.myDocumentsLink>span:not(:last-of-type):hover {
text-decoration: underline;
}
}
.myDocumentsLink > span:not(:last-of-type):after {
.myDocumentsLink>span:not(:last-of-type):after {
content: ">";
margin: 0 3px;
color: #e95252;
pointer-events: none;
}
}
.myDocumentsLink > span:last-child {
.myDocumentsLink>span:last-child {
color: #666;
cursor: default;
}
.dsyNone {
}
.dsyNone {
display: none;
}
.indexMsgLayer {
}
.indexMsgLayer {
position: fixed;
z-index: 999;
background: rgba(0, 0, 0, 0.2);
......@@ -3895,8 +3981,9 @@ export default {
height: 100%;
left: 0;
top: 0;
}
.indexMsgLayerContent {
}
.indexMsgLayerContent {
width: 400px;
background: #fff;
z-index: 1100;
......@@ -3907,109 +3994,128 @@ export default {
position: absolute;
box-shadow: 4px 0px 10px rgba(0, 0, 0, 0.1);
transition: right 0.5s;
}
.indexMsgLayerContent.rightZero {
}
.indexMsgLayerContent.rightZero {
right: 0px;
}
.indexMsgLayerContent .title {
}
.indexMsgLayerContent .title {
height: 48px;
background: #edeef0;
line-height: 48px;
font-size: 16px;
color: #333;
text-indent: 30px;
}
.indexMsgLayerContent .user {
}
.indexMsgLayerContent .user {
width: 340px;
margin: 0 30px;
border-bottom: 1px solid #e6e6e6;
height: 60px;
padding: 30px 0;
box-sizing: content-box;
}
.indexMsgLayerContent .user > p {
}
.indexMsgLayerContent .user>p {
line-height: 28px;
}
.indexMsgLayerContent .user > img {
}
.indexMsgLayerContent .user>img {
width: 58px;
height: 58px;
border-radius: 29px;
float: left;
margin: 0 12px 0 0;
}
.indexMsgLayerContent .detail {
}
.indexMsgLayerContent .detail {
width: 340px;
margin: 0 30px;
padding: 25px 0;
border-bottom: 1px solid #e6e6e6;
min-height: 120px;
}
.indexMsgLayerContent .audit {
}
.indexMsgLayerContent .audit {
width: 340px;
margin: 30px 30px 0;
min-height: 120px;
border-bottom: 1px solid #e6e6e6;
}
.indexMsgLayerContent .audit .auditItem {
}
.indexMsgLayerContent .audit .auditItem {
min-height: 80px;
width: 320px;
margin-left: 20px;
border-left: 1px solid #ededed;
position: relative;
font-size: 14px;
}
.indexMsgLayerContent .audit .auditItem:last-child {
}
.indexMsgLayerContent .audit .auditItem:last-child {
border-left: none;
}
.indexMsgLayerContent .audit .auditItem > p {
}
.indexMsgLayerContent .audit .auditItem>p {
line-height: 40px;
text-indent: 40px;
}
.indexMsgLayerContent .audit .auditItem > img {
}
.indexMsgLayerContent .audit .auditItem>img {
width: 40px;
height: 40px;
border-radius: 20px;
position: absolute;
left: -20px;
}
.indexMsgLayerContent .send {
}
.indexMsgLayerContent .send {
width: 340px;
margin: 30px 30px 0;
min-height: 120px;
}
.indexMsgLayerContent .send .sentTitle {
}
.indexMsgLayerContent .send .sentTitle {
height: 14px;
line-height: 14px;
text-indent: 10px;
border-left: 3px solid #e95252;
font-size: 14px;
}
.indexMsgLayerContent .send .sentTitle span {
}
.indexMsgLayerContent .send .sentTitle span {
color: #666;
margin-left: 20px;
}
.indexMsgLayerContent .send .sendList > div {
}
.indexMsgLayerContent .send .sendList>div {
float: left;
margin: 10px 10px 0 0;
font-size: 12px;
color: #666;
width: 40px;
text-align: center;
}
.indexMsgLayerContent .send .sendList > div > img {
}
.indexMsgLayerContent .send .sendList>div>img {
width: 40px;
height: 40px;
border-radius: 20px;
}
.indexMsgLayerContent .myApprovalTable tr {
}
.indexMsgLayerContent .myApprovalTable tr {
height: 40px;
font-size: 14px;
}
.indexMsgLayerContent .myApprovalTable tr td:nth-child(1) {
}
.indexMsgLayerContent .myApprovalTable tr td:nth-child(1) {
text-align: right;
color: #666;
}
.indexMsgLayerContentBtn {
}
.indexMsgLayerContentBtn {
position: fixed;
bottom: 0;
background: #fff;
......@@ -4018,16 +4124,19 @@ export default {
line-height: 40px;
padding: 0 30px;
border-top: 1px solid #f0f3fa;
}
.indexMsgLayerContentBtn input {
}
.indexMsgLayerContentBtn input {
margin-right: 10px;
}
.Supplier_nav_right ul li.user_head .el-dropdown-link {
}
.Supplier_nav_right ul li.user_head .el-dropdown-link {
display: flex;
align-items: center;
cursor: pointer;
}
.Supplier_nav_right ul li.user_head span.name {
}
.Supplier_nav_right ul li.user_head span.name {
color: #99a7b3;
font-size: 12px;
display: inline-block;
......@@ -4035,59 +4144,70 @@ export default {
overflow: hidden;
width: 45px;
height: 50px;
}
.Supplier_nav_right ul li.user_head img {
}
.Supplier_nav_right ul li.user_head img {
width: 24px;
height: 24px;
border-radius: 50%;
}
.nav {
}
.nav {
display: -webkit-box;
.size(100%, 50px);
.min-width(1366px);
background: #1f2533;
}
.nav-left {
}
.nav-left {
width: 56px;
line-height: 50px;
color: #e73828;
text-align: center;
}
.nav-left .GroupPic{
}
.nav-left .GroupPic {
width: 36px;
height: 36px;
-webkit-border-radius: 36px;
margin: 7px 0px 0px 15px;
}
.nav-left i.iconfont {
}
.nav-left i.iconfont {
font-size: 24px;
}
.nav-left img {
}
.nav-left img {
.fl();
.size(50px;50px);
.size(50px; 50px);
.circle(25px);
}
.nav-left p.name {
}
.nav-left p.name {
.fz(14px, 18px);
color: #444;
margin: 20px 0 5px 0;
}
.nav-left p.company {
}
.nav-left p.company {
.fz(12px);
color: #444;
}
.nav-middle {
}
.nav-middle {
/*width: calc(100% - 140px);*/
display: flex;
}
.nav-middle ul {
}
.nav-middle ul {
width: 100%;
margin: 0 auto;
height: 100%;
z-index: 2019128;
}
.nav-middle ul li {
}
.nav-middle ul li {
.size(100px, 100%);
.fz(14px);
.center(text-x);
......@@ -4097,16 +4217,19 @@ export default {
padding: 12px 0;
float: left;
z-index: 2019128;
}
.nav-middle ul li i {
}
.nav-middle ul li i {
font-size: 16px;
color: #a6adb4;
}
.nav-middle ul li img {
}
.nav-middle ul li img {
height: 40px;
margin: 32px 0 14px;
}
.nav-middle ul li:hover .menuList_son{
}
.nav-middle ul li:hover .menuList_son {
// display: block;
width: 1000px;
z-index: 999999;
......@@ -4114,20 +4237,24 @@ export default {
padding: 20px 0 20px 20px;
height: auto;
// transition: all .5s linear .5s;
animation:ttt .5s forwards;
}
@keyframes ttt {
0%{
opacity:0;
animation: ttt .5s forwards;
}
66%{
opacity:0;
@keyframes ttt {
0% {
opacity: 0;
}
100%{
opacity:1;
66% {
opacity: 0;
}
}
.nav-middle ul li .menuList_son{
100% {
opacity: 1;
}
}
.nav-middle ul li .menuList_son {
position: fixed;
z-index: 9000;
background-color: #363c4a;
......@@ -4137,102 +4264,122 @@ export default {
padding: 0;
overflow: hidden;
height: 0;
}
.menuList_tittle_box{
}
.menuList_tittle_box {
line-height: 30px;
padding-top: 15px;
}
.menuList_son_one_tittle{
}
.menuList_son_one_tittle {
color: #a6adb4;
font-size: 16px;
padding-bottom: 15px;
border-bottom: 1px solid #495165;
text-align: left;
}
.menuList_son_two_tittle{
}
.menuList_son_two_tittle {
color: #e9ebec;
text-align: left;
}
.menuList_son_three_tittle{
}
.menuList_son_three_tittle {
cursor: pointer;
transition: all linear .3s;
text-align: left;
}
.menuList_son_three_tittle:hover{
}
.menuList_son_three_tittle:hover {
color: white;
}
.menuList_son_item{
}
.menuList_son_item {
width: 100%;
display: flex;
justify-content: flex-start;
}
.hoverNote {
}
.hoverNote {
width: 0;
height: 4px;
background: #e95252;
position: absolute;
left: 0;
bottom: -2px;
}
.nav-middle ul li:hover {
}
.nav-middle ul li:hover {
background-color: #2f384d;
}
.nav-middle ul li:hover .hoverNote {
}
.nav-middle ul li:hover .hoverNote {
width: 100%;
transition: width 0.3s;
}
.nav-middle ul li i {
}
.nav-middle ul li i {
color: #a6adb4;
display: inline-block;
margin-right: 12px;
}
.big_tittle{
}
.big_tittle {
cursor: pointer;
}
.nav-middle ul li.active .big_tittle{
}
.nav-middle ul li.active .big_tittle {
color: #ffffff;
// background: #2f384d;
cursor: pointer;
}
}
.nav-middle ul li.active .hoverNote {
.nav-middle ul li.active .hoverNote {
width: 100%;
}
.Supplier_nav_right {
}
.Supplier_nav_right {
min-width: 220px;
position: absolute;
right: 0;
}
.Supplier_nav_right ul {
}
.Supplier_nav_right ul {
display: flex;
line-height: 50px;
justify-content: flex-end;
}
.Supplier_nav_right ul li {
}
.Supplier_nav_right ul li {
height: 50px;
margin-right: 20px;
text-align: center;
justify-content: flex-end;
}
.Supplier_nav_right ul li i {
}
.Supplier_nav_right ul li i {
cursor: pointer;
.fz(18px);
color: #e4e4e4;
}
.Supplier_nav_right ul li i:hover {
}
.Supplier_nav_right ul li i:hover {
color: #999;
}
.hide {
}
.hide {
display: none;
}
#message_box {
}
#message_box {
position: fixed;
left: 0;
top: 0;
z-index: 1889;
font-family: "PingFangSC-fine" !important;
}
.box {
}
.box {
height: 100%;
background-color: rgba(255, 255, 255, 0);
overflow: hidden;
......@@ -4241,55 +4388,70 @@ export default {
top: 0;
z-index: 180;
width: 100%;
}
.mybox-leave-active {
}
.mybox-leave-active {
transition: all 1s ease;
}
.mybox-enter-active {
}
.mybox-enter-active {
transition: all 0.5s ease;
}
.mybox-leave-active,
.mybox-enter {
}
.mybox-leave-active,
.mybox-enter {
right: -100% !important;
}
.mybox-leave,
.mybox-enter-active {
}
.mybox-leave,
.mybox-enter-active {
right: 0;
}
.noNewMsg {
}
.noNewMsg {
font-size: 16px;
color: #999;
text-align: center;
}
@keyframes zy {
}
@keyframes zy {
10% {
transform: rotate(15deg);
}
20% {
transform: rotate(-10deg);
}
30% {
transform: rotate(5deg);
}
40% {
transform: rotate(-5deg);
}
50%,
100% {
transform: rotate(0deg);
}
}
.animation::before {
}
.animation::before {
color: #e95252;
float: left;
width: 18px;
height: 27px;
animation: zy 2.5s 0.15s linear infinite;
-moz-animation: zy 2.5s 0.15s linear infinite; /* Firefox */
-webkit-animation: zy 2.5s 0.15s linear infinite; /* Safari and Chrome */
-o-animation: zy 2.5s 0.15s linear infinite; /* Opera */
}
#message_box .content {
-moz-animation: zy 2.5s 0.15s linear infinite;
/* Firefox */
-webkit-animation: zy 2.5s 0.15s linear infinite;
/* Safari and Chrome */
-o-animation: zy 2.5s 0.15s linear infinite;
/* Opera */
}
#message_box .content {
width: 350px;
height: 100%;
background-image: url("../assets/img/message_bg@3x.png");
......@@ -4298,58 +4460,73 @@ export default {
right: 0;
top: 0;
z-index: 200;
}
#message_box .header {
}
#message_box .header {
padding: 18px 20px;
height: 6%;
}
#message_box .header i {
}
#message_box .header i {
color: #e95252;
font-size: 18px;
cursor: pointer;
}
#message_box .header > div {
}
#message_box .header>div {
width: 50%;
float: left;
}
#message_box .header > div:nth-child(2) {
}
#message_box .header>div:nth-child(2) {
text-align: right;
}
#message_box .header i.icon-img_caidan {
}
#message_box .header i.icon-img_caidan {
font-size: 16px;
}
#message_box .header > div:nth-child(2) .icon-img_delete_small {
}
#message_box .header>div:nth-child(2) .icon-img_delete_small {
display: inline-block;
margin-right: 38px;
}
.msgItem_box {
}
.msgItem_box {
height: 94%;
overflow: auto;
}
#message_box .msgItem {
}
#message_box .msgItem {
padding: 20px;
transition: all linear 0.5s;
cursor: pointer;
}
#message_box .msgItem:hover {
}
#message_box .msgItem:hover {
background: rgba(0, 0, 0, 0.1);
}
#message_box .msgItem:hover .icon-ego-guanbi {
}
#message_box .msgItem:hover .icon-ego-guanbi {
display: inline-block;
}
.msgItem_left {
}
.msgItem_left {
width: 40px;
}
.msgItem_right {
}
.msgItem_right {
width: 250px;
}
.msgItem_right > div > div {
}
.msgItem_right>div>div {
float: left;
}
.msgItem_right > div > div:nth-child(2) {
}
.msgItem_right>div>div:nth-child(2) {
float: right;
}
.msgItem_tit {
}
.msgItem_tit {
padding-left: 10px;
font-size: 14px;
color: #333333;
......@@ -4357,13 +4534,15 @@ export default {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.msgItem_left,
.msgItem_right {
}
.msgItem_left,
.msgItem_right {
height: 80px;
float: left;
}
.msgItem_radius {
}
.msgItem_radius {
height: 38px;
width: 38px;
line-height: 38px;
......@@ -4372,80 +4551,100 @@ export default {
background-color: #6694dc;
font-size: 12px;
color: white;
}
.msgItem_time {
}
.msgItem_time {
font-size: 14px;
color: #999999;
}
.icon-ego-guanbi {
}
.icon-ego-guanbi {
font-size: 12px;
color: #999999;
cursor: pointer;
display: inline-block;
padding-left: 20px;
display: none;
}
.msgItem_conten {
}
.msgItem_conten {
padding: 10px;
font-size: 12px;
color: #666666;
padding-bottom: 0;
}
.icon-imessage_top {
}
.icon-imessage_top {
animation: mymove 5s infinite;
-webkit-animation: mymove 5s infinite; /*Safari and Chrome*/
}
@keyframes mymove {
-webkit-animation: mymove 5s infinite;
/*Safari and Chrome*/
}
@keyframes mymove {
from {
left: 0px;
}
to {
left: 200px;
}
}
@-webkit-keyframes mymove /*Safari and Chrome*/ {
}
@-webkit-keyframes mymove
/*Safari and Chrome*/
{
from {
left: 0px;
}
to {
left: 200px;
}
}
.temDivs {
}
.temDivs {
/*flex:1;margin-top: 2px;*/
position: absolute;
top: 50px;
bottom: 0px;
left: 0px;
right: 0px;
}
.red {
}
.red {
color: #e95252 !important;
}
.weOytour {
}
.weOytour {
display: none;
}
.sysMsg_lod_more {
}
.sysMsg_lod_more {
text-align: center;
font-size: 12px;
color: #999999;
}
.IM_messageList2{
}
.IM_messageList2 {
top: 41px;
}
.IM_messageList ul li.sysMsg_lod_more:hover {
}
.IM_messageList ul li.sysMsg_lod_more:hover {
background-color: inherit;
height: auto;
line-height: 35px;
}
.IM_messageList ._SysNoteDate_ul li {
}
.IM_messageList ._SysNoteDate_ul li {
height: auto;
}
._more_dropdown._dropdown.el-dropdown-menu{
}
._more_dropdown._dropdown.el-dropdown-menu {
top: 50px !important;
}
}
.logsBack{
.logsBack {
position: fixed;
z-index: 999;
background: rgba(0, 0, 0, 0.2);
......@@ -4453,58 +4652,67 @@ export default {
height: 100%;
left: 0;
top: 0;
}
.updateLogs{
}
.updateLogs {
position: absolute;
width:400px;
width: 400px;
// height:400px;
left:50%;
top:50%;
margin-left:-200px;
margin-top:-200px;
left: 50%;
top: 50%;
margin-left: -200px;
margin-top: -200px;
border-radius: 4px;
border:1px solid #DCDCDC;
border: 1px solid #DCDCDC;
z-index: 9999;
background-color: #fff;
}
.logsTitle{
width:100%;
padding:0 10px;
}
.logsTitle {
width: 100%;
padding: 0 10px;
text-align: center;
color:#333333;
font-size:14px;
margin-top:10px;
color: #333333;
font-size: 14px;
margin-top: 10px;
font-weight: bold;
}
.inlogs_Content{
width:100%;
padding:0 15px;
}
.inlogs_Content {
width: 100%;
padding: 0 15px;
// height:260px;
overflow: auto;
margin-top:20px;
color:#666666;
font-size:12px;
}
.inlogs_Content p{
margin-bottom:10px;
}
.logsImg{
margin-top:-30px;
margin-left:155px;
}
._saleRnk.el-dialog--center{
margin-top: 20px;
color: #666666;
font-size: 12px;
}
.inlogs_Content p {
margin-bottom: 10px;
}
.logsImg {
margin-top: -30px;
margin-left: 155px;
}
._saleRnk.el-dialog--center {
z-index: 2019523;
}
._saleRnk.el-dialog--center .el-dialog__body{
}
._saleRnk.el-dialog--center .el-dialog__body {
padding: 0;
max-height: 800px;
}
._saleRnk.el-dialog--center{
}
._saleRnk.el-dialog--center {
margin-top: 45px !important;
margin-bottom: 0 !important;
height: 850px;
}
.Supplier_nav_right ul li.user_head span.SupplierName {
}
.Supplier_nav_right ul li.user_head span.SupplierName {
color: #99a7b3;
font-size: 12px;
display: inline-block;
......@@ -4512,12 +4720,13 @@ export default {
overflow: hidden;
min-width: 45px;
height: 50px;
}
.SupplierIndex_Nav ul li{
margin-left:20px;
}
}
.classHong {
.SupplierIndex_Nav ul li {
margin-left: 20px;
}
.classHong {
background-color: rgb(255, 55, 55);
color: #fff;
}
......@@ -4632,4 +4841,6 @@ export default {
.HotelQueryList .el-table td {
padding: 0;
}</style>
}
</style>
src/components/SupplierLogin.vue
View file @ 80f8ac78
......@@ -48,7 +48,7 @@
<div class="homepage-hero-module">
<div :style="{'height':'100vh'}">
<div class="item">
<img :style="{'height':'100vh'}" src="../assets/img/supplierBg.png" />
<img :style="{'height':'100vh'}" src="../assets/img/supplierBg.jpg" />
</div>
</div>
</div>
......
src/components/activity/ItineraryCustomizer.vue
View file @ 80f8ac78
......@@ -60,7 +60,7 @@
<el-dialog custom-class='w400' title="行程定制师" :visible.sync="Visible">
<el-form :model="pwdMsg" label-width="80px" :rules="rulesPwd" ref="pwdMsg">
<el-form-item label="员工ID" prop="employeeId">
<el-select class='w217' v-model="pwdMsg.employeeId" placeholder="请选择">
<el-select class='w217' v-model="pwdMsg.employeeId" filterable placeholder="请选择">
<el-option v-for="item in employee" :key="item.employeeId" :label="`${item.bName} ${item.departmentName}(${item.name})`" :value="item.employeeId"></el-option>
</el-select>
</el-form-item>
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 80f8ac78
......@@ -235,7 +235,7 @@
</td>
<td>
<div class="fz16 fbold linkspan">
<span @click="goUrlRR('confirmationOrderDownLoad',item)" style="color: #4BCA81;"
<span @click="toTrip(item)" style="color: #4BCA81;"
v-if="item.ResultReport.LetterDeparture==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.LetterDeparture=='-1'?"x":"O"}}</span>
</div>
......@@ -423,15 +423,22 @@
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
<el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1"></tripDownLoadCommon>
</el-dialog>
</div>
</template>
<script>
import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue";
export default {
data() {
return {
loading: false,
currentPage: 1,
total: 0,
travelControlTripLayerShow: false,
msg: {
StartDate: '',
EndDate: '',
......@@ -471,6 +478,12 @@
AirlineList: [],
EmployeeList: [],
},
tripObj: {
tcid: 0,
configId: 0,
cityId: 0,
orderId: 0
},
pickerBeginDateBefore: {
disabledDate: time => {
if (this.msg.EndDate == null) {
......@@ -489,6 +502,9 @@
}
}
},
components: {
tripDownLoadCommon
},
methods: {
openChart(obj) {
this.MsgBus.$emit('openChat', {
......@@ -720,6 +736,16 @@
err => {}
)
},
toTrip: function (obj) {
this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigID;
this.tripObj.cityId = obj.StartCityIdS;
this.tripObj.orderId = 0;
this.travelControlTripLayerShow = true;
},
hideTripDown() {
this.travelControlTripLayerShow = false;
}
},
mounted() {
let myDate = new Date();
......
src/plug/index.js
View file @ 80f8ac78
......@@ -118,7 +118,8 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
domainUrl = "http://192.168.2.214:8082";
// domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......@@ -149,7 +150,7 @@ export default {
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
//文件站点
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
};
return obj;
},
......
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