|
|
@@ -261,11 +261,12 @@
|
|
|
</template>
|
|
|
<template slot-scope="scope">
|
|
|
<div v-if="item.prop === 'sales'">
|
|
|
- <el-input size="mini" :ref="'el-input-' + index" v-model="scope.row[item.prop]" show-word-limit />
|
|
|
+ <el-input size="mini" :ref="'el-input-' + index" v-model="scope.row[item.prop]"
|
|
|
+ show-word-limit />
|
|
|
</div>
|
|
|
<div v-else-if="item.prop === 'day'">
|
|
|
- <el-input size="mini" :ref="'el-input-' + index" v-model="scope.row[item.prop]" type="number"
|
|
|
- min="0" @change="NumberSetTime(scope.row[item.prop], scope.$index)" />
|
|
|
+ <el-input size="mini" :ref="'el-input-' + index" v-model="scope.row[item.prop]"
|
|
|
+ type="number" min="0" @change="NumberSetTime(scope.row[item.prop], scope.$index)" />
|
|
|
</div>
|
|
|
<div v-else-if="item.prop === 'date'">
|
|
|
<span :title="scope.row[item.prop]">
|
|
|
@@ -273,8 +274,8 @@
|
|
|
v-model="scope.row[item.prop]"
|
|
|
@change="dateChange(scope.row[item.prop], scope.$index)">
|
|
|
</el-input> -->
|
|
|
- <el-date-picker size="mini" v-model="scope.row[item.prop]" type="date" value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择日期">
|
|
|
+ <el-date-picker size="mini" v-model="scope.row[item.prop]" type="date"
|
|
|
+ value-format="yyyy-MM-dd" placeholder="选择日期">
|
|
|
</el-date-picker>
|
|
|
</span>
|
|
|
<div style="position: absolute;left: 36%;">
|
|
|
@@ -304,40 +305,44 @@
|
|
|
<div>
|
|
|
<span style="color:red;">*具体价格以当前货币汇率为准!</span><br />
|
|
|
<div v-if="ShowMeals.length == 0">
|
|
|
- <br/>
|
|
|
+ <br />
|
|
|
<span style="color:red">暂无数据!</span>
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<div v-for="( item, index ) in ShowMeals" :key="index">
|
|
|
- {{item.countryOrCity}} <span style="color:green;">{{item.price}}</span>元/人<br>
|
|
|
+ {{ item.countryOrCity }} <span style="color:green;">{{
|
|
|
+ item.price }}</span>元/人<br>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-input size="mini" slot="reference" placeholder="请输入内容" v-model="scope.row[item.prop]">
|
|
|
+ <el-input size="mini" slot="reference" placeholder="请输入内容"
|
|
|
+ v-model="scope.row[item.prop]">
|
|
|
</el-input>
|
|
|
</el-popover>
|
|
|
</div>
|
|
|
- <div v-else-if="item.prop == 'suite' || item.prop == 'jS_ES' || item.prop == 'sgr'|| item.prop == 'tbr'">
|
|
|
+ <div
|
|
|
+ v-else-if="item.prop == 'suite' || item.prop == 'jS_ES' || item.prop == 'sgr' || item.prop == 'tbr'">
|
|
|
<el-popover placement="top-start" title="酒店报批费用:" width="200" trigger="hover">
|
|
|
<div>
|
|
|
<span style="color:red;">*具体价格以当前货币汇率为准!</span><br />
|
|
|
<div v-if="ShowHotel.length == 0">
|
|
|
- <br/>
|
|
|
+ <br />
|
|
|
<span style="color:red">暂无数据!</span>
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<div v-for="( item, index ) in ShowHotel" :key="index">
|
|
|
- {{item.countryOrCity}} <span style="color:green;">{{item.price}}</span>元/人<br>
|
|
|
+ {{ item.countryOrCity }} <span style="color:green;">{{
|
|
|
+ item.price }}</span>元/人<br>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-input size="mini" slot="reference" placeholder="请输入内容" v-model="scope.row[item.prop]">
|
|
|
+ <el-input size="mini" slot="reference" placeholder="请输入内容"
|
|
|
+ v-model="scope.row[item.prop]">
|
|
|
</el-input>
|
|
|
</el-popover>
|
|
|
</div>
|
|
|
<span v-else :title="scope.row[item.prop]">
|
|
|
- <el-input size="mini" placeholder="请输入内容"
|
|
|
- v-model="scope.row[item.prop]">
|
|
|
+ <el-input size="mini" placeholder="请输入内容" v-model="scope.row[item.prop]">
|
|
|
</el-input></span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -345,14 +350,16 @@
|
|
|
<el-table-column class="czbtn" label="操作" :width="200">
|
|
|
<!-- eslint-disable-next-line -->
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button class="czbtn" size="mini" @click="insertRow(scope.$index, scope.row, 'UP')" type="primary">插入行
|
|
|
+ <el-button class="czbtn" size="mini" @click="insertRow(scope.$index, scope.row, 'UP')"
|
|
|
+ type="primary">插入行
|
|
|
↑</el-button>
|
|
|
<br />
|
|
|
<el-button class="czbtn" style="margin: 10px;" size="mini"
|
|
|
@click="handleDelete(scope.$index, scope.row, tableData)" type="danger">删除<i
|
|
|
class="el-icon-delete"></i></el-button>
|
|
|
<br />
|
|
|
- <el-button class="czbtn" size="mini" @click="insertRow(scope.$index, scope.row, 'DOWN')" type="primary">插入行
|
|
|
+ <el-button class="czbtn" size="mini" @click="insertRow(scope.$index, scope.row, 'DOWN')"
|
|
|
+ type="primary">插入行
|
|
|
↓</el-button>
|
|
|
|
|
|
</template>
|
|
|
@@ -605,7 +612,7 @@
|
|
|
<span v-else-if="itemcabinone.prop === 'singleProfit'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
(scope.row['singleQuote'] - scope.row['costPerson']).toFixed(2)
|
|
|
- }}</span>
|
|
|
+ }}</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'totalProfit'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
((scope.row['singleQuote'] - scope.row['costPerson']) *
|
|
|
@@ -663,8 +670,8 @@
|
|
|
</div> -->
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button @click="outerVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="outerVisible = false">确定</el-button>
|
|
|
+ <el-button @click="outerVisible = false; dialogSelectObject={}">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="confirm">确定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -1089,12 +1096,12 @@ export default {
|
|
|
EnLabel: 'tbr',
|
|
|
childList: [
|
|
|
{
|
|
|
- childLabel: '酒店TBR单人成本(CNY)',
|
|
|
+ childLabel: '酒店TBR单间成本(CNY)',
|
|
|
prop: 'tbrcb',
|
|
|
isBind: true
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '人数',
|
|
|
+ childLabel: '间数',
|
|
|
prop: 'tbrNumber'
|
|
|
},
|
|
|
{
|
|
|
@@ -1106,7 +1113,7 @@ export default {
|
|
|
prop: 'ZCB'
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '酒店TBR单人报价(CNY)',
|
|
|
+ childLabel: '酒店TBR单间报价(CNY)',
|
|
|
prop: 'DRBJ'
|
|
|
},
|
|
|
{
|
|
|
@@ -1114,7 +1121,7 @@ export default {
|
|
|
prop: 'ZBJ'
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '酒店TBR单人利润(CNY)',
|
|
|
+ childLabel: '酒店TBR单间利润(CNY)',
|
|
|
prop: 'DRLR'
|
|
|
},
|
|
|
{
|
|
|
@@ -1128,12 +1135,12 @@ export default {
|
|
|
EnLabel: 'sgr',
|
|
|
childList: [
|
|
|
{
|
|
|
- childLabel: '酒店SGR单人成本(CNY)',
|
|
|
+ childLabel: '酒店SGR单间成本(CNY)',
|
|
|
prop: 'sgrcb',
|
|
|
isBind: true
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '人数',
|
|
|
+ childLabel: '间数',
|
|
|
prop: 'sgrNumber'
|
|
|
},
|
|
|
{
|
|
|
@@ -1145,7 +1152,7 @@ export default {
|
|
|
prop: 'ZCB'
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '酒店SGR单人报价(CNY)',
|
|
|
+ childLabel: '酒店SGR单间报价(CNY)',
|
|
|
prop: 'DRBJ'
|
|
|
},
|
|
|
{
|
|
|
@@ -1153,7 +1160,7 @@ export default {
|
|
|
prop: 'ZBJ'
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '酒店SGR单人利润(CNY)',
|
|
|
+ childLabel: '酒店SGR单间利润(CNY)',
|
|
|
prop: 'DRLR'
|
|
|
},
|
|
|
{
|
|
|
@@ -1167,12 +1174,12 @@ export default {
|
|
|
EnLabel: 'jses',
|
|
|
childList: [
|
|
|
{
|
|
|
- childLabel: '酒店JSES单人成本(CNY)',
|
|
|
+ childLabel: '酒店JSES单间成本(CNY)',
|
|
|
prop: 'jsescb',
|
|
|
isBind: true
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '人数',
|
|
|
+ childLabel: '间数',
|
|
|
prop: 'jsesNumber'
|
|
|
},
|
|
|
{
|
|
|
@@ -1184,7 +1191,7 @@ export default {
|
|
|
prop: 'ZCB'
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '酒店JSES单人报价(CNY)',
|
|
|
+ childLabel: '酒店JSES单间报价(CNY)',
|
|
|
prop: 'DRBJ'
|
|
|
},
|
|
|
{
|
|
|
@@ -1192,7 +1199,7 @@ export default {
|
|
|
prop: 'ZBJ'
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '酒店JSES单人利润(CNY)',
|
|
|
+ childLabel: '酒店JSES单间利润(CNY)',
|
|
|
prop: 'DRLR'
|
|
|
},
|
|
|
{
|
|
|
@@ -1206,12 +1213,12 @@ export default {
|
|
|
EnLabel: 'suite',
|
|
|
childList: [
|
|
|
{
|
|
|
- childLabel: '酒店SUITE单人成本(CNY)',
|
|
|
+ childLabel: '酒店SUITE单间成本(CNY)',
|
|
|
prop: 'suitecb',
|
|
|
isBind: true
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '人数',
|
|
|
+ childLabel: '间数',
|
|
|
prop: 'suiteNumber'
|
|
|
},
|
|
|
{
|
|
|
@@ -1223,7 +1230,7 @@ export default {
|
|
|
prop: 'ZCB'
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '酒店SUITE单人报价(CNY)',
|
|
|
+ childLabel: '酒店SUITE单间报价(CNY)',
|
|
|
prop: 'DRBJ'
|
|
|
},
|
|
|
{
|
|
|
@@ -1231,7 +1238,7 @@ export default {
|
|
|
prop: 'ZBJ'
|
|
|
},
|
|
|
{
|
|
|
- childLabel: '酒店SUITE单人利润(CNY)',
|
|
|
+ childLabel: '酒店SUITE单间利润(CNY)',
|
|
|
prop: 'DRLR'
|
|
|
},
|
|
|
{
|
|
|
@@ -2213,7 +2220,10 @@ export default {
|
|
|
],
|
|
|
ShowBaoPi: [
|
|
|
|
|
|
- ]
|
|
|
+ ],
|
|
|
+ dialogSelectObject: {
|
|
|
+
|
|
|
+ }
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -2223,7 +2233,7 @@ export default {
|
|
|
if (this.tableData.length > 3) {
|
|
|
this.centerheight = 700;
|
|
|
} else {
|
|
|
- this.centerheight = this.defaultheight + (this.tableData.length * 220);
|
|
|
+ this.centerheight = this.defaultheight + (this.tableData.length * 230) - ((this.tableData.length - 1) * 50);
|
|
|
}
|
|
|
//console.log('高度' + this.centerheight);
|
|
|
}
|
|
|
@@ -2292,9 +2302,13 @@ export default {
|
|
|
|
|
|
}, 0);
|
|
|
|
|
|
- if (column.label == 'SGR' || column.label == 'JS/ES' || column.label == 'SUITE' || column.label == 'TBR' || column.label == 'B' || column.label == 'L' || column.label == 'D' || column.label == 'EF' || column.label == 'TE' || column.label == 'T/G T' || column.label == 'P/C' || column.label == ' DRV T' || column.label == 'DRV T') {
|
|
|
+ if (column.label == 'B' || column.label == 'L' || column.label == 'D' || column.label == 'EF' || column.label == 'TE' || column.label == 'T/G T' || column.label == 'P/C' || column.label == ' DRV T' || column.label == 'DRV T') {
|
|
|
prices[index] = '共' + (sums[index] * that.peopleNumber).toFixed(2) + ' ' + this.AGroupCostParameter.currency + '\r\n人均' + (sums[index]).toFixed(2) + " " + this.AGroupCostParameter.currency //sums[index] + '(' + this.AGroupCostParameter.currency + ')' + ' 人均(' + sums[index] + ')';
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ else if (column.label == 'SGR' || column.label == 'JS/ES' || column.label == 'SUITE' || column.label == 'TBR') {
|
|
|
+ prices[index] = '共' + (sums[index]).toFixed(2) + ' ' + this.AGroupCostParameter.currency + '\r\n人均' + (sums[index]).toFixed(2) + " " + this.AGroupCostParameter.currency
|
|
|
+ }
|
|
|
+ else {
|
|
|
prices[index] = '共' + sums[index].toFixed(2) + ' ' + this.AGroupCostParameter.currency + '\r\n人均' + (sums[index] / that.peopleNumber).toFixed(2) + " " + this.AGroupCostParameter.currency //sums[index] + '(' + this.AGroupCostParameter.currency + ')' + ' 人均(' + sums[index] + ')';
|
|
|
sums[index] = parseFloat((sums[index] / that.peopleNumber).toFixed(2));
|
|
|
}
|
|
|
@@ -2316,9 +2330,13 @@ export default {
|
|
|
}
|
|
|
}, 0);
|
|
|
|
|
|
- if (column.label == 'SGR' || column.label == 'JS/ES' || column.label == 'SUITE' || column.label == 'TBR' || column.label == 'B' || column.label == 'L' || column.label == 'D' || column.label == 'EF' || column.label == 'TE' || column.label == 'T/G T' || column.label == 'P/C' || column.label == ' DRV T' || column.label == 'DRV T') {
|
|
|
+ if (column.label == 'B' || column.label == 'L' || column.label == 'D' || column.label == 'EF' || column.label == 'TE' || column.label == 'T/G T' || column.label == 'P/C' || column.label == ' DRV T' || column.label == 'DRV T') {
|
|
|
prices[index] = 'A段费用' + prices[index] + '\r\nB段费用共' + (sums1[index] * that.BGroupCostParameter.costTypenumber).toFixed(2) + " " + this.AGroupCostParameter.currency + '\r\n人均' + sums1[index] + " " + this.AGroupCostParameter.currency //sums[index] + '(' + this.AGroupCostParameter.currency + ')' + ' 人均(' + sums[index] + ')';
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ else if (column.label == 'SGR' || column.label == 'JS/ES' || column.label == 'SUITE' || column.label == 'TBR') {
|
|
|
+ prices[index] = 'A段费用' + prices[index] + '\r\nB段费用共' + (sums1[index]).toFixed(2) + " " + this.AGroupCostParameter.currency + '\r\n人均' + sums1[index] + " " + this.AGroupCostParameter.currency //sums[index] + '(' + this.AGroupCostParameter.currency + ')' + ' 人均(' + sums[index] + ')';
|
|
|
+ }
|
|
|
+ else {
|
|
|
prices[index] = 'A段费用' + prices[index] + '\r\nB段费用共' + sums1[index].toFixed(2) + " " + this.AGroupCostParameter.currency + '\r\n人均' + (sums1[index] / that.BGroupCostParameter.costTypenumber).toFixed(2) + " " + this.AGroupCostParameter.currency //sums[index] + '(' + this.AGroupCostParameter.currency + ')' + ' 人均(' + sums[index] + ')';
|
|
|
sums1[index] = ((sums1[index] / that.BGroupCostParameter.costTypenumber).toFixed(2));
|
|
|
}
|
|
|
@@ -3153,6 +3171,9 @@ export default {
|
|
|
sum = drlr * parseInt(this.AGroupCostParameter[EnLabelParam + 'RS']);
|
|
|
} else if (this.AGroupCostParameter[EnLabelParam + 'rs'] != undefined) {
|
|
|
sum = drlr * parseInt(this.AGroupCostParameter[EnLabelParam + 'rs']);
|
|
|
+ } else if (this.AGroupCostParameter[EnLabelParam + 'Number'] != undefined) {
|
|
|
+
|
|
|
+ sum = drlr * parseInt(this.AGroupCostParameter[EnLabelParam + 'Number']);
|
|
|
}
|
|
|
|
|
|
if (isNaN(sum)) {
|
|
|
@@ -3257,6 +3278,8 @@ export default {
|
|
|
sum = drlr * parseInt(this.BGroupCostParameter[EnLabelParam + 'RS']);
|
|
|
} else if (this.BGroupCostParameter[EnLabelParam + 'rs'] != undefined) {
|
|
|
sum = drlr * parseInt(this.BGroupCostParameter[EnLabelParam + 'rs']);
|
|
|
+ } else if (this.BGroupCostParameter[EnLabelParam + 'Number'] != undefined) {
|
|
|
+ sum = drlr * parseInt(this.BGroupCostParameter[EnLabelParam + 'Number']);
|
|
|
}
|
|
|
|
|
|
if (isNaN(sum)) {
|
|
|
@@ -3269,6 +3292,7 @@ export default {
|
|
|
},
|
|
|
SelChange(row, oldrow) {
|
|
|
//console.log(row, oldrow);
|
|
|
+ this.dialogSelectObject = row;
|
|
|
},
|
|
|
handleSizeChange(val) {
|
|
|
this.currentPage = 1;
|
|
|
@@ -3354,13 +3378,13 @@ export default {
|
|
|
return x.label == 'TBR';
|
|
|
})
|
|
|
if (TBRList.length > 0) {
|
|
|
- TBRsum = TBRList[0].Aprice;
|
|
|
- BTBRsum = TBRList[0].Bprice;
|
|
|
+ TBRsum = TBRList[0].Aprice * 2;
|
|
|
+ BTBRsum = TBRList[0].Bprice * 2;
|
|
|
}
|
|
|
TBRsum = isNaN(TBRsum) ? 0 : TBRsum;
|
|
|
BTBRsum = isNaN(BTBRsum) ? 0 : BTBRsum;
|
|
|
- TBRsum = TBRsum * rate;
|
|
|
- BTBRsum = BTBRsum * rate;
|
|
|
+ TBRsum = (TBRsum * rate).toFixed(2);
|
|
|
+ BTBRsum = (BTBRsum * rate).toFixed(2);
|
|
|
|
|
|
let JSESsum = 0;
|
|
|
let BJSESsum = 0;
|
|
|
@@ -3480,7 +3504,7 @@ export default {
|
|
|
|
|
|
var BleftSum = this.BOtherCost();
|
|
|
let BJJCSGR = (BleftSum + Number(this.BGroupCostParameter.sgrcb) + Number(this.BGroupCostParameter.jjccb));
|
|
|
- let BJJCTBR = BleftSum + Number(this.BGroupCostParameter.tbrcb) + Number(this.BGroupCostParameter.jjccb);
|
|
|
+ let BJJCTBR = BleftSum + (Number(this.BGroupCostParameter.tbrcb) / 2) + Number(this.BGroupCostParameter.jjccb);
|
|
|
let BJJCSUITE = BleftSum + Number(this.BGroupCostParameter.suitecb) + Number(this.BGroupCostParameter.jjccb);
|
|
|
let BGWCSUITE = BleftSum + Number(this.BGroupCostParameter.suitecb) + Number(this.BGroupCostParameter.gwccb);
|
|
|
let BGWCSGR = BleftSum + Number(this.BGroupCostParameter.sgrcb) + Number(this.BGroupCostParameter.gwccb);
|
|
|
@@ -3495,7 +3519,7 @@ export default {
|
|
|
|
|
|
|
|
|
let BJJCSGRDRBJ = BrightSum + Number(that.BcalculateDRBJ('jjc')) + Number(that.BcalculateDRBJ('sgr'));
|
|
|
- let BJJCTBRDRBJ = BrightSum + Number(that.BcalculateDRBJ('tbr')) + Number(that.BcalculateDRBJ('jjc'));
|
|
|
+ let BJJCTBRDRBJ = BrightSum + (Number(that.BcalculateDRBJ('tbr')) / 2) + Number(that.BcalculateDRBJ('jjc'));
|
|
|
let BJJCSUITEDRBJ = BrightSum + Number(that.BcalculateDRBJ('suite')) + Number(that.BcalculateDRBJ('jjc'));
|
|
|
let BGWCSUITEDRBJ = BrightSum + Number(that.BcalculateDRBJ('suite')) + Number(that.BcalculateDRBJ('gwc'));
|
|
|
let BGWCSGRDRBJ = BrightSum + Number(that.BcalculateDRBJ('sgr')) + Number(that.BcalculateDRBJ('gwc'));
|
|
|
@@ -3540,7 +3564,7 @@ export default {
|
|
|
|
|
|
var leftSum = this.OtherCost();
|
|
|
let JJCSGR = (leftSum + Number(this.AGroupCostParameter.sgrcb) + Number(this.AGroupCostParameter.jjccb)).toFixed(2);
|
|
|
- let JJCTBR = (leftSum + Number(this.AGroupCostParameter.tbrcb) + Number(this.AGroupCostParameter.jjccb)).toFixed(2);
|
|
|
+ let JJCTBR = (leftSum + (Number(this.AGroupCostParameter.tbrcb) / 2) + Number(this.AGroupCostParameter.jjccb)).toFixed(2);
|
|
|
let JJCSUITE = (leftSum + Number(this.AGroupCostParameter.suitecb) + Number(this.AGroupCostParameter.jjccb)).toFixed(2);
|
|
|
let GWCSUITE = (leftSum + Number(this.AGroupCostParameter.suitecb) + Number(this.AGroupCostParameter.gwccb)).toFixed(2);
|
|
|
let GWCSGR = (leftSum + Number(this.AGroupCostParameter.sgrcb) + Number(this.AGroupCostParameter.gwccb)).toFixed(2);
|
|
|
@@ -3553,7 +3577,7 @@ export default {
|
|
|
})
|
|
|
|
|
|
let JJCSGRDRBJ = (rightSum + Number(that.calculateDRBJ('jjc')) + Number(that.calculateDRBJ('sgr'))).toFixed(2);
|
|
|
- let JJCTBRDRBJ = (rightSum + Number(that.calculateDRBJ('tbr')) + Number(that.calculateDRBJ('jjc'))).toFixed(2);
|
|
|
+ let JJCTBRDRBJ = (rightSum + (Number(that.calculateDRBJ('tbr')) / 2) + Number(that.calculateDRBJ('jjc'))).toFixed(2);
|
|
|
let JJCSUITEDRBJ = (rightSum + Number(that.calculateDRBJ('suite')) + Number(that.calculateDRBJ('jjc'))).toFixed(2);
|
|
|
let GWCSUITEDRBJ = (rightSum + Number(that.calculateDRBJ('suite')) + Number(that.calculateDRBJ('gwc'))).toFixed(2);
|
|
|
let GWCSGRDRBJ = (rightSum + Number(that.calculateDRBJ('sgr')) + Number(that.calculateDRBJ('gwc'))).toFixed(2);
|
|
|
@@ -3916,7 +3940,7 @@ export default {
|
|
|
})
|
|
|
|
|
|
let BJJCSGRDRBJ = BrightSum + Number(that.BcalculateDRBJ('jjc')) + Number(that.BcalculateDRBJ('sgr'));
|
|
|
- let BJJCTBRDRBJ = BrightSum + Number(that.BcalculateDRBJ('tbr')) + Number(that.BcalculateDRBJ('jjc'));
|
|
|
+ let BJJCTBRDRBJ = BrightSum + (Number(that.BcalculateDRBJ('tbr')) / 2) + Number(that.BcalculateDRBJ('jjc'));
|
|
|
let BJJCSUITEDRBJ = BrightSum + Number(that.BcalculateDRBJ('suite')) + Number(that.BcalculateDRBJ('jjc'));
|
|
|
let BGWCSUITEDRBJ = BrightSum + Number(that.BcalculateDRBJ('suite')) + Number(that.BcalculateDRBJ('gwc'));
|
|
|
let BGWCSGRDRBJ = BrightSum + Number(that.BcalculateDRBJ('sgr')) + Number(that.BcalculateDRBJ('gwc'));
|
|
|
@@ -3979,7 +4003,7 @@ export default {
|
|
|
})
|
|
|
|
|
|
let JJCSGRDRBJ = (rightSum + Number(that.calculateDRBJ('jjc')) + Number(that.calculateDRBJ('sgr'))).toFixed(2);
|
|
|
- let JJCTBRDRBJ = (rightSum + Number(that.calculateDRBJ('tbr')) + Number(that.calculateDRBJ('jjc'))).toFixed(2);
|
|
|
+ let JJCTBRDRBJ = (rightSum + (Number(that.calculateDRBJ('tbr')) / 2) + Number(that.calculateDRBJ('jjc'))).toFixed(2);
|
|
|
let JJCSUITEDRBJ = (rightSum + Number(that.calculateDRBJ('suite')) + Number(that.calculateDRBJ('jjc'))).toFixed(2);
|
|
|
let GWCSUITEDRBJ = (rightSum + Number(that.calculateDRBJ('suite')) + Number(that.calculateDRBJ('gwc'))).toFixed(2);
|
|
|
let GWCSGRDRBJ = (rightSum + Number(that.calculateDRBJ('sgr')) + Number(that.calculateDRBJ('gwc'))).toFixed(2);
|
|
|
@@ -4521,13 +4545,83 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
return '';
|
|
|
- }
|
|
|
+ },
|
|
|
+ confirm() {
|
|
|
+ debugger;
|
|
|
+ this.outerVisible = false;
|
|
|
+ if (this.dialogSelectObject == null) {
|
|
|
+ this.dialogSelectObject = {};
|
|
|
+ }
|
|
|
+
|
|
|
+ if (Object.keys(this.dialogSelectObject).length != 0) {
|
|
|
+
|
|
|
+ const possibleDialogTitles = ['选择车导数据', '导游信息', '选择车数据', '景点信息'];
|
|
|
+ const indexBtn = possibleDialogTitles.indexOf(this.DialogTitle);
|
|
|
+ if (indexBtn != -1) {
|
|
|
+ if (indexBtn == 0) {
|
|
|
+ this.bindCD();
|
|
|
+ } else if (indexBtn == 1) {
|
|
|
+ this.bindDY();
|
|
|
+ } else if (indexBtn == 2) {
|
|
|
+ this.bindCSJ();
|
|
|
+ } else if (indexBtn == 3) {
|
|
|
+ this.bindJD();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ this.dialogSelectObject = {};
|
|
|
+ },
|
|
|
+ bindCD() {
|
|
|
+ debugger;
|
|
|
+ var offer = this.dialogSelectObject.offer.match(/\d+/g) != null ? Number(this.dialogSelectObject.offer.match(/\d+/g)[0]) : 0;
|
|
|
+ var cgCost = this.dialogSelectObject.cgCost.match(/\d+/g) != null ? Number(this.dialogSelectObject.cgCost.match(/\d+/g)[0]) : 0;
|
|
|
+ var cgOvertimeFee = this.dialogSelectObject.cgOvertimeFee.match(/\d+/g) != null ? Number(this.dialogSelectObject.cgOvertimeFee.match(/\d+/g)[0]) : 0;
|
|
|
+ var overtimeFee = this.dialogSelectObject.overtimeFee.match(/\d+/g) != null ? Number(this.dialogSelectObject.overtimeFee.match(/\d+/g)[0]) : 0;
|
|
|
+ var runingTime = this.dialogSelectObject.runingTime.match(/\d+/g) != null ? Number(this.dialogSelectObject.runingTime.match(/\d+/g)[0]) : 0;
|
|
|
+ var row = this.tableData[this.rowIndex];
|
|
|
+ var carNumber = row.carNumber;
|
|
|
+ row['carCost'] = (carNumber * offer).toFixed(2);
|
|
|
+ row['tgs'] = cgCost.toFixed(2);
|
|
|
+ row['carTiming'] = runingTime.toFixed(2);
|
|
|
+ var carType = this.dialogSelectObject.city + "/" + this.dialogSelectObject.carType + "/" + this.dialogSelectObject.serviceType + "\n";
|
|
|
+ row['carType'] = carType;
|
|
|
+ },
|
|
|
+ bindDY() {
|
|
|
+ debugger;
|
|
|
+ var row = this.tableData[this.rowIndex];
|
|
|
+ var tgn = row.tgn;
|
|
|
+ var price = this.dialogSelectObject.price.match(/\d+/g) != null ? Number(this.dialogSelectObject.price.match(/\d+/g)[0]) : 0;
|
|
|
+ var translationPrice = this.dialogSelectObject.translationPrice.match(/\d+/g) != null ? Number(this.dialogSelectObject.translationPrice.match(/\d+/g)[0]) : 0;
|
|
|
+ var when = this.dialogSelectObject.when.match(/\d+/g) != null ? Number(this.dialogSelectObject.when.match(/\d+/g)[0]) : 0;
|
|
|
+
|
|
|
+ row['tgs'] = (tgn * price).toFixed(2);
|
|
|
+ row['if'] = translationPrice.toFixed(2);
|
|
|
+ row['tgwh'] = when.toFixed(2);
|
|
|
+ },
|
|
|
+ bindCSJ() {
|
|
|
+ debugger;
|
|
|
+ var row = this.tableData[this.rowIndex];
|
|
|
+ var carType = this.dialogSelectObject.city + "/" + this.dialogSelectObject.carType + "/" + this.dialogSelectObject.serviceType + "\n";
|
|
|
+ var toPrice = this.dialogSelectObject.price.match(/\d+/g) != null ? Number(this.dialogSelectObject.price.match(/\d+/g)[0]) : 0;
|
|
|
+ var when = this.dialogSelectObject.when.match(/\d+/g) != null ? Number(this.dialogSelectObject.when.match(/\d+/g)[0]) : 0;
|
|
|
+ row['carType'] = carType;
|
|
|
+ row['carCost'] = toPrice.toFixed(2);
|
|
|
+ row['carTiming'] = when.toFixed(2);
|
|
|
|
|
|
+ },
|
|
|
+ bindJD() {
|
|
|
+ debugger;
|
|
|
+ var row = this.tableData[this.rowIndex];
|
|
|
+ var Price = this.dialogSelectObject.price;
|
|
|
+ row['ef'] = Price.toFixed(2);
|
|
|
+ }
|
|
|
},
|
|
|
mounted() {
|
|
|
this.token = JSON.parse(localStorage.getItem('userinif')).token;
|
|
|
this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
|
|
|
this.loadData(-1);
|
|
|
+ window.Vue = this;
|
|
|
},
|
|
|
computed: {
|
|
|
defaultCostTypeHotelNumber() {
|
|
|
@@ -4548,33 +4642,33 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
ShowMeals() {
|
|
|
- if(this.ShowBaoPi.length > 0){
|
|
|
+ if (this.ShowBaoPi.length > 0) {
|
|
|
var result = this.ShowBaoPi.filter(x => x.type == 'Meals')[0];
|
|
|
- if(result){
|
|
|
+ if (result) {
|
|
|
return result.content;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
return [];
|
|
|
}
|
|
|
}
|
|
|
return [];
|
|
|
},
|
|
|
ShowHotel() {
|
|
|
- if(this.ShowBaoPi.length > 0){
|
|
|
+ if (this.ShowBaoPi.length > 0) {
|
|
|
var result = this.ShowBaoPi.filter(x => x.type == 'Hotel')[0];
|
|
|
- if(result){
|
|
|
+ if (result) {
|
|
|
return result.content;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
return [];
|
|
|
}
|
|
|
}
|
|
|
return [];
|
|
|
},
|
|
|
ShowGongZa() {
|
|
|
- if(this.ShowBaoPi.length > 0){
|
|
|
+ if (this.ShowBaoPi.length > 0) {
|
|
|
var result = this.ShowBaoPi.filter(x => x.type == 'GongZa')[0];
|
|
|
- if(result){
|
|
|
+ if (result) {
|
|
|
return result.content;
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
return [];
|
|
|
}
|
|
|
}
|
|
|
@@ -4720,7 +4814,8 @@ export default {
|
|
|
.biaogeKz .el-table .el-input--small {
|
|
|
width: 60%;
|
|
|
}
|
|
|
-.czbtn{
|
|
|
+
|
|
|
+.czbtn {
|
|
|
width: 70px;
|
|
|
}
|
|
|
</style>
|
