Explorar el Código

成本完善签证内容

yuanrf hace 2 meses
padre
commit
a5c01e11fe
Se han modificado 1 ficheros con 44 adiciones y 20 borrados
  1. 44 20
      src/components/Finance/Cost.vue

+ 44 - 20
src/components/Finance/Cost.vue

@@ -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>
 
@@ -806,7 +819,7 @@
                                                                 <!-- :content="itemsheetone.tips" -->
                                                                 <div v-if="itemsheetone.tips != '暂无!'">
                                                                     <span style="color:green">{{ itemsheetone.tips
-                                                                        }}</span>
+                                                                    }}</span>
                                                                     元/人
                                                                 </div>
                                                                 <div v-else>
@@ -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>
 
@@ -974,24 +999,24 @@
                                                 </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]
-                                                }}</span>
+                                                    }}</span>
 
                                             </template>
                                         </el-table-column>
@@ -1019,28 +1044,28 @@
                                                 <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]
-                                                }}</span>
+                                                    }}</span>
 
                                             </template>
                                         </el-table-column>
@@ -7486,8 +7511,7 @@ export default {
     background-color: #0001;
 }
 
-.accon-ul:last-child {
-    bottom: 15px;
+.accon-ul:last-child { bottom: 15px;
 }
 
 .btn-dialog-cost {