Skip to content

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

页面修改

parent 867fa2df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2060 additions and 2751 deletions
src/components/DomesticTravelcontract.vue
View file @ 77428188
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/commonPage/commonTripList.vue
View file @ 77428188
<style> <style>
.leftDayList{ .leftDayList {
display:inline-block; display: inline-block;
width: 30px; width: 30px;
height: 100%; height: 100%;
vertical-align: top; vertical-align: top;
} }
.dayNum{
font-weight: bold; .dayNum {
font-size: 16px; font-weight: bold;
margin-left: -42px; font-size: 16px;
position: relative; margin-left: -42px;
z-index: 2; position: relative;
margin-bottom: 5px; z-index: 2;
display: block; margin-bottom: 5px;
} display: block;
.siteList{ }
display: inline-block;
position: relative; .siteList {
border-left: 2px solid #ebebec; display: inline-block;
position: relative; position: relative;
padding: 0 0 50px 50px; border-left: 2px solid #ebebec;
margin-left: 10px; position: relative;
} padding: 0 0 50px 50px;
.Trip_Content{ margin-left: 10px;
margin-left:100px; }
}
.Trip_Content:first-child{ .Trip_Content {
margin-top:20px; margin-left: 100px;
} }
.Trip_Content:last-child{
margin-bottom:20px; .Trip_Content:first-child {
} margin-top: 20px;
.TC_circles{ }
width: 18px;
height: 18px; .Trip_Content:last-child {
background: #fff; margin-bottom: 20px;
border-radius: 100%; }
border: 2px solid #90b7ec;
position: absolute; .TC_circles {
left: -11px; width: 18px;
top: 0; height: 18px;
} background: #fff;
.TripControl{ border-radius: 100%;
display: inline-block; border: 2px solid #90b7ec;
vertical-align: middle; position: absolute;
position: relative; left: -11px;
top: -170px; top: 0;
margin-left: 30px; }
}
.TripControl i{ .TripControl {
display:inline-block; display: inline-block;
width:30px; vertical-align: middle;
height:30px; position: relative;
line-height: 30px; top: -170px;
cursor: pointer; margin-left: 30px;
border-radius: 50%; }
text-align: center;
} .TripControl i {
.TripControl i:hover{ display: inline-block;
background-color: #90b7ec; width: 30px;
color:#fff; height: 30px;
} line-height: 30px;
.addTrip{ cursor: pointer;
width:30px; border-radius: 50%;
height:30px; text-align: center;
color: #fff; }
text-align: center;
font-size: 25px; .TripControl i:hover {
line-height: 28px; background-color: #90b7ec;
background-color: #f60; color: #fff;
border-radius: 100%; }
cursor: pointer;
margin:-2px 0 20px 130px; .addTrip {
} width: 30px;
height: 30px;
color: #fff;
text-align: center;
font-size: 25px;
line-height: 28px;
background-color: #f60;
border-radius: 100%;
cursor: pointer;
margin: -2px 0 20px 130px;
}
</style> </style>
<template> <template>
<div> <div>
<div class="Trip_Content" v-for="(item,index) in TripListArr"> <div v-if="TripType==0">
<div class="leftDayList"> <quill-editor v-model="TripListArr[0].TravelContent" style="height:400px;"></quill-editor>
<span class="dayNum">第{{index+1}}天</span> </div>
</div> <div v-else class="Trip_Content" v-for="(item,index) in TripListArr" :key="index">
<div class="siteList"> <div class="leftDayList">
<el-form-item label="前往地" label-width='100px' style="display:inline-block;"> <span class="dayNum">第{{index+1}}天</span>
<el-input type="text" class="w150" v-model="item.Go"></el-input> </div>
</el-form-item> <div class="siteList">
<el-form-item label="前往省份/国家地区" label-width='160px' style="display:inline-block;"> <el-form-item label="前往地" label-width='100px' style="display:inline-block;">
<el-input type="text" class="w150" v-model="item.GoProvice"></el-input> <el-input type="text" class="w150" v-model="item.Go"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否过境" label-width='100px' style="display:inline-block;"> <el-form-item label="前往省份/国家地区" label-width='160px' style="display:inline-block;">
<el-checkbox v-model="item.IsOut" :true-label="CheckedVaule" :false-label="UnCheckedVaule"></el-checkbox> <el-input type="text" class="w150" v-model="item.GoProvice"></el-input>
</el-form-item> </el-form-item>
<quill-editor v-model="item.TravelContent" style="height:300px;"></quill-editor> <el-form-item label="是否过境" label-width='100px' style="display:inline-block;">
<!-- <el-input type="textarea" resize="none" rows="16" cols="40" v-model="item.TravelContent"></el-input> --> <el-checkbox v-model="item.IsOut" :true-label="CheckedVaule" :false-label="UnCheckedVaule"></el-checkbox>
<div class="TC_circles"></div> </el-form-item>
</div> <quill-editor v-model="item.TravelContent" style="height:300px;"></quill-editor>
<div class="TripControl"> <div class="TC_circles"></div>
<!-- <i class="iconfont icon-baocun1" @click="saveTripList(item,index)"></i> --> </div>
<i class="iconfont icon-img_delete_small" style="margin-left:10px;" @click="delTrip(index)"></i> <div class="TripControl">
</div> <i class="iconfont icon-img_delete_small" style="margin-left:10px;" @click="delTrip(index)"></i>
</div> </div>
<div class="addTrip" @click="addTrip()">+</div> <div class="addTrip" @click="addTrip()">+</div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
props:["ContractTripList"], props: ["ContractTripList", "TripType"],
data() { data() {
return { return {
checked: false, checked: false,
TripListArr:[], TripListArr: [],
//选中过境 //选中过境
CheckedVaule: 1, CheckedVaule: 1,
//不过境 //不过境
UnCheckedVaule: 0, UnCheckedVaule: 0,
};
},
mounted() {
}; },
}, created() {
mounted() { if (this.ContractTripList) {
if(this.ContractTripList&&this.ContractTripList.length>0){ if (this.ContractTripList.length > 0) {
this.TripListArr=this.ContractTripList; this.TripListArr = JSON.parse(JSON.stringify(this.ContractTripList));
} } else {
}, var tripObj = {
methods: { DayNum: 1, //天数
//添加行程 Go: '', // 前往地
addTrip(){ GoProvice: '', //前往国家地区
let obj={ IsOut: 0, // 是否过境(0-不过，1-过)
DayNum:'', //天数 TravelContent: '', //行程内容
Go:'', // 前往地 }
GoProvice:'', //前往国家地区 this.TripListArr.push(tripObj);
IsOut:0, // 是否过境(0-不过，1-过) }
TravelContent:'', //行程内容 }
},
methods: {
//添加行程
addTrip() {
let obj = {
DayNum: '', //天数
Go: '', // 前往地
GoProvice: '', //前往国家地区
IsOut: 0, // 是否过境(0-不过，1-过)
TravelContent: '', //行程内容
} }
this.TripListArr.push(obj); this.TripListArr.push(obj);
this.getSavedData(); this.getSavedData();
}, },
//删除行程 //删除行程
delTrip(index){ delTrip(index) {
this.TripListArr.splice(index,1); this.TripListArr.splice(index, 1);
this.getSavedData(); this.getSavedData();
}, },
//保存行程 //遍历已经保存数据
// saveTripList(item,index){ getSavedData() {
// item.DayNum=index+1; this.TripListArr.forEach((x, index) => {
// item.IsShow=1; x.DayNum = index + 1;
// this.getSavedData();
// },
//遍历已经保存数据
getSavedData(){
let sendArr=[];
this.TripListArr.forEach((x,index)=>{
x.DayNum=index+1;
sendArr.push(x);
}) })
this.$emit('tripData', sendArr); }
},
watch: {
//监听参数
TripListArr: {
handler: function (val, oldVal) {
this.$emit('tripData', this.TripListArr);
},
deep: true
},
} }
} };
};
</script> </script>
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 77428188
...@@ -67,8 +67,6 @@ ...@@ -67,8 +67,6 @@
<div v-if="FeatureData.FeatureType==FeatureTypeState.userDefined"> <div v-if="FeatureData.FeatureType==FeatureTypeState.userDefined">
<span class="userDeSpan">{{$t('sm.xiaoguoyldzxg')}}</span> <span class="userDeSpan">{{$t('sm.xiaoguoyldzxg')}}</span>
<div class="userDefined"> <div class="userDefined">
<!-- <quill-editor @change="onEditorChange($event)" v-model="FeatureData.FeatureContent">
</quill-editor>-->
<my-edit v-on:edit-value="FeatureData.FeatureContent = arguments[0]" <my-edit v-on:edit-value="FeatureData.FeatureContent = arguments[0]"
v-bind:editValue="FeatureData.FeatureContent" v-bind:toolbarShow="toolbar" v-bind:editValue="FeatureData.FeatureContent" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit> v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
......
src/components/onedayTripContract.vue
View file @ 77428188
This diff is collapsed.
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