Skip to content

S
SuperMan
Commit 3eef6579 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent 67623ff2
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 71 deletions
src/assets/common/lang/zh.js
View file @ 3eef6579
...@@ -39,6 +39,7 @@ export const pub={ ...@@ -39,6 +39,7 @@ export const pub={
clickToView:'点击查看', clickToView:'点击查看',
man:'男', man:'男',
woman:'女', woman:'女',
delete:'删除',
} }
...@@ -266,6 +267,9 @@ export const admin={ //行政 ...@@ -266,6 +267,9 @@ export const admin={ //行政
admin_Bindingposition:'绑定岗位', admin_Bindingposition:'绑定岗位',
admin_sort:'排序', admin_sort:'排序',
admin_level:'级', admin_level:'级',
admin_logincount:'登陆账号',
admin_Validaccount:'有效账号',
admin_logintel:'登录手机号',
...@@ -660,6 +664,9 @@ export const visa = { ...@@ -660,6 +664,9 @@ export const visa = {
v_yibaoru:'已报入', v_yibaoru:'已报入',
v_houbu:'候补', v_houbu:'候补',
v_yxhoubu:'允许候补', v_yxhoubu:'允许候补',
v_Japanese:'日本',
v_Othervisas:'其他签证',
...@@ -1109,6 +1116,8 @@ export const tips = { ...@@ -1109,6 +1116,8 @@ export const tips = {
qzcpbianhao: '签证产品编号', qzcpbianhao: '签证产品编号',
qishu: '期数', qishu: '期数',
jiaoyifangshi: '交易方式', jiaoyifangshi: '交易方式',
tips_deletealldepart: '删除该部门，会将其子部门全部删除！是否删除?',
} }
export const Operation = { export const Operation = {
Op_ShortName:'线路简称', Op_ShortName:'线路简称',
......
src/components/SalesModule/groupInquiry.vue
View file @ 3eef6579
...@@ -428,18 +428,18 @@ ...@@ -428,18 +428,18 @@
</div > </div >
<div class="el-col" style="width:190px;"> <div class="el-col" style="width:190px;">
<div class="d3"> <div class="d3">
<p><i class="iconfont icon-tuandui"></i>团队信息<em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}晚</em></p> <p><i class="iconfont icon-tuandui"></i>{{$t('visa.v_teaminfo')}}<em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}晚</em></p>
<p><span>出发时间</span>{{item.StartDate}}</p> <p><span>{{$t('Airticket.Air_StartTime')}}</span>{{item.StartDate}}</p>
<p><span>出团公司</span>{{item.OutBranchName}}</p> <p><span>{{$t('scen.sc_cp')}}</span>{{item.OutBranchName}}</p>
</div> </div>
</div> </div>
<div class="el-col" style="width:200px;"> <div class="el-col" style="width:200px;">
<div class="d5"> <div class="d5">
<p><i class="iconfont icon-tuanwei"></i>团位信息</p> <p><i class="iconfont icon-tuanwei"></i>{{$t('visa.v_tuanweiinfo')}}</p>
<p><span>当前余位</span><i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></p> <p><span>{{$t('visa.v_currentseat')}}</span><i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></p>
<p><span>已报入</span><i @click='goUrlX("RegistrationList", item.TCID)' style="cursor:pointer;">{{item.OrderGuestNum}}<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人</i>(占位：{{item.Occupied}}人)</p> <p><span>{{$t('visa.v_yibaoru')}}</span><i @click='goUrlX("RegistrationList", item.TCID)' style="cursor:pointer;">{{item.OrderGuestNum}}<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人</i>(占位：{{item.Occupied}}人)</p>
<p><span>候补</span> <p><span>{{$t('visa.v_houbu')}}</span>
<span v-if='item.IsSubstitution==1' class="TCL-greenType">允许候补</span> <span v-if='item.IsSubstitution==1' class="TCL-greenType">{{$t('visa.v_yxhoubu')}}</span>
<span v-else class="TCL-redType">不允许候补</span> <span v-else class="TCL-redType">不允许候补</span>
</p> </p>
<p><span @click="goUrlY('TravelPassengerList',item.TCID)" style="cursor:pointer;text-decoration:underline;">旅客名单</span></p> <p><span @click="goUrlY('TravelPassengerList',item.TCID)" style="cursor:pointer;text-decoration:underline;">旅客名单</span></p>
...@@ -486,11 +486,11 @@ ...@@ -486,11 +486,11 @@
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<div> <div>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==1" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_banliqianzheng')}}</el-button> <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==1" @click="goUrlZ('VisaApplicationDetails',item.LineID,item.TCID,item.TCNUM)">{{$t('visa.v_banliqianzheng')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button> <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.LineID,item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button> <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.LineID,item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button>
</div> </div>
<el-button v-if="item.LineID!=14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button> <el-button v-if="item.LineID==14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button>
<!-- <el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> --> <!-- <el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> -->
<el-button @click="goUrl('VisaFinancialDocuments',item.TCID,item.OutBranchId,item.TCNUM,'签证财务单据')" type="primary" style='background:#F16C3C; border-color:#F16C3C'>费用明细</el-button> <el-button @click="goUrl('VisaFinancialDocuments',item.TCID,item.OutBranchId,item.TCNUM,'签证财务单据')" type="primary" style='background:#F16C3C; border-color:#F16C3C'>费用明细</el-button>
<el-button @click='openEdit(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>送签日期</el-button> <el-button @click='openEdit(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>送签日期</el-button>
...@@ -503,7 +503,11 @@ ...@@ -503,7 +503,11 @@
<div style="padding:10px 0"> <div style="padding:10px 0">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.VisaGuestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.VisaGuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.VisaGuestList">{{childItem.GuestName}}</span> <span style="color:blue !important" v-for="(childItem) in item.VisaGuestList">
<span v-if="childItem.VisaStatus===2" class="groupTourOrder_tickets_blue" >{{childItem.GuestName}}</span>
<span v-if="childItem.VisaStatus===1" class="groupTourOrder_tickets_red" >{{childItem.GuestName}}</span>
<span v-if="childItem.VisaStatus===3" class="groupTourOrder_tickets_black" >{{childItem.GuestName}}</span>
</span>
</span> </span>
<span class="RL-redType RL-remarkCon" v-else> <span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span> <span>暂无名单</span>
...@@ -520,7 +524,7 @@ ...@@ -520,7 +524,7 @@
<span v-if="item.VisaFinanceList.length===0">暂无数据</span> <span v-if="item.VisaFinanceList.length===0">暂无数据</span>
</div> </div>
</div> </div>
<!-- <div class="TC_remarkContent"> <div class="TC_remarkContent">
<div class="clearfix TCL-redType"> <div class="clearfix TCL-redType">
<div class="TCL_remarkTitle">OP对外备注：</div> <div class="TCL_remarkTitle">OP对外备注：</div>
<div class="TCL_Content">{{item.OPRemark}}</div> <div class="TCL_Content">{{item.OPRemark}}</div>
...@@ -533,7 +537,7 @@ ...@@ -533,7 +537,7 @@
<div class="TCL_remarkTitle">地接备注：</div> <div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div> <div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div>
</div> </div>
</div> --> </div>
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData"> <div class="noData" v-show="queryMsg.noData">
...@@ -810,7 +814,7 @@ export default { ...@@ -810,7 +814,7 @@ export default {
//航班配置 //航班配置
FlightState:0, FlightState:0,
TCVisaStatus: '-1', TCVisaStatus: '-1',
IsShowUnion:1, IsShowUnion:0,
QueryType:1,//查询类型 1:签证 QueryType:1,//查询类型 1:签证
}, },
remarkMsg: { remarkMsg: {
...@@ -1200,6 +1204,7 @@ export default { ...@@ -1200,6 +1204,7 @@ export default {
}) })
} }
}); });
console.log("this.queryCommonData.dataList",this.queryCommonData.dataList)
} }
}, },
err => {} err => {}
...@@ -1373,8 +1378,8 @@ export default { ...@@ -1373,8 +1378,8 @@ export default {
goUrlY(path, id) { goUrlY(path, id) {
this.$router.push({ name: path, query: { id: id,blank:'y',tab:'旅客名单'} }); this.$router.push({ name: path, query: { id: id,blank:'y',tab:'旅客名单'} });
}, },
goUrlZ(path, id, num) { goUrlZ(path,LineID, id, num) {
this.$router.push({ name: path, query: { id: id, num: num,blank:'y',tab:'签证办理'} }); this.$router.push({ name: path, query: { LineID:LineID,id: id, num: num,blank:'y',tab:'签证办理'} });
}, },
goUrlT(path, tcid) { goUrlT(path, tcid) {
this.$router.push({ name: path, query: { tcid: tcid, blank:'y', tab:'签证列表'} }); this.$router.push({ name: path, query: { tcid: tcid, blank:'y', tab:'签证列表'} });
......
src/components/VisaCenter/VisaApplicationDetails.vue
View file @ 3eef6579
...@@ -21,14 +21,17 @@ ...@@ -21,14 +21,17 @@
<el-dropdown split-button type="primary" trigger="click" @command="bindVisa"> <el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
{{$t('visa.v_tvisa')}} {{$t('visa.v_tvisa')}}
<el-dropdown-menu slot="dropdown" > <el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(item,index) in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item> <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visa.v_Othervisas')}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-dropdown split-button type="primary" trigger="click" @command="bindVisa"> <el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
{{$t('visa.v_gvisa')}} {{$t('visa.v_gvisa')}}
<el-dropdown-menu slot="dropdown" > <el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(item,index) in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item> <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
</el-dropdown-menu> <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>{{$t('visa.v_Othervisas')}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
</div> </div>
...@@ -44,7 +47,10 @@ ...@@ -44,7 +47,10 @@
<th>{{$t('hotel.table_operat')}}</th> <th>{{$t('hotel.table_operat')}}</th>
</tr> </tr>
<tr v-for="(item,index) in dataList"> <tr v-for="(item,index) in dataList">
<td width=150 class="text_left"> <input type="checkbox" :disabled="item.ApplyStatus!=-1" v-model="checkList" :value="item.Id" @change="checkThis"> {{item.OrderId}}</td> <td width=150 class="text_left">
<input v-if="LineID==14" type="checkbox" :disabled="item.ApplyStatus!=-1" v-model="checkList" :value="item.Id" @change="checkThis">
<input v-else type="checkbox" :disabled="item.VisaManageStatus>1" v-model="checkList" :value="item.Id" @change="checkThis">
{{item.OrderId}}</td>
<td>{{item.GuestName}}</td> <td>{{item.GuestName}}</td>
<td><img class="_head_img" :src="item.SalesManPhoto" alt=""> {{item.SalesMan}}</td> <td><img class="_head_img" :src="item.SalesManPhoto" alt=""> {{item.SalesMan}}</td>
<td> <td>
...@@ -54,17 +60,42 @@ ...@@ -54,17 +60,42 @@
<i v-if="item.IsDataFull==1||item.IsDataFull==0" class="iconfont icon-iconfontremind" @click="UrgeGuestInfo(item.Id,item.EmployeeId)" style="vertical-align:middle;"></i> <i v-if="item.IsDataFull==1||item.IsDataFull==0" class="iconfont icon-iconfontremind" @click="UrgeGuestInfo(item.Id,item.EmployeeId)" style="vertical-align:middle;"></i>
</td> </td>
<td> <td>
{{item.VisaName}} <span v-if="LineID==14">
<span v-if="item.SignStatus==1" class="_radius" >{{$t('visa.v_dan')}}</span> {{item.VisaName}}
<span v-if="item.SignStatus==2" class="_radius _tuan">{{$t('visa.v_tuan')}}</span> <span v-if="item.SignStatus==1" class="_radius" >{{$t('visa.v_dan')}}</span>
<span v-if="item.SignStatus==2" class="_radius _tuan">{{$t('visa.v_tuan')}}</span>
</span>
<span v-else>
<span v-if="item.VisaCountryType==1">{{$t('visa.v_Japanese')}}</span>
<span v-if="item.VisaCountryType==-1">{{$t('active.cl_qita')}}</span>
<span v-if="item.VisaType==1" class="_radius" >{{$t('visa.v_dan')}}</span>
<span v-if="item.VisaType==2" class="_radius _tuan">{{$t('visa.v_tuan')}}</span>
</span>
</td> </td>
<td> <td>
<span v-if="item.ApplyStatus==0">{{$t('visa.v_chulizhong')}}</span> <span v-if="LineID==14">
<img v-if="item.ApplyStatus==1" src="../../assets/img/pass@2x.png" alt=""> <span v-if="item.ApplyStatus==0">{{$t('visa.v_chulizhong')}}</span>
<img v-if="item.ApplyStatus==2" src="../../assets/img/fail@2x.png" alt=""> <img v-if="item.ApplyStatus==1" src="../../assets/img/pass@2x.png" alt="">
<img v-if="item.ApplyStatus==2" src="../../assets/img/fail@2x.png" alt="">
</span>
<span v-else>
<span v-if="item.VisaCountryType!=0">
<span v-if="item.VisaManageStatus==1">未办理</span>
<span v-if="item.VisaManageStatus==2">办理中</span>
<span v-if="item.VisaManageStatus==3">办理完成</span>
</span>
</span>
</td> </td>
<td>{{item.UpdateName}} <img class="_head_img" :src="item.UpdatePhoto" alt=""></td> <td>{{item.UpdateName}} <img class="_head_img" :src="item.UpdatePhoto" alt=""></td>
<td> <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i></td> <td> <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i>
<span v-if="LineID!=14">
<!-- <button v-if="item.VisaManageStatus==1" @click="UpdateGuestStatus(item,2)" style='background:#3EABFF;padding:4px 6px;color:#fff;cursor:pointer'>办理</button> -->
<button v-if="item.VisaManageStatus==2" @click="UpdateGuestStatus(item,3)" style='background:#3EABFF;padding:4px 6px;color:#fff;cursor:pointer'>办理完成</button>
</span>
</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -100,11 +131,27 @@ export default { ...@@ -100,11 +131,27 @@ export default {
Name:'拒签' Name:'拒签'
}, },
], ],
LineID:0,
} }
}, },
watch:{}, watch:{},
computed:{}, computed:{},
methods:{ methods:{
UpdateGuestStatus(item,num){
let msg={
guestId:item.Id,
visaManageStatus:num
};
this.apipost('dmc_post_UpdateGuestVisaManageStatus',msg,res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message)
this.getData()
}
else{
this.$message.error(res.data.message)
}
})
},
UrgeGuestInfo(id,EmployeeId){ //催客人完善资料 UrgeGuestInfo(id,EmployeeId){ //催客人完善资料
let msg = { let msg = {
GuestId:id, GuestId:id,
...@@ -144,7 +191,10 @@ export default { ...@@ -144,7 +191,10 @@ export default {
},err=>{}) },err=>{})
}, },
bindVisa(command){ //绑定签证类型 bindVisa(command){ //绑定签证类型
console.log(command) if(command.id>0&&this.LineID!=14){
this.$message.error('请选择正确的签证类型！')
return;
}
if(this.checkList.length==0){ if(this.checkList.length==0){
this.$message.error('请选择需要绑定的人员') this.$message.error('请选择需要绑定的人员')
return return
...@@ -190,15 +240,25 @@ export default { ...@@ -190,15 +240,25 @@ export default {
}, },
getData(){ //获取数据 getData(){ //获取数据
this.loading = true this.loading = true
this.checkListAll=[] this.checkListAll=[];
this.apipost('dmc_get_GetTCGuestList',{TCID:this.id},res=>{ this.apipost('dmc_get_GetTCGuestList',{TCID:this.id},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.dataList = res.data.data this.dataList = res.data.data;
this.dataList.forEach(x=>{ if(this.LineID==14){
this.dataList.forEach(x=>{
if(x.ApplyStatus==-1){ if(x.ApplyStatus==-1){
this.checkListAll.push(x.Id) this.checkListAll.push(x.Id)
} }
}) })
}else{
this.dataList.forEach(x=>{
if(x.VisaManageStatus==1 || x.VisaManageStatus==0){
this.checkListAll.push(x.Id)
}
})
}
}else{ }else{
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -209,7 +269,8 @@ export default { ...@@ -209,7 +269,8 @@ export default {
created(){}, created(){},
mounted(){ mounted(){
this.id = this.$route.query.id this.id = this.$route.query.id
this.num = this.$route.query.num this.num = this.$route.query.num;
this.LineID=this.$route.query.LineID;
this.getVisaManagementList() this.getVisaManagementList()
this.getData() this.getData()
} }
......
src/components/administrative/departmentManagement.vue
View file @ 3eef6579
...@@ -401,11 +401,11 @@ ...@@ -401,11 +401,11 @@
<td>{{item.PostName}}</td> <td>{{item.PostName}}</td>
<td>{{item.Sort}}</td> <td>{{item.Sort}}</td>
<td> <td>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button type="primary" icon="el-icon-edit" circle <el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible = true,dialogTitle='修改部门信息',updateData(item.DepartmentID)"></el-button> @click="outerVisible = true,dialogTitle='修改部门信息',updateData(item.DepartmentID)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('pub.delete')" placement="top">
<el-button type="danger" icon="el-icon-delete" @click='deleteDeparment(item.DepartmentID)' <el-button type="danger" icon="el-icon-delete" @click='deleteDeparment(item.DepartmentID)'
circle></el-button> circle></el-button>
</el-tooltip> </el-tooltip>
...@@ -473,20 +473,20 @@ ...@@ -473,20 +473,20 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<el-form-item label="部门排序" prop="Sort"> <el-form-item :label="$t('admin.admin_departsort')" prop="Sort">
<el-input class='w200' type="text" v-model="addMsg.Sort" <el-input class='w200' type="text" v-model="addMsg.Sort"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<el-form-item class='w400' label='是否领队' prop="IsLeader"> <el-form-item class='w400' :label="$t('admin.admin_isleader')" prop="IsLeader">
<el-switch v-model="addMsg.IsLeader" active-value="1" inactive-value="0"></el-switch> <el-switch v-model="addMsg.IsLeader" active-value="1" inactive-value="0"></el-switch>
</el-form-item> </el-form-item>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<el-form-item label="绑定岗位" prop="PostIdArr"> <el-form-item :label="$t('admin.admin_Bindingposition')" prop="PostIdArr">
<el-select filterable class='w500 multiple_input' multiple v-model='addMsg.PostIdArr' <el-select filterable class='w500 multiple_input' multiple v-model='addMsg.PostIdArr'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId"> <el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
...@@ -657,7 +657,7 @@ ...@@ -657,7 +657,7 @@
}], }],
EmCard: [{ EmCard: [{
pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/,
message: '请输正确的身份证号459258' message: this.$t('rule.qsrIdnum'),
}], }],
}, },
//请求数据 //请求数据
...@@ -1124,16 +1124,16 @@ ...@@ -1124,16 +1124,16 @@
}, },
deleteDeparment(id) { deleteDeparment(id) {
this.$confirm('删除该部门，会将其子部门全部删除！是否删除?', '提示', { this.$confirm(this.$t('tips.tips_deletealldepart'), this.$t('tips.tips'), {
confirmButtonText: '确定', confirmButtonText:this.$t('pub.sureBtn'),
cancelButtonText: '取消', cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apipost('admin_post_DepartmentRemove', { this.apipost('admin_post_DepartmentRemove', {
DepartmentID: id DepartmentID: id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success('删除成功！') this.$message.success(this.$t('tips.shanchuchenggong'))
this.getList(); this.getList();
this.getAllDepartment() this.getAllDepartment()
} }
......
src/components/administrative/userManagement.vue
View file @ 3eef6579
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<div class="flexOne"> <div class="flexOne">
<div class="query-box"> <div class="query-box">
<ul class="user_time_picker"> <ul class="user_time_picker">
<li><span><em>公司</em><el-select filterable :disabled ="msg.IsParentCompany==2" v-model='msg.RB_Branch_id' @change='linkageDepartment()'> <li><span><em>{{$t('system.table_company')}}</em><el-select filterable :disabled ="msg.IsParentCompany==2" v-model='msg.RB_Branch_id' @change='linkageDepartment()'>
<el-option label='不限' value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in companyList' <el-option v-for='item in companyList'
:label='item.BName' :label='item.BName'
:value='item.Id' :value='item.Id'
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>部门</em><el-select filterable v-model='msg.RB_Department_Id' @change='linkagePost()'> <li><span><em>{{$t('admin.admin_Department')}}</em><el-select filterable v-model='msg.RB_Department_Id' @change='linkagePost()'>
<el-option label='不限' value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in departMentList' <el-option v-for='item in departMentList'
:label='item.DepartmentName' :label='item.DepartmentName'
:value='item.DepartmentID' :value='item.DepartmentID'
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li><span><em>岗位</em><el-select filterable v-model='msg.RB_Post_Id'> <li><span><em>{{$t('admin.admin_Post')}}</em><el-select filterable v-model='msg.RB_Post_Id'>
<el-option label='不限' value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in PostList' <el-option v-for='item in PostList'
:label='item.PostName' :label='item.PostName'
:value='item.PostId' :value='item.PostId'
...@@ -43,50 +43,50 @@ ...@@ -43,50 +43,50 @@
</el-option> </el-option>
</el-select> </el-select>
</span></li> </span></li>
<li><span><em>姓名</em><el-input v-model='msg.EmName' @keyup.enter.native="getList" ></el-input></span></li> <li><span><em>{{$t('system.query_name')}}</em><el-input v-model='msg.EmName' @keyup.enter.native="getList" ></el-input></span></li>
<li><span><em>登陆账号</em><el-input v-model='msg.EmAccount' @keyup.enter.native="getList" ></el-input></span></li> <li><span><em>{{$t('admin.admin_logincount')}}</em><el-input v-model='msg.EmAccount' @keyup.enter.native="getList" ></el-input></span></li>
<li><span><em>状态</em><el-select filterable v-model="msg.Status" > <li><span><em>{{$t('hotel.hotel_status')}}</em><el-select filterable v-model="msg.Status" >
<el-option label="不限" value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option label="在职" value="0"></el-option> <el-option :label="$t('pub.jobSel')" value="0"></el-option>
<el-option label="离职" value="1"></el-option> <el-option :label="$t('pub.noJobSel')" value="1"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li><span><em>入职时间</em><el-date-picker v-model='msg.sEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker> <li><span><em>{{$t('admin.admin_Entrytime')}}</em><el-date-picker v-model='msg.sEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
- -
<el-date-picker v-model='msg.eEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.eEmEntry' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span> </span>
</li> </li>
<li><span><em>离职时间</em><el-date-picker v-model='msg.sEmLeave' value-format="yyyy-MM-dd" class='w105' type="date"></el-date-picker> <li><span><em>{{$t('admin.admin_Departuretime')}}</em><el-date-picker v-model='msg.sEmLeave' value-format="yyyy-MM-dd" class='w105' type="date"></el-date-picker>
- -
<el-date-picker v-model='msg.eEmLeave' value-format="yyyy-MM-dd" class='w105' type="date"></el-date-picker> <el-date-picker v-model='msg.eEmLeave' value-format="yyyy-MM-dd" class='w105' type="date"></el-date-picker>
</span> </span>
</li> </li>
<li><input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp; <li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" @click="outerVisible = true,isleaveBtn=false,dialogTitle='添加员工',getCompany()" class="normalBtn" value="新增" /></li> <input type="button" @click="outerVisible = true,isleaveBtn=false,dialogTitle='添加员工',getCompany()" class="normalBtn" value="新增" /></li>
</ul> </ul>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div style="margin: 10px 0;" class="fz14 color333">有效账号：<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div> <div style="margin: 10px 0;" class="fz14 color333">{{$t('admin.admin_Validaccount')}}:<span class="colorE95252">{{UseNum}}</span>&nbsp;&nbsp;&nbsp;&nbsp;账号限额：<span class="colorE95252">{{TotalNum}}</span></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>公司</th> <th>{{$t('system.table_company')}}</th>
<th>部门</th> <th>{{$t('admin.admin_Department')}}</th>
<th>岗位</th> <th>{{$t('admin.admin_Post')}}</th>
<th>姓名</th> <th>{{$t('system.query_name')}}</th>
<th>性别</th> <th>{{$t('system.table_sex')}}</th>
<th>账号</th> <th>{{$t('system.table_acc')}}</th>
<th>登录手机号</th> <th>{{$t('admin.admin_logintel')}}</th>
<th>入职时间</th> <th>{{$t('admin.admin_Entrytime')}}</th>
<th>离职时间</th> <th>{{$t('admin.admin_Departuretime')}}</th>
<th>操作</th> <th>{{$t('admin.admin_operate')}}</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" v-loading='loading'> <tr v-for="(item,index) in DataList" v-loading='loading'>
<td>{{item.BranchName}}</td> <td>{{item.BranchName}}</td>
<td>{{item.DepartName}}</td> <td>{{item.DepartName}}</td>
<td>{{item.PostName}}</td> <td>{{item.PostName}}</td>
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
<td>{{item.EmSex==0?'男':'女'}}</td> <td>{{item.EmSex}}==0 ? {{$t('pub.man')}} :{{$t('pub.woman')}}</td>
<td>{{item.EmAccount}}</td> <td>{{item.EmAccount}}</td>
<td>{{item.EmLoginMobile}}</td> <td>{{item.EmLoginMobile}}</td>
<td>{{item.EmEntry}}</td> <td>{{item.EmEntry}}</td>
......
src/router/config.js
View file @ 3eef6579
...@@ -1718,6 +1718,14 @@ export default { ...@@ -1718,6 +1718,14 @@ export default {
title: '团期查询' title: '团期查询'
}, },
}, },
{ // 签证中心 签证财务单据
path: '/VisaFinancialDocuments',
name: 'VisaFinancialDocuments',
component: resolve => require(['@/components/SalesModule/VisaFinancialDocuments'], resolve),
meta: {
title: '签证财务单据'
},
},
{ // 签证中心 签证工作表 { // 签证中心 签证工作表
path: '/visaWorksheet', path: '/visaWorksheet',
name: 'visaWorksheet', name: 'visaWorksheet',
......
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