Commit 6da291b6 authored by 黄奎's avatar 黄奎

国内合同修改

parent 3eff1894
...@@ -420,6 +420,18 @@ ...@@ -420,6 +420,18 @@
<div class="createTableTitle">旅行社信息</div> <div class="createTableTitle">旅行社信息</div>
<table class="createTable"> <table class="createTable">
<tbody> <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> <tr>
<td> <td>
<el-form-item label="公司名称"> <el-form-item label="公司名称">
...@@ -1257,6 +1269,7 @@ ...@@ -1257,6 +1269,7 @@
TCID: 0, TCID: 0,
OrderId: 0, OrderId: 0,
GuestNum: 0, //旅客人数 GuestNum: 0, //旅客人数
SignType: 0, //0-四川和平,1-日本PIC,2-成都欧亚
}, },
//旅客名单 //旅客名单
guestList: [], guestList: [],
...@@ -1359,6 +1372,17 @@ ...@@ -1359,6 +1372,17 @@
commonTripList: commonTripList commonTripList: commonTripList
}, },
methods: { 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() { exchangeTrip() {
if (this.CtObj.TripType == 0) { if (this.CtObj.TripType == 0) {
...@@ -1623,6 +1647,7 @@ ...@@ -1623,6 +1647,7 @@
this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum; this.CtObj.C_OrderDayNum = tempObj.C_OrderDayNum;
this.CtObj.C_PayDayNum = tempObj.C_PayDayNum; this.CtObj.C_PayDayNum = tempObj.C_PayDayNum;
this.CtObj.C_SignType = tempObj.C_SignType; this.CtObj.C_SignType = tempObj.C_SignType;
this.CtObj.SignType = tempObj.SignType;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice; this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
this.CtObj.OtherConvention = tempObj.OtherConvention; this.CtObj.OtherConvention = tempObj.OtherConvention;
this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice; this.CtObj.OtherConventionPrice = tempObj.OtherConventionPrice;
...@@ -1637,6 +1662,9 @@ ...@@ -1637,6 +1662,9 @@
this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice; this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice; this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
this.CtObj.GuestNum = tempObj.GuestNum; 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 = this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice; tempObj.TicketAndHotelTotalPrice;
if ( if (
......
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<span class="tit_name T1"> <span class="tit_name T1">
{{item.CurrencyName==''?'':item.CurrencyName}}<span {{item.CurrencyName==''?'':item.CurrencyName}}<span
v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><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>
<p class="Ldata">{{item.LDate}}</p> <p class="Ldata">{{item.LDate}}</p>
</td> </td>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<span class="tit_name T1"> <span class="tit_name T1">
{{item.CurrencyName==''?'':item.CurrencyName}}<span {{item.CurrencyName==''?'':item.CurrencyName}}<span
v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><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>
<p class="Ldata">{{item.HDate}}</p> <p class="Ldata">{{item.HDate}}</p>
</td> </td>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
font-size: 12px; font-size: 12px;
} }
.packagePrice .resource-content > div { .packagePrice .resource-content>div {
display: inline-block; display: inline-block;
} }
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
margin-top: 60px; margin-top: 60px;
} }
.packagePrice .resource-imginfo > div { .packagePrice .resource-imginfo>div {
margin-bottom: 20px; margin-bottom: 20px;
} }
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
display: inline-block; display: inline-block;
} }
.packagePrice .resource-baseinfo > div { .packagePrice .resource-baseinfo>div {
margin-top: 60px; margin-top: 60px;
} }
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
height: 30px; height: 30px;
} }
.packagePrice .priceDate td.checked > label { .packagePrice .priceDate td.checked>label {
border-color: red; border-color: red;
line-height: 28px; line-height: 28px;
box-sizing: border-box; box-sizing: border-box;
...@@ -93,7 +93,8 @@ ...@@ -93,7 +93,8 @@
border-width: 0 123px 30px; border-width: 0 123px 30px;
border-style: solid; border-style: solid;
opacity: 0.75; opacity: 0.75;
border-color: transparent transparent rgba(233, 82, 82, 1); /*透明 透明 灰*/ border-color: transparent transparent rgba(233, 82, 82, 1);
/*透明 透明 灰*/
} }
.packagePrice #calendar { .packagePrice #calendar {
...@@ -101,7 +102,7 @@ ...@@ -101,7 +102,7 @@
height: 400px; height: 400px;
margin: 0 auto; margin: 0 auto;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.1), box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.1),
0 1px 5px 0 rgba(0, 0, 0, 0.12); 0 1px 5px 0 rgba(0, 0, 0, 0.12);
} }
.packagePrice .month ul { .packagePrice .month ul {
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
justify-content: space-around; justify-content: space-around;
} }
.packagePrice .year-month > input { .packagePrice .year-month>input {
width: 100px; width: 100px;
float: left; float: left;
} }
...@@ -148,7 +149,7 @@ ...@@ -148,7 +149,7 @@
letter-spacing: 3px; letter-spacing: 3px;
} }
.packagePrice .month ul li > input { .packagePrice .month ul li>input {
padding-left: 10px; padding-left: 10px;
text-align: center; text-align: center;
margin: 20px 10px 20px; margin: 20px 10px 20px;
...@@ -336,6 +337,7 @@ ...@@ -336,6 +337,7 @@
.HT_supplier { .HT_supplier {
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
} }
</style> </style>
<template> <template>
<div class="flexOne packagePrice"> <div class="flexOne packagePrice">
...@@ -348,18 +350,19 @@ ...@@ -348,18 +350,19 @@
<li> <li>
<i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)"></i> <i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)"></i>
<input type="text" v-model="currentYear" class="currentInput" <input type="text" v-model="currentYear" class="currentInput"
@input="getDateString(),initCalendar(dateString)"/>{{$t('pub.year')}} @input="getDateString(),initCalendar(dateString)" />{{$t('pub.year')}}
<i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)"></i> <i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)"></i>
</li> </li>
<li> <li>
<i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)"></i> <i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)"></i>
<input type="text" v-model="currentMonth" class="currentInput" <input type="text" v-model="currentMonth" class="currentInput"
@input="getDateString(),initCalendar(dateString)"/>{{$t('pub.month')}} @input="getDateString(),initCalendar(dateString)" />{{$t('pub.month')}}
<i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)"></i> <i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)"></i>
</li> </li>
<li> <li>
<div class="ckAll"> <div class="ckAll">
<el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">{{$t('system.table_chekAll')}}</el-checkbox> <el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">{{$t('system.table_chekAll')}}
</el-checkbox>
</div> </div>
</li> </li>
</ul> </ul>
...@@ -377,17 +380,17 @@ ...@@ -377,17 +380,17 @@
<!-- 日期 --> <!-- 日期 -->
<ul class="days"> <ul class="days">
<li class="liList" :class="{'checked':dayobject.checkState==$calendarUtils.checkState.checked}" <li class="liList" :class="{'checked':dayobject.checkState==$calendarUtils.checkState.checked}"
v-for="(dayobject,index) in days" :key="dayobject.subCode" @mouseover="disBoard(dayobject,index)" v-for="(dayobject,index) in days" :key="dayobject.subCode" @mouseover="disBoard(dayobject,index)"
@mouseout="disNoneBoard()"> @mouseout="disNoneBoard()">
<span v-if="dayobject.day.getMonth()+1 != currentMonth" <span v-if="dayobject.day.getMonth()+1 != currentMonth"
class="other-month">{{ dayobject.day.getDate()}}</span> class="other-month">{{ dayobject.day.getDate()}}</span>
<span class="spanCheck" @click="clickedDay(dayobject)" <span class="spanCheck" @click="clickedDay(dayobject)"
v-else-if="updateDay==-1 || dayobject.day.getDate()==updateDay" :class="dayobject.class"> v-else-if="updateDay==-1 || dayobject.day.getDate()==updateDay" :class="dayobject.class">
{{dayobject.day.getDate()}} {{dayobject.day.getDate()}}
</span> </span>
<span class="other-month" v-else> <span class="other-month" v-else>
{{dayobject.day.getDate()}} {{dayobject.day.getDate()}}
</span> </span>
<div class="detailInfo" :class="{s:index==num}"> <div class="detailInfo" :class="{s:index==num}">
<div class="triangle_border_up"></div> <div class="triangle_border_up"></div>
<div class="popContent"> <div class="popContent">
...@@ -403,8 +406,10 @@ ...@@ -403,8 +406,10 @@
<label>{{$t('hotel.hotel_Supplier')}}{{dayobject.SupplierName}}</label> <label>{{$t('hotel.hotel_Supplier')}}{{dayobject.SupplierName}}</label>
</div> </div>
</div> </div>
<input type="button" class="hollowFixedBtn delButton" @click="isdelete(dayobject.ID)" :value="$t('system.table_delete')"/> <input type="button" class="hollowFixedBtn delButton" @click="isdelete(dayobject.ID)"
<button class="hollowFixedBtn delButton" @click="updateInfo(dayobject.ID,dayobject.date,index)">{{$t('system.table_edit')}} :value="$t('system.table_delete')" />
<button class="hollowFixedBtn delButton"
@click="updateInfo(dayobject.ID,dayobject.date,index)">{{$t('system.table_edit')}}
</button> </button>
</div> </div>
</li> </li>
...@@ -415,65 +420,53 @@ ...@@ -415,65 +420,53 @@
<div class="resource-imginfo"> <div class="resource-imginfo">
<el-form :model="addMsg" :rules="rules" ref="addMsg"> <el-form :model="addMsg" :rules="rules" ref="addMsg">
<div class="resDiv" style="margin:0 0 20px 42px"> <div class="resDiv" style="margin:0 0 20px 42px">
<span> <span>
<em style="margin-right:10px;">{{$t('pub.date')}}</em> <em style="margin-right:10px;">{{$t('pub.date')}}</em>
<el-date-picker class="w150" <el-date-picker class="w150" v-model='addMsg.StartDate' type="date"
v-model='addMsg.StartDate' :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder="">
type="date" </el-date-picker>
:picker-options="pickerBeginDateBefore" <el-date-picker class="w150" v-model='addMsg.EndDate' type="date" value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter" placeholder="">
placeholder=""> </el-date-picker>
</el-date-picker>
<el-date-picker class="w150"
v-model='addMsg.EndDate'
type="date"
value-format="yyyy-MM-dd"
:picker-options="pickerBeginDateAfter"
placeholder="">
</el-date-picker>
</span> </span>
</div> </div>
<div class="resDiv"> <div class="resDiv">
<el-form-item :label="$t('hotel.hotel_CostPrice')" prop="CostPrice"> <el-form-item :label="$t('hotel.hotel_CostPrice')" prop="CostPrice">
<el-input type="text" class="w210" v-model="addMsg.CostPrice" <el-input type="text" class="w210" v-model="addMsg.CostPrice"
@keyup.native="checkPrice(addMsg,'CostPrice')"></el-input> @keyup.native="checkPrice(addMsg,'CostPrice')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('hotel.hotel_SalesPrice')" prop="SalesPrice"> <el-form-item :label="$t('hotel.hotel_SalesPrice')" prop="SalesPrice">
<el-input type="text" class="w210" v-model="addMsg.SalesPrice" <el-input type="text" class="w210" v-model="addMsg.SalesPrice"
@keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input> @keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="resDiv"> <div class="resDiv">
<el-form-item :label="$t('hotel.hotel_B2BPrice')" prop="B2BPrice"> <el-form-item :label="$t('hotel.hotel_B2BPrice')" prop="B2BPrice">
<el-input type="text" class="w210" v-model="addMsg.B2BPrice" <el-input type="text" class="w210" v-model="addMsg.B2BPrice"
@keyup.native="checkPrice(addMsg,'B2BPrice')"></el-input> @keyup.native="checkPrice(addMsg,'B2BPrice')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('hotel.hotel_B2CPrice')" prop="B2CPrice"> <el-form-item :label="$t('hotel.hotel_B2CPrice')" prop="B2CPrice">
<el-input type="text" class="w210" v-model="addMsg.B2CPrice" <el-input type="text" class="w210" v-model="addMsg.B2CPrice"
@keyup.native="checkPrice(addMsg,'B2CPrice')"></el-input> @keyup.native="checkPrice(addMsg,'B2CPrice')"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="resDiv"> <div class="resDiv">
<el-form-item label="币种"> <el-form-item label="币种">
<el-select :placeholder="$t('objFill.qingxuanzhebz')" filterable class='multiple_input w210' <el-select :placeholder="$t('objFill.qingxuanzhebz')" filterable class='multiple_input w210'
@change="getCurrentRate(addMsg.CurrencyId)" v-model="addMsg.CurrencyId"> @change="getCurrentRate(addMsg.CurrencyId)" v-model="addMsg.CurrencyId">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option <el-option v-for="item in allCurrencyList" :key="item.ID" :label="item.Name" :value="item.ID">
v-for="item in allCurrencyList"
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('hotel.hotel_CurrentRate')" prop="Fax"> <el-form-item :label="$t('hotel.hotel_CurrentRate')" prop="Fax">
<el-input class="w210" v-model='addMsg.CurrentRate' <el-input class="w210" v-model='addMsg.CurrentRate' @keyup.native="checkRate(addMsg,'CurrentRate')">
@keyup.native="checkRate(addMsg,'CurrentRate')"></el-input> </el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="resDiv"> <div class="resDiv">
<el-form-item :label="$t('hotel.hotel_Supplier')" v-if="IsSelfBook" prop="Supplier"> <el-form-item :label="$t('hotel.hotel_Supplier')" v-if="IsSelfBook" >
<el-select v-model="addMsg.Supplier" class="w210" filterable :placeholder="$t('hotel.hotel_inputholder')"> <el-select v-model="addMsg.Supplier" class="w210" filterable :placeholder="$t('hotel.hotel_inputholder')">
<el-option :label='$t("hotel.hotel_inputholder")' :value='defaultSelect'></el-option> <el-option :label='$t("hotel.hotel_inputholder")' :value='defaultSelect'></el-option>
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
...@@ -492,10 +485,12 @@ ...@@ -492,10 +485,12 @@
<div>2.{{$t('ground.tjsjfgyq')}}</div> <div>2.{{$t('ground.tjsjfgyq')}}</div>
</div> </div>
<button type="success" class="subPrice" :class="{'comDisableBtn':isDisable==true,'normalBtn':isDisable==false}" <button type="success" class="subPrice" :class="{'comDisableBtn':isDisable==true,'normalBtn':isDisable==false}"
:disabled='isDisable' @click="submitForm('addMsg')">{{comBtnText}} :disabled='isDisable' @click="submitForm('addMsg')">{{comBtnText}}
</button> </button>
<button type="success" class="hollowFixedBtn" @click="goBack" v-if="updateDay=='-1'">{{$t('pub.returnBack')}}</button> <button type="success" class="hollowFixedBtn" @click="goBack"
<button type="success" class="hollowFixedBtn" @click="resetForm('addMsg')" v-else>{{$t('pub.cancelBtn')}}</button> v-if="updateDay=='-1'">{{$t('pub.returnBack')}}</button>
<button type="success" class="hollowFixedBtn" @click="resetForm('addMsg')"
v-else>{{$t('pub.cancelBtn')}}</button>
</div> </div>
</div> </div>
</div> </div>
...@@ -538,7 +533,7 @@ ...@@ -538,7 +533,7 @@
updateDay: -1, updateDay: -1,
//下拉框默认值 //下拉框默认值
SelectDefaultValue: 0, SelectDefaultValue: 0,
allCurrencyList: [],//所有币种 allCurrencyList: [], //所有币种
addMsg: { addMsg: {
ID: 0, ID: 0,
DiningId: "", DiningId: "",
...@@ -557,41 +552,51 @@ ...@@ -557,41 +552,51 @@
}, },
rules: { rules: {
//表单必填验证 //表单必填验证
CostPrice: [ CostPrice: [{
{required: true, message: this.$t('ground.qingshurcbj'), trigger: "change"}, required: true,
message: this.$t('ground.qingshurcbj'),
trigger: "change"
},
{ {
pattern: this.$commonUtils.Regex.el_Isdecimal, pattern: this.$commonUtils.Regex.el_Isdecimal,
message: this.$t('ground.qingshurlwxs') message: this.$t('ground.qingshurlwxs')
} }
], ],
B2BPrice: [ B2BPrice: [{
{required: true, message: this.$t('ground.qingshurnbjg'), trigger: "change"}, required: true,
message: this.$t('ground.qingshurnbjg'),
trigger: "change"
},
{ {
pattern: this.$commonUtils.Regex.el_Isdecimal, pattern: this.$commonUtils.Regex.el_Isdecimal,
message: this.$t('ground.qingshurlwxs') message: this.$t('ground.qingshurlwxs')
} }
], ],
B2CPrice: [ B2CPrice: [{
{required: true, message: `${this.$t('pub.pleaseImport')}B2B${this.$t('objFill.jiage')}`, trigger: "change"}, required: true,
message: `${this.$t('pub.pleaseImport')}B2B${this.$t('objFill.jiage')}`,
trigger: "change"
},
{ {
pattern: this.$commonUtils.Regex.el_Isdecimal, pattern: this.$commonUtils.Regex.el_Isdecimal,
message: this.$t('ground.qingshurlwxs') message: this.$t('ground.qingshurlwxs')
} }
], ],
SalesPrice: [ SalesPrice: [{
{required: true, message: this.$t('ground.qingshuruB2Bjg'), trigger: "change"}, required: true,
message: this.$t('ground.qingshuruB2Bjg'),
trigger: "change"
},
{ {
pattern: this.$commonUtils.Regex.el_Isdecimal, pattern: this.$commonUtils.Regex.el_Isdecimal,
message: this.$t('ground.qingshurlwxs') message: this.$t('ground.qingshurlwxs')
} }
], ],
Supplier: [ Supplier: [{
{ required: this.IsSelfBook,
required: this.IsSelfBook, validator: SupperValidate,
validator: SupperValidate, trigger: "change"
trigger: "change" }]
}
]
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -607,8 +612,7 @@ ...@@ -607,8 +612,7 @@
} }
}; };
}, },
created: function () { created: function () {},
},
methods: { methods: {
initDataTable() { initDataTable() {
//初始化列表数据 //初始化列表数据
...@@ -697,10 +701,10 @@ ...@@ -697,10 +701,10 @@
}, },
isdelete(ID) { isdelete(ID) {
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), { this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
this.$message({ this.$message({
type: "success", type: "success",
...@@ -834,7 +838,9 @@ ...@@ -834,7 +838,9 @@
}, },
//设置供应商是否显示 //设置供应商是否显示
setSuplier() { setSuplier() {
var msg = {ID: this.DiningId}; var msg = {
ID: this.DiningId
};
this.apipost("dining_post_Get", msg, res => { this.apipost("dining_post_Get", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.IsSelfBook = res.data.data.IsSelfBook; this.IsSelfBook = res.data.data.IsSelfBook;
...@@ -844,15 +850,13 @@ ...@@ -844,15 +850,13 @@
//获取所有币种 //获取所有币种
getAllCurrency() { getAllCurrency() {
this.apipost( this.apipost(
"financeinfo_post_GetList", "financeinfo_post_GetList", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.allCurrencyList = res.data.data; this.allCurrencyList = res.data.data;
} }
}, },
err => { err => {}
}
); );
}, },
//获取当前下拉选中币种汇率 //获取当前下拉选中币种汇率
...@@ -881,4 +885,5 @@ ...@@ -881,4 +885,5 @@
this.getAllCurrency(); this.getAllCurrency();
} }
}; };
</script> </script>
...@@ -67,23 +67,23 @@ ...@@ -67,23 +67,23 @@
<th width="110">{{$t('active.ad_xuhao')}}</th> <th width="110">{{$t('active.ad_xuhao')}}</th>
<th width="100">{{$t('sm.chufadi')}}</th> <th width="100">{{$t('sm.chufadi')}}</th>
<th width="120">{{$t('ground.hbsj')}}</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('ground.jiweishokzs')}}</th>
<th width="120">{{$t('adm.adm_time')}}</th> <th width="120">{{$t('adm.adm_time')}}</th>
<th width="130">{{$t('restaurant.res_resName')}}</th> <th width="300">{{$t('restaurant.res_resName')}}</th>
<th width="80">{{$t('admin.admin_status')}}</th>
<th width="100">{{$t('ground.yongcanleixing')}}</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.da')}}</th>
<th width="100">{{$t('ground.zhong')}}</th> <th width="100">{{$t('ground.zhong')}}</th>
<th width="100">{{$t('ground.xiao')}}</th> <th width="100">{{$t('ground.xiao')}}</th>
<th width="100">{{$t('system.table_operation')}}</th> <th width="100">{{$t('system.table_operation')}}</th>
</tr> </tr>
<template v-for="(outItem,outindex) in DataList"> <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="(item,index) in outItem.StaticsReportList">
<template v-for="(subItem,subIndex) in item.CommonReport.DiningList"> <template v-for="(subItem,subIndex) in item.CommonReport.DiningList">
<template v-for="(thirdItem,thirdIndex) in subItem.DiningSummaryList"> <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'> <td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
...@@ -146,6 +146,8 @@ ...@@ -146,6 +146,8 @@
</td> </td>
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
{{thirdItem.DiningName}} {{thirdItem.DiningName}}
<br />
真实名称:<font style="color:red;">{{thirdItem.DiningRealName}}</font>
</td> </td>
<td> <td>
{{thirdItem.UseDinnerTypeStr}} {{thirdItem.UseDinnerTypeStr}}
...@@ -154,12 +156,12 @@ ...@@ -154,12 +156,12 @@
<template v-if="thirdItem.OrderState==-1"> <template v-if="thirdItem.OrderState==-1">
<span style="color:red">未操作</span> <span style="color:red">未操作</span>
</template> </template>
<template v-else-if="thirdItem.OrderState==0">
<span style="color:red">暂定</span>
</template>
<template v-else-if="thirdItem.OrderState==1"> <template v-else-if="thirdItem.OrderState==1">
<span style="color:green">确定</span> <span style="color:green">确定</span>
</template> </template>
<template v-else>
<span style="color:red">暂定</span>
</template>
</td> </td>
<td> <td>
<!--大人--> <!--大人-->
......
...@@ -1354,8 +1354,7 @@ ...@@ -1354,8 +1354,7 @@
</template> </template>
<span>{{CtObj.C_TotalPrice}}</span>{{getCurrencyStr()}}&nbsp;&nbsp;(大写) <span>{{CtObj.C_TotalPrice}}</span>{{getCurrencyStr()}}&nbsp;&nbsp;(大写)
<template <template v-if="CtObj.SignType==0">
v-if="CtObj.SignType==0">
人民币 人民币
</template> </template>
<template v-else> <template v-else>
...@@ -1537,7 +1536,6 @@ ...@@ -1537,7 +1536,6 @@
<!-- 签字 --> <!-- 签字 -->
<div class="signSpan"> <div class="signSpan">
<div @click="dialogVisible=true" :class="dialogVisible?'CisHideen':''" class="sign"> <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> <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-if="CtObj.Tourists_Sign==''||CtObj.Tourists_Sign==null">签字</span>
<span style="font-size:2rem" v-else>重新签字</span> <span style="font-size:2rem" v-else>重新签字</span>
...@@ -1606,9 +1604,9 @@ ...@@ -1606,9 +1604,9 @@
</font> </font>
人(名单可附页,需旅行社和旅游者代表签字盖章确认); 人(名单可附页,需旅行社和旅游者代表签字盖章确认);
</p> </p>
<p>旅行社:<font>{{dataList.company}}</font> <p>旅行社:<font>{{CtObj.TravelAgency_Name}}</font>
</p> </p>
<p>旅行社业务经营许可证编号:<font>{{dataList.businessCertificate}}</font> <p>旅行社业务经营许可证编号:<font>{{CtObj.TravelAgency_LicenseNum}}</font>
</p> </p>
<h3> <h3>
<p class="TC_ZhangTitle">第一章&nbsp;&nbsp;术语和定义</p> <p class="TC_ZhangTitle">第一章&nbsp;&nbsp;术语和定义</p>
...@@ -1887,26 +1885,17 @@ ...@@ -1887,26 +1885,17 @@
<p class="bold colorRed">支付宝收款账号:2850943039@qq.com</p> <p class="bold colorRed">支付宝收款账号:2850943039@qq.com</p>
</template> </template>
<template v-else> <template v-else>
<p>出境社的指定收款账号信息</p> <p>国内社的指定收款账号信息</p>
<p> <p class="bold colorRed">
銀行名:京都銀行 名称:成都欧亚旅行社有限公司
</p>
<p>
支店名:水口支店 店番593
</p>
<p>
口座種別:レギュラー口座
</p> </p>
<p> <p class="bold colorRed">
口座番号: 593-1070078 开户银行:交通银行股份有限公司成都西安路支行
</p> </p>
<p class="bold colorRed"> <p class="bold colorRed">
户名:株式会社ピースインターナショナル 号:5116 1501 7018 0101 9726 7
</p> </p>
<p>银行住所:滋賀県甲賀市水口町本綾野5-21</p> <p class="bold colorRed">支付宝收款账号:392336499@qq.com</p>
<p>银行邮编:〒528-0037 </p>
<p>電話番号:0748-65-1011</p>
<p>SWIFT CODE: BOKFJPJZ</p>
</template> </template>
<h3> <h3>
<p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p> <p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p>
...@@ -3768,7 +3757,7 @@ ...@@ -3768,7 +3757,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div style="width:100%;" @click="handelClearEl()"> <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:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">重置签名</span> <span style="font-size:2rem">重置签名</span>
</div> </div>
...@@ -3776,14 +3765,11 @@ ...@@ -3776,14 +3765,11 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()"> <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:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">完成签名</span> <span style="font-size:2rem">完成签名</span>
</div> </div>
</el-col> </el-col>
</el-row> </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> </div>
</div> </div>
...@@ -3801,22 +3787,17 @@ ...@@ -3801,22 +3787,17 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div style="width:100%;" @click="handelClearEl()"> <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:3rem;color:rgb(36, 173, 229)" class="iconfont icon-zhongzhi1"></span>
<span style="font-size:2rem">重置签名</span> <span style="font-size:2rem">重置签名</span>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div style="width:100%;" @click="handelSaveEl()"> <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:3rem;color:rgb(36, 173, 229)" class="iconfont icon-wancheng1"></span>
<span style="font-size:2rem">完成签名</span> <span style="font-size:2rem">完成签名</span>
</div> </div>
</el-col> </el-col>
</el-row> </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> </div>
</div> </div>
...@@ -3860,11 +3841,11 @@ ...@@ -3860,11 +3841,11 @@
Tourists_Fax: "", Tourists_Fax: "",
Tourists_EmergencyLinkMan: "", Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "", Tourists_EmergencyLinkTel: "",
TravelAgency_Name: "四川和平国际旅行社有限公司", //旅行社名称 TravelAgency_Name: "", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015", TravelAgency_LicenseNum: "",
TravelAgency_DealMan: "", TravelAgency_DealMan: "",
TravelAgency_IDNum: "", TravelAgency_IDNum: "",
TravelAgency_Address: "成都市锦江区青和里南段55号1栋2310、2311、2312号", TravelAgency_Address: "",
TravelAgency_Tel: "", TravelAgency_Tel: "",
TravelAgency_Fax: "", TravelAgency_Fax: "",
TravelAgency_PostNum: "", TravelAgency_PostNum: "",
......
...@@ -1315,27 +1315,18 @@ ...@@ -1315,27 +1315,18 @@
</p> </p>
<p class="bold colorRed">支付宝收款账号:2850943039@qq.com</p> <p class="bold colorRed">支付宝收款账号:2850943039@qq.com</p>
</template> </template>
<template v-else> <template v-else-if="CtObj.SignType==2">
<p>出境社的指定收款账号信息</p> <p>国内社的指定收款账号信息</p>
<p> <p class="bold colorRed">
銀行名:京都銀行 名称:成都欧亚旅行社有限公司
</p>
<p>
支店名:水口支店 店番593
</p>
<p>
口座種別:レギュラー口座
</p> </p>
<p> <p class="bold colorRed">
口座番号: 593-1070078 开户银行:交通银行股份有限公司成都西安路支行
</p> </p>
<p class="bold colorRed"> <p class="bold colorRed">
户名:株式会社ピースインターナショナル 号:5116 1501 7018 0101 9726 7
</p> </p>
<p class="bold colorRed">银行住所:滋賀県甲賀市水口町本綾野5-21</p> <p class="bold colorRed">支付宝收款账号:392336499@qq.com</p>
<p class="bold colorRed">银行邮编:〒528-0037 </p>
<p class="bold colorRed">電話番号:0748-65-1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template> </template>
<h3> <h3>
<p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p> <p class="toTopDistance">第二十二条&nbsp;&nbsp;人身意外伤害保险</p>
......
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