Skip to content

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

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 227153be 9d6500b2
Expand all Show whitespace changes
Inline Side-by-side
Showing with 438 additions and 1062 deletions
src/assets/common/lang/zh.js
View file @ 8d1adbdb
......@@ -254,8 +254,6 @@ export const admin={ //行政
admin_lnLoginPwd:'请输入登录密码',
admin_Department:'部门',
admin_Post:'岗位',
admin_xueli:'学历',
admin_Entrytime:'入职时间',
admin_Departuretime:'离职时间',
......@@ -266,9 +264,6 @@ export const admin={ //行政
admin_Bindingposition:'绑定岗位',
admin_sort:'排序',
admin_level:'级',
}
//zk
export const hotel = {
......@@ -1052,6 +1047,47 @@ export const fnc = {
khyuanbi: '（原币）',
khbweibi: '（本位币）',
jylshuihao: '交易流水号',
shzhuangtai: '审核状态',
yjdanju: '佣金单据',
mbleixing: '模板类型',
djleixing: '单据类型',
yingshou: '应收',
yingfu: '应付',
shishou: '实收',
shifu: '实付',
zjdiaobo: '资金调拨',
tuanqi: '团期',
hkriqi: '汇款日期',
fybumen: '费用部门',
zdrenyuan: '制单人员',
zhleixing: '账户类型',
sfkzhanghu: '收付款账户',
dxleixing: '对象类型',
ddbianhao: '订单编号',
bzleixing: '币种类型',
djjine: '单据金额',
zdriqi: '制单日期',
spriqi: '审批日期',
gjchaxun: '高级查询',
piltijiao: '批量提交',
gzweituo: '工作委托',
shoukuan: '收款',
fukuan: '付款',
duixiang: '对象',
dqzhuangtai: '当前状态',
gnjpqishu: '国内票务期数',
qzbianhao: '签证编号',
tsbianhao: '投诉编号',
smjpbianhao: '散卖机票编号',
chakan: '查看',
shenhe: '审核',
zhuanjiao: '转交',
tzjyriqi: '调整交易日期',
xzzjiaoren: '选择转交人',
zhuanjiaoren: '转交人',
yjyriqi: '原交易日期',
cwbaobiao: '财务报表',
shuoming:'说明',
}
export const tips = {
tips: '提示',
......@@ -1109,6 +1145,8 @@ export const tips = {
qzcpbianhao: '签证产品编号',
qishu: '期数',
jiaoyifangshi: '交易方式',
zwtqxinxi: '暂无团期信息',
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1205,7 +1243,6 @@ export const rule = {
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
......@@ -1215,8 +1252,11 @@ export const rule = {
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
qxzzjiaoren: '请选择转交人',
qtxzjbeizhu: '请填写转交备注',
qxztzhdjyriqi: '请选择调整后的交易日期',
qtxshuoming: '请填写说明',
qxzygxytjddanju: '请选择一个需要提交的单据！'
}
export const adm={
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 8d1adbdb
......@@ -903,16 +903,6 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YouHui",
formatter: this.moneyFormat,
title: "优惠",
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "DaiShou",
formatter: this.moneyFormat,
......@@ -1012,16 +1002,6 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "BaoXian",
title: "保险费",
formatter: this.moneyFormat,
width: 100,
titleAlign: "left",
columnAlign: "left",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "QiTa",
formatter: this.moneyFormat,
......@@ -1514,7 +1494,6 @@ export default {
"实收金额",
"退款",
"平台税金",
"优惠金额",
"待收金额",
"溢收金额",
"人数",
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 8d1adbdb
......@@ -286,7 +286,6 @@
</el-radio-group>
</div>
</div>
</div>
<div class="approval_page_layer_bottom">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="closeLayer" /> &nbsp;&nbsp;
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 8d1adbdb
......@@ -104,18 +104,6 @@
</el-option>
</el-select>
</div>
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="danger" icon="el-icon-upload2">
<!-- <i class="el-icon-plus avatar-uploader-icon" @click="ClickItem=item"></i> -->
<div class="el-upload__text" @click="ClickItem=item">点击上传</div>
</el-button>
</el-upload>
<div class="RoomfileList" v-for="(subItem,subIndex) in item.ContractUrlArray" v-if="item.ContractUrlArray!=null && item.ContractUrlArray.length>0">
<p title="点击下载" @click="downLoadPZ(subItem)" style="cursor: pointer;">{{ '附件' + (index + 1)}}</p>
<span>
<i class="iconfont icon-close" @click="deleteFile(item,subIndex)"></i>
</span>
</div>
</td>
<td>
<div class="w80">
......@@ -225,26 +213,10 @@
CreateByAccount: '',
//创建人姓名
CreateByName: '',
//点击项
ClickItem: {},
}
},
methods: {
//联系op
downLoadPZ: function (src) {
let dom = document.querySelector("#blankLink")
dom.href=src
dom.click()
},
//删除
deleteFile(item,index){
item.ContractUrlArray.splice(index,1);
var str = "";
item.ContractUrlArray.forEach(subItem => {
str += subItem + ",";
})
item.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
},
openChart() {
this.MsgBus.$emit('openChat', {
account: this.CreateByAccount,
......@@ -293,15 +265,11 @@
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
this.list.forEach(item => {
this.calculationPrice(item);
this.calculationPrice(item)
item.hotelList.push({
Name: item.NewHotelName,
ID: item.NewHotelId
})
item.ContractUrlArray = [];
if (item.ContractUrl && item.ContractUrl != '') {
item.ContractUrlArray = item.ContractUrl.split(',');
}
item.PayStyle = item.PayStyle.toString()
item.OrderDetailsList.forEach((x, index1) => {
if (x.HouseTypeCount <= 0) {
......@@ -313,22 +281,22 @@
x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString();
})
if (item.ReserveNo == '' || item.ReserveNo == null) {
if(item.ReserveNo==''||item.ReserveNo==null){
item.ReserveNo = this.$route.query.NewCombinationNum;
}
})
} else {
this.$message.error(res.data.message);
this.$message.error(res.data.message)
}
}, err => {})
},
calculationPrice(obj) {
let totalPrice = 0;
let totalPrice = 0
obj.OrderDetailsList.forEach(item => {
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100)
})
obj.TotalPrice = totalPrice.toFixed(2);
this.$forceUpdate();
obj.TotalPrice = totalPrice.toFixed(2)
this.$forceUpdate()
},
getHotelList(obj) {
this.apipost('hotel_post_GetLineHotelList', {
......@@ -337,32 +305,32 @@
QCity: obj.QCity
}, res => {
if (res.data.resultCode == 1) {
obj.hotelList = res.data.data;
obj.hotelList = res.data.data
} else {
this.$message.error(res.data.message);
this.$message.error(res.data.message)
}
}, err => {})
},
sendValue(obj) {
if (obj.hotelList.length > 0) {
let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId);
obj.Address = ckedObj.Address;
obj.Tel = ckedObj.Tel;
obj.NewHotelName = ckedObj.Name;
let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId)
obj.Address = ckedObj.Address
obj.Tel = ckedObj.Tel
obj.NewHotelName = ckedObj.Name
} else {
obj.Address = '';
obj.Tel = '';
obj.Address = ''
obj.Tel = ''
}
},
saveList(type) {
if (type == 0) {
this.list.forEach(item => {
item.HotelOrderState = 0;
item.HotelOrderState = 0
})
}
if (type == 1) {
this.list.forEach(item => {
item.HotelOrderState = 1;
item.HotelOrderState = 1
})
}
this.list.forEach(x => {
......@@ -374,10 +342,9 @@
})
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.getList();
this.Success(res.data.message);
this.Success(res.data.message)
} else {
this.Error(res.data.message);
this.Error(res.data.message)
}
}, err => {})
},
......@@ -386,33 +353,13 @@
item.HotelOrderState = 1;
this.apipost('dmcstatistics_post_SetNewHotelOrder', item, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.Success(res.data.message)
} else {
this.Error(res.data.message);
this.Error(res.data.message)
}
}, err => {})
},
//合同上传
uploadFileBtn(file) {
if (file.file.size > 1024 * 1024 * 100) {
this.$message.warning("文件大小不能超过100M！");
return;
}
let newArr = [];
newArr.push(file.file);
let path = "/Upload/DMC/";
this.$message.info("上传中...");
this.UploadSelfFileT(path, newArr, x => {
var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.ClickItem.ContractUrlArray.push(fileUrl);
var str = "";
this.ClickItem.ContractUrlArray.forEach(subItem => {
str += subItem + ",";
})
this.ClickItem.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
});
},
}
},
mounted() {
this.TCNUM = this.$route.query.TCNUM;
......@@ -421,32 +368,8 @@
this.getList();
},
}
</script>
<style>
.RoomfileList{
width:100%;
height:20px;
text-align: center;
position: relative;
cursor: pointer;
}
.RoomfileList p{
display: inline-block;
}
.RoomfileList i:hover{
color:#E95252;
}
.roomReservationsDetailsTalbe .el-button--small {
padding: 0 20px 0 10px;
margin-top: 10px;
height:28px;
line-height: 10px;
}
.roomReservationsDetailsTalbe .el-button--small i{
float: left;
margin-top:9px;
}
.roomReservationsDetailsTalbe .roomBtn {
color: #fff;
padding: 0 10px !important;
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 8d1adbdb
......@@ -315,7 +315,6 @@
this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
......
src/components/SalesModule/VisaFinancialDocuments.vue deleted 100644 → 0
View file @ 227153be
This diff is collapsed.
src/components/SalesModule/groupInquiry.vue
View file @ 8d1adbdb
This diff is collapsed.
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 8d1adbdb
......@@ -854,53 +854,6 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">保险费：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'保险费') || isExists(item.CostTypeList,'旅游责任险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr> </template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他：</div>
</div>
......@@ -916,7 +869,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
<tr v-if="NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1139,7 +1092,7 @@
gridData:[],
TCID: 0,
//数据列表
DataList: [],
DataList: "",
OutBranchId: 0,
ishowBtn: true,
CloseIncomeBtn: false,
......@@ -1241,7 +1194,7 @@
x.checked = false;
})
this.DataList = data;
console.log("resa",this.DataList)
// console.log("resa",this.DataList)
}
});
},
......
src/components/VisaCenter/addVisa.vue
View file @ 8d1adbdb
This diff is collapsed.
src/components/VisaCenter/seeVisa.vue
View file @ 8d1adbdb
This diff is collapsed.
src/components/administrative/departmentManagement.vue
View file @ 8d1adbdb
......@@ -226,20 +226,20 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_xueli')" prop="EmEducation">
<el-form-item :label="$t('adm.adm_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="$t('admin.admin_Entrytime')" prop="EmEntry">
<el-form-item label="入职时间" 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="$t('admin.admin_Departuretime')" prop="EmLeave">
<el-form-item label="离职时间" 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="$t('admin.admin_Birthday')" prop="EmBirthday">
<el-form-item label="生日" 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="$t('admin.admin_password')" prop="EmPassword">
<el-form-item label="密码" 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 type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')" />
@click="resetForm('addMsg1'),treeLayerShowUser=false"></input>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input>
<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="$t('admin.admin_departsort')" prop="Sort">
<el-form-item label="部门排序" 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="$t('admin.admin_isleader')" prop="IsLeader">
<el-form-item label='是否领队' 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="$t('admin.admin_Bindingposition')" prop="PostIdArr">
<el-form-item label="绑定岗位" 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">{{$t('admin.admin_Bindingposition')}}</th>
<th>{{$t('admin.admin_sort')}}</th>
<th width="300">绑定岗位</th>
<th>排序</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}}{{$t('admin.admin_level')}}</td>
<td>{{item.Tier}}级</td>
<td>{{item.DepartmentManagerName}}</td>
<td>{{item.DepartmentTel}}</td>
<td>{{item.PostName}}</td>
......
src/components/busManagement/BusInfo.vue
View file @ 8d1adbdb
......@@ -706,12 +706,12 @@ export default {
getBeforeInfo(index){
let oldPlanData = this.PlanTableData[index-1];
let newPlanData = this.PlanTableData[index];
// newPlanData.PlanDateStr = oldPlanData.PlanDateStr;
// newPlanData.HotelName = oldPlanData.HotelName;
// newPlanData.IsHavearking = oldPlanData.IsHavearking;
// newPlanData.AirportPickUp = oldPlanData.AirportPickUp;
// newPlanData.UseType = oldPlanData.UseType;
// newPlanData.UseTime = oldPlanData.UseTime;
newPlanData.PlanDateStr = oldPlanData.PlanDateStr;
newPlanData.HotelName = oldPlanData.HotelName;
newPlanData.IsHavearking = oldPlanData.IsHavearking;
newPlanData.AirportPickUp = oldPlanData.AirportPickUp;
newPlanData.UseType = oldPlanData.UseType;
newPlanData.UseTime = oldPlanData.UseTime;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.DriverName = oldPlanData.DriverName;
newPlanData.DriverTel = oldPlanData.DriverTel;
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 8d1adbdb
......@@ -220,7 +220,6 @@
this.apipost('dmcstatistics_get_SetTicketOrder', this.list, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
} else {
this.$message.error(res.data.message);
}
......
src/plug/index.js
View file @ 8d1adbdb
......@@ -119,8 +119,6 @@ export default {
let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.65:8025"; //214主域名
domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.0.119:8082";
// domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......
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