Skip to content

S
SuperMan
Commit 3ce25ea8 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 727e5682 ac32d32a
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 63 deletions
src/assets/common/lang/EN/fill.js
View file @ 3ce25ea8
......@@ -8156,6 +8156,10 @@ export const obj = {
chunxuzhong: 'Still in existence ',
dakuanzhong: 'In progress ',
lianmenght: 'Alliance Contract ',
shenqinjsr: 'Application for Settlement Date ',
lianmeng: 'Union ',
fanyongjefw: 'Rebate Transaction Amount Range ',
qingxuanzbohtg: 'Please select Pass or reject',
},
//#endregion
}
......
src/assets/common/lang/Japan/fill.js
View file @ 3ce25ea8
......@@ -8156,6 +8156,10 @@ export const obj = {
chunxuzhong: '継続中です',
dakuanzhong: '金をかけます',
lianmenght: 'リーグ契約」です',
shenqinjsr: '決済日を申請します',
lianmeng: '同盟」です',
fanyongjefw: '取引金額の範囲です',
qingxuanzbohtg: '通過または却下を選択します',
},
//#endregion
}
......
src/assets/common/lang/zhCN/fill.js
View file @ 3ce25ea8
......@@ -8159,6 +8159,7 @@ export const obj = {
shenqinjsr: '申请结算日期',
lianmeng: '联盟',
fanyongjefw: '返佣交易金额范围',
qingxuanzbohtg: '请选择通过或驳回',
},
//#endregion
}
......
src/assets/common/lang/zhTW/fill.js
View file @ 3ce25ea8
......@@ -8156,6 +8156,10 @@ export const obj = {
chunxuzhong:　'存續中',
dakuanzhong:　'打款中',
lianmenght:　'聯盟合同',
shenqinjsr: '申請結算日期',
lianmeng: '聯盟',
fanyongjefw: '返傭交易金額範圍',
qingxuanzbohtg: '請選擇通過或駁回'
},
//#endregion
}
......
src/components/SalesModule/Returnratio.vue
View file @ 3ce25ea8
......@@ -82,21 +82,34 @@
</style>
<template>
<div class="flexOne">
<div style="text-align:right;padding:10px">
<div class="query-box">
<ul>
<li> <span><em>{{$t('objFill.nianfen')}}</em>
<YearLimit :clearable="false" :dateTime="year" @change="getTime"></YearLimit>
</span></li>
<li> <div style="text-align:right;">
<input type="button" class="hollowFixedBtn" name="" id="" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.addBtn')" @click="add"/>
</div>
</div></li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th>{{$t('fnc.jine')}}</th>
<th>{{$t('restaurant.res_commissionColumn')}}</th>
<th>{{$t('objFill.nianfen')}}</th>
<th>{{$t('objFill.v101.Rest.chaozrxinm')}}</th>
<th>{{$t('hotel.table_operattime')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index+500">
<td>{{item.Money}}</td>
<td>{{item.Money}} <当前年份交易额<= {{item.MaxMoney}}</td>
<td>{{item.Ratio}}‰</td>
<td>{{item.Year}}</td>
<td>{{item.UpdateByName}}</td>
<td>{{item.UpdateTime}}</td>
<td>
......@@ -127,19 +140,28 @@
<td colspan="6" align="center">{{$t('system.content_noData')}}</td>
</tr>
</table>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination> -->
<el-dialog
:title="$t('tips.tips')"
:visible.sync="dialogVisible"
width="400px">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
<el-form-item :label="$t('fnc.jine')" prop="Money">
<el-input v-model="ruleForm.Money" @keyup.native="checkPrice(ruleForm,'Money')"></el-input>
<el-form-item :label="$t('objFill.jinefanwei')" required>
<el-col :span="11">
<el-form-item prop="Money">
<el-input v-model="ruleForm.Money" size="mini" @keyup.native="checkPrice(ruleForm,'Money')" type="number"></el-input>
</el-form-item>
</el-col>
<el-col style="text-align:center;" :span="2"> -</el-col>
<el-col :span="11">
<el-form-item prop="MaxMoney">
<el-input v-model="ruleForm.MaxMoney" size="mini" @keyup.native="checkPrice(ruleForm,'MaxMoney')" type="number"></el-input>
</el-form-item>
</el-col>
</el-form-item>
<el-form-item :label="$t('restaurant.res_commissionColumn')+'(‰)'" prop="Ratio">
<el-input v-model="ruleForm.Ratio" @keyup.native="checkPrice(ruleForm,'Ratio')"></el-input>
<el-input v-model="ruleForm.Ratio" @keyup.native="checkPrice(ruleForm,'Ratio')" type="number"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
......@@ -152,21 +174,70 @@
</template>
<script>
import YearLimit from '../public/YearLimit.vue';
export default {
components: {YearLimit},
data() {
// 自定义验证规则
const validatePriceMoney = (rule, value, callback) => {
if (!value) {
return callback(new Error(this.$t('rule.qsrjine')));
}
if (Number(value) >= Number(this.ruleForm.MaxMoney)) {
callback(new Error('必须小于'+this.ruleForm.MaxMoney));
} else {
callback();
}
};
const validatePriceMaxMoney = (rule, value, callback) => {
if (!value) {
return callback(new Error(this.$t('rule.qsrjine')));
}
if (Number(value) <= Number(this.ruleForm.Money)) {
callback(new Error('必须大于'+this.ruleForm.Money));
} else {
callback();
}
};
return {
dialogVisible:false,
loading: true,
//分页
total: 0,
pageSize: '',
year:"",
currentPage:1,
DataList:[],
dateList:[],
yearList:[],
Msg:{Year:0,},
rules: {
Money: [
{ required: true, message: this.$t('rule.qsrjine'), trigger: 'blur' },
],
Money: [
{ required: true, message: this.$t('rule.qsrjine'), trigger: 'blur' },
{ validator: validatePriceMoney, trigger: 'blur' }
// { validator: (rule, value, callback) => {
// if (value > this.ruleForm.MaxMoney) {
// callback(new Error('必须小于'+this.ruleForm.MaxMoney));
// } else {
// callback();
// }
// }, trigger: 'blur' }
],
MaxMoney: [
{ required: true, message: this.$t('rule.qsrjine'), trigger: 'blur' },
{ validator: validatePriceMaxMoney, trigger: 'blur' }
// { validator: (rule, value, callback) => {
// if (value <= this.ruleForm.Money) {
// callback(new Error('必须大于'+this.ruleForm.Money));
// } else {
// callback();
// }
// }, trigger: 'blur' }
],
// [
// { required: true, message: this.$t('rule.qsrjine'), trigger: 'blur' },
// ],
Ratio: [
{ required: true, message: this.$t('objFill.v101.Rest.qingshurfybl'), trigger: 'blur' },
],
......@@ -174,18 +245,37 @@
ruleForm:{
Id:0,
Money:"",
MaxMoney:"",
Year:"",
Ratio:"",
},
}
},
created(){
var nowTime=new Date();
if (this.$route.query.year) {
this.year = this.$route.query.year;
this.Msg.Year= this.year;
this.ruleForm.Year=this.year;
} else {
this.year = nowTime.getFullYear().toString();
this.Msg.Year=this.year;
this.ruleForm.Year=this.year;
}
console.log("this.ruleForm.Year",this.ruleForm.Year);
},
mounted() {
let userInfo = this.getLocalStorage();
this.getList();
},
methods: {
getTime(Date){
this.Msg.Year=Date
this.ruleForm.Year=Date
this.year=Date
this.getList();
},
Delete(item){
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
......@@ -211,6 +301,7 @@
this.ruleForm={
Id:item.Id,
Money:item.Money,
MaxMoney:item.MaxMoney,
Ratio:item.Ratio,
}
this.dialogVisible=true;
......@@ -219,6 +310,7 @@
this.ruleForm={
Id:0,
Money:"",
MaxMoney:"",
Ratio:"",
}
this.dialogVisible=true;
......@@ -227,12 +319,14 @@
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.ruleForm.Year=this.year;
this.apipost('customer_post_SetCustomerCommissionRatio', this.ruleForm, res => {
if (res.data.resultCode == 1) {
this.getList();
this.dialogVisible=false;
this.$refs["ruleForm"].resetFields();
this.getList();
this.dialogVisible=false;
this.$refs["ruleForm"].resetFields();
} else {
this.Error(res.data.message)
}
}, err => {
})
......@@ -241,9 +335,10 @@
}
});
},
getList() { //获取数据
this.loading = true;
this.apipost('customer_post_GetCustomerCommissionRatioList', {}, res => {
this.apipost('customer_post_GetCustomerCommissionRatioList', this.Msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
......
src/components/administrative/AllianceContract.vue
View file @ 3ce25ea8
......@@ -6,7 +6,7 @@
background-color: #E6E6E6;
}
/deep/.el-form-item{
margin-bottom:5px;
/* margin-bottom:5px; */
}
/deep/.el-table .el-table__cell {
padding: 5px 0;
......@@ -65,10 +65,10 @@
</td>
<!-- <td>{{ item.TravelAgency_SignAddress }}</td> -->
<td>{{ item.Money?item.Money:'' }}~{{ item.MaxMoney?item.Money:'' }}</td>
<td>{{ item.Ratio?item.Ratio:'-' }}</td>
<td>{{ item.Money?item.Money:'' }}~{{ item.MaxMoney?item.MaxMoney:'' }}</td>
<td>{{ item.Ratio?item.Ratio+'‰':'-' }}</td>
<td>{{ item.TradeMoney?item.TradeMoney:'-' }}</td>
<td>{{ item.TotalClosePrice?item.TotalClosePrice:'-' }}</td>
<td>{{ item.TotalClosePrice?item.TotalClosePrice.toFixed(2):'-' }}</td>
<td>
<el-popover width="500" trigger="click">
<el-table
......@@ -78,6 +78,10 @@
prop="CustomerName"
:label="$t('salesModule.storeName')"
width="150">
<template slot-scope="scope">
{{ scope.row.CustomerName }}
<span v-if="scope.row.IsMain == 1" style="color: #E95252">({{$t('Operation.Op_zhu')}})</span>
</template>
</el-table-column>
<el-table-column prop="PredictPrice" :label="$t('restaurant.res_fy')">
<template slot-scope="scope">
......@@ -122,6 +126,7 @@
v-model="addMsg.C_StartDate"
:picker-options="pickerBeginDateBefore"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
......@@ -131,6 +136,7 @@
<el-date-picker class="h34" style="width: 100%;"
v-model="addMsg.C_EndDate"
type="date"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
......@@ -226,14 +232,14 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="'WORD'+$t('objFill.fj')" prop="ContractUrl">
<el-form-item :label="$t('objFill.fj')" prop="ContractUrl">
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="UploadAttachment" :show-file-list="false" action="">
<el-button size="small" type="primary">{{$t('objFill.v101.Rest.tianjiafuj')}}</el-button>
</el-upload>
<template v-if="addMsg.ContractUrl&& addMsg.ContractUrl!='' ">
<a style="margin-left: 20px; color: blue; cursor: pointer" target="_blank"
@click="downloadFile(addMsg.ContractUrl)">{{$t('Operation.Op_downLoadword')}}</a>
@click="downloadFile(addMsg.ContractUrl)">{{$t('objFill.xz')}}</a>
<a style="margin-left: 20px; color: blue; cursor: pointer"
@click="DeleteFile()">{{$t('system.table_delete')}}</a>
</template>
......@@ -253,7 +259,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="dialogFormVisible=false, iniTAddMsg">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="UpdateDate('addMsg')">{{$t('pub.sureBtn')}}</button>
<button class="normalBtn" type="primary" v-loading="saveLoading" @click="UpdateDate('addMsg')">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
......@@ -423,7 +429,7 @@ export default {
this.addMsg.OpenBankName = list[0].OpenBankName;
this.addMsg.AccountHolder = list[0].AccountHolder;
this.addMsg.BankName = list[0].BankName;
this.addMsg.CardNum = list[0].CardNum;
this.addMsg.CardNum = list[0].CardNum.trim();
}
}
}else{
......@@ -551,7 +557,6 @@ export default {
},
// 保存
UpdateDate: function (formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if(this.addMsg.ContractUrl == ''){
......
src/components/administrative/ElectronicAudit.vue
View file @ 3ce25ea8
......@@ -2,10 +2,21 @@
.shenheInfoBox{
display: flex;
flex-direction: row;
height: 24px;
margin-bottom: 5px;
}
.shenheInfoTitle{
width: 90px;
max-width: 80px;
min-width: 25px;
color: #606266;
/* font-weight: bold; */
margin-right: 10px;
}
.shenheInfoCenter{
color: #000;
}
.shenheInfoBoxR{
justify-content: end;
}
.ElectronicAudit .icon-shenhebohui {
color: #fff;
......@@ -309,7 +320,7 @@
{{$t('objFill.danxwtht')}}
</template>
<template v-if="item.CType == 4">
{{$t('salesModule.BigBag')}}
{{$t('objFill.v102.dahongbaoht')}}
</template>
</td>
<td>{{ item.T_ContractNum }}</td>
......@@ -382,15 +393,15 @@
</div>
</template>
<el-dialog custom-class='w500' :title="hetongTitle"
<el-dialog custom-class='w550' :title="hetongTitle"
:visible.sync="isShowContract"
center :before-close="closeContractDialog">
<el-row v-if="isBoHui>0">
<el-row v-if="isBoHui>0" v-loading="inforLoading">
<el-col :span="24" class="shenheInfoBox">
<p class="shenheInfoTitle">公司名称:</p>
<div class="shenheInfoCenter">{{ ContractInfor.Tourists_Name }}</div>
</el-col>
<el-col :span="24" class="shenheInfoBox">
<el-col :span="5" class="shenheInfoBox">
<p class="shenheInfoTitle">营业执照:</p>
<div class="shenheInfoCenter">
<el-image
......@@ -400,16 +411,16 @@
</el-image>
</div>
</el-col>
<el-col :span="12" class="shenheInfoBox">
<p class="shenheInfoTitle">法人姓名:</p>
<div class="shenheInfoCenter">{{ ContractInfor.LegalPersonName }}</div>
</el-col>
<el-col :span="12" class="shenheInfoBox">
<el-col :span="13" class="shenheInfoBox">
<p class="shenheInfoTitle">经营许可证:</p>
<div class="shenheInfoCenter">{{ ContractInfor.Tourists_Email }}</div>
</el-col>
<el-col :span="24" class="shenheInfoBox">
<p class="shenheInfoTitle">身份证正面:</p>
<el-col :span="6" class="shenheInfoBox shenheInfoBoxR">
<p class="shenheInfoTitle">法人:</p>
<div class="shenheInfoCenter">{{ ContractInfor.LegalPersonName }}</div>
</el-col>
<el-col :span="5" class="shenheInfoBox">
<p class="shenheInfoTitle">身份证:</p>
<div class="shenheInfoCenter">
<el-image
style="width: 20px; height: 20px"
......@@ -423,27 +434,27 @@
</el-image>
</div>
</el-col>
<el-col :span="24" class="shenheInfoBox">
<el-col :span="12" class="shenheInfoBox">
<p class="shenheInfoTitle">身份证号:</p>
<div class="shenheInfoCenter">{{ ContractInfor.LegalIdCardNumber }}</div>
</el-col>
<el-col :span="24" class="shenheInfoBox">
<p class="shenheInfoTitle">身份证有效期:</p>
<el-col :span="7" class="shenheInfoBox shenheInfoBoxR">
<p class="shenheInfoTitle">有效期:</p>
<div class="shenheInfoCenter">{{ ContractInfor.LegalIdCardTime }}</div>
</el-col>
<el-col :span="12" class="shenheInfoBox">
<el-col :span="8" class="shenheInfoBox">
<p class="shenheInfoTitle">开户支行:</p>
<div class="shenheInfoCenter">{{ ContractInfor.OpenBankName }}</div>
</el-col>
<el-col :span="12" class="shenheInfoBox">
<el-col :span="11" class="shenheInfoBox ">
<p class="shenheInfoTitle">所属银行:</p>
<div class="shenheInfoCenter">{{ ContractInfor.BankName }}</div>
</el-col>
<el-col :span="12" class="shenheInfoBox">
<el-col :span="5" class="shenheInfoBox shenheInfoBoxR">
<p class="shenheInfoTitle">开户人:</p>
<div class="shenheInfoCenter">{{ ContractInfor.AccountHolder }}</div>
</el-col>
<el-col :span="12" class="shenheInfoBox">
<el-col :span="24" class="shenheInfoBox">
<p class="shenheInfoTitle">卡号:</p>
<div class="shenheInfoCenter">{{ ContractInfor.CardNum }}</div>
</el-col>
......@@ -467,6 +478,7 @@
<td>
<el-date-picker v-model="BoHuiObj.C_StartDate" style="width: 100%;"
format="yyyy-MM-dd" type="date"
value-format="yyyy-MM-dd"
:picker-options="pickerBeginDateBefore3" :clearable="false">
</el-date-picker>
</td>
......@@ -476,6 +488,7 @@
<td>
<el-date-picker v-model="BoHuiObj.C_EndDate" style="width: 100%;"
format="yyyy-MM-dd" type="date"
value-format="yyyy-MM-dd"
:picker-options="pickerBeginDateAfter3" :clearable="false">
</el-date-picker>
</td>
......@@ -509,7 +522,7 @@
<br/>
<el-col :span="12" class="shenheInfoBox">
<el-radio v-model="isBoHui" :label="Number(2)" @change="auditMsg.AuditContract=isBoHui">{{$t('visa.v_tongguo')}}</el-radio>
<el-radio v-model="isBoHui" :label="Number(1)" @change="auditMsg.AuditContract=isBoHui">{{$t('fnc.bohui')}}</el-radio>
<el-radio v-model="isBoHui" :label="Number(1)" @change="auditMsg.AuditContract=3">{{$t('fnc.bohui')}}</el-radio>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
......@@ -631,7 +644,8 @@
isBoHui: 0, //是否是单项、一日游、境内旅游合同驳回
NightNumList: [],
hetongTitle: '',
ContractInfor: {}
ContractInfor: {},
inforLoading: false,
};
},
methods: {
......@@ -795,21 +809,26 @@
this.getContractInfor(item)
},
getContractInfor(item){
this.inforLoading = true
this.apipost("app_customer_GetERPAuthenticationContractDetails",
{ ContractId: item.Id },
{ ContractId: item.ID },
res => {
if (res.data.resultCode === 1) {
console.log(res.data.data,'=====');
this.ContractInfor = res.data.data;
this.inforLoading = false
} else {
this.Error(res.data.message);
this.inforLoading = false
}
},err=>{
this.inforLoading = false
});
},
//提交并盖章
SubmitContract(item, status) {
if(item.CType==4&&!this.isBoHui){
return this.Error(this.$t('objFill.v102.qingxuanzbohtg'));
if(item.CType==4){
if(!this.isBoHui) return this.Error(this.$t('objFill.v102.qingxuanzbohtg'));
}
var that = this;
if(status==2){
......
src/components/administrative/LianMengManagementList.vue
View file @ 3ce25ea8
......@@ -24,17 +24,19 @@
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in dataList" :key="index">
<td>{{item.CustomerName}} <span v-if="item.IsMain == 1" style="color: #E95252">({{$t('Operation.Op_zhu')}})</span> </td>
<td>{{item.CustomerName}}
<!-- <span v-if="item.IsMain == 1" style="color: #E95252">({{$t('Operation.Op_zhu')}})</span> -->
</td>
<td>{{item.Contact}}</td>
<td>{{item.ContactNumber}}</td>
<td>{{item.IsMember == 1 ? $t('pub.yes') : $t('pub.no')}}</td>
<td class="_icon_btn">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.shiezhizmd')" placement="top">
<!-- <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.shiezhizmd')" placement="top">
<i class="iconfont icon-guanli2" @click="clickSetAdmin(item)"></i>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.yichumend')" placement="top">
<i class="iconfont icon-img_delete_small icon-guanli2" @click="DelAllianceChild(item)"></i>
</el-tooltip> -->
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.administrative.yichumend')" placement="top">
<i class="iconfont icon-img_delete_small icon-guanli2" @click="DelAllianceChild(item)"></i>
</el-tooltip>
</td>
</tr>
</table>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 3ce25ea8
......@@ -1124,12 +1124,12 @@
</template>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
<!-- <button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)" :class="{'disClick':!isSaved}">{{btnText}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=2;saveHoteluseDetail(2)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp;
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp; -->
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
<template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1">
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 3ce25ea8
......@@ -1109,12 +1109,12 @@
</template>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
<!-- <button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)" :class="{'disClick':!isSaved}">{{btnText}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=2;saveHoteluseDetail(2)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp;
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp; -->
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
<template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1">
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 3ce25ea8
......@@ -939,12 +939,12 @@
</template>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
<!-- <button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)" :class="{'disClick':!isSaved}">{{btnText}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=2;saveHoteluseDetail(2)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp;
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp; -->
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
<template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1">
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ 3ce25ea8
......@@ -977,12 +977,12 @@
</template>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
<!-- <button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=1,saveHoteluseDetail(1)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)" :class="{'disClick':!isSaved}">{{btnText}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="PostConfig.IsUpdateHotel=2;saveHoteluseDetail(2)"
v-if="!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp;
:class="{'disClick':!isSaved}">{{btnTongBu}}</button> &nbsp; -->
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
<template v-if="priceData.IsOpenHotel&&priceData.IsOpenHotel==1">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment