Commit 94ba52f5 authored by 123zhang's avatar 123zhang

合并代码

parents e06ad2b9 3f756676
......@@ -658,6 +658,12 @@ export const visa = {
v_yibaoru:'已报入',
v_houbu:'候补',
v_yxhoubu:'允许候补',
v_byxhoubu:'不允许候补',
v_sqtime:'送签日期',
v_cqtime:'出签日期',
v_kptime:'开票日期',
v_EuropeanVisaType:'欧洲签证类型',
v_britishVisa:'英国签证',
......@@ -756,6 +762,12 @@ export const active = {
}
export const fnc = {
fnc_tfsrhj: '团费收入合计',
fnc_zksr: '直客收入',
fnc_thjksr: '同行交客收入',
fnc_plattev: '平台收入',
acc: '账户',
accBming: '账户别名:',
accType: '账户类型:',
......@@ -1211,6 +1223,50 @@ export const Operation = {
Op_localBranchPrice:'当地分公司价格',
Op_localdaiPrice:'当地代销商价格',
Op_localDangPrice:'当地当团利润归属',
Op_Country:'国别',
Op_WarningTeam:'预警团',
Op_TransportState:'联运状态',
Op_hide:'隐藏',
Op_TeamWarningSearch:'团控预警查询',
Op_daysChoice:'天数选择',
Op_Attendance:'上座率',
Op_warningSearch:'预警查询',
Op_TeamName:'团名',
Op_nei:'内',
Op_zhu:'主',
Op_lian:'联',
Op_jietuan:'结团',
Op_night:'晚',
Op_teamNotice:'出团通知书',
Op_downLoadword:'下载WORD行程',
Op_PriceInfo:'价格信息',
Op_tradePrice:'同业价',
Op_directPrice:'直客价',
Op_fellowMember:'同行会员',
Op_standard:'标准',
Op_fellow:'同行',
Op_directMember:'直客会员',
Op_direct:'直客',
Op_baby:'婴儿',
Op_spickupPrice:'单地接价格',
Op_Income:'增收',
Op_childBed:'儿童占床',
Op_childSurcharge:'儿童附加费',
Op_oldmanSurcharge:'老人附加费',
Op_visaPrice:'签证费',
Op_singleRoomcha:'单房差',
Op_insurance:'保险',
Op_zafei:'杂费',
Op_jianmian:'减免',
Op_childNobed:'儿童不占床',
Op_visafeeBack:'退签证费',
Op_priceDetail:'查看价格明细',
Op_people:'人',
Op_takeSeat:'占位',
Op_nozhipai:'尚未指派',
Op_caozuoop:'操作op',
Op_bindNum:'绑定数量',
Op_Warmprompt:'温馨提示',
}
export const rule = {
company: '请选择公司',
......@@ -1308,6 +1364,10 @@ export const rule = {
qtxhkshijian: '请选择汇款时间!',
qxzjylshuihao: '请选择交易流水号!',
qxzskzhanghao: '请选择收款账号!',
qxzrzshijian: '请选择入职时间!',
qsrzqdqq: '请输入正确的qq!',
}
export const adm={
......@@ -1326,6 +1386,71 @@ export const adm={
adm_ynyyfenqu:"是否应用分区",
adm_qsrgwname:"请输入岗位名称",
adm_qxzsfyyfenqu:"请选择是否应用分区",
adm_changepd:"修改密码",
adm_changeUserInfo:"修改用户信息",
adm_bindaccountinfo:"绑定账户信息",
adm_newPd:"新密码",
adm_Reinput:"再次输入",
adm_logintel:"登录手机",
adm_Validaccount:"有效账号",
adm_logincount:"登录账号",
adm_changelogintel:"修改登录手机",
adm_staff:"员工",
adm_newphone:"新手机号",
adm_resetpd:"重置密码",
adm_twopdnotsame:"两次密码不一致!",
adm_twotelphnotsame:"两次手机号码不一致!",
adm_swlizhi:"设为离职",
adm_swzaizhi:"设为在职",
adm_Rolename:"角色名称",
adm_quanxian:"权限",
adm_qsrmiaoshu:"请输入描述",
adm_qxshezhi:"权限设置",
adm_Bindingattendance:"绑定考勤",
adm_title:"标题",
adm_Publisher:"发布人",
adm_ublicationstatus:"发布情况",
adm_tobepublish:"待发布",
adm_published:"已发布",
adm_Withdrawn:"已撤回",
adm_Ceilingsituation:"置顶情况",
adm_Noroofset:"未置顶",
adm_roofset:"已置顶",
adm_theme:"主题",
adm_roof:"置顶",
adm_exitroof:"取消置顶",
adm_shifouroof:"是否置顶?",
adm_chehui:"撤回",
adm_fujian:"附件",
adm_download:"下载",
adm_content:"内容",
adm_content:"上传",
adm_fjlist:"附件列表",
adm_publish:"发布",
adm_qsrgbbiaoti:"请输入公告标题",
adm_qsrgbneirong:"请输入公告内容",
adm_filenotmoreM:"文件大小不能超过100M!",
adm_sfchehui:"是否撤回",
adm_chsuccess:"撤回成功",
adm_chexit:"取消撤回",
adm_xgnotice:"修改公告",
adm_noticexiangqing:"公告详情",
adm_binded:"已绑定",
adm_binding:"未绑定",
adm_time:"时间",
adm_Jobnumber:"工号",
adm_Attendancedate:"考勤日期",
adm_sbkqshijian:"上班考勤时间",
adm_sbdkshijian:"上班打卡时间",
adm_sbdkjieguo:"上班打卡结果",
adm_sbdkdizhi:"上班打卡地址",
adm_xbkqshijian:"下班考勤时间",
adm_xbdkshijian:"下班打卡时间",
adm_xbdkjieguo:"下班打卡结果",
adm_xbdkdizhi:"下班打卡地址",
adm_dkshebei:"打卡设备",
adm_timenomorethan:"时间跨度不能超过31天!",
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -964,7 +964,7 @@
<button class="hollowFixedBtn" @click="ReturnBack()">返回</button>
<!--<template v-if="AuditOrRefundMsg.Status !== '3'" v-for="step in GetDetail.AuditSteps">-->
<template v-for="step in GetDetail.AuditSteps">
<template v-if="step.NextStep === 1 && (step.SpecialNode === 2 || step.SpecialNode === 1 || userId==1569)">
<template v-if="step.NextStep === 1 && (step.SpecialNode === 2 || step.SpecialNode === 1 || RB_Post_Id==168)">
<button class="normalBtn" @click="zanCun()" style="position: relative;left: 560px;">暂存</button>
</template>
</template>
......@@ -1102,7 +1102,8 @@ export default {
loading:false,
GetFinancLogList:[],
LogLoading:false,
userId:0
userId:0,
RB_Post_Id: 0,
}
},components:{
"my-FlowChartModule": myFlowChartModule,
......@@ -1696,6 +1697,7 @@ export default {
},mounted(){
let userInfo=this.getLocalStorage();
this.userId = userInfo.EmployeeId;
this.RB_Post_Id = userInfo.RB_Post_Id
this.ID = this.$route.query.id;
this.Financial_post_GetDetail(this.ID);
this.financeinfo_post_GetList();
......
......@@ -245,6 +245,7 @@
reserve-keyword
placeholder="请输入"
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethod"
@change="$forceUpdate()"
@remove-tag="removeTag"
:loading="loading2">
......
......@@ -22,7 +22,7 @@
._cu{cursor: pointer;}
._none{opacity:0 ;}
._block{opacity: 1}
.InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.InfoChangeLog{height: auto;background-color: #FFFFFF;}
.changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
......@@ -33,8 +33,8 @@
._tp{padding: 10px 20px 0 20px;font-size: 12px;display: flex;align-items: center;align-items: flex-end}
._bg_blue{background-color: #297BEF}
._bg_org{background-color: #F16C3C !important}
._bg_gre{background-color: #32B37C}
._bg_greS{background-color:#1C9A65}
._bg_greend{background-color: #32B37C}
._bg_greendS{background-color:#1C9A65}
._bg_gray{background-color: #666666}
._color_blue{color: #005CAA}
._yewu{color: white;padding: 3px 13px;}
......@@ -130,7 +130,7 @@
<div class="changLog">
<p class="_log_t">适用费用</p>
<div class="_feiyong">
<span class="_bg_gre" v-for="Cose in item.CoseTypeList">{{Cose}}</span>
<span class="_bg_greend" v-for="Cose in item.CoseTypeList">{{Cose}}</span>
</div>
<p class="_log_t _log_t_s">注:以上费用类型将会被执行你设定的流程</p>
</div>
......@@ -154,7 +154,7 @@
<div class="changLog">
<p class="_log_t">适用公司</p>
<div class="_feiyong">
<span class="_bg_gre" v-for="Cose in item.SuitableObjectNameList">{{Cose}}</span>
<span class="_bg_greend" v-for="Cose in item.SuitableObjectNameList">{{Cose}}</span>
</div>
<p class="_log_t _log_t_s">注:以上公司将会被执行你设定的流程</p>
</div>
......
......@@ -7,17 +7,17 @@
<div class="query-box">
<ul>
<li>
<button class="normalBtn" @click="addShow=true,text='新增'">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn')">{{$t('pub.addBtn')}}</button>
</li>
</ul>
</div>
<div v-loading="loading" class="cm_content _scrollbar" :class="addShow==true?'_edHeight':''">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" >
<tr>
<th>窗口名称</th>
<th>所属公司</th>
<th>业务人员</th>
<th>负责方向</th>
<th>{{$t('fnc.w_ckmingcheng')}}</th>
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.w_ywrenyuan')}}</th>
<th>{{$t('fnc.w_fzfangxiang')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
......@@ -27,19 +27,19 @@
<span v-for="(i,ix) in item.emList">{{i.emName}} <span v-if="ix!=item.emList.length-1">,</span> </span>
</td>
<td>
<span v-if="item.Direct==1">收款</span>
<span v-else-if="item.Direct==2">支款</span>
<span v-else>收支</span>
<span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
<span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span>
<span v-else>{{$t('fnc.shouzhi')}}</span>
</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text='修改'"></el-button>
<el-tooltip class="item" effect="dark" :content="$t('pub,updateMsg')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text=$t('pub,updateMsg')"></el-button>
</el-tooltip>
<!--<el-tooltip class="item" effect="dark" content="单据信息" placement="top-start">-->
<!--<el-button type="danger" class="iconfont icon-img-rili" circle @click="goUrlDetail('CashierWorkDetail',2,item.Name,item.ID,item.BranchId)"></el-button>-->
<!--</el-tooltip>-->
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" circle @click="financeinfoRemove(item.ID,item.ID)"></el-button>
</el-tooltip>
</el-row>
......@@ -63,7 +63,7 @@
<div class="_vMG_edit" :class="addShow==true?'edHeight':''">
<el-row class="_margin_bottom_20">
<el-col :span="20">
<p class="_tit">{{text}}窗口</p>
<p class="_tit">{{text}}{{$t('fnc.w_chuangkou')}}</p>
</el-col>
<el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
......@@ -91,7 +91,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务人员" prop="listArr">
<el-form-item :label="$t('fnc.w_ywrenyuan')" prop="listArr">
<el-select
v-model="addMsg.listArr"
filterable
......@@ -115,10 +115,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="负责方向" prop="Direct">
<el-radio v-model="addMsg.Direct" :label="1"></el-radio>
<el-radio v-model="addMsg.Direct" :label="2"></el-radio>
<el-radio v-model="addMsg.Direct" :label="3">收支</el-radio>
<el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct">
<el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio>
<el-radio v-model="addMsg.Direct" :label="2">{{$t('fnc.w_zhi')}}</el-radio>
<el-radio v-model="addMsg.Direct" :label="3">{{$t('fnc.shouzhi')}}</el-radio>
</el-form-item>
</el-col>
</el-row>
......@@ -157,14 +157,14 @@
text: '',
rules: {
Name: [
{ required: true, message: '请填写窗口名称', trigger: 'blur' }
{ required: true, message: this.$t('rule.qtxckmingcheng'), trigger: 'blur' }
],
listArr: [
{type: 'array', required: true, editCurencymessage: '请选择业务员', trigger: 'blur' }
{type: 'array', required: true, editCurencymessage: this.$t('rule.qxzywuyuan'), trigger: 'blur' }
],BranchId:[
{ required: true, message: '请选择公司', trigger: 'change' }
{ required: true, message: this.$t('rule.company'), trigger: 'change' }
],Direct:[
{ required: true, message: '请选择使用方向', trigger: 'change' }
{ required: true, message: this.$t('rule.qxzsyfangxiang'), trigger: 'change' }
]
},
}
......@@ -173,9 +173,9 @@
}, methods: {
financeinfoRemove: function(id){ // 删除
this.$confirm('确定删除窗口?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.qrscchuangkou'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('Window_post_RemoveTwo',{ID:id}, res => {
......@@ -189,7 +189,7 @@
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
message: this.$t('hotel.hotel_HasBeenCancelled'),
});
});
},
......
......@@ -1667,9 +1667,9 @@ export default {
this.msg,
res => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;
let data = res.data.data.pmodel.pageData;
// res.data.data.TotalRevenue
this.total = res.data.data.count;
this.total = res.data.data.pmodel.count;
if (this.total == 0) {
this.DataList = [];
} else {
......
......@@ -997,7 +997,7 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
// this.msg.OutBranchId=this.CompanyList[0].Id;
this.msg.OutBranchId=this.CompanyList[0].Id;
} else {
}
},
......
......@@ -37,7 +37,7 @@
</el-form-item>
</el-col> -->
<el-col :span="6">
<el-form-item label="交易日期:">
<el-form-item :label="$t('fnc.jiaoyiriqi')+':'">
<el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
......@@ -49,24 +49,24 @@
<span>
</span>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
</li>
</ul>
</div>
<div class="_fnDm_content" v-loading='loading'>
<table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
<tr>
<th colspan="8">四川和平国际旅行社有限公司现金日报表</th>
<th colspan="8">{{branchName}}{{$t('fnc.a_xjrbaobiao')}}</th>
</tr>
<tr>
<th>公司</th>
<th>银行</th>
<th>上期余额</th>
<th>本期借方发生额</th>
<th>本期贷方发生额</th>
<th>本期余额</th>
<th>借方笔数</th>
<th>贷方笔数</th>
<th>{{$t('system.table_company')}}</th>
<th>{{$t('fnc.yinhang')}}</th>
<th>{{$t('fnc.a_sqyue')}}</th>
<th>{{$t('fnc.a_bqjffshenge')}}</th>
<th>{{$t('fnc.a_bqdffshenge')}}</th>
<th>{{$t('fnc.a_bqyue')}}</th>
<th>{{$t('fnc.a_jfbishu')}}</th>
<th>{{$t('fnc.a_dfbishu')}}</th>
</tr>
<template v-for="item in dataObj.resultList">
<tr>
......@@ -153,6 +153,7 @@
comPanyALLList: [],
ALLMoney: [],
dataObj: {},
branchName: ''
}
},
created() {
......@@ -161,6 +162,7 @@
components: {},
mounted() {
let userInfo = this.getLocalStorage();
this.branchName = userInfo.GroupName
this.getList();
this.msg.EmployeeId= userInfo.EmployeeId;
},
......
......@@ -817,7 +817,7 @@ export default {
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
Content: x.data.FilePath,
......@@ -879,7 +879,7 @@ export default {
}).then(() => {
this.$router.push({ name:'addFinancialDocuments',query:{"id":this.$route.query.id,"Name":this.$route.query.Name,'InPay':this.$route.query.InPay,"Type":this.$route.query.Type,"orderObj":this.$route.query.orderObj,'IsUploadPic':this.$route.query.IsUploadPic,'companyID':this.$route.query.companyID}})
}).catch(() => {
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type,'InPay':this.$route.query.InPay}}) ;
this.$router.push({name:'FinancialDocuments',query:{'Type':this.$route.query.Type,'InPay':this.$route.query.InPay}}) ;
});
}else{
this.resultCode = res.data.resultCode;
......@@ -1258,7 +1258,10 @@ export default {
},
},created(){
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
console.log(this.$route.query.orderObj)
console.log(this.$route.query.orderObj)
if(this.orderObj!=null&&this.orderObj.OrderSource===10){
console.log("getGuestInfo",this.$store.getters.getGuestInfo)
}
},mounted(){
let userInfo = this.getLocalStorage();
this.department = userInfo.DepartName;
......
......@@ -402,7 +402,7 @@
</div>
<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible" center>
<div class="fl" style="width: 300px; margin: 0 20px;">
<p style="margin: 0 0 10px 0;">{{$t('fnc.xuanze')}}<el-input class='w200' :placeholder="$t('fnc.srgjzjxguolv')" v-model="filterText">
<p style="margin: 0 0 10px 0;">{{$t('fnc.xuanze')}}<el-input class='w200' :placeholder="$t('tips.srgjzjxguolv')" v-model="filterText">
</el-input>
</p>
<el-tree class='ApprovalProcessBg'
......@@ -430,7 +430,7 @@
</el-dialog>
<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible1" center>
<div class="fl" style="width: 300px; margin: 0 20px;">
<p style="margin: 0 0 10px 0;">{{$t('fnc.xzgangwei')}}<el-input class='w200' :placeholder="$t('fnc.srgjzjxguolv')" v-model="filterText1">
<p style="margin: 0 0 10px 0;">{{$t('fnc.xzgangwei')}}<el-input class='w200' :placeholder="$t('tips.srgjzjxguolv')" v-model="filterText1">
</el-input>
</p>
<el-tree class='ApprovalProcessBg'
......
This diff is collapsed.
......@@ -486,9 +486,9 @@
<div class="el-col">
<div class="d7">
<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==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==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==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.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.LineID,item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button>
</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 @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> -->
......@@ -1378,8 +1378,8 @@ export default {
goUrlY(path, id) {
this.$router.push({ name: path, query: { id: id,blank:'y',tab:'旅客名单'} });
},
goUrlZ(path, id, num) {
this.$router.push({ name: path, query: { id: id, num: num,blank:'y',tab:'签证办理'} });
goUrlZ(path,LineID, id, num) {
this.$router.push({ name: path, query: { LineID:LineID,id: id, num: num,blank:'y',tab:'签证办理'} });
},
goUrlT(path, tcid) {
this.$router.push({ name: path, query: { tcid: tcid, blank:'y', tab:'签证列表'} });
......
......@@ -1299,7 +1299,7 @@
<li>
<span>
<em>编号</em>
<el-input v-model="msg.ID" placeholder="机票编号"></el-input>
<el-input v-model="msg.ID" placeholder="机票编号" @keyup.native="checkInteger(msg,'ID')"></el-input>
</span>
</li>
<li>
......@@ -2733,8 +2733,7 @@
this.chengeDelIdList = [];
this.apipost(
"ticket_get_GetEntityExtend", {
ID,
ID
ID:ID
},
res => {
if (res.data.resultCode == 1) {
......@@ -2751,8 +2750,6 @@
res.data.data.flightList.forEach((x, index) => {
this.chengeDelIdList.push(x.ID);
});
console.log(this.addMsg,'addmsg');
} else {
this.Warning(res.data.message);
}
......
......@@ -622,6 +622,16 @@
<div class="flexOne TravelticketManager">
<div class="query-box">
<ul>
<li>
<span>
<em>线路</em>
<el-select v-model="Query.LineId" :placeholder="$t('pub.pleaseSel')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</span>
</li>
<li>
<span class="hotel_name">
<em>起飞时间</em>
......@@ -650,6 +660,12 @@
</el-input>
</span>
</li>
<li>
<span>
<em>机票编号</em>
<el-input v-model="Query.ID" placeholder="机票编号" @keyup.native="checkInteger(Query,'ID')"></el-input>
</span>
</li>
<li>
<button class="hollowFixedBtn" type="button"
@click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
......@@ -806,10 +822,14 @@
<div class="TCID_cont PingFangSC">
团期:
<span v-show="item.PriceList.length==0">暂无</span>
<span class="Ticket_TCID" v-for="subItem in item.PriceList">({{subItem.TCID}}){{subItem.TCNUM}} &nbsp;</span>
<span class="Ticket_TCID" v-for="subItem in item.PriceList">({{subItem.TCID}}){{subItem.TCNUM}}
&nbsp;</span>
</div>
</el-col>
<el-col :span="16">
<el-col :span="6">
<div class="TCID_cont"> 采购人:<span style="color:red;">{{item.PurchaseManName}}</span> </div>
</el-col>
<el-col :span="10">
<div class="TCID_cont">
PNR:{{item.PNR}}
</div>
......@@ -847,6 +867,7 @@
data() {
return {
Query: {
LineId: 0, //线路编号
//页码
pageIndex: 1,
//每页显示条数
......@@ -872,7 +893,13 @@
currentPage: 1,
//起飞状态
FlyState: "0",
//是否查询采购人员(1-查询,0-不查询)
IsQueryPurchase: 1,
//机票编号
ID: "",
},
//线路列表
LineList: [],
//下拉框默认值
selectDefauleValue: 0,
//防止重复提交
......@@ -914,16 +941,21 @@
methods: {
getList() {
this.loading = true;
if (this.Query.ID == "") {
this.Query.ID = 0;
}
this.apipost(
"AirTicket_get_GetPageList",
this.Query,
res => {
this.loading = false;
this.loading = false;
if (res.data.resultCode == 1) {
this.Query.total = res.data.data.count;
this.noData = !this.Query.total > 0;
this.dataList = res.data.data.pageData;
console.log("dataList",this.dataList);
if (this.Query.ID == 0) {
this.Query.ID = "";
}
} else {
this.Warning(res.data.message);
}
......@@ -931,6 +963,18 @@
err => {}
);
},
//获取线路列表
GetLineList() {
this.apipost(
"line_post_GetAllList", {},
res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
},
err => {}
);
},
GetPlaceHolder() {
this.UseNum_placeholder =
"最多绑定" + this.bindAirticket.TotalNum + "个机位";
......@@ -998,6 +1042,7 @@
}
},
mounted() {
this.GetLineList();
this.initAirline();
this.getList();
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
/* 获取数据 */
export default {
getGuestInfo(state) {
return state.guestInfo;
}
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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