Skip to content

S
SuperMan
Commit 4e6aad95 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents fb9b9c1f 673b86a2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1355 additions and 479 deletions
src/App.vue
View file @ 4e6aad95
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
</viewer> </viewer>
<chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode> <chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode>
<!-- --> <!-- -->
<!-- <div class="showMyCareer"> <div class="showMyCareer" v-if="showCareer">
<mycareer></mycareer> <mycareer :show-close="true" :uid="careerId" @close="closeCareer"></mycareer>
</div> --> </div>
</div> </div>
</template> </template>
...@@ -64,7 +64,9 @@ export default { ...@@ -64,7 +64,9 @@ export default {
haveOpenMode:false, haveOpenMode:false,
settingSys: false, settingSys: false,
timer:null, timer:null,
useTime:0 useTime:0,
showCareer:false,
careerId:0
// sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true // sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
} }
}, },
...@@ -72,6 +74,9 @@ export default { ...@@ -72,6 +74,9 @@ export default {
inited (viewer){ inited (viewer){
this.$viewer = viewer this.$viewer = viewer
}, },
closeCareer(){
this.showCareer=false
},
show (data) { show (data) {
this.$set(this.images,data) this.$set(this.images,data)
this.$viewer.show() this.$viewer.show()
...@@ -117,6 +122,11 @@ export default { ...@@ -117,6 +122,11 @@ export default {
path: '/login' path: '/login'
}) })
}else{ }else{
if(document.URL.indexOf("clientConfirm")!=-1){
localStorage.openMode=0
}else{
}
this.timekeeper() this.timekeeper()
this.listeneruser() this.listeneruser()
} }
...@@ -151,7 +161,14 @@ export default { ...@@ -151,7 +161,14 @@ export default {
this.MsgBus.$on('imgprevclear',content=>{ this.MsgBus.$on('imgprevclear',content=>{
this.images=[] this.images=[]
}) })
this.MsgBus.$on('showCareer',empId=>{
this.careerId=empId
this.showCareer=true
})
this.MsgBus.$on('hideCareer',content=>{
this.careerId=0
this.showCareer=false
})
} }
} }
</script> </script>
......
src/components/Contract/TravelContract.vue
View file @ 4e6aad95
This diff is collapsed.
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 4e6aad95
...@@ -196,14 +196,14 @@ ...@@ -196,14 +196,14 @@
<div class="rb_top_row _r_mb5"> <div class="rb_top_row _r_mb5">
<p >{{$t('fnc.fkduixiang')}}： <p >{{$t('fnc.fkduixiang')}}：
<el-select filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1"> <el-select filterable v-model='msg.IsPublic' placeholder="付款类型" @change="IsPublicChange" class="w135 _border_b_1">
<el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.gongzhang')" :value='1' :key='1' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.sizhang')" :value='0' :key='0' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.sizhang')" :value='0' :key='0' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.rmbxianjin')" :value='2' :key='2' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.wbxianjin')" :value='3' :key='3' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.wbxianjin')" :value='3' :key='3' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.zjinchi')" :value='4' :key='4' v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48'></el-option> <el-option :label="$t('fnc.zjinchi')" :value='4' :key='4' v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48 || msg.TemplateId===53'></el-option>
<el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option> <el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48 && msg.TemplateId !==53'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option> <el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option>
<el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67'></el-option> <el-option label="地接预支款" :value='9' :key='9' v-if='msg.TemplateId===67'></el-option>
...@@ -1495,14 +1495,14 @@ export default { ...@@ -1495,14 +1495,14 @@ export default {
this.msg.FrID = this.$route.query.FrID; this.msg.FrID = this.$route.query.FrID;
this.Financial_post_Get(this.$route.query.FrID,0); this.Financial_post_Get(this.$route.query.FrID,0);
}else{ }else{
let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
this.financeinfo_post_GetList(TCID);
this.msg.TemplateId = this.$route.query.id; this.msg.TemplateId = this.$route.query.id;
this.Financial_post_GetCostTypeList(this.$route.query.id); this.Financial_post_GetCostTypeList(this.$route.query.id);
this.BillName = userInfo.GroupName; this.BillName = userInfo.GroupName;
this.BillSonName = this.$route.query.Name; this.BillSonName = this.$route.query.Name;
this.FinancialFlowTemplate_post_GetProcessList(this.$route.query.id); this.FinancialFlowTemplate_post_GetProcessList(this.$route.query.id);
this.Financial_post_Get(0,parseInt(this.$route.query.id)); this.Financial_post_Get(0,parseInt(this.$route.query.id));
let TCID = (this.orderObj && this.orderObj.TCIDList && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
this.financeinfo_post_GetList(TCID);
} }
if(this.$route.query.Conditon){ if(this.$route.query.Conditon){
this.returnCode = this.$route.query.Conditon; this.returnCode = this.$route.query.Conditon;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 4e6aad95
...@@ -541,27 +541,25 @@ ...@@ -541,27 +541,25 @@
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for='(item, index) in nav'> <tr v-for='(item, index) in nav'>
<td :rowspan="nav.length" width="180" v-if="index===0">总金额： <td>{{item.TCNUMS}}</td>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice)}} --> <td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额：
<!-- ({{currencyTypeObj.}}) -->
<span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{cur.money}} <span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{cur.money}}
<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span> <span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
</br></span> </br></span>
</td>
</td>
<td>{{item.TCNUMS}}</td>
<td style="padding: 5px 20px;"> <td style="padding: 5px 20px;">
<div style="margin:10px 0" v-for="cur in CurrencyListMoney"> <div style="margin:10px 0" v-for="cur in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr"> <template v-for="leadr in cur.LeaderGetPriceArr">
<p style="padding-left:20px;display:inline-block" v-if="leadr.LeaderGetPrice>0">已领款： <p style="padding-left:20px;display:inline-block" >
<span style="color: red;">{{moneyFormat(leadr.LeaderGetPrice)}}<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span></span></p> 已领款：
<el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" <span style="color: red;">
type="number" v-model="leadr.LeaderGetPriceT"></el-input> {{moneyFormat(leadr.LeaderGetPrice)}}
</template> <span v-if="cur.CurrencyId > 0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span>
</span>
</p>
<el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number" v-model="leadr.LeaderGetPriceT"></el-input>
</template>
</div> </div>
</td> </td>
<td> <td>
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration" <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
...@@ -574,9 +572,10 @@ ...@@ -574,9 +572,10 @@
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney"> <div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr"> <template v-for="leadr in cur.LeaderGetPriceArr">
<input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn" @click="goZhiDan(item, 2)" /> <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn" @click="goZhiDan(item, 2)" />
<input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr)" /> <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
</template> <input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn" @click="goZhiDan(item,0,leadr)" />
</el-tooltip>
</template>
</div> </div>
</td> </td>
</tr> </tr>
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 4e6aad95
...@@ -118,9 +118,24 @@ ...@@ -118,9 +118,24 @@
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{subItem.TotalPrice}} {{subItem.TotalPrice}}
<template v-if="subItem.NewTotalPrice">
<br /><span style="color:red;">{{subItem.NewTotalPrice}}</span>
</template>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
<table class="dinnerTable"> <table class="dinnerTable">
<tr>
<td width="70" style="text-align:right;">币种：</td>
<td>
<el-select v-model="subItem.CurrencyId" placeholder="请选择" class='w135 sel'
@change="calculationPrice(subItem)">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</td>
</tr>
<tr> <tr>
<td width="60" style="text-align:right;"> <td width="60" style="text-align:right;">
付款方式： 付款方式：
...@@ -197,6 +212,7 @@ ...@@ -197,6 +212,7 @@
CurrentUserInfo: {}, CurrentUserInfo: {},
//是否禁用按钮 //是否禁用按钮
IsDisabled: false, IsDisabled: false,
allCurrencyList: [],
}; };
}, },
methods: { methods: {
...@@ -278,10 +294,52 @@ ...@@ -278,10 +294,52 @@
}, },
calculationPrice(obj) { calculationPrice(obj) {
let totalPrice = 0; let totalPrice = 0;
obj.DiningPriceList.forEach(item => { //获取当前选中的对象
totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100); let currentObj = {};
if (obj.CurrencyId != 0) {
currentObj = this.allCurrencyList.find(item => {
return item.ID === obj.CurrencyId; //筛选出匹配数据
});
}
//日元
let jpaObj = this.allCurrencyList.find(item => {
return item.ID === 3; //筛选出匹配数据
});
obj.DiningPriceList.forEach((item, index) => {
var tempPrice = 0;
var coefficient = 1;
totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (coefficient - item.DiscountPrice / 100);
totalPrice += tempPrice;
}) })
obj.TotalPrice = totalPrice.toFixed(2); obj.TotalPrice = totalPrice.toFixed(2);
if (currentObj && currentObj.ID > 0) {
//人民币
if (currentObj.ID == 1) {
obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice * jpaObj.PayRate).toFixed(2);
}
//日元
else if (currentObj.ID == 3) {
obj.NewTotalPrice = "";
} else {
if(currentObj.CurrentRate>1)
{
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
}
else
{
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
}
}
} else {
obj.NewTotalPrice = "";
}
this.$forceUpdate();
// let totalPrice = 0;
// obj.DiningPriceList.forEach(item => {
// totalPrice += item.PeoplePrice * (item.PeopleNum - item.Discount) * (1 - item.DiscountPrice / 100);
// })
// obj.TotalPrice = totalPrice.toFixed(2);
}, },
saveList(type) { saveList(type) {
this.IsDisabled = true; this.IsDisabled = true;
...@@ -356,6 +414,11 @@ ...@@ -356,6 +414,11 @@
this.TCNUM = this.$route.query.TCNUM; this.TCNUM = this.$route.query.TCNUM;
this.GuestNum = this.$route.query.GuestNum; this.GuestNum = this.$route.query.GuestNum;
this.getList(); this.getList();
this.apipost("financeinfo_post_GetList", {}, res => {
if (res.data.resultCode === 1) {
this.allCurrencyList = res.data.data;
}
}, err => {});
} }
}; };
......
src/components/SalesModule/groupTourOrder.vue
View file @ 4e6aad95
...@@ -1820,8 +1820,8 @@ ...@@ -1820,8 +1820,8 @@
</span> </span>
</div> </div>
<span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</span> <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
<span v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.contractNum}}</span> <span v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -3827,6 +3827,7 @@ ...@@ -3827,6 +3827,7 @@
this.loading = false this.loading = false
this.total = res.data.data.count this.total = res.data.data.count
this.list = res.data.data.pageData; this.list = res.data.data.pageData;
console.log(this.list,'list');
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 4e6aad95
...@@ -2142,8 +2142,8 @@ ...@@ -2142,8 +2142,8 @@
<span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span> <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
</span> </span>
<div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</div> <div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none;">领取合同</div>
<div v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.contractNum}}</div> <div v-else class="GO_Contract" @click="goContract(item)" style="display:none;">{{item.contractNum}}</div>
</div> </div>
</td> </td>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 4e6aad95
...@@ -1777,8 +1777,8 @@ ...@@ -1777,8 +1777,8 @@
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </p>--> <!-- </p>-->
<span>房间信息：{{item.OrderGuestHouseStr}}</span> <span>房间信息：{{item.OrderGuestHouseStr}}</span>
<span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)" style="display:none">领取合同</span> <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)">领取合同</span>
<span v-else class="GO_Contract" @click="goContract(item)" style="display:none">{{item.ContractNum}}</span> <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -2094,8 +2094,8 @@ ...@@ -2094,8 +2094,8 @@
<span>单据：</span> <span>单据：</span>
<span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span> <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span>
</span> </span>
<span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)" style="display:none">领取合同</span> <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)">领取合同</span>
<span v-else class="GO_Contract" @click="goContract(childItem)" style="display:none">{{childItem.ContractNum}}</span> <span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
</div> </div>
</td> </td>
</tr> </tr>
......
src/components/VisaCenter/addVisaNew.vue
View file @ 4e6aad95
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
<el-input v-else v-model="item.Duty" type="text" size=mini class="w230" maxlength="50" ></el-input> <el-input v-else v-model="item.Duty" type="text" size=mini class="w230" maxlength="50" ></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('hotel.hotel_remark')"> <el-form-item :label="$t('hotel.hotel_remark')">
<el-input v-model="item.Remarks" type="textarea" size=mini class="w230" maxlength="1000"></el-input> <el-input style="height:30px" v-model="item.Remarks" type="textarea" size=mini class="w230" maxlength="1000"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('visaT.student')"> <el-form-item :label="$t('visaT.student')">
<el-checkbox v-model="item.IsHightSchool" :true-label='1' :false-label='2'></el-checkbox> <el-checkbox v-model="item.IsHightSchool" :true-label='1' :false-label='2'></el-checkbox>
...@@ -269,6 +269,22 @@ ...@@ -269,6 +269,22 @@
<el-form-item :label="$t('system.table_rank')" prop="Sort"> <el-form-item :label="$t('system.table_rank')" prop="Sort">
<el-input v-model="item.Sort" @keyup.native="checkInteger(item,'Sort')" type="text" size=mini class="w230" maxlength="6" :placeholder="$t('visaT.qtxrank')"></el-input> <el-input v-model="item.Sort" @keyup.native="checkInteger(item,'Sort')" type="text" size=mini class="w230" maxlength="6" :placeholder="$t('visaT.qtxrank')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="在职证明" prop="IncumbencyCertificationType">
<el-select v-model="item.IncumbencyCertificationType" placeholder="请选择">
<el-option label="不选" :value="0"></el-option>
<el-option label="已确认为真" :value="1"></el-option>
<el-option label="已确认为假" :value="2"></el-option>
<el-option label="无法确认" :value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" 银行流水" prop="AccountStatementType">
<el-select v-model="item.AccountStatementType" placeholder="请选择">
<el-option label="不选" :value="0"></el-option>
<el-option label="已确认为真" :value="1"></el-option>
<el-option label="已确认为假" :value="2"></el-option>
<el-option label="无法确认" :value="3"></el-option>
</el-select>
</el-form-item>
</div> </div>
<div class="_Ec_Box clearfix"> <div class="_Ec_Box clearfix">
<template v-for="(Ec,Eci) in item.EconomicCapabilityS"> <template v-for="(Ec,Eci) in item.EconomicCapabilityS">
...@@ -387,7 +403,9 @@ export default { ...@@ -387,7 +403,9 @@ export default {
EconomicCapabilityS:[], EconomicCapabilityS:[],
TimeOver:false, TimeOver:false,
OrderId:'', OrderId:'',
Sort:0 Sort:0,
IncumbencyCertificationType:1,
AccountStatementType:1,
}, },
rules:{ rules:{
OrderId:[ OrderId:[
......
src/components/champion/mycareer.vue
View file @ 4e6aad95
This diff is collapsed.
src/components/clientConfirm.vue
View file @ 4e6aad95
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
.dic_content .item_content .title {width:100%;text-align:center;margin-top:20px;} .dic_content .item_content .title {width:100%;text-align:center;margin-top:20px;}
.dic_content .item_content>label {width:100%;text-align:left;font-weight:bold;background-color:#F2F2F2;margin:30px 0;padding:8px 0;text-indent:20px;display:inline-block;font-size:16px;} .dic_content .item_content>label {width:100%;text-align:left;font-weight:bold;background-color:#F2F2F2;margin:30px 0;padding:8px 0;text-indent:20px;display:inline-block;font-size:16px;}
.dic_content .item_content>span{font-size:13px;line-height:26px;margin-left:10px;} .dic_content .item_content>span{font-size:13px;line-height:26px;margin-left:10px;}
.dic_content .item_content .content_table {border:0;margin-top:10px;width:100%;} .dic_content .item_content .content_table {border:1px solid #d1d1d1;margin-top:10px;width:100%;text-align: center;}
.dic_content .item_content .content_table th {background-color:#F2F2F2;} .dic_content .item_content .content_table th {background-color:#F2F2F2;}
.dic_content .item_content .content_table th,.dic_content .item_content .content_table th td {border:1px solid #808080;text-align:center;padding:10px;} .dic_content .item_content .content_table th,.dic_content .item_content .content_table td {border:1px solid #808080;text-align:center;padding:10px;}
.dic_content .item_content font {color:blue;display:inline-block;padding:0 10px; font-size: 13px;} .dic_content .item_content font {color:blue;display:inline-block;padding:0 10px; font-size: 13px;}
.dic_content .content_table font{min-width:0;} .dic_content .content_table font{min-width:0;}
...@@ -53,15 +53,15 @@ ...@@ -53,15 +53,15 @@
.dic_content .shouquanNum{font-weight:bold;} .dic_content .shouquanNum{font-weight:bold;}
.dic_content .zhangTitle{height:90px;font-size:16px;font-weight:bold;line-height:90px!important;} .dic_content .zhangTitle{height:90px;font-size:16px;font-weight:bold;line-height:90px!important;}
.dic_content .toTopDistance{margin-top:15px;} .dic_content .toTopDistance{margin-top:15px;}
.dic_content .travelDan td{border:none;text-align:left;text-indent:20px;padding:10px 0;} .dic_content .travelDan td{border:none!important;text-align:left;text-indent:20px;padding:10px 0;}
.dic_content .travelDan{padding:50px 0;} .dic_content .travelDan{padding:50px 0;}
.dic_content .zhangOne{position:absolute;width:200px;top:-83px;left:160px;} .dic_content .zhangOne{position:absolute;width:200px;top:-83px;left:160px;}
.dic_content .zhangTwo{position:absolute;width:200px;top:-60px;left:80px;} .dic_content .zhangTwo{position:absolute;width:200px;top:-60px;left:80px;}
.dic_content .comonTb td{padding:15px 0;} .dic_content .comonTb td{padding:15px 0;}
.dic_content .remindInfo{position:absolute;top:42%;left:25%;font-size:60px;color:#FF7F7F;letter-spacing:20px;} .dic_content .remindInfo{position:absolute;top:42%;left:35%;font-size:60px;color:#FF7F7F;letter-spacing:20px;}
.dic_content .signName{position:relative;top:10px;width:140px;} .dic_content .signName{position:relative;top:10px;width:140px;}
.dic_content .LRTB td:nth-child(odd){text-align:right;padding-right:20px;} .dic_content .LRTB td:nth-child(odd){text-align:right;padding:10px;height:50px;border:1px solid #d1d1d1;}
.dic_content .LRTB td:nth-child(even){text-align:left;padding-left:20px;} .dic_content .LRTB td:nth-child(even){text-align:left;padding:10px;height:50px;border:1px solid #d1d1d1;}
.dic_content .shouquanNum{ .dic_content .shouquanNum{
margin:30px 0!important; margin:30px 0!important;
font-weight: bold; font-weight: bold;
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
#canvas { #canvas {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: relative; /* position: relative; */
} }
#canvas canvas { #canvas canvas {
display: block; display: block;
...@@ -90,9 +90,9 @@ ...@@ -90,9 +90,9 @@
} }
.CV_Btn{ .CV_Btn{
color: #fff; color: #fff;
padding: 0 15px; padding: 10px 30px;
height: 30px;
background: #E95252; background: #E95252;
font-size:30px;
border: 1px solid #E95252; border: 1px solid #E95252;
cursor: pointer; cursor: pointer;
border-radius: 15px; border-radius: 15px;
...@@ -106,11 +106,16 @@ ...@@ -106,11 +106,16 @@
} }
.CliConfirmBtn{ .CliConfirmBtn{
color: #fff; color: #fff;
height: 30px; height: 60px;
width:150px;
font-size:27px;
background: #E95252; background: #E95252;
border: 1px solid #E95252; border: 1px solid #E95252;
border-radius: 15px; border-radius: 15px;
} }
.ClientTravelTable td{
border:1px solid #d1d1d1;
}
</style> </style>
<template> <template>
...@@ -391,7 +396,7 @@ ...@@ -391,7 +396,7 @@
</div> </div>
<div class="item_content"> <div class="item_content">
<label id="l5">旅客信息</label> <label id="l5">旅客信息</label>
<table class="content_table" cellpadding="0" cellspacing="0" style="border-collapse:collapse"> <table class="content_table ClientTravelTable" cellpadding="0" cellspacing="0" style="border-collapse:collapse">
<tr> <tr>
<th>姓名</th> <th>姓名</th>
<th>国籍</th> <th>国籍</th>
...@@ -542,8 +547,8 @@ ...@@ -542,8 +547,8 @@
<td >经办人：<font>{{dataList.agentName}}</font></td> <td >经办人：<font>{{dataList.agentName}}</font></td>
</tr> </tr>
<tr> <tr>
<td style="text-indent:118px;">签约日期：<font>{{getDate(dataList.payDate)}}</font> </td> <td>签约日期：<font>{{getDate(dataList.payDate)}}</font> </td>
<td style="text-indent:35px;">签约日期：<font>{{getDate(dataList.payDate)}}</font> </td> <td>签约日期：<font>{{getDate(dataList.payDate)}}</font> </td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -747,7 +752,7 @@ ...@@ -747,7 +752,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="CliSignDiv" :class="dialogVisible?'isShowSign':''"> <div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent>
<div id="canvas"> <div id="canvas">
</div> </div>
<div style="text-align:center;margin-top:20px;"> <div style="text-align:center;margin-top:20px;">
...@@ -783,7 +788,7 @@ ...@@ -783,7 +788,7 @@
methods: { methods: {
//获取数据 //获取数据
getList(){ getList(){
this.apiJavaPost("/api/contract/getContractInfoForCode",this.msg,res => { this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
console.log(res,'resss'); console.log(res,'resss');
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
...@@ -898,7 +903,7 @@ ...@@ -898,7 +903,7 @@
this.msg.orderID = this.$route.query.orderID; this.msg.orderID = this.$route.query.orderID;
var h = window.screen.height; var h = window.screen.height;
var cHeight=document.getElementsByClassName("CliSignDiv")[0]; var cHeight=document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height=600+'px'; cHeight.style.height=700+'px';
this.getList(); this.getList();
this.getCanvas(); this.getCanvas();
} }
......
src/components/personalCenter.vue
View file @ 4e6aad95
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</span> </span>
</div> </div>
<div class="item"> <div class="item" @click="changeBoard(2)">
<i class="iconfont icon-guanjun"></i> <i class="iconfont icon-guanjun"></i>
<span class="n-name">冠军之路</span> <span class="n-name">冠军之路</span>
<span class="fang"> <span class="fang">
...@@ -100,12 +100,17 @@ ...@@ -100,12 +100,17 @@
</div> </div>
<personalIndex v-if="boardIndex==0"></personalIndex> <personalIndex v-if="boardIndex==0"></personalIndex>
<dailyAnalysis v-if="boardIndex==1"></dailyAnalysis> <dailyAnalysis v-if="boardIndex==1"></dailyAnalysis>
<div class="m-box" v-if="boardIndex==2" :style="{'left':(300*zoomH)+'px'}">
<personnelManagement></personnelManagement>
</div>
</div> </div>
</template> </template>
<script> <script>
import personalIndex from './personalCenter/index' import personalIndex from './personalCenter/index'
import dailyAnalysis from './visualization/dailyAnalysis' import dailyAnalysis from './visualization/dailyAnalysis'
import personnelManagement from './activity/PersonnelManagement'
export default { export default {
data() { data() {
return { return {
...@@ -119,7 +124,8 @@ export default { ...@@ -119,7 +124,8 @@ export default {
}, },
components: { components: {
personalIndex, personalIndex,
dailyAnalysis dailyAnalysis,
personnelManagement
}, },
mounted() { mounted() {
this.u = this.getLocalStorage(); this.u = this.getLocalStorage();
...@@ -192,7 +198,11 @@ export default { ...@@ -192,7 +198,11 @@ export default {
right: 0; right: 0;
background: rgba(242, 243, 248, 1); background: rgba(242, 243, 248, 1);
overflow-y: auto; overflow-y: auto;
padding-bottom: 20px; /* padding-bottom: 20px; */
}
.personal .m-box .personTable{
margin: 0px;
width: 100%;
} }
.personal .u-box .h-info-box { .personal .u-box .h-info-box {
margin: 15px; margin: 15px;
......
src/components/personalCenter/index.vue
View file @ 4e6aad95
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
<div class="r-box"> <div class="r-box">
<div class="sell"> <div class="sell">
<div class="title">本周销冠</div> <div class="title">本周销冠</div>
<i class="more iconfont icon-gengduo1 white" title="查看往期排行"></i> <i class="more iconfont icon-gengduo1 white" title="查看往期排行" @click="openRank"></i>
<sell :champion="result.orderRankList"></sell> <sell :champion="result.orderRankList"></sell>
</div> </div>
<div class="todayOpera"> <div class="todayOpera">
...@@ -280,6 +280,10 @@ export default { ...@@ -280,6 +280,10 @@ export default {
const { href } = this.$router.resolve({ path: "/Maninfo" }); const { href } = this.$router.resolve({ path: "/Maninfo" });
window.open(href, "_blank"); window.open(href, "_blank");
}, },
openRank(){
const { href } = this.$router.resolve({ path: "/saleRnkBefore"});
window.open(href, "_blank");
},
getList(){ getList(){
let msg={ let msg={
pageIndex:1, pageIndex:1,
......
src/components/personalCenter/sell.vue
View file @ 4e6aad95
...@@ -47,12 +47,11 @@ export default { ...@@ -47,12 +47,11 @@ export default {
} }
}, },
mounted() { mounted() {
console.log(this.champion)
}, },
methods: { methods: {
openRank(){ openRank(){
const { href } = this.$router.resolve({ path: "/saleRnkBefore"}); this.MsgBus.$emit("showCareer",this.champion.employeeId)
window.open(href, "_blank");
} }
}, },
} }
......
src/components/public/leftNav.vue
View file @ 4e6aad95
...@@ -202,11 +202,28 @@ ...@@ -202,11 +202,28 @@
}) })
}, },
goUrl(path) { goUrl(path) {
this.$router.push({ if(path=='/JapanHotel'){
path: path let userInfo = this.getLocalStorage();
}) let msg = {
}, id:userInfo.EmployeeId
}, }
this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
if (res.data.resultCode == 1) {
this.EnCodeWord=res.data.data;
window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
} else {
this.Error(res.data.message);
}
},
err => {}
);
}else{
this.$router.push({
path: path
})
}
}
}
} }
</script> </script>
......
src/plug/index.js
View file @ 4e6aad95
...@@ -118,9 +118,10 @@ export default { ...@@ -118,9 +118,10 @@ export default {
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function() {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
domainUrl = "http://192.168.2.214:8082"; //domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.65:8025"; domainUrl = "http://192.168.2.65:8025";
domainUrl = "http://192.168.2.16:8083"; //domainUrl = "http://192.168.2.16:8083";
//domainUrl = "http://192.168.0.110";
if (locationName.indexOf('oytour') !== -1) { if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
...@@ -354,7 +355,7 @@ export default { ...@@ -354,7 +355,7 @@ export default {
}, },
Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) { Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1) { if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) {
let previousPathInfo = { let previousPathInfo = {
path: this.$route.name, path: this.$route.name,
query: this.$route.query query: this.$route.query
......
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