Skip to content

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

Merge branch 'master' into langEn 

# Conflicts:
#	src/components/Ticketing/trainManagement.vue
#	src/components/systemManagement/stationManagement.vue
parents d5c7a228 99cf9139
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 94 deletions
src/components/FinancialModule/DataAnalysis/allEchart.vue
View file @ a0a7ed9f
......@@ -267,6 +267,7 @@
</template>
<script>
import moment from 'moment';
import IncomeChange from "./components/oneEchart/IncomeChange.vue";
import IncomeShare from "./components/oneEchart/IncomeShare.vue";
import WoolRateChange from "./components/oneEchart/WoolRateChange.vue";
......@@ -399,10 +400,11 @@ export default {
},
mounted() {
this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id
const end = new Date();
const start = new Date();
start.setMonth(start.getMonth() - 6);
this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
let sDate = moment().subtract(7, 'months').format('YYYY-MM');
let eDate = moment().subtract(1, 'months').format('YYYY-MM');
this.dateTime = [sDate,eDate]
this.msg.startDate = this.dateTime[0]
this.msg.endDate = this.dateTime[1]
......@@ -524,7 +526,7 @@ export default {
this.msg.LineIdList = [],
this.msg.LineIdStr = ''
this.msg.IsLastData = 2
this.msg.OutBranchIdList = [0]
this.msg.OutBranchIdList = [0,1,32,33]
this.msg.StandardBranchIds = '0'
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
......@@ -555,10 +557,10 @@ export default {
this.msg.startDate = this.dateTime[0]
this.msg.endDate = this.dateTime[1]
}else{
const end = new Date();
const start = new Date();
start.setMonth(start.getMonth() - 6);
this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
let sDate = moment().subtract(7, 'months').format('YYYY-MM');
let eDate = moment().subtract(1, 'months').format('YYYY-MM');
this.dateTime = [sDate,eDate]
this.msg.startDate = start
this.msg.endDate = end
}
......
src/components/FinancialModule/DataAnalysis/components/twoEchart/ActualRateColumnar.vue
View file @ a0a7ed9f
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>净利润变化趋势图</h3>
<h3>净利润变化趋势图（简易报表的净利润）</h3>
<div style="margin-left: 20px;">
......
src/components/FinancialModule/DataAnalysis/components/twoEchart/ActualRateColumnarZZT.vue
View file @ a0a7ed9f
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>实际利润变化趋势图</h3>
<h3>实际利润变化趋势图（营收报表的实际利润）</h3>
<div style="margin-left: 20px;">
......@@ -59,8 +59,8 @@ export default {
let Newobj = {}
let barW = 30;
if(this.BranchAnalysisData.length >=2){barW=28;}
if(this.BranchAnalysisData.length >=3){barW=27;}
if(this.BranchAnalysisData.length >=4){barW=22;}
if(this.BranchAnalysisData.length >=3){barW=26;}
if(this.BranchAnalysisData.length >=4){barW=21;}
if(this.BranchAnalysisData.length >=5){barW=17;}
if(this.BranchAnalysisData.length >=7){barW=15;}
this.BranchAnalysisData.forEach((x,indexs)=>{
......
src/components/FinancialModule/DataAnalysis/components/twoEchart/WoolRateColumnar.vue
View file @ a0a7ed9f
<template>
<div class="echartsBox">
<div class="titleBox row">
<h3>营业利润变化趋势图</h3>
<h3>营业利润变化趋势图（营收报表实际利润+联运收入）</h3>
<div style="margin-left: 20px;">
......
src/components/FinancialModule/DataAnalysis/components/twoEchart/WoolRateColumnarZZT.vue
View file @ a0a7ed9f
......@@ -59,8 +59,8 @@ export default {
let Newobj = {}
let barW = 30;
if(this.BranchAnalysisData.length >=2){barW=28;}
if(this.BranchAnalysisData.length >=3){barW=27;}
if(this.BranchAnalysisData.length >=4){barW=22;}
if(this.BranchAnalysisData.length >=3){barW=26;}
if(this.BranchAnalysisData.length >=4){barW=21;}
if(this.BranchAnalysisData.length >=5){barW=17;}
if(this.BranchAnalysisData.length >=7){barW=15;}
this.BranchAnalysisData.forEach((x,indexs)=>{
......
src/components/FinancialModule/DataAnalysis/index.vue
View file @ a0a7ed9f
......@@ -177,6 +177,7 @@
</template>
<script>
import moment from 'moment';
import Lines from "./components/line.vue";
import Corporations from "./components/corporation.vue";
import Packets from "./components/packet.vue";
......@@ -254,10 +255,10 @@ export default {
},
mounted() {
this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id
const end = new Date();
const start = new Date();
start.setMonth(start.getMonth() - 6);
this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
let sDate = moment().subtract(7, 'months').format('YYYY-MM');
let eDate = moment().subtract(1, 'months').format('YYYY-MM');
this.dateTime = [sDate,eDate]
this.msg.startDate = this.dateTime[0]
this.msg.endDate = this.dateTime[1]
......@@ -361,10 +362,10 @@ export default {
this.msg.startDate = this.dateTime[0]
this.msg.endDate = this.dateTime[1]
}else{
const end = new Date();
const start = new Date();
start.setMonth(start.getMonth() - 6);
this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
let sDate = moment().subtract(7, 'months').format('YYYY-MM');
let eDate = moment().subtract(1, 'months').format('YYYY-MM');
this.dateTime = [sDate,eDate]
this.msg.startDate = start
this.msg.endDate = end
}
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ a0a7ed9f
......@@ -740,6 +740,8 @@
v-if="msg.Conditon == 3">{{BOSSBtn2 ? $t('objFill.noOneclicktransfer') : $t('objFill.oneclicktransfer')}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon == 3 && BOSSBtn2"
@click="BOSSBtnClick(2)">{{$t('fnc.zhuanjiao')}}</button>
<button class="hollowFixedBtn" v-if="this.userId == 2994"
@click="outerVisible3=true">车行ETC补差</button>
<button class="hollowFixedBtn" v-if="msg.Conditon == 1&&ActionMenuCode.indexOf('batchAddWages')!=-1 "
@click="outerVisible=true">{{$t('objFill.payroll')}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon == 1&&ActionMenuCode.indexOf('batchAddWages')!=-1 "
......@@ -1651,6 +1653,14 @@
<div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
</el-upload>
</el-dialog>
<el-dialog custom-class='w700' title="导入车行ETC差额" :visible.sync="outerVisible3" center>
<el-upload drag class="upload-demo" :action="importFileUrl5+'&EmployeeId='+userId" :on-success="handleAvatarSuccess3"
:before-upload="beforeAvatarUpload2">
<i class="el-icon-upload"></i>
<div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
<div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
</el-upload>
</el-dialog>
<el-dialog custom-class='w700' title="导入快递费" :visible.sync="outerVisible2" center>
<el-upload drag class="upload-demo" :action="importFileUrl3" :on-success="handleAvatarSuccess2"
:before-upload="beforeAvatarUpload2">
......@@ -1829,6 +1839,7 @@
isTerminate: -1,
outerVisible: false,
outerVisible2: false,
outerVisible3: false,
importData: "",
importDataIndex: 0,
picObj: [],
......@@ -1838,6 +1849,8 @@
tabLoading: false,
importFileUrl2: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=18",
importFileUrl5: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=22",
expressageMsg: [],
importFileUrl3: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21",
......@@ -2485,6 +2498,13 @@
this.$message.error(res.message);
}
},
handleAvatarSuccess3(res, file) {
if (res.resultCode == 1) {
this.Success(res.message);
} else {
this.$message.error(res.message);
}
},
getRate(value) {
return this.moneyFormatB(value)
},
......
src/components/FinancialModule/RecPayQueryKM.vue
View file @ a0a7ed9f
......@@ -29,7 +29,7 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.feiyongleixing')">
<el-select filterable multiple collapse-tags clearable v-model='msg.CostTypeIDList'>
<el-select filterable multiple reserve-keyword collapse-tags clearable v-model='msg.CostTypeIDList'>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
......
src/components/Ticketing/trainManagement.vue
View file @ a0a7ed9f
......@@ -127,7 +127,15 @@
<div class="query-box">
<ul>
<li>
<label>火车编号</label>
<label>交通类型</label>
<el-select v-model="msg.TrafficType" filterable :placeholder="$t('system.ph_buxian')" class="w210">
<el-option label="火车" :value='2'></el-option>
<el-option label="轮船" :value='3'></el-option>
<el-option label="巴士" :value='4'></el-option>
</el-select>
</li>
<li>
<label>班次号</label>
<el-input v-model="msg.Flight_number" placeholder="" @keyup.native.enter="getList" class="w210"></el-input>
</li>
<li>
......@@ -167,26 +175,29 @@
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="">动车号</th>
<th width="">{{$t('commonPickUp.Pick_StartCity')}}</th>
<th>交通类型</th>
<th width="">班次号</th>
<th width="">出发城市</th>
<th width="">出发站点</th>
<th>{{$t('Airticket.Air_StartTime')}}</th>
<th>{{$t('system.query_arrivalCity')}}</th>
<th>出发时间</th>
<th>到达城市</th>
<th>达到站点</th>
<th>{{$t('objFill.v101.BasicDocuments.col.t4')}}</th>
<th>到达时间</th>
<th>用时</th>
<th>{{$t("admin.admin_czPerson")}}</th>
<th>{{$t("hotel.table_operattime")}}</th>
<th width="200">{{$t("admin.admin_operate")}}</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index">
<td>{{item.Flight_number}}
</td>
<td>{{item.TrafficType==2?'火车':item.TrafficType==3?'轮船':'巴士'}}</td>
<td>{{item.Flight_number}}</td>
<td>{{item.DepartureCityName}}</td>
<td>{{item.DName}}</td>
<td>{{item.Departure_time}}</td>
<td>{{item.ArrivalCityName}}</td>
<td>{{item.AName}}</td>
<td>{{item.Arrival_time}}</td>
<td>{{item.FlyTime}}</td>
<td>{{item.emName}}</td>
<td>{{item.UpdateDate}}</td>
<td style="position: relative;">
......@@ -216,8 +227,15 @@
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<el-form-item label="动车号" prop="Flight_number" class="other_input">
<el-input v-model="addMsg.Flight_number" placeholder="请填写动车号"></el-input>
<el-form-item label="交通类型">
<el-select v-model="addMsg.TrafficType" filterable :placeholder="$t('system.ph_buxian')" class="w210">
<el-option label="火车" :value='2'></el-option>
<el-option label="轮船" :value='3'></el-option>
<el-option label="巴士" :value='4'></el-option>
</el-select>
</el-form-item>
<el-form-item label="班次号" prop="Flight_number" class="other_input">
<el-input v-model="addMsg.Flight_number" placeholder="请填写班次号"></el-input>
</el-form-item>
<el-form-item label="出发城市" prop="Departure_city">
<el-select v-model="addMsg.Departure_city" filterable placeholder="请选择出发城市"
......@@ -253,6 +271,10 @@
<el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="checkTime(addMsg,'Arrival_time')"
maxlength="5" :placeholder="$t('system.ph_time')"></el-input>
</el-form-item>
<el-form-item label="用时">
<el-input type="text" v-model="addMsg.FlyTime" @keyup.native="checkTime(addMsg,'FlyTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
......@@ -296,7 +318,7 @@
Arrival_city: "0",
Arrival_airport: "0",
Status: "0",
TrafficType: 2,
TrafficType: 2, //交通类型(1-飞机,2-火车,3-轮船,4-巴士)
},
addMsg: {
ID: 0,
......@@ -318,7 +340,8 @@
synchronization: 0,
StartDate: "",
EndDate: "",
TrafficType: 2
TrafficType: 2, //交通类型(1-飞机,2-火车,3-轮船,4-巴士)
FlyTime: "", //用时
},
SeasonTypeList: [],
DataList: [],
......@@ -441,7 +464,7 @@
//根据城市获取起飞机场
let msg = {
City_id: ID,
TrafficType: 2,
TrafficType: this.addMsg.TrafficType,
};
this.apipost(
"airport_post_GetList",
......@@ -481,35 +504,16 @@
StartDate: "",
EndDate: "",
TrafficType: 2,
FlyTime: "",
};
this.addMsg = newMsg;
},
//根据城市获取经停机场
getaStopAirport(ID, blo) {
this.apipost(
"airport_post_GetList", {
City_id: ID,
TrafficType: 2,
},
res => {
if (this.outerVisible) {
if (!blo) {
this.addMsg.Stopover_airport = "";
}
this.layer_Stopover_airport = res.data.data;
} else {
this.msg.Stopover_airport = "0";
this.Stopover_airport = res.data.data;
}
},
err => {}
);
},
getaArrivalAirport(ID, blo) {
//根据城市获取到达车站
let msg = {
City_id: ID,
TrafficType: 2,
TrafficType: this.addMsg.TrafficType,
};
this.apipost(
"airport_post_GetList",
......@@ -656,12 +660,9 @@
msg,
res => {
var newMsg = res.data.data;
this.addMsg = res.data.data;
this.getaAirport(newMsg.Departure_city, true);
if (newMsg.Stopover_city) {
this.getaStopAirport(newMsg.Stopover_city, true);
}
this.getaArrivalAirport(newMsg.Arrival_city, true);
this.addMsg = res.data.data;
},
err => {}
);
......
src/components/systemManagement/stationManagement.vue
View file @ a0a7ed9f
......@@ -43,6 +43,14 @@
</el-option>
</el-select>
</li>
<li>
<label>交通类型</label>
<el-select v-model="msg.TrafficType" filterable :placeholder="$t('system.ph_buxian')" class="w210">
<el-option label="火车" :value='2'></el-option>
<el-option label="轮船" :value='3'></el-option>
<el-option label="巴士" :value='4'></el-option>
</el-select>
</li>
<li>
<label class="margin_left_30">{{$t('system.query_airName')}}</label>
<el-input v-model="msg.Name" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210">
......@@ -55,39 +63,49 @@
<el-option key="1" :label="$t('system.ph_shanchu')" value="1"></el-option>
</el-select>
</li>
<<<<<<< HEAD
<li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" :value="$t('fnc.tianjia')" @click="initAddMsg(),outerVisible=true,dialogTitle='新增车站'" /></li>
=======
<li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="添加"
@click="initAddMsg(),outerVisible=true,dialogTitle='新增车站'" /></li>
>>>>>>> master
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>交通类型</th>
<th>{{$t('system.query_airName')}}</th>
<th>{{$t('system.table_city')}}</th>
<th>{{$t('hotel.table_operater')}}</th>
<th>{{$t('hotel.table_operattime')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>{{item.Name}}</td>
<td>{{item.CityName}}</td>
<td>{{item.EmName}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible=true,dialogTitle='修改',updateData(index)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.revoke')" placement="top-start"
v-if="item.Status==1">
<el-button type="danger" icon="iconfont icon-web-icon-revoke" circle @click="deletelist(index,2)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-else>
<el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button>
</el-tooltip>
</td>
</tr>
<tbody v-loading="loading">
<tr v-for="(item,index) in DataList" :key="`d_`+index">
<td>{{item.TrafficType==2?'火车':item.TrafficType==3?'轮船':'巴士'}}</td>
<td>{{item.Name}}</td>
<td>{{item.CityName}}</td>
<td>{{item.EmName}}</td>
<td>{{item.UpdateDate}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible=true,dialogTitle='修改',updateData(index)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.revoke')" placement="top-start"
v-if="item.Status==1">
<el-button type="danger" icon="iconfont icon-web-icon-revoke" circle @click="deletelist(index,2)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-else>
<el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button>
</el-tooltip>
</td>
</tr>
</tbody>
</table>
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
......@@ -98,6 +116,13 @@
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item label="交通类型">
<el-select v-model="addMsg.TrafficType" filterable :placeholder="$t('system.ph_buxian')" class="w210">
<el-option label="火车" :value='2'></el-option>
<el-option label="轮船" :value='3'></el-option>
<el-option label="巴士" :value='4'></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('system.table_country')" prop="Country_id">
<el-select v-model="addMsg.Country_id" filterable :placeholder="$t('system.ph_buxian')"
@change="getProvinceListLayer(addMsg.Country_id,1)" class="w210">
......@@ -157,7 +182,7 @@
Name: '',
IATA: '',
ICAO: '',
TrafficType: 2, //车站
TrafficType: 2, //交通类型(1-飞机,2-火车,3-轮船,4-巴士)
},
addMsg: {
ID: '',
......@@ -170,15 +195,11 @@
IATA: '',
ICAO: '',
RankNum: '',
//经
Lng: '',
//纬
Lat: '',
TrafficType: 2, //车站
Lng: '', //经
Lat: '', //纬
TrafficType: 2, //交通类型(1-飞机,2-火车,3-轮船,4-巴士)
},
DataList: [],
BranchGetList: [],
lineList: [],
countryList: '',
provinceList: '',
cityList: '',
......
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