Skip to content

S
SuperMan
Commit 1c2a393e authored by youjie's avatar youjie
Browse files
Options

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

parents 1ec92098 d9a41de7
Hide whitespace changes
Inline Side-by-side
Showing with 389 additions and 80 deletions
src/assets/common/lang/en.js
View file @ 1c2a393e
......@@ -1316,6 +1316,7 @@ export const fnc = {
a_hkfkshijian: 'Remittance time/payment time',
a_dhuanlv: 'Exchange rate',
a_rminbi: 'RMB',
a_ynd:"Rupiah",
a_qcyue: 'Opening balance',
a_fkshijian: 'Payment time',
a_heji: 'Total',
......
src/assets/common/lang/jp.js
View file @ 1c2a393e
......@@ -1262,6 +1262,7 @@ export const fnc = {
a_hkfkshijian:'送金時間/支払時間',
a_dhuanlv:'為替レート',
a_rminbi:'人民元',
a_ynd:"インドネシア盾",
a_qcyue:'期首残高',
a_fkshijian:'支払い時間',
a_heji:'合計',
......
src/assets/common/lang/zh-tw.js
View file @ 1c2a393e
......@@ -1306,6 +1306,7 @@ export const fnc = {
a_hkfkshijian: '匯款時間/付款時間',
a_dhuanlv: '兌換率',
a_rminbi: '人民幣',
a_ynd:"印尼盾",
a_qcyue: '期初餘額',
a_fkshijian: '付款時間',
a_heji: '合計',
......
src/assets/common/lang/zh.js
View file @ 1c2a393e
......@@ -1319,6 +1319,7 @@ export const fnc = {
a_hkfkshijian: '汇款时间/付款时间',
a_dhuanlv: '兑换率',
a_rminbi: '人民币',
a_ynd:"印尼盾",
a_qcyue: '期初余额',
a_fkshijian: '付款时间',
a_heji: '合计',
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 1c2a393e
......@@ -1364,6 +1364,36 @@
</template>
</span>
</div>
<div style="display: flex;align-items: center;margin-top:15px;" v-if="is_financeShow && GetDetail.Type==2 && item.AuditDescription.indexOf('会计')!=-1">
<div style="display: flex;align-items: center;flex-grow: 1;">
<span style="font-size: 14px;">{{$t('objFill.xiugaidianfudx')}}：</span>
<div style="display: flex;flex-grow: 1;">
<el-select
v-model="AuditOrRefundMsg.KingdeeClientID" class="w135 _border_b_1"
filterable
remote
reserve-keyword
:placeholder="$t('pub.PleaseKeyWords')"
:remote-method="GetClientAccountListByKeyWord"
>
<el-option v-for='item in ClientKingdeeAccountList'
:label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
:value='item.ID'
:key='item.ID'>
<div>
<span>{{`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" v-if="item.Status==1">{{$t('pub.fressSel')}}</el-tag>
</span>
</div>
</el-option>
</el-select>
</div>
<div style="display: flex;flex-grow: 1;" v-if="GetDetail.AuditNumber!=''">
<span style="font-size: 24px;">{{GetDetail.AuditNumber}}</span>
</div>
</div>
</div>
<textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea"
v-model="AuditOrRefundMsg.Description" :placeholder="$t('pub.pleaseImport')+'...'"></textarea>
<div v-else-if="item.SpecialNode!==0&&AuditOrRefundMsg.Status=='5'">
......
src/components/FinancialModule/accDetail/AccountNewCollectingOrPay.vue
View file @ 1c2a393e
......@@ -414,13 +414,22 @@ export default {
return;
}
if(!(this.msg.RB_Branch_Id==1252&&(this.msg.HelpBranchId==0||this.msg.HelpBranchId==1218))){
this.Error('暂不支持生成结算单，请联系管理员');
return;
}
let TemplateId2=0;
if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==0){TemplateId2=35;}
// if(!(this.msg.RB_Branch_Id==1252&&(this.msg.HelpBranchId==0||this.msg.HelpBranchId==1218))){
// this.Error('暂不支持生成结算单，请联系管理员');
// return;
// }
let TemplateId2=35;let FBranchId=-1;
if(this.msg.RB_Branch_Id==0&&this.msg.HelpBranchId==1218){TemplateId2=35;FBranchId=1218;}
if(this.msg.RB_Branch_Id==1218&&this.msg.HelpBranchId==0){TemplateId2=35;FBranchId=1218;}
if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==0){TemplateId2=35;FBranchId=1252;}
if(this.msg.RB_Branch_Id==1252&&this.msg.HelpBranchId==1218){TemplateId2=292;}
if(this.msg.RB_Branch_Id==0&&this.msg.HelpBranchId==1252){TemplateId2=35;FBranchId=1252;}
if(this.msg.RB_Branch_Id==1218&&this.msg.HelpBranchId==1252){TemplateId2=292;}
if(this.msg.RB_Branch_Id==1248||this.msg.HelpBranchId==1248){TemplateId2=289;FBranchId=1248;}
if(this.msg.RB_Branch_Id==1220||this.msg.HelpBranchId==1220){TemplateId2=285;FBranchId=1220;}
let ids = this.DataList.filter(citem => citem.check).map(x=>{ return x.FrID})
this.$router.push({
......@@ -428,6 +437,7 @@ export default {
query: {
'settlementFrIds': ids.join(','),
'IsAirTicketSelect': TemplateId2,
'settlementBranchId':FBranchId,
'tab': '新增资金调拨',
'blank': "y"
}
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 1c2a393e
......@@ -506,6 +506,9 @@ export default {
if(this.$route.query.IsAirTicketSelect){
this.msg.IsAirTicketSelect=this.$route.query.IsAirTicketSelect;
}
if(this.$route.query.settlementBranchId && this.$route.query.settlementBranchId>0){
this.msg.RB_Branch_Id=this.$route.query.settlementBranchId;
}
}
if(this.$route.query.frIds){
......
src/components/Hotel/HotelSalesBoard.vue
View file @ 1c2a393e
......@@ -208,7 +208,7 @@
}
.hotelSalesBoard .stock2 {
color: white;
color: green;
}
/* 日期样式结束*/
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 1c2a393e
......@@ -2374,6 +2374,7 @@
//获取TCID
clickAirticket(item) {
this.updateAirticketObj.TCID = item.TCID;
console.log(" this.updateAirticketObj",item.TCID, this.updateAirticketObj)
},
//开启散客机票
openAirticket() {
......@@ -2406,7 +2407,7 @@
tempMsg,
(res) => {
if (res.data.resultCode == 1) {
that.Success(this.$t("objFill.kaiqichenggong"));
that.Success(that.$t("objFill.kaiqichenggong"));
that.getControlList();
} else {
that.Error(res.data.data);
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 1c2a393e
......@@ -71,6 +71,7 @@
.comSearchDiv .el-checkbox {
margin-right: 0;
}
</style>
<template>
<div>
......@@ -785,6 +786,48 @@
{{item.TicketNum}}</span>
</el-popover>
</div>
<div class="TC_SeatList" v-if="CurrentUserInfo.RB_Group_id == 2">
<template v-if="item.CanSellTicketNum > 0">
<span style="color: rgb(71, 191, 140)">{{ $t("objFill.kesouskjp") }}&nbsp;
<span style="color: red; font-size: 14px; font-weight: 700">{{
item.CanSellTicketNum
}}</span>&nbsp;{{ $t("objFill.zhang") }} </span>&nbsp;&nbsp;
<a @click="closeAirticket(item.TCID)" :title="$t('objFill.dianjigbksjp')"
style="cursor: pointer; color: red; text-decoration: underline">{{ $t("pub.closeSel") }}</a>
</template>
<template v-if="item.CanSellTicketNum == 0">
<span style="color: red">{{ $t("objFill.yiguanbskjp") }}</span>&nbsp;&nbsp;
<el-popover width="300" trigger="click" popper-class="TC_customerInfo">
<table>
<tr>
<td style="width: 100px;text-align: right;height: 30px;line-height: 30px;">
{{ $t("objFill.kesoujpsl") }}:
</td>
<td style="text-align: left; height: 30px; line-height: 30px">
<el-input type="text" style="width: 100px; padding-left: 5px"
v-model="updateAirticketObj.CanSellTicketNum" maxlength="1" @keyup.native="
checkInteger(updateAirticketObj, 'CanSellTicketNum')
"></el-input>
</td>
</tr>
<tr>
<td colspan="2" style="text-align: center; height: 10px; line-height: 10px"></td>
</tr>
<tr>
<td colspan="2" style="text-align: center">
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')"
@click="openAirticket()" />
</td>
</tr>
</table>
<a slot="reference" :title="$t('objFill.dianjikqksjp')" @click="clickAirticket(item)" style="
cursor: pointer;
color: rgb(71, 191, 140);
text-decoration: underline;
">{{ $t("pub.openSel") }}</a>
</el-popover>
</template>
</div>
<template v-if="item.AuditStatus==1">
<span class="AuditRedType">{{$t('fnc.a_shezhong')}}</span>
</template>
......@@ -1403,6 +1446,11 @@
copyType: "",
CurrentTCNUM: "",
},
//更新可售机票数量
updateAirticketObj: {
TCID: 0,
CanSellTicketNum: 2,
},
saveLoading: false, //保存loading防止重复提交
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -1419,6 +1467,52 @@
};
},
methods: {
//获取TCID
clickAirticket(item) {
this.updateAirticketObj.TCID = item.TCID;
console.log(" this.updateAirticketObj", item.TCID, this.updateAirticketObj)
},
//开启散客机票
openAirticket() {
this.apipost(
"travel_post_SetCanSellTicketNumService",
this.updateAirticketObj,
(res) => {
if (res.data.resultCode == 1) {
this.Success(this.$t("objFill.kaiqichenggong"));
this.updateAirticketObj.TCID = 0;
this.updateAirticketObj.CanSellTicketNum = 2;
this.getControlList();
} else {
this.Error(res.data.data);
}
},
null
);
},
//关闭散客机票
closeAirticket(TCID) {
var that = this;
this.Confirm(that.$t("objFill.shifouygbksjp"), function () {
var tempMsg = {
TCID: TCID,
CanSellTicketNum: 0,
};
that.apipost(
"travel_post_SetCanSellTicketNumService",
tempMsg,
(res) => {
if (res.data.resultCode == 1) {
that.Success(that.$t("objFill.kaiqichenggong"));
that.getControlList();
} else {
that.Error(res.data.data);
}
},
null
);
});
},
CancelGroupType() {
this.GroupTypeVisible = false
this.GroupTypeObj = {}
......@@ -2502,4 +2596,5 @@
this.getControlList();
}
};
</script>
\ No newline at end of file
</script>
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 1c2a393e
......@@ -57,7 +57,7 @@
<div class="QuotationFirstDiv1">
<table style="font-size:14px;">
<tr>
<td width="80" class="txtRightCost">{{$t('objFill.v101.kaituants')}}</td>
<td width="80" class="txtRightCost">{{$t('objFill.v101.chutuanleix')}}</td>
<td width="300">
<template v-if="postConfig.TeamType==1">
<span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
......@@ -680,16 +680,39 @@
</td>
<td>
{{$t('objFill.tongyexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
({{$t('objFill.ribi')}})
</template>
<!--印尼印象-->
<template v-else-if="postConfig.OutBranchId==1252">
({{$t('fnc.a_ynd')}})
</template>
<template v-else>({{$t('fnc.a_rminbi')}})
</template>
</td>
<td>
{{$t('objFill.zhikexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
({{$t('objFill.ribi')}})
</template>
<!--印尼印象-->
<template v-else-if="postConfig.OutBranchId==1252">
({{$t('fnc.a_ynd')}})
</template>
<template v-else>({{$t('fnc.a_rminbi')}})
</template>
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
</template>
</template>
</td>
<td colspan="2">
......@@ -860,8 +883,11 @@
{{subItem.B2CSalePrice}}
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{subItem.JPYSalePrice}}
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{subItem.JPYSalePrice}}
</template>
</template>
</td>
<td colspan="2">
......@@ -875,7 +901,7 @@
</tr>
<tr>
<td class="CP_ComTitle2">{{$t('objFill.shenhebz')}}</td>
<td colspan="5">
<td colspan="3">
<template v-if="postConfig.OpAuditDate&&postConfig.OpAuditDate!='' ">
<p> {{postConfig.OPName}}：{{postConfig.OpAuditDate}}
<template v-if="postConfig.OpAuditStatus==1">
......@@ -912,6 +938,7 @@
{{postConfig.AuditContent}}
</p>
</template>
<template
v-if="postConfig.ChangeManagerAduitDate&&postConfig.ChangeManagerAduitDate!=''&&postConfig.ChangeManagerAduitName&&postConfig.ChangeManagerAduitName!=''">
<br />
......@@ -925,7 +952,7 @@
{{postConfig.ChangeManagerAduitContent}}
</p>
</template>
<template v-if=" postConfig.ChangeAduitDate&&postConfig.ChangeAduitDate!=''">
<template v-if="postConfig.ChangeAduitDate&&postConfig.ChangeAduitDate!=''">
<br />
<p>
{{postConfig.ChangeAuditByName}}：{{postConfig.ChangeAduitDate}}
......@@ -942,6 +969,39 @@
<el-input type="textarea" v-model="postConfig.CRemarks"></el-input>
</template>
</td>
<td class="CP_ComTitle2">
变更原因：
</td>
<td colspan="5">
<template v-for="(cItem,cIndex) in dayCostPrice">
<template
v-if="cItem.IsHotelChange||cItem.IsBusChange ||cItem.IsBreakfastChange||cItem.IsLunchChange||cItem.IsDinnerChange||cItem.IsScenicChange||cItem.IsOtherChange">
<p :key="cIndex">第{{cItem.DayNum}}天
<template v-if="cItem.IsHotelChange">
酒店：{{cItem.HotelChangeRemark}} (<font style="color:red">{{cItem.HotelChangeValue}}</font>)
</template>
<template v-if="cItem.IsBusChange">
车资：{{cItem.BusChangeRemark}} (<font style="color:red">{{cItem.BusChangeValue}}</font>)
</template>
<template v-if="cItem.IsBreakfastChange">
早餐：{{cItem.BreakfastChangeRemark}} (<font style="color:red">{{cItem.BreakfastChangeValue}}</font>)
</template>
<template v-if="cItem.IsLunchChange">
午餐：{{cItem.LunchChangeRemark}} (<font style="color:red">{{cItem.LunchChangeValue}}</font>)
</template>
<template v-if="cItem.IsDinnerChange">
晚餐：{{cItem.DinnerChangeRemark}} (<font style="color:red">{{cItem.DinnerChangeValue}}</font>)
</template>
<template v-if="cItem.IsScenicChange">
景点：{{cItem.ScenicChangeRemark}} (<font style="color:red">{{cItem.ScenicChangeValue}}</font>)
</template>
<template v-if="cItem.IsOtherChange">
其他费用：{{cItem.OtherChangeRemark}} (<font style="color:red">{{cItem.OtherChangeValue}}</font>)
</template>
</p>
</template>
</template>
</td>
<td colspan="3">
{{$t('objFill.dangqiantdlx')}}: <template v-if="postConfig.TeamTypeName=='小包团'">
<span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
......@@ -950,14 +1010,14 @@
{{postConfig.TeamTypeName}}
</template>
</td>
<td colspan="4">
<!-- <td colspan="4">
<el-form-item :label="$t('objFill.v101.gengctleix')">
<el-select class="multiple_input" v-model="postConfig.TeamType">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</td>
</td> -->
</tr>
<!--报价单审核-->
<tr v-if="IsEdit==2">
......@@ -1017,6 +1077,10 @@
changeOffer: changeOffer,
},
methods: {
//获取变更原因
getChangeRemark() {
},
//关闭弹窗
closeDialog() {
this.changMsg.isShowChangeOffer = false;
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 1c2a393e
......@@ -577,16 +577,40 @@
</td>
<td>
{{$t('objFill.tongyexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
({{$t('objFill.ribi')}})
</template>
<!--印尼印象-->
<template v-else-if="postConfig.OutBranchId==1252">
({{$t('fnc.a_ynd')}})
</template>
<template v-else>({{$t('fnc.a_rminbi')}})
</template>
</td>
<td>
{{$t('objFill.zhikexsjg')}}
<br />({{$t('fnc.a_rminbi')}})
<br />
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
({{$t('objFill.ribi')}})
</template>
<!--印尼印象-->
<template v-else-if="postConfig.OutBranchId==1252">
({{$t('fnc.a_ynd')}})
</template>
<template v-else>({{$t('fnc.a_rminbi')}})
</template>
</td>
<td>
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
<template v-if="postConfig.LineId==14||postConfig.LineId==118">
{{$t('Airticket.Air_salesPrice')}}
<br />({{$t('objFill.ribi')}})
</template>
</template>
</td>
<td colspan="2">
......@@ -629,17 +653,20 @@
{{subItem.TotalMoney}}
</td>
<td>
<el-input type='text' class="w70" v-model="subItem.SalePrice"
<el-input type='text' class="w120" v-model="subItem.SalePrice"
@keyup.native="checkPrice(subItem,'SalePrice')" maxlength="8"></el-input>
</td>
<td>
<el-input type='text' class="w70" v-model="subItem.B2CSalePrice"
<el-input type='text' class="w120" v-model="subItem.B2CSalePrice"
@keyup.native="checkPrice(subItem,'B2CSalePrice')" maxlength="8"></el-input>
</td>
<td>
<el-input v-if="postConfig.LineId==14||postConfig.LineId==118" type='text' class="w70"
v-model="subItem.JPYSalePrice" @keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8">
</el-input>
<!--台湾印象和日本印象-->
<template v-if="postConfig.OutBranchId==1218||postConfig.OutBranchId==1220">
<el-input v-if="postConfig.LineId==14||postConfig.LineId==118" type='text' class="w70"
v-model="subItem.JPYSalePrice" @keyup.native="checkPrice(subItem,'JPYSalePrice')" maxlength="8">
</el-input>
</template>
</td>
<td colspan="2">
<el-input type="textarea" v-model="subItem.CostRemark"></el-input>
......@@ -1028,7 +1055,7 @@
this.getConvertMoney(this.otherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.otherPrice.InlandTrainTicketMoney)+
this.getConvertMoney(this.otherPrice.InlandTrainTicketMoney) +
this.getConvertMoney(this.otherPrice.SafeMoney) -
this.getConvertMoney(this.otherPrice.KBMoney)
return totalMoney;
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 1c2a393e
......@@ -90,21 +90,31 @@
<tr>
<td width="80" class="txtRightCost">{{$t('objFill.v101.chutuanleix')}}</td>
<td>
<el-select class="multiple_input" v-model="postData.TeamType"
@change="postData.LineId=0,postData.LineteamId=0">
<el-select class="multiple_input" v-model="postData.TeamType" @change="changeTeamType()">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</td>
<td width="80" class="txtRightCost">{{$t('objFill.tuanduilx')}}</td>
<td width="80" class="txtRightCost">
<template v-if="postData.TeamType==0||postData.TeamType==1">{{$t('objFill.tuanduilx')}}
</template>
</td>
<td>
<el-select class="multiple_input" v-model="postData.PriceTeamType">
<template v-for="item in TeamListArr">
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==9" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
</el-select>
<template v-if="postData.TeamType==0||postData.TeamType==1">
<el-select class="multiple_input" v-model="postData.PriceTeamType">
<template v-for="item in TeamListArr">
<template v-if="postData.TeamType==0">
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==9" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
<template v-if="postData.TeamType==1">
<el-option v-if="item.Id==3||item.Id==2" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</template>
</el-select>
</template>
</td>
<td width="80" class="txtRightCost">{{$t('advmanager.v_line')}}</td>
<td>
......@@ -351,6 +361,16 @@
};
},
methods: {
changeTeamType() {
this.postData.LineId = 0;
this.postData.LineteamId = 0;
this.postData.PriceTeamType = '';
if (this.postData.TeamType == 0) {
this.postData.PriceTeamType = 1;
} else if (this.postData.TeamType == 1) {
this.postData.PriceTeamType = 3;
}
},
//获取所有币种
getAllCurrency() {
this.apipost(
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 1c2a393e
......@@ -172,7 +172,9 @@
<span>{{getTitle(item)}}</span>
</el-tooltip>
</p>
<p>{{$t('fnc.khmingcheng')}}：{{item.CustomerName}}</p>
<template v-if="item.CustomerName&&item.CustomerName!=''">
<p>{{$t('fnc.khmingcheng')}}：{{item.CustomerName}}</p>
</template>
<p>{{$t('scen.sc_cp')}}：{{item.OutBranchName}}</p>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 1c2a393e
......@@ -911,18 +911,25 @@
</div>
<div class="clearfix">
<div class="TPright clearfix">
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<!--去掉小包团2023-04-19-->
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==9" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;">
<template v-if="priceData.TeamType==0||priceData.TeamType==1">
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<template v-if="priceData.TeamType==0">
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==9" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
<template v-if="priceData.TeamType==1">
<el-option v-if="item.Id==3||item.Id==2" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</template>
</el-select>
</el-form-item>
</template>
<el-form-item style="margin-top:1px;display:none;">
<span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 1c2a393e
......@@ -554,7 +554,7 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<!-- 团费包含签证
<el-form-item prop="VisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
......@@ -612,7 +612,7 @@
<template slot="prepend">{{$t('Operation.Op_childNobed')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="BackVisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.BackVisaPrice" @keyup.native="checkInteger(priceData,'BackVisaPrice')">
......@@ -897,17 +897,25 @@
</div>
<div class="clearfix">
<div class="TPright clearfix">
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<!--去掉小包团2023-04-19-->
<el-option v-if="item.Id==2||item.Id==3" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;">
<template v-if="priceData.TeamType==0||priceData.TeamType==1">
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
<template v-if="priceData.TeamType==0">
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==9" :key="item.Id"
:label="item.Name" :value="item.Id">
</el-option>
</template>
<template v-if="priceData.TeamType==1">
<el-option v-if="item.Id==3||item.Id==2" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</template>
</el-select>
</el-form-item>
</template>
<el-form-item style="margin-top:1px;display:none;">
<span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
......@@ -1410,7 +1418,7 @@
ForeignPassportPrice: 0,
UseFlightType: this.CurrentUserInfo.UseFlightType,
SupplierId: 0, //供应商编号
PriceTeamType: 1, //团队类型
PriceTeamType: 3, //团队类型
PriceOfferUrl: '', //报价单地址
PriceOfferName: "", //报价单名称
IsUseCompanyBus: 0, //是否使用公司车辆
......@@ -1419,7 +1427,7 @@
IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数
IsLeaderDaiTuan: 1, //领队带团/不带团
IsNewArrival: 0, //是否新品
IsNewArrival: 0, //是否新品
};
}
this.returnPriceList.push(objItem);
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 1c2a393e
......@@ -1178,7 +1178,7 @@
ForeignPassportPrice: 0,
UseFlightType: this.CurrentUserInfo.UseFlightType,
SupplierId: 0, //供应商编号
PriceTeamType: 1, //团队类型
PriceTeamType: "", //团队类型
PriceOfferUrl: '', //报价单地址
PriceOfferName: "", //报价单名称
IsUseCompanyBus: 0, //是否使用公司车辆
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ 1c2a393e
......@@ -1276,7 +1276,7 @@
ForeignPassportPrice: 0,
UseFlightType: this.CurrentUserInfo.UseFlightType,
SupplierId: 0, //供应商编号
PriceTeamType: 1, //团队类型
PriceTeamType: "", //团队类型
PriceOfferUrl: '', //报价单地址
PriceOfferName: "", //报价单名称
IsUseCompanyBus: 0, //是否使用公司车辆
......
src/components/rank/dataCount.vue
View file @ 1c2a393e
......@@ -7,7 +7,7 @@
<el-select
v-model="parameters.branchId"
style="margin-right: 20px;"
@change="handleDateChange()"
@change="getEmpList(),parameters.empIdList=[],handleDateChange()"
>
<el-option
v-for="(x, i) in branchs"
......@@ -16,6 +16,22 @@
:value="x.Id"
></el-option>
</el-select>
<el-select
v-model="parameters.empIdList"
style="margin-right: 20px;"
@change="handleDateChange()"
multiple
filterable
collapse-tags
>
<el-option
v-for="(x, i) in empList"
:key="i"
:label="x.EmName"
:value="x.EmployeeId"
></el-option>
</el-select>
<el-date-picker
v-model="parameters.dateRange"
type="daterange"
......@@ -627,7 +643,7 @@ export default {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 8);
end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
end.setTime(end.getTime());
picker.$emit("pick", [start, end]);
}
},
......@@ -637,7 +653,7 @@ export default {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 31);
end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
end.setTime(end.getTime());
picker.$emit("pick", [start, end]);
}
},
......@@ -647,13 +663,13 @@ export default {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 91);
end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
end.setTime(end.getTime());
picker.$emit("pick", [start, end]);
}
}
],
disabledDate(time) {
return time.getTime() > new Date(Date.now() - 3600 * 1000 * 24);
return time.getTime() > new Date(Date.now() );
}
},
menus: [
......@@ -679,8 +695,10 @@ export default {
branchId: -1,
dateRange: [],
StartDate: "",
EndDate: ""
EndDate: "",
empIdList:[],
},
empList:[],//员工列表
coreId: 1,
coreLists: [
{
......@@ -832,10 +850,11 @@ export default {
},
created() {
this.getCompanyList();
this.getEmpList()
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
end.setTime(end.getTime() - 3600 * 1000 * 24);
end.setTime(end.getTime());
this.parameters.dateRange = [
start.toLocaleString().split(" ")[0],
end.toLocaleString().split(" ")[0]
......@@ -916,7 +935,26 @@ export default {
query
});
}
},
getEmpList(){
let userInfo = this.getLocalStorage();
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: "-1",
DepartmentId: "-1",
PostId: "-1",
IsLeave: "0",
};
msg.BranchId=this.parameters.branchId;
this.apipost(
"admin_get_EmployeeGetList", msg,
(res) => {
if (res.data.resultCode == 1) {
this.empList = res.data.data;
}
},
(err) => {}
);
},
handleDateChange() {
this.getCustomerStatic();
......
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