Skip to content

S
SuperMan
Commit 1904b82f authored by 黄奎's avatar 黄奎
Browse files
Options

合同行程保存修改

parent c6857cbd
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 21 deletions
src/components/DomesticTravelcontract.vue
View file @ 1904b82f
......@@ -761,7 +761,7 @@
<el-option label="1" :value="1"></el-option>
<el-option label="2" :value="2"></el-option>
</el-select>
{{$t('objFill.v101.Contract.zhongfangs')}}
{{$t('objFill.zhongfangs')}}
</el-form-item>
<el-form-item label="1、提交" v-if="CtObj.C_SolveType == 1" label-width="110px">
<el-input type="text" class="w300" v-model="CtObj.C_SolveRemark"></el-input>&nbsp;仲裁委员会仲裁；
......@@ -891,8 +891,7 @@
<commonTripList @tripData="tripData" :ContractTripList="CtObj.ContractTripList" :TripType="CtObj.TripType">
</commonTripList>
</div> -->
<div v-if="CtObj.ID>0&&CtObj.ContractTripList&&CtObj.ContractTripList.length==1"
v-html="CtObj.ContractTripList[0].TravelContent" ref="TcTravel_Table"></div>
<div v-if="CtObj.ID>0" ref="TcTravel_Table" v-html="CtObj.ContractTripList[0].TravelContent" ></div>
<div v-else ref="TcTravel_Table">
<table class="TcTravel_Table">
<tbody>
......@@ -999,8 +998,7 @@
火车：普通车/空调车/动车组（其中：软卧/硬卧/软座/硬座）；
</div>
<div style="color: red" v-if="CtObj.CType!=3">
注：用房
：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
</div>
<template v-if="CtObj.TeamType == 2">
<div>
......@@ -1029,10 +1027,6 @@
</tbody>
</table>
</div>
<div style="padding:10px;background:#f9f9f9;color:red;" v-if="CtObj.CType!=3">
注：用房
：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
</div>
</div>
<div class="block mtop15" id="anchor-5" ref="anchor5">
<div class="blockTitle">
......@@ -1402,7 +1396,14 @@
TicketAndHotelTotalPrice: "0", // 机票加酒店组合总费用
ContractShopList: [], //自愿购物活动补充协议
ContractGuestList: [], //旅客名单
ContractTripList: [], //行程列表
ContractTripList: [{
TripType: 1,
DayNum: 1,
Go: "",
GoProvice: "",
IsOut: 0,
TravelContent: ""
}], //行程列表
ContractSelfFeeList: [], //自愿付费项目补充协议
TripType: 0, //行程类型(0-简易行程，1-标准行程)
TCID: 0,
......
src/components/Educationvideo.vue
View file @ 1904b82f
......@@ -37,12 +37,33 @@
<el-tooltip class="item" effect="dark" :content="item.Name" placement="top-start">
<p style="font-size:14px" class="bold text1">{{item.Name}}</p>
</el-tooltip>
<p class="wryh" style="color:#aaaaaa">{{item.EmName}}</p>
<p class="wryh" style="color:#aaaaaa">{{item.WatchNum}}次观看
<span style="margin-left:5pxy"></span>
<span>{{item.UpdateDate}}</span>
</p>
<!-- <p>生成二维码</p> -->
<el-row>
<el-col :span="12">
<p class="wryh" style="color:#aaaaaa">{{item.EmName}}</p>
<p class="wryh" style="color:#aaaaaa">{{item.WatchNum}}次观看
<span style="margin-left:5pxy"></span>
<span>{{item.UpdateDate}}</span>
</p>
</el-col>
<el-col :span="12" style="text-align:right;display:none;">
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ShareTrip')" placement="top-start"
style="float: right">
<el-popover width="180" trigger="click">
<div class="w150" v-loading="wxLoading">
<template v-if="item.wxImage!=''">
<img style="float: left; width: 108px; height: 108px; margin: 10px 21px 3px;"
:src="'data:image/png;base64,' + item.wxImage" />
</template>
<p style="text-align: center; font-size: 12px; color: #666">
{{ $t("salesModule.XCX") }}
</p>
</div>
<el-button slot="reference" type="primary" @click="createVideoQrCode(item)" size="mini">分享
</el-button>
</el-popover>
</el-tooltip>
</el-col>
</el-row>
</div>
</div>
</li>
......@@ -91,6 +112,7 @@
loading: false,
windowHeight: 0,
nodata: false,
wxLoading: false,
}
},
mounted() {
......@@ -108,15 +130,16 @@
methods: {
//生成小程序码
createVideoQrCode(item) {
this.wxLoading = true;
var postMsg = {
Id: item.Id
}
this.apipost(
"Video_get_GetLvXiaoYouVideoCodeShare", postMsg,
res => {
console.log("res", res);
this.wxLoading = false;
if (res.data.resultCode == 1) {
item.wxImage = res.data.data;
}
}
);
......@@ -170,6 +193,7 @@
data.forEach(item => {
let lastUrl = "?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
item.background = item.VideoAddress + lastUrl;
item.wxImage = "";
})
this.dataList = this.dataList.concat(data)
}
......
src/components/onedayTripContract.vue
View file @ 1904b82f
......@@ -925,8 +925,8 @@
<commonTripList @tripData="tripData" :ContractTripList="CtObj.ContractTripList" :TripType="CtObj.TripType">
</commonTripList>
</div> -->
<div v-if="CtObj.ID>0&&CtObj.ContractTripList&&CtObj.ContractTripList.length==1"
v-html="CtObj.ContractTripList[0].TravelContent" ref="TcTravel_Table"></div>
<div v-if="CtObj.ID>0" v-html="CtObj.ContractTripList[0].TravelContent" ref="TcTravel_Table"></div>
<div v-else ref="TcTravel_Table">
<table class="TcTravel_Table">
<tbody>
......@@ -1352,7 +1352,14 @@
TicketAndHotelTotalPrice: "0", // 机票加酒店组合总费用
ContractShopList: [], //自愿购物活动补充协议
ContractGuestList: [], //旅客名单
ContractTripList: [], //行程列表
ContractTripList: [{
TripType: 1,
DayNum: 1,
Go: "",
GoProvice: "",
IsOut: 0,
TravelContent: ""
}], //行程列表
TCID: 0,
OrderId: 0,
},
......@@ -1461,6 +1468,8 @@
if (this.isSubmit) {
if (this.CtObj.ContractTripList && this.CtObj.ContractTripList.length > 0) {
this.CtObj.ContractTripList[0].TravelContent = this.$refs.TcTravel_Table.innerHTML;
} else {
this.CtObj.ContractTripList[0].TravelContent = this.$refs.TcTravel_Table.innerHTML;
}
this.isSubmit = false;
this.apipost(
......@@ -1755,6 +1764,7 @@
};
this.CtObj.ContractTripList.push(tripObj);
}
} else {
this.Error(res.data.message);
}
......@@ -2071,4 +2081,5 @@
});
}
};
</script>
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