Skip to content

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

修改

parent 1968df08
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 42 deletions
src/assets/common/lang/zh.js
View file @ 24713947
......@@ -252,6 +252,21 @@ export const admin={ //行政
admin_lnLoginPwd:'请输入登录密码',
admin_Department:'部门',
admin_Post:'岗位',
admin_xueli:'学历',
admin_Entrytime:'入职时间',
admin_Departuretime:'离职时间',
admin_Birthday:'生日',
admin_password:'密码',
admin_departsort:'部门排序',
admin_isleader:'是否领队',
admin_Bindingposition:'绑定岗位',
admin_sort:'排序',
admin_level:'级',
}
//zk
export const hotel = {
......@@ -637,6 +652,12 @@ export const visa = {
v_yxiajia:'已下架',
v_hangban:'航班',
v_zanding:'暂定',
v_teaminfo:'团队信息',
v_tuanweiinfo:'团位信息',
v_currentseat:'当前余位',
v_yibaoru:'已报入',
v_houbu:'候补',
v_yxhoubu:'允许候补',
......@@ -1149,3 +1170,15 @@ export const visaT = {
xzggbg:'下载归国报告',
dccg:'导出成功！'
}
export const adm={
adm_xzbumen:"新增部门",
adm_sxjg:"树形结构",
adm_fhlb:"返回列表",
adm_jggl:"结构管理",
adm_addbumen:"添加部门",
adm_addzibumen:"添加子部门",
adm_addyuangong:"添加部门",
adm_edityuangong:"添加员工",
adm_rzshijian:"入职时间",
}
\ No newline at end of file
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ 24713947
......@@ -89,7 +89,7 @@
<div v-loading="loading">
<div class="sfd_header">
<ul class="clearfix">
<li><span>团队编号：</span>{{TCNUM}}</li>
<li><span>{{$t('scen.sc_temID')}}:</span>{{TCNUM}}</li>
<!-- <li><span>订单号：</span>{{orderId}}</li> -->
<li> </li>
<li><span>已收总金额：</span>{{moneyFormat(allMoney)}}</li>
......@@ -106,7 +106,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
<th width="200">费用类型</th>
<th width="200">{{$t('fnc.fyleixing')}}</th>
<th width="350">交易方式</th>
<th width="100">同行转款</th>
<th width="100">应收</th>
......
src/components/SalesModule/groupInquiry.vue
View file @ 24713947
......@@ -193,7 +193,7 @@
<em>{{$t('system.table_ssLine')}}</em>
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
<el-option v-for="(item,index) in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='index+10000'>
</el-option>
</el-select>
</span>
......@@ -318,7 +318,8 @@
<div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span>
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox>
<!-- 全选 -->
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group>
......@@ -327,7 +328,7 @@
<div class="comSearchDiv">
<span>{{$t('visa.v_tqstatus')}}</span>
<span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
<el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id" :key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group>
......@@ -341,8 +342,8 @@
</el-checkbox-group>
</span>
</div>
<button class="normalBtn TC_SearchBtn" @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">查询</button>
<!-- 查询 -->
<button class="normalBtn TC_SearchBtn" @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}</button>
</div>
<span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}}<i class="iconfont icon-xiaotuziCduan_1"></i></span>
</el-popover>
......@@ -428,18 +429,19 @@
</div >
<div class="el-col" style="width:190px;">
<div class="d3">
<p><i class="iconfont icon-tuandui"></i>团队信息<em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}晚</em></p>
<p><span>出发时间</span>{{item.StartDate}}</p>
<p><span>出团公司</span>{{item.OutBranchName}}</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>{{$t('Airticket.Air_StartTime')}}</span>{{item.StartDate}}</p>
<p><span>>{{$t('scen.sc_cp')}}</span>{{item.OutBranchName}}</p>
</div>
</div>
<div class="el-col" style="width:200px;">
<div class="d5">
<p><i class="iconfont icon-tuanwei"></i>团位信息</p>
<p><span>当前余位</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>候补</span>
<span v-if='item.IsSubstitution==1' class="TCL-greenType">允许候补</span>
<p><i class="iconfont icon-tuanwei"></i>{{$t('visa.v_tuanweiinfo')}}</p>
<!-- 当前余位 -->
<p><span>{{$t('visa.v_currentseat')}}</span><i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></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>{{$t('visa.v_houbu')}}</span>
<span v-if='item.IsSubstitution==1' class="TCL-greenType">{{$t('visa.v_yxhoubu')}}</span>
<span v-else class="TCL-redType">不允许候补</span>
</p>
<p><span @click="goUrlY('TravelPassengerList',item.TCID)" style="cursor:pointer;text-decoration:underline;">旅客名单</span></p>
......@@ -456,20 +458,20 @@
<div class="TC-OPName">{{item.OPName}}</div>
</div>
<div class="TC_SeatList">
头等舱：{{item.FSeat}}
{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}
</div>
<div class="TC_SeatList">
商务舱：{{item.CSeat}}
{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}
</div>
<div class="TC_SeatList">
经济舱：{{item.YSeat}}
{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}
</div>
</div>
</div>
<div class="el-col" style="width:190px;">
<div class="d3">
<p><i class="iconfont icon-qianzheng"></i>签证</p>
<p><span>签证状态:</span><i @click="goUrlP('visaWorksheet',item.TCID)" style="cursor:pointer;">{{item.VisaStatusName}}</i></p>
<p><i class="iconfont icon-qianzheng"></i>{{$t('active.cl_qianzheng')}}</p>
<p><span>{{$t('visa.v_qianzhengst')}}:</span><i @click="goUrlP('visaWorksheet',item.TCID)" style="cursor:pointer;">{{item.VisaStatusName}}</i></p>
<p><span>送签日期:</span>{{item.SendVisaTime}}</p>
<p><span>出签日期:</span>{{item.OutVisaTime}}</p>
<p><span>进馆日期:</span>{{item.EnterVisaTime}}</p>
......@@ -517,7 +519,7 @@
<span v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red" >{{item2.FrID}}</span>
<span v-else-if="item2.ColorState===4" class="groupTourOrder_tickets_black" >{{item2.FrID}}</span>
</span>
<span v-if="item.VisaFinanceList.length===0">暂无数据</span>
<span v-if="item.VisaFinanceList.length===0">{{$t('system.content_noData')}}</span>
</div>
</div>
<!-- <div class="TC_remarkContent">
......@@ -549,14 +551,14 @@
<div class="combottomTitle">请选择上架平台</div>
<span class="setPlatLeft">销售平台</span>
<span>
<el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">全选</el-checkbox>
<el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group>
</span>
<span>
<button class="normalBtn" style="margin-left:50px;" @click="SetshelvesUp">确定</button>
<button class="hollowFixedBtn" @click="queryCommonData.setPlatDialog=false">取消</button>
<button class="normalBtn" style="margin-left:50px;" @click="SetshelvesUp">{{$t('pub.sureBtn')}}</button>
<button class="hollowFixedBtn" @click="queryCommonData.setPlatDialog=false">{{$t('pub.cancelBtn')}}</button>
</span>
</div>
......@@ -625,10 +627,10 @@
<el-form-item label="进馆日期" prop="EnterVisaTime" class="groupInquiry_admission_formItem">
<el-date-picker class="groupInquiry_admission_input2" v-model='msg_admission.EnterVisaTime' @change="admissionInput" type="date" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')" clearable></el-date-picker>
</el-form-item>
<el-form-item label="签证类型" prop="VisaType" class="groupInquiry_admission_formItem">
<el-form-item :label="$t('visa.v_visaType')" prop="VisaType" class="groupInquiry_admission_formItem">
<el-select class="groupInquiry_admission_input2" v-model="msg_admission.VisaType" placeholder="选择签证类型">
<el-option label='个签' value='1'></el-option>
<el-option label='团签' value='2'></el-option>
<el-option :label="$t('visa.v_gvisa')" value='1'></el-option>
<el-option :label="$t('visa.v_tvisa')" value='2'></el-option>
</el-select>
</el-form-item>
<el-form-item label="欧洲签证" prop="EuropeVisaType" class="groupInquiry_admission_formItem" v-if="msg_admission.LineID===2">
......@@ -637,7 +639,7 @@
</el-select>
</el-form-item>
<div style="display: inline-block;vertical-align: top;white-space: nowrap;">
<el-form-item label="国家" prop="EuropeSchengen" class="groupInquiry_admission_formItem" v-show="msg_admission.LineID===2&&msg_admission.EuropeVisaType==='2'">
<el-form-item :label="$t('advmanager.v_country')" prop="EuropeSchengen" class="groupInquiry_admission_formItem" v-show="msg_admission.LineID===2&&msg_admission.EuropeVisaType==='2'">
<el-select class="groupInquiry_admission_input2" v-model="msg_admission.EuropeSchengen" @change="SchengenChange" placeholder="选择国家">
<el-option v-for="(item, index) in EuropeSchengenList" :key="index+2000" :label='item.Name' :value='item.Id'></el-option>
</el-select>
......
src/components/administrative/departmentManagement.vue
View file @ 24713947
......@@ -226,20 +226,20 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('adm.adm_xueli')" prop="EmEducation">
<el-form-item :label="$t('admin.admin_xueli')" prop="EmEducation">
<el-input maxlength='20' type="text" v-model="addMsg1.EmEducation"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="入职时间" prop="EmEntry">
<el-form-item :label="$t('admin.admin_Entrytime')" prop="EmEntry">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmEntry' type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="离职时间" prop="EmLeave">
<el-form-item :label="$t('admin.admin_Departuretime')" prop="EmLeave">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmLeave' type="date"
disabled></el-date-picker>
</el-form-item>
......@@ -269,7 +269,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生日" prop="EmBirthday">
<el-form-item :label="$t('admin.admin_Birthday')" prop="EmBirthday">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmBirthday' type="date"></el-date-picker>
</el-form-item>
</el-col>
......@@ -279,7 +279,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="密码" prop="EmPassword">
<el-form-item :label="$t('admin.admin_password')" prop="EmPassword">
<el-input type="password" v-model="addMsg1.EmPassword" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
......@@ -287,8 +287,8 @@
<el-row :gutter="10">
<el-col :span="24">
<input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn"
@click="resetForm('addMsg1'),treeLayerShowUser=false"></input>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input>
@click="resetForm('addMsg1'),treeLayerShowUser=false" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')" />
<button v-if='isleaveBtn' class="normalBtn" @click="setIsLeave(leaveId)">{{leaveBtn}}</button>
</el-col>
</el-row>
......@@ -346,19 +346,19 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="部门排序" prop="Sort">
<el-form-item :label="$t('admin.admin_departsort')" prop="Sort">
<el-input type="text" v-model="addMsg.Sort" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label='是否领队' prop="IsLeader">
<el-form-item :label="$t('admin.admin_isleader')" prop="IsLeader">
<el-switch v-model="addMsg.IsLeader" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<el-form-item label="绑定岗位" prop="PostIdArr">
<el-form-item :label="$t('admin.admin_Bindingposition')" prop="PostIdArr">
<el-select filterable class='w400 multiple_input' multiple v-model='addMsg.PostIdArr'
:placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
......@@ -388,14 +388,14 @@
<th>{{$t('admin.admin_departmentLevel')}}</th>
<th>{{$t('admin.admin_leader')}}</th>
<th>{{$t('admin.admin_dphone')}}</th>
<th width="300">绑定岗位</th>
<th>排序</th>
<th width="300">{{$t('admin.admin_Bindingposition')}}</th>
<th>{{$t('admin.admin_sort')}}</th>
<th>{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>{{item.RB_Branch_Name}}</td>
<td>{{item.DepartmentName}}</td>
<td>{{item.Tier}}级</td>
<td>{{item.Tier}}{{$t('admin.admin_level')}}</td>
<td>{{item.DepartmentManagerName}}</td>
<td>{{item.DepartmentTel}}</td>
<td>{{item.PostName}}</td>
......
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