Skip to content

S
SuperMan
Commit 791f0b36 authored by 沈良进's avatar 沈良进
Browse files
Options

pull code

parents bc6d01c2 fdb00b2e
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 198 deletions
src/components/FinancialModule/CapitalAllocation.vue
View file @ 791f0b36
......@@ -51,7 +51,8 @@
<div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addBtn"/>
<input v-if="btnShow" type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="addBtn"/>
<input v-else type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
</li>
......@@ -213,8 +214,10 @@
</div>
<el-dialog title="资金调拨类型" :visible.sync="isCapitalAllocation" width="450px">
<div style="text-align: center;">
<input v-if="btnShow" type="button" class="normalBtn" value="日本资金调拨" @click="goAddurl('addCapitalAllocation',1)"/>
<input v-if="btnShow" type="button" class="normalBtn" value="台湾资金调拨" @click="goAddurl('addCapitalAllocation',2)"/>
<template v-if="btnShow">
<input type="button" class="normalBtn" value="日本资金调拨" @click="goAddurl('addCapitalAllocation',1)"/>
<input type="button" class="normalBtn" value="台湾资金调拨" @click="goAddurl('addCapitalAllocation',2)"/>
</template>
<input type="button" class="normalBtn" value="通用资金调拨" @click="goURL('addCapitalAllocation')"/>
</div>
<span slot="footer" class="dialog-footer">
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 791f0b36
......@@ -423,8 +423,7 @@ export default {
let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
// 是否日本调拨
// fengs： 1日本调拨 2台湾调拨
if(this.$route.query.fengs){
if(this.$route.query.fengs==1){
this.msg.RB_Branch_Id = 1218;
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ 791f0b36
......@@ -608,15 +608,15 @@
</template>
</el-table-column>
<template slot="append" >
<div class="row justify-sb " style="padding:10px;">
<div class="row justify-sb" style="padding:10px;">
<div class="cF1416C">
<div v-if="item.remark" style="min-width: 200px;max-width: 300px;">
{{$t('pub.pubRemark')}}：{{ item.remark }}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.UpRemarks')"
placement="top-start">
<i class="el-icon-edit cursor-pointer c059FF6 mx" @click='getDetail(item,true)'></i>
</el-tooltip>
</div>
placement="top-start">
<i class="el-icon-edit cursor-pointer c059FF6 mx" @click='getDetail(item,true)'></i>
</el-tooltip>
</div>
</div>
<div class="row justify-sb">
......
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 791f0b36
......@@ -241,7 +241,7 @@
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">餐</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br/>(保险、司导杂费等)</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr>
<tr>
<td width="80" class="CP_ComTitle2 CostcomCenter">总车资</td>
......@@ -449,7 +449,7 @@
</el-select>
<br />
<el-input type='text' v-model="subItem.HotelCostPrice" class="w100"
@keyup.native="checkPrice(subItem,'HotelCostPrice')" placeholder="酒店价格"></el-input>
@keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange()" placeholder="酒店价格"></el-input>
<br />
</td>
<td>
......@@ -981,7 +981,8 @@
<td class="CP_ComTitle2">人数统计</td>
<td class="CP_ComTitle2">成本价(人民币)</td>
<td class="CP_ComTitle2">成本价(日元)</td>
<td class="CP_ComTitle2" colspan="2">销售价格(人民币)</td>
<td class="CP_ComTitle2">成本总价(日元)</td>
<td class="CP_ComTitle2">销售价格(人民币)</td>
<td class="CP_ComTitle2">销售价格(日元)</td>
<td class="CP_ComTitle2">销售付款方式</td>
<td class="CP_ComTitle2">手配费</td>
......@@ -992,7 +993,8 @@
<td>{{item.PeopleNumber}}+1</td>
<td>{{item.TotalMoney}}</td>
<td>{{item.JPYTotalMoney}}</td>
<td colspan="2">
<td>{{item.JPYTotalMoney*item.PeopleNumber}}</td>
<td>
<el-input type='text' class="w70" v-model="item.SalePrice"
@keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
</td>
......@@ -1095,12 +1097,12 @@
</el-input>
</td>
</tr>
<tr>
<!-- <tr>
<td class="CP_ComTitle2">备注</td>
<td colspan="13">
<el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
</td>
</tr>
</tr> -->
<tr>
<td class="CP_ComTitle2">附件</td>
<td colspan="13">
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 791f0b36
......@@ -157,7 +157,7 @@
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">餐</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br/>(保险、司导杂费等)</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr>
<tr>
<td width="120" class="CP_ComTitle2 CostcomCenter">总车资</td>
......@@ -703,7 +703,8 @@
<td class="CP_ComTitle2">人数统计 </td>
<td class="CP_ComTitle2">成本价(人民币)</td>
<td class="CP_ComTitle2">成本价(日元)</td>
<td class="CP_ComTitle2" colspan="2">销售价格(人民币)</td>
<td class="CP_ComTitle2">成本总价(日元)</td>
<td class="CP_ComTitle2">销售价格(人民币)</td>
<td class="CP_ComTitle2">销售价格(日元)</td>
<td class="CP_ComTitle2">销售付款方式</td>
<td class="CP_ComTitle2">手配费</td>
......@@ -714,7 +715,8 @@
<td>{{item.PeopleNumber}}+1</td>
<td>{{item.TotalMoney}}</td>
<td>{{item.JPYTotalMoney}}</td>
<td colspan="2">
<td>{{item.JPYTotalMoney*item.PeopleNumber}}</td>
<td>
{{item.SalePrice}}
</td>
<td>
......@@ -804,12 +806,12 @@
{{teamPrice.SingleRoomPrice}}
</td>
</tr>
<tr>
<!-- <tr>
<td class="CP_ComTitle2">备注</td>
<td colspan="13">
{{OtherPrice.OtherRemark}}
</td>
</tr>
</tr> -->
<tr>
<td class="CP_ComTitle2">附件</td>
<td colspan="13">
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 791f0b36
<style>
@import "../../../assets/css/newTravelManager.css";
.flex {
display: flex;
}
.w-25 {
width: 25%;
}
.w-50 {
width: 50%
.w_20 {
width: 20%;
}
.p20 {
padding: 20px;
}
.TC_companyList span,
.TC_OtherCompany span {
display: inline-block;
font-size: 12px;
padding: 5px 10px;
border: 1px solid #d1d1d1;
margin: 5px 10px 0 0;
border-radius: 4px;
cursor: pointer;
}
.TC_companyList span:first-child {
margin-right: 20px;
}
.TC_companyList {
padding-top: 15px;
margin-left: 32px;
}
.TC_checked {
border: 1px solid #d95454 !important;
box-sizing: border-box;
}
.TC_OtherCompany {
margin: 0 0 20px 20px;
}
.TC_customerInfo tbody th {
height: 40px;
text-align: center;
}
.TC_firTable td {
height: 20px !important;
text-align: center !important;
}
.TC_midTable td {
text-align: center !important;
}
.TC_showUnion {
float: right;
color: #2aaef2;
cursor: pointer;
margin-bottom: 10px;
}
.go_date {
font-weight: 700;
font-size: 14px;
}
.TC_Content ._pic_upload .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.TC_Content ._pic_upload>div {
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210, 210, 210, 1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.TC_Content .avatar-uploader-icon {
height: auto;
}
.TC_HotelPop {
overflow: auto;
max-height: 350px;
}
.TC_HotelPop table td {
padding: 5px 0;
text-align: center;
}
.TC_HotelPop table th {
text-align: center;
}
.TC_CarNum {
padding: 5px 10px;
background: #5151f5;
color: #fff;
font-size: 12px;
display: inline-block;
border-radius: 5px;
}
.comSearchDiv .el-checkbox {
margin-right: 0;
}
</style>
<template>
<div class="TC_Content">
<div class=" TC-MyList">
<div class="TC-MyList">
<div class="query-box">
<ul>
<li>
<!-- <li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
......@@ -141,7 +25,7 @@
:key="item.LineID"></el-option>
</el-select>
</span>
</li>
</li> -->
<li>
<span>
<em>业务名称</em>
......@@ -165,71 +49,70 @@
</ul>
</div>
<div class="TravelTclList" v-loading="queryMsg.loading">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
</el-pagination>
<ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
</el-pagination>
<li v-for="(item,index) in queryDataObj.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent">
<div class="el-col w-25">
<div class="el-col w-20">
<div class="p20">
<div><span>{{item.GTeamName}}</span></div>
<div>出发日期：<span>{{item.StartDate}}</span></div>
</div>
</div>
<div class="el-col w-25 ">
<div class="p20" v-for="(subItem,subIndex) in item.TravelTeamFlightList">
<div :key="subIndex+1000">{{subItem.AlName}} {{subItem.Flight_number}} {{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}} {{subItem.Arrival_time}}</div>
<div class="el-col w-20">
<div class="p20" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
<div> {{subItem.Flight_number}}
{{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
{{subItem.Arrival_time}}</div>
</div>
</div>
<div class="el-col w-25 ">
<div class="el-col w_20">
<div class="p20">
<div><span>经济舱 {{item.YSeat}}</span></div>
<div>商务舱 {{item.CSeat}}</div>
<div><span>商务舱 {{item.CSeat}}</span></div>
<div><span>头等舱 {{item.FSeat}}</span></div>
<div><span>中心价 {{item.MiddlePrice}}</span></div>
</div>
</div>
<div class="el-colw-25">
<div class="el-col w_20">
<div class="p20">
<span>操作</span>
<el-button @click.native='goUrl("RegistrationList", item.GTeamId,"报名情况")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">报名情况
</el-button>
<el-button @click.native='goUrl("RegistrationList", item.GTeamId,"财务入账")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">财务入账
</el-button>
<el-button @click.native='goUrl("RegistrationList", item.GTeamId,"财务审核")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">财务审核
</el-button>
<el-button @click.native='goUrl("airplaneInfo", item.GTeamId,"修改")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">修改
</el-button>
<el-button @click.native='goUrl("RegistrationList", item.GTeamId,"删除")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">删除
</el-button>
<el-button @click.native='goUrl("RegistrationList", item.GTeamId,"包机结算")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">包机结算
</el-button>
<el-button @click.native='goUrl("RegistrationList", item.GTeamId,"查看包机团")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">查看包机团
</el-button>
<el-button @click.native='goUrl("RegistrationList", item.GTeamId,"添加包机团")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">添加包机团
</el-button>
<template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
<el-tag :key="subIndex+1000" style="margin-right:10px;">{{subItem.CustomerName}}</el-tag>
</template>
</div>
</div>
</div>
<div class="TC_remarkContent">
<div class="el-col w-50">
<div class="el-col w_20">
<div class="p20">发起人：{{item.CreateByName}}</div>
<div class="p20">发起时间：{{item.CreateTime}}</div>
</div>
<div class="el-col w-50">
<div class="p20">合作伙伴：
<template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
<el-tag :key="subIndex+1000" style="margin-right:10px;">{{subItem.CustomerName}}</el-tag>
</template>
<div class="el-col w_20">
<div class="p20">
<span>操作</span>
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名情况")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">修改
</el-button>
<el-dropdown trigger="click">
<span class="el-dropdown-link">更多
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="travelControlDropDown">
<el-dropdown-item>
财务入账
</el-dropdown-item>
<el-dropdown-item>
财务审核
</el-dropdown-item>
<el-dropdown-item>
包机结算
</el-dropdown-item>
<el-dropdown-item>
删除
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
</div>
......
src/components/busManagement/CharteringManagement/CharteringInfoManage.vue
View file @ 791f0b36
......@@ -836,30 +836,30 @@
<template v-if="addMsg.CarType == 2">送机</template>
<template v-if="addMsg.CarType == 3">包车</template>
<template v-if="!addMsg.CarType">-</template>
(上车信息)
({{addMsg.CarType == 1?'下车':addMsg.CarType == 2?'上车':'上下车'}}信息)
<span style="float: right;margin-right: 206px;color: #6e6e6e;cursor: pointer;" @click="clickShow(2)">
{{ PlaceShow?'收起': '展开' }}
</span>
</span>
<template v-for="(item, index) in addMsg.PlaceList">
<div v-show="PlaceShow">
<el-form-item :label="`上车地址${index + 1}`" :prop="`PlaceList.${index}.Name`" :rules="rules.Name3">
<el-form-item :label="`地址${index + 1}`" :prop="`PlaceList.${index}.Name`" :rules="rules.Name3">
<div style="position: relative;">
<el-input maxlength="100" placeholder="请输入上车地址" class="w300 addAddress"
<el-input maxlength="100" placeholder="请输入地址" class="w300 addAddress"
v-model="item.Name"></el-input>
<i v-if="index == 0" class="el-icon-circle-plus addlist" @click="clickPlace(index, 1)"></i>
<i v-else class="el-icon-delete addlist" @click="clickPlace(index)"></i>
</div>
</el-form-item>
<el-form-item :label="`上车详细地址${index + 1}`" :prop="`PlaceList.${index}.Address`" :rules="rules.Address">
<el-input maxlength="300" placeholder="请输入上车详细地址" class="w300 addAddress" v-model="item.Address">
<el-form-item :label="`详细地址${index + 1}`" :prop="`PlaceList.${index}.Address`" :rules="rules.Address">
<el-input maxlength="300" placeholder="请输入详细地址" class="w300 addAddress" v-model="item.Address">
<el-button slot="append" @click="clickMapAddress(2, index, item.Address)"
icon="iconfont icon-img_dw"></el-button>
</el-input>
</el-form-item>
<div class="toolOne" style="margin: 0 0 28px 13px;">
<span class="fanbili">上车地理位置{{ index+ 1}}</span>
<span class="fanbili" style="width: 80px;text-align: right;"> 地理位置{{ index+ 1}}</span>
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
<div class="leftPnum">经度</div>
......@@ -872,7 +872,7 @@
</div>
</div>
<el-form-item :label="`距离中心范围${index + 1}`" :prop="`PlaceList.${index}.Range`" :rules="rules.Range">
<el-input type="Number" placeholder="上车距离中心范围" class="w300 addAddress" v-model="item.Range">
<el-input type="Number" placeholder="距离中心范围" class="w300 addAddress" v-model="item.Range">
<i slot="suffix"> m</i>
</el-input>
</el-form-item>
......@@ -1701,7 +1701,7 @@ export default {
if (i == index) {
x.Lng = msg.lng;
x.Lat = msg.lat;
x.Address = address_detail
// x.Address = address_detail
}
})
} if (type == 2) {
......@@ -1709,7 +1709,7 @@ export default {
if (i == index) {
x.Lng = msg.lng;
x.Lat = msg.lat;
x.Address = address_detail
// x.Address = address_detail
}
})
}
......
src/components/public/Map.vue
View file @ 791f0b36
......@@ -55,6 +55,7 @@
height: '100%'
},
center: {lng: 116.404, lat: 39.915},
newCenter: {lng: '', lat: ''},
zoom: 20,
nearby: {
center: {
......@@ -124,21 +125,26 @@
})
this.center.lng = e.point.lng
this.center.lat = e.point.lat
this.newCenter.lng = e.point.lng
this.newCenter.lat = e.point.lat
},
syncCenterAndZoom (e) {
if(this.GetOff) return
const {lng, lat} = e.target.getCenter()
this.center.lng = lng
this.center.lat = lat
this.newCenter.lng = lng
this.newCenter.lat = lat
this.zoom = e.target.getZoom()
},
// 经纬度
determineLngLat(){
if(this.center.lng){
this.$emit("headCallBack", this.center, this.type, this.index, this.keyword);
if(this.newCenter.lng){
this.$emit("headCallBack", this.newCenter, this.type, this.index, this.keyword);
this.$emit("refList");
this.newCenter = {lng: '', lat: ''}
}else{
this.Error("请搜索您需要选择的地址");
this.Error("请搜索并选择您需要的地址");
}
},
}
......
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