|
@@ -792,21 +792,24 @@
|
|
|
v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes('签证') && visaCountryInfoArr.length > 0">
|
|
v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes('签证') && visaCountryInfoArr.length > 0">
|
|
|
|
|
|
|
|
<el-table :data="visaCountryInfoArr" border style="width: 100%">
|
|
<el-table :data="visaCountryInfoArr" border style="width: 100%">
|
|
|
- <el-table-column prop="visaCountry" label="签证国家">
|
|
|
|
|
|
|
+ <el-table-column prop="country" width="90" label="签证国家">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="visaPrice" label="签证费用(元)">
|
|
|
|
|
|
|
+
|
|
|
|
|
+ <el-table-column prop="largeVisaPrice" label="大公务签证费(元)">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="grandBusinessAgencyFee" label="大公务代办费(元)">
|
|
|
|
|
|
|
+ <el-table-column prop="largeAgencyFee" label="大公务代办费(元)">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="pettyBusinessAgencyFee" label="小公务代办费(元)">
|
|
|
|
|
|
|
+ <el-table-column prop="isVisaExemptionLarge" label="大公务是否免签">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="isVisaExemption" label="是否免签">
|
|
|
|
|
|
|
+
|
|
|
|
|
+ <el-table-column prop="smallVisaPrice" label="小公务签证费(元)">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="isVisaOnArrival" label="是否落地签">
|
|
|
|
|
|
|
+ <el-table-column prop="smallAgencyFee" label="小公务代办费(元)">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="isElectronicSignature" label="是否电子签">
|
|
|
|
|
|
|
+ <el-table-column prop="isVisaExemptionSmall" label="小公务是否免签">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="visaTime" label="一般签证时间(天)">
|
|
|
|
|
|
|
+
|
|
|
|
|
+ <el-table-column prop="yinsivalue" label="因私签证费【包含代办费】(元)">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</el-table>
|
|
</el-table>
|
|
|
|
|
|
|
@@ -836,12 +839,12 @@
|
|
|
<!-- :content="itemsheetone.tips" -->
|
|
<!-- :content="itemsheetone.tips" -->
|
|
|
<div v-if="itemsheetone.tips != '暂无!'">
|
|
<div v-if="itemsheetone.tips != '暂无!'">
|
|
|
<span style="color:green">{{ itemsheetone.tips
|
|
<span style="color:green">{{ itemsheetone.tips
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ }}</span>
|
|
|
元/人
|
|
元/人
|
|
|
</div>
|
|
</div>
|
|
|
<div v-else>
|
|
<div v-else>
|
|
|
<span style="color:red">{{ itemsheetone.tips
|
|
<span style="color:red">{{ itemsheetone.tips
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ }}</span>
|
|
|
</div>
|
|
</div>
|
|
|
<el-input-number slot="reference"
|
|
<el-input-number slot="reference"
|
|
|
v-model="AGroupCostParameter[itemsheetone.prop]"
|
|
v-model="AGroupCostParameter[itemsheetone.prop]"
|
|
@@ -898,14 +901,14 @@
|
|
|
v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes('签证') && visaCountryInfoArr.length > 0">
|
|
v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes('签证') && visaCountryInfoArr.length > 0">
|
|
|
|
|
|
|
|
<el-table :data="visaCountryInfoArr" border style="width: 100%">
|
|
<el-table :data="visaCountryInfoArr" border style="width: 100%">
|
|
|
- <el-table-column prop="visaCountry" label="签证国家">
|
|
|
|
|
|
|
+ <el-table-column prop="country" label="签证国家">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column prop="visaPrice" label="签证费用(元)">
|
|
|
|
|
|
|
+ <!-- <el-table-column prop="visaPrice" label="签证费用(元)">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column prop="grandBusinessAgencyFee" label="大公务代办费(元)">
|
|
<el-table-column prop="grandBusinessAgencyFee" label="大公务代办费(元)">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column prop="pettyBusinessAgencyFee" label="小公务代办费(元)">
|
|
<el-table-column prop="pettyBusinessAgencyFee" label="小公务代办费(元)">
|
|
|
- </el-table-column>
|
|
|
|
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column prop="isVisaExemption" label="是否免签">
|
|
<el-table-column prop="isVisaExemption" label="是否免签">
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
<el-table-column prop="isVisaOnArrival" label="是否落地签">
|
|
<el-table-column prop="isVisaOnArrival" label="是否落地签">
|
|
@@ -1000,7 +1003,7 @@
|
|
|
}}元/人</span>
|
|
}}元/人</span>
|
|
|
<span v-else style="color: red">暂无!</span>
|
|
<span v-else style="color: red">暂无!</span>
|
|
|
<span slot="reference">{{ scope.row[itemcabinone.prop]
|
|
<span slot="reference">{{ scope.row[itemcabinone.prop]
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ }}</span>
|
|
|
</el-popover>
|
|
</el-popover>
|
|
|
</span>
|
|
</span>
|
|
|
<span v-else>
|
|
<span v-else>
|
|
@@ -1008,7 +1011,7 @@
|
|
|
:title="itemcabinone.title" width="200" trigger="hover">
|
|
:title="itemcabinone.title" width="200" trigger="hover">
|
|
|
<span style="color: red">暂无!</span>
|
|
<span style="color: red">暂无!</span>
|
|
|
<span slot="reference">{{ scope.row[itemcabinone.prop]
|
|
<span slot="reference">{{ scope.row[itemcabinone.prop]
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ }}</span>
|
|
|
</el-popover>
|
|
</el-popover>
|
|
|
</span>
|
|
</span>
|
|
|
</span>
|
|
</span>
|
|
@@ -1033,7 +1036,7 @@
|
|
|
}}</span>
|
|
}}</span>
|
|
|
<span v-else :title="scope.row[itemcabinone.prop]">{{
|
|
<span v-else :title="scope.row[itemcabinone.prop]">{{
|
|
|
scope.row[itemcabinone.prop]
|
|
scope.row[itemcabinone.prop]
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ }}</span>
|
|
|
|
|
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -1082,7 +1085,7 @@
|
|
|
}}</span>
|
|
}}</span>
|
|
|
<span v-else :title="scope.row[itemcabinone.prop]">{{
|
|
<span v-else :title="scope.row[itemcabinone.prop]">{{
|
|
|
scope.row[itemcabinone.prop]
|
|
scope.row[itemcabinone.prop]
|
|
|
- }}</span>
|
|
|
|
|
|
|
+ }}</span>
|
|
|
|
|
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -4300,7 +4303,16 @@ export default {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (resp.data.data.visaCountryInfoArr.length > 0) {
|
|
if (resp.data.data.visaCountryInfoArr.length > 0) {
|
|
|
- that.visaCountryInfoArr = resp.data.data.visaCountryInfoArr;
|
|
|
|
|
|
|
+ var visainfo = resp.data.data.visaCountryInfoArr;
|
|
|
|
|
+ that.visaCountryInfoArr = visainfo.map(item => {
|
|
|
|
|
+ return {
|
|
|
|
|
+ country: item.country,
|
|
|
|
|
+ yinsiid: item.yinsi.id,
|
|
|
|
|
+ yinsivalue: item.yinsi.value,
|
|
|
|
|
+ ...item.visaMain
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ //console.log(that.visaCountryInfoArr, "that.visaCountryInfoArr");
|
|
|
} else {
|
|
} else {
|
|
|
that.visaCountryInfoArr = [];
|
|
that.visaCountryInfoArr = [];
|
|
|
}
|
|
}
|