Skip to content

S
SuperMan
Commit 41e2c58d authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 76b80150
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 423 deletions
src/components/FinancialModule/ReportForm/ChangeRevenueDetail.vue
View file @ 41e2c58d
......@@ -852,6 +852,36 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "RoomFee",
formatter: this.moneyFormat,
title: "房费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "MealFee",
formatter: this.moneyFormat,
title: "餐费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TicketFee",
formatter: this.moneyFormat,
title: "门票费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "JiPiao",
formatter: this.moneyFormat,
......@@ -872,7 +902,26 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
// {field: 'Money11', title: '房费',width: 90, titleAlign: 'left',columnAlign:'left',isResize:true},
{
field: "AirLossIncome",
formatter: this.moneyFormat,
title: "机损增收",
width: 120,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "AirServiceCharge",
formatter: this.moneyFormat,
title: "开票费用",
width: 120,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "Visa",
formatter: this.moneyFormat,
......@@ -1029,118 +1078,6 @@ export default {
columnAlign: "right",
isResize: true
},
{
field: "TransportCD",
title: "成都",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportKM",
title: "昆明",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCQ",
title: "重庆",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportWH",
title: "武汉",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportXA",
title: "西安",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCS",
title: "长沙",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportGY",
title: "贵阳",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNC",
title: "南昌",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportXM",
title: "厦门",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportLZ",
title: "兰州",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNJ",
title: "南京",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportWT",
title: "微途",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportHF",
title: "合肥",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNN",
title: "南宁",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCost",
formatter: this.moneyFormat,
......@@ -1176,97 +1113,6 @@ export default {
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "GRPNum",
title: "GRP",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TKTNum",
title: "TKT",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "VisaNum",
title: "VISA",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "ZiYouXingNum",
title: "自由行",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "DiJieNum",
title: "地接",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "HotelNum",
title: "酒店",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "DanTuanNum",
title: "单团",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "HuZhaoNum",
title: "护照",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "AverageIncome",
formatter: this.moneyFormat,
title: "平均收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "AverageCost",
formatter: this.moneyFormat,
title: "平均成本",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "AverageProfit",
formatter: this.moneyFormat,
title: "平均利润",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
}
],
footer: [],
......
src/components/FinancialModule/ReportForm/ChangeRevenueReport.vue
View file @ 41e2c58d
......@@ -505,12 +505,12 @@ tr._item_list td:last-child {
<el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="1" label="团队营收"></el-option>
<el-option value="3" label="单办签证"></el-option>
<!-- <el-option value="3" label="单办签证"></el-option>
<el-option value="2" label="国际机票"></el-option>
<el-option value="4" label="国内票务"></el-option>
<el-option value="5" label="散卖机票"></el-option>
<el-option value="6" label="日本地接部专户"></el-option>
<el-option value="7" label="老挝地接部专户"></el-option>
<el-option value="7" label="老挝地接部专户"></el-option> -->
</el-select>
</el-form-item>
</el-col>
......@@ -991,6 +991,36 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "RoomFee",
formatter: this.moneyFormat,
title: "房费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "MealFee",
formatter: this.moneyFormat,
title: "餐费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TicketFee",
formatter: this.moneyFormat,
title: "门票费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "JiPiao",
formatter: this.moneyFormat,
......@@ -1011,7 +1041,26 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
// {field: 'Money11', title: '房费',width: 90, titleAlign: 'left',columnAlign:'left',isResize:true},
{
field: "AirLossIncome",
formatter: this.moneyFormat,
title: "机损增收",
width: 120,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "AirServiceCharge",
formatter: this.moneyFormat,
title: "开票费用",
width: 120,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "Visa",
formatter: this.moneyFormat,
......@@ -1154,7 +1203,7 @@ export default {
{
field: "changeProfit",
formatter: this.moneyFormat,
title: "变更利润",
title: "历史利润",
width: 90,
titleAlign: "left",
columnAlign: "right",
......@@ -1188,118 +1237,6 @@ export default {
columnAlign: "right",
isResize: true
},
{
field: "TransportCD",
title: "成都",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportKM",
title: "昆明",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCQ",
title: "重庆",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportWH",
title: "武汉",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportXA",
title: "西安",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCS",
title: "长沙",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportGY",
title: "贵阳",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNC",
title: "南昌",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportXM",
title: "厦门",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportLZ",
title: "兰州",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNJ",
title: "南京",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportWT",
title: "微途",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportHF",
title: "合肥",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNN",
title: "南宁",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCost",
formatter: this.moneyFormat,
......@@ -1336,97 +1273,6 @@ export default {
columnAlign: "right",
isResize: true
},
{
field: "GRPNum",
title: "GRP",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TKTNum",
title: "TKT",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "VisaNum",
title: "VISA",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "ZiYouXingNum",
title: "自由行",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "DiJieNum",
title: "地接",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "HotelNum",
title: "酒店",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "DanTuanNum",
title: "单团",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "HuZhaoNum",
title: "护照",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "AverageIncome",
formatter: this.moneyFormat,
title: "平均收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "AverageCost",
formatter: this.moneyFormat,
title: "平均成本",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "AverageProfit",
formatter: this.moneyFormat,
title: "平均利润",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
}
],
footer: [],
pageSize: 6,
......@@ -1467,6 +1313,14 @@ export default {
},
components: {},
mounted() {
let STime = this.getBeforeDate(31,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
let ETime = this.getBeforeDate(0,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
if(!this.msg.startDate){
this.productionDate = [STime,ETime]
this.msg.startDate = this.productionDate[0];
this.msg.endDate = this.productionDate[1];
}
let allH, allW, cH, cW;
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
......@@ -2130,17 +1984,17 @@ export default {
let newData = [];
data.forEach((x, index) => {
x.MaoLiRate=x.MaoLiRate+"%";
if (index !== data.length - 1) {
//if (index !== data.length - 1) {
x.Is_Transport = x.Is_Transport === 0 ? "否" : "是";
newData.push(x);
} else {
x.LineName = "合计";
x.TCID = "";
x.TCNUM = "";
x.Is_Transport = "";
x.BName = "";
newData.push(x);
}
// } else {
// x.LineName = "合计";
// x.TCID = "";
// x.TCNUM = "";
// x.Is_Transport = "";
// x.BName = "";
// newData.push(x);
// }
});
newData.forEach(x=>{
if(x.IsHaveChange==0||x.IsHaveChange==null){
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 41e2c58d
......@@ -646,10 +646,10 @@ tr._item_list td:last-child {
</el-form-item>
</el-col>
</template>
<el-col :span="4" v-if="userId==1 || userId==5 || F_GeneralManager">
<el-col :span="6" v-if="userId==1 || userId==5 || userId==2786 || F_GeneralManager">
<el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
<el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button>
<!-- <el-button @click="SetTravelDataRecord()" type="danger" size="small" round :loading="btnloading">记录变更</el-button> -->
</el-col>
<el-col :span="5">
<p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
......@@ -2390,6 +2390,22 @@ export default {
}
);
},
SetTravelDataRecord(){
this.btnloading=true;
this.apipost(
"financestatistics_post_SetTravelDataRecord",
this.msg,
res => {
this.btnloading=false;
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
} else {
this.AALloading = false;
this.Error(res.data.message);
}
}
);
},
goEasyReport: function() {
let year = this.productionDate[0]
? this.productionDate[0].substring(0, 4)
......
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