Skip to content

S
SuperMan
Commit 3913bcd7 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents feea6981 464f8a7d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 220 deletions
src/components/DomesticTravelcontract.vue
View file @ 3913bcd7
...@@ -313,10 +313,10 @@ ...@@ -313,10 +313,10 @@
} }
.TC-MainContent .disClick { .TC-MainContent .disClick {
background-color: #d1d1d1!important; background-color: #d1d1d1 !important;
color: #fff!important; color: #fff !important;
background-image: none; background-image: none;
border: 1px solid #d1d1d1!important; border: 1px solid #d1d1d1 !important;
} }
.TC-MainContent .disClick:hover { .TC-MainContent .disClick:hover {
...@@ -341,7 +341,8 @@ ...@@ -341,7 +341,8 @@
<span style="color:blue;font-size:14px;"></span> <span style="color:blue;font-size:14px;"></span>
</span> </span>
<div class="pull-right"> <div class="pull-right">
<input type="button" class="btn-warning" :class="{'disClick':!isSubmit}" @click="submitForm('CtObj')" value="保存" /> <input type="button" class="btn-warning" :class="{'disClick':!isSubmit}" @click="submitForm('CtObj')"
value="保存" />
</div> </div>
</div> </div>
<el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj"> <el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj">
...@@ -1227,7 +1228,8 @@ ...@@ -1227,7 +1228,8 @@
ContractTripList: [], //行程列表 ContractTripList: [], //行程列表
ContractSelfFeeList: [], //自愿付费项目补充协议 ContractSelfFeeList: [], //自愿付费项目补充协议
TripType: 0, //行程类型(0-简易行程，1-标准行程) TripType: 0, //行程类型(0-简易行程，1-标准行程)
TCID: 0,
OrderId: 0,
}, },
//旅客名单 //旅客名单
guestList: [], guestList: [],
...@@ -1359,9 +1361,14 @@ ...@@ -1359,9 +1361,14 @@
res => { res => {
this.isSubmit = true; this.isSubmit = true;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message); this.Success(res.data.message);
this.CtObj.ID = res.data.data;
this.$router.push({
name: 'DomesticTravelcontract',
query: {
id: res.data.data,
}
});
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -1660,7 +1667,14 @@ ...@@ -1660,7 +1667,14 @@
item.IsShow = 0; item.IsShow = 0;
this.$forceUpdate(); this.$forceUpdate();
}, },
},
created() {
if (this.$route.query.TCID && this.$route.query.TCID > 0) {
this.CtObj.TCID = this.$route.query.TCID;
}
if (this.$route.query.orderID && this.$route.query.orderID > 0) {
this.CtObj.OrderId = this.$route.query.orderID;
}
}, },
mounted() { mounted() {
if (this.$route.query.id && this.$route.query.id > 0) { if (this.$route.query.id && this.$route.query.id > 0) {
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 3913bcd7
...@@ -1768,8 +1768,14 @@ ...@@ -1768,8 +1768,14 @@
}); });
this.CurrencyListMoney.forEach((cur, i) => { this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr.forEach(lead => { cur.LeaderGetPriceArr.forEach(lead => {
lead.LeaderGetPriceT = if(lead.LeaderGetPrice==0){
lead.LeaderGetPriceT = (Math.floor((cur.money * this.comRate - cur.yiLing) * 100) / 100)/10000;
lead.LeaderGetPriceT = lead.LeaderGetPriceT.toFixed(1)*10000
}else{
lead.LeaderGetPriceT =
Math.floor((cur.money * this.comRate - cur.yiLing) * 100) / 100; Math.floor((cur.money * this.comRate - cur.yiLing) * 100) / 100;
}
lead.PlanPrice = cur.money * this.comRate; lead.PlanPrice = cur.money * this.comRate;
}); });
}); });
......
src/components/SalesModule/groupTourOrder.vue
View file @ 3913bcd7
...@@ -2165,13 +2165,16 @@ ...@@ -2165,13 +2165,16 @@
" v-for="(id, i) in item.tipFrId" :key="i">{{ id }}</span> " v-for="(id, i) in item.tipFrId" :key="i">{{ id }}</span>
</span> </span>
</div> </div>
<div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
<span class="GO_Contract"
@click="goSingleContract(item)">{{item.otherContractList.length==0?"单项合同":"查看单项合同"}}</span>
</div>
<div v-if=" <div v-if="
item.contractNum.length == 0 && item.contractNum.length == 0 &&
(qjGroupId == userInfo.RB_Group_id || F_ContractManagement) (qjGroupId == userInfo.RB_Group_id || F_ContractManagement)
"> ">
<span class="GO_Contract" @click="goContract(item, {})">{{ <span class="GO_Contract" @click="goContract(item, {})">出境合同</span>
$t("salesModule.GetContract")
}}</span>
</div> </div>
<div v-else> <div v-else>
<template v-if="item.contractNum && item.contractNum.length > 0"> <template v-if="item.contractNum && item.contractNum.length > 0">
...@@ -2931,6 +2934,14 @@ ...@@ -2931,6 +2934,14 @@
}, },
}); });
}, },
//跳转单单项合同
goSingleContract(item) {
let query = {
TCID: item.tcid,
orderID: item.orderId,
}
this.OpenNewPage('/ContractManage', query)
},
//跳转至领取合同 //跳转至领取合同
goContract(item, sItem) { goContract(item, sItem) {
let cid = 0; let cid = 0;
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 3913bcd7
...@@ -2381,7 +2381,11 @@ ...@@ -2381,7 +2381,11 @@
<!--&&item==userId--> <!--&&item==userId-->
<div v-if="item.contractNum && item.contractNum.length==0 &&item.isOwn==1" class="GO_Contract" <div v-if="item.contractNum && item.contractNum.length==0 &&item.isOwn==1" class="GO_Contract"
@click="goContract(item,{})"> @click="goContract(item,{})">
领取合同 出境合同
</div>
<div v-if="item.otherContractList &&item.isOwn==1" class="GO_Contract"
@click="goSingleContract(item)">
{{item.otherContractList.length==0?"单项合同":"查看单项合同"}}
</div> </div>
<div> <div>
<template v-if="item.contractNum && item.contractNum.length > 0"> <template v-if="item.contractNum && item.contractNum.length > 0">
...@@ -5501,6 +5505,7 @@ ...@@ -5501,6 +5505,7 @@
"sellorder_post_GetTCNUMOrderList", "sellorder_post_GetTCNUMOrderList",
this.tuanMsg, this.tuanMsg,
(res) => { (res) => {
console.log("sellorder_post_GetTCNUMOrderList", res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false; this.loading = false;
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -5583,6 +5588,14 @@ ...@@ -5583,6 +5588,14 @@
}, },
}); });
}, },
//跳转单单项合同
goSingleContract(item) {
let query = {
TCID: item.tcid,
orderID: item.orderId,
}
this.OpenNewPage('/ContractManage', query)
},
//跳转至领取合同 //跳转至领取合同
goContract(item, sItem) { goContract(item, sItem) {
let guestId = 0; let guestId = 0;
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 3913bcd7
...@@ -3919,10 +3919,10 @@ ...@@ -3919,10 +3919,10 @@
}, },
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
if (this.TotalNumber == 0) { // if (this.TotalNumber == 0) {
this.$message.error('总人数不能小于1人') // this.$message.error('总人数不能小于1人')
return // return
} // }
this.$refs[addMsg].validate(valid => { this.$refs[addMsg].validate(valid => {
if (valid) { if (valid) {
this.saveOrder(); this.saveOrder();
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 3913bcd7
...@@ -1687,11 +1687,15 @@ ...@@ -1687,11 +1687,15 @@
<span style="display: block">{{$t('salesModule.RoomInfo')}}：{{item.orderGuestHouseStr}}</span> <span style="display: block">{{$t('salesModule.RoomInfo')}}：{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">（{{$t('fnc.xiaofei')}}：{{item.tipMoney}}）</span> <span v-if="item.tipMoney" style="color:red">（{{$t('fnc.xiaofei')}}：{{item.tipMoney}}）</span>
<div v-if="item.otherContractList">
<div v-if=" item.contractNum.length == 0"> <span class="GO_Contract" style="color:blue;cursor:pointer;" @click="goSingleContract(item)">
<span class="GO_Contract" style="color:blue;cursor:pointer;" @click="goContract(item, {})">{{ {{item.otherContractList.length==0?"单项合同":"查看单项合同"}}
$t("salesModule.GetContract") </span>
}}</span> </div>
<div v-if="item.contractNum.length == 0">
<span class="GO_Contract" style="color:blue;cursor:pointer;" @click="goContract(item, {})">
出境合同
</span>
</div> </div>
<div v-else> <div v-else>
<template v-if="item.contractNum && item.contractNum.length > 0"> <template v-if="item.contractNum && item.contractNum.length > 0">
...@@ -2280,6 +2284,14 @@ ...@@ -2280,6 +2284,14 @@
this.isShowLayerRemarks = false; this.isShowLayerRemarks = false;
this.getList(); this.getList();
}, },
//跳转单单项合同
goSingleContract(item) {
let query = {
TCID: item.tcid,
orderID: item.orderId,
}
this.OpenNewPage('/ContractManage', query)
},
//跳转至领取合同 //跳转至领取合同
goContract(item, sItem) { goContract(item, sItem) {
let guestId = 0; let guestId = 0;
......
src/components/SingleContract.vue
View file @ 3913bcd7
...@@ -1375,7 +1375,9 @@ ...@@ -1375,7 +1375,9 @@
ContractTicketAndHotel: { // 机票和酒店组合信息 ContractTicketAndHotel: { // 机票和酒店组合信息
ContractTickets: [], ContractTickets: [],
ContractHotels: [] ContractHotels: []
} },
TCID: 0,
OrderId: 0,
}, },
rules: { rules: {
Tourists_Name: [{ Tourists_Name: [{
...@@ -1413,7 +1415,6 @@ ...@@ -1413,7 +1415,6 @@
menuArr: ['合同基本信息', '相关告知及提示', '费用计算', '游客信息', '机票预订', '酒店预订', '接送服务', '代办签证', '服务组合（机票与酒店）', '其他单项服务事宜'], menuArr: ['合同基本信息', '相关告知及提示', '费用计算', '游客信息', '机票预订', '酒店预订', '接送服务', '代办签证', '服务组合（机票与酒店）', '其他单项服务事宜'],
ckedIndex: 0, ckedIndex: 0,
ckedAll: false, ckedAll: false,
//旅客信息 //旅客信息
touristList: [], touristList: [],
editorOption: { editorOption: {
...@@ -1424,7 +1425,6 @@ ...@@ -1424,7 +1425,6 @@
] ]
} }
}, },
//防止重复提交 //防止重复提交
isSubmit: true, isSubmit: true,
//大写金额 //大写金额
...@@ -1462,9 +1462,14 @@ ...@@ -1462,9 +1462,14 @@
res => { res => {
this.isSubmit = true; this.isSubmit = true;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message); this.Success(res.data.message);
this.CtObj.ID = res.data.data;
this.$router.push({
name: 'SingleContract',
query: {
id: res.data.data,
}
});
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -1680,7 +1685,6 @@ ...@@ -1680,7 +1685,6 @@
this.ckedIndex = 8 this.ckedIndex = 8
} }
}, },
GetData() { GetData() {
this.apipost( this.apipost(
"travelcontract_get_GetTravelContractService", { "travelcontract_get_GetTravelContractService", {
...@@ -1787,8 +1791,8 @@ ...@@ -1787,8 +1791,8 @@
this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice; this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice; this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
this.CtObj.SignType = tempObj.SignType; this.CtObj.SignType = tempObj.SignType;
this.CtObj.TravelAgency_Name=tempObj.TravelAgency_Name; this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
this.CtObj.TravelAgency_Address=tempObj.TravelAgency_Address; this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
this.CtObj.TicketAndHotelTotalPrice = this.CtObj.TicketAndHotelTotalPrice =
tempObj.TicketAndHotelTotalPrice; tempObj.TicketAndHotelTotalPrice;
if ( if (
...@@ -2029,7 +2033,14 @@ ...@@ -2029,7 +2033,14 @@
this.AmountMoney = strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace( this.AmountMoney = strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(
/零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元") /零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元")
} }
},
created() {
if (this.$route.query.TCID && this.$route.query.TCID > 0) {
this.CtObj.TCID = this.$route.query.TCID;
}
if (this.$route.query.orderID && this.$route.query.orderID > 0) {
this.CtObj.OrderId = this.$route.query.orderID;
}
}, },
mounted() { mounted() {
if (this.$route.query.id && this.$route.query.id > 0) { if (this.$route.query.id && this.$route.query.id > 0) {
......
src/components/TravelContractNew.vue
View file @ 3913bcd7
This diff is collapsed.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 3913bcd7
...@@ -6406,7 +6406,7 @@ ...@@ -6406,7 +6406,7 @@
}, },
}); });
}, },
//跳转至领取合同 //跳转到合同详情
goContract(item, sItem) { goContract(item, sItem) {
var guestId = 0; var guestId = 0;
if (sItem && sItem.GuestId) { if (sItem && sItem.GuestId) {
......
src/components/administrative/ContractManage.vue
View file @ 3913bcd7
<style> <style>
.ContractManage .query-box .el-button--primary {
background-color: #fff !important;
color: #e95252 !important;
border-color: #e95252 !important;
}
.ContractManage .query-box .el-button--primary:focus,
.query-box .el-button--primary:hover {
background-color: #fff !important;
color: #e95252 !important;
border-color: #e95252 !important;
}
.ContractManage .query-box .el-button {
border-radius: 16px;
height: 30px;
position: relative;
top: 5px;
}
.ContractManage .query-box .el-button i {
color: #e95252;
}
.ContractManage .query-box .el-button span {
position: relative;
top: -3px;
}
.ContractManage .el-button+.el-button {
margin-left: 0 !important;
}
/*灰色遮罩层*/ /*灰色遮罩层*/
.ContractManage .fade { .ContractManage .fade {
width: 100%; width: 100%;
...@@ -58,6 +25,7 @@ ...@@ -58,6 +25,7 @@
z-index: 999; z-index: 999;
border-radius: 5px; border-radius: 5px;
} }
.ContractManage .Ec_cha { .ContractManage .Ec_cha {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
...@@ -74,6 +42,7 @@ ...@@ -74,6 +42,7 @@
.ContractManage .Ec_cha:hover { .ContractManage .Ec_cha:hover {
color: red; color: red;
} }
</style> </style>
<template> <template>
...@@ -139,6 +108,20 @@ ...@@ -139,6 +108,20 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span><em>团队编号</em>
<el-input class="w210" v-model="msg.TCID" placeholder="请输入团队编号" @keyup.enter.native="getList" clearable
@clear="getList">
</el-input>
</span>
</li>
<li>
<span><em>订单号</em>
<el-input class="w210" v-model="msg.OrderId" placeholder="请输入订单" @keyup.enter.native="getList" clearable
@clear="getList">
</el-input>
</span>
</li>
<li> <li>
<span><em>{{ $t("sm.Date") }}</em> <span><em>{{ $t("sm.Date") }}</em>
<el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date" <el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date"
...@@ -153,7 +136,7 @@ ...@@ -153,7 +136,7 @@
getList(); getList();
resetPageIndex(); resetPageIndex();
" /> " />
<el-dropdown @command="getImport"> <!-- <el-dropdown @command="getImport">
<el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')"> 一日游合同 <el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')"> 一日游合同
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</el-button> </el-button>
...@@ -161,6 +144,14 @@ ...@@ -161,6 +144,14 @@
<el-dropdown-item command="1">境内旅游合同</el-dropdown-item> <el-dropdown-item command="1">境内旅游合同</el-dropdown-item>
<el-dropdown-item command="2">单项委托合同</el-dropdown-item> <el-dropdown-item command="2">单项委托合同</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> -->
<el-dropdown size="medium" @command="getImport" split-button type="primary" @click="handleClick"
style="padding-left:5px;">
一日游合同
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">境内旅游合同</el-dropdown-item>
<el-dropdown-item command="2">单项委托合同</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> </el-dropdown>
</li> </li>
</ul> </ul>
...@@ -239,10 +230,6 @@ ...@@ -239,10 +230,6 @@
v-if="item.Status==0||item.Status==3"> v-if="item.Status==0||item.Status==3">
<el-button type="info" icon="el-icon-upload2" circle @click="SubmitContract(item)"></el-button> <el-button type="info" icon="el-icon-upload2" circle @click="SubmitContract(item)"></el-button>
</el-tooltip> </el-tooltip>
<!-- <el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户">
<el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)"
style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
</el-tooltip> -->
<el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户"> <el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户">
<el-button type="info" icon="iconfont icon-copy-l" circle @click="GetQrCode(item)" <el-button type="info" icon="iconfont icon-copy-l" circle @click="GetQrCode(item)"
style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button> style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
...@@ -264,7 +251,7 @@ ...@@ -264,7 +251,7 @@
<div class="fade" v-show="isShowFade"></div> <div class="fade" v-show="isShowFade"></div>
<div class="qrCodeDiv" v-show="isShowFade"> <div class="qrCodeDiv" v-show="isShowFade">
<div style="margin-top:15px;">请扫码签字 <br/>【{{clickObj.T_ContractNum}}】</div> <div style="margin-top:15px;">请扫码签字 <br />【{{clickObj.T_ContractNum}}】</div>
<div id="qrcode" style="margin:25px;" ref="qrcode"> <div id="qrcode" style="margin:25px;" ref="qrcode">
<img class="WeiXinShare" :src="'data:image/png;base64,'+QRCodeStr" /> <img class="WeiXinShare" :src="'data:image/png;base64,'+QRCodeStr" />
</div> </div>
...@@ -294,7 +281,9 @@ ...@@ -294,7 +281,9 @@
TravelAgency_DealMan: "", //经办人 TravelAgency_DealMan: "", //经办人
C_TCNUM: "", //团号 C_TCNUM: "", //团号
C_ProductName: "", //线路名称 C_ProductName: "", //线路名称
IsQueryAll: 0 IsQueryAll: 0,
TCID: "",
OrderId: "",
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -312,11 +301,25 @@ ...@@ -312,11 +301,25 @@
return startTime.getTime() >= time.getTime(); return startTime.getTime() >= time.getTime();
} }
}, },
clickObj:{},//当前选择的合同 clickObj: {}, //当前选择的合同
isShowFade: false, //是否显示二维码图片 isShowFade: false, //是否显示二维码图片
QRCodeStr: "", //二维码图片 QRCodeStr: "", //二维码图片
queryPrams: {
TCID: 0,
orderID: 0,
}
}; };
}, },
created() {
if (this.$route.query.TCID && this.$route.query.TCID > 0) {
this.queryPrams.TCID = this.$route.query.TCID;
this.msg.TCID = this.$route.query.TCID;
}
if (this.$route.query.orderID && this.$route.query.orderID > 0) {
this.queryPrams.orderID = this.$route.query.orderID;
this.msg.OrderId = this.$route.query.orderID;
}
},
mounted() { mounted() {
this.getList(); this.getList();
}, },
...@@ -369,7 +372,7 @@ ...@@ -369,7 +372,7 @@
let msg = { let msg = {
ContractId: item.ID, ContractId: item.ID,
}; };
this.clickObj=item; this.clickObj = item;
this.$http({ this.$http({
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
...@@ -397,8 +400,12 @@ ...@@ -397,8 +400,12 @@
oInput.style.display = 'none'; oInput.style.display = 'none';
this.Info("复制成功!"); this.Info("复制成功!");
}, },
handleClick() {
this.goContract('onedayTripContract', 0, '一日游合同');
},
//跳转 //跳转
getImport(command) { getImport(command) {
console.log("command", command);
if (command == 1) { if (command == 1) {
this.goContract('DomesticTravelcontract', 0, '境内旅游合同'); this.goContract('DomesticTravelcontract', 0, '境内旅游合同');
} else if (command == 2) { } else if (command == 2) {
...@@ -516,6 +523,8 @@ ...@@ -516,6 +523,8 @@
query: { query: {
id: nId, id: nId,
blank: "y", blank: "y",
TCID: this.queryPrams.TCID,
orderID: this.queryPrams.orderID,
tab: title tab: title
} }
}); });
......
src/components/administrative/ElectronicAudit.vue
View file @ 3913bcd7
...@@ -237,6 +237,20 @@ ...@@ -237,6 +237,20 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span><em>团队编号</em>
<el-input class="w210" v-model="msg.TCID" placeholder="请输入团队编号" @keyup.enter.native="resetOtherQuery"
clearable @clear="resetOtherQuery">
</el-input>
</span>
</li>
<li>
<span><em>订单号</em>
<el-input class="w210" v-model="msg.OrderId" placeholder="请输入订单" @keyup.enter.native="resetOtherQuery"
clearable @clear="resetOtherQuery">
</el-input>
</span>
</li>
<li> <li>
<span><em>{{ $t("sm.Date") }}</em> <span><em>{{ $t("sm.Date") }}</em>
<el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date" <el-date-picker v-model="msg.StartDate" class="w135" value-format="yyyy-MM-dd" type="date"
...@@ -410,7 +424,9 @@ ...@@ -410,7 +424,9 @@
C_TCNUM: "", //团号 C_TCNUM: "", //团号
C_ProductName: "", //线路名称 C_ProductName: "", //线路名称
IsAduitPage: 1, //是否是审核页面 IsAduitPage: 1, //是否是审核页面
IsQueryAll: 1 IsQueryAll: 1,
TCID: "",
OrderId: "",
}, },
pickerBeginDateBefore2: { pickerBeginDateBefore2: {
disabledDate: time => { disabledDate: time => {
......
src/components/onedayTripContract.vue
View file @ 3913bcd7
...@@ -333,11 +333,12 @@ ...@@ -333,11 +333,12 @@
background-color: #0044cc; background-color: #0044cc;
*background-color: #003bb3; *background-color: #003bb3;
} }
.TC-MainContent .disClick { .TC-MainContent .disClick {
background-color: #d1d1d1!important; background-color: #d1d1d1 !important;
color: #fff!important; color: #fff !important;
background-image: none; background-image: none;
border: 1px solid #d1d1d1!important; border: 1px solid #d1d1d1 !important;
} }
.TC-MainContent .disClick:hover { .TC-MainContent .disClick:hover {
...@@ -1146,7 +1147,9 @@ ...@@ -1146,7 +1147,9 @@
TicketAndHotelTotalPrice: "0", // 机票加酒店组合总费用 TicketAndHotelTotalPrice: "0", // 机票加酒店组合总费用
ContractShopList: [], //自愿购物活动补充协议 ContractShopList: [], //自愿购物活动补充协议
ContractGuestList: [], //旅客名单 ContractGuestList: [], //旅客名单
ContractTripList: [] //行程列表 ContractTripList: [], //行程列表
TCID: 0,
OrderId: 0,
}, },
rules: { rules: {
...@@ -1227,9 +1230,14 @@ ...@@ -1227,9 +1230,14 @@
res => { res => {
this.isSubmit = true; this.isSubmit = true;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CtObj.ID = res.data.data;
this.GetData();
this.Success(res.data.message); this.Success(res.data.message);
this.CtObj.ID = res.data.data;
this.$router.push({
name: 'onedayTripContract',
query: {
id: res.data.data,
}
});
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -1238,7 +1246,6 @@ ...@@ -1238,7 +1246,6 @@
); );
} }
}, },
//提交 //提交
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
...@@ -1503,6 +1510,14 @@ ...@@ -1503,6 +1510,14 @@
this.$forceUpdate(); this.$forceUpdate();
}, },
}, },
created() {
if (this.$route.query.TCID && this.$route.query.TCID > 0) {
this.CtObj.TCID = this.$route.query.TCID;
}
if (this.$route.query.orderID && this.$route.query.orderID > 0) {
this.CtObj.OrderId = this.$route.query.orderID;
}
},
mounted() { mounted() {
if (this.$route.query.id && this.$route.query.id > 0) { if (this.$route.query.id && this.$route.query.id > 0) {
this.CtObj.ID = this.$route.query.id; this.CtObj.ID = this.$route.query.id;
......
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