|
|
@@ -770,13 +770,26 @@
|
|
|
</el-checkbox-group>
|
|
|
<div style="display: flex;font-size: 12px">
|
|
|
<div :style="{ 'width': costTypevalue == 'A' ? '100%' : '49%' }">
|
|
|
- <div style="width: 200px;margin-bottom:0px;margin-top: 20px;"
|
|
|
+ <div :style="{ 'width': costTypevalue == 'A' ? '50%' : '100%' }"
|
|
|
+ style="margin-bottom:0px;margin-top: 20px;"
|
|
|
v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes('签证') && visaCountryInfoArr.length > 0">
|
|
|
|
|
|
<el-table :data="visaCountryInfoArr" border style="width: 100%">
|
|
|
<el-table-column prop="visaCountry" label="签证国家">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="visaPrice" label="签证费用">
|
|
|
+ <el-table-column prop="visaPrice" label="签证费用(元)">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="grandBusinessAgencyFee" label="大公务代办费(元)">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="pettyBusinessAgencyFee" label="小公务代办费(元)">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="isVisaExemption" label="是否免签">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="isVisaOnArrival" label="是否落地签">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="isElectronicSignature" label="是否电子签">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="visaTime" label="一般签证时间(天)">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
@@ -811,7 +824,7 @@
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<span style="color:red">{{ itemsheetone.tips
|
|
|
- }}</span>
|
|
|
+ }}</span>
|
|
|
</div>
|
|
|
<el-input-number slot="reference"
|
|
|
v-model="AGroupCostParameter[itemsheetone.prop]"
|
|
|
@@ -864,13 +877,25 @@
|
|
|
<div style="width: 2%;" v-show="costTypevalue != 'A'"></div>
|
|
|
<div style="width: 49%;" v-show="costTypevalue != 'A'">
|
|
|
|
|
|
- <div class="" style="width: 200px;margin-bottom:0px;margin-top: 20px;visibility: hidden;"
|
|
|
+ <div class="" style="width: 800px;margin-bottom:0px;margin-top: 20px;visibility: hidden;"
|
|
|
v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes('签证') && visaCountryInfoArr.length > 0">
|
|
|
|
|
|
<el-table :data="visaCountryInfoArr" border style="width: 100%">
|
|
|
<el-table-column prop="visaCountry" label="签证国家">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="visaPrice" label="签证费用">
|
|
|
+ <el-table-column prop="visaPrice" label="签证费用(元)">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="grandBusinessAgencyFee" label="大公务代办费(元)">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="pettyBusinessAgencyFee" label="小公务代办费(元)">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="isVisaExemption" label="是否免签">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="isVisaOnArrival" label="是否落地签">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="isElectronicSignature" label="是否电子签">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="visaTime" label="一般签证时间(天)">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
@@ -958,7 +983,7 @@
|
|
|
}}元/人</span>
|
|
|
<span v-else style="color: red">暂无!</span>
|
|
|
<span slot="reference">{{ scope.row[itemcabinone.prop]
|
|
|
- }}</span>
|
|
|
+ }}</span>
|
|
|
</el-popover>
|
|
|
</span>
|
|
|
<span v-else>
|
|
|
@@ -966,7 +991,7 @@
|
|
|
:title="itemcabinone.title" width="200" trigger="hover">
|
|
|
<span style="color: red">暂无!</span>
|
|
|
<span slot="reference">{{ scope.row[itemcabinone.prop]
|
|
|
- }}</span>
|
|
|
+ }}</span>
|
|
|
</el-popover>
|
|
|
</span>
|
|
|
</span>
|
|
|
@@ -974,20 +999,20 @@
|
|
|
</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'totalCost'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
|
|
|
+ (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
|
|
|
}}</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'totalQuote'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- (scope.row['toll'] * scope.row['singleQuote']).toFixed(2)
|
|
|
+ (scope.row['toll'] * scope.row['singleQuote']).toFixed(2)
|
|
|
}}</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'singleProfit'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- ((scope.row['singleQuote'] - scope.row['costPerson'])).toFixed(2)
|
|
|
+ ((scope.row['singleQuote'] - scope.row['costPerson'])).toFixed(2)
|
|
|
}}</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'totalProfit'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- ((scope.row['singleQuote'] - scope.row['costPerson']) *
|
|
|
- scope.row['toll']).toFixed(2)
|
|
|
+ ((scope.row['singleQuote'] - scope.row['costPerson']) *
|
|
|
+ scope.row['toll']).toFixed(2)
|
|
|
}}</span>
|
|
|
<span v-else :title="scope.row[itemcabinone.prop]">{{
|
|
|
scope.row[itemcabinone.prop]
|
|
|
@@ -1019,24 +1044,24 @@
|
|
|
<span
|
|
|
v-else-if="itemcabinone.prop === 'costPerson' || itemcabinone.prop === 'singleQuote'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- scope.row[itemcabinone.prop]
|
|
|
+ scope.row[itemcabinone.prop]
|
|
|
}}</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'totalCost'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
|
|
|
+ (scope.row['toll'] * scope.row['costPerson']).toFixed(2)
|
|
|
}}</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'totalQuote'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- (scope.row['toll'] * scope.row['singleQuote']).toFixed(2)
|
|
|
+ (scope.row['toll'] * scope.row['singleQuote']).toFixed(2)
|
|
|
}}</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'singleProfit'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- (scope.row['singleQuote'] - scope.row['costPerson']).toFixed(2)
|
|
|
+ (scope.row['singleQuote'] - scope.row['costPerson']).toFixed(2)
|
|
|
}}</span>
|
|
|
<span v-else-if="itemcabinone.prop === 'totalProfit'"
|
|
|
:title="scope.row[itemcabinone.prop]">{{
|
|
|
- ((scope.row['singleQuote'] - scope.row['costPerson']) *
|
|
|
- scope.row['toll']).toFixed(2)
|
|
|
+ ((scope.row['singleQuote'] - scope.row['costPerson']) *
|
|
|
+ scope.row['toll']).toFixed(2)
|
|
|
}}</span>
|
|
|
<span v-else :title="scope.row[itemcabinone.prop]">{{
|
|
|
scope.row[itemcabinone.prop]
|
|
|
@@ -6624,6 +6649,7 @@ export default {
|
|
|
}).then(function (res) {
|
|
|
if (res.data.code == 200) {
|
|
|
that.rollcallarr = res.data.data;
|
|
|
+ //that.hideAirInfo();
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -7016,38 +7042,55 @@ export default {
|
|
|
|
|
|
},
|
|
|
hideAirInfo() {
|
|
|
+
|
|
|
+ var settomgAir = [
|
|
|
+ { key: "经济舱", text: "经济舱单人成本(CNY)" },
|
|
|
+ { key: "公务舱", text: "公务舱单人成本(CNY)" },
|
|
|
+ { key: "头等舱", text: "头等舱单人成本(CNY)" }
|
|
|
+ ];
|
|
|
+
|
|
|
+ var hideAirInfoArr = [];
|
|
|
+ for (var j = 0; j < settomgAir.length; j++) {
|
|
|
+ var first = this.rollcallarr.firstWhere(x => x.shippingSpaceType == settomgAir[j].key);
|
|
|
+ if (!first) {
|
|
|
+ hideAirInfoArr.push(settomgAir[j].text)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
const container = document.getElementsByClassName('sheet-box')[0];
|
|
|
- var elem = null;
|
|
|
+
|
|
|
if (container) {
|
|
|
- const elementsInContainer = container.querySelectorAll('*');
|
|
|
- elementsInContainer.forEach((element) => {
|
|
|
- if (element.textContent == '公务舱单人成本(CNY)') {
|
|
|
- if (!this.isElementHidden(element)) {
|
|
|
- //console.log('找到包含内容且未隐藏的元素:', element);
|
|
|
- if (elem == null) {
|
|
|
- elem = element;
|
|
|
+ hideAirInfoArr.forEach((item) => {
|
|
|
+ var elem = null;
|
|
|
+ const elementsInContainer = container.querySelectorAll('*');
|
|
|
+ elementsInContainer.forEach((element) => {
|
|
|
+ if (element.textContent == item && element.textContent) {
|
|
|
+ if (!this.isElementHidden(element)) {
|
|
|
+ //console.log('找到包含内容且未隐藏的元素:', element);
|
|
|
+ if (elem == null) {
|
|
|
+ elem = element;
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- });
|
|
|
+ });
|
|
|
|
|
|
- if (elem && elem.tagName == 'TH') {
|
|
|
+ if (elem && elem.tagName == 'TH') {
|
|
|
|
|
|
- const targetClassName = 'biaoge';
|
|
|
- let parent = elem;
|
|
|
- let hasParentWithClass = false;
|
|
|
+ const targetClassName = 'biaoge';
|
|
|
+ let parent = elem;
|
|
|
+ let hasParentWithClass = false;
|
|
|
|
|
|
- while (parent) {
|
|
|
- if (parent.classList && parent.classList.contains(targetClassName)) {
|
|
|
- hasParentWithClass = true;
|
|
|
- parent.style.display = 'none';
|
|
|
- break;
|
|
|
+ while (parent) {
|
|
|
+ if (parent.classList && parent.classList.contains(targetClassName)) {
|
|
|
+ hasParentWithClass = true;
|
|
|
+ parent.style.display = 'none';
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ parent = parent.parentElement; // 移动到上一级父容器
|
|
|
}
|
|
|
- parent = parent.parentElement; // 移动到上一级父容器
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- }
|
|
|
+ })
|
|
|
|
|
|
} else {
|
|
|
console.log('未找到指定的容器');
|
|
|
@@ -7468,8 +7511,7 @@ export default {
|
|
|
background-color: #0001;
|
|
|
}
|
|
|
|
|
|
-.accon-ul:last-child {
|
|
|
- bottom: 15px;
|
|
|
+.accon-ul:last-child { bottom: 15px;
|
|
|
}
|
|
|
|
|
|
.btn-dialog-cost {
|
