Skip to content

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

111

parent 1289d0af
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 197 deletions
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ e3a6e038
......@@ -265,7 +265,7 @@
<div class="_fnDm_content" v-loading='loading'>
<el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%" row-key="FrID"
@selection-change="handleSelectionChange">
<el-table-column type="selection" :selectable="selectable" width="55" :reserve-selection="true" />
<el-table-column type="selection" :selectable="selectable" width="55" :reserve-selection="true" >
</el-table-column>
<el-table-column :label="$t('fnc.danhao')" width="120">
<template slot-scope="scope">
......
src/components/administrative/Survey.vue
View file @ e3a6e038
......@@ -13,7 +13,8 @@
<em>{{$t('advmanager.v_line')}}</em>
</span>
<el-select filterable v-model="obj.LineID" value-key="LineID" @change="getLineTeamList">
<el-option :label="$t('pub.unlimitedSel')" :value="{LineName:`${$t('pub.unlimitedSel')}`,LineID:0}"></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value="{LineName:`${$t('pub.unlimitedSel')}`,LineID:0}">
</el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item' :key='item.LineID'></el-option>
</el-select>
</li>
......@@ -105,10 +106,9 @@
</template>
<template v-if="item.SurveyType === 3">
<td colspan="4">
<el-checkbox-group v-model="item.SurveyOptionsList">
<el-checkbox v-for="(radio, rIndex) in item.SurveyOptionsList" :label="radio.ID" :key="rIndex">
{{radio.OptionsName}}</el-checkbox>
</el-checkbox-group>
<el-checkbox v-for="(radio, rIndex) in item.SurveyOptionsList" v-model="radio.IsCheckS"
:label="radio.ID" :key="rIndex">
{{radio.OptionsName}}</el-checkbox>
</td>
</template>
<template v-if="item.SurveyType === 4">
......@@ -263,9 +263,16 @@
x.GuestId = this.GuestId;
if (x.SurveyType === 2 || x.SurveyType === 3) {
x.SurveyOptionsList.forEach(y => {
y.IsCheck = x.ScoreNum == y.ID ? '1' : '0'
y.IsCheck = "0";
if (x.SurveyType === 2 && x.ScoreNum == y.ID) {
y.IsCheck = '1';
}
//多选
if (x.SurveyType == 3 && y.IsCheckS) {
y.IsCheck = "1";
}
})
x.ScoreNum = 0
x.ScoreNum = 0;
}
})
this.apipost('survey_post_SetGuestSurvey', data, res => {
......
src/components/guestSign.vue
View file @ e3a6e038
......@@ -44,21 +44,25 @@
/deep/.guestSign .el-checkbox .el-checkbox__inner {
width: 40px;
height: 40px;
line-height: 40px;
}
/deep/.guestSign .el-checkbox .el-checkbox__inner {
line-height: 3;
/deep/.guestSign .el-checkbox .el-checkbox__label {
font-size: 36px;
/* 设置文字大小 */
}
/* 调整checkbox的选择框大小 */
/deep/.guestSign .el-checkbox .el-checkbox__inner::after {
width: 40px;
height: 40px;
/* 如果需要调整选中对勾的大小 */
/deep/.guestSign .el-checkbox .el-checkbox__input .el-checkbox__inner::after {
width: 20px;
/* 设置对勾的宽度 */
height: 20px;
/* 设置对勾的高度 */
line-height: 20px;
/* 设置对勾内文本的行高 */
}
/deep/.guestSign .el-checkbox .el-checkbox__label {
font-size: 36px;
/deep/.guestSign .el-checkbox .el-checkbox__input.is-checked .el-checkbox__inner::after {
transform: rotate(50deg) scaleY(1.3);
}
</style>
......@@ -128,7 +132,6 @@
<script>
export default {
data() {
return {
qMsg: {
......@@ -206,13 +209,12 @@
}
})
this.dataList = data;
console.log("this.dataList1", JSON.parse(JSON.stringify(this.dataList)))
}
}, null)
},
//提交意见调查
saveGuestSurvey() {
//this.saveLoading = true;
this.saveLoading = true;
var postMsg = [];
console.log("this.dataList2", JSON.parse(JSON.stringify(this.dataList)))
if (this.dataList && this.dataList.length > 0) {
......
src/components/guestlogin.vue
View file @ e3a6e038
......@@ -21,7 +21,7 @@
postMsg: {
type: 1, //1-手机号码验证登录，2-护照号码验证登录
//E75385750 13970261014
guestMobile: "13088987863", //1-为手机号码,2-护照号码
guestMobile: "13891660266", //1-为手机号码,2-护照号码
TCID: 21633
},
qMsg: {
......
src/components/h5page/guestlogin.vue deleted 100644 → 0
View file @ 1289d0af
<style>
</style>
<template>
<div>
<input type="button" value="手机号验证" />
<input type="button" value="护照号验证" />
</div>
</template>
<script>
export default {
components: {
},
data() {
return {
activeName: 'first',
postMsg: {
loginType: 1, //1-手机号码验证登录，2-护照号码验证登录
phoneNum: "", //电话号码
passportNum: "", //护照号码
}
};
},
mounted() {
},
methods: {
guestLogin() {
}
}
};
</script>
src/components/index.vue
View file @ e3a6e038
......@@ -72,7 +72,7 @@
<div class="nav-middle">
<ul class="clearfix comIndexUl" :style="{width:`${allWindowWidth}px`}">
<li v-for="(item,index) in menuList" v-if="item.MenuUrl!='' && index<=maxLength"
:class="{active:item.MenuId==chosenIndex}" @click="goUrl(item.MenuUrl,item.MenuId,index)">
:class="{active:item.MenuId==chosenIndex}" @click="goUrl(item.MenuUrl,item.MenuId,index)" :key="`r_`+index">
<span class="big_tittle"><i :class="[fontPub,item.icon]"></i>
{{item.MenuName}}
<span class="MenuConfirm" v-if="item.fatherCount>0">{{item.fatherCount}}</span>
......@@ -83,18 +83,18 @@
:style="{width:item.ChildMenu.length>=1 ? '1300px' : '0',left:'50px'}"
style='border: 1px solid #eee;border-top:none;' @click.stop>
<div class="menuList_son_item">
<div v-for="(son, sIndex) in item.ChildMenu"
<div v-for="(son, sIndex) in item.ChildMenu" :key="`r_`+index+`_s_`+sIndex"
style="width: 150px;border-right: 1px solid rgb(246, 246, 249);">
<p class="menuList_son_one_tittle">
{{son.MenuName}}
<span class="MenuConfirm" v-if="son.childCount>0">{{son.childCount}}</span>
</p>
<div v-for="(grand, gIndex) in son.NewChildMenu" class="menuList_tittle_box">
<div v-for="(grand, gIndex) in son.NewChildMenu" class="menuList_tittle_box" :key="`r_`+index+`_s_`+sIndex+`_g_`+gIndex">
<p v-if="grand.GCode !== '默认'" class="menuList_son_two_tittle">{{grand.GCode}}</p>
<template v-for="(grandSon, gsIndex) in grand.list">
<template v-if="(HOTEL_memorandum&&son.MenuId==647)||son.MenuId!=647">
<p @click.stop="goUrl(grandSon.MenuUrl,grandSon.MenuId,gsIndex)"
class="menuList_son_three_tittle"><i
class="menuList_son_three_tittle" :key="`r_`+index+`_s_`+sIndex+`_g_`+gIndex+`_gs_`+gsIndex"><i
:class="[fontPub,JSON.parse(grandSon.MenuStyle).icon ? JSON.parse(grandSon.MenuStyle).icon : 'icon-guanli2']"></i>
{{grandSon.MenuName}}
<span class="MenuConfirm" v-if="grandSon.Count>0">{{grandSon.Count}}</span>
......@@ -112,12 +112,12 @@
<span v-if="!useRed" class="el-dropdown-link"
style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span style="color: #a6adb4;"><i class="iconfont icon-biaoge"
style="margin-right: 5px;font-size:13px"></i>{{$t('pub.more')}}</span>
style="margin-right: 5px;font-size:13px"></i>更多</span>
</span>
<span v-if="useRed" class="el-dropdown-link"
style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span style="color: #FFF;font-size:15px"><i class="iconfont icon-biaoge"
style="margin-right: 5px;font-size:12px"></i>{{$t('pub.more')}}</span>
style="margin-right: 5px;font-size:12px"></i>更多</span>
</span>
<el-dropdown-menu slot="dropdown" class="_dropdown _more_dropdown">
<el-dropdown-item class="clearfix _dropdown_other" v-for="(item,index) in menuList" :key="index"
......@@ -132,7 +132,7 @@
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("知识圈")!==-1'
@click.native="zhishiquan">
<a href="http://we.oytour.com:8110/" target="_blank" style="color:#a6adb4;">
<i class="iconfont icon-menu-zhishiquan"></i>{{$t('objFill.v101.header.zhishiq')}}
<i class="iconfont icon-menu-zhishiquan"></i>知識圈
</a>
</el-dropdown-item>
</el-dropdown-menu>
......@@ -143,7 +143,7 @@
<div class="nav-right">
<ul>
<template v-if="typeSystem==0">
<li class="user_head" @click='hideIM' style="position: relative;z-index: 99;">
<li class="user_head" @click='hideIM'>
<el-dropdown trigger="click">
<div class="el-dropdown-link">
<img v-if="userInfo.UserPhoto!='' " :src="userInfo.UserPhoto" :onerror='defaultHeadImg' />
......@@ -173,7 +173,7 @@
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("财务单")!==-1'
@click.native="goUrlT('FinancialDocuments',3,'财务单据')">
<i class="iconfont icon-nav-caiwu" style="color:#8e44ad"></i>
{{$t('objFill.v101.header.caiwudan')}}
财务单
<el-badge v-if="NotDealCount8>0" class="mark" :value="NotDealCount8?NotDealCount8:0" type="primary"
style="right: 65px;" @click.native.stop="goUrlT('FinancialDocuments',8,'财务单据')" />
<el-badge class="mark" :value="NotDealCount?NotDealCount:'0'" />
......@@ -184,14 +184,14 @@
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("考勤")!==-1'
@click.native="goUrlT('myApproval',-1,'考勤')">
<i class="iconfont icon-menu-kaoqin" style="color:#27ae60"></i>
{{$t('objFill.v101.header.kaoqing')}}
考勤
<el-badge class="mark" :value="MyAuditCount?MyAuditCount:'0'" />
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("企业云盘")!==-1'
@click.native="goUrlT('myDocuments',-1,'企业云盘')">
<i class="iconfont icon-menu-yunpan" style="color:#2980b9"></i>
{{$t('objFill.v101.header.qiyeyunpan')}}
企业云盘
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
</template>
......@@ -199,63 +199,63 @@
v-if='firstMenuList.indexOf("常用付款对象") && (qjGroupId==userInfo.RB_Group_id || F_Finance_Create)'
@click.native="goUrlPayment()">
<i class="iconfont icon-menu-zhishiquan" style="color:#f39c12"></i>
{{$t('objFill.changyongfkdx')}}
常用付款对象
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlContract()"
v-if="qjGroupId==userInfo.RB_Group_id||F_ContractManagement">
<i class="iconfont icon-hetong" style="color:#f39c12"></i>
{{$t('objFill.hetongguanli')}}
合同管理
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlZC()"
v-if="qjGroupId==userInfo.RB_Group_id">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
{{$t('objFill.zhicangl')}}
资产管理
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlCRM()"
v-if="2==userInfo.RB_Group_id">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
CRM{{$t('restaurant.res_system')}}
CRM系统
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlCAR()"
v-if="2==userInfo.RB_Group_id">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
CAR{{$t('restaurant.res_system')}}
CAR系统
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true" v-if="userInfo&&userInfo.DepartName&&(userInfo.DepartName.indexOf('操作部')!=-1 || userInfo.DepartName.indexOf('总部财务部')!=-1) ||(userInfo.RB_Branch_id == 1245
&& userInfo.DepartName.indexOf('引流')==-1
&& userInfo.DepartName.indexOf('市场')==-1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
{{$t('objFill.v101.header.jipiaowbck')}}
机票未绑团查看
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="unTravelVisible=true"
v-if="UnTravelDate">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
{{$t('objFill.v101.header.weisqjtts')}}
未收齐团款/未结团提醒
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item v-if="userInfo.RB_Group_id==2 && ChangeThePriceList.length>0"
class="clearfix _dropdown_other"
@click.native="GetChangeThePrice(1),GetExaminePriceOrderPageList(1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
{{$t('objFill.v101.header.dindangjck')}}
订单改价查看
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item v-if="userInfo.RB_Group_id==2 && userInfo.IsEditTripTemplate==1"
class="clearfix _dropdown_other" @click.native="journeyTemplate()">
<i class="iconfont icon-pdf" style="color:#f39c12"></i>
{{$t('objFill.v101.header.tianjbjmb')}}
添加/编辑模版
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item v-if="userInfo.RB_Group_id==2" class="clearfix _dropdown_other"
@click.native="journeyTemplate(1)">
<i class="iconfont icon-pdf" style="color:#f39c12"></i>
{{$t('objFill.v101.header.zaixianxc')}}
在线行程
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()">
......@@ -273,8 +273,9 @@
</li>
<template v-if="userInfo.RB_Group_id==2">
<li style="position: relative;">
<!--||MsgCount>0-->
<i class="iconfont icon-imessage_top"
:class="[(hasNewMsg>0||MsgCount>0) &&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']"
:class="[(hasNewMsg>0) &&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']"
@click="IM_bodyIsShow=!IM_bodyIsShow,IM_navType=1"></i>
</li>
<li><i class="iconfont icon-banbengengxin" @click="goUrlLog()"></i></li>
......@@ -290,15 +291,14 @@
<i v-if="language=='zh-TW'" class="iconfont icon-fanti"></i>
<i v-if="language=='en-US'" class="iconfont icon-yingyu"></i>
</span>
<el-dropdown-menu class="changelanguage" slot="dropdown"
:class="[getLanguage()=='en-US'?'activeW':'']">
<el-dropdown-item @click.native="ChangeLan('Japanese')">{{$t('objFill.v101.header.lang.t1')}} <i v-if="language=='Japanese'"
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'"
class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-CN')">{{$t('objFill.v101.header.lang.t2')}} <i v-if="language=='zh-CN'"
<el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'"
class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-TW')">{{$t('objFill.v101.header.lang.t3')}} <i v-if="language=='zh-TW'"
<el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'"
class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('en-US')">{{$t('objFill.v101.header.lang.t4')}} <i v-if="language=='en-US'"
<el-dropdown-item @click.native="ChangeLan('en-US')">English <i v-if="language=='en-US'"
class="iconfont icon-duigou"></i></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -309,8 +309,8 @@
</template>
<li v-if="userInfo.RB_Group_id==2">
<a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''"
style="color:#FFF">{{$t('objFill.v101.header.qianwangqt')}}</a>
<a :href="`javascript:alert(${$t('objFill.v101.header.weiktb2bxt')})`" v-else style="color:#FFF">{{$t('objFill.v101.header.qianwangqt')}}</a>
style="color:#FFF">前往前台</a>
<a href="javascript:alert('未開通B2B前端系統，請您聯繫業務員')" v-else style="color:#FFF">前往前台</a>
</li>
</ul>
</div>
......@@ -321,21 +321,22 @@
<ul>
<li @click="IM_navType=1,imToolsType=0,changeTools(0)" :class="{checked:IM_navType==1}">
<span class="txt">
{{$t('objFill.v101.header.xiaoxi')}}
<div class="unreadMsg" v-show="IM_navType!=1&&(hasNewMsg>0||MsgCount>0)">{{hasNewMsg+MsgCount}}</div>
消息
<!--||MsgCount>0 +MsgCount-->
<div class="unreadMsg" v-show="IM_navType!=1&&(hasNewMsg>0)">{{hasNewMsg}}</div>
</span>
<div class="lihoverNote"></div>
</li>
<li @click="IM_navType=2,imToolsType=0,changeTools(0)" :class="{checked:IM_navType==2}">
{{$t('objFill.tongxunlu')}}
通訊錄
<div class="lihoverNote"></div>
</li>
<li v-if="!useRed" @click="IM_navType=3,imToolsType=0,changeTools(0)" :class="{checked:IM_navType==3}">
{{$t('objFill.v101.header.kongjian')}}
空間
<div class="lihoverNote"></div>
</li>
<li v-if="!useRed" @click="IM_navType=52,imToolsType=0,changeTools(0)" :class="{checked:IM_navType==52}">
{{$t('objFill.gonggao')}}
公告
<div class="lihoverNote"></div>
</li>
</ul>
......@@ -343,7 +344,7 @@
<div class="IM_tool" style='top: 41px;z-index: 1;' v-if="IM_navType!==3 && IM_navType!==52">
<div class="search">
<i class='iconfont icon-search search'></i>
<input type="text" class='s-box' :placeholder="$t('objFill.v101.header.sousuo')" v-model="newSearchContent" @keyup.enter="searchNameV2" />
<input type="text" class='s-box' placeholder='搜索' v-model="newSearchContent" @keyup.enter="searchNameV2" />
<i class="close iconfont icon-close" v-if='newSearchContent.length>0' @click="changeTools(0)"></i>
</div>
</div>
......@@ -354,7 +355,7 @@
@click="enterSystemChat(session),refreshSysNoteDate()">
<div
style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;font-size: 14px; text-align: center; line-height: 38px; color: #fff; margin-right:10px">
{{$t('restaurant.res_system')}}</div>
系统</div>
<div class="cont">
<p class="name">{{session.name}}</p>
<p class="msg">{{session.lastMsgShow}}</p>
......@@ -404,7 +405,7 @@
</ul>
<div class="search-none-data" v-show="!isLoading&&searchList.length==0">
<i class="iconfont icon-zanwushuju"></i><br />
{{$t('objFill.v101.header.baoqmyz')}}{{newSearchContent}}{{$t('objFill.v101.header.daxia')}}
抱歉，没有找到这位{{newSearchContent}}大侠
</div>
</div>
<div v-show="IM_navType==1" class="IM_tool">
......@@ -423,7 +424,7 @@
<ul class="_SysNoteDate_ul" v-loading="SystemLog">
<li @click="redNotice(item.noticeId, item.title)" v-for="item in NoticeList" class="u-list-item">
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">{{$t('objFill.tongzi')}}</div>
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">通知</div>
<div class="cont sys_cont">
<p class="name">{{item.groupName}}</p>
<p class="msg sys_msg">{{item.title}}</p>
......@@ -431,21 +432,21 @@
<div style="float: right; font-size: 12px; color: #999; margin: 12px 0 0;">{{item.noticeDate}}</div>
</li>
<li class="sysMsg_lod_more" @click="getNoticeList(2)" v-if="AllNoticeCount < NoticeListMsg.pageIndex">
<p>{{$t('objFill.v101.header.jiazagd')}}...</p>
<p>加载更多...</p>
</li>
</ul>
</div>
<div class='IM_contacts contact-box' v-show="IM_navType==2 && searchList.length===0">
<div class="contacts-type-box">
<div class="contacts-type-item" :class="{active:contactsType==0}" @click="changeContactGroup(0)">{{$t('objFill.v101.header.tongshi')}}</div>
<div class="contacts-type-item" :class="{active:contactsType==0}" @click="changeContactGroup(0)">同事</div>
<div class="contacts-type-item" :class="{active:contactsType==1}" @click="changeContactGroup(1)"
v-if="!useRed">{{$t('objFill.v101.header.qunliao')}}</div>
<el-tooltip effect="dark" :content="$t('objFill.v101.header.xinjianqunl')" placement="top-start">
v-if="!useRed">群聊</div>
<el-tooltip effect="dark" content="新建群聊" placement="top-start">
<i class="plus iconfont icon-img_jiahao_big" v-if="contactsType==1" @click="createGroup"></i>
</el-tooltip>
</div>
<div v-show='contactsType==0' class="el-tree-style-div">
<el-tree :data='webAllpartList' :props="defaultProps1" :empty-text="$t('system.content_noData')">
<el-tree :data='webAllpartList' :props="defaultProps1">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span class="fz14" v-if="data.Type==1">{{ node.label }}</span>
<span class="fz14" v-if="data.Type==2" @dblclick="lt(data)">
......@@ -480,13 +481,13 @@
<div class='IM_contacts' v-show="IM_navType==4">
<div style="padding: 10px; border-bottom: 1px dashed rgba(134,142,148,.4); overflow: hidden;">
<div class="fl" style="width: 300px; margin-right: 10px;">
<el-input prefix-icon="el-icon-search" :placeholder="$t('objFill.v101.header.yuanghcqss')" v-model='searchKey' @input='isSearchType'
<el-input prefix-icon="el-icon-search" placeholder='员工姓名，回车搜索' v-model='searchKey' @input='isSearchType'
@keyup.enter.native="searchName"></el-input>
</div>
<div class="fl" style="font-size: 12px; color: #1BC594; margin-top: 2px; text-align: center;">
<i class="iconfont icon-ico_commodity_defaul" @click="saveGroup" style="cursor: pointer;"></i>
<br />
{{$t('pub.sureBtn')}}
确定
</div>
</div>
<div v-if='!searchType' class="el-tree-style-div">
......@@ -521,7 +522,7 @@
</div>
</div>
<div v-show="IM_navType==5" class="IM_messageList">
<div class="sysMsgDiv">{{$t('objFill.v101.header.xitongxiaox')}}<span v-show="msglist">({{$t('fnc.w_gong')}}{{this.msgList.length}}{{$t('hotel.hotel_item')}})</span>
<div class="sysMsgDiv">系統消息<span v-show="msglist">(共{{this.msgList.length}}條)</span>
<span class="fr">
<i @click="deletMsg(0)" class="iconfont icon-xingzhuang"></i>
&nbsp;
......@@ -531,7 +532,7 @@
<ul class="_SysNoteDate_ul" v-loading="SystemLog">
<li @click="LogSetReadStatus(session)" v-for="(session, index) in msgList" class="u-list-item">
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">{{$t('restaurant.res_system')}}</div>
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">系统</div>
<div class="cont sys_cont">
<p class="name">{{session.Title}}</p>
<p class="msg sys_msg">{{session.Content}}</p>
......@@ -542,7 +543,7 @@
v-show="session.unread > 0">{{session.unread}}</div>
</li>
<li class="sysMsg_lod_more" @click="refreshSysNoteDate('a')">
<p>{{$t('objFill.v101.header.jiazagd')}}...</p>
<p>加載更多...</p>
</li>
</ul>
</div>
......@@ -550,11 +551,11 @@
<div class="IM_myNav">
<ul>
<li :class="{cked:dynamicType==1}" @click="dynamicType=1"><i class="iconfont icon-suoyoudongtai"></i>
{{$t('objFill.v101.header.quanbudt')}}</li>
全部動態</li>
<li :class="{cked:dynamicType==2}" @click="dynamicType=2"><i class="iconfont icon-ico-wofabude"></i>
{{$t('objFill.v101.header.wofabud')}}</li>
我發佈的</li>
<li :class="{cked:dynamicType==3}" @click="dynamicType=3"><i class="iconfont icon-ico_yuwoxiangguan"></i>
{{$t('objFill.v101.header.yuwoxiang')}}</li>
與我相關</li>
</ul>
</div>
<div class="IM_cont" id='allDynamic' v-show="dynamicType==1">
......@@ -590,7 +591,7 @@
src="../assets/img/imbg/SSR.png" alt="" />
</div>
<div class="Ticheng_Date">
<span>{{item.SellGeneralContent.Month}}{{$t('pub.month')}}</span><span
<span>{{item.SellGeneralContent.Month}}月</span><span
class="Ticheng_Money"><span>¥</span>{{item.SellGeneralContent.totalCommission}}</span>
</div>
<div class="Ticheng_Text">
......@@ -628,7 +629,7 @@
@click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;{{$t('objFill.v101.header.huifu')}}&nbsp;
<span>{{i.empName}}</span>&nbsp;回复&nbsp;
<span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1"
@click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
......@@ -641,7 +642,7 @@
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticle(item.id,index)'>{{$t('pub.sureBtn')}}</el-button>
<el-button slot="append" @click='reviewArticle(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
......@@ -700,7 +701,7 @@
@click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;{{$t('objFill.v101.header.huifu')}}&nbsp;
<span>{{i.empName}}</span>&nbsp;回复&nbsp;
<span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1"
@click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
......@@ -713,7 +714,7 @@
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticle(item.id,index)'>{{$t('pub.sureBtn')}}</el-button>
<el-button slot="append" @click='reviewArticle(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
......@@ -759,7 +760,7 @@
src="../assets/img/imbg/SSR.png" alt="" />
</div>
<div class="Ticheng_Date">
<span>{{item.SellGeneralContent.Month}}{{$t('pub.month')}}</span><span
<span>{{item.SellGeneralContent.Month}}月</span><span
class="Ticheng_Money"><span>¥</span>{{item.SellGeneralContent.totalCommission}}</span>
</div>
<div class="Ticheng_Text">
......@@ -797,7 +798,7 @@
@click="deleteComments(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;{{$t('objFill.v101.header.huifu')}}&nbsp;
<span>{{i.empName}}</span>&nbsp;回复&nbsp;
<span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1"
@click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
......@@ -810,7 +811,7 @@
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticle(item.id,index)'>{{$t('pub.sureBtn')}}</el-button>
<el-button slot="append" @click='reviewArticle(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
......@@ -871,7 +872,7 @@
@click="deleteCommentsOne(i.commentId,i.outIndex,item.id)"></i>
</p>
<p v-if="i.byReplayEmpName!=null">
<span>{{i.empName}}</span>&nbsp;{{$t('objFill.v101.header.huifu')}}&nbsp;{{$t('objFill.v101.header.huifu')}}
<span>{{i.empName}}</span>&nbsp;回复&nbsp;
<span>{{i.byReplayEmpName}}</span>：{{i.content|decodeURIComponent(i.content)}}
<i class="iconfont icon-ico_pinglun1"
@click="reviewIndex=i.outIndex,reviewMsg.commentId=i.commentId"></i>
......@@ -884,7 +885,7 @@
</div>
<div class="reviewInput" v-if='reviewIndex==index'>
<el-input :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticleOne(item.id,index)'>{{$t('pub.sureBtn')}}</el-button>
<el-button slot="append" @click='reviewArticleOne(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
......@@ -913,7 +914,7 @@
<i class="iconfont icon-ico_pinglun1" style="cursor: pointer; font-size: 12px; color: #666;"
@click="reviewIndex=index,reviewMsg.commentId=item.commentId,reviewCont=''"></i>
<el-input v-if='reviewIndex==index' :placeholder="placeholder" maxlength='50' v-model='reviewCont'>
<el-button slot="append" @click='reviewArticleTwo(item.id,index)'>{{$t('pub.sureBtn')}}</el-button>
<el-button slot="append" @click='reviewArticleTwo(item.id,index)'>确定</el-button>
</el-input>
</div>
</div>
......@@ -922,15 +923,15 @@
<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;">
{{$t('objFill.v101.header.fabudongt')}}</p>
<el-input type="textarea" :rows="4" maxlength='50' :placeholder="$t('objFill.v101.header.zheyikxf')+'...'" v-model='dynamicCont'> </el-input>
发布动态</p>
<el-input type="textarea" :rows="4" maxlength='50' placeholder="这一刻你的想法..." v-model='dynamicCont'> </el-input>
<p style="margin: 10px 0;">
<el-upload action="" :file-list="imgList" :http-request="UploadAttachment" :multiple="false" :limit="9"
accept="image/jpeg,image/gif,image/png,image/bmp" list-type="picture-card" :on-remove="handleRemoveImg">
<i class="el-icon-plus"></i>
</el-upload>
</p>
<input type="button" :value="$t('objFill.v101.header.fabu')" class="normalBtn fr" @click="SaveDynamic" />
<input type="button" value="发布" class="normalBtn fr" @click="SaveDynamic" />
</div>
<i v-show="dynamicType!=4" class="iconfont icon-fabu" @click="dynamicType=4"
......@@ -942,11 +943,11 @@
<div class="updateLogs">
<img src="../assets/img/logsImg.png" alt="" class="logsImg" />
<div class="logsTitle">
{{versionList[0].UpdateTitle}}{{$t('objFill.v101.header.banbengx')}}
{{versionList[0].UpdateTitle}}版本更新
</div>
<div class="inlogs_Content" v-html="versionList[0].UpdateContent">
</div>
<input type="button" :value="$t('objFill.v101.header.wozhidl')" class="normalBtn" style="margin:10px 0 15px 155px;" @click="logsShow=false" />
<input type="button" value="我知道了" class="normalBtn" style="margin:10px 0 15px 155px;" @click="logsShow=false" />
</div>
</div>
<div class="downmz" v-show="downmz">
......@@ -957,7 +958,7 @@
<div class="downlist">
<div>
<img style="width:143px;height:40px;" src="../assets/img/im/xiaz.png" alt="">
<p>{{$t('objFill.v101.header.col.t1')}}</p>
<p>安卓版扫码下载</p>
</div>
<div>
<img style="width:142px;height:142px;margin-top: 10px;" src="../assets/img/im/andoriod.png" alt="">
......@@ -966,14 +967,14 @@
<div class="downlist" style="margin-top:20px">
<div>
<img style="width:143px;height:40px;" src="../assets/img/im/xiaz.png" alt="">
<p>{{$t('objFill.v101.header.col.t2')}}</p>
<p>IOS版扫码下载</p>
</div>
<div>
<img style="width:142px;height:142px;margin-top: 10px;" src="../assets/img/im/ios.png" alt="">
</div>
</div>
<div style="text-align:center;margin-top:20px">
<span class="khd"><a href="http://im.oytour.com/麦子助手.exe">{{$t('objFill.v101.header.col.t3')}}</a></span>
<span class="khd"><a href="http://im.oytour.com/麦子助手.exe">IM客户端下载</a></span>
</div>
<div class="im_bottom"></div>
</div>
......@@ -1044,7 +1045,7 @@
<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">{{$t('objFill.v101.header.qunzhu')}}</span>
v-if="currentSession.teamInfo.owner==item.account">群主</span>
{{item.alias}}
</span>
</li>
......@@ -1052,7 +1053,7 @@
<div class="add" @click="addNewMember">
<i class="iconfont icon-mui-icon-add"></i>
</div>
<span style="color:rgb(30, 144, 255);margin-top: 4px;">{{$t('objFill.v101.header.yaoqingxcy')}}</span>
<span style="color:rgb(30, 144, 255);margin-top: 4px;">邀请新成员</span>
</li>
</ul>
</div>
......@@ -1068,14 +1069,14 @@
</vue-draggable-resizable>
<el-dialog :visible.sync="isAddGroup" class="addGroupByAlex" :modal="false">
<div class="title">
{{addOrUpdate==0?$t('objFill.v101.header.yaoqingxcy'):$t('objFill.v101.header.xinjianqunl')}}
{{addOrUpdate==0?'邀请新成员':'新建群聊'}}
</div>
<div class="new-group-name" v-if="addOrUpdate==1">
<input type="text" :placeholder="$t('objFill.v101.header.qingsrqmc')" v-model="groupName" class="search-input" />
<input type="text" placeholder="请输入群名称" v-model="groupName" class="search-input" />
</div>
<div class="group-body">
<div class="group-body-item">
<input type="text" :placeholder="$t('objFill.v101.header.sosuots')" v-model="newSearchContent" class="search-input"
<input type="text" placeholder="搜索同事" v-model="newSearchContent" class="search-input"
@keyup.enter="searchNameV3" @keyup="emptyChangeBox" />
<div class="search-result-box">
<el-tree :data='webAllpartList' v-show="groupboxSearch==0" :props="defaultProps1">
......@@ -1107,13 +1108,13 @@
</ul>
<div class="search-none-data" v-show="!isLoading&&groupSearchBox.length==0">
<i class="iconfont icon-zanwushuju"></i><br />
{{$t('objFill.v101.header.baoqianmyzwwmdx')}}
抱歉，没有找到这位无名的大侠
</div>
</div>
</div>
</div>
<div class="group-body-item">
<div>{{$t('objFill.v101.header.yixuanlxr')}}：{{GroupMemberList.length}}/100</div>
<div>已选择联系人：{{GroupMemberList.length}}/100</div>
<div class="search-result-box">
<div class="IM_messageList IM_searchListBox">
<ul>
......@@ -1134,20 +1135,20 @@
</div>
</div>
<div class="group-foot" v-if="addOrUpdate==1">
<button class="hollowFixedBtn" @click="isAddGroup=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" @click="addNewGroup">{{$t('objFill.v101.header.chuanjian')}}</button>
<button class="hollowFixedBtn" @click="isAddGroup=false">取消</button>
<button class="normalBtn" @click="addNewGroup">创建</button>
</div>
</el-dialog>
<el-dialog :visible.sync="isUpdateGroup" class="addGroupByAlex" :modal="false">
<div class="title">
{{$t('objFill.v101.header.xiugaiqunzxx')}}
<i class="iconfont icon-jiesan" @click="dismissTeam" :title="$t('objFill.v101.header.jieshangq')"></i>
修改群组信息
<i class="iconfont icon-jiesan" @click="dismissTeam" title="解散该群"></i>
</div>
<div class="cl-name" >{{$t('objFill.v101.header.qunzhumc')}}</div>
<div class="cl-name">群组名称</div>
<div class="new-group-name">
<input type="text" :placeholder="$t('objFill.v101.header.qingsrqmc')" v-model="currentSession.name" class="search-input" />
<input type="text" placeholder="请输入群名称" v-model="currentSession.name" class="search-input" />
</div>
<div class="cl-name" >{{$t('objFill.v101.header.qunzhucy')}}</div>
<div class="cl-name">群组成员</div>
<div class="group-body" style="height:200px;position: relative;margin-bottom:15px;border-bottom: 1px solid #eee">
<div class="team-member-box" v-if="currentSession.scene=='team'">
<ul>
......@@ -1163,8 +1164,8 @@
</div>
</div>
<div class="group-foot">
<button class="hollowFixedBtn" @click="showUpdateTeam(0)">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" @click="updateTeamName" >{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" @click="showUpdateTeam(0)">取消</button>
<button class="normalBtn" @click="updateTeamName">保存</button>
</div>
</el-dialog>
<el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center
......@@ -1183,14 +1184,14 @@
</div>
</el-dialog>
<a class="weOytour" ref="weOytour" href="http://we.oytour.com:8110/" target="view_window">Preface</a>
<el-dialog v-if="typeSystem==0" custom-class='w800 PingFangSC _saleRnk' :title="$t('sm.saleRank')" :visible.sync="saleRnkShow"
<el-dialog v-if="typeSystem==0" custom-class='w800 PingFangSC _saleRnk' title="销售排行" :visible.sync="saleRnkShow"
center :before-close="closeChangeMachie">
<saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie" />
</el-dialog>
<!-- 提成账单 -->
<el-dialog custom-class='w700 addTichengDialog' :title="$t('objFill.v101.header.tichengzhangdan')" :visible.sync="commissionDialog" center
<el-dialog custom-class='w700 addTichengDialog' title="提成账单" :visible.sync="commissionDialog" center
:before-close="resetClose">
<commissonBill v-if="isShowBill" @Close="changeComponent" :articleId='articleId' :userId='createEmpId'
ref="myBill"></commissonBill>
......@@ -1215,15 +1216,15 @@
<div class="tsDiv" v-if="tsState&&isShowMore&&typeSystem==0">
<div class="tsContent">
<div style="width:100%;height:372px;position:relative">
<p style="text-align:center;font-size:14px;z-index:100;">{{$t('objFill.v101.header.toushuanl')}}</p>
<p style="text-align:center;font-size:14px;z-index:100;">投诉案例</p>
<img @click="CloseTs" class="tsClose" style="width:11px;height:11px;cursor: pointer;"
src="../assets/img/tsclose.png" alt="">
<img class="tsbg" style="width:100%;height:100%" src="../assets/img/ts.png" alt="">
</div>
<div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">{{$t('tips.di')}}{{tsNumber}}{{$t('objFill.v101.header.qitoushualfxyfb')}}</p>
<p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/question/42"
style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">{{$t('objFill.v101.header.dianjichakan')}}</a>
style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
</div>
</div>
</div>
......@@ -1234,7 +1235,7 @@
</div>
<div class="chakanbox_b" @click="VotingShow =true">
<img src="http://imgfile.oytour.com/New/Upload/Cloud/2020-01/20200102101633702.png">
{{$t('objFill.v101.header.toupiaojilv')}}
投票记录
</div>
</div>
<!-- 投票 -->
......@@ -2205,7 +2206,7 @@
);
},
testDownLoad() {
var fileName = this.$t('objFill.v101.header.querenshuxz')+".doc";
var fileName = "确认书下载.doc";
var msg = {
FinanceId: "81461"
};
......@@ -2463,10 +2464,10 @@
this.msgList = data;
}
let sysMsg = {
name: this.$t('objFill.v101.header.tongxiaoxi'),
name: "通知消息",
updateTimeShow: "",
unread: this.MsgCount,
lastMsgShow: this.$t('objFill.v101.header.tiaoweidxx'),
lastMsgShow: "条未读消息",
IMID: "684cb79fe92f46888888",
type: "system",
dataAPI: "/components/administrative/forMyApproval",
......@@ -2501,17 +2502,17 @@
result += timePublish.getMonth() + "-";
result += timePublish.getDate();
} else if (diffMonth > 1) {
result = parseInt(diffMonth) + this.$t('objFill.v101.header.col1.t1');
result = parseInt(diffMonth) + "月前";
} else if (diffWeek > 1) {
result = parseInt(diffWeek) + this.$t('objFill.v101.header.col1.t2');
result = parseInt(diffWeek) + "周前";
} else if (diffDay > 1) {
result = parseInt(diffDay) + this.$t('objFill.v101.header.col1.t3');
result = parseInt(diffDay) + "天前";
} else if (diffHour > 1) {
result = parseInt(diffHour) + this.$t('objFill.v101.header.col1.t4');
result = parseInt(diffHour) + "小时前";
} else if (diffMinute > 1) {
result = parseInt(diffMinute) + this.$t('objFill.v101.header.col1.t5');
result = parseInt(diffMinute) + "分钟前";
} else {
result = this.$t('objFill.v101.header.col1.t6');
result = "刚刚";
}
return result;
},
......@@ -2599,7 +2600,7 @@
},
addNewGroup() {
if (this.groupName == "") {
this.$message.error(this.$t('objFill.v101.header.qingsrqmc'));
this.$message.error("请输入群名称");
return;
}
if (this.GroupMemberList.length > 1) {
......@@ -2619,7 +2620,7 @@
this.groupName = "";
this.s;
if (error) {
this.$message.error(this.$t('objFill.v101.header.chuanjqzsb'));
this.$message.error("创建群失败");
}
if (!error) {
this.$store.state.teamlist.push(obj.team);
......@@ -2653,7 +2654,7 @@
}
});
} else {
this.$message.error(this.$t('objFill.v101.header.qingxuanzqy'));
this.$message.error("请选择群员");
}
},
createGroup() {
......@@ -2735,7 +2736,7 @@
},
updateTeamName() {
if (this.currentSession.name == "") {
this.$message.error(this.$t('objFill.v101.header.qingshurqmc'));
this.$message.error("请输入群名称");
return;
}
this.$store.dispatch("delegateTeamFunction", {
......@@ -2746,7 +2747,7 @@
done: (error, team) => {
this.isUpdateGroup = false;
if (error) {
this.$message.error(this.$t('objFill.shibai')+"！");
this.$message.error("失败！");
} else {
this.$store.state.teamlist.forEach(x => {
if (x.teamId == this.currentSession.teamInfo.teamId) {
......@@ -2821,7 +2822,7 @@
leaveTeam() {
let that = this;
this.editorTeam = false;
this.$confirm(this.$t('objFill.v101.header.shifoutuiq')+"?", this.$t('tips.tips'), {
this.$confirm("是否退群?", this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
......@@ -2836,7 +2837,7 @@
),
done: (error, obj) => {
if (!error) {
this.$message.success(this.$t('objFill.v101.header.niyicgtuiq')+"！");
this.$message.success("你已经成功退群！");
this.IM_Chatlayer = false;
this.IM_navType = 1;
this.$store.dispatch(
......@@ -2844,14 +2845,14 @@
window.localStorage.sessionId
);
} else {
this.$message.error(this.$t('objFill.v101.header.tuiquanshib')+"！");
this.$message.error("退群失败！");
}
}
}
});
})
.catch(() => {
this.$message.info(this.$t('OrderList.orderStatus.cancel')+"！");
this.$message.info("已取消！");
});
},
deleteFriend(account) {
......@@ -2873,7 +2874,7 @@
accounts: [account],
done: (error, obj) => {
if (error) {
this.$message.error(this.$t('objFill.v101.header.nimeiygczqx')+"！");
this.$message.error("你没有该操作权限！");
} else {
this.oldGroupMemberList.forEach((item, index) => {
if (item.account == account) {
......@@ -2956,7 +2957,7 @@
}
}
} else {
this.$message.warning(this.$t('objFill.v101.header.nimeiygczqx')+"！");
this.$message.warning("该员工暂时不可进群，请联系管理员！");
if (this.IMList.findIndex(item => item === null) != -1) {
this.IMList.splice(this.IMList.findIndex(item => item === null), 1);
}
......@@ -2981,7 +2982,7 @@
this.GroupMemberList.splice(_index, 1);
}
} else {
this.$message.warning(this.$t('objFill.v101.header.nimeiygczqx')+"！");
this.$message.warning("该员工暂时不可进群，请联系管理员！");
if (this.IMList.findIndex(item => item === null) != -1) {
this.IMList.splice(this.IMList.findIndex(item => item === null), 1);
}
......@@ -3030,7 +3031,7 @@
saveGroup() {
if (this.newGroup) {
if (this.IMList.length < 1) {
this.$message.warning(this.$t('objFill.v101.header.jianqunzsyygcy')+"！");
this.$message.warning("建群至少要有一个成员！");
return;
}
this.$store.dispatch("delegateTeamFunction", {
......@@ -3042,10 +3043,10 @@
accounts: this.IMList,
done: (error, obj) => {
if (error) {
this.$message.error(this.$t('objFill.v101.header.chuanjqzsb'));
this.$message.error("创建群失败");
}
if (!error) {
this.$message.success(this.$t('objFill.chenggong')+"！");
this.$message.success("成功！");
this.$store.state.teamlist.push(obj.team);
this.searchUsers(obj.accounts);
this.clearBuildGroup();
......@@ -3066,7 +3067,7 @@
accounts: this.IMList,
done: (error, obj) => {
if (error) {
this.$message.error(this.$t('objFill.v101.header.xiugaicysb')+"！");
this.$message.error("修改成员失败！");
return;
}
if (!error) {
......@@ -3078,7 +3079,7 @@
),
this.IMList
);
this.$message.success(this.$t('objFill.chenggong')+"！");
this.$message.success("成功！");
this.clearBuildGroup();
this.IM_navType = 1;
}
......@@ -3222,7 +3223,7 @@
this.currentSession = session;
pageUtil.scrollChatListDown();
} else {
this.$message.warning(this.$t('objFill.v101.header.gaiygbklt'));
this.$message.warning("该员工暂时不可聊天，请联系管理员");
}
},
dbChat(obj) {
......@@ -3231,7 +3232,7 @@
this.IM_Chatlayer = true;
pageUtil.scrollChatListDown();
} else {
this.$message.warning(this.$t('objFill.v101.header.gaiygbklt'));
this.$message.warning("该员工暂时不可聊天，请联系管理员");
}
},
enterTeamChat(teamInfo) {
......@@ -3314,9 +3315,9 @@
}
this.searchList = res.data.data;
this.searchList.forEach(x => {
x.lastMsg = this.$t('objFill.v101.header.meiythndltxx');
x.lastMsg = "没有他和你的聊天信息哦";
if (!x.imAccount || x.imAccount == "")
x.lastMsg = this.$t('objFill.v101.header.gaiygwktltgn');
x.lastMsg = "该同事还没有开通聊天功能呢";
else {
this.sessionlist.forEach(y => {
if (y.id.indexOf(x.imAccount) != -1) {
......@@ -3472,7 +3473,7 @@
);
})
.catch(() => {
this.$message.info(this.$t('tips.cancleDelete'));
this.$message.info("已取消删除！");
});
},
likeArticle(id, index) {
......@@ -3793,7 +3794,7 @@
});
},
handleExceed(files, fileList) {
this.$message.warning(this.$t('objFill.v101.header.zuiduoscjzt'));
this.$message.warning("最多只能上传9张图片！");
},
clearDialogMsg(done) {
done();
......@@ -3826,7 +3827,7 @@
},
openDialog(IsAgree, workFlowId, templateType) {
this.agree = IsAgree;
this.dialogTitle = this.$t('fnc.spliucheng')
this.dialogTitle = "审批流程";
this.outerVisible = true;
this.workFlowId = workFlowId;
this.templateType = templateType;
......@@ -3866,7 +3867,7 @@
);
},
withdrawAapproval(workFlowId, templateType) {
this.$confirmm(this.$t('adm.adm_sfchehui')+"?", this.$t('tips.tips'), {
this.$confirm("是否撤回?", this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
......@@ -3879,7 +3880,7 @@
},
res => {
if (res.data.resultCode == 1) {
this.$message.success(this.$t('adm.adm_chsuccess'));
this.$message.success("撤回成功。");
this.getList();
}
},
......@@ -3887,7 +3888,7 @@
);
})
.catch(() => {
this.$message.info(this.$t('objFill.v101.header.yiquxiaoch'));
this.$message.info("已取消撤回。");
});
},
updateAapproval(path, cmd, submitCmd, workFlowId, templateId) {
......@@ -3902,7 +3903,7 @@
});
},
transferDialog(workFlowId, templateType) {
this.dialogTitle1 = this.$t('objFill.v101.header.zhuanjialiuc');
this.dialogTitle1 = "转交流程";
this.outerVisible1 = true;
this.workFlowId = workFlowId;
this.templateType = templateType;
......@@ -3945,7 +3946,7 @@
this.transferMsg.WorkFlowId = this.workFlowId;
this.transferMsg.TemplateType = this.templateType;
if (this.transferMsg.CareOfEmId == "-1") {
this.$message.warning(this.$t('rule.qxzzjiaoren'));
this.$message.warning("请选择转交人！");
return;
}
this.apipost(
......@@ -4333,7 +4334,7 @@
function CreatNotification() {
const n = new NotificationInstance(msg.name, {
body: msg.lastMsgShow,
tag: this.$t('objFill.v101.header.liaotian'),
tag: "聊天",
icon: msg.avatar,
silent: true,
data: {
......@@ -4401,7 +4402,7 @@
if (Time != '' && Time != null) {
let newTime = Time.split(' ')[0];
let endDate = newTime.split('-');
return endDate[0] + this.$t('pub.year') + endDate[1] + this.$t('pub.month') + endDate[2] + this.$t('fnc.day')
return endDate[0] + '年' + endDate[1] + '月' + endDate[2] + '日'
}
},
//打开详情
......@@ -4564,9 +4565,6 @@
.changelanguage {
width: 124px;
}
.changelanguage.activeW{
width: 200px;
}
.changelanguage .el-dropdown-menu__item .icon-duigou {
color: #000000;
......
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