Skip to content

S
SuperMan
Commit 2b781142 authored by 王悦's avatar 王悦
Browse files
Options

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

parents 2e1256bb e358b84d
Hide whitespace changes
Inline Side-by-side
Showing with 866 additions and 89 deletions
src/assets/css/tripIndex.css
View file @ 2b781142
......@@ -615,9 +615,10 @@
.travelControlTrip .essential-item p.pkey{font-size: 14px; color: #000; margin:10px 0 0 0; }
.travelControlTrip .essential-item p.pvalue{font-size: 18px; color: #000; margin-top:5px; }
.travelControlTrip .collection{margin-bottom: 40px;width: 100%;}
.travelControlTrip .collection-item{width:400px; height:110px; line-height: 110px; border-bottom:1px solid #ddd; margin-left:60px; box-sizing: border-box; color: #666;}
.travelControlTrip .collection-item{width:400px; height:110px;border-bottom:1px solid #ddd; margin-left:60px; box-sizing: border-box; color: #666;}
.travelControlTrip .collection-item>div{width:130px; float: left;padding-top: 25px;}
.travelControlTrip .collection-item img{vertical-align: sub; margin-right:12px;}
.travelControlTrip .collection-item span{font-size: 18px; color: #000; margin-left: 20px;}
.travelControlTrip .collection-item span{font-size: 18px; color: #000;width:270px;display: inline-block;float: left;padding-top: 25px;}
.travelControlTrip .flight-table{width:960px; color: #666; margin-bottom: 90px; background: #fff;}
.travelControlTrip .flight-table td.thClass {height: 50px; background: #e2e2e2; font-size: 16px; font-weight: normal; padding: 0!important;}
.travelControlTrip .flight-table tr td{background: #f7f7f7; text-align: center; font-size: 14px; padding: 15px 10px; }
......
src/components/Details.vue
View file @ 2b781142
......@@ -533,6 +533,9 @@ export default {
case "/AccountPageList": //财务 下属账号页面
path = "/institutionsManagement";
break;
case "/SalesFinancialDetail": //销售
path = "/groupTourOrder";
break;
}
//找到Root
......@@ -738,6 +741,9 @@ export default {
case "/AccountPageList": //财务 下属账号页面
path = "/institutionsManagement";
break;
case "/SalesFinancialDetail": //销售
path = "/groupTourOrder";
break;
}
//找到Root
......@@ -787,7 +793,7 @@ export default {
},
getTitleByRouter(name){
let obj={}
routerConfig.routes[8].children[10].children.forEach(x=>{
routerConfig.routes[9].children[10].children.forEach(x=>{
if(x.name==name){
obj.comp=x.component
if(x.meta && x.meta.title)
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 2b781142
......@@ -187,6 +187,7 @@
<el-radio :label="2">人民币现金</el-radio>
<el-radio :label="3">外币现金</el-radio>
<el-radio :label="4">资金池</el-radio>
<el-radio :label="5">平台虚拟账户</el-radio>
<!-- <el-radio :label="3">资金池</el-radio> -->
</el-radio-group>
</div>
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 2b781142
......@@ -955,6 +955,7 @@ export default {
if(res.data.resultCode==1){
let AccList = res.data.data;
let newAccList = [];
// if (typeof this.GetDetail.walist !== Array) return false
this.GetDetail.walist.forEach(x=>{
if (x.Type===1){
AccList.forEach(y=>{
......
src/components/SalesModule/MyCustomer.vue
View file @ 2b781142
......@@ -153,7 +153,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户名称：" prop="customerName">
<el-form-item label="门店名称：" prop="customerName">
<el-input :disabled="isOldPerson" v-model="addMsg.customerName" placeholder="请输入" maxlength="20"></el-input>
</el-form-item>
</el-col>
......
src/components/SalesModule/MyCustomerDetail.vue
View file @ 2b781142
......@@ -50,7 +50,7 @@
<el-form label-width="80px">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="客户名称：">
<el-form-item label="门店名称：">
<el-input class='w200' v-model='updateMsg.CustomerName'></el-input>
</el-form-item>
</el-col>
......
src/components/SalesModule/SalesFinancialDetail.vue 0 → 100644
View file @ 2b781142
<style>
.page_SalesFinancialDetail{}
.page_SalesFinancialDetail p.sfd_tit {
border-left: 3px solid #E95252;
text-indent: 10px;
font-size: 16px;
line-height: 30px;
margin: 20px 0 10px 0;
}
.page_SalesFinancialDetail .sfd_nav{margin: 20px 0 0 0 ;}
.page_SalesFinancialDetail .sfd_nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
.page_SalesFinancialDetail .sfd_nav li._active{background-color:#FFFFFF;color: #333333 }
.page_SalesFinancialDetail .sfd_nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
.page_SalesFinancialDetail p.sfd_tit input{
float: right
}
.page_SalesFinancialDetail .sfd_header{
position: relative;
width: 100%;
margin-bottom: 15px;
}
.page_SalesFinancialDetail .sfd_header input{
position: absolute;
right: 0;
bottom: 0;
}
.page_SalesFinancialDetail .sfd_header>ul {
background-color: white;
padding: 15px;
border-radius: 4px;
width: 50%;
}
.page_SalesFinancialDetail .sfd_header>ul>li {
float: left;
width: 33%;
padding: 5px 0;
}
.page_SalesFinancialDetail .sfd_header>ul>li>span {
font-size: 14px;
color: #666;
}
.page_SalesFinancialDetail table.teamRevenueExpenditureTable {
background: #eee;
width: 100%;
margin-bottom: 30px;
}
.page_SalesFinancialDetail table.teamRevenueExpenditureTable th {
background: #D1D1D1;
font-weight: normal !important;
font-size: 14px;
height: 30px;
color: #333;
}
.page_SalesFinancialDetail table.teamRevenueExpenditureTable td {
background: #fff;
height: 36px;
text-align: center;
font-size: 12px;
}
.page_SalesFinancialDetail table.teamRevenueExpenditureTable td:first-child span {
text-decoration: underline;
cursor: pointer;
}
.page_SalesFinancialDetail td.noDataNotice p.iconfont {
font-size: 120px;
color: #ccc;
}
.page_SalesFinancialDetail td.noDataNotice p.text{
color: #999;
margin-bottom: 20px;
}
.page_SalesFinancialDetail .color_red{
color: #e95252 !important;
}
</style>
<template>
<div class="page_SalesFinancialDetail">
<ul class="sfd_nav clearfix">
<li :class="activeTab==1?'_active':''" @click="activeTab=1,getList(1)">收款单</li>
<li :class="activeTab==2?'_active':''" @click="activeTab=2,getList(2)">付款单</li>
</ul>
<div v-loading="loading">
<div class="sfd_header">
<ul class="clearfix">
<li><span>团队编号：</span>{{tcnum}}</li>
<li><span>订单号：</span>{{orderId}}</li>
<li><span>业务员：</span>{{`王大毛`}}</li>
<li><span>应收金额：</span>{{moneyFormat(0)}}</li>
<li><span>实收金额：</span>{{moneyFormat(0)}}</li>
<li><span>代收金额：</span>{{moneyFormat(0)}}</li>
</ul>
<input type="button" :value="`新增${activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()">
</div>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
<th width="10%">费用类型</th>
<th width="10%">交易方式</th>
<th width="10%">金额</th>
<th width="20%">交易日期</th>
<th width="10%">制单人员</th>
<th width="10%">主管审核</th>
<th>出纳审核</th>
<th width="10%">会计审核</th>
</tr>
<tr>
<td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"><span>666</span></th>
<td width="10%">吃饭</td>
<td width="10%">现金</td>
<td width="10%">{{moneyFormat(0)}}</td>
<td width="20%">2019-02-29</td>
<td width="10%">王大毛</td>
<td width="10%">王二毛</td>
<td>王三毛</td>
<td width="10%">王四毛</td>
</tr>
<tr v-if="dataList.length===0">
<td colspan="9" class="noDataNotice">
<div>
<p class="iconfont icon-kong"></p>
<p class="text">{{`暂无数据`}}</p>
</div>
</td>
</tr>
</table>
</div>
</div>
</template>
<script>
export default {
data() {
return {
orderId: 0,
dataList: [],
loading: true,
noData: true,
activeTab: 1,
tcnum: '',
}
}, methods: {
goUrl: function (name, path, id, tcmun) {
this.$router.push({ name: path, query: { id: id, tcmun: tcmun, blank: 'y', tab: name} });
},
getList: function (type) {
this.loading = true
setTimeout(()=>{
this.apipost('', {ID: this.orderId}, res=>{
if (res.data.resultCode == 1) {
this.dataList = res.data.data
} else {
this.$message.error("数据获取失败！");
}
this.loading = false
}, null)
}, 2000)
},
addFinancialOrder: function () { // 新增单据方法
if (this.activeTab === 1) {
let orderObj = {
OrderID: obj.orderId,
OrderSource: 8,
Obj: {},
SourceID: obj.ID,
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": 1,
"companyID": obj.outBranchId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
} else if (this.activeTab === 2) {
let orderObj = {
OrderID: obj.orderId,
OrderSource: 8,
Obj: {},
SourceID: obj.ID,
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": 2,
"companyID": obj.outBranchId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
}
},
}, mounted() {
this.orderId = this.$route.query.orderId
this.tcnum = this.$route.query.tcnum
this.getList(1)
}
}
</script>
src/components/SalesModule/addPassenger.vue
View file @ 2b781142
......@@ -139,10 +139,12 @@
</li>
<li>
<el-form-item label="性别" prop="Sex">
<el-select v-model='addMsg.Sex' size=mini class="w230">
<el-checkbox v-model="addMsg.Sex" true-label='1' false-label='2'>男</el-checkbox>
<el-checkbox v-model="addMsg.Sex" true-label='2' false-label='1'>女</el-checkbox>
<!-- <el-select v-model='addMsg.Sex' size=mini class="w230">
<el-option key="1" label="男" value="1"> </el-option>
<el-option key="2" label="女" value="2"> </el-option>
</el-select>
</el-select> -->
</el-form-item>
</li>
<li>
......@@ -155,21 +157,32 @@
<el-input v-model='addMsg.EName' type="text" size=mini class="w230" maxlength="20" placeholder="请输入英文"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="手机号码" prop="MobilePhone">
<el-input v-model="addMsg.MobilePhone" type="text" size=mini class="w230" maxlength="20" placeholder="请填写"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="出生日期" prop="Birthday">
<el-date-picker v-model='addMsg.Birthday' class="w230" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</li>
<li>
<el-form-item label="出生地" prop="BirthdayAddress">
<el-input v-model="addMsg.BirthdayAddress" type="text" size=mini class="w230" maxlength="20" placeholder="请填写"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="护照号" prop="PassportNo">
<el-input v-model='addMsg.PassportNo' type="text" size=mini class="w230" maxlength="20" placeholder="请填写护照号"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="出生地" prop="BirthdayAddress">
<el-input v-model="addMsg.BirthdayAddress" type="text" size=mini class="w230" maxlength="20" placeholder="请填写"></el-input>
<li>
<el-form-item label="护照签发地" prop="PassportAddress">
<el-input v-model='addMsg.PassportAddress' type="text" size=mini class="w230" maxlength="100" placeholder="请填写"></el-input>
</el-form-item>
</li>
</li>
<li>
<el-form-item label="护照签发日期" prop="PassportIssued">
<el-date-picker v-model='addMsg.PassportIssued' class="w230" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
......@@ -192,17 +205,6 @@
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="护照签发地" prop="PassportAddress">
<el-input v-model='addMsg.PassportAddress' type="text" size=mini class="w230" maxlength="100" placeholder="请填写"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="手机号码" prop="MobilePhone">
<el-input v-model="addMsg.MobilePhone" type="text" size=mini class="w230" maxlength="20" placeholder="请填写"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="婚姻" prop="Marriage">
<el-select v-model="addMsg.Marriage" filterable size=mini class="w230">
......@@ -745,7 +747,7 @@ export default {
PassportAddress: "",
PassportExpiry: "",
PassportNo: "",
Nationality: "",
Nationality: 2,
Marriage: "",
Address: "",
AddressDetail: "",
......@@ -768,14 +770,14 @@ export default {
UnitName: "",
UnitPhone: "",
UnitPost: "",
Purpose: "",
Purpose: "观光",
IsDepartureRecord: "2",
LastTime: "",
DeadlineTime: "",
NCNationality: "",
HotelTel: "",
HotelAddress: "",
HotelName: "",
HotelName: "参照\"赴日予定表\"",
EmergencyContact: "",
EmergencyAddress: "",
EmergencyTel: "",
......@@ -1964,7 +1966,7 @@ export default {
this.addMsg.PassportAddress= "";
this.addMsg.PassportExpiry= "";
this.addMsg.PassportNo= "";
this.addMsg.Nationality= "";
this.addMsg.Nationality= 2;
this.addMsg.Marriage= "";
this.addMsg.Address= "";
this.addMsg.AddressDetail= "";
......@@ -1987,14 +1989,14 @@ export default {
this.addMsg.UnitName= "";
this.addMsg.UnitPhone= "";
this.addMsg.UnitPost= "";
this.addMsg.Purpose= "";
this.addMsg.Purpose= "观光";
this.addMsg.IsDepartureRecord= "2";
this.addMsg.LastTime= "";
this.addMsg.DeadlineTime= "";
this.addMsg.NCNationality= "";
this.addMsg.HotelTel= "";
this.addMsg.HotelAddress= "";
this.addMsg.HotelName= "";
this.addMsg.HotelName= "参照\"赴日予定表\"";
this.addMsg.EmergencyContact= "";
this.addMsg.EmergencyAddress= "";
this.addMsg.EmergencyTel= "";
......@@ -2012,6 +2014,19 @@ export default {
this.addMsg.SafeReplaceId= "0";
this.GetGuestMustVisaAir();
let userInfo = this.getLocalStorage();
var BranchName=userInfo.BranchName;
if(BranchName.search("武汉")!=-1){
this.addMsg.BirthdayAddress="湖北";
this.addMsg.PassportAddress="湖北";
}else if(BranchName.search("西安")!=-1){
this.addMsg.BirthdayAddress="陕西";
this.addMsg.PassportAddress="陕西";
}else if(BranchName.search("长沙")!=-1){
this.addMsg.BirthdayAddress="湖南";
this.addMsg.PassportAddress="湖南";
}
this.addMsg.IssuingAuthority="公安部出入境管理局";
}
},
mounted() {
......@@ -2029,6 +2044,19 @@ export default {
this.getAccessToken();
this.addMsg.TCID = this.$route.query.TCID;
this.addMsg.OrderId = this.$route.query.orderId;
let userInfo = this.getLocalStorage();
var BranchName=userInfo.BranchName;
if(BranchName.search("武汉")!=-1){
this.addMsg.BirthdayAddress="湖北";
this.addMsg.PassportAddress="湖北";
}else if(BranchName.search("西安")!=-1){
this.addMsg.BirthdayAddress="陕西";
this.addMsg.PassportAddress="陕西";
}else if(BranchName.search("长沙")!=-1){
this.addMsg.BirthdayAddress="湖南";
this.addMsg.PassportAddress="湖南";
}
this.addMsg.IssuingAuthority="公安部出入境管理局";
}
};
</script>
\ No newline at end of file
src/components/SalesModule/customerTransfer.vue
View file @ 2b781142
......@@ -22,7 +22,7 @@
</el-select>
</li>
<li><span><em>关键字</em></span>
<el-input v-model='msg.CustomerName' placeholder="请输入客户名称或电话"></el-input>
<el-input v-model='msg.CustomerName' placeholder="请输入门店名称或电话"></el-input>
</li>
<li><input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
<el-popover width='280' v-model='layerShow' popper-class='pd20' trigger="click">
......@@ -56,8 +56,8 @@
<table class="customerTransferTable mt20" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="15%">
客户名称
<!--<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>客户名称</label>-->
门店名称
<!--<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>门店名称</label>-->
</th>
<th width="10%">
联系人
......@@ -150,7 +150,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户名称：" prop="CustomerName">
<el-form-item label="门店名称：" prop="CustomerName">
<el-input :disabled="isOldPerson" v-model="addMsg.CustomerName" placeholder="请输入" maxlength="20"></el-input>
</el-form-item>
</el-col>
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ 2b781142
......@@ -148,7 +148,7 @@
<div>
<i class="groupTourOrder_count_green"></i>
<span>应收金额：</span>
<span>{{countData.SumPreferPrice}}</span>
<span>{{moneyFormat(countData.SumPreferPrice)}}</span>
</div>
</div>
</el-col>
......@@ -157,7 +157,7 @@
<div>
<i class="groupTourOrder_count_green"></i>
<span>已收金额：</span>
<span>{{countData.SumIncome}}</span>
<span>{{moneyFormat(countData.SumIncome)}}</span>
</div>
</div>
</el-col>
......@@ -166,7 +166,7 @@
<div>
<i class="groupTourOrder_count_green"></i>
<span>退款金额：</span>
<span>{{countData.SumRefund}}</span>
<span>{{moneyFormat(countData.SumRefund)}}</span>
</div>
</div>
</el-col>
......@@ -175,7 +175,7 @@
<div>
<i class="groupTourOrder_count_green"></i>
<span>平台税金：</span>
<span>{{countData.SumPlatformTax}}</span>
<span>{{moneyFormat(countData.SumPlatformTax)}}</span>
</div>
</div>
</el-col>
......@@ -184,7 +184,7 @@
<div>
<i class="groupTourOrder_count_green"></i>
<span>在途金额：</span>
<span>{{countData.ZaiTu}}</span>
<span>{{moneyFormat(countData.ZaiTu)}}</span>
</div>
</div>
</el-col>
......@@ -193,7 +193,7 @@
<div>
<i class="groupTourOrder_count_green"></i>
<span>未收金额：</span>
<span>{{countData.DaiShou}}</span>
<span>{{moneyFormat(countData.DaiShou)}}</span>
</div>
</div>
</el-col>
......@@ -204,6 +204,7 @@
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="120">单号&团号</th>
<th width="90">客户信息</th>
<th width="70">类型</th>
<th width="180">系列&线路</th>
<!-- <th width="190" style="display:none;">日期</th> -->
......@@ -217,7 +218,6 @@
<th width="80">在途</th>
<th width="80">未收</th>
<th width="60">状态</th>
<th width="90">客户信息</th>
</tr>
<tr>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td>
......@@ -231,6 +231,10 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
</td>
<td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
<p>{{item.contactMobile}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
</td>
......@@ -242,29 +246,25 @@
</td>
<!-- <td style="display:none;">
<p>下单：{{item.createDate}}</p>
<p>发团：{{item.startDate}}</p>
<p>发团：{{item.startDate}}</p>
</td> -->
<td>
{{item.guestNum}}
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td>
<td style="color:#FF9C00">{{moneyFormat(item.tC_Price)}}</td>
<td style="color:#FF9C00">￥{{moneyFormat(item.unit_Price)}}</td>
<td>
<p style="color:#FF9C00">￥{{item.preferPrice}}</p>
<p style="color:#FF9C00">￥{{moneyFormat(item.preferPrice)}}</p>
</td>
<td>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{moneyFormat(item.income)}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{moneyFormat(item.income)}}</span>
</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td>{{item.weiShouMoney}}</td>
<td>{{moneyFormat(item.zaiTuMoney)}}</td>
<td>{{moneyFormat(item.weiShouMoney)}}</td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
<p>{{item.contactMobile}}</p>
</td>
</tr>
<tr>
<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;">
......@@ -649,7 +649,7 @@
}
.enrollTotalSearchTable tr {
border-bottom: 2px solid #333;
/* border-bottom: 2px solid #333; */
}
.enrollTotalSearchTable tr th {
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 2b781142
......@@ -804,7 +804,7 @@
</el-col> -->
<el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input>
<el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1118,7 +1118,7 @@
</el-col>
<el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input>
<el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1406,7 +1406,7 @@
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
<p>下单时间：{{item.createDate}}</p>
</td>
<td>
<img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/>
......@@ -1454,8 +1454,7 @@
</el-popover>
</td>
<td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.tC_Price}}</span>
<span v-else>*****</span>
<span>{{item.tC_Price}}</span>
</td>
<td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.unit_Price}}</span>
......@@ -1653,7 +1652,7 @@
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
<p>下单时间：{{item.createDate}}</p>
</td>
<td>
<img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/>
......@@ -1701,8 +1700,7 @@
</el-popover>
</td>
<td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.tC_Price}}</span>
<span v-else>*****</span>
<span>{{item.tC_Price}}</span>
</td>
<td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.unit_Price}}</span>
......@@ -2169,6 +2167,7 @@ export default {
TCNUM: ''
}
},
IsUpdateOrderMoney: false,
//订单编号及业务员信息
subInfo:{
CreateBy:'',
......@@ -3386,6 +3385,7 @@ export default {
this.loading = false;
this.total = res.data.data.count;
this.list = res.data.data.pageData.rtData;
this.IsUpdateOrderMoney = res.data.data.pageData.isUpdateOrderMoney
this.cancelRtData = res.data.data.pageData.cancelRtData[0].list;
this.seat.YSeat = res.data.data.pageData.ySeatNum
this.seat.CSeat = res.data.data.pageData.eSeatNum
......
src/components/SalesModule/passengerSaleList.vue
View file @ 2b781142
......@@ -53,6 +53,9 @@
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-button type="primary" style='background:#e95252; border-color:#e95252' icon="iconfont icon-shanchu" @click="pal_del(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="下载申请表" placement="top-start">
<el-button type="primary" style='background:#9E8DE3; border-color:#9E8DE3' icon="iconfont icon-img_download" @click="goUrlB(item.Id)"></el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
......@@ -113,6 +116,10 @@ export default {
goUrlA: function (guestId){
this.$router.push({name: 'addPassenger',query:{"TCID":this.msg.tcid,"orderId":this.msg.id,'guestId':guestId}});
},
goUrlB: function (guestId){
let routeData = this.$router.resolve({name: 'VisaPersonalFormSell', query: {data: guestId}});
window.open(routeData.href, '_blank');
},
goUrlP: function () {
this.$router.push({ name: 'passengerListSale', query: { id: this.msg.id, tcnum: this.msg.tcnum, blank: 'y', tab: '旅客分房'} });
},
......
src/components/SalesModule/publicCustomer.vue
View file @ 2b781142
......@@ -52,7 +52,7 @@
<table class="publicCustomerTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="20%">
<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>客户名称</label>
<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>门店名称</label>
</th>
<th width="10%">联系电话</th>
<th width="20%">地址</th>
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 2b781142
......@@ -284,7 +284,6 @@
this.loading = true
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.loading = false
console.log("dmcstatistics_post_GetUniteCombinationNumService", res.data.data);
if (res.data.resultCode == 1) {
this.msg.total = res.data.data.count;
let data = res.data.data.pageData.data;
......@@ -312,6 +311,7 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
this.getLineTeamList();
this.getList()
},
}
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 2b781142
......@@ -888,8 +888,8 @@
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input>
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1158,9 +1158,9 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice">
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' @keyup.native="checkInteger(addMsg,'PreferPrice')" @input.native='getTicheng()'
:disabled="true&&notUpdate"></el-input>
:disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1328,7 +1328,7 @@
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle">
<table class="RegisTrationTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="130">单号</th>
<th width="240">单号</th>
<th width="150">客户信息</th>
<th width="70">人数/机位数</th>
<th width="110">单价</th>
......@@ -1358,7 +1358,8 @@
</div>
<div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" style="color:red">({{item.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
<p>发团：{{item.startDate}}</p>
<p>下单时间：{{item.CreateDate}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
......@@ -1530,7 +1531,8 @@
</div>
<div class="RL_CreatInfo">{{childItem.CreateBy}}<span v-if="childItem.LeaveStr!=''" style="color:red">({{childItem.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{childItem.CommissionSPeopleName}}</div>
<p>发团：{{childItem.startDate}}</p>
<!-- <p>发团：{{childItem.startDate}}</p> -->
<p>下单时间：{{childItem.CreateDate}}</p>
</td>
<td>
<p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="childItem.ContactName">
......@@ -1744,7 +1746,8 @@
</div>
<div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" style="color:red">({{item.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
<p>发团：{{item.StartDate}}</p>
<!-- <p>发团：{{item.StartDate}}</p> -->
<p>下单时间：{{item.CreateDate}}</p>
</td>
<td>
<p v-if="item.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="item.ContactName">{{item.ContactName}}</p>
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 2b781142
......@@ -123,7 +123,7 @@
<div class="TB_comtitle">团队收支明细</div>
<div class="Team_Content">
<el-row :gutter="12">
<el-col :span="5">
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">收客情况</div>
<div>团队编号：{{TCID}}</div>
......@@ -133,7 +133,7 @@
<div>系列：{{DataList.TeamBalance.LtName}}</div>
</div>
</el-col>
<el-col :span="5">
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_shou">
......@@ -147,7 +147,7 @@
</div>
</div>
</el-col>
<el-col :span="5">
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_zhichu">
......@@ -161,7 +161,7 @@
</div>
</div>
</el-col>
<el-col :span="5">
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
......@@ -174,6 +174,18 @@
</div>
</div>
</el-col>
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>提成
</div>
<div class="Team_Incontent">
<div>预计提成<span>￥{{DataList.ExpectedCut}}</span></div>
</div>
</div>
</el-col>
</el-row>
</div>
</div>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 2b781142
......@@ -1078,6 +1078,10 @@
this.queryCommonData.checkDialogAll = false;
this.queryCommonData.ckedplat = [];
}
else
{
this.Info(res.data.message);
}
});
},
//单团设置上架
......
src/components/VisaPersonalForm.vue
View file @ 2b781142
......@@ -173,6 +173,28 @@
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>国籍(或公民身份)及签证种类<input style="width: 100%;" type="text" ></span>
</p>
<p>在日邀请人(如保证人和邀请人是同一个人，请写“同上”)</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>姓名<input style="width: 48%;" type="text" value='同上'></span>
<span>电话<input style="width: 100%;" type="text" ></span>
</p>
<p style=" margin-top: 20px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>地址<input style="width: 100%;" type="text" ></span>
</p>
<p class="_mb0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>出生日期<input style="width: 11%;" type="text" ></span>
<span class="_sex">性别:<span> 男<i></i></span><span>女<i></i></span></span>
</p>
<p class="_tips _date" style="text-align: left;padding-left: 120px;"><span>(年)/(月)/(日)</span></p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>与申请人的关系<input style="width: 100%;" type="text" ></span>
</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>职业和职务<input style="width: 100%;" type="text" ></span>
</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>国籍(或公民身份)及签证种类<input style="width: 100%;" type="text" ></span>
</p>
<p>
<span>*备注/其他需特殊声明的事项（如有）<input style="width: 100%;" type="text" ></span>
</p>
......
src/components/VisaPersonalFormSell.vue 0 → 100644
View file @ 2b781142
<style>
.page_VisaPersonalForm{margin: 0 auto;max-width: 793px;min-width: 793px;background-color: white;padding:50px 0;height: auto !important;margin-bottom: 20px}
p{margin: 5px 0 }
.page_VisaPersonalForm ._tit{text-align: center;font-size: 22px;letter-spacing:20px;}
.page_VisaPersonalForm ._head{text-align:center;margin-top: 20px;display: flex;align-items: center;justify-content: space-between;}
.page_VisaPersonalForm ._head>div{display: inline-block}
.page_VisaPersonalForm ._head ._left{border: 1px solid #000;margin-top: 45px;margin-left: 280px;width: 190px;height: 72px;line-height: 72px;font-size: 12px}
.page_VisaPersonalForm ._head ._right{height: 170px;width: 170px;border: 1px solid #333;margin-right: 50px;font-size: 12px;line-height: 40px}
.page_VisaPersonalForm ._form{margin-top: 20px;font-size: 14px;}
.page_VisaPersonalForm ._form input{border: none;border-bottom: 1px solid #000;padding: 0 20px;margin-left: 10px;outline: none;padding-right: 0px !important;}
.page_VisaPersonalForm ._f_name{margin: 10px 0}
.page_VisaPersonalForm ._f_name ._fn_left{width: 69%;display: inline-block}
.page_VisaPersonalForm ._f_name ._fn_left input{width: 58.2%;}
.page_VisaPersonalForm ._f_name ._fn_right{width: 30%;display: inline-block}
.page_VisaPersonalForm ._tips{margin: 0}
.page_VisaPersonalForm ._tips ._left{display: inline-block;font-size: 10px;padding-left: 140px;}
.page_VisaPersonalForm ._tips ._right{display: inline-block;font-size: 10px;padding-left: 240px;}
.page_VisaPersonalForm ._fx_left{display: inline-block;margin-right: 133px;margin-left: 0!important}
.page_VisaPersonalForm ._mr10{margin-right: 10px}
.page_VisaPersonalForm ._vp_box{margin:0 20px;overflow: hidden;}
.page_VisaPersonalForm ._vp_box p{white-space: nowrap;}
.page_VisaPersonalForm ._date{font-size: 10px;text-align: right;padding-right: 78px}
.page_VisaPersonalForm ._mb0{margin-bottom: 0}
.page_VisaPersonalForm ._sex,._fx_left,._MarriageType{display: inline-block;margin-left: 180px}
.page_VisaPersonalForm ._sex i,._fx_left i,._MarriageType i{display: inline-block;width: 12px;height: 12px;border: 1px solid #000;margin: 0 5px;font-size: 10px;}
.page_VisaPersonalForm ._MarriageType{margin-left: 0!important}
.page_VisaPersonalForm ._sex._yes{float: right}
.page_vpf .normalBtn {color: #fff;min-width: 90px!important;height: 30px;background: #E95252;border: 1px solid #E95252;cursor: pointer;border-radius: 15px;}
.page_vpf .hollowFixedBtn {background: #fff;color: #E95252;width: 90px;height: 30px;border: 1px solid #E95252;cursor: pointer;border-radius: 15px;}
.page_vpf .vpf_btn{text-align: center;margin: 10px 0 40px 0;}
.page_vpf .dialog-footer .normalBtn{width: 90px}
.page_vpf .dialog-footer{text-align: center}
._qr{max-width: 793px;min-width: 793px;position: absolute;top: 88px; padding-left: 17px;}
#canvas{position: absolute;top: 100px;}
[v-cloak] {display: none;}
.page_VisaPersonalForm input:disabled{border: none;background-color: transparent;}
</style>
<template>
<div class="page_vpf" style="width:100%;background-color: white;height:auto;" v-cloak v-loading="loading2" element-loading-text="下载中..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.1)">
<div class="page_VisaPersonalForm">
<canvas v-show="dialogVisible" id="canvas"></canvas>
<div class="_qr">
<label>开启二维码</label>
<el-switch
@change="creatQRCode(1)"
v-model="infoData.PeopleModel.OpenQRCode"
active-color="#13ce66"
inactive-color="#E95252"
active-value="1"
inactive-value="2">
</el-switch>
</div>
<div class="_vp_box" style="">
<p class="_tit">赴日签证申请表</p>
<div class="_head clearfix">
<div class="_left">此处空白处仅供官方使用</div>
<div class="_right">贴</br>照</br>片</br>处</div>
</div>
<div class="_form">
<p class="_f_name">
<span class="_fn_left">姓(请按照护照填写)(英文)<input type="text" v-model="infoData.PeopleModel.ESurName"></span>
<span class="_fn_right">(中文)<input style="width:100%;" type="text" v-model="infoData.PeopleModel.SurName"></span>
</p>
<p class="_f_name">
<span class="_fn_left">名(请按照护照填写)(英文)<input type="text" v-model="infoData.PeopleModel.EName"></span>
<span class="_fn_right">(中文)<input style="width:100%;" type="text" v-model="infoData.PeopleModel.Name"></span>
</p>
<p class="_f_name">
<span class="_fn_left">曾用名(如有)(英文)<input style="width: 66.3%;" type="text" v-model="infoData.PeopleModel.CEName"></span>
<span class="_fn_right">(中文)<input style="width:100%;" type="text" v-model="infoData.PeopleModel.CName"></span>
</p>
<p style="margin-bottom:0">
<span>出生日期<input type="text" v-model="infoData.PeopleModel.Birthday"></span>
<span>出生地点<input style="width:100%;" type="text" v-model="infoData.PeopleModel.BirthdayAddress"></span>
</p>
<p class="_tips"><span v-if="infoData.IsWH==false" class="_left">(年)/(月)/(日)</span><span v-else class="_left">(日)/(月)/(年)</span><span class="_right">(省)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(市)</span></p>
<p class="_f_sex">
<span class="_fx_left">性别 <span> 男<i v-if="infoData.PeopleModel.Sex!='1'"></i><i v-else>X</i></span><span>女<i v-if="infoData.PeopleModel.Sex!='2'"></i><i v-else>X</i></span>
</span>
<span class="_fn_right">婚姻状况
<span v-for="mar in MarriageType" class="_mr10 _MarriageType"><span>{{mar.Name}} <i v-if="infoData.PeopleModel.Marriage!=mar.Id"></i><i v-else>X</i></span></span>
</span>
</p>
<p><span>国籍（或公民身份）<input disabled style="width: 100%;" type="text" v-model="infoData.PeopleModel.NationalityName"></span></p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>曾有的或另有的国籍（或公民身份）<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.CNationality"></span></p>
<p><span>身份证号码<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.IdCard"></span></p>
<p><span>护照类别</span>
<!-- PassportType -->
<span v-for="Pass in PassportTypeList" class="_mr10 _MarriageType"><span>{{Pass.Name}} <i v-if="Pass.Id==infoData.PeopleModel.PassportType">X</i><i v-else></i></span></span>
</p>
<p><span>护照号码<input style="width:100%;" type="text" v-model="infoData.PeopleModel.PassportNo"></span></p>
<p class="_mb0">
<span>签发地点<input style="width: 55.1%;" type="text" v-model="infoData.PeopleModel.PassportAddress"></span>
<span>签发日期<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.PassportIssued"></span>
</p>
<p class="_tips _date"><span v-if="infoData.IsWH==false">(年)/(月)/(日)</span><span v-else>(日)/(月)/(年)</span></p>
<p class="_mb0">
<span>签发机关<input style="width: 55.1%;" type="text" v-model="infoData.PeopleModel.IssuingAuthority"></span>
<span>有效日期<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.PassportExpiry"></span>
</p>
<p class="_tips _date"><span v-if="infoData.IsWH==false">(年)/(月)/(日)</span><span v-else>(日)/(月)/(年)</span></p>
<p><span>赴日目的<input style="width:100%;" type="text" v-model="infoData.PeopleModel.Purpose"></span></p>
<p><span>预定在日逗留日期<input disabled style="width:30%;" type="text" v-model="infoData.PlanModel.EnterCountryTime"></span>～<input disabled style="width:26%;" type="text" v-model="infoData.PlanModel.LeaveCountryTime"></p>
<p><span>预定在日逗留期间<input disabled style="width:30%;" type="text" v-model="infoData.PlanModel.TotalDay"></span> 天</p>
<p class="">
<span>入境口岸<input disabled style="width: 34%;" type="text" v-model="infoData.PlanModel.ArriveAirName"></span>
<span>船舶或航空公司名称<input disabled style="width: 100%;" type="text" v-model="infoData.PlanModel.DepartAlName+infoData.PlanModel.DepartAlCode"></span>
</p>
<p>申请人在日拟入住的酒店名称或友人姓名及住址</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>酒店名称或友人姓名<input style="width: 38%;" type="text" v-model="infoData.PeopleModel.HotelName"></span>
<span>电话<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.HotelTel"></span>
</p>
<br/>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>地址<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.HotelAddress"></span>
</p>
<p>
<span>上次赴日日期及停留时间
<input style="width: 35%;" type="text" v-model="infoData.PeopleModel.LastTime">
~
<input style="width: 34%;" type="text" v-model="infoData.PeopleModel.DeadlineTime">
</span>
</p>
<p>家庭地址（如有多处居住地，请全都写上)</p>
<br/>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>地址<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.AddressDetail"></span>
</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>电话<input style="width: 13%;" type="text" v-model="infoData.PeopleModel.Tel"></span>
<span style="display: inline-block;margin-left: 130px;">手机<input style="width: 45%;" type="text" v-model="infoData.PeopleModel.MobilePhone"></span>
</p>
<p v-if="infoData.IsWH==true">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>电邮<input style="width: 100%;" type="text" value="没有"></span>
</p>
<p>工作单位名称及地址</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>名称<input style="width: 44%;" type="text" v-model="infoData.PeopleModel.UnitName"></span>
<span>电话<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.UnitPhone"></span>
</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>地址<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.UnitAddress"></span>
</p>
<p>
<span>目前的职位<input style="width: 100%;" type="text" v-model="infoData.PeopleModel.Duty"></span>
</p>
</div>
</div>
</div>
<div class="page_VisaPersonalForm">
<div class="_vp_box" style="">
<div class="_form">
<p>*配偶所从事的职业（如果申请人是未成年人，请填写父母的职业）</p>
<p><input style="width: 100%;" type="text" v-model="infoData.PeopleModel.UnitPost"></p>
<p>在日担保人(请填写担保人的详细内容)</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>姓名<input style="width: 48%;" type="text" value='参照"身元保证书"'></span>
<span>电话<input style="width: 100%;" type="text" ></span>
</p>
<p style=" margin-top: 20px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>地址<input style="width: 100%;" type="text" ></span>
</p>
<p class="_mb0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>出生日期<input style="width: 11%;" type="text" ></span>
<span class="_sex">性别:<span> 男<i></i></span><span>女<i></i></span></span>
</p>
<p class="_tips _date" style="text-align: left;padding-left: 120px;"><span v-if="infoData.IsWH==false">(年)/(月)/(日)</span><span v-else>(日)/(月)/(年)</span></p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>与申请人的关系<input style="width: 100%;" type="text" ></span>
</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>职业和职务<input style="width: 100%;" type="text" ></span>
</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>国籍(或公民身份)及签证种类<input style="width: 100%;" type="text" ></span>
</p>
<p>在日邀请人(如保证人和邀请人是同一个人，请写“同上”)</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>姓名<input style="width: 48%;" type="text" value='同上'></span>
<span>电话<input style="width: 100%;" type="text" ></span>
</p>
<p style=" margin-top: 20px;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>地址<input style="width: 100%;" type="text" ></span>
</p>
<p class="_mb0">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>出生日期<input style="width: 11%;" type="text" ></span>
<span class="_sex">性别:<span> 男<i></i></span><span>女<i></i></span></span>
</p>
<p class="_tips _date" style="text-align: left;padding-left: 120px;"><span v-if="infoData.IsWH==false">(年)/(月)/(日)</span><span v-else>(日)/(月)/(年)</span></p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>与申请人的关系<input style="width: 100%;" type="text" ></span>
</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>职业和职务<input style="width: 100%;" type="text" ></span>
</p>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>国籍(或公民身份)及签证种类<input style="width: 100%;" type="text" ></span>
</p>
<p>
<span>*备注/其他需特殊声明的事项（如有）<input style="width: 100%;" type="text" ></span>
</p>
<p>是否:</p>
<p><span>● 在任何国家曾被判决有罪？</span> <span class="_sex _yes"><span> 是<i></i></span><span>否<i v-if="infoData.IsWH==true">X</i><i v-else>√</i></span></span> </p>
<p><span>● 在任何国家曾被判处一年或一年以上徒刑？**</span> <span class="_sex _yes"><span> 是<i></i></span><span>否<i v-if="infoData.IsWH==true">X</i><i v-else>√</i></span></span> </p>
<p><span>● 在任何国家曾因非法滞留或违反该国法律法规而被驱逐出境？</span> <span class="_sex _yes"><span> 是<i></i></span><span>否<i v-if="infoData.IsWH==true">X</i><i v-else>√</i></span></span> </p>
<p><span>● 因违反任何国家关于取缔毒品、大麻、鸦片、兴奋剂或精神药物的法律法规被</span> </p>
<p><span>&nbsp;&nbsp;&nbsp;判刑？**</span><span class="_sex _yes"><span> 是<i></i></span><span>否<i v-if="infoData.IsWH==true">X</i><i v-else>√</i></span></span> </p>
<p><span>● 从事卖淫活动或曾为卖淫中介、拉客，或曾为卖淫或其他与卖淫有直接联系的</span> </p>
<p><span>&nbsp;&nbsp;&nbsp;活动提供场所？</span><span class="_sex _yes"><span> 是<i></i></span><span>否<i v-if="infoData.IsWH==true">X</i><i v-else>√</i></span></span> </p>
<p><span>● 有过贩卖人口的经历或教唆或协助他人从事贩卖人口的活动？</span> <span class="_sex _yes"><span> 是<i></i></span><span>否<i v-if="infoData.IsWH==true">X</i><i v-else>√</i></span></span> </p>
<p style="font-size:10px">**若您曾被判刑，即使该刑罚为缓期执行，请选择“是”。</p>
<br/>
<p>若以上问题的回答中有“是”的，请说明具体情况。</p>
<p style="height:64px;border: 1px solid #000;width:97%">
</p>
<div>
<p>本人特此声明：上述填写内容真实且无误。本人了解入境身份及在日停留期限将在入境日本时由日本入国管理局决定。</p>
<p>本人知悉，签证并非授予持有者进入日本的权利，如果签证持有者在到达港口时被发现属于不允许入境的情况，亦无权</p>
<p>进入日本。</p>
<p>本人特此同意：我（通过指定的且有签证代办权的旅行社）向日本使馆/总领馆提交个人材料。以及当需要支付签证费</p>
<p>时，（委托代办机构）向日本使馆/总领馆支付签证费。</p>
</div>
<div style="margin-top:45px;margin-bottom:15px">
<p class="_mb0"><span>申请日期</span><input style="width: 18%;" type="text" v-model="infoData.PeopleModel.Date"><span style="display: inline-block;margin-left: 100px;">申请人签名</span><input style="width: 18%;" type="text"></p>
<p style="margin:0"><span v-if="infoData.IsWH==false" style="padding-left: 110px; font-size: 10px;">(年)/(月)/(日)</span><span v-else style="padding-left: 110px; font-size: 10px;">(日)/(月)/(年)</span></p>
</div>
<p style="font-size:8px">* 可不填写</p>
<p>签证申请中提交的任何个人信息以及追加材料所涉及的个人信息（以下简称“保留的个人信息”）将依照行政机关保护</p>
<p>个人信息法（第58号法案，2003，以下简称“该法”），被恰当的处理。保留的个人信息仅会被用做处理签证申请的目</p>
<p>的以及该法中第八条款所认定的必要目的范围之内。</p>
<p style="text-align: right;font-size:10px">(H24.05改訂)</p>
</div>
</div>
</div>
<div class="vpf_btn" v-if="!ok">
<button class="normalBtn" type="button" @click="addForm()"> <i class="iconfont icon-bianji-smal"></i> 保存并下载</button>
<button class="hollowFixedBtn" @click="goUrl(url)">返回</button>
<!-- <button class="normalBtn" @click="creatQRCode()">生成电子签名</button> -->
</div>
</div>
</template>
<script>
import QRCode from 'qrcode'
import Vue from "vue"
Vue.use(QRCode)
export default {
data(){
return{
ID:0,
infoData:{
"PeopleModel":{
"Address":"gsda",
"AddressDetail":"gsdafsa",
"Birthday":"2018/08/10",
"Duty":"员工",
"EconomicCapability":{
},
"EName":"GSAF",
"ESurName":"GSDSF",
"HistoryRecord":"良好",
"Id":119,
"IdentityType":"身份证",
"IsHightSchool":1,
"IsRecommend":2,
"Marriage":3,
"Name":"二狗",
"NationalityName":"中国",
"Nationality":2,
"PassportAddress":"北京",
"PassportExpiry":"2019/08/31",
"PassportNo":"P324234",
"Remarks":"gsa ",
"Sex":"1",
"SurName":"王",
"VisaPlanId":44,
"PassportType":2,
"Signature":null,
"OpenQRCode":"1",
"PassportIssued":"2018/08/17",
"IdCard":"123213213",
"Tel":"32423423",
"MobilePhone":"213123123",
"UnitName":"哥斯达",
"UnitPhone":"12312314",
"UnitPost":"公司",
"EmergencyAddress":"干撒发生的v",
"EmergencyContact":"vcxba",
"EmergencyRelation":"戈萨德",
"EmergencyTel":"234234",
"TravelCost":233333,
"TravelName":"搞的撒",
"MutualFriends":"公司打法倒萨个",
"IsDepartureRecord":1,
"LastTime":"2018/08",
"DeadlineTime":"2018/08",
"NCNationality":"公司",
"Date":"2018/08/17"
},
"PlanModel":{
"ArriveAirName":"东京机场",
"DepartAlCode":"IAC",
"DepartAlName":"测试航空公司",
"DepartFlight":"DDDDD123",
"EnterCountryTime":"2018/02/19",
"LeaveCountryTime":"2018/02/24",
"TotalDay":6
}
},
MarriageType:[],
PassportTypeList:[],
QRCode:false,
dialogVisible:false,
isOpen:false,
QRpath:'',
ok:false,
loading2:false,
url:''
}
},mounted(){
this.ID = this.$route.query.data
this.ok = this.$route.query.ok
this.url = this.$route.query.url
this.getInfo()
this.getMarriageType()
this.getPassportTypeList()
this.getQR()
},methods:{
goUrl(path){
this.$router.push({ name: path })
},
handleClose(done){
done();
},
creatQRCode(type){
if(type==1){
this.apipost('dmc_post_SetOpenQRCode',{VisaPeopleId:this.ID},res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message)
}else{
this.$message.error(res.data.message)
}
},err=>{})
}
if(this.infoData.PeopleModel.OpenQRCode=="1"){
this.dialogVisible=true
setTimeout(() => {
let path = this.QRpath
var canvas = document.getElementById('canvas')
QRCode.toCanvas(canvas, path, function (error) {
if (error) console.error(error)
console.log('success!');
})
},1000);
}else{
this.dialogVisible=false
}
},
addForm(){
let msg = {
"AddressDetail":this.infoData.PeopleModel.AddressDetail==null?'':this.infoData.PeopleModel.AddressDetail,
"Birthday":this.infoData.PeopleModel.Birthday==null?'':this.infoData.PeopleModel.Birthday,
"BirthdayAddress":this.infoData.PeopleModel.BirthdayAddress==null?'':this.infoData.PeopleModel.BirthdayAddress,
"Duty":this.infoData.PeopleModel.Duty==null?'':this.infoData.PeopleModel.Duty,
"EName":this.infoData.PeopleModel.EName==null?'':this.infoData.PeopleModel.EName,
"ESurName":this.infoData.PeopleModel.ESurName==null?'':this.infoData.PeopleModel.ESurName,
"Id":this.ID,
"Marriage":this.infoData.PeopleModel.Marriage==null?'':this.infoData.PeopleModel.Marriage,
"Name":this.infoData.PeopleModel.Name==null?'':this.infoData.PeopleModel.Name,
"PassportAddress":this.infoData.PeopleModel.PassportAddress==null?'':this.infoData.PeopleModel.PassportAddress,
"PassportExpiry":this.infoData.PeopleModel.PassportExpiry==null?'':this.infoData.PeopleModel.PassportExpiry,
"PassportNo":this.infoData.PeopleModel.PassportNo==null?'':this.infoData.PeopleModel.PassportNo,
"Sex":this.infoData.PeopleModel.Sex==null?'':this.infoData.PeopleModel.Sex,
"SurName":this.infoData.PeopleModel.SurName==null?'':this.infoData.PeopleModel.SurName,
"PassportIssued":this.infoData.PeopleModel.PassportIssued==null?'':this.infoData.PeopleModel.PassportIssued,
"IssuingAuthority":this.infoData.PeopleModel.IssuingAuthority==null?'':this.infoData.PeopleModel.IssuingAuthority,
"IdCard":this.infoData.PeopleModel.IdCard==null?'':this.infoData.PeopleModel.IdCard,
"CEName":this.infoData.PeopleModel.CEName==null?'':this.infoData.PeopleModel.CEName,
"CName":this.infoData.PeopleModel.CName==null?'':this.infoData.PeopleModel.CName,
"CNationality":this.infoData.PeopleModel.CNationality==null?'':this.infoData.PeopleModel.CNationality,
"Tel":this.infoData.PeopleModel.Tel==null?'':this.infoData.PeopleModel.Tel,
"MobilePhone":this.infoData.PeopleModel.MobilePhone==null?'':this.infoData.PeopleModel.MobilePhone,
"UnitAddress":this.infoData.PeopleModel.UnitAddress==null?'':this.infoData.PeopleModel.UnitAddress,
"UnitName":this.infoData.PeopleModel.UnitName==null?'':this.infoData.PeopleModel.UnitName,
"UnitPhone":this.infoData.PeopleModel.UnitPhone==null?'':this.infoData.PeopleModel.UnitPhone,
"UnitPost":this.infoData.PeopleModel.UnitPost==null?'':this.infoData.PeopleModel.UnitPost,
"Purpose":this.infoData.PeopleModel.Purpose==null?'':this.infoData.PeopleModel.Purpose,
"LastTime":this.infoData.PeopleModel.LastTime==null?'':this.infoData.PeopleModel.LastTime,
"DeadlineTime":this.infoData.PeopleModel.DeadlineTime==null?'':this.infoData.PeopleModel.DeadlineTime,
"HotelTel":this.infoData.PeopleModel.HotelTel==null?'':this.infoData.PeopleModel.HotelTel,
"HotelAddress":this.infoData.PeopleModel.HotelAddress==null?'':this.infoData.PeopleModel.HotelAddress,
"HotelName":this.infoData.PeopleModel.HotelName==null?'':this.infoData.PeopleModel.HotelName,
"Date":this.infoData.PeopleModel.Date==null?'':this.infoData.PeopleModel.Date,
}
this.apipost('dmc_post_visa_SetVisaApplyForInfo',msg,res=>{
if(res.data.resultCode==1){
this.downLoad()
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
downLoad(){ // 下载申请材料
this.loading2= true
this.apipost('dmc_get_DownLoadWordForApplyForSell',{VisaPeopleId:this.ID},res=>{
if(res.data.resultCode==1){
const link = document.createElement('a');
let _loadUrl=this.domainManager().DomainUrl
let str = window.location.href
link.href = _loadUrl+res.data.data
document.body.appendChild(link);
link.click();
this.$message.success('导出成功！')
this.loading2 = false
}else{
this.loading2 = false
this.$message.error(res.data.message)
}
},err=>{})
},
getQR(){ // 获取二维码
this.apipost('dmc_get_GetPeopleForeignInfo',{VisaPeopleId:this.ID},res=>{
if(res.data.resultCode==1){
this.QRpath = res.data.data
console.log(this.QRpath)
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getInfo(){ // 获取信息
this.apipost('dmc_get_GetVisaApplyForGrouSignInfoForSell',{VisaPeopleId:this.ID},res=>{
if(res.data.resultCode==1){
console.log(res.data.data)
this.infoData = res.data.data
this.infoData.PeopleModel.OpenQRCode = this.infoData.PeopleModel.OpenQRCode.toString()
if(this.infoData.PeopleModel.OpenQRCode=='1'){
this.dialogVisible=true
this.creatQRCode()
}
this.infoData.PeopleModel.Sex = this.infoData.PeopleModel.Sex.toString()
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getPassportTypeList(){ // 获取护照类别
this.apipost('dmc_get_visa_GetPassportTypeList',{VisaPeopleId:this.ID},res=>{
if(res.data.resultCode==1){
this.PassportTypeList = res.data.data
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getMarriageType(){//获取婚姻
let msg = {};
this.apipost("dmc_get_visa_GetVisaMarriageTypeEnum",msg,res => {
if(res.data.resultCode==1){
this.MarriageType = res.data.data;
this.MarriageType.forEach(x=>{
x.Id = parseInt(x.Id)
})
}else{
this.$message.error(res.data.message)
}
},err => {});
},
}
}
</script>
src/components/confirmationOrderDownLoad.vue
View file @ 2b781142
......@@ -68,15 +68,15 @@
<table v-if='vshowL' class="collection">
<tr>
<td>
<div class="collection-item">
<img src="../assets/img/TravelControlTripIcon9.png" />本团领队
<div class="collection-item clearfix">
<div><img src="../assets/img/TravelControlTripIcon9.png" />本团领队</div>
<span>{{orderTripdiff!=null? orderTripdiff.leaderInfo :
orderMsg.leaderName+(orderMsg.leaderMobile!=null?"/"+orderMsg.leaderMobile:"")}}</span>
</div>
</td>
<td>
<div class="collection-item">
<img src="../assets/img/TravelControlTripIcon10.png" />集合时间
<div class="collection-item clearfix">
<div><img src="../assets/img/TravelControlTripIcon10.png" />集合时间</div>
<span>{{orderTripdiff!=null? orderTripdiff.gatheringTime :
orderMsg.gatheringTime}}</span>
</div>
......@@ -84,15 +84,15 @@
</tr>
<tr>
<td>
<div class="collection-item">
<img src="../assets/img/TravelControlTripIcon11.png" />机场服务
<div class="collection-item clearfix">
<div><img src="../assets/img/TravelControlTripIcon11.png" />机场服务</div>
<span>{{orderTripdiff!=null ? orderTripdiff.airportService : orderMsg.airportServicePerson+"/"+
orderMsg.airportServicePhone}}</span>
</div>
</td>
<td>
<div class="collection-item">
<img src="../assets/img/TravelControlTripIcon12.png" />集合标识
<div class="collection-item clearfix">
<div><img src="../assets/img/TravelControlTripIcon12.png" />集合标识</div>
<span>{{orderTripdiff!=null? orderTripdiff.gatherIdent :
orderMsg.bName}}</span>
</div>
......@@ -100,8 +100,8 @@
</tr>
<tr>
<td>
<div class="collection-item">
<img src="../assets/img/TravelControlTripIcon13.png" />紧急联系人
<div class="collection-item clearfix">
<div><img src="../assets/img/TravelControlTripIcon13.png" />紧急联系人</div>
<template>
<span v-if='vshowLLR'> {{orderTripdiff!=null ?
orderTripdiff.emergencyContact : orderMsg.branchManager+"/"+orderMsg.mobilePhone}}</span>
......@@ -111,8 +111,8 @@
</div>
</td>
<td>
<div class="collection-item">
<img src="../assets/img/TravelControlTripIcon14.png" />集合地点
<div class="collection-item clearfix">
<div><img src="../assets/img/TravelControlTripIcon14.png" />集合地点</div>
<span>{{orderTripdiff!=null? orderTripdiff.gatheringAddress :
orderMsg.gatheringAddress}}</span>
</div>
......
src/plug/index.js
View file @ 2b781142
......@@ -115,13 +115,13 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.214:8082"; //214主域名
domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //王悦主域名
// domainUrl = "http://192.168.2.16:8083"; //刘东主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名
domainUrl = "http://192.168.2.214:8082"; //罗超主域名
// domainUrl = "http://192.168.2.106:8082"; //罗超主域名
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com";
}else if (locationName.indexOf('viitto')!==-1) {
......@@ -525,6 +525,7 @@ export default {
//价钱格式化，三位数逗号分隔，保留两位小数 duanjun
Vue.prototype.moneyFormat = function (value) {
if(!value) return ('0.00')
let nStr = Number(value).toFixed(2)
nStr += '';
let x = nStr.split('.');
......
src/router/config.js
View file @ 2b781142
......@@ -22,6 +22,11 @@ export default {
name: 'VisaPersonalFormTuan',
component: resolve => require(['@/components/VisaPersonalFormTuan'], resolve),
},
{ //签证个人申请表信息
path: '/VisaPersonalFormSell',
name: 'VisaPersonalFormSell',
component: resolve => require(['@/components/VisaPersonalFormSell'], resolve),
},
{ //财务打印页面
path: '/PrintPage',
name: 'PrintPage',
......@@ -1766,6 +1771,14 @@ export default {
title: '跟团游订单'
},
},
{ // 销售 跟团游订单
path: '/SalesFinancialDetail',
name: 'SalesFinancialDetail',
component: resolve => require(['@/components/SalesModule/SalesFinancialDetail'], resolve),
meta: {
title: '销售财务单据'
},
},
{ // 销售 拜访月历
path: '/visitMonthStatistics',
name: 'visitMonthStatistics',
......
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