Skip to content

S
SuperMan
Commit 8cda6cbb authored by 吴春's avatar 吴春
Browse files
Options

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

parents b82d5aa3 a315c949
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2773 additions and 2438 deletions
src/assets/common/lang/zhTW/fill.js
View file @ 8cda6cbb
......@@ -1012,7 +1012,7 @@ export const obj = {
t1: '車/使用時間/天數',
t2: '用車詳情',
t3: '總金額',
t4: '代收金額',
t4: '待收金額',
t5: '實收',
t6: '退款',
t7: '平台在途金額',
......
src/components/BatchPrintPage.vue
View file @ 8cda6cbb
......@@ -34,7 +34,8 @@
}
._PrintPage_always{
page-break-after: always;
padding-top: 10px;
padding-top: 2px;
height: 1550px;
}
</style>
<template v-loading="loading">
......
src/components/CarDealerOrder/components/ReservationOrder.vue
View file @ 8cda6cbb
......@@ -154,20 +154,36 @@
<li>
<span>
<em>{{ $t('OrderList.search.status') }}</em>
<el-select v-model="msg.OrderState">
<el-select v-model="msg.OrderState" @change="handleCurrentChange(1)">
<el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
<el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>订单类型</em>
<el-select v-model="msg.OrderType" @change="handleCurrentChange(1)">
<el-option :key="0" :value="0" label="不限"></el-option>
<el-option v-for="item in orderType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>主{{ $t('OrderList.search.orderId') }}</em>
<el-input clearable type="Number" v-model="msg.MainId" :placeholder="$t('objFill.orderid')"
@keyup.native="handleCurrentChange(1)" @change="handleCurrentChange(1)"/>
</span>
</li>
<li>
<span><em>{{ $t('OrderList.search.orderId') }}</em>
<el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.v100.orderid')" />
<el-input clearable type="Number" v-model="msg.OrderId" :placeholder="$t('objFill.orderid')"
@keyup.native="handleCurrentChange(1)" @change="handleCurrentChange(1)"/>
</span>
</li>
<li>
<span><em>{{$t('fnc.khmingcheng')}}</em>
<el-select v-model="msg.CustomerId" filterable>
<el-select v-model="msg.CustomerId" filterable @change="handleCurrentChange(1)">
<el-option :key="0" :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for="item in CustomerList" :key="item.Id" :label="item.CustomerName" :value="item.Id"></el-option>
</el-select>
......@@ -185,7 +201,7 @@
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click="msg.pageIndex = 1, currentPage = 1, GetList()" />
@click="handleCurrentChange(1)" />
</li>
</ul>
</div>
......@@ -238,12 +254,16 @@ export default {
msg: {
pageIndex: 1,
pageSize: 5,
OrderId: '0',
CustomerId: 0,
UseSTime: "",
UseETime: "",
OrderState: 0,
IsFinish: -1,
Sort: 1,
OrderId: null,
OrderType: 0,
MainId: null,
OrderTCNUM: '',
},
total: 0,
currentPage: 1,
......@@ -252,8 +272,8 @@ export default {
{ Name: this.$t('OrderList.orderStatus.cancel'), ID: '2' },
],
orderType: [
{ Name: this.$t('OrderList.orderType.tour'), ID: '1' },
{ Name: this.$t('OrderList.orderType.guest'), ID: '2' },
{ Name: '常规', ID: '1' },
{ Name: '包车', ID: '2' },
],
Datelist: '',
DatelistUse: '',
......@@ -310,6 +330,7 @@ export default {
this.msg.UseSTime = ''
this.msg.UseETime = ''
}
this.handleCurrentChange(1)
},
setEdate() {
return this.addMoth(new Date().Format("yyyy-MM-dd"), 1)
......@@ -357,43 +378,57 @@ export default {
},
//获取酒店订单列表
GetList() {
if(this.msg.OrderId=='') this.msg.OrderId = 0
// if(this.msg.OrderId=='') this.msg.OrderId = 0
this.loading = true
let url
// 销售 OP
if (this.pagesTitle == '销售') {
url = "JapanCar_get_GetJapanOrderPageList"
url = "JapanCar_get_GetJapanOrderMainPageList"
} else {
url = "JapanCar_get_GetJapanOrderPageList"
url = "JapanCar_get_GetJapanOrderMainPageList"
}
this.apipost(url, this.msg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
let addLists = function(arr){
arr.forEach(x=>{
x.typeInfo = {}
x.paymentInfo = {}
})
}
let addList = function(arr){
arr.forEach(x=>{
x.typeInfo = ''
x.paymentInfo = {}
x.list = []
x.isMore = false
x.upIcon = false
x.NewOrderDetailList = []
})
}
addList(data)
data.forEach(item => {
item.typeInfo = this.OrderStatusType.find(y => y.ID == item.OrderState) ?? this.OrderStatusType[1]
item.paymentInfo = this.PaymentMethods.find(y => y.Id == item.PayWay) ?? this.PaymentMethods[1]
if(item.OrderDetailList.length>2){
item.isMore = true
}
let dataLists = []
item.OrderDetailList.forEach((x,index)=>{
x.useTypeInfo = this.useTypes.find(z => z.StatusId == x.UseType) ?? this.useTypes[1]
if(index<2){
dataLists.push(x)
// addLists(data)
data.forEach(k => {
addList(k.OrderList)
k.typeInfo = this.OrderStatusType.find(y => y.ID == k.OrderState) ?? this.OrderStatusType[1]
k.paymentInfo = this.PaymentMethods.find(y => y.Id == k.PayWay) ?? this.PaymentMethods[1]
k.OrderList.forEach(item=>{
item.typeInfo = this.OrderStatusType.find(y => y.ID == item.OrderState) ?? this.OrderStatusType[1]
item.paymentInfo = this.PaymentMethods.find(y => y.Id == k.PayWay) ?? this.PaymentMethods[1]
if(item.OrderDetailList.length>2){
item.isMore = true
}
let dataLists = []
item.OrderDetailList.forEach((x,index)=>{
x.useTypeInfo = this.useTypes.find(z => z.StatusId == x.UseType) ?? this.useTypes[1]
if(index<2){
dataLists.push(x)
}
})
item.NewOrderDetailList = JSON.parse(JSON.stringify(dataLists))
})
item.NewOrderDetailList = JSON.parse(JSON.stringify(dataLists))
})
this.OrderList = data;
......@@ -430,6 +465,12 @@ export default {
if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId
}
if (this.$route.query.MainId) {
this.msg.MainId = this.$route.query.MainId
}
if (this.$route.query.OrderTCNUM) {
this.msg.OrderTCNUM = this.$route.query.OrderTCNUM
}
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
......
src/components/DomesticTravelcontract.vue
View file @ 8cda6cbb
......@@ -420,6 +420,18 @@
<div class="createTableTitle">旅行社信息</div>
<table class="createTable">
<tbody>
<tr>
<td>
<el-form-item label="合同章">
<el-select v-model="CtObj.SignType" :placeholder="$t('pub.pleaseSel')" @change="changeSignType">
<el-option key="0" label="和平章" :value="0">
</el-option>
<el-option key="2" label="欧亚" :value="2">
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="公司名称">
......@@ -1257,6 +1269,7 @@
TCID: 0,
OrderId: 0,
GuestNum: 0, //旅客人数
SignType: 0, //0-四川和平，1-日本PIC，2-成都欧亚
},
//旅客名单
guestList: [],
......@@ -1359,6 +1372,17 @@
commonTripList: commonTripList
},
methods: {
changeSignType() {
if (this.CtObj.SignType == 0) {
this.CtObj.TravelAgency_Name = "四川和平国际旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市锦江区青和里南段55号1栋2310、2311、2312号 ";
this.CtObj.TravelAgency_LicenseNum = "L-SC-CJ00015";
} else if (this.CtObj.SignType == 2) {
this.CtObj.TravelAgency_Name = "成都欧亚旅行社有限公司";
this.CtObj.TravelAgency_Address = "成都市金牛区营门口路48号1栋3单元16楼1601";
this.CtObj.TravelAgency_LicenseNum = "L-SC-A00289";
}
},
//点击切换行程
exchangeTrip() {
if (this.CtObj.TripType == 0) {
......@@ -1623,6 +1647,7 @@
this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum;
this.CtObj.C_PayDayNum = tempObj.C_PayDayNum;
this.CtObj.C_SignType = tempObj.C_SignType;
this.CtObj.SignType = tempObj.SignType;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
this.CtObj.OtherConvention = tempObj.OtherConvention;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
......@@ -1637,6 +1662,9 @@
this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
this.CtObj.GuestNum = tempObj.GuestNum;
this.CtObj.TravelAgency_Name=tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address=tempObj.TravelAgency_Address;
this.CtObj.TravelAgency_LicenseNum=tempObj.TravelAgency_LicenseNum;
this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice;
if (
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 8cda6cbb
......@@ -1699,14 +1699,14 @@ class="w135 _border_b_1">
<el-input type="text" v-model="AuditOrRefundMsg.PayReceiptNo" style="width: 364px;" clearable></el-input>
</div>
</div>
</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
<el-select
v-model="AuditOrRefundMsg.KingdeeClientID" class="w135 _border_b_1"
filterable
remote
......@@ -2654,6 +2654,7 @@ else if (Type==2) {
event_id: 'CarDealerOrder',
data: {
OrderId: this.GetDetail.ReFinanceId,
type: 1
}}, `${href}`)
}else{
this.$router.push({
......@@ -2671,7 +2672,8 @@ else if (Type==2) {
window.parent.postMessage({
event_id: 'CarDealerOrder',
data: {
MainId: this.GetDetail.ReFinanceId,
OrderId: this.GetDetail.ReFinanceId,
type: 2
}
}, `${href}`)
} else {
......@@ -3445,7 +3447,7 @@ else if (Type==2) {
this.payMsgList[index].balance = x.Initialbalance;
this.Calculation(1, index);
} else {
this.payMsg.Account = x.allName;
this.payMsg.CurrenName = x.CurrencyName;
if(this.GetDetail.DetailList[0].CurrencyId==x.CurrencyId){
......@@ -3454,7 +3456,7 @@ else if (Type==2) {
else{
this.payMsg.Rate = x.PayRate;
}
this.payMsg.CurrencyId = x.CurrencyId;
this.payMsg.balance = x.Initialbalance;
this.Calculation();
......@@ -4280,7 +4282,7 @@ else if (Type==2) {
path: "/dmcTotalTable",
query
});
},
goGuideAccount(path, ClientID) {
if (ClientID == 0) {
......
src/components/FinancialModule/DataAnalysis/index.vue
View file @ 8cda6cbb
......@@ -6,7 +6,7 @@
<el-tab-pane label="日本小包OR常规" name="3"></el-tab-pane>
</el-tabs>
<div class="query-box">
<el-form class="_info_box clearfix" label-width="110px">
<el-form class="_info_box clearfix" label-width="90px">
<el-row style="padding: 15px 0px 0 0">
<el-col :span="4">
<el-form-item :label="$t('system.table_company')">
......@@ -96,6 +96,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="2" v-if="msg.Type!=3">
<el-form-item label="季度汇总">
<el-checkbox v-model="msg.LossType" true-label="1" false-label="0"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
......@@ -134,7 +139,8 @@ export default {
StandardCurrencyId:0,
LineId: 0,
Type: '1',
DataType:'-1'
DataType:'-1',
LossType:'0'
},
dateTime: [],
CompanyList: [],
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 8cda6cbb
......@@ -1889,6 +1889,7 @@
event_id: 'CarDealerOrder',
data: {
OrderId: this.GetDetail.ReFinanceId,
type:2
}
}, `${href}`)
} else {
......@@ -1900,14 +1901,15 @@
}
});
}
}
}
else if(this.GetDetail.OtherType == 83){
if (this.typeSystem == 1) {
let href = this.domainManager().CarUrl
window.parent.postMessage({
event_id: 'CarDealerOrder',
data: {
MainId: this.GetDetail.ReFinanceId,
OrderId: this.GetDetail.ReFinanceId,
type:1
}
}, `${href}`)
} else {
......
src/components/FinancialModule/MonthlyCostStatement/components/selectSettlementData.vue
View file @ 8cda6cbb
......@@ -38,7 +38,7 @@
其他收入
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
<span v-else-if="scope.row.Type==2 && scope.row.TCIDList && scope.row.TCIDList.count>0" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
......@@ -46,6 +46,14 @@
border-radius: 4px;">
成本支出
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
PIC代付
</span>
<span v-else-if="scope.row.Type==1" style="display: inline-block;
padding: 2px 8px;
color: white;
......@@ -126,7 +134,7 @@
this.dataList.forEach(x=>{
x.DetailList.forEach(y=>{
if(x.TemplateId==281 || x.TemplateId==283 || x.Type==2){
if(x.TemplateId==281 || x.TemplateId==283 || (x.Type == 2 && x.TCIDList && x.TCIDList.count>0)){
this.OriginalMoney+=(y.Money *100)
}else{
this.OriginalMoney-=(y.Money *100)
......
src/components/FinancialModule/MonthlyCostStatement/settlement.vue
View file @ 8cda6cbb
......@@ -70,7 +70,7 @@
<button class="normalBtn" @click="GenerateDocuments()">生成结算单据</button>
</li>
</ul>
注释：此处为对台湾结算，结算金额 = 分润收入 + 其他收入(经营费+佣金等) + 台湾成本支出 - 台湾团费收入
注释：此处为对台湾结算，结算金额 = 分润收入 + 其他收入(经营费+佣金等) + 台湾成本支出 - 台湾团费收入 - PIC代付
</div>
<div style="display: flex;flex-wrap: nowrap; padding: 10px;">
<div style="display: flex;flex-wrap: wrap;">
......@@ -122,8 +122,7 @@
border-radius: 4px;">
其他收入
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
<span v-else-if="scope.row.Type==2 && scope.row.TCIDList && scope.row.TCIDList.count>0" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #E95252;
......@@ -131,6 +130,14 @@
border-radius: 4px;">
成本支出
</span>
<span v-else-if="scope.row.Type==2" style="display: inline-block;
padding: 2px 8px;
color: white;
background-color: #2BB87C;
line-height: 16px;
border-radius: 4px;">
PIC代付
</span>
<span v-else-if="scope.row.Type==1" style="display: inline-block;
padding: 2px 8px;
color: white;
......@@ -627,7 +634,7 @@
let Money = 0
this.multipleSelection.forEach(x => {
x.DetailList.forEach(y => {
if (x.TemplateId==281 || x.TemplateId==283 || x.Type == 2) {
if (x.TemplateId==281 || x.TemplateId==283 || (x.Type == 2 && x.TCIDList && x.TCIDList.count>0)) {
Money += (y.Money * 100)
}else{
Money -= (y.Money * 100)
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 8cda6cbb
......@@ -798,12 +798,13 @@ Vue.component("TCIDJump", {
event_id: 'CarDealerOrder',
data: {
OrderId: id,
type: 3
}}, `${href}`)
}else{
this.$router.push({
path: path,
query: {
OrderId: id,
OrderTCNUM: id,
blank: 'y'
}
});
......@@ -2285,7 +2286,7 @@ export default {
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
},
{
field: "YingShou",
formatter: this.moneyFormat,
......@@ -2295,7 +2296,7 @@ export default {
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
},
{
field: "ShiShou",
formatter: this.moneyFormat,
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 8cda6cbb
......@@ -202,7 +202,7 @@
<div class="cm_content">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th></th>
<th><input type="checkbox" v-model="isCheckAll" @change="checkAllOrder()"/></th>
<th>{{$t('system.query_company')}}</th>
<th>团队订单</th>
<th>{{$t('fnc.danhao')}}</th>
......@@ -233,7 +233,7 @@
</tr>
<tr v-for=" ( item , index ) in DataList ">
<td>
<input v-if="item.CallBackReFrId<=0" type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
<input v-if="item.CallBackReFrId<=0 && item.CostTypeName !='资金调拨'" type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{ item.BName }}</td>
<td>{{ item.OrderID }}</td>
......@@ -588,6 +588,8 @@ export default {
userInfo:{},
//上传数组
saveMsg:[],
//是否全选
isCheckAll:false,
}
},created(){
this.userInfo = this.getLocalStorage();
......@@ -1026,6 +1028,31 @@ export default {
this.allLoading = false
},null)
},
//点击全选
checkAllOrder(){
this.checkList=[]
if(this.isCheckAll){
this.DataList.forEach(x=>{
x.check=true;
})
}else{
this.DataList.forEach(x=>{
x.check=false;
})
}
this.DataList.forEach((x,index)=>{
if(x.check&&x.CallBackReFrId<=0 && x.CostTypeName !='资金调拨'){
this.checkList[index] = {
FinanceId:x.FinanceId,
Type:x.Type,
ClientID:x.ClientID,
ClientType:x.ClientType,
OriginalMoney:x.OriginalMoney,
Money:x.Money,
}
}
})
},
addCheckbox(obj,index){
this.DataList.forEach((x)=>{ // 循环改变check disabled 状态
if(x.FinanceId===obj.FinanceId){
......
src/components/Hotel/DiDa/HotelList.vue
View file @ 8cda6cbb
This diff is collapsed.
src/components/Hotel/DiDa/HotelSure.vue
View file @ 8cda6cbb
This diff is collapsed.
src/components/Restaurant/RestaurantPackage.vue
View file @ 8cda6cbb
......@@ -132,7 +132,7 @@
<span class="tit_name T1">
{{item.CurrencyName==''?'':item.CurrencyName}}<span
v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
class='tit_name T2'>{{item.LPrice}}</span>
class='tit_name T2'>{{item.LPrice}}/人</span>
</p>
<p class="Ldata">{{item.LDate}}</p>
</td>
......@@ -141,7 +141,7 @@
<span class="tit_name T1">
{{item.CurrencyName==''?'':item.CurrencyName}}<span
v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
class='tit_name HP'>{{item.HPrice}}</span>
class='tit_name HP'>{{item.HPrice}}/人</span>
</p>
<p class="Ldata">{{item.HDate}}</p>
</td>
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ 8cda6cbb
......@@ -67,23 +67,23 @@
<th width="110">{{$t('active.ad_xuhao')}}</th>
<th width="100">{{$t('sm.chufadi')}}</th>
<th width="120">{{$t('ground.hbsj')}}</th>
<th width="140">{{$t('ground.gongsituanhao')}}</th>
<th width="180">{{$t('ground.gongsituanhao')}}</th>
<th width="120">{{$t('ground.jiweishokzs')}}</th>
<th width="120">{{$t('adm.adm_time')}}</th>
<th width="130">{{$t('restaurant.res_resName')}}</th>
<th width="80">{{$t('admin.admin_status')}}</th>
<th width="300">{{$t('restaurant.res_resName')}}</th>
<th width="100">{{$t('ground.yongcanleixing')}}</th>
<th width="80">{{$t('admin.admin_status')}}</th>
<th width="100">{{$t('ground.da')}}</th>
<th width="100">{{$t('ground.zhong')}}</th>
<th width="100">{{$t('ground.xiao')}}</th>
<th width="100">{{$t('system.table_operation')}}</th>
</tr>
<template v-for="(outItem,outindex) in DataList">
<tbody :class="{bookDinnerStatisticsSplitTrCss:outindex%2!=0}">
<tbody :class="{bookDinnerStatisticsSplitTrCss:outindex%2!=0}" :key="`d_s_`+outindex">
<template v-for="(item,index) in outItem.StaticsReportList">
<template v-for="(subItem,subIndex) in item.CommonReport.DiningList">
<template v-for="(thirdItem,thirdIndex) in subItem.DiningSummaryList">
<tr>
<tr :key="`d_s_d_`+outindex+index+subIndex+thirdIndex">
<td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}}
</td>
......@@ -146,6 +146,8 @@
</td>
<td style="text-align:left;padding-left:3px;">
{{thirdItem.DiningName}}
<br />
真实名称:<font style="color:red;">{{thirdItem.DiningRealName}}</font>
</td>
<td>
{{thirdItem.UseDinnerTypeStr}}
......@@ -154,12 +156,12 @@
<template v-if="thirdItem.OrderState==-1">
<span style="color:red">未操作</span>
</template>
<template v-else-if="thirdItem.OrderState==0">
<span style="color:red">暂定</span>
</template>
<template v-else-if="thirdItem.OrderState==1">
<span style="color:green">确定</span>
</template>
<template v-else>
<span style="color:red">暂定</span>
</template>
</td>
<td>
<!--大人-->
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 8cda6cbb
......@@ -8,12 +8,12 @@
<input type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)"
:disabled="IsDisabled" />
<input v-if="IsEditDinner==0" type="button" class="fr normalBtn mb30" style="display:none;"
:value="$t('ground.baocuncaogao')" @click="saveList(1)" :disabled="IsDisabled" />
:value="$t('ground.baocuncaogao')" @click="saveList()" :disabled="IsDisabled" />
</template>
<template v-else>
<span style="color:red;font-size:14px;">{{$t('ground.yizhidbnxg')}}!</span>
<input v-if="EditBtn&&currentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30"
:value="$t('pub.saveBtn')" @click="saveList(1)" />
:value="$t('pub.saveBtn')" @click="saveList()" />
</template>
</li>
</ul>
......@@ -215,6 +215,18 @@
</el-select>
</td>
</tr>
<tr>
<td width="60" style="text-align:right;">
订餐状态：
</td>
<td style="text-align:left;">
<el-select v-model='subItem.OrderState' class='w135 sel' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.pleaseSel')" :value='-1'></el-option>
<el-option :label='$t("pub.sureBtn")' :value='1'></el-option>
<el-option :label='$t("visa.v_zanding")' :value='2'></el-option>
</el-select>
</td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;">
{{$t('ground.fukuanth')}}:
......@@ -411,7 +423,6 @@
if (currentObj && currentObj.ID > 0) {
//人民币
if (currentObj.ID == 1) {
obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice * jpaObj.PayRate).toFixed(2);
}
//日元
......@@ -432,22 +443,22 @@
}
this.$forceUpdate();
},
saveList(type) {
saveList() {
this.IsDisabled = true;
if (type == 0) {
this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => {
insideItem.OrderState = 0;
})
})
}
if (type == 1) {
this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => {
insideItem.OrderState = 1;
})
})
}
// if (type == 0) {
// this.list.forEach(item => {
// item.DiningSummaryList.forEach(insideItem => {
// insideItem.OrderState = 0;
// })
// })
// }
// if (type == 1) {
// this.list.forEach(item => {
// item.DiningSummaryList.forEach(insideItem => {
// insideItem.OrderState = 1;
// })
// })
// }
this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => {
if (insideItem.DiningPriceList) {
......
src/components/TravelContractConfirm.vue
View file @ 8cda6cbb
......@@ -1354,8 +1354,7 @@
</template>
<span>{{CtObj.C_TotalPrice}}</span>{{getCurrencyStr()}}&nbsp;&nbsp;（大写）
<template
v-if="CtObj.SignType==0">
<template v-if="CtObj.SignType==0">
人民币
</template>
<template v-else>
......@@ -1537,7 +1536,6 @@
<!-- 签字 -->
<div class="signSpan">
<div @click="dialogVisible=true" :class="dialogVisible?'CisHideen':''" class="sign">
<!-- <span><span class="sp1"></span></p> -->
<p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>
<span style="font-size:2rem" v-if="CtObj.Tourists_Sign==''||CtObj.Tourists_Sign==null">签字</span>
<span style="font-size:2rem" v-else>重新签字</span>
......@@ -1606,9 +1604,9 @@
</font>
人（名单可附页，需旅行社和旅游者代表签字盖章确认）；
</p>
<p>旅行社：<font>{{dataList.company}}</font>
<p>旅行社：<font>{{CtObj.TravelAgency_Name}}</font>
</p>
<p>旅行社业务经营许可证编号：<font>{{dataList.businessCertificate}}</font>
<p>旅行社业务经营许可证编号：<font>{{CtObj.TravelAgency_LicenseNum}}</font>
</p>
<h3>
<p class="TC_ZhangTitle">第一章&nbsp;&nbsp;术语和定义</p>
......@@ -1887,26 +1885,17 @@
<p class="bold colorRed">支付宝收款账号：2850943039@qq.com</p>
</template>
<template v-else>
<p>出境社的指定收款账号信息</p>
<p>
銀行名：京都銀行
</p>
<p>
支店名：水口支店　店番593
</p>
<p>
口座種別：レギュラー口座
<p>国内社的指定收款账号信息</p>
<p class="bold colorRed">
名称：成都欧亚旅行社有限公司
</p>
<p>
口座番号： 593-1070078
<p class="bold colorRed">
开户银行：交通银行股份有限公司成都西安路支行
</p>
<p class="bold colorRed">
账户名：株式会社ピースインターナショナル
账号：5116 1501 7018 0101 9726 7
</p>
<p>银行住所：滋賀県甲賀市水口町本綾野5－21</p>
<p>银行邮编：〒528-0037　</p>
<p>電話番号：0748－65－1011</p>
<p>SWIFT CODE: BOKFJPJZ</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<h3>
<p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p>
......@@ -3768,7 +3757,7 @@
<el-row>
<el-col :span="12">
<div style="width:100%;" @click="handelClearEl()">
<!-- <span class="bg bg1"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">重置签名</span>
</div>
......@@ -3776,14 +3765,11 @@
</el-col>
<el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()">
<!-- <span class="bg bg2"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">完成签名</span>
</div>
</el-col>
</el-row>
<!-- <input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" />
<input type="button" @click="handelSaveEl()" class="CV_Btn" :value="$t('pub.saveBtn')" /> -->
</div>
</div>
</div>
......@@ -3801,22 +3787,17 @@
<el-row>
<el-col :span="12">
<div style="width:100%;" @click="handelClearEl()">
<!-- <span class="bg bg1"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">重置签名</span>
</div>
</el-col>
<el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()">
<!-- <span class="bg bg2"></span> -->
<span style="font-size:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">完成签名</span>
</div>
</el-col>
</el-row>
<!-- <input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" />
<input type="button" @click="handelSaveEl()" class="CV_Btn" :value="$t('pub.saveBtn')" /> -->
</div>
</div>
</div>
......@@ -3860,11 +3841,11 @@
Tourists_Fax: "",
Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "",
TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_Name: "", //旅行社名称
TravelAgency_LicenseNum: "",
TravelAgency_DealMan: "",
TravelAgency_IDNum: "",
TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号",
TravelAgency_Address: "",
TravelAgency_Tel: "",
TravelAgency_Fax: "",
TravelAgency_PostNum: "",
......
src/components/TravelContractNew.vue
View file @ 8cda6cbb
......@@ -669,6 +669,7 @@
<el-option label="中国平安财产保险股份有限公司成都市锦城支公司" value="中国平安财产保险股份有限公司成都市锦城支公司"></el-option>
<el-option label="あいおいニッセイ同和損害保険株式会社" value="あいおいニッセイ同和損害保険株式会社"></el-option>
<el-option label="中国大地财产保险股份有限公司" value="中国大地财产保险股份有限公司"></el-option>
<el-option label="中国人民财产保险股份有限公司" value="中国人民财产保险股份有限公司"></el-option>
</el-select>
</el-form-item>
</td>
......
src/components/TravelContractView.vue
View file @ 8cda6cbb
......@@ -1315,27 +1315,18 @@
</p>
<p class="bold colorRed">支付宝收款账号：2850943039@qq.com</p>
</template>
<template v-else>
<p>出境社的指定收款账号信息</p>
<p>
銀行名：京都銀行
</p>
<p>
支店名：水口支店　店番593
</p>
<p>
口座種別：レギュラー口座
<template v-else-if="CtObj.SignType==2">
<p>国内社的指定收款账号信息</p>
<p class="bold colorRed">
名称：成都欧亚旅行社有限公司
</p>
<p>
口座番号： 593-1070078
<p class="bold colorRed">
开户银行：交通银行股份有限公司成都西安路支行
</p>
<p class="bold colorRed">
账户名：株式会社ピースインターナショナル
账号：5116 1501 7018 0101 9726 7
</p>
<p class="bold colorRed">银行住所：滋賀県甲賀市水口町本綾野5－21</p>
<p class="bold colorRed">银行邮编：〒528-0037　</p>
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<h3>
<p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p>
......
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ 8cda6cbb
......@@ -744,7 +744,7 @@
<div class="FlightDivDetails">
<div class="_flightList" v-for="(subItem,subIndex) in item.flightList" :key="subIndex+20000">
<span class="FlightNumber">{{subItem.Flight_number}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}/{{subItem.Arrival_time}}</span>
<span>({{subItem.DIATA}}){{subItem.DepartureName}}</span>
<span v-if="subItem.StopoverName">-</span>
<span v-if="subItem.StopoverName">({{subItem.StopoverIATA}}){{subItem.StopoverName}}</span>
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 8cda6cbb
......@@ -724,7 +724,7 @@
<div class="FlightDivDetails">
<div class="_flightList" v-for="(subItem,subIndex) in item.flightList" :key="subIndex+20000">
<span class="FlightNumber">{{subItem.Flight_number}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}/{{subItem.Arrival_time}}</span>
<span>({{subItem.DIATA}}){{subItem.DepartureName}}</span>
<span v-if="subItem.StopoverName">-</span>
<span v-if="subItem.StopoverName">({{subItem.StopoverIATA}}){{subItem.StopoverName}}</span>
......
src/components/administrative/ElectronicAudit.vue
View file @ 8cda6cbb
......@@ -380,7 +380,7 @@
TCID: '',
StartDate: '',
ReturnDate: '',
AuditContract: '',
AuditContract: 1,
PageIndex: 1,
PageSize: 15
},
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 8cda6cbb
......@@ -149,7 +149,7 @@
</template>
</template>
<!-- 可以让销售修改基本信息-->
<el-button v-if="orderId>0" type="primary" size="medium" value="修改信息" @click="editMsgShow=true">
<el-button v-if="orderId>0" type="primary" value="修改信息" @click="editMsgShow=true" style="margin-left:20px;">
修改信息</el-button>
</el-col>
<el-col v-if="orderId<=0">
......@@ -532,7 +532,13 @@
method: 'get',
url: ocrUrl,
data: {},
responseType: 'arraybuffer'
responseType: 'arraybuffer',
onDownloadProgress: (progressEvent) => {
const progress = Math.round((progressEvent.loaded / progressEvent.total) * 100);
that.loadingText = `正在下载` + (that.orderId > 0 ? "出团通知书" : "行程") + `文件` + progress +
`%,请勿关闭或刷新页面...`;
// 在这里处理下载进度, 如更新界面上的进度条
}
}).then(res => {
that.pdfLoading = false;
let blob = new Blob([res.data], {
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 8cda6cbb
......@@ -974,10 +974,8 @@
this.PostConfig.ImgCover = tempData.ImgCover;
this.PostConfig.LtName = tempData.LtName;
this.PostConfig.CreateBy = tempData.CreateBy;
if (tempData.ImgCover != "") {
if (tempData.ImgCoverList.length > 0) {
this.PostConfig.fileList = tempData.ImgCoverList;
}
if (tempData.ImgCover != ""&&tempData.ImgCoverList.length > 0) {
this.PostConfig.fileList = tempData.ImgCoverList;
} else {
this.initFileList();
}
......
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