|
|
@@ -358,8 +358,8 @@
|
|
|
<div class="cost-info-li">
|
|
|
<!-- 客户名单 -->
|
|
|
<el-popover class="clientinfo" placement="bottom" width="952" trigger="hover">
|
|
|
- <el-table :cell-style="{ 'text-align': 'center' }" :header-cell-style="{ 'text-align': 'center' }"
|
|
|
- max-height="600" border :data="rollcallarr">
|
|
|
+ <el-table :cell-style="{ 'text-align': 'center' }"
|
|
|
+ :header-cell-style="{ 'text-align': 'center' }" max-height="600" border :data="rollcallarr">
|
|
|
<el-table-column width="100" property="date" label="姓名" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.lastName }}{{ scope.row.firstName }}
|
|
|
@@ -1023,6 +1023,9 @@ export default {
|
|
|
{ label: '1/L', width: '60', prop: 'iL', describe: '邀请函相关费用(1/L)' },
|
|
|
{ label: 'I/F', width: '60', prop: 'if', describe: '公务翻译费用(INTERPRETER FEES)' },
|
|
|
{ label: 'EF', width: '60', prop: 'ef', describe: '景点门票(ENTRANCE FEE) #个人成本' },
|
|
|
+ //--------------------------------------------------
|
|
|
+ { label: 'EFR', width: '100', prop: 'efr', describe: '景点门票详细信息 (ENTRANCE FEE REMARK)' },
|
|
|
+ //-----------------------------------------------------
|
|
|
{ label: 'B/R/F', width: '60', prop: 'b_R_F', describe: '饮料零食水果(BEVERAGE/RRESHMENT/FRUIT)' },
|
|
|
{ label: 'TE', width: '60', prop: 'te', describe: '出行物资(TRAVELLLING ESSENTIALS) #个人成本' },
|
|
|
{ label: 'T/G T', width: '60', prop: 'tgTips', describe: '导游小费(T/G TIPS) #个人成本' },
|
|
|
@@ -2758,6 +2761,14 @@ export default {
|
|
|
"singleTips": "景点门票人均\n",
|
|
|
"width": 60,
|
|
|
},
|
|
|
+ {
|
|
|
+ "label": "EFR",
|
|
|
+ "tips": "",
|
|
|
+ "totalPrice": 0,
|
|
|
+ "singlePrice": 0,
|
|
|
+ "singleTips": "",
|
|
|
+ "width": 100,
|
|
|
+ },
|
|
|
{
|
|
|
"label": "B/R/F",
|
|
|
"tips": "饮料零食水果\n",
|
|
|
@@ -2994,7 +3005,7 @@ export default {
|
|
|
that.lableSetPrice(column.label, '', '');
|
|
|
return;
|
|
|
}
|
|
|
- if (column.label == 'DATE' || column.label == 'ITIN' || column.label == 'VT' || column.label == 'VN' || column.label == 'ACCO N' || column.label == 'VA' || column.label == 'VRD' || column.label == 'T/G N' || column.label == 'T/G WH' || column.label == '操作' || column.label == 'TV/N' || column.label == 'IF/N') {
|
|
|
+ if (column.label == 'DATE' || column.label == 'ITIN' || column.label == 'VT' || column.label == 'VN' || column.label == 'ACCO N' || column.label == 'VA' || column.label == 'VRD' || column.label == 'T/G N' || column.label == 'T/G WH' || column.label == '操作' || column.label == 'TV/N' || column.label == 'IF/N' || column.label == 'EFR') {
|
|
|
prices[index] = "——";
|
|
|
that.lableSetPrice(column.label, '', '');
|
|
|
return;
|
|
|
@@ -3267,7 +3278,8 @@ export default {
|
|
|
"ect": "",
|
|
|
"id": 1,
|
|
|
"gwCount": "",
|
|
|
- "fyCount": ""
|
|
|
+ "fyCount": "",
|
|
|
+ "efr": "",
|
|
|
}
|
|
|
)
|
|
|
},
|
|
|
@@ -3284,7 +3296,7 @@ export default {
|
|
|
}).then(resp => {
|
|
|
setTimeout(() => {
|
|
|
that.PostTourClientListByDiId(id);
|
|
|
- }, 500)
|
|
|
+ }, 1000)
|
|
|
//////console.log(resp.data.data, '------------------------------------');
|
|
|
if (resp.data.code == 200) {
|
|
|
|
|
|
@@ -3318,7 +3330,7 @@ export default {
|
|
|
{
|
|
|
"diid": that.diid,
|
|
|
"cbType": "Top",
|
|
|
- "cbValues": ['DAY', 'DATE', 'ITIN', 'VA', 'VT', 'VF', 'VRD', 'T/G S', 'T/G WH', 'C/F M', 'L', 'D', 'SGR', 'SUITE', 'ACCO N', 'T/V', 'EF', 'B/R/F', 'TE', 'DRV T', 'P/C'] //"string"
|
|
|
+ "cbValues": ['DAY', 'DATE', 'ITIN', 'VA', 'VT', 'VF', 'VRD', 'T/G S', 'T/G WH', 'C/F M', 'L', 'D', 'SGR', 'SUITE', 'ACCO N', 'T/V', 'EF', 'EFR', 'B/R/F', 'TE', 'DRV T', 'P/C'] //"string"
|
|
|
},
|
|
|
{
|
|
|
"diid": that.diid,
|
|
|
@@ -3333,6 +3345,14 @@ export default {
|
|
|
]
|
|
|
}
|
|
|
|
|
|
+ that.CheckBoxListSelect.forEach(x => {
|
|
|
+ if (x.cbType == 'Top') {
|
|
|
+ if (x.cbValues.includes("EF") && !x.cbValues.includes("EFR")) {
|
|
|
+ x.cbValues.push("EFR");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
that.grouptitleinfo.visitStartDate = that.grouptitleinfo.visitStartDate.split(' ')[0];
|
|
|
that.grouptitleinfo.visitEndDate = that.grouptitleinfo.visitEndDate.split(' ')[0];
|
|
|
that.peopleNumber = that.grouptitleinfo.visitPNumber > 0 ? that.grouptitleinfo.visitPNumber : 1;
|
|
|
@@ -3391,7 +3411,8 @@ export default {
|
|
|
"ect": "",
|
|
|
"id": 1,
|
|
|
"gwCount": "",
|
|
|
- "fyCount": ""
|
|
|
+ "fyCount": "",
|
|
|
+ "efr": "",
|
|
|
}
|
|
|
]
|
|
|
}
|
|
|
@@ -4696,6 +4717,75 @@ export default {
|
|
|
if (label == 'SUITE') {
|
|
|
this.costTypeHotelNumbers.filter(item => item.type == 'Default')[0].suite = 0
|
|
|
}
|
|
|
+
|
|
|
+ if (label == 'EF') {
|
|
|
+ that.CheckBoxListSelect.forEach(x => {
|
|
|
+ if (x.cbType == 'Top') {
|
|
|
+ if (x.cbValues.includes("EFR")) {
|
|
|
+ var index = x.cbValues.indexOf("EFR");
|
|
|
+ if (index > -1) {
|
|
|
+ x.cbValues.splice(index, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ var fliterList = that.tableLabel.filter(x => x.label == "EFR");
|
|
|
+ if (fliterList.length != 0) {
|
|
|
+ var obj = {
|
|
|
+ "diid": that.diid,
|
|
|
+ "day": "-",
|
|
|
+ "date": "",
|
|
|
+ "itin": "",
|
|
|
+ "carType": "",
|
|
|
+ "carCost": "",
|
|
|
+ "carNumber": "",
|
|
|
+ "carTiming": "",
|
|
|
+ "tgs": "",
|
|
|
+ "tgwh": "",
|
|
|
+ "tgn": "",
|
|
|
+ "tgof": "",
|
|
|
+ "tgm": "",
|
|
|
+ "tga": "",
|
|
|
+ "tgtf": "",
|
|
|
+ "tgef": "",
|
|
|
+ "cfs": "",
|
|
|
+ "cfm": "",
|
|
|
+ "cfof": "",
|
|
|
+ "b": "",
|
|
|
+ "l": "",
|
|
|
+ "d": "",
|
|
|
+ "tbr": "",
|
|
|
+ "sgr": "",
|
|
|
+ "jS_ES": "",
|
|
|
+ "suite": "",
|
|
|
+ "accon": "",
|
|
|
+ "tv": "",
|
|
|
+ "iL": "",
|
|
|
+ "if": "",
|
|
|
+ "ef": "",
|
|
|
+ "b_R_F": "",
|
|
|
+ "te": "",
|
|
|
+ "tgTips": "",
|
|
|
+ "drvTips": "",
|
|
|
+ "pc": "",
|
|
|
+ "tlf": "",
|
|
|
+ "ect": "",
|
|
|
+ "id": 1,
|
|
|
+ "gwCount": "",
|
|
|
+ "fyCount": "",
|
|
|
+ "efr": "",
|
|
|
+ };
|
|
|
+ var prop = fliterList[0].prop;
|
|
|
+ var initval = obj[prop];
|
|
|
+
|
|
|
+ for (var i = 0; i < that.tableData.length; i++) {
|
|
|
+ that.tableData[i][prop] = initval;
|
|
|
+ }
|
|
|
+ //////console.log(that.tableData, 'that.tableData数据');
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
//////console.log('确定清空数据');
|
|
|
var fliterList = this.sumTopPrice.filter(x => x.label == label);
|
|
|
if (fliterList.length != 0) {
|
|
|
@@ -4746,7 +4836,8 @@ export default {
|
|
|
"ect": "",
|
|
|
"id": 1,
|
|
|
"gwCount": "",
|
|
|
- "fyCount": ""
|
|
|
+ "fyCount": "",
|
|
|
+ "efr": "",
|
|
|
};
|
|
|
var prop = fliterList[0].prop;
|
|
|
var initval = obj[prop];
|
|
|
@@ -4774,6 +4865,16 @@ export default {
|
|
|
}
|
|
|
|
|
|
});
|
|
|
+ } else {
|
|
|
+ if (label == 'EF') {
|
|
|
+ that.CheckBoxListSelect.forEach(x => {
|
|
|
+ if (x.cbType == 'Top') {
|
|
|
+ if (!x.cbValues.includes("EFR")) {
|
|
|
+ x.cbValues.push("EFR");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
},
|
|
|
@@ -5340,7 +5441,8 @@ export default {
|
|
|
"ect": "",
|
|
|
"id": 1,
|
|
|
"gwCount": "",
|
|
|
- "fyCount": ""
|
|
|
+ "fyCount": "",
|
|
|
+ "efr": "",
|
|
|
};
|
|
|
|
|
|
if (oper == 'UP') {
|
|
|
@@ -5409,7 +5511,8 @@ export default {
|
|
|
"ect": 0,
|
|
|
"id": 1,
|
|
|
"gwCount": "",
|
|
|
- "fyCount": ""
|
|
|
+ "fyCount": "",
|
|
|
+ "efr": "",
|
|
|
};
|
|
|
var numberList = [];
|
|
|
for (var key in souer) {
|
yuanrf