|
@@ -358,10 +358,36 @@
|
|
|
<div v-else>
|
|
|
<!-- <el-input v-model="AGroupCostParameter[itemsheetone.prop]"
|
|
|
show-word-limit /> -->
|
|
|
- <el-input-number
|
|
|
+ <!-- <el-input-number
|
|
|
v-model="AGroupCostParameter[itemsheetone.prop]"
|
|
|
@change="handleChange" :min="0" size="small"
|
|
|
- :controls="false"></el-input-number>
|
|
|
+ :controls="false"></el-input-number> -->
|
|
|
+ <div v-if="itemsheetone.tips">
|
|
|
+ <el-popover placement="top-start"
|
|
|
+ :title="itemsheetone.title" width="200" trigger="hover">
|
|
|
+ <!-- :content="itemsheetone.tips" -->
|
|
|
+ <div v-if="itemsheetone.tips != '暂无!'">
|
|
|
+ <span style="color:green">{{ itemsheetone.tips
|
|
|
+ }}</span>
|
|
|
+ 元/人
|
|
|
+ </div>
|
|
|
+ <div v-else>
|
|
|
+ <span style="color:red">{{ itemsheetone.tips
|
|
|
+ }}</span>
|
|
|
+ </div>
|
|
|
+ <el-input-number slot="reference"
|
|
|
+ v-model="AGroupCostParameter[itemsheetone.prop]"
|
|
|
+ @change="handleChange" :min="0" size="small"
|
|
|
+ :controls="false"></el-input-number>
|
|
|
+ </el-popover>
|
|
|
+ </div>
|
|
|
+ <div v-else>
|
|
|
+ <el-input-number slot="reference"
|
|
|
+ v-model="AGroupCostParameter[itemsheetone.prop]"
|
|
|
+ @change="handleChange" :min="0" size="small"
|
|
|
+ :controls="false"></el-input-number>
|
|
|
+
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div v-else-if="itemsheetone.prop === 'ZCB'">
|
|
@@ -743,7 +769,9 @@ export default {
|
|
|
childList: [
|
|
|
{
|
|
|
childLabel: '签证单人成本(CNY)',
|
|
|
- prop: 'visaCB'
|
|
|
+ prop: 'visaCB',
|
|
|
+ tips: '这是一个tips',
|
|
|
+ title: '签证报批费用:'
|
|
|
},
|
|
|
{
|
|
|
childLabel: '人数',
|
|
@@ -782,7 +810,9 @@ export default {
|
|
|
childList: [
|
|
|
{
|
|
|
childLabel: '保险单人成本(CNY)',
|
|
|
- prop: 'bxcb'
|
|
|
+ prop: 'bxcb',
|
|
|
+ title: '保险报批费用:',
|
|
|
+ tips: '这是一个tips',
|
|
|
},
|
|
|
{
|
|
|
childLabel: '人数',
|
|
@@ -860,7 +890,9 @@ export default {
|
|
|
childList: [
|
|
|
{
|
|
|
childLabel: '经济舱单人成本(CNY)',
|
|
|
- prop: 'jjccb'
|
|
|
+ prop: 'jjccb',
|
|
|
+ title: '经济舱报批费用:',
|
|
|
+ tips: '这是一个tips',
|
|
|
},
|
|
|
{
|
|
|
childLabel: '人数',
|
|
@@ -899,7 +931,9 @@ export default {
|
|
|
childList: [
|
|
|
{
|
|
|
childLabel: '公务舱单人成本(CNY)',
|
|
|
- prop: 'gwccb'
|
|
|
+ prop: 'gwccb',
|
|
|
+ title: '公务舱报批费用:',
|
|
|
+ tips: '这是一个tips',
|
|
|
},
|
|
|
{
|
|
|
childLabel: '人数',
|
|
@@ -977,7 +1011,9 @@ export default {
|
|
|
childList: [
|
|
|
{
|
|
|
childLabel: '核酸检测单人成本(CNY)',
|
|
|
- prop: 'hscb'
|
|
|
+ prop: 'hscb',
|
|
|
+ title: '核酸检测报批费用:',
|
|
|
+ tips: '这是一个tips',
|
|
|
},
|
|
|
{
|
|
|
childLabel: '人数',
|
|
@@ -2130,16 +2166,16 @@ export default {
|
|
|
MiscellaneousFees: ['B/R/F', 'TE', 'T/L F'],
|
|
|
ATip: ['T/G T', 'DRV T'],
|
|
|
visaCountryInfoArr: [],
|
|
|
-
|
|
|
+ equalWhere: [
|
|
|
+ { "Visa": "visa" },
|
|
|
+ { "HeSuan": "hs" },
|
|
|
+ { "Insurance": "bx" },
|
|
|
+ { "JJC": "jjc" },
|
|
|
+ { "GWC": "gwc" }
|
|
|
+ ],
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
- // 此处监听variable变量,当期有变化时执行
|
|
|
- // checkList(item1, item2) {
|
|
|
- // // console.log(item1)
|
|
|
- // // console.log(item2)
|
|
|
- // // item1为新值,item2为旧值
|
|
|
- // },
|
|
|
'tableData.length': {
|
|
|
handler(newValue, oldValue) {
|
|
|
if (newValue !== oldValue) {
|
|
@@ -2148,7 +2184,7 @@ export default {
|
|
|
} else {
|
|
|
this.centerheight = this.defaultheight + (this.tableData.length * 220);
|
|
|
}
|
|
|
- console.log('高度' + this.centerheight);
|
|
|
+ //console.log('高度' + this.centerheight);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -2157,7 +2193,7 @@ export default {
|
|
|
methods: {
|
|
|
getSummaries(param) {
|
|
|
var that = this;
|
|
|
- //console.log(param)
|
|
|
+ ////console.log(param)
|
|
|
const { columns, data } = param;
|
|
|
const sums = [];
|
|
|
const sums1 = [];
|
|
@@ -2167,11 +2203,11 @@ export default {
|
|
|
var ATime = { start: that.addOneDay(that.AGroupCostParameter.costTypeStartTime, 0), end: that.addOneDay(that.AGroupCostParameter.costTypeendTime, 0) };
|
|
|
var BTime = { start: that.addOneDay(that.BGroupCostParameter.costTypeStartTime, 0), end: that.addOneDay(that.BGroupCostParameter.costTypeendTime, 0) };
|
|
|
|
|
|
- console.log('ATime,BTime', ATime, BTime);
|
|
|
+ //console.log('ATime,BTime', ATime, BTime);
|
|
|
var data1 = [];
|
|
|
var data2 = [];
|
|
|
|
|
|
- console.log('datas', data);
|
|
|
+ //console.log('datas', data);
|
|
|
|
|
|
if (that.costTypevalue == 'B') {
|
|
|
for (var i = 0; i < thisData.length; i++) {
|
|
@@ -2193,7 +2229,7 @@ export default {
|
|
|
that.peopleNumber = Number(that.AGroupCostParameter.costTypenumber);
|
|
|
}
|
|
|
}
|
|
|
- console.log('3data', thisData, data1, data2);
|
|
|
+ //console.log('3data', thisData, data1, data2);
|
|
|
columns.forEach((column, index) => {
|
|
|
if (index === 0) {
|
|
|
prices[index] = "总计:";
|
|
@@ -2274,9 +2310,9 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
this.titleText = texts;
|
|
|
- console.log(that.sumTopPrice, 'sumTopPrice---------------');
|
|
|
+ //console.log(that.sumTopPrice, 'sumTopPrice---------------');
|
|
|
this.CalculatedPrice();
|
|
|
- //console.log(that.sumTopPrice, '------------');
|
|
|
+ ////console.log(that.sumTopPrice, '------------');
|
|
|
setTimeout(() => {
|
|
|
this.setLastTitle(prices);
|
|
|
}, 1000);
|
|
@@ -2284,7 +2320,7 @@ export default {
|
|
|
return prices;
|
|
|
},
|
|
|
handleEdit(index, row, buttonIndex) {
|
|
|
- //console.log(index, row, buttonIndex);
|
|
|
+ ////console.log(index, row, buttonIndex);
|
|
|
this.rowIndex = index; // 行的索引
|
|
|
var api = '';
|
|
|
switch (buttonIndex) {
|
|
@@ -2325,7 +2361,7 @@ export default {
|
|
|
'Authorization': that.token,
|
|
|
}
|
|
|
}).then(resp => {
|
|
|
- console.log(resp.data.data, '------------------------------------');
|
|
|
+ //console.log(resp.data.data, '------------------------------------');
|
|
|
that.outerVisible = true;
|
|
|
if (resp.data.code == 200) {
|
|
|
that.dialogTableData = resp.data.data;
|
|
@@ -2337,7 +2373,7 @@ export default {
|
|
|
|
|
|
},
|
|
|
handleDelete(index, row, rows) {
|
|
|
- console.log(index, row, rows);
|
|
|
+ //console.log(index, row, rows);
|
|
|
this.$confirm('此操作将删除该条信息, 是否继续?', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
@@ -2424,7 +2460,7 @@ export default {
|
|
|
'Authorization': that.token,
|
|
|
}
|
|
|
}).then(resp => {
|
|
|
- console.log(resp.data.data, '------------------------------------');
|
|
|
+ //console.log(resp.data.data, '------------------------------------');
|
|
|
if (resp.data.code == 200) {
|
|
|
that.options = resp.data.data.groupList;
|
|
|
that.grouptitleinfo = resp.data.data.groupInfo.data;
|
|
@@ -2439,7 +2475,7 @@ export default {
|
|
|
for (var i = 0; i < that.CheckBoxListSelect.length; i++) {
|
|
|
if (item.cbType == that.CheckBoxListSelect[i].cbType) {
|
|
|
that.CheckBoxListSelect[i].cbValues = item.cbValues.split(',');
|
|
|
- console.log(item.cbValues.split(','));
|
|
|
+ //console.log(item.cbValues.split(','));
|
|
|
break;
|
|
|
}
|
|
|
if (that.CheckBoxListSelect[i].diid == 0) {
|
|
@@ -2827,6 +2863,38 @@ export default {
|
|
|
that.visaCountryInfoArr = [];
|
|
|
}
|
|
|
|
|
|
+ if (resp.data.data.baoPi.length > 0) {
|
|
|
+ //that.sheetDatal
|
|
|
+ const baoPi = resp.data.data.baoPi;
|
|
|
+ for (var i = 0; i < baoPi.length; i++) {
|
|
|
+ for (var j = 0; j < that.equalWhere.length; j++) {
|
|
|
+ let item = that.equalWhere[j];
|
|
|
+ for (var p in item) {
|
|
|
+ if (baoPi[i].type == p) {
|
|
|
+ //console.log("key:" + p + "已经匹配 value:" + item[p]);
|
|
|
+ for (var m = 0; m < that.sheetDatal.length; m++) {
|
|
|
+ if (that.sheetDatal[m].EnLabel == item[p]) {
|
|
|
+ //console.log(" 1 key:" + that.sheetDatal[m].EnLabel + "已经匹配 1 value:" + baoPi[i].price);
|
|
|
+ that.sheetDatal[m].childList[0].tips = baoPi[i].price;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ } else {
|
|
|
+ for (var m = 0; m < that.sheetDatal.length; m++) {
|
|
|
+ if (that.sheetDatal[m].childList[0].tips) {
|
|
|
+ that.sheetDatal[m].childList[0].tips = "暂无!";
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
that.costloading = false;
|
|
|
}).catch(err => {
|
|
@@ -2894,7 +2962,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
this.Dataformat();
|
|
|
- console.log(Data, "save-------Data");
|
|
|
+ //console.log(Data, "save-------Data");
|
|
|
|
|
|
var that = this;
|
|
|
this.$axios.post('/api/Groups/SaveGroupCost', Data, {
|
|
@@ -2902,7 +2970,7 @@ export default {
|
|
|
'Authorization': that.token,
|
|
|
}
|
|
|
}).then(resp => {
|
|
|
- console.log(resp.data.data, '------------------------------------');
|
|
|
+ //console.log(resp.data.data, '------------------------------------');
|
|
|
if (resp.data.code == 200) {
|
|
|
this.$message({
|
|
|
message: '保存成功!',
|
|
@@ -3138,7 +3206,7 @@ export default {
|
|
|
this.currentPage = val;
|
|
|
},
|
|
|
SelChange(row, oldrow) {
|
|
|
- console.log(row, oldrow);
|
|
|
+ //console.log(row, oldrow);
|
|
|
},
|
|
|
handleSizeChange(val) {
|
|
|
this.currentPage = 1;
|
|
@@ -3260,8 +3328,8 @@ export default {
|
|
|
SUITEsum = SUITEsum * rate;
|
|
|
BSUITEsum = BSUITEsum * rate;
|
|
|
|
|
|
- // console.log(Djsum, GWsum, LYJsum, 'Djsum,GWsum,LYJsum');
|
|
|
- // console.log(SGRsum, TBRsum, JSESsum, SUITEsum, 'SGRsum,TBRsum,JSESsum,SUITEsum');
|
|
|
+ // //console.log(Djsum, GWsum, LYJsum, 'Djsum,GWsum,LYJsum');
|
|
|
+ // //console.log(SGRsum, TBRsum, JSESsum, SUITEsum, 'SGRsum,TBRsum,JSESsum,SUITEsum');
|
|
|
|
|
|
var sgrfilter = this.costTypeHotelNumbers.filter(x => {
|
|
|
return x.type == 'Default'
|
|
@@ -3415,7 +3483,7 @@ export default {
|
|
|
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);
|
|
|
let GWCJSES = (leftSum + Number(this.AGroupCostParameter.jsescb) + Number(this.AGroupCostParameter.gwccb)).toFixed(2);
|
|
|
- //console.log(JJCSGR, JJCTBR, JJCSUITE, GWCSUITE, GWCSGR, GWCJSES, '666--------------------------');
|
|
|
+ ////console.log(JJCSGR, JJCTBR, JJCSUITE, GWCSUITE, GWCSGR, GWCJSES, '666--------------------------');
|
|
|
|
|
|
var rightSum = 0;
|
|
|
this.OtherCostPropertyBJ.forEach((x) => {
|
|
@@ -3489,7 +3557,7 @@ export default {
|
|
|
// }
|
|
|
|
|
|
|
|
|
- //console.log(groupCosts, gtroupQuotes, groupProfit, 'groupCosts, gtroupQuotes, groupProfit');
|
|
|
+ ////console.log(groupCosts, gtroupQuotes, groupProfit, 'groupCosts, gtroupQuotes, groupProfit');
|
|
|
|
|
|
},
|
|
|
OtherCost() {
|
|
@@ -3540,7 +3608,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
NumberSetTime(number, index) {
|
|
|
- console.log(number, index, this.grouptitleinfo.visitStartDate);
|
|
|
+ //console.log(number, index, this.grouptitleinfo.visitStartDate);
|
|
|
number = parseInt(number);
|
|
|
if (!isNaN(number)) {
|
|
|
var time = this.addOneDay(this.grouptitleinfo.visitStartDate, number - 1)
|
|
@@ -3564,7 +3632,7 @@ export default {
|
|
|
return `${year}-${month}-${day}`;
|
|
|
},
|
|
|
costTypeSelect(val) {
|
|
|
- console.log('costTypeSelect--------------------------------------------------------', val);
|
|
|
+ //console.log('costTypeSelect--------------------------------------------------------', val);
|
|
|
},
|
|
|
async formVerify() {
|
|
|
return new Promise((resolve, reject) => {
|
|
@@ -3598,7 +3666,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
topcheckboxChange(val, label) {
|
|
|
- console.log(val, label, 'topcheckboxChangeval');
|
|
|
+ //console.log(val, label, 'topcheckboxChangeval');
|
|
|
var that = this;
|
|
|
if (!val) {
|
|
|
this.$confirm('此操作将清空整列数据, 是否继续?', '提示', {
|
|
@@ -3607,7 +3675,7 @@ export default {
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
|
|
|
- console.log('确定清空数据');
|
|
|
+ //console.log('确定清空数据');
|
|
|
var fliterList = this.sumTopPrice.filter(x => x.label == label);
|
|
|
if (fliterList.length != 0) {
|
|
|
fliterList[0].Aprice = 0;
|
|
@@ -3663,7 +3731,7 @@ export default {
|
|
|
for (var i = 0; i < that.tableData.length; i++) {
|
|
|
that.tableData[i][prop] = initval;
|
|
|
}
|
|
|
- console.log(that.tableData, 'that.tableData数据');
|
|
|
+ //console.log(that.tableData, 'that.tableData数据');
|
|
|
}
|
|
|
|
|
|
this.$message({
|
|
@@ -3692,7 +3760,7 @@ export default {
|
|
|
'Authorization': this.token,
|
|
|
}
|
|
|
}).then(resp => {
|
|
|
- console.log(resp.data.data, '------------------------------------');
|
|
|
+ //console.log(resp.data.data, '------------------------------------');
|
|
|
if (resp.data.code == 200) {
|
|
|
this.$message({
|
|
|
message: '操作成功!' + resp.data.msg,
|
|
@@ -3904,7 +3972,7 @@ export default {
|
|
|
'Authorization': this.token,
|
|
|
}
|
|
|
}).then(resp => {
|
|
|
- console.log(resp, '------------------------------------');
|
|
|
+ //console.log(resp, '------------------------------------');
|
|
|
try {
|
|
|
if (resp.data.code != 200) {
|
|
|
throw resp.data.msg;
|
|
@@ -3936,7 +4004,7 @@ export default {
|
|
|
},
|
|
|
async GetGroupCostExcel() {
|
|
|
|
|
|
- console.log(this.titleText, 'this.titleText');
|
|
|
+ //console.log(this.titleText, 'this.titleText');
|
|
|
|
|
|
var isTrue = await this.save();
|
|
|
if (!isTrue) {
|
|
@@ -3980,14 +4048,14 @@ export default {
|
|
|
data.rightInfo = rightObject;
|
|
|
data.titleModel = this.titleText;
|
|
|
|
|
|
- console.log(data);
|
|
|
+ //console.log(data);
|
|
|
|
|
|
this.$axios.post('/api/Groups/ExportGroupCostExcelFile', data, {
|
|
|
headers: {
|
|
|
'Authorization': this.token,
|
|
|
}
|
|
|
}).then(resp => {
|
|
|
- console.log(resp, '------------------------------------');
|
|
|
+ //console.log(resp, '------------------------------------');
|
|
|
if (resp.data.code == 200) {
|
|
|
var file = resp.data.data;
|
|
|
that.fileDownload(file.data, file.strFileName);
|
|
@@ -4182,7 +4250,7 @@ export default {
|
|
|
'Authorization': this.token,
|
|
|
}
|
|
|
}).then(resp => {
|
|
|
- console.log(resp, '------------------------------------');
|
|
|
+ //console.log(resp, '------------------------------------');
|
|
|
if (resp.data.code == 200) {
|
|
|
var file = resp.data.data;
|
|
|
that.fileDownload(file.data, file.strFileName);
|
|
@@ -4249,10 +4317,10 @@ export default {
|
|
|
that.tableData.splice(index + 1, 0, row)
|
|
|
}
|
|
|
|
|
|
- console.log('that.tableData', that.tableData)
|
|
|
+ //console.log('that.tableData', that.tableData)
|
|
|
var thisDay = 1;
|
|
|
for (var i = 0; i < that.tableData.length; i++) {
|
|
|
- console.log("iiiiiiiiiiiiiiii", i, Number(that.tableData.day))
|
|
|
+ //console.log("iiiiiiiiiiiiiiii", i, Number(that.tableData.day))
|
|
|
if (Number(that.tableData[i].day) > 0) {
|
|
|
that.tableData[i].day = thisDay;
|
|
|
thisDay++;
|
|
@@ -4310,13 +4378,13 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- console.log(numberList, "numberList!");
|
|
|
- console.log(that.tableData, "that.tableData!");
|
|
|
+ //console.log(numberList, "numberList!");
|
|
|
+ //console.log(that.tableData, "that.tableData!");
|
|
|
for (var i = 0; i < that.tableData.length; i++) {
|
|
|
that.tableData[i].day = that.tableData[i].day.toString();
|
|
|
for (var j = 0; j < numberList.length; j++) {
|
|
|
if (that.tableData[i][numberList[j]] === "") {
|
|
|
- console.log(i + "行数据异常!", numberList[j]);
|
|
|
+ //console.log(i + "行数据异常!", numberList[j]);
|
|
|
that.tableData[i][numberList[j]] = 0;
|
|
|
}
|
|
|
}
|
|
@@ -4373,7 +4441,7 @@ export default {
|
|
|
return result;
|
|
|
},
|
|
|
handleChange(currentValue, oldValue) {
|
|
|
- console.log(currentValue, oldValue);
|
|
|
+ //console.log(currentValue, oldValue);
|
|
|
if (currentValue == undefined) {
|
|
|
|
|
|
}
|
|
@@ -4386,7 +4454,7 @@ export default {
|
|
|
var weekday = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
|
|
|
return weekday[myDay];
|
|
|
} catch (e) {
|
|
|
- console.log("时间格式不正确!")
|
|
|
+ //console.log("时间格式不正确!")
|
|
|
return "时间格式不正确!";
|
|
|
}
|
|
|
}
|