Skip to content

S
SuperMan
Commit 51b91b09 authored by 123zhang's avatar 123zhang
Browse files
Options

解决冲突

parents bf1a2ed0 292691f5
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2133 additions and 1695 deletions
src/App.vue
View file @ 51b91b09
......@@ -9,6 +9,8 @@
<img v-for="src in images" :src="src" :key="src">
</viewer>
<chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode>
<!-- -->
</div>
</template>
......@@ -56,9 +58,12 @@ export default {
dataShow:false,
haveOpenMode:false,
settingSys: false,
// sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
}
},
methods: {
inited (viewer){
this.$viewer = viewer
},
......@@ -108,7 +113,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_uyefzcxpu3.css";
@import "//at.alicdn.com/t/font_635492_wsab6ve9rk8.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......@@ -119,4 +124,6 @@ export default {
.BMap_cpyCtrl {display: none;}
.anchorBL {display: none;}
.viewer{display: none !important;}
</style>
src/assets/common/lang/zh.js
View file @ 51b91b09
......@@ -39,6 +39,9 @@ export const pub={
clickToView:'点击查看',
man:'男',
woman:'女',
yes:'是',
no:'否',
}
......@@ -1117,6 +1120,7 @@ export const fnc = {
ljhaoshi: '累计耗时',
xsfujian: '显示附件',
ycfujian: '隐藏附件',
ysjine: '应收金额',
}
export const tips = {
tips: '提示',
......@@ -1284,7 +1288,7 @@ export const rule = {
qxzkhmingcheng: '请选择客户名称!',
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qxzzdbumen:' 请选择制单部门！',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
......@@ -1300,6 +1304,10 @@ export const rule = {
qtxshuoming: '请填写说明',
qxzygxytjddanju: '请选择一个需要提交的单据！',
qxzbmen: '请选择部门',
qtxhkuanren: '请填写汇款人！',
qtxhkshijian: '请选择汇款时间！',
qxzjylshuihao: '请选择交易流水号！',
qxzskzhanghao: '请选择收款账号！',
}
export const adm={
......@@ -1313,6 +1321,13 @@ export const adm={
adm_edityuangong:"员工修改",
adm_xueli:"学历",
adm_rzshijain:"入职时间",
adm_gwname:"岗位名称",
adm_gxtime:"更新时间",
adm_ynyyfenqu:"是否应用分区",
adm_qsrgwname:"请输入岗位名称",
adm_qxzsfyyfenqu:"请选择是否应用分区",
}
export const visaT = {
cxjihua: '出行计划',
......@@ -1429,5 +1444,5 @@ export const visaT = {
sfshanchubd:'是否删除绑定?',
qxzzzdqzlx:'请选择正确的签证类型！',
qxzxybddry:"请选择需要绑定的人员",
v_Othervisas:'其他签证'
v_Othervisas:'其他'
}
\ No newline at end of file
src/assets/common/lang/zh.js.rej 0 → 100644
View file @ 51b91b09
This diff is collapsed.
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 51b91b09
......@@ -123,7 +123,7 @@
<span v-else>{{$t('fnc.no')}}</span>
</span>
</p>
<span class="">{{$t(hotel.order_Number)}}：<span>{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></span>
<span class="">{{$t('hotel.order_Number')}}：<span>{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></span>
</div>
<div class="rb_top_row _r_mb5" v-if="isPrintPage&&OrderSource==4">
<p>
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 51b91b09
......@@ -17,6 +17,11 @@
float: left;
}
.page_EasyReport_form .el-date-editor.el-input,.page_EasyReport_form .el-date-editor.el-input__inner{width: 100% !important;}
.easyUpdateTime{
position: absolute;
top: 55px;
right: 0;
}
</style>
<template>
<div class="page_EasyReport" v-loading="AALloading">
......@@ -55,6 +60,8 @@
<!-- <button class="normalBtn " @click="togbu">一键同步</button> -->
</div>
<button class="normalBtn page_EasyReport_search" @click="getData">确定</button>
<p class="easyUpdateTime" v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<p class="easyUpdateTime" v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
</div>
<div style="margin-bottom:25px;" v-loading='loading'>
<v-table
......@@ -488,6 +495,9 @@ export default {
},
data: [],
DataList: [],
UpdateStaus:0,
UpdateStartTime:'',
UpdateEndTime:'',
BranchList: [],
MonthIndex: 0,
pageSize: 18,
......@@ -865,6 +875,9 @@ export default {
this.monthList[i].value = x.Money
})
this.DataList = data.list
this.UpdateStaus=data.Status;
this.UpdateStartTime=data.UpdateStartTime;
this.UpdateEndTime=data.UpdateEndTime;
this.loading = false
this.$forceUpdate()
return
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 51b91b09
......@@ -517,6 +517,11 @@ tr._item_list td:last-child {
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<p v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
......@@ -749,6 +754,9 @@ export default {
Status: "0"
},
DataList: [],
UpdateStaus:0,
UpdateStartTime:'',
UpdateEndTime:'',
CompanyList: [],
productionDate: [],
loading: false,
......@@ -1889,11 +1897,13 @@ export default {
res => {
if (res.data.resultCode == 1) {
//console.log( res.data.data);
let data = res.data.data.pageData;
let data = res.data.data.pmodel.pageData;
// res.data.data.TotalRevenue
this.total = res.data.data.count;
this.SDate=res.data.data.StartDate;
this.EDate=res.data.data.NextDate;
this.total = res.data.data.pmodel.count;
this.SDate=res.data.data.pmodel.StartDate;
this.EDate=res.data.data.pmodel.NextDate;
this.UpdateStaus=res.data.data.Status;
this.UpdateStartTime=res.data.data.UpdateTime;
if (this.total == 0) {
this.DataList = [];
} else {
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 51b91b09
......@@ -179,7 +179,7 @@
<p class="rb_stit">
<span>{{BillSonName}}</span>
</p>
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?this.$t('fnc.no'):msg.OrderID}}</span></p>
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
<div class="rb_top_row _r_mb5">
<el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.gongzhang')}}</el-radio>
......@@ -203,8 +203,8 @@
</el-option>
</el-select>
<el-select filterable v-if="msg.ClientType==7" v-model='msg.IsLeader' :placeholder="$t('fnc.khmingcheng')" class="w135 _border_b_1">
<el-option :label='$t('fnc.zslingdui')' :value='1' :key='1'> </el-option>
<el-option :label='$t('fnc.lslingdui')' :value='0' :key='0'> </el-option>
<el-option :label='$t("fnc.zslingdui")' :value='1' :key='1'> </el-option>
<el-option :label='$t("fnc.lslingdui")' :value='0' :key='0'> </el-option>
</el-select>
<template v-if="msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3">
<el-select v-if="msg.IsLeader==1" filterable v-model='msg.ClientID' :placeholder="$t('fnc.khmingcheng')" @change="GetClientAccountList(msg.ClientID)" class="w135 _border_b_1">
......
src/components/Hotel/HotelInfo.vue
View file @ 51b91b09
......@@ -211,6 +211,7 @@
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<div class="imgzhe">
<div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
......@@ -251,6 +252,9 @@
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div>
</template>
<script>
......@@ -259,6 +263,11 @@ import googleMap from "../commonPage/googleMap.vue";
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
},
images: [],
//是否显示添加图片
addimg: false,
//地图选中地址
......@@ -443,6 +452,24 @@ export default {
this.HotelImageArray.splice(index, 1);
//this.updatePic();
},
inited (viewer){
this.$viewer = viewer
},
showImg: function (src) {
let srcArr = src.split('?')
src = srcArr[0]
let isExsit=false
this.images.forEach(x=>{
if(x===src)
isExsit=true
})
if(!isExsit) {
this.images.push(src)
} else {
this.$viewer.view(this.images.indexOf(src))
}
this.$viewer.show()
},
addImgOpen() {
this.addimg = true;
this.initimgList();
......
src/components/Restaurant/restaurantInfoManage.vue
View file @ 51b91b09
......@@ -858,6 +858,7 @@
<img v-if="!item" src="../../assets/img/bg_c3@3x.png">
<img :src="item.ShowPath" :onerror='defaultImg' />
<div class="imgzhe">
<div class="re-delte" ><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
......@@ -899,6 +900,9 @@
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('restaurantList')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
</div>
</template>
<script>
......@@ -908,6 +912,11 @@
export default {
data() {
return {
imageOptions:{
navbar:false,
title:false
},
images: [],
selectAddress: false,
addimg: false,
//图片选取数组
......@@ -1082,6 +1091,24 @@
this.addimg = true;
this.initimgList();
},
inited (viewer){
this.$viewer = viewer
},
showImg: function (src) {
let srcArr = src.split('?')
src = srcArr[0]
let isExsit=false
this.images.forEach(x=>{
if(x===src)
isExsit=true
})
if(!isExsit) {
this.images.push(src)
} else {
this.$viewer.view(this.images.indexOf(src))
}
this.$viewer.show()
},
saveResource() {
//保存餐厅信息
if (this.isBook) {
......
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ 51b91b09
......@@ -423,12 +423,6 @@ export default {
},
}, mounted() {
this.userId = this.getLocalStorage().EmployeeId;
// let obj = this.$route.query.item ? JSON.parse(this.$route.query.item) : ''
// this.item = obj
// this.orderId = this.msg.OrderID = obj.orderId ? obj.orderId : obj.OrderId
// this.tcnum = obj.tcnum ? obj.tcnum : obj.TCNUM
// this.tcid = obj.tcid ? obj.tcid : obj.TCID
// this.outBranchId = obj.outBranchId ? obj.outBranchId : obj.OutBranchId;
this.tcid= this.$route.query.TCID;
this.OutBranchId=this.$route.query.OutBranchId;
......
src/components/SalesModule/groupInquiry.vue
View file @ 51b91b09
......@@ -490,7 +490,7 @@
<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>
</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="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>
......@@ -503,7 +503,12 @@
<div style="padding:10px 0">
<span class="RL-remarkTitle">名单:</span>
<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-else-if="childItem.VisaStatus===3" class="groupTourOrder_tickets_black" >{{childItem.GuestName}}</span>
<span v-else-if="childItem.VisaStatus===1" class="groupTourOrder_tickets_red" >{{childItem.GuestName}}</span>
</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
......@@ -520,7 +525,7 @@
<span v-if="item.VisaFinanceList.length===0">暂无数据</span>
</div>
</div>
<!-- <div class="TC_remarkContent">
<div class="TC_remarkContent">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle">OP对外备注：</div>
<div class="TCL_Content">{{item.OPRemark}}</div>
......@@ -533,7 +538,7 @@
<div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div>
</div>
</div> -->
</div>
</li>
</ul>
<div class="noData" v-show="queryMsg.noData">
......@@ -810,7 +815,7 @@ export default {
//航班配置
FlightState:0,
TCVisaStatus: '-1',
IsShowUnion:1,
IsShowUnion:0,
QueryType:1,//查询类型 1:签证
},
remarkMsg: {
......
src/components/SalesModule/groupTourOrder.vue
View file @ 51b91b09
......@@ -1500,7 +1500,7 @@
<th width="200">操作</th>
</tr>
<tr>
<td v-show="list.length==0" colspan="16" align="center">暂无数据</td>
<td v-show="list.length==0" colspan="17" align="center">暂无数据</td>
</tr>
<tbody v-for="(item,index) in list" :key="index">
<tr>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 51b91b09
......@@ -676,7 +676,7 @@
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
<el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
@click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">收入确认单
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ 51b91b09
......@@ -132,7 +132,6 @@
res => {
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res,'data');
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
......
src/components/VisaCenter/VisaApplicationDetails.vue
View file @ 51b91b09
......@@ -27,6 +27,7 @@
<el-dropdown-menu slot="dropdown" >
<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('visaT.v_Othervisas')}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>其他</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -34,7 +35,11 @@
{{$t('visa.v_gvisa')}}
<el-dropdown-menu slot="dropdown" >
<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>
<<<<<<< HEAD
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
=======
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>其他</el-dropdown-item>
>>>>>>> 292691f5f6e9626c70936d1e9ce1f153541b45b3
</el-dropdown-menu>
</el-dropdown>
</div>
......
src/components/administrative/positionManagement.vue
View file @ 51b91b09
......@@ -6,28 +6,29 @@
<div class="query-box">
<ul>
<li>
<span><em>岗位名称</em><el-input class='w210' v-model='msg.PostName'
<!-- 岗位名称 -->
<span><em>{{$t('adm.adm_gwname')}}</em><el-input class='w210' v-model='msg.PostName'
@keyup.enter.native="getList"></el-input></span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
<input type="button" @click="outerVisible = true,dialogTitle='新增岗位',layerShowIndex=1,getCompany()"
class="normalBtn" value="新增"/>
class="normalBtn" :value="$t('pub.addBtn')"/>
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th>岗位名称</th>
<th>更新时间</th>
<th width="250">操作</th>
<th>{{$t('adm.adm_gwname')}}</th>
<th>{{$t('adm.adm_gxtime')}}</th>
<th width="250">{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>{{item.PostName}}</td>
<td>{{item.UpdateTime}}</td>
<td>
<el-button-group>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button
@click="outerVisible = true,dialogTitle='修改岗位信息',getCompany(),getDerpartMent(),updateData(index,item.PostId)"
type="primary" icon="el-icon-edit"></el-button>
......@@ -38,7 +39,7 @@
<el-tooltip class="item" effect="dark" content="APP角色管理" placement="top-start">
<el-button @click="roleAllocation(item.PostId,2)" type="primary" icon="iconfont icon-user11"></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 @click="deleteData(item.PostId)" type="danger" icon="el-icon-delete"></el-button>
</el-tooltip>
</el-button-group>
......@@ -52,13 +53,13 @@
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<div v-if="this.layerShowIndex==1">
<el-form-item label="岗位名称" prop="PostName">
<el-form-item :label="$t('adm.adm_gwname')" prop="PostName">
<el-input class='w300' type="text" v-model="addMsg.PostName" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item label="是否应用分区" prop="IsUseSubarea">
<el-select v-model="addMsg.IsUseSubarea" placeholder="请选择">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
<el-form-item :label="$t('adm.adm_ynyyfenqu')" prop="IsUseSubarea">
<el-select v-model="addMsg.IsUseSubarea" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.yes')" value="1"></el-option>
<el-option :label="$t('pub.no')" value="2"></el-option>
</el-select>
</el-form-item>
</div>
......@@ -67,9 +68,9 @@
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取 消</button> &nbsp;
<button v-if="this.layerShowIndex==1" class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button>
<button v-if="this.layerShowIndex==2" class="normalBtn" type="primary" @click="updateRole()">保存</button>
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button v-if="this.layerShowIndex==1" class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button v-if="this.layerShowIndex==2" class="normalBtn" type="primary" @click="updateRole()">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
......@@ -106,8 +107,8 @@
Status: 0,
},
rules: {
PostName: [{required: true,message: '请输入岗位名称',trigger: 'blur'}],
IsUseSubarea: [{required: true,message: '请选择是否应用分区',trigger: 'blur'}]
PostName: [{required: true,message: this.$t('adm.adm_qsrgwname'),trigger: 'blur'}],
IsUseSubarea: [{required: true,message: this.$t('adm.adm_qxzsfyyfenqu'),trigger: 'blur'}]
},
addMsg: {
PostId: '-1',
......
src/components/busManagement/BusInfo.vue
View file @ 51b91b09
This diff is collapsed.
src/components/busManagement/busStatistics.vue
View file @ 51b91b09
......@@ -153,7 +153,7 @@
</div></td>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div class="w100 link">
<span @click="goUrlX('BusInfo',outItem,'车配信息')">详情</span>
<span @click="goUrlX('BusInfo',item,outItem,'车配信息')">详情</span>
<span @click="DownLoadFile(item,outItem.NewCombinationNum)">下载</span>
</div>
</td>
......@@ -291,14 +291,28 @@ totalPrice+=busInfo.CostPrice*(Number(busInfo.TransferNum)+1)*PeopleNum;
}
);
},
goUrlX(path,obj,title){
console.log(obj);
//
let TotalSeat=0;
obj.StaticsReportList.forEach(outItem=>{
TotalSeat+=outItem.CommonReport.HouseStatistics.RealityNum;
});
this.$router.push({ name:path,query:{"TCID":obj.TCIDs,TotalNumber:TotalSeat,blank:'y',tab:title}})
goUrlX(path, obj,outItem,title){
this.$router.push({
name: path,
query: {
"TCID": obj.TCIDS,
StartDate: obj.StartDateStr,
DayNum: obj.DayNum,
TotalNumber: obj.TotalSeat, //机位总数
RealityYSeatNum:obj.CommonReport.HouseStatistics.RealityYSeatNum,
RealityESeatNum:obj.CommonReport.HouseStatistics.RealityESeatNum,
RealityFSeatNum:obj.CommonReport.HouseStatistics.RealityFSeatNum,
LeaderName:obj.LeaderName,
GuideName:obj.GuideName,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
title:obj.Titles,
TCNUMS:obj.TCNUMS,
InOut:obj.InOut,
RealityNum:obj.CommonReport.HouseStatistics.RealityNum,
tab: title
}
})
},
goUrlR(path,obj,title){
this.$router.push({ name:path,query:{"ID":obj,blank:'y',tab:title}})
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 51b91b09
......@@ -127,7 +127,7 @@
<td>{{ds.StopoverName}}</td>
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5" style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
<el-button slot="reference" class="normalBtn mt5 restaurantDetails" style='height:20px; padding: 0 8px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
</el-popover>
</div>
</td>
......@@ -233,24 +233,32 @@
<td>
<div class="w250">
<el-button-group>
<el-button @click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary" style="background:#00C6FF; border-color:#00C6FF">收付款</el-button>
<el-tooltip class="item" effect="dark" content="收付款" placement="top-start">
<el-button icon="iconfont icon-shoufukuan" @click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary" style="background:#00C6FF; border-color:#00C6FF"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top-start">
<el-popover placement="bottom" width="300" trigger="click">
<el-input class='mt10' v-model='remarkString' type='textarea'></el-input>
<p class="alcenter mt10">
<input type="button" value="保存" @click="saveRemark" class="normalBtn" />
</p>
<el-button type="primary" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;">添加备注</el-button>
<el-button type="primary" icon="iconfont icon-beizhu" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;"></el-button>
</el-popover>
<br/>
<el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="联系OP" placement="top-start">
<el-button @click='openChart(item)' icon="iconfont icon-dianhua" type="primary" style="background:#6DD875; border-color:#6DD875"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="地接团号" placement="top-start">
<el-popover placement="bottom" width="300" trigger="click">
<el-input class='mt10' v-model='NumObj.DMCNum' type='textarea'></el-input>
<p class="alcenter mt10">
<input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
</p>
<el-button type="primary" slot="reference" @click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;">地接团号</el-button>
<el-button type="primary" icon="iconfont icon-jituan" slot="reference" @click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;"></el-button>
</el-popover>
</el-tooltip>
</el-button-group>
</div>
</td>
......@@ -520,6 +528,10 @@
</script>
<style>
.restaurantDetails{
color:#fff!important;
margin-bottom:5px;
}
.dmcTotalSplitTrCss td {
background: #eee !important;
}
......
src/components/index.vue
View file @ 51b91b09
......@@ -761,6 +761,18 @@
</div>
</el-dialog>
<a class="weOytour" ref="weOytour" href="http://we.oytour.com:8110/" target="view_window">Preface</a>
<div v-show="mazip==0" id="downzip">
<div>
<div>
<a href="https://reborndev.oss-cn-hangzhou.aliyuncs.com/IM/%E9%BA%A6%E5%AD%90%E5%8A%A9%E6%89%8B.exe">
<img @click="CloseZip" src="../assets/img/mzzip.png" alt="">
</a>
<img @click="CloseZip" class="close" src="../assets/img/close.png" alt="">
</div>
</div>
</div>
</div>
</template>
......@@ -785,6 +797,7 @@ export default {
},
data() {
return {
mazip:sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : 0,
language:'zh-CN',
douTimer:null,
defaultHeadImg:
......@@ -1333,6 +1346,10 @@ export default {
}
},
methods: {
CloseZip(){
this.mazip=1;
sessionStorage.setItem("mazip",1);
},
ChangeLan(str){
this.language=str;
this.$i18n.locale = str;
......@@ -3196,6 +3213,36 @@ export default {
@import "../assets/css/main.less";
@import "../assets/css/cssReset.css";
@import "../assets/css/message.css";
#downzip{
width: 100%;
height: 100%;
position: fixed;
background: rgba(0,0,0,0.3);
top: 0;
left: 0;
z-index: 2000;
display: table;
}
#downzip>div{
display: table-cell;
vertical-align: middle;
margin-top: 200px;
}
#downzip>div>div{
width:285px;
height: 260px;
margin: 0 auto;
position: relative;
cursor: pointer;
}
.close{
position: absolute;
top: 0;
right: 0px;
width: 25px;
height: 25px;
}
.changelanguage{
width:124px;
}
......
src/plug/index.js
View file @ 51b91b09
......@@ -247,7 +247,7 @@ export default {
//HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (this.$route.name.indexOf('login') === -1) {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1) {
let previousPathInfo = {
path: this.$route.name,
query: this.$route.query
......@@ -361,7 +361,7 @@ export default {
},
Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
if (this.$route.name.indexOf('login') === -1) {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1) {
let previousPathInfo = {
path: this.$route.name,
query: this.$route.query
......
src/router/config.js
View file @ 51b91b09
......@@ -1715,7 +1715,7 @@ export default {
name: 'groupInquiry',
component: resolve => require(['@/components/SalesModule/groupInquiry'], resolve),
meta: {
title: '团期查询'
title: '签证办理'
},
},{ // 签证中心 签证财务单据
path: '/VisaFinancialDocuments',
......
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