Skip to content

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

页面修改

parent 1c7c83ea
Show whitespace changes
Inline Side-by-side
Showing with 4073 additions and 3851 deletions
src/components/Supplier/roomQuery.vue
View file @ f9ae7d03
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</template> </template>
</span> </span>
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length"> <td v-if="childIndex==0" :rowspan="subItem.hotelList.length+1">
<a style="text-decoration:underline;color:blue;cursor:pointer" <a style="text-decoration:underline;color:blue;cursor:pointer"
@click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)"> @click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
<template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template> <template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
...@@ -164,6 +164,11 @@ ...@@ -164,6 +164,11 @@
@click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a> @click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
</td> </td>
</tr> </tr>
<tr v-if="subIndex==0" >
<td colspan="8" class="redTip">
备注:<p >{{subItem.SupplierRemarks}}</p>
</td>
</tr>
</template> </template>
</template> </template>
</table> </table>
...@@ -521,4 +526,10 @@ ...@@ -521,4 +526,10 @@
padding-left: 5px; padding-left: 5px;
} }
.roomQuery_SupplierTable .redTip {
text-align: left;
color:red;
padding-left: 5px;
}
</style> </style>
src/components/SupplierIndex.vue
View file @ f9ae7d03
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<i class="iconfont icon-menu-shezhi1"></i> <i class="iconfont icon-menu-shezhi1"></i>
设置 设置
</el-dropdown-item> </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> <i class="iconfont icon-menu-tuichu"></i>
退出 退出
</el-dropdown-item> </el-dropdown-item>
...@@ -34,7 +34,9 @@ ...@@ -34,7 +34,9 @@
</el-dropdown> </el-dropdown>
</li> </li>
<li style="position: relative;"> <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>
<!-- <li><i class="iconfont icon-gonggao" @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i></li> --> <!-- <li><i class="iconfont icon-gonggao" @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i></li> -->
<li> <li>
...@@ -44,8 +46,10 @@ ...@@ -44,8 +46,10 @@
<i v-if="language=='Japanese'" class="iconfont icon-icon-riyu"></i> <i v-if="language=='Japanese'" class="iconfont icon-icon-riyu"></i>
</span> </span>
<el-dropdown-menu class="changelanguage" slot="dropdown"> <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('Japanese')">日语 <i v-if="language=='Japanese'"
<el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item> 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-menu>
</el-dropdown> </el-dropdown>
</li> </li>
...@@ -80,46 +84,44 @@ ...@@ -80,46 +84,44 @@
<div class="IM_tool" style='top: 41px;z-index: 1;' v-if="IM_navType!==3 && IM_navType!==52"> <div class="IM_tool" style='top: 41px;z-index: 1;' v-if="IM_navType!==3 && IM_navType!==52">
<div class="search"> <div class="search">
<i class='iconfont icon-search search'></i> <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> <i class="close iconfont icon-close" v-if='newSearchContent.length>0' @click="changeTools(0)"></i>
</div> </div>
</div> </div>
<div v-show="imToolsType!=-1 && imToolsType!=52"> <div v-show="imToolsType!=-1 && imToolsType!=52">
<div v-show="IM_navType==1" class="IM_messageList "> <div v-show="IM_navType==1" class="IM_messageList ">
<ul> <ul>
<li <li v-for="(session, index) in sysMsgList" class="u-list-item"
v-for="(session, index) in sysMsgList" @click="enterSystemChat(session),refreshSysNoteDate()">
class="u-list-item" <div
@click="enterSystemChat(session),refreshSysNoteDate()" 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 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"> <div class="cont">
<p class="name">{{session.name}}</p> <p class="name">{{session.name}}</p>
<p class="msg">{{session.lastMsgShow}}</p> <p class="msg">{{session.lastMsgShow}}</p>
</div> </div>
<div style="float: right; font-size: 12px; color: #999; margin: 0px 10px 0;">{{session.updateTimeShow}}</div> <div style="float: right; font-size: 12px; color: #999; margin: 0px 10px 0;">{{session.updateTimeShow}}
<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>
<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>
<li <li v-for="(session, index) in sessionlist" class="u-list-item" :inline-desc="session.lastMsgShow"
v-for="(session, index) in sessionlist" :key="session.id" :sessionId="session.id" @dblclick="enterChat(session)" v-if="session.to!=''">
class="u-list-item" <img :src="session.avatar" width="24" />
: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"> <div class="cont">
<p class="name">{{session.name}}</p> <p class="name">{{session.name}}</p>
<p class="msg">{{session.lastMsgShow}}</p> <p class="msg">{{session.lastMsgShow}}</p>
</div> </div>
<div style="float: right; font-size: 12px; color: #999;"> <div style="float: right; font-size: 12px; color: #999;">
{{session.updateTimeShow}}&nbsp; {{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>
<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> </li>
</ul> </ul>
</div> </div>
...@@ -142,7 +144,7 @@ ...@@ -142,7 +144,7 @@
</li> </li>
</ul> </ul>
<div class="search-none-data" v-show="!isLoading&&searchList.length==0"> <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}}大侠 抱歉，没有找到这位{{newSearchContent}}大侠
</div> </div>
</div> </div>
...@@ -154,16 +156,13 @@ ...@@ -154,16 +156,13 @@
<li><i class="iconfont icon-icon-"></i></li> <li><i class="iconfont icon-icon-"></i></li>
</ul> </ul>
<div class="search" v-show="imToolsType==1||imToolsType==-1"> <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> <i class="close iconfont icon-close" @click="changeTools(0)"></i>
</div> </div>
</div> </div>
<div v-show="IM_navType==52" class="IM_messageList IM_messageList2"> <div v-show="IM_navType==52" class="IM_messageList IM_messageList2">
<ul class="_SysNoteDate_ul" v-loading="SystemLog"> <ul class="_SysNoteDate_ul" v-loading="SystemLog">
<li @click="redNotice(item.noticeId, item.title)" <li @click="redNotice(item.noticeId, item.title)" v-for="item in NoticeList" class="u-list-item">
v-for="item in NoticeList"
class="u-list-item"
>
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC; <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> margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">通知</div>
<div class="cont sys_cont"> <div class="cont sys_cont">
...@@ -186,35 +185,33 @@ ...@@ -186,35 +185,33 @@
</el-tooltip> </el-tooltip>
</div> </div>
<div v-show='contactsType==0' class="el-tree-style-div"> <div v-show='contactsType==0' class="el-tree-style-div">
<el-tree :data='webAllpartList' <el-tree :data='webAllpartList' :props="defaultProps1">
:props="defaultProps1">
<span class="custom-tree-node" slot-scope="{ node, data }"> <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==1">{{ node.label }}</span>
<span class="fz14" v-if="data.Type==2" @dblclick="lt(data)"> <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' src="../assets/img/litheader.png"
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon' style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/> 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' :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> </span>
</el-tree> </el-tree>
</div> </div>
<div v-show="contactsType==1" class="IM_messageList" style='top:41px'> <div v-show="contactsType==1" class="IM_messageList" style='top:41px'>
<ul> <ul>
<li <li v-for="(session, index) in teamList" class="u-list-item" :inline-desc="session.lastMsgShow"
v-for="(session, index) in teamList" :key="session.id" :sessionId="session.id" @dblclick="enterChat(session)">
class="u-list-item" <img :src="session.avatar" width="24" />
:inline-desc="session.lastMsgShow"
:key="session.id"
:sessionId="session.id"
@dblclick="enterChat(session)"
>
<img :src="session.avatar" width="24"/>
<div class="cont"> <div class="cont">
<p class="name team" :title='session.name'>{{session.name}}</p> <p class="name team" :title='session.name'>{{session.name}}</p>
</div> </div>
<div style="float: right; font-size: 12px; color: #999;height: 38px;line-height: 38px;"> <div style="float: right; font-size: 12px; color: #999;height: 38px;line-height: 38px;">
{{diaplayTime(session.updateTime)}} {{diaplayTime(session.updateTime)}}
</div> </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> </li>
</ul> </ul>
</div> </div>
...@@ -224,24 +221,27 @@ ...@@ -224,24 +221,27 @@
<div class='IM_contacts' v-show="IM_navType==4"> <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 style="padding: 10px; border-bottom: 1px dashed rgba(134,142,148,.4); overflow: hidden;">
<div class="fl" style="width: 300px; margin-right: 10px;"> <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>
<div class="fl" style="font-size: 12px; color: #1BC594; margin-top: 2px; text-align: center;"> <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> <i class="iconfont icon-ico_commodity_defaul" @click="saveGroup" style="cursor: pointer;"></i>
<br/> <br />
确定 确定
</div> </div>
</div> </div>
<div v-if='!searchType' class="el-tree-style-div"> <div v-if='!searchType' class="el-tree-style-div">
<el-tree :data='webAllpartList' <el-tree :data='webAllpartList' :props="defaultProps1">
:props="defaultProps1">
<span class="custom-tree-node" slot-scope="{ node, data }"> <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"> <span class="fz14" v-if="data.Type==2">
<label> <label>
<input type="checkbox" :value="data.IMAccount" v-model="IMList" @click="addFriend(data)"/> <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' src="../assets/img/litheader.png"
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon' style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/> 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 }} {{ node.label }}
</label> </label>
</span> </span>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
<ul> <ul>
<li v-for="item in searchList"> <li v-for="item in searchList">
<label> <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-if="!item.icon" src="../assets/img/litheader.png" alt="">
<img v-else :src="item.icon" alt="" :onerror="defaultImg"> <img v-else :src="item.icon" alt="" :onerror="defaultImg">
{{item.name}} {{item.name}}
...@@ -271,10 +271,7 @@ ...@@ -271,10 +271,7 @@
</span> </span>
</div> </div>
<ul class="_SysNoteDate_ul" v-loading="SystemLog"> <ul class="_SysNoteDate_ul" v-loading="SystemLog">
<li @click="LogSetReadStatus(session)" <li @click="LogSetReadStatus(session)" v-for="(session, index) in msgList" class="u-list-item">
v-for="(session, index) in msgList"
class="u-list-item"
>
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC; <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> margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">系统</div>
<div class="cont sys_cont"> <div class="cont sys_cont">
...@@ -282,7 +279,9 @@ ...@@ -282,7 +279,9 @@
<p class="msg sys_msg">{{session.Content}}</p> <p class="msg sys_msg">{{session.Content}}</p>
</div> </div>
<div style="float: right; font-size: 12px; color: #999; margin: 12px 0 0;">{{session.CreateTime}}</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>
<li class="sysMsg_lod_more" @click="refreshSysNoteDate('a')"> <li class="sysMsg_lod_more" @click="refreshSysNoteDate('a')">
<p>加载更多...</p> <p>加载更多...</p>
...@@ -307,13 +306,19 @@ ...@@ -307,13 +306,19 @@
<img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg"> <img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg">
&nbsp; &nbsp;
{{item.createEmName}} {{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>
<p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p> <p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'> <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==1' v-for="(i,index) in item.files"
<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'"/> :src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_300'" />
<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==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>
<p v-if='item.fileType==2&&item.files.length==1'> <p v-if='item.fileType==2&&item.files.length==1'>
<video :src="item.files[0]" controls="controls" style="width: 100%;"> <video :src="item.files[0]" controls="controls" style="width: 100%;">
...@@ -324,9 +329,12 @@ ...@@ -324,9 +329,12 @@
<span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span> <span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr"> <span class="fr">
<!--{{item.hasLike}}--> <!--{{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;" v-if='!item.hasLike'
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticle(item.id,index)"></i> @click="likeArticle(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; 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> </span>
</p> </p>
<div class="praiseAndReview"> <div class="praiseAndReview">
...@@ -342,14 +350,20 @@ ...@@ -342,14 +350,20 @@
</span> </span>
<ul> <ul>
<li v-for="(i,index) in item.commentList"> <li v-for="(i,index) in item.commentList">
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}} <p v-if="i.byReplayEmpName==null">
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i> <span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i> <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>
<p v-if="i.byReplayEmpName!=null"> <p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}} <span>{{i.empName}}</span>&nbsp;回复&nbsp;
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i> <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteComments(i.commentId,i.outIndex,item.id)"></i> <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>
</li> </li>
...@@ -371,12 +385,19 @@ ...@@ -371,12 +385,19 @@
<div class="iconOut"> <div class="iconOut">
<div class="iconIn"></div> <div class="iconIn"></div>
</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="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'> <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==1' v-for="(i,index) in item.files"
<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'"/> :src="i+'?x-oss-process=image/resize,m_mfit,h_100,w_273'" />
<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==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>
<p v-if='item.fileType==2&&item.files.length==1'> <p v-if='item.fileType==2&&item.files.length==1'>
<video :src="item.files[0]" controls="controls" style="width: 100%;"> <video :src="item.files[0]" controls="controls" style="width: 100%;">
...@@ -386,9 +407,12 @@ ...@@ -386,9 +407,12 @@
<p class="artcleAddress"> <p class="artcleAddress">
<span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span> <span v-if="item.address!=''"><i class="iconfont icon-img_dizhi_small"></i>{{item.address}}</span>
<span class="fr"> <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;" v-if='!item.hasLike'
<i class="iconfont icon-zan_" style="cursor: pointer; color: #E95252;" v-if='item.hasLike' @click="disLikeArticleOne(item.id,index)"></i> @click="likeArticleOne(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; 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> <i class="iconfont icon-img_delete_small" style="cursor: pointer;" @click="deleteArticle(item.id)"></i>
</span> </span>
</p> </p>
...@@ -405,15 +429,21 @@ ...@@ -405,15 +429,21 @@
<span class="sjx"></span> <span class="sjx"></span>
</span> </span>
<ul> <ul>
<li v-for="i in item.commentList" > <li v-for="i in item.commentList">
<p v-if="i.byReplayEmpName==null"><span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}} <p v-if="i.byReplayEmpName==null">
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i> <span>{{i.empName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i> <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>
<p v-if="i.byReplayEmpName!=null"> <p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;回复&nbsp; <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}} <span>{{i.empName}}</span>&nbsp;回复&nbsp;
<i class="iconfont icon-ico_pinglun1" @click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i> <span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i v-if='userId==i.empId' class='iconfont icon-img_delete_small' @click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i> <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>
</li> </li>
</ul> </ul>
...@@ -439,16 +469,20 @@ ...@@ -439,16 +469,20 @@
</div> </div>
<div class="middleDiv"> <div class="middleDiv">
<p>{{item.createEmName}}</p> <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==1' style="line-height: 18px; font-size: 12px; color: #666;">
<p v-if='item.realtionType==2'><i class="iconfont icon-zan_" style="color: #E95252; font-size: 12px;"></i></p> {{item.commentContent|decodeURIComponent(item.commentContent)}}</p>
<p style="line-height: 18px; font-size: 12px; color: #999;">{{item.createTime|diaplayTime(item.createTime)}}</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>
<div class="rightDiv" v-if='item.fileList.length>0'> <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> </div>
<div class="dynamicItembottom" v-if='item.realtionType==1'> <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-input v-if='reviewIndex==index' :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticleTwo(item.id,index)'>确定</el-button> <el-button slot="append" @click='reviewArticleTwo(item.id,index)'>确定</el-button>
</el-input> </el-input>
...@@ -457,25 +491,21 @@ ...@@ -457,25 +491,21 @@
</div> </div>
<div class="IM_cont" v-show="dynamicType==4"> <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> <el-input type="textarea" :rows="4" maxlength='50' placeholder="这一刻你的想法..." v-model='dynamicCont'> </el-input>
<p style="margin: 10px 0;"> <p style="margin: 10px 0;">
<el-upload <el-upload action="" :file-list="imgList" :http-request="uploadImg" :multiple="false" :limit="9"
action="" accept="image/jpeg,image/gif,image/png,image/bmp" list-type="picture-card" :on-remove="handleRemoveImg">
: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> <i class="el-icon-plus"></i>
</el-upload> </el-upload>
</p> </p>
<input type="button" value="发布" class="normalBtn fr" @click="SaveDynamic"/> <input type="button" value="发布" class="normalBtn fr" @click="SaveDynamic" />
</div> </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 style="width: 100%; height: 50px;"></div>
</div> </div>
</div> </div>
...@@ -488,7 +518,7 @@ ...@@ -488,7 +518,7 @@
<div class="inlogs_Content" v-html="versionList[0].UpdateContent"> <div class="inlogs_Content" v-html="versionList[0].UpdateContent">
</div> </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> </div>
<div class="listen"> <div class="listen">
...@@ -498,7 +528,7 @@ ...@@ -498,7 +528,7 @@
</div> </div>
<div class="temDivs"> <div class="temDivs">
<!-- :key="key" --> <!-- :key="key" -->
<router-view ></router-view> <router-view></router-view>
<template v-if="showPage"> <template v-if="showPage">
<div> <div>
<div class="query-box" style="border-bottom: none;display:none;"> <div class="query-box" style="border-bottom: none;display:none;">
...@@ -744,7 +774,7 @@ ...@@ -744,7 +774,7 @@
<div :class="{viewBigPicLayer:true,viewBigPicLayerDisplayNone:dspNone}" @click="closePicLayer"> <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 height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index"> <el-carousel-item v-for="(item,index) in picObj" :key="index">
<div class="inlineDiv ownScrollbarStyle"><img :src="item" /></div> <div class="inlineDiv ownScrollbarStyle"><img :src="item" /></div>
...@@ -752,15 +782,22 @@ ...@@ -752,15 +782,22 @@
</el-carousel> </el-carousel>
</div> </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"> <div class="IM_message_box_left" v-if="openSessions.length>1">
<ul> <ul>
<li v-for="(item,index) in openSessions" :class="{active:item.id==currentSession.id}" @click="enterChat(item)"> <li v-for="(item,index) in openSessions" :class="{active:item.id==currentSession.id}"
<img :src="item.avatar" v-if='item.avatar' :alt='item.name'/> @click="enterChat(item)">
<img src="../assets/img/litheader.png" v-if='!item.avatar' :alt='item.name'/> <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> <span class="name">{{item.name}}</span>
<i class="iconfont icon-close1" v-show="item.id==currentSession.id" @click.stop="deleteOpenSession(index)"></i> <i class="iconfont icon-close1" v-show="item.id==currentSession.id"
<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> @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> </li>
</ul> </ul>
</div> </div>
...@@ -797,7 +834,9 @@ ...@@ -797,7 +834,9 @@
<li v-for="item in oldGroupMemberList" @dbclick="lt(item)"> <li v-for="item in oldGroupMemberList" @dbclick="lt(item)">
<img :src="item.avatar" /> <img :src="item.avatar" />
<span> <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}} {{item.alias}}
</span> </span>
</li> </li>
...@@ -810,14 +849,8 @@ ...@@ -810,14 +849,8 @@
</ul> </ul>
</div> </div>
<div class="msg-content-box" id="msg-content"> <div class="msg-content-box" id="msg-content">
<chat-list <chat-list type="session" :msglist="msglist" :userInfos="userInfos" :robotInfos="robotInfos"
type="session" :myInfo="myInfo" :isRobot="isRobot" :canLoadMore="canLoadMore"></chat-list>
:msglist="msglist"
:userInfos="userInfos"
:robotInfos="robotInfos"
:myInfo="myInfo"
:isRobot="isRobot"
:canLoadMore="canLoadMore"></chat-list>
</div> </div>
<div class="msg-foot-box"> <div class="msg-foot-box">
<chat-editor type="session" :isRobot="isRobot"></chat-editor> <chat-editor type="session" :isRobot="isRobot"></chat-editor>
...@@ -834,14 +867,17 @@ ...@@ -834,14 +867,17 @@
</div> </div>
<div class="group-body"> <div class="group-body">
<div class="group-body-item"> <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"> <div class="search-result-box">
<el-tree :data='webAllpartList' v-show="groupboxSearch==0" :props="defaultProps1"> <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==1">{{ node.label }}</span>
<span class="fz14" v-if="data.Type==2" @click="addFriend(0,data)"> <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' src="../assets/img/litheader.png"
<img v-if='data.Icon' :onerror="defaultImg" :src='data.Icon' style="width: 24px; height: 24px; border-radius: 12px; display: inline-block; vertical-align: middle;"/> 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> {{ node.label }}</span>
</span> </span>
</el-tree> </el-tree>
...@@ -862,7 +898,7 @@ ...@@ -862,7 +898,7 @@
</li> </li>
</ul> </ul>
<div class="search-none-data" v-show="!isLoading&&groupSearchBox.length==0"> <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>
</div> </div>
...@@ -881,7 +917,8 @@ ...@@ -881,7 +917,8 @@
{{item.Name}} {{item.Name}}
</p> </p>
</div> </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> </li>
</ul> </ul>
</div> </div>
...@@ -896,7 +933,7 @@ ...@@ -896,7 +933,7 @@
<el-dialog :visible.sync="isUpdateGroup" class="addGroupByAlex" :modal="false"> <el-dialog :visible.sync="isUpdateGroup" class="addGroupByAlex" :modal="false">
<div class="title"> <div class="title">
修改群组信息 修改群组信息
<i class="iconfont icon-jiesan" @click="dismissTeam" title="解散该群" ></i> <i class="iconfont icon-jiesan" @click="dismissTeam" title="解散该群"></i>
</div> </div>
<div class="cl-name">群组名称</div> <div class="cl-name">群组名称</div>
<div class="new-group-name"> <div class="new-group-name">
...@@ -911,7 +948,8 @@ ...@@ -911,7 +948,8 @@
<span> <span>
{{item.alias}} {{item.alias}}
</span> </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> </li>
</ul> </ul>
...@@ -922,22 +960,26 @@ ...@@ -922,22 +960,26 @@
<button class="normalBtn" @click="updateTeamName">保存</button> <button class="normalBtn" @click="updateTeamName">保存</button>
</div> </div>
</el-dialog> </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> <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 v-html="detailMessage.Content">
</div> </div>
<!-- <pre style="letter-spacing: 1px; font-size: 14px; color: #333;line-height: 30px;">{{detailMessage.Content}}</pre> --> <!-- <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="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> <i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>
</p> </p>
</div> </div>
</el-dialog> </el-dialog>
<a class="weOytour" ref="weOytour" href="http://we.oytour.com:8110/" target="view_window">Preface</a> <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"> <el-dialog custom-class='w800 PingFangSC _saleRnk' title="销售排行" :visible.sync="saleRnkShow" center
<saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie"/> :before-close="closeChangeMachie">
<saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie" />
</el-dialog> </el-dialog>
<div v-show="mazip==0" id="downzip"> <div v-show="mazip==0" id="downzip">
<div> <div>
...@@ -955,19 +997,22 @@ ...@@ -955,19 +997,22 @@
</template> </template>
<script> <script>
import util from "../utils"; import util from "../utils";
import config from "../configs"; import config from "../configs";
import pageUtil from "../utils/page"; import pageUtil from "../utils/page";
import ChatList from "./Chat/chatList"; import ChatList from "./Chat/chatList";
import ChatEditor from "./Chat/ChatEditor"; import ChatEditor from "./Chat/ChatEditor";
//import md5 from 'js-md5' //import md5 from 'js-md5'
import emojiObj from "../configs/emoji"; import emojiObj from "../configs/emoji";
// import Vue from 'vue' // import Vue from 'vue'
import loading from "./commonPage/loading"; import loading from "./commonPage/loading";
import VueDraggableResizable from "vue-draggable-resizable"; import VueDraggableResizable from "vue-draggable-resizable";
import { setInterval, clearInterval } from 'timers'; import {
import saleRnk from "./SalesModule/saleRnk"; setInterval,
export default { clearInterval
} from 'timers';
import saleRnk from "./SalesModule/saleRnk";
export default {
components: { components: {
ChatList, ChatList,
ChatEditor, ChatEditor,
...@@ -981,11 +1026,10 @@ export default { ...@@ -981,11 +1026,10 @@ export default {
saleRnkShow: false, saleRnkShow: false,
dialogTitleNot: '', dialogTitleNot: '',
outerVisibleNot: false, outerVisibleNot: false,
mazip:localStorage.getItem("mazip") ? localStorage.getItem("mazip") : 0, mazip: localStorage.getItem("mazip") ? localStorage.getItem("mazip") : 0,
language:'zh-CN', language: 'zh-CN',
douTimer:null, douTimer: null,
defaultHeadImg: defaultHeadImg: 'this.src="' + require("../assets/img/default_head_img.jpg") + '"',
'this.src="' + require("../assets/img/default_head_img.jpg") + '"',
delAccountList: [], delAccountList: [],
isUpdateGroup: false, isUpdateGroup: false,
groupName: "", groupName: "",
...@@ -1075,9 +1119,9 @@ export default { ...@@ -1075,9 +1119,9 @@ export default {
displayNone: true, displayNone: true,
dialogTitle: "", dialogTitle: "",
outerVisible: false, outerVisible: false,
logsShow:false, logsShow: false,
newVersion:'', newVersion: '',
versionList:[], versionList: [],
msg: { msg: {
ParentId: 0, ParentId: 0,
MenuStatus: "", MenuStatus: "",
...@@ -1168,8 +1212,8 @@ export default { ...@@ -1168,8 +1212,8 @@ export default {
NotDealCount: "", NotDealCount: "",
MyAuditCount: "", MyAuditCount: "",
sysMsgPageIndex: 1, sysMsgPageIndex: 1,
firstMenuList:[], firstMenuList: [],
allSsionList:[], allSsionList: [],
allWindowWidth: '', allWindowWidth: '',
SetTimeout: null, SetTimeout: null,
NoticeList: [], NoticeList: [],
...@@ -1184,7 +1228,7 @@ export default { ...@@ -1184,7 +1228,7 @@ export default {
NewSaleRnkInfo: {}, NewSaleRnkInfo: {},
showPage: true, showPage: false,
tableHeight: 0, tableHeight: 0,
Hotelmsg: { Hotelmsg: {
//酒店选择数组 //酒店选择数组
...@@ -1294,8 +1338,7 @@ export default { ...@@ -1294,8 +1338,7 @@ export default {
var diffHour = diffValue / hour; var diffHour = diffValue / hour;
var diffMinute = diffValue / minute; var diffMinute = diffValue / minute;
var result = ""; var result = "";
if (diffValue < 0) { if (diffValue < 0) {} else if (diffMonth > 3) {
} else if (diffMonth > 3) {
result = timePublish.getFullYear() + "-"; result = timePublish.getFullYear() + "-";
result += timePublish.getMonth() + "-"; result += timePublish.getMonth() + "-";
result += timePublish.getDate(); result += timePublish.getDate();
...@@ -1316,7 +1359,7 @@ export default { ...@@ -1316,7 +1359,7 @@ export default {
} }
}, },
computed: { computed: {
key(){ key() {
return this.$route.path + Math.random(); return this.$route.path + Math.random();
}, },
sysMsgUnread() { sysMsgUnread() {
...@@ -1436,7 +1479,7 @@ export default { ...@@ -1436,7 +1479,7 @@ export default {
} }
this.unReadMsgId.push(item.lastMsg.idServer); 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.dou()
this.enterChat(item) this.enterChat(item)
} }
...@@ -1497,26 +1540,26 @@ export default { ...@@ -1497,26 +1540,26 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
this.MsgBus.$on('doudong',function(){ this.MsgBus.$on('doudong', function () {
that.dou() that.dou()
}); });
this.MsgBus.$on('openChat',function(obj){ this.MsgBus.$on('openChat', function (obj) {
that.lt(obj) that.lt(obj)
}); });
const permissionNow = Notification.requestPermission(); const permissionNow = Notification.requestPermission();
var hiddenProperty = var hiddenProperty =
"hidden" in document "hidden" in document ?
? "hidden" "hidden" :
: "webkitHidden" in document "webkitHidden" in document ?
? "webkitHidden" "webkitHidden" :
: "mozHidden" in document "mozHidden" in document ?
? "mozHidden" "mozHidden" :
: null; null;
var visibilityChangeEvent = hiddenProperty.replace( var visibilityChangeEvent = hiddenProperty.replace(
/hidden/i, /hidden/i,
"visibilitychange" "visibilitychange"
); );
var onVisibilityChange = function() { var onVisibilityChange = function () {
if (!document[hiddenProperty]) { if (!document[hiddenProperty]) {
that.isFocus = true; that.isFocus = true;
} else { } else {
...@@ -1524,11 +1567,11 @@ export default { ...@@ -1524,11 +1567,11 @@ export default {
} }
}; };
document.addEventListener(visibilityChangeEvent, onVisibilityChange); document.addEventListener(visibilityChangeEvent, onVisibilityChange);
if(!localStorage.menu) if (!localStorage.menu)
this.$store.dispatch("connect"); this.$store.dispatch("connect");
else{ else {
this.firstMenuList=JSON.parse(localStorage.menu) this.firstMenuList = JSON.parse(localStorage.menu)
if(this.firstMenuList.indexOf('IM')!=-1){ if (this.firstMenuList.indexOf('IM') != -1) {
this.$store.dispatch("connect"); this.$store.dispatch("connect");
} }
} }
...@@ -1540,7 +1583,7 @@ export default { ...@@ -1540,7 +1583,7 @@ export default {
this.getNoticeList() this.getNoticeList()
document document
.getElementById("allDynamic") .getElementById("allDynamic")
.addEventListener("scroll", function() { .addEventListener("scroll", function () {
//全部动态 //全部动态
if (this.scrollHeight - this.scrollTop === this.clientHeight) { if (this.scrollHeight - this.scrollTop === this.clientHeight) {
that.isAppend = true; that.isAppend = true;
...@@ -1550,7 +1593,7 @@ export default { ...@@ -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) { if (this.scrollHeight - this.scrollTop === this.clientHeight) {
that.isAppendOne = true; that.isAppendOne = true;
...@@ -1562,7 +1605,7 @@ export default { ...@@ -1562,7 +1605,7 @@ export default {
document document
.getElementById("aboutMeDynamic") .getElementById("aboutMeDynamic")
.addEventListener("scroll", function() { .addEventListener("scroll", function () {
//与我相关 //与我相关
if (this.scrollHeight - this.scrollTop === this.clientHeight) { if (this.scrollHeight - this.scrollTop === this.clientHeight) {
that.isAppendTwo = true; that.isAppendTwo = true;
...@@ -1583,12 +1626,6 @@ export default { ...@@ -1583,12 +1626,6 @@ export default {
if (this.boxInfo.y == 0) { if (this.boxInfo.y == 0) {
this.boxInfo.y = 280; this.boxInfo.y = 280;
} }
//this.Financial_post_GetNotDealCount();
//this.app_user_workflow_MyAuditCount();
//this.refreshSysNoteDate();
//this.GetUserIsRead();
//this.getNewSaleRnkInfo()
document.title = this.userInfo.GroupName; document.title = this.userInfo.GroupName;
this.getMenu(); this.getMenu();
this.getBranchList(); this.getBranchList();
...@@ -1608,7 +1645,6 @@ export default { ...@@ -1608,7 +1645,6 @@ export default {
} }
}, },
created() { created() {
//页面刚进入时开启长连接 //页面刚进入时开启长连接
// this.initWebSocket() // this.initWebSocket()
this.userInfo = this.getLocalStorageSupplier(); this.userInfo = this.getLocalStorageSupplier();
...@@ -1623,7 +1659,7 @@ export default { ...@@ -1623,7 +1659,7 @@ export default {
//IM_body //IM_body
let allWindowWidth = window.innerWidth; let allWindowWidth = window.innerWidth;
this.allWindowWidth = allWindowWidth - 50 - 220 - 60; this.allWindowWidth = allWindowWidth - 50 - 220 - 60;
let maxLength = parseInt(allWindowWidth/100); let maxLength = parseInt(allWindowWidth / 100);
this.maxLength = maxLength; this.maxLength = maxLength;
// this.new(); // this.new();
}, },
...@@ -1634,6 +1670,7 @@ export default { ...@@ -1634,6 +1670,7 @@ export default {
}, },
methods: { methods: {
goUrl(url, id, index) { goUrl(url, id, index) {
this.showPage = false;
this.chosenIndex = id; this.chosenIndex = id;
if (localStorage.openMode && localStorage.openMode == 1) if (localStorage.openMode && localStorage.openMode == 1)
this.$router.push({ this.$router.push({
...@@ -1904,7 +1941,7 @@ export default { ...@@ -1904,7 +1941,7 @@ export default {
this.tableHeight = h; this.tableHeight = h;
}, },
getNewSaleRnkInfo: function(){ getNewSaleRnkInfo: function () {
let msg = { let msg = {
StartDate: '' StartDate: ''
} }
...@@ -1917,7 +1954,7 @@ export default { ...@@ -1917,7 +1954,7 @@ export default {
let New = this.NewSaleRnkInfo.StartDateMonth + this.NewSaleRnkInfo.StartDateDay let New = this.NewSaleRnkInfo.StartDateMonth + this.NewSaleRnkInfo.StartDateDay
let arr = localStorage.saleRnkInfo ? JSON.parse(localStorage.saleRnkInfo) : [] let arr = localStorage.saleRnkInfo ? JSON.parse(localStorage.saleRnkInfo) : []
let rep = false let rep = false
for(let i = 0; i < arr.length; i++){ for (let i = 0; i < arr.length; i++) {
if (arr[i] === New) { if (arr[i] === New) {
rep = true rep = true
return return
...@@ -1933,51 +1970,55 @@ export default { ...@@ -1933,51 +1970,55 @@ export default {
err => {} err => {}
); );
}, },
downloadSingle(obj){ downloadSingle(obj) {
let dom = document.querySelector("#groupTourOrderByTuan_DownLoad"); let dom = document.querySelector("#groupTourOrderByTuan_DownLoad");
dom.href = obj.Url; dom.href = obj.Url;
dom.click(); dom.click();
}, },
closeChangeMachie2(done){ closeChangeMachie2(done) {
this.outerVisibleNot = false this.outerVisibleNot = false
}, },
closeChangeMachie(done) { //弹出框关闭初始化弹框内表单 closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
this.saleRnkShow= false this.saleRnkShow = false
}, },
GetUserIsRead(){ GetUserIsRead() {
this.ApiPost2('app_user_notice_GetUserIsRead',{},res=>{ this.ApiPost2('app_user_notice_GetUserIsRead', {}, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if (res.data.data.IsRead === 0) { if (res.data.data.IsRead === 0) {
this.dialogTitleNot = res.data.data.title; this.dialogTitleNot = res.data.data.title;
this.getNotDetail(res.data.data.noticeId) this.getNotDetail(res.data.data.noticeId)
} }
}else{ } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
},err=>{}) }, err => {})
}, },
getNotDetail: function(id) { getNotDetail: function (id) {
this.ApiPost2('User_get_NoticeGet',{noticeId:id},res=>{ this.ApiPost2('User_get_NoticeGet', {
if(res.data.resultCode == 1) { noticeId: id
this.detailMessage=res.data.data }, res => {
this.downLoadList=res.data.data.File_url ? JSON.parse(res.data.data.File_url) : [] if (res.data.resultCode == 1) {
this.downLoadList.forEach(item=>{ this.detailMessage = res.data.data
item.Url=this.domainManager().ViittoFileUrl+item.Url 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; this.outerVisibleNot = true;
}else{ } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
},err=>{}) }, err => {})
}, },
// 阅读公告 // 阅读公告
redNotice: function (id, tit) { redNotice: function (id, tit) {
this.dialogTitleNot = tit; this.dialogTitleNot = tit;
this.ApiPost2('app_user_notice_detial',{noticeId:id},res=>{ this.ApiPost2('app_user_notice_detial', {
if(res.data.resultCode == 1) { noticeId: id
}, res => {
if (res.data.resultCode == 1) {
this.getNotDetail(id) this.getNotDetail(id)
this.getNoticeList() this.getNoticeList()
}else{ } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}) })
...@@ -1992,60 +2033,60 @@ export default { ...@@ -1992,60 +2033,60 @@ export default {
this.NoticeList = res.data.data.pageData; this.NoticeList = res.data.data.pageData;
this.AllNoticeCount = res.data.data.pageCount; this.AllNoticeCount = res.data.data.pageCount;
} }
},err => {} }, err => {});
);
}, },
CloseZip(){ CloseZip() {
this.mazip=1; this.mazip = 1;
localStorage.setItem("mazip",1); localStorage.setItem("mazip", 1);
}, },
ChangeLan(str){ ChangeLan(str) {
this.language=str; this.language = str;
this.$i18n.locale = str; this.$i18n.locale = str;
localStorage.language = str; localStorage.language = str;
}, },
settingSys: function () { settingSys: function () {
this.MsgBus.$emit('settingOpen') this.MsgBus.$emit('settingOpen')
}, },
hideIM(){ hideIM() {
if(this.IM_bodyIsShow){ if (this.IM_bodyIsShow) {
this.IM_bodyIsShow=false this.IM_bodyIsShow = false
} }
}, },
dou(){ dou() {
if(!this.douTimer){ if (!this.douTimer) {
let x=this.boxInfo.x; let x = this.boxInfo.x;
let y=this.boxInfo.y; let y = this.boxInfo.y;
let t=0; let t = 0;
let c=0; let c = 0;
this.douTimer = setInterval(()=>{ this.douTimer = setInterval(() => {
if(t==0) if (t == 0)
this.$refs.resizeBox._data.top=y+2 this.$refs.resizeBox._data.top = y + 2
if(t==2) if (t == 2)
this.$refs.resizeBox._data.top=y-2 this.$refs.resizeBox._data.top = y - 2
if(t==1) if (t == 1)
this.$refs.resizeBox._data.left=x-2 this.$refs.resizeBox._data.left = x - 2
if(t==3){ if (t == 3) {
this.$refs.resizeBox._data.left=x+2 this.$refs.resizeBox._data.left = x + 2
t=0 t = 0
}else{ } else {
t++ t++
} }
c++ c++
if(c==40){ if (c == 40) {
this.$refs.resizeBox._data.top=y this.$refs.resizeBox._data.top = y
this.$refs.resizeBox._data.left=x this.$refs.resizeBox._data.left = x
clearInterval(this.douTimer) clearInterval(this.douTimer)
this.douTimer=null this.douTimer = null
} }
},25) }, 25)
} }
}, },
LogSetReadStatus(s) { LogSetReadStatus(s) {
this.ApiPost2( this.ApiPost2(
"SystemLog_post_LogSetReadStatus", "SystemLog_post_LogSetReadStatus", {
{ LogId: s.ID }, LogId: s.ID
},
r => { r => {
if (s.Link) { if (s.Link) {
this.goUrl(s.Link); this.goUrl(s.Link);
...@@ -2129,8 +2170,7 @@ export default { ...@@ -2129,8 +2170,7 @@ export default {
var diffHour = diffValue / hour; var diffHour = diffValue / hour;
var diffMinute = diffValue / minute; var diffMinute = diffValue / minute;
var result = ""; var result = "";
if (diffValue < 0) { if (diffValue < 0) {} else if (diffMonth > 3) {
} else if (diffMonth > 3) {
result = timePublish.getFullYear() + "-"; result = timePublish.getFullYear() + "-";
result += timePublish.getMonth() + "-"; result += timePublish.getMonth() + "-";
result += timePublish.getDate(); result += timePublish.getDate();
...@@ -2151,8 +2191,7 @@ export default { ...@@ -2151,8 +2191,7 @@ export default {
}, },
Financial_post_GetNotDealCount() { Financial_post_GetNotDealCount() {
this.ApiPost2( this.ApiPost2(
"Financial_post_GetNotDealCount", "Financial_post_GetNotDealCount", {},
{},
r => { r => {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.NotDealCount = r.data.data; this.NotDealCount = r.data.data;
...@@ -2163,8 +2202,7 @@ export default { ...@@ -2163,8 +2202,7 @@ export default {
}, },
app_user_workflow_MyAuditCount() { app_user_workflow_MyAuditCount() {
this.ApiPost2( this.ApiPost2(
"app_user_workflow_MyAuditCount", "app_user_workflow_MyAuditCount", {},
{},
r => { r => {
if (r.data.resultCode == 1) { if (r.data.resultCode == 1) {
this.MyAuditCount = r.data.data; this.MyAuditCount = r.data.data;
...@@ -2315,8 +2353,8 @@ export default { ...@@ -2315,8 +2353,8 @@ export default {
window.localStorage.msgBoxInfo = JSON.stringify(this.boxInfo); window.localStorage.msgBoxInfo = JSON.stringify(this.boxInfo);
}, },
changeTools(index) { changeTools(index) {
if(index==0) if (index == 0)
this.newSearchContent=''; this.newSearchContent = '';
this.imToolsType = index; this.imToolsType = index;
this.searchList = []; this.searchList = [];
}, },
...@@ -2374,7 +2412,7 @@ export default { ...@@ -2374,7 +2412,7 @@ export default {
}, },
dragDiv() { dragDiv() {
if (this.isDrag == true) { if (this.isDrag == true) {
document.onmousemove = function(e) { document.onmousemove = function (e) {
if (document.getElementById("IM_chatLayer").offsetWidth >= 600) { if (document.getElementById("IM_chatLayer").offsetWidth >= 600) {
document.getElementById("IM_chatLayer").style.width = document.getElementById("IM_chatLayer").style.width =
document.body.clientWidth - 360 - e.pageX + "px"; document.body.clientWidth - 360 - e.pageX + "px";
...@@ -2753,10 +2791,10 @@ export default { ...@@ -2753,10 +2791,10 @@ export default {
this.openSessions.push(session); this.openSessions.push(session);
} }
this.currentSession = session; this.currentSession = session;
if(!session.name || session.name==''){ if (!session.name || session.name == '') {
setTimeout(() => { setTimeout(() => {
this.sessionlist.forEach(x=>{ this.sessionlist.forEach(x => {
if(session.id==x.id) if (session.id == x.id)
this.currentSession = x; this.currentSession = x;
}) })
}, 1000); }, 1000);
...@@ -2780,8 +2818,8 @@ export default { ...@@ -2780,8 +2818,8 @@ export default {
obj.name = obj.Name; obj.name = obj.Name;
obj.avatar = obj.Icon; obj.avatar = obj.Icon;
} }
if(!obj.avatar && obj.icon){ if (!obj.avatar && obj.icon) {
obj.avatar=obj.icon obj.avatar = obj.icon
} }
if (obj.imAccount != null) { // 判断是否有im账号 if (obj.imAccount != null) { // 判断是否有im账号
let session = null; let session = null;
...@@ -2883,8 +2921,9 @@ export default { ...@@ -2883,8 +2921,9 @@ export default {
if (this.searchKey != "") { if (this.searchKey != "") {
this.searchType = true; this.searchType = true;
this.ApiPost2( this.ApiPost2(
"admin_Get_Chat_All_SelectEmpName", "admin_Get_Chat_All_SelectEmpName", {
{ EmName: this.searchKey }, EmName: this.searchKey
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.searchList = res.data.data; this.searchList = res.data.data;
...@@ -2901,8 +2940,9 @@ export default { ...@@ -2901,8 +2940,9 @@ export default {
this.searchList = []; this.searchList = [];
this.isLoading = true; this.isLoading = true;
this.ApiPost2( this.ApiPost2(
"admin_Get_Chat_All_SelectEmpName", "admin_Get_Chat_All_SelectEmpName", {
{ EmName: this.newSearchContent }, EmName: this.newSearchContent
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if (res.data.data.length > 1) { if (res.data.data.length > 1) {
...@@ -2938,8 +2978,9 @@ export default { ...@@ -2938,8 +2978,9 @@ export default {
this.groupSearchBox = []; this.groupSearchBox = [];
this.isLoading = true; this.isLoading = true;
this.ApiPost2( this.ApiPost2(
"admin_Get_Chat_All_SelectEmpName", "admin_Get_Chat_All_SelectEmpName", {
{ EmName: this.newSearchContent }, EmName: this.newSearchContent
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if (res.data.data.length > 1) { if (res.data.data.length > 1) {
...@@ -2983,15 +3024,14 @@ export default { ...@@ -2983,15 +3024,14 @@ export default {
getWebAllPart() { getWebAllPart() {
let msg = { let msg = {
RB_Department_Id:240 RB_Department_Id: 240
} }
this.ApiPost2( this.ApiPost2(
"admin_Get_GetCompanyDepartMentEmployeeForChar_V2",msg, "admin_Get_GetCompanyDepartMentEmployeeForChar_V2", msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.webAllpartList = res.data.data; this.webAllpartList = res.data.data;
} else { } else {}
}
}, },
err => {} err => {}
); );
...@@ -3003,8 +3043,9 @@ export default { ...@@ -3003,8 +3043,9 @@ export default {
this.isAppendOne = false; this.isAppendOne = false;
this.dynamicMsg.pageIndex = Math.ceil((index + 1) / 10); this.dynamicMsg.pageIndex = Math.ceil((index + 1) / 10);
this.ApiPost2( this.ApiPost2(
"user_dynamic_delete_comment", "user_dynamic_delete_comment", {
{ commentId: id }, commentId: id
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getDynamic(index); this.getDynamic(index);
...@@ -3026,8 +3067,9 @@ export default { ...@@ -3026,8 +3067,9 @@ export default {
this.isAppendOne = false; this.isAppendOne = false;
this.myDynamicMsg.pageIndex = Math.ceil((index + 1) / 10); this.myDynamicMsg.pageIndex = Math.ceil((index + 1) / 10);
this.ApiPost2( this.ApiPost2(
"user_dynamic_delete_comment", "user_dynamic_delete_comment", {
{ commentId: id }, commentId: id
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getMyDynamic(index); this.getMyDynamic(index);
...@@ -3344,8 +3386,7 @@ export default { ...@@ -3344,8 +3386,7 @@ export default {
this.aboutMyDynamicList = this.aboutMyDynamicList.concat( this.aboutMyDynamicList = this.aboutMyDynamicList.concat(
res.data.data.pageData res.data.data.pageData
); );
} else { } else {}
}
} }
}, },
err => {} err => {}
...@@ -3359,7 +3400,9 @@ export default { ...@@ -3359,7 +3400,9 @@ export default {
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let url = this.domainManager().ViittoFileUrl + x.data.FilePath let url = this.domainManager().ViittoFileUrl + x.data.FilePath
this.addDynamicMsg.fileList.push(url); this.addDynamicMsg.fileList.push(url);
this.imgList.push({ url: url }); this.imgList.push({
url: url
});
}); });
}, },
handleRemoveImg(file) { handleRemoveImg(file) {
...@@ -3383,7 +3426,9 @@ export default { ...@@ -3383,7 +3426,9 @@ export default {
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let src = this.domainManager().ViittoFileUrl + x.data.FilePath let src = this.domainManager().ViittoFileUrl + x.data.FilePath
this.appMsg.Image.push(src); this.appMsg.Image.push(src);
this.fileList.push({ url: src}); this.fileList.push({
url: src
});
}); });
}, },
handleRemove(file) { handleRemove(file) {
...@@ -3481,8 +3526,10 @@ export default { ...@@ -3481,8 +3526,10 @@ export default {
}) })
.then(() => { .then(() => {
this.ApiPost2( this.ApiPost2(
"app_user_workflow_wndoaudit", "app_user_workflow_wndoaudit", {
{ workFlowId: workFlowId, templateType: templateType }, workFlowId: workFlowId,
templateType: templateType
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success("撤回成功。"); this.$message.success("撤回成功。");
...@@ -3513,8 +3560,7 @@ export default { ...@@ -3513,8 +3560,7 @@ export default {
this.workFlowId = workFlowId; this.workFlowId = workFlowId;
this.templateType = templateType; this.templateType = templateType;
this.ApiPost2( this.ApiPost2(
"WorkFlow_get_GetDepartMentEmployee", "WorkFlow_get_GetDepartMentEmployee", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.memberList = res.data.data; this.memberList = res.data.data;
...@@ -3577,8 +3623,11 @@ export default { ...@@ -3577,8 +3623,11 @@ export default {
let WorkFlowId = JSON.parse(link).workFlowId; let WorkFlowId = JSON.parse(link).workFlowId;
let TemplateType = JSON.parse(link).templateType; let TemplateType = JSON.parse(link).templateType;
this.ApiPost2( this.ApiPost2(
"app_user_workflow_GetAuditInfo", "app_user_workflow_GetAuditInfo", {
{ SysLogId: id, WorkFlowId: WorkFlowId, TemplateType: TemplateType }, SysLogId: id,
WorkFlowId: WorkFlowId,
TemplateType: TemplateType
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.detailList = res.data.data; this.detailList = res.data.data;
...@@ -3596,29 +3645,39 @@ export default { ...@@ -3596,29 +3645,39 @@ export default {
}, },
closeLayer() { closeLayer() {
let _this = this; let _this = this;
setTimeout(function() { setTimeout(function () {
_this.showlayer = false; _this.showlayer = false;
}, 300); }, 300);
this.isTransition = false; this.isTransition = false;
this.displayNone = true; this.displayNone = true;
}, },
goUrlT(url, index, name) { goUrlT(url, index, name) {
let query={ let query = {
Conditon: index Conditon: index
} }
if(localStorage.openMode && localStorage.openMode==1){ if (localStorage.openMode && localStorage.openMode == 1) {
query.tab=name query.tab = name
query.blank='y' query.blank = 'y'
} }
// if (index!=-1) { // if (index!=-1) {
this.$router.push({ path: url, query }); this.$router.push({
path: url,
query
});
// } else { // } else {
// this.$router.push({ path: url }); // this.$router.push({ path: url });
// } // }
}, },
goUrlPayment() { goUrlPayment() {
let eid=this.getLocalStorage().EmployeeId; let eid = this.getLocalStorage().EmployeeId;
this.$router.push({ path: 'empBankAccount', query: { id: eid,type:10,blank:'y' } }); this.$router.push({
path: 'empBankAccount',
query: {
id: eid,
type: 10,
blank: 'y'
}
});
}, },
exit() { exit() {
...@@ -3641,8 +3700,9 @@ export default { ...@@ -3641,8 +3700,9 @@ export default {
}, },
setMsgRead(id) { setMsgRead(id) {
this.ApiPost2( this.ApiPost2(
"SystemLog_post_LogSetReadStatus", "SystemLog_post_LogSetReadStatus", {
{ LogId: id }, LogId: id
},
res => {}, res => {},
err => {} err => {}
); );
...@@ -3673,14 +3733,16 @@ export default { ...@@ -3673,14 +3733,16 @@ export default {
} else { } else {
setPermission(); setPermission();
} }
function setPermission() { function setPermission() {
//请求获取通知权限 //请求获取通知权限
NotificationInstance.requestPermission(function(PERMISSION) { NotificationInstance.requestPermission(function (PERMISSION) {
if (PERMISSION === "granted") { if (PERMISSION === "granted") {
CreatNotification(); CreatNotification();
} }
}); });
} }
function CreatNotification() { function CreatNotification() {
const n = new NotificationInstance(msg.name, { const n = new NotificationInstance(msg.name, {
body: msg.lastMsgShow, body: msg.lastMsgShow,
...@@ -3691,9 +3753,8 @@ export default { ...@@ -3691,9 +3753,8 @@ export default {
session: msg session: msg
} }
}); });
n.onshow = function() { n.onshow = function () {};
}; n.onclick = function (e) {
n.onclick = function(e) {
//可以直接通过实例的方式获取data内自定义的数据 //可以直接通过实例的方式获取data内自定义的数据
//也可以通过访问回调参数e来获取data的数据 //也可以通过访问回调参数e来获取data的数据
_that.enterChat(e.data.session); _that.enterChat(e.data.session);
...@@ -3702,9 +3763,8 @@ export default { ...@@ -3702,9 +3763,8 @@ export default {
_that.IM_bodyIsShow = true; _that.IM_bodyIsShow = true;
n.close(); n.close();
}; };
n.onclose = function() { n.onclose = function () {};
}; n.onerror = function (err) {
n.onerror = function(err) {
throw err; throw err;
}; };
setTimeout(() => { setTimeout(() => {
...@@ -3716,134 +3776,157 @@ export default { ...@@ -3716,134 +3776,157 @@ export default {
deletMsg(type) { deletMsg(type) {
let LogStr = [], let LogStr = [],
ContentType = []; ContentType = [];
this.msgList.forEach(x=>{ this.msgList.forEach(x => {
LogStr.push(x.ID) LogStr.push(x.ID)
ContentType.push(x.ContentType) ContentType.push(x.ContentType)
}) })
this.ApiPost2('SystemLog_post_SetReadStatusBatch',{LogStr:LogStr,ContentType:ContentType},r=>{ this.ApiPost2('SystemLog_post_SetReadStatusBatch', {
if(r.data.resultCode==1){ LogStr: LogStr,
ContentType: ContentType
}, r => {
if (r.data.resultCode == 1) {
this.msgList = []; this.msgList = [];
this.MsgCount = this.msgList.length; this.MsgCount = this.msgList.length;
}else{ } else {
this.$message.error(r.data.message); this.$message.error(r.data.message);
} }
},null) }, null)
} }
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less">
@import "../assets/css/main.less"; @import "../assets/css/main.less";
@import "../assets/css/cssReset.css"; @import "../assets/css/cssReset.css";
@import "../assets/css/message.css"; @import "../assets/css/message.css";
#downzip{
#downzip {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed; position: fixed;
background: rgba(0,0,0,0.3); background: rgba(0, 0, 0, 0.3);
top: 0; top: 0;
left: 0; left: 0;
z-index: 2000; z-index: 2000;
display: table; display: table;
} }
#downzip>div{
#downzip>div {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
margin-top: 200px; margin-top: 200px;
} }
#downzip>div>div{
width:285px; #downzip>div>div {
width: 285px;
height: 260px; height: 260px;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
} }
.close{
.close {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0px; right: 0px;
width: 25px; width: 25px;
height: 25px; height: 25px;
} }
.changelanguage{
width:124px; .changelanguage {
} width: 124px;
.changelanguage .el-dropdown-menu__item .icon-duigou{ }
color:#000000;
.changelanguage .el-dropdown-menu__item .icon-duigou {
color: #000000;
position: absolute; position: absolute;
right: 10px; right: 10px;
font-size: 14px; font-size: 14px;
} }
.changelanguage .el-dropdown-menu__item{
padding:0; .changelanguage .el-dropdown-menu__item {
padding-left:15px; padding: 0;
padding-left: 15px;
font-size: 14px; font-size: 14px;
position: relative; position: relative;
color:#333333; color: #333333;
} }
.changelanguage .el-dropdown-menu__item:hover{
.changelanguage .el-dropdown-menu__item:hover {
background: #D9D9D9; background: #D9D9D9;
color:#333333; color: #333333;
} }
._dropdown.el-dropdown-menu {
._dropdown.el-dropdown-menu {
padding: 0; padding: 0;
background-color: #1f2533 !important; background-color: #1f2533 !important;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
width: 210px; width: 210px;
top: 40px !important; top: 40px !important;
} }
._dropdown_f1.el-dropdown-menu__item {
._dropdown_f1.el-dropdown-menu__item {
background-color: #4d515b !important; background-color: #4d515b !important;
color: #ffffff !important; color: #ffffff !important;
cursor: default; cursor: default;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
} }
._dropdown_f1.el-dropdown-menu__item .company {
._dropdown_f1.el-dropdown-menu__item .company {
font-size: 14px; font-size: 14px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; 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; display: inline-block;
padding: 3px 8px; padding: 3px 8px;
background-color: #007eff; background-color: #007eff;
border-radius: 9px; border-radius: 9px;
line-height: 18px; line-height: 18px;
font-size: 12px; 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; background-color: #4d515b !important;
color: #ffffff !important; color: #ffffff !important;
} }
._dropdown_other.el-dropdown-menu__item {
._dropdown_other.el-dropdown-menu__item {
color: #a9aaad; color: #a9aaad;
position: relative; position: relative;
} }
._dropdown_other.el-dropdown-menu__item .el-badge {
._dropdown_other.el-dropdown-menu__item .el-badge {
position: absolute; position: absolute;
right: 20px; right: 20px;
top: 5px; top: 5px;
} }
._dropdown_other.el-dropdown-menu__item i {
._dropdown_other.el-dropdown-menu__item i {
color: #a9aaad; color: #a9aaad;
display: inline-block; display: inline-block;
margin-right: 6px; 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; background-color: #6f737b !important;
color: #ffffff !important; color: #ffffff !important;
} }
._dropdown .popper__arrow::after {
._dropdown .popper__arrow::after {
border-bottom-color: transparent !important; border-bottom-color: transparent !important;
} }
.IM_body {
.IM_body {
position: absolute; position: absolute;
z-index: 9999; z-index: 9999;
right: 0; right: 0;
...@@ -3858,36 +3941,39 @@ export default { ...@@ -3858,36 +3941,39 @@ export default {
background-image: url("../assets/img/imbg/1.png"); background-image: url("../assets/img/imbg/1.png");
box-shadow: 1px 1px 50px rgba(0, 0, 0, 0.3); box-shadow: 1px 1px 50px rgba(0, 0, 0, 0.3);
background-clip: content-box; background-clip: content-box;
} }
.myDocumentsLink {
.myDocumentsLink {
margin: 25px 0; margin: 25px 0;
} }
.myDocumentsLink > span { .myDocumentsLink>span {
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
color: #e95252; color: #e95252;
} }
.myDocumentsLink > span:not(:last-of-type):hover { .myDocumentsLink>span:not(:last-of-type):hover {
text-decoration: underline; text-decoration: underline;
} }
.myDocumentsLink > span:not(:last-of-type):after { .myDocumentsLink>span:not(:last-of-type):after {
content: ">"; content: ">";
margin: 0 3px; margin: 0 3px;
color: #e95252; color: #e95252;
pointer-events: none; pointer-events: none;
} }
.myDocumentsLink > span:last-child { .myDocumentsLink>span:last-child {
color: #666; color: #666;
cursor: default; cursor: default;
} }
.dsyNone {
.dsyNone {
display: none; display: none;
} }
.indexMsgLayer {
.indexMsgLayer {
position: fixed; position: fixed;
z-index: 999; z-index: 999;
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
...@@ -3895,8 +3981,9 @@ export default { ...@@ -3895,8 +3981,9 @@ export default {
height: 100%; height: 100%;
left: 0; left: 0;
top: 0; top: 0;
} }
.indexMsgLayerContent {
.indexMsgLayerContent {
width: 400px; width: 400px;
background: #fff; background: #fff;
z-index: 1100; z-index: 1100;
...@@ -3907,109 +3994,128 @@ export default { ...@@ -3907,109 +3994,128 @@ export default {
position: absolute; position: absolute;
box-shadow: 4px 0px 10px rgba(0, 0, 0, 0.1); box-shadow: 4px 0px 10px rgba(0, 0, 0, 0.1);
transition: right 0.5s; transition: right 0.5s;
} }
.indexMsgLayerContent.rightZero {
.indexMsgLayerContent.rightZero {
right: 0px; right: 0px;
} }
.indexMsgLayerContent .title {
.indexMsgLayerContent .title {
height: 48px; height: 48px;
background: #edeef0; background: #edeef0;
line-height: 48px; line-height: 48px;
font-size: 16px; font-size: 16px;
color: #333; color: #333;
text-indent: 30px; text-indent: 30px;
} }
.indexMsgLayerContent .user {
.indexMsgLayerContent .user {
width: 340px; width: 340px;
margin: 0 30px; margin: 0 30px;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
height: 60px; height: 60px;
padding: 30px 0; padding: 30px 0;
box-sizing: content-box; box-sizing: content-box;
} }
.indexMsgLayerContent .user > p {
.indexMsgLayerContent .user>p {
line-height: 28px; line-height: 28px;
} }
.indexMsgLayerContent .user > img {
.indexMsgLayerContent .user>img {
width: 58px; width: 58px;
height: 58px; height: 58px;
border-radius: 29px; border-radius: 29px;
float: left; float: left;
margin: 0 12px 0 0; margin: 0 12px 0 0;
} }
.indexMsgLayerContent .detail {
.indexMsgLayerContent .detail {
width: 340px; width: 340px;
margin: 0 30px; margin: 0 30px;
padding: 25px 0; padding: 25px 0;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
min-height: 120px; min-height: 120px;
} }
.indexMsgLayerContent .audit {
.indexMsgLayerContent .audit {
width: 340px; width: 340px;
margin: 30px 30px 0; margin: 30px 30px 0;
min-height: 120px; min-height: 120px;
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
} }
.indexMsgLayerContent .audit .auditItem {
.indexMsgLayerContent .audit .auditItem {
min-height: 80px; min-height: 80px;
width: 320px; width: 320px;
margin-left: 20px; margin-left: 20px;
border-left: 1px solid #ededed; border-left: 1px solid #ededed;
position: relative; position: relative;
font-size: 14px; font-size: 14px;
} }
.indexMsgLayerContent .audit .auditItem:last-child {
.indexMsgLayerContent .audit .auditItem:last-child {
border-left: none; border-left: none;
} }
.indexMsgLayerContent .audit .auditItem > p {
.indexMsgLayerContent .audit .auditItem>p {
line-height: 40px; line-height: 40px;
text-indent: 40px; text-indent: 40px;
} }
.indexMsgLayerContent .audit .auditItem > img {
.indexMsgLayerContent .audit .auditItem>img {
width: 40px; width: 40px;
height: 40px; height: 40px;
border-radius: 20px; border-radius: 20px;
position: absolute; position: absolute;
left: -20px; left: -20px;
} }
.indexMsgLayerContent .send {
.indexMsgLayerContent .send {
width: 340px; width: 340px;
margin: 30px 30px 0; margin: 30px 30px 0;
min-height: 120px; min-height: 120px;
} }
.indexMsgLayerContent .send .sentTitle {
.indexMsgLayerContent .send .sentTitle {
height: 14px; height: 14px;
line-height: 14px; line-height: 14px;
text-indent: 10px; text-indent: 10px;
border-left: 3px solid #e95252; border-left: 3px solid #e95252;
font-size: 14px; font-size: 14px;
} }
.indexMsgLayerContent .send .sentTitle span {
.indexMsgLayerContent .send .sentTitle span {
color: #666; color: #666;
margin-left: 20px; margin-left: 20px;
} }
.indexMsgLayerContent .send .sendList > div {
.indexMsgLayerContent .send .sendList>div {
float: left; float: left;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
font-size: 12px; font-size: 12px;
color: #666; color: #666;
width: 40px; width: 40px;
text-align: center; text-align: center;
} }
.indexMsgLayerContent .send .sendList > div > img {
.indexMsgLayerContent .send .sendList>div>img {
width: 40px; width: 40px;
height: 40px; height: 40px;
border-radius: 20px; border-radius: 20px;
} }
.indexMsgLayerContent .myApprovalTable tr {
.indexMsgLayerContent .myApprovalTable tr {
height: 40px; height: 40px;
font-size: 14px; font-size: 14px;
} }
.indexMsgLayerContent .myApprovalTable tr td:nth-child(1) {
.indexMsgLayerContent .myApprovalTable tr td:nth-child(1) {
text-align: right; text-align: right;
color: #666; color: #666;
} }
.indexMsgLayerContentBtn {
.indexMsgLayerContentBtn {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
background: #fff; background: #fff;
...@@ -4018,16 +4124,19 @@ export default { ...@@ -4018,16 +4124,19 @@ export default {
line-height: 40px; line-height: 40px;
padding: 0 30px; padding: 0 30px;
border-top: 1px solid #f0f3fa; border-top: 1px solid #f0f3fa;
} }
.indexMsgLayerContentBtn input {
.indexMsgLayerContentBtn input {
margin-right: 10px; 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; display: flex;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
} }
.Supplier_nav_right ul li.user_head span.name {
.Supplier_nav_right ul li.user_head span.name {
color: #99a7b3; color: #99a7b3;
font-size: 12px; font-size: 12px;
display: inline-block; display: inline-block;
...@@ -4035,59 +4144,70 @@ export default { ...@@ -4035,59 +4144,70 @@ export default {
overflow: hidden; overflow: hidden;
width: 45px; width: 45px;
height: 50px; height: 50px;
} }
.Supplier_nav_right ul li.user_head img {
.Supplier_nav_right ul li.user_head img {
width: 24px; width: 24px;
height: 24px; height: 24px;
border-radius: 50%; border-radius: 50%;
} }
.nav {
.nav {
display: -webkit-box; display: -webkit-box;
.size(100%, 50px); .size(100%, 50px);
.min-width(1366px); .min-width(1366px);
background: #1f2533; background: #1f2533;
} }
.nav-left {
.nav-left {
width: 56px; width: 56px;
line-height: 50px; line-height: 50px;
color: #e73828; color: #e73828;
text-align: center; text-align: center;
} }
.nav-left .GroupPic{
.nav-left .GroupPic {
width: 36px; width: 36px;
height: 36px; height: 36px;
-webkit-border-radius: 36px; -webkit-border-radius: 36px;
margin: 7px 0px 0px 15px; margin: 7px 0px 0px 15px;
} }
.nav-left i.iconfont {
.nav-left i.iconfont {
font-size: 24px; font-size: 24px;
} }
.nav-left img {
.nav-left img {
.fl(); .fl();
.size(50px;50px); .size(50px; 50px);
.circle(25px); .circle(25px);
} }
.nav-left p.name {
.nav-left p.name {
.fz(14px, 18px); .fz(14px, 18px);
color: #444; color: #444;
margin: 20px 0 5px 0; margin: 20px 0 5px 0;
} }
.nav-left p.company {
.nav-left p.company {
.fz(12px); .fz(12px);
color: #444; color: #444;
} }
.nav-middle {
.nav-middle {
/*width: calc(100% - 140px);*/ /*width: calc(100% - 140px);*/
display: flex; display: flex;
} }
.nav-middle ul {
.nav-middle ul {
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
height: 100%; height: 100%;
z-index: 2019128; z-index: 2019128;
} }
.nav-middle ul li {
.nav-middle ul li {
.size(100px, 100%); .size(100px, 100%);
.fz(14px); .fz(14px);
.center(text-x); .center(text-x);
...@@ -4097,16 +4217,19 @@ export default { ...@@ -4097,16 +4217,19 @@ export default {
padding: 12px 0; padding: 12px 0;
float: left; float: left;
z-index: 2019128; z-index: 2019128;
} }
.nav-middle ul li i {
.nav-middle ul li i {
font-size: 16px; font-size: 16px;
color: #a6adb4; color: #a6adb4;
} }
.nav-middle ul li img {
.nav-middle ul li img {
height: 40px; height: 40px;
margin: 32px 0 14px; margin: 32px 0 14px;
} }
.nav-middle ul li:hover .menuList_son{
.nav-middle ul li:hover .menuList_son {
// display: block; // display: block;
width: 1000px; width: 1000px;
z-index: 999999; z-index: 999999;
...@@ -4114,20 +4237,24 @@ export default { ...@@ -4114,20 +4237,24 @@ export default {
padding: 20px 0 20px 20px; padding: 20px 0 20px 20px;
height: auto; height: auto;
// transition: all .5s linear .5s; // transition: all .5s linear .5s;
animation:ttt .5s forwards; animation: ttt .5s forwards;
}
@keyframes ttt {
0%{
opacity:0;
} }
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; position: fixed;
z-index: 9000; z-index: 9000;
background-color: #363c4a; background-color: #363c4a;
...@@ -4137,102 +4264,122 @@ export default { ...@@ -4137,102 +4264,122 @@ export default {
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
height: 0; height: 0;
} }
.menuList_tittle_box{
.menuList_tittle_box {
line-height: 30px; line-height: 30px;
padding-top: 15px; padding-top: 15px;
} }
.menuList_son_one_tittle{
.menuList_son_one_tittle {
color: #a6adb4; color: #a6adb4;
font-size: 16px; font-size: 16px;
padding-bottom: 15px; padding-bottom: 15px;
border-bottom: 1px solid #495165; border-bottom: 1px solid #495165;
text-align: left; text-align: left;
} }
.menuList_son_two_tittle{
.menuList_son_two_tittle {
color: #e9ebec; color: #e9ebec;
text-align: left; text-align: left;
} }
.menuList_son_three_tittle{
.menuList_son_three_tittle {
cursor: pointer; cursor: pointer;
transition: all linear .3s; transition: all linear .3s;
text-align: left; text-align: left;
} }
.menuList_son_three_tittle:hover{
.menuList_son_three_tittle:hover {
color: white; color: white;
} }
.menuList_son_item{
.menuList_son_item {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
} }
.hoverNote {
.hoverNote {
width: 0; width: 0;
height: 4px; height: 4px;
background: #e95252; background: #e95252;
position: absolute; position: absolute;
left: 0; left: 0;
bottom: -2px; bottom: -2px;
} }
.nav-middle ul li:hover {
.nav-middle ul li:hover {
background-color: #2f384d; background-color: #2f384d;
} }
.nav-middle ul li:hover .hoverNote {
.nav-middle ul li:hover .hoverNote {
width: 100%; width: 100%;
transition: width 0.3s; transition: width 0.3s;
} }
.nav-middle ul li i {
.nav-middle ul li i {
color: #a6adb4; color: #a6adb4;
display: inline-block; display: inline-block;
margin-right: 12px; margin-right: 12px;
} }
.big_tittle{
.big_tittle {
cursor: pointer; cursor: pointer;
} }
.nav-middle ul li.active .big_tittle{
.nav-middle ul li.active .big_tittle {
color: #ffffff; color: #ffffff;
// background: #2f384d; // background: #2f384d;
cursor: pointer; cursor: pointer;
} }
.nav-middle ul li.active .hoverNote { .nav-middle ul li.active .hoverNote {
width: 100%; width: 100%;
} }
.Supplier_nav_right {
.Supplier_nav_right {
min-width: 220px; min-width: 220px;
position: absolute; position: absolute;
right: 0; right: 0;
} }
.Supplier_nav_right ul {
.Supplier_nav_right ul {
display: flex; display: flex;
line-height: 50px; line-height: 50px;
justify-content: flex-end; justify-content: flex-end;
} }
.Supplier_nav_right ul li {
.Supplier_nav_right ul li {
height: 50px; height: 50px;
margin-right: 20px; margin-right: 20px;
text-align: center; text-align: center;
justify-content: flex-end; justify-content: flex-end;
} }
.Supplier_nav_right ul li i {
.Supplier_nav_right ul li i {
cursor: pointer; cursor: pointer;
.fz(18px); .fz(18px);
color: #e4e4e4; color: #e4e4e4;
} }
.Supplier_nav_right ul li i:hover {
.Supplier_nav_right ul li i:hover {
color: #999; color: #999;
} }
.hide {
.hide {
display: none; display: none;
} }
#message_box {
#message_box {
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
z-index: 1889; z-index: 1889;
font-family: "PingFangSC-fine" !important; font-family: "PingFangSC-fine" !important;
} }
.box {
.box {
height: 100%; height: 100%;
background-color: rgba(255, 255, 255, 0); background-color: rgba(255, 255, 255, 0);
overflow: hidden; overflow: hidden;
...@@ -4241,55 +4388,70 @@ export default { ...@@ -4241,55 +4388,70 @@ export default {
top: 0; top: 0;
z-index: 180; z-index: 180;
width: 100%; width: 100%;
} }
.mybox-leave-active {
.mybox-leave-active {
transition: all 1s ease; transition: all 1s ease;
} }
.mybox-enter-active {
.mybox-enter-active {
transition: all 0.5s ease; transition: all 0.5s ease;
} }
.mybox-leave-active,
.mybox-enter { .mybox-leave-active,
.mybox-enter {
right: -100% !important; right: -100% !important;
} }
.mybox-leave,
.mybox-enter-active { .mybox-leave,
.mybox-enter-active {
right: 0; right: 0;
} }
.noNewMsg {
.noNewMsg {
font-size: 16px; font-size: 16px;
color: #999; color: #999;
text-align: center; text-align: center;
} }
@keyframes zy {
@keyframes zy {
10% { 10% {
transform: rotate(15deg); transform: rotate(15deg);
} }
20% { 20% {
transform: rotate(-10deg); transform: rotate(-10deg);
} }
30% { 30% {
transform: rotate(5deg); transform: rotate(5deg);
} }
40% { 40% {
transform: rotate(-5deg); transform: rotate(-5deg);
} }
50%, 50%,
100% { 100% {
transform: rotate(0deg); transform: rotate(0deg);
} }
} }
.animation::before {
.animation::before {
color: #e95252; color: #e95252;
float: left; float: left;
width: 18px; width: 18px;
height: 27px; height: 27px;
animation: zy 2.5s 0.15s linear infinite; animation: zy 2.5s 0.15s linear infinite;
-moz-animation: zy 2.5s 0.15s linear infinite; /* Firefox */ -moz-animation: zy 2.5s 0.15s linear infinite;
-webkit-animation: zy 2.5s 0.15s linear infinite; /* Safari and Chrome */ /* Firefox */
-o-animation: zy 2.5s 0.15s linear infinite; /* Opera */ -webkit-animation: zy 2.5s 0.15s linear infinite;
} /* Safari and Chrome */
#message_box .content { -o-animation: zy 2.5s 0.15s linear infinite;
/* Opera */
}
#message_box .content {
width: 350px; width: 350px;
height: 100%; height: 100%;
background-image: url("../assets/img/message_bg@3x.png"); background-image: url("../assets/img/message_bg@3x.png");
...@@ -4298,58 +4460,73 @@ export default { ...@@ -4298,58 +4460,73 @@ export default {
right: 0; right: 0;
top: 0; top: 0;
z-index: 200; z-index: 200;
} }
#message_box .header {
#message_box .header {
padding: 18px 20px; padding: 18px 20px;
height: 6%; height: 6%;
} }
#message_box .header i {
#message_box .header i {
color: #e95252; color: #e95252;
font-size: 18px; font-size: 18px;
cursor: pointer; cursor: pointer;
} }
#message_box .header > div {
#message_box .header>div {
width: 50%; width: 50%;
float: left; float: left;
} }
#message_box .header > div:nth-child(2) {
#message_box .header>div:nth-child(2) {
text-align: right; text-align: right;
} }
#message_box .header i.icon-img_caidan {
#message_box .header i.icon-img_caidan {
font-size: 16px; 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; display: inline-block;
margin-right: 38px; margin-right: 38px;
} }
.msgItem_box {
.msgItem_box {
height: 94%; height: 94%;
overflow: auto; overflow: auto;
} }
#message_box .msgItem {
#message_box .msgItem {
padding: 20px; padding: 20px;
transition: all linear 0.5s; transition: all linear 0.5s;
cursor: pointer; cursor: pointer;
} }
#message_box .msgItem:hover {
#message_box .msgItem:hover {
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
} }
#message_box .msgItem:hover .icon-ego-guanbi {
#message_box .msgItem:hover .icon-ego-guanbi {
display: inline-block; display: inline-block;
} }
.msgItem_left {
.msgItem_left {
width: 40px; width: 40px;
} }
.msgItem_right {
.msgItem_right {
width: 250px; width: 250px;
} }
.msgItem_right > div > div {
.msgItem_right>div>div {
float: left; float: left;
} }
.msgItem_right > div > div:nth-child(2) {
.msgItem_right>div>div:nth-child(2) {
float: right; float: right;
} }
.msgItem_tit {
.msgItem_tit {
padding-left: 10px; padding-left: 10px;
font-size: 14px; font-size: 14px;
color: #333333; color: #333333;
...@@ -4357,13 +4534,15 @@ export default { ...@@ -4357,13 +4534,15 @@ export default {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.msgItem_left,
.msgItem_right { .msgItem_left,
.msgItem_right {
height: 80px; height: 80px;
float: left; float: left;
} }
.msgItem_radius {
.msgItem_radius {
height: 38px; height: 38px;
width: 38px; width: 38px;
line-height: 38px; line-height: 38px;
...@@ -4372,80 +4551,100 @@ export default { ...@@ -4372,80 +4551,100 @@ export default {
background-color: #6694dc; background-color: #6694dc;
font-size: 12px; font-size: 12px;
color: white; color: white;
} }
.msgItem_time {
.msgItem_time {
font-size: 14px; font-size: 14px;
color: #999999; color: #999999;
} }
.icon-ego-guanbi {
.icon-ego-guanbi {
font-size: 12px; font-size: 12px;
color: #999999; color: #999999;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
padding-left: 20px; padding-left: 20px;
display: none; display: none;
} }
.msgItem_conten {
.msgItem_conten {
padding: 10px; padding: 10px;
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
padding-bottom: 0; padding-bottom: 0;
} }
.icon-imessage_top {
.icon-imessage_top {
animation: mymove 5s infinite; animation: mymove 5s infinite;
-webkit-animation: mymove 5s infinite; /*Safari and Chrome*/ -webkit-animation: mymove 5s infinite;
} /*Safari and Chrome*/
@keyframes mymove { }
@keyframes mymove {
from { from {
left: 0px; left: 0px;
} }
to { to {
left: 200px; left: 200px;
} }
} }
@-webkit-keyframes mymove /*Safari and Chrome*/ {
@-webkit-keyframes mymove
/*Safari and Chrome*/
{
from { from {
left: 0px; left: 0px;
} }
to { to {
left: 200px; left: 200px;
} }
} }
.temDivs {
.temDivs {
/*flex:1;margin-top: 2px;*/ /*flex:1;margin-top: 2px;*/
position: absolute; position: absolute;
top: 50px; top: 50px;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
right: 0px; right: 0px;
} }
.red {
.red {
color: #e95252 !important; color: #e95252 !important;
} }
.weOytour {
.weOytour {
display: none; display: none;
} }
.sysMsg_lod_more {
.sysMsg_lod_more {
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
color: #999999; color: #999999;
} }
.IM_messageList2{
.IM_messageList2 {
top: 41px; top: 41px;
} }
.IM_messageList ul li.sysMsg_lod_more:hover {
.IM_messageList ul li.sysMsg_lod_more:hover {
background-color: inherit; background-color: inherit;
height: auto; height: auto;
line-height: 35px; line-height: 35px;
} }
.IM_messageList ._SysNoteDate_ul li {
.IM_messageList ._SysNoteDate_ul li {
height: auto; height: auto;
} }
._more_dropdown._dropdown.el-dropdown-menu{
._more_dropdown._dropdown.el-dropdown-menu {
top: 50px !important; top: 50px !important;
} }
.logsBack{ .logsBack {
position: fixed; position: fixed;
z-index: 999; z-index: 999;
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
...@@ -4453,58 +4652,67 @@ export default { ...@@ -4453,58 +4652,67 @@ export default {
height: 100%; height: 100%;
left: 0; left: 0;
top: 0; top: 0;
} }
.updateLogs{
.updateLogs {
position: absolute; position: absolute;
width:400px; width: 400px;
// height:400px; // height:400px;
left:50%; left: 50%;
top:50%; top: 50%;
margin-left:-200px; margin-left: -200px;
margin-top:-200px; margin-top: -200px;
border-radius: 4px; border-radius: 4px;
border:1px solid #DCDCDC; border: 1px solid #DCDCDC;
z-index: 9999; z-index: 9999;
background-color: #fff; background-color: #fff;
} }
.logsTitle{
width:100%; .logsTitle {
padding:0 10px; width: 100%;
padding: 0 10px;
text-align: center; text-align: center;
color:#333333; color: #333333;
font-size:14px; font-size: 14px;
margin-top:10px; margin-top: 10px;
font-weight: bold; font-weight: bold;
} }
.inlogs_Content{
width:100%; .inlogs_Content {
padding:0 15px; width: 100%;
padding: 0 15px;
// height:260px; // height:260px;
overflow: auto; overflow: auto;
margin-top:20px; margin-top: 20px;
color:#666666; color: #666666;
font-size:12px; font-size: 12px;
} }
.inlogs_Content p{
margin-bottom:10px; .inlogs_Content p {
} margin-bottom: 10px;
.logsImg{ }
margin-top:-30px;
margin-left:155px; .logsImg {
} margin-top: -30px;
._saleRnk.el-dialog--center{ margin-left: 155px;
}
._saleRnk.el-dialog--center {
z-index: 2019523; z-index: 2019523;
} }
._saleRnk.el-dialog--center .el-dialog__body{
._saleRnk.el-dialog--center .el-dialog__body {
padding: 0; padding: 0;
max-height: 800px; max-height: 800px;
} }
._saleRnk.el-dialog--center{
._saleRnk.el-dialog--center {
margin-top: 45px !important; margin-top: 45px !important;
margin-bottom: 0 !important; margin-bottom: 0 !important;
height: 850px; height: 850px;
} }
.Supplier_nav_right ul li.user_head span.SupplierName {
.Supplier_nav_right ul li.user_head span.SupplierName {
color: #99a7b3; color: #99a7b3;
font-size: 12px; font-size: 12px;
display: inline-block; display: inline-block;
...@@ -4512,12 +4720,13 @@ export default { ...@@ -4512,12 +4720,13 @@ export default {
overflow: hidden; overflow: hidden;
min-width: 45px; min-width: 45px;
height: 50px; height: 50px;
} }
.SupplierIndex_Nav ul li{
margin-left:20px;
}
.classHong { .SupplierIndex_Nav ul li {
margin-left: 20px;
}
.classHong {
background-color: rgb(255, 55, 55); background-color: rgb(255, 55, 55);
color: #fff; color: #fff;
} }
...@@ -4632,4 +4841,6 @@ export default { ...@@ -4632,4 +4841,6 @@ export default {
.HotelQueryList .el-table td { .HotelQueryList .el-table td {
padding: 0; padding: 0;
}</style> }
</style>
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