Skip to content

S
SuperMan
Commit f8883a9f authored by youjie's avatar youjie
Browse files
Options

no message

parent 677b47ca
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 33 deletions
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ f8883a9f
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<div class='flexOne page_CompanyAccDetail'> <div class='flexOne page_CompanyAccDetail'>
<div class='query-box'> <div class='query-box'>
<el-form class="_info_box clearfix" label-width="110px"> <el-form class="_info_box clearfix" label-width="110px">
<el-row> <el-row style="padding: 10px 0 0 0;">
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhanghuleixing')"> <el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='accType' @change="bankaccount_post_GetList"> <el-select filterable v-model='accType' @change="bankaccount_post_GetList">
...@@ -184,12 +184,15 @@ ...@@ -184,12 +184,15 @@
<th>{{$t('fnc.a_hkrfkduixiang')}}</th> <th>{{$t('fnc.a_hkrfkduixiang')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th> <th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th> <th>{{$t('fnc.jylshuihao')}}</th>
<th>{{$t('fnc.skjine')}}</th> <th>原币币种</th>
<th>{{$t('fnc.fkjine')}}</th> <th>原币收款</th>
<th>原币付款</th>
<th>本位币{{$t('fnc.skjine')}}</th>
<th>本位币{{$t('fnc.fkjine')}}</th>
<th>{{$t('fnc.yueacc')}}</th> <th>{{$t('fnc.yueacc')}}</th>
</tr> </tr>
<tr> <tr>
<td :colspan="7">{{$t('fnc.a_qcyue')}}：</td> <td :colspan="10">{{$t('fnc.a_qcyue')}}：</td>
<td></td> <td></td>
<td></td> <td></td>
<td>{{moneyFormat(StartMoney)}}</td> <td>{{moneyFormat(StartMoney)}}</td>
...@@ -218,12 +221,15 @@ ...@@ -218,12 +221,15 @@
<td> <td>
{{ item.AccountNumber }} {{ item.AccountNumber }}
</td> </td>
<td> {{ item.CurrencyName }} </td>
<td>{{ item.Type == 1 ? moneyFormat(item.OriginalMoney) : '' }}</td>
<td>{{ item.Type == 2 ? moneyFormat(item.OriginalMoney) : '' }}</td>
<td>{{ item.Type == 1 ? moneyFormat(item.Money) : '' }}</td> <td>{{ item.Type == 1 ? moneyFormat(item.Money) : '' }}</td>
<td>{{ item.Type == 2 ? moneyFormat(item.Money) : '' }}</td> <td>{{ item.Type == 2 ? moneyFormat(item.Money) : '' }}</td>
<td>{{ moneyFormat(item.EndMoney) }}</td> <td>{{ moneyFormat(item.EndMoney) }}</td>
</tr> </tr>
<tr> <tr>
<td :colspan="7">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td> <td :colspan="10">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td> <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td> <td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
<td>{{ moneyFormat(allMoney) }}</td> <td>{{ moneyFormat(allMoney) }}</td>
......
src/components/Hotel/singleProduct/components/hotelDetails.vue
View file @ f8883a9f
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<el-image <el-image
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[0]" :src="images[0]"
:preview-src-list="images"> :preview-src-list="images" fit="cover">
</el-image> </el-image>
</div> </div>
<div v-if="images.length>1"> <div v-if="images.length>1">
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<el-image <el-image
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[1]" :src="images[1]"
:preview-src-list="images"> :preview-src-list="images" fit="cover">
</el-image> </el-image>
</div> </div>
<div class="Img-right-box" v-if="images.length>2"> <div class="Img-right-box" v-if="images.length>2">
...@@ -48,14 +48,14 @@ ...@@ -48,14 +48,14 @@
<el-image <el-image
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[2]" :src="images[2]"
:preview-src-list="images" ref="images"> :preview-src-list="images" ref="images" fit="cover">
</el-image> </el-image>
</div> </div>
</div> </div>
</div> </div>
<div class="hotelDetails-Map"> <div class="hotelDetails-Map">
<Map :obj="h"></Map> <!-- <Map :obj="h"></Map> -->
<!-- <div :style="{height:'100%',width:'100%'}" id="mapContainer"></div> --> <div :style="{height:'100%',width:'100%'}" id="mapContainer"></div>
</div> </div>
</div> </div>
<div class="hotelDetails-prompt"> <div class="hotelDetails-prompt">
...@@ -238,7 +238,10 @@ ...@@ -238,7 +238,10 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.hotelDetails-Img,.hotelDetails-Map{ .hotelDetails-Img{
width: 60%;
}
.hotelDetails-Map{
flex: 1; flex: 1;
flex-shrink: 0; flex-shrink: 0;
} }
......
src/components/busManagement/BookAcar/components/Details.vue
View file @ f8883a9f
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="hotelDetails-infor"> <div class="hotelDetails-infor">
<div> <div>
<i class="el-icon-location"></i> <i class="el-icon-location"></i>
<p><span>{{t.CityList2[0].CountryName }}{{t.CityList2[0].CityName}}</span></p> <p v-if="t.CityList2&&t.CityList2.length>0&&t.CityList2[0]"><span>{{t.CityList2[0].CountryName }}{{t.CityList2[0].CityName}}</span></p>
</div> </div>
</div> </div>
<div class="hotelDetails-ImgMap"> <div class="hotelDetails-ImgMap">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
v-if="images.length>0" v-if="images.length>0"
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[0]" :src="images[0]"
:preview-src-list="images"> :preview-src-list="images" fit="cover">
<div slot="placeholder" class="image-slot"> <div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span> 加载中<span class="dot">...</span>
</div> </div>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<el-image <el-image
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[1]" :src="images[1]"
:preview-src-list="images"> :preview-src-list="images" fit="cover">
<div slot="placeholder" class="image-slot"> <div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span> 加载中<span class="dot">...</span>
</div> </div>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<el-image <el-image
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[2]" :src="images[2]"
:preview-src-list="images" ref="images"> :preview-src-list="images" ref="images" fit="cover">
<div slot="placeholder" class="image-slot"> <div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span> 加载中<span class="dot">...</span>
</div> </div>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</div> </div>
</div> </div>
<div class="hotelDetails-Map"> <div class="hotelDetails-Map">
<Map :obj="t"></Map> <Map :obj="ObjMap"></Map>
<!-- <div :style="{height:'100%',width:'100%'}" :id="`mapContainer_${detailsObj.Id}`"></div> --> <!-- <div :style="{height:'100%',width:'100%'}" :id="`mapContainer_${detailsObj.Id}`"></div> -->
</div> </div>
</div> </div>
...@@ -111,7 +111,12 @@ ...@@ -111,7 +111,12 @@
loading: true, loading: true,
t: {}, t: {},
images: [], images: [],
center: null center: null,
ObjMap:{
lng:'',
lat:'',
Address: ''
}
}; };
}, },
watch: { watch: {
...@@ -140,7 +145,12 @@ ...@@ -140,7 +145,12 @@
res => { res => {
this.t = res.data.data this.t = res.data.data
this.images = this.t.ImageList this.images = this.t.ImageList
this.initMap(this.t.PlaceList[0].Lng,this.t.PlaceList[0].Lat,this.t.Name) this.ObjMap = {
lng:this.t.PlaceList[0].Lng,
lat:this.t.PlaceList[0].Lat,
Address: this.t.PlaceList[0].Address
}
// this.initMap(this.t.PlaceList[0].Lng,this.t.PlaceList[0].Lat,this.t.Name)
}, },
err => {} err => {}
); );
...@@ -235,7 +245,10 @@ ...@@ -235,7 +245,10 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.hotelDetails-Img,.hotelDetails-Map{ .hotelDetails-Img{
width: 60%;
}
.hotelDetails-Map{
flex: 1; flex: 1;
flex-shrink: 0; flex-shrink: 0;
} }
......
src/components/public/Map.vue
View file @ f8883a9f
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
handler(newValue,onldValue) { handler(newValue,onldValue) {
this.keyword = newValue this.keyword = newValue
}, },
deep:true,
immediate: true immediate: true
}, },
}, },
......
src/components/public/echoMap.vue
View file @ f8883a9f
...@@ -43,16 +43,19 @@ ...@@ -43,16 +43,19 @@
watch: { watch: {
obj: { obj: {
handler(newValue,onldValue) { handler(newValue,onldValue) {
this.center.lng = newValue.PlaceList[0].Lng this.center.lng = this.obj.lng
this.center.lat = newValue.PlaceList[0].Lat this.center.lat = this.obj.lat
this.keyword = this.obj.Address
console.log(this.center,'----')
}, },
deep:true,
immediate: true immediate: true
}, },
}, },
mounted() { mounted() {
this.center.lng = this.obj.PlaceList[0].Lng this.center.lng = this.obj.lng
this.center.lat = this.obj.PlaceList[0].Lat this.center.lat = this.obj.lat
this.keyword = this.obj.PlaceList[0].Address this.keyword = this.obj.Address
}, },
methods: { methods: {
getClickInfo (e) { getClickInfo (e) {
......
src/components/scenicSpot/Singleticket/components/OrderDetails.vue
View file @ f8883a9f
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
v-if="images.length>0" v-if="images.length>0"
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[0]" :src="images[0]"
:preview-src-list="images"> :preview-src-list="images" fit="cover">
<div slot="placeholder" class="image-slot"> <div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span> 加载中<span class="dot">...</span>
</div> </div>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<el-image <el-image
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[1]" :src="images[1]"
:preview-src-list="images"> :preview-src-list="images" fit="cover">
<div slot="placeholder" class="image-slot"> <div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span> 加载中<span class="dot">...</span>
</div> </div>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<el-image <el-image
style="width: 100%; height: 100%" style="width: 100%; height: 100%"
:src="images[2]" :src="images[2]"
:preview-src-list="images" ref="images"> :preview-src-list="images" ref="images" fit="cover">
<div slot="placeholder" class="image-slot"> <div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span> 加载中<span class="dot">...</span>
</div> </div>
...@@ -80,7 +80,8 @@ ...@@ -80,7 +80,8 @@
</div> </div>
</div> </div>
<div class="hotelDetails-Map"> <div class="hotelDetails-Map">
<div :style="{height:'100%',width:'100%'}" :id="`mapContainer_${ticket.ID}`"></div> <Map :obj="ObjMap"></Map>
<!-- <div :style="{height:'100%',width:'100%'}" :id="`mapContainer_${ticket.ID}`"></div> -->
</div> </div>
</div> </div>
<div class="hotelDetails-prompt"> <div class="hotelDetails-prompt">
...@@ -113,7 +114,9 @@ ...@@ -113,7 +114,9 @@
</div> </div>
</template> </template>
<script> <script>
import Map from "../../../public/echoMap.vue";
export default { export default {
components: { Map },
props: ['ticket'], props: ['ticket'],
data() { data() {
return { return {
...@@ -121,7 +124,12 @@ ...@@ -121,7 +124,12 @@
loading: true, loading: true,
t: {}, t: {},
images: [], images: [],
center: null center: null,
ObjMap:{
lng:'',
lat:'',
Address: ''
}
}; };
}, },
watch: { watch: {
...@@ -129,9 +137,15 @@ ...@@ -129,9 +137,15 @@
handler: function (val, oldVal) { handler: function (val, oldVal) {
this.t = JSON.parse(JSON.stringify(this.ticket)) this.t = JSON.parse(JSON.stringify(this.ticket))
this.images = this.t.PicPathList this.images = this.t.PicPathList
this.initMap(this.t.Lng,this.t.Lat,this.t.Name) this.ObjMap = {
lng:this.t.Lng,
lat:this.t.Lat,
Address: this.t.Address
}
// this.initMap(this.t.Lng,this.t.Lat,this.t.Name)
}, },
deep: true deep: true,
immediate: true
}, },
}, },
created() { created() {
...@@ -140,7 +154,12 @@ ...@@ -140,7 +154,12 @@
if(this.ticket){ if(this.ticket){
this.t = JSON.parse(JSON.stringify(this.ticket)) this.t = JSON.parse(JSON.stringify(this.ticket))
this.images = this.t.PicPathList this.images = this.t.PicPathList
this.initMap(this.t.Lng,this.t.Lat,this.t.Name) this.ObjMap = {
lng:this.t.Lng,
lat:this.t.Lat,
Address: this.t.Address
}
// this.initMap(this.t.Lng,this.t.Lat,this.t.Name)
} }
}, },
methods: { methods: {
...@@ -234,7 +253,10 @@ ...@@ -234,7 +253,10 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.hotelDetails-Img,.hotelDetails-Map{ .hotelDetails-Img{
width: 60%;
}
.hotelDetails-Map{
flex: 1; flex: 1;
flex-shrink: 0; flex-shrink: 0;
} }
......
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