Skip to content

S
SuperMan
Commit 725ef356 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 0608d92a fd3564d5
Hide whitespace changes
Inline Side-by-side
Showing with 295 additions and 48 deletions
src/assets/common/lang/EN/fill.js
View file @ 725ef356
......@@ -8160,6 +8160,9 @@ export const obj = {
lianmeng: 'Union ',
fanyongjefw: 'Rebate Transaction Amount Range ',
qingxuanzbohtg: 'Please select Pass or reject',
jinyinxkez: 'Business License',
faren: 'Legal person',
kaihuzhih: 'Opening Branch',
},
//#endregion
}
......
src/assets/common/lang/Japan/fill.js
View file @ 725ef356
......@@ -8160,6 +8160,9 @@ export const obj = {
lianmeng: '同盟」です',
fanyongjefw: '取引金額の範囲です',
qingxuanzbohtg: '通過または却下を選択します',
jinyinxkez: '経営許可証',
faren: '法人',
kaihuzhih: '口座開設します',
},
//#endregion
}
......
src/assets/common/lang/zhCN/fill.js
View file @ 725ef356
......@@ -8160,6 +8160,9 @@ export const obj = {
lianmeng: '联盟',
fanyongjefw: '返佣交易金额范围',
qingxuanzbohtg: '请选择通过或驳回',
jinyinxkez: '经营许可证',
faren: '法人',
kaihuzhih: '开户支行',
},
//#endregion
}
......
src/assets/common/lang/zhTW/fill.js
View file @ 725ef356
......@@ -8159,7 +8159,10 @@ export const obj = {
shenqinjsr: '申請結算日期',
lianmeng: '聯盟',
fanyongjefw: '返傭交易金額範圍',
qingxuanzbohtg: '請選擇通過或駁回'
qingxuanzbohtg: '請選擇通過或駁回',
jinyinxkez: '經營許可證',
faren: '法人',
kaihuzhih: '開戶支行'
},
//#endregion
}
......
src/components/FinancialModule/TradeCommission/YNTicketDetails.vue
View file @ 725ef356
......@@ -131,7 +131,8 @@
<td>{{item.UserName}}</td>
<td>{{item.LineName}}</td>
<td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
<td><span class="cursor-p" :style="{'color': '#409EFF'}">{{item.Rate?item.Rate+'/'+$t('hotel.hotel_people'):'-'}}</span></td>
<td v-if="item.OrderType==5"><span class="cursor-p" :style="{'color': '#409EFF'}">{{$t('objFill.lirunbi')}}10%</span></td>
<td v-else><span class="cursor-p" :style="{'color': '#409EFF'}">{{item.Rate?item.Rate+'/'+$t('hotel.hotel_people'):'-'}}</span></td>
<td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
<td>{{item.WaitCommissionMoney?item.WaitCommissionMoney:'-'}}</td>
<td><span v-if="item.IssueNum<3" style="padding-left:5px;color:blue;cursor: pointer;text-decoration: underline;" @click="goUrlUser('YNTradeTicketDetails',item)">{{$t('tips.di')}}{{item.IssueNum}}{{$t('objFill.v101.FinancialModule.citicheng')}}</span>
......
src/components/TravelContractNew.vue
View file @ 725ef356
......@@ -21,6 +21,7 @@
padding-top: 10px;
}
.TC-MainContent .fixedMenu li {
padding: 5px 15px;
position: relative;
......@@ -326,7 +327,8 @@
{{$t('pub.saveBtn')}}</el-button>
</template>
<template v-if="CurrentUserInfo.EmployeeId == 615">
<el-button type="primary" size="medium" @click="submitForm('CtObj')" :loading="SaveLoading">{{$t('pub.saveBtn')}}(S)</el-button>
<el-button type="primary" size="medium" @click="submitForm('CtObj')" :loading="SaveLoading">
{{$t('pub.saveBtn')}}(S)</el-button>
</template>
</div>
</div>
......@@ -1044,7 +1046,9 @@
</tr>
<tr>
<td colspan="5" class="TC_LASTTD" contenteditable="true">
<div style="color: red">
注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
</div>
<template v-if="CtObj.TeamType == 2">
<div>
{{$t('pub.pubRemark')}}：<br />
......@@ -1205,7 +1209,8 @@
v-if="item.IsShow == 0">
<el-button type="primary" icon="el-icon-edit" circle @click="item.IsShow = 1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow == 1">
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow == 1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="item.IsShow = 0"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
......@@ -1285,7 +1290,8 @@
v-if="item.IsShow == 0">
<el-button type="primary" icon="el-icon-edit" circle @click="item.IsShow = 1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start" v-if="item.IsShow == 1">
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"
v-if="item.IsShow == 1">
<el-button type="primary" icon="iconfont icon-baocun" circle @click="item.IsShow = 0"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
......
src/components/administrative/AllianceContract.vue
View file @ 725ef356
......@@ -175,7 +175,7 @@
@change="getCustomer(1)"
class="">
<el-option v-for='item in CustomerList'
:label='item.CustomerName+"("+item.ContactNumber+")"'
:label='item.CustomerName+"-"+item.Contact+"("+item.ContactNumber+")"'
:value='item.ID'
:key='item.ID'>
</el-option>
......@@ -398,16 +398,23 @@ export default {
this.dialogFormVisible = true
this.addType = 2
console.log(obj)
let list = obj.CustomerChildrenIds.split(',')
this.addMsg = {
...JSON.parse(JSON.stringify(obj)),
CustomerChildrenIds: obj.CllianceChildList.map(x=>{
return x.ID
}).join(','),
CustomerChildrenIdList: obj.CllianceChildList.map(x=>{
return x.ID
}),
CustomerChildrenIds: obj.CustomerChildrenIds,
CustomerChildrenIdList: [],
accountId: obj.ClientBankAccountId
}
list.forEach(item=>{
this.addMsg.CustomerChildrenIdList.push(Number(item))
})
let lists = this.CustomerList.filter(x=>{
return x.ID == this.addMsg.Id
})
if(lists.length>0){
this.addMsg.CustomerId = lists[0].CustomerId;
this.getAccountPageList()
}
},
ViewContract(item){
window.open(item.TravelAgency_SignAddress, '_blank');
......@@ -431,8 +438,6 @@ export default {
this.addMsg.CustomerId = list[0].CustomerId;
this.getAccountPageList()
}
this.addMsg.CustomerChildrenIds = ''
this.addMsg.CustomerChildrenIdList = []
this.addMsg.accountId = ''
this.addMsg.OpenBankName = '';
this.addMsg.AccountHolder = '';
......@@ -640,7 +645,7 @@ export default {
this.saveLoading = false
})
},
iniTAddMsg: function () {
iniTAddMsg() {
this.addMsg = {
Id: this.addMsg.Id,// 主账户信息（也就是customerId）
CustomerId: this.addMsg.CustomerId,
......
src/components/administrative/ElectronicAudit.vue
View file @ 725ef356
......@@ -398,11 +398,11 @@
center :before-close="closeContractDialog">
<el-row v-if="isBoHui>0" v-loading="inforLoading">
<el-col :span="24" class="shenheInfoBox">
<p class="shenheInfoTitle">公司名称:</p>
<p class="shenheInfoTitle">{{ $t('admin.admin_company') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.Tourists_Name }}</div>
</el-col>
<el-col :span="5" class="shenheInfoBox">
<p class="shenheInfoTitle">营业执照:</p>
<el-col :span="6" class="shenheInfoBox">
<p class="shenheInfoTitle">{{ $t('salesModule.BusinessLicense') }}:</p>
<div class="shenheInfoCenter">
<el-image
style="width: 20px; height: 20px"
......@@ -411,16 +411,16 @@
</el-image>
</div>
</el-col>
<el-col :span="13" class="shenheInfoBox">
<p class="shenheInfoTitle">经营许可证:</p>
<el-col :span="11" class="shenheInfoBox">
<p class="shenheInfoTitle">{{ $t('objFill.v102.jinyinxkez') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.Tourists_Email }}</div>
</el-col>
<el-col :span="6" class="shenheInfoBox shenheInfoBoxR">
<p class="shenheInfoTitle">法人:</p>
<el-col :span="7" class="shenheInfoBox">
<p class="shenheInfoTitle">{{ $t('objFill.v102.faren') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.LegalPersonName }}</div>
</el-col>
<el-col :span="5" class="shenheInfoBox">
<p class="shenheInfoTitle">身份证:</p>
<el-col :span="6" class="shenheInfoBox">
<p class="shenheInfoTitle">{{ $t('objFill.shengfenzheng') }}:</p>
<div class="shenheInfoCenter">
<el-image
style="width: 20px; height: 20px"
......@@ -434,28 +434,28 @@
</el-image>
</div>
</el-col>
<el-col :span="12" class="shenheInfoBox">
<p class="shenheInfoTitle">身份证号:</p>
<el-col :span="11" class="shenheInfoBox">
<p class="shenheInfoTitle">{{ $t('system.table_IDcard') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.LegalIdCardNumber }}</div>
</el-col>
<el-col :span="7" class="shenheInfoBox shenheInfoBoxR">
<p class="shenheInfoTitle">有效期:</p>
<el-col :span="7" class="shenheInfoBox">
<p class="shenheInfoTitle">{{ $t('objFill.youxiaoqi') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.LegalIdCardTime }}</div>
</el-col>
<el-col :span="8" class="shenheInfoBox">
<p class="shenheInfoTitle">开户支行:</p>
<el-col :span="6" class="shenheInfoBox">
<p class="shenheInfoTitle">{{ $t('objFill.v102.kaihuzhih') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.OpenBankName }}</div>
</el-col>
<el-col :span="11" class="shenheInfoBox ">
<p class="shenheInfoTitle">所属银行:</p>
<p class="shenheInfoTitle">{{ $t('objFill.v102.suoshuyinh') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.BankName }}</div>
</el-col>
<el-col :span="5" class="shenheInfoBox shenheInfoBoxR">
<p class="shenheInfoTitle">开户人:</p>
<el-col :span="7" class="shenheInfoBox">
<p class="shenheInfoTitle">{{ $t('fnc.khuren') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.AccountHolder }}</div>
</el-col>
<el-col :span="24" class="shenheInfoBox">
<p class="shenheInfoTitle">卡号:</p>
<p class="shenheInfoTitle">{{ $t('objFill.kaihao') }}:</p>
<div class="shenheInfoCenter">{{ ContractInfor.CardNum }}</div>
</el-col>
</el-row>
......@@ -476,7 +476,7 @@
<tr>
<td width="100" align="right">{{$t('objFill.v102.youxiaoqks')}}：</td>
<td>
<el-date-picker v-model="BoHuiObj.C_StartDate" style="width: 100%;"
<el-date-picker v-model="BoHuiObj.StartDateStr" style="width: 100%;"
format="yyyy-MM-dd" type="date"
value-format="yyyy-MM-dd"
:picker-options="pickerBeginDateBefore3" :clearable="false">
......@@ -486,7 +486,7 @@
<tr>
<td width="100" align="right">{{$t('objFill.v102.youxiaoqjs')}}：</td>
<td>
<el-date-picker v-model="BoHuiObj.C_EndDate" style="width: 100%;"
<el-date-picker v-model="BoHuiObj.EndDateStr" style="width: 100%;"
format="yyyy-MM-dd" type="date"
value-format="yyyy-MM-dd"
:picker-options="pickerBeginDateAfter3" :clearable="false">
......@@ -615,10 +615,10 @@
},
pickerBeginDateBefore3: {
disabledDate: time => {
if (this.BoHuiObj.C_EndDate == null) {
if (this.BoHuiObj.EndDateStr == null) {
return false;
} else {
let endTime = new Date(this.BoHuiObj.C_EndDate);
let endTime = new Date(this.BoHuiObj.EndDateStr);
return endTime.getTime() < time.getTime();
}
}
......@@ -637,8 +637,8 @@
},
BoHuiObj: {
C_DayNum: '',
C_StartDate: '',
C_EndDate: '',
StartDateStr: '',
EndDateStr: '',
C_NightNum: '',
},
isBoHui: 0, //是否是单项、一日游、境内旅游合同驳回
......@@ -707,8 +707,8 @@
closeContractDialog() {
this.BoHuiObj = {
C_DayNum: '',
C_StartDate: '',
C_EndDate: '',
StartDateStr: '',
EndDateStr: '',
C_NightNum: '',
}
this.isBoHui = 0;
......@@ -814,7 +814,6 @@
{ ContractId: item.ID },
res => {
if (res.data.resultCode === 1) {
console.log(res.data.data,'=====');
this.ContractInfor = res.data.data;
this.inforLoading = false
} else {
......@@ -831,10 +830,11 @@
if(!this.isBoHui) return this.Error(this.$t('objFill.v102.qingxuanzbohtg'));
}
var that = this;
if(status==2){
if(item.C_DayNum==''||item.C_StartDate==''||item.C_EndDate==''
||item.C_NightNum==''||!item.C_NightNum
||item.C_NightNum==null){
if(item.CType==4&&status==2){
if(item.C_DayNum==''||!item.C_DayNum||item.C_DayNum==null
||item.StartDateStr==''||!item.StartDateStr||item.StartDateStr==null
||item.EndDateStr==''||!item.EndDateStr||item.EndDateStr==null
||item.C_NightNum==''||!item.C_NightNum||item.C_NightNum==null){
this.Error(this.$t('objFill.v102.hetongdhbts'));
return;
}
......
src/components/systemManagement/CashierBankStatImport.vue 0 → 100644
View file @ 725ef356
<style>
.currentManage ._vMG_edit{overflow: auto;display: none;position:absolute;font-family: 'PingFangSc-Fine';bottom:0;left: 0;border-top:1px solid #d1d1d1;background-color:#FFFFFF;padding: 10px;width: 100%;}
.currentManage ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000}
.currentManage ._vMG_edit ._tit span{color: #666666;font-size: 14px;}
._edHeight{height:400px;}
.edHeight{display: block !important;height: 230px;}
._scrollbar::-webkit-scrollbar{width: 4px;height: 8px;}
._scrollbar::-webkit-scrollbar-thumb{border-radius: 4px;box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);background: #c9c9c9;}
._scrollbar::-webkit-scrollbar-track{box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
.currentManage ._info_box ul{margin-top: 15px}
.currentManage ._info_box ul li{float: left; width: 250px;}
.currentManage .po_content{
border-collapse: collapse;
}
.currentManage .po_content{
width: 100%;
}
.currentManage .po_content tr:first-child{
font-size: 12px;
color: #666666;
background-color: #DCDCDC;
}
.currentManage .po_content tr th,.currentManage .po_content tr td{
padding: 10px 20px;
text-align: left;
}
.currentManage .po_content tr td{
color: #333333;
font-size: 14px;
border:1px solid #E6E6E6;
}
.currentManage .po_content tr td .iconfont{
font-size: 14px;
padding: 4px;
}
.RoomMealImport .query-box .iconfont{
cursor: pointer;
background-color: #E95252;
color: white;
width: 30px;
height: 30px;
display: inline-block;
text-align: center;
line-height: 30px;
border-radius: 50%;
margin-left: 10px;
}
.currentManage ._yuan{
width:12px;
height:12px;
background:rgba(233,82,82,1);
border-radius:50%;
display: inline-block;
}
.currentManage ._yuan._yuan_red{
background:#47BF8C;
}
.RoomMealImport .picload{
width: 138px;
height: 92px;
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.RoomMealImport .picload .el-upload{
width: 138px;
height: 92px;
}
.RoomMealImport .picload .el-upload-dragger{
width: 100%;
height: 100%;
}
.RoomMealImport ._addUpload_box>div{
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210,210,210,1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.RoomMealImport ._addUpload_box .icon-excel, .RoomMealImport ._addUpload_box .icon-pdf{
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
.RoomMealImport ._addUpload_box .icon-guanbi1{
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
</style>
<template>
<div class="flexOne currentManage RoomMealImport">
<div>
<ul style="margin:10px 0;text-align:right">
<li>
<el-button class="hollowFixedBtn" @click="outerVisible=true">导入银行流水</el-button>
</li>
</ul>
</div>
<div class="cm_content _scrollbar">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6; width: 500px;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<td>期初余额</td>
<td>{{Data.StartMoney}}</td>
<td></td>
<td></td>
</tr>
<tr>
<td>用途</td>
<td>求和项:收入</td>
<td>求和项:支出</td>
<td></td>
</tr>
<tr v-for="(item,index) in Data.RList" :key="index">
<td>{{item.Remark}}</td>
<td>{{(item.Income>0?item.Income:'')}}</td>
<td>{{(item.Refund>0?item.Refund:'')}}</td>
<td></td>
</tr>
<tr>
<td>(空白)</td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td>总计</td>
<td>{{Data.TIncome}}</td>
<td>{{Data.TRefund}}</td>
<td>{{Data.EndMoney}}</td>
</tr>
</table>
</div>
<el-dialog custom-class='w700' :title="$t('objFill.v101.daoruygsj')" :visible.sync="outerVisible" center>
<el-upload :show-file-list="false" style="text-align: center;" drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
<i class="el-icon-upload"></i>
<div class="el-upload__text">{{$t('tips.tuodongwenjian')}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
</el-upload>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
outerVisible:false,
loading:false,
importFileUrl2: "",
Data:{
StartMoney:'',
RList:[],
TIncome:'',
TRefund:'',
EndMoney:''
}
}
},created(){
let userInfo = this.getLocalStorage();
this.importFileUrl2=this.domainManager().UploadFileUrl +"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=24&SystemType=1&EmployeeId="+userInfo.EmployeeId;
},
mounted(){
},
methods: {
beforeAvatarUpload(file) {
return;
},
//上传
handleAvatarSuccess(res, file) {
if (res.resultCode == 1) {
this.Success(this.$t('objFill.v101.FinancialModule.daoruchengg'));
this.outerVisible = false;
this.Data = res.data;
}else{
this.Error(res.message);
}
}
},
}
</script>
src/components/systemManagement/Manfunds.vue
View file @ 725ef356
......@@ -200,6 +200,7 @@
<button class="hollowFixedBtn" @click="outerVisible=true">{{$t('objFill.daoru')}}</button>
<a class="hollowFixedBtn downBtn" style="padding:6px 9px;" :href="downList">{{$t('objFill.v101.FinancialModule.daorumobxz')}}</a>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
<button class="normalBtn" @click="GoBankStat()">流水即时汇总</button>
</li>
</ul>
</div>
......@@ -471,6 +472,14 @@
}
})
},
GoBankStat(){
this.$router.push({
name: "CashierBankStatImport",
query: {
blank: 'y'
}
})
},
beforeAvatarUpload(file) {
return;
const isJPG = file.type === "application/x-msdownload";
......
src/router/config.js
View file @ 725ef356
......@@ -1375,6 +1375,14 @@ export default {
title: '汇差批量制单'
},
},
{
path: '/CashierBankStatImport', //银行流水汇总
name: 'CashierBankStatImport',
component: resolve => require(['@/components/systemManagement/CashierBankStatImport'], resolve),
meta: {
title: '银行流水汇总'
},
},
{
path: '/Maninfo', //未认款信息
name: 'Maninfo',
......
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