Browse Source

0613签证标准

liuhj 3 days ago
parent
commit
7d7a47bc2e
30 changed files with 152 additions and 118 deletions
  1. 1 1
      src/components/ConferenceModule/Supplierinfo.vue
  2. 1 1
      src/components/Finance/Collection.vue
  3. 1 2
      src/components/Finance/Currency.vue
  4. 1 1
      src/components/Finance/FeesPage.vue
  5. 1 1
      src/components/Finance/GroupStatus.vue
  6. 1 1
      src/components/Finance/GroupUnreviewed.vue
  7. 1 1
      src/components/Finance/LncomingBills.vue
  8. 1 1
      src/components/Finance/PayReceived.vue
  9. 1 1
      src/components/Finance/Payroll.vue
  10. 1 1
      src/components/Finance/Sendack.vue
  11. 1 1
      src/components/OP/EntryDetails.vue
  12. 1 1
      src/components/OP/EntryDetailsdraft.vue
  13. 1 1
      src/components/OP/EntryQuotation.vue
  14. 1 1
      src/components/OP/HotelReservations.vue
  15. 1 1
      src/components/OP/OpLtinerary.vue
  16. 1 1
      src/components/OP/PickupList.vue
  17. 1 2
      src/components/OP/ThreeStandards.vue
  18. 1 1
      src/components/OP/backwardtabke.vue
  19. 25 52
      src/components/Resource/CountryFeeCost.vue
  20. 100 34
      src/components/Resource/CountryFeeCostOperation.vue
  21. 1 1
      src/components/Resource/GroundDetailedfees.vue
  22. 1 1
      src/components/Resource/WorldGamescost.vue
  23. 0 3
      src/components/child/index.vue
  24. 1 1
      src/components/statistics/Groupreports.vue
  25. 1 1
      src/components/statistics/Reportstbale.vue
  26. 1 1
      src/components/statistics/TellerStatement.vue
  27. 1 1
      src/components/statistics/TellerStatementTB.vue
  28. 1 1
      src/components/statistics/enterpriseProfit.vue
  29. 1 1
      src/components/system/AssignTasks.vue
  30. 1 1
      src/components/system/MyTasksinif.vue

+ 1 - 1
src/components/ConferenceModule/Supplierinfo.vue

@@ -497,7 +497,7 @@ export default {
     padding: 10px;
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
-    min-height: 840px;
+    min-height: 830px;
     
     
 }
 }
 .supplierinfo-screen{
 .supplierinfo-screen{

+ 1 - 1
src/components/Finance/Collection.vue

@@ -778,7 +778,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .collection-head-li label{
 .collection-head-li label{
     color: #606266;
     color: #606266;

+ 1 - 2
src/components/Finance/Currency.vue

@@ -584,8 +584,7 @@ export default {
         padding: 10px;
         padding: 10px;
         box-shadow: 0 0 5px #0005;
         box-shadow: 0 0 5px #0005;
         border-radius: 10px;
         border-radius: 10px;
-        height: 100%;
-        min-height: 840px;
+        min-height: 830px;
     }
     }
     .currency-info{
     .currency-info{
         display: flex;
         display: flex;

+ 1 - 1
src/components/Finance/FeesPage.vue

@@ -421,7 +421,7 @@ export default {
     padding: 10px;
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 
 
 .fesspage-head .el-form-item__label {
 .fesspage-head .el-form-item__label {

+ 1 - 1
src/components/Finance/GroupStatus.vue

@@ -241,7 +241,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .groupstatus-title{
 .groupstatus-title{
     display: flex;
     display: flex;

+ 1 - 1
src/components/Finance/GroupUnreviewed.vue

@@ -254,7 +254,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
     min-width: 1400px;
     min-width: 1400px;
 }
 }
 .groupunreviewed-title{
 .groupunreviewed-title{

+ 1 - 1
src/components/Finance/LncomingBills.vue

@@ -508,7 +508,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 
 
 .lncomingbill-all .sub-box {
 .lncomingbill-all .sub-box {

+ 1 - 1
src/components/Finance/PayReceived.vue

@@ -426,7 +426,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .received-head-li label{
 .received-head-li label{
     color: #606266;
     color: #606266;

+ 1 - 1
src/components/Finance/Payroll.vue

@@ -508,7 +508,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .payroll-head-li label{
 .payroll-head-li label{
     color: #606266;
     color: #606266;

+ 1 - 1
src/components/Finance/Sendack.vue

@@ -688,7 +688,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .sendack-head-li label{
 .sendack-head-li label{
     color: #606266;
     color: #606266;

+ 1 - 1
src/components/OP/EntryDetails.vue

@@ -2848,7 +2848,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 
 
 .Entry-head-li label {
 .Entry-head-li label {

+ 1 - 1
src/components/OP/EntryDetailsdraft.vue

@@ -3435,7 +3435,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 
 
 .Entrydraft-head-li label {
 .Entrydraft-head-li label {

+ 1 - 1
src/components/OP/EntryQuotation.vue

@@ -297,7 +297,7 @@ export default {
     padding: 10px;
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
-    min-height: 840px;
+    min-height: 830px;
     min-width: 1582px;
     min-width: 1582px;
 }
 }
 .entryquotation-head{
 .entryquotation-head{

+ 1 - 1
src/components/OP/HotelReservations.vue

@@ -2359,7 +2359,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .hotelr-all .block {
 .hotelr-all .block {
     margin-top: 10px;
     margin-top: 10px;

+ 1 - 1
src/components/OP/OpLtinerary.vue

@@ -309,7 +309,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .opltinerary-head-li label{
 .opltinerary-head-li label{
     color: #606266;
     color: #606266;

+ 1 - 1
src/components/OP/PickupList.vue

@@ -1551,7 +1551,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
     min-width: 900px;
     min-width: 900px;
 }
 }
 
 

+ 1 - 2
src/components/OP/ThreeStandards.vue

@@ -536,8 +536,7 @@ export default {
     padding: 10px;
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
-    height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .standards-head-li{
 .standards-head-li{
     display: flex;
     display: flex;

+ 1 - 1
src/components/OP/backwardtabke.vue

@@ -770,7 +770,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
     min-width: 1550px;
     min-width: 1550px;
 }
 }
 .backward-head-li label{
 .backward-head-li label{

+ 25 - 52
src/components/Resource/CountryFeeCost.vue

@@ -4,16 +4,16 @@
             <div class="communal-title">
             <div class="communal-title">
                 <div>签证费用标准</div>
                 <div>签证费用标准</div>
                 <div class="communal-box">
                 <div class="communal-box">
-                    <el-input @input="Inquireclick()" placeholder="国家" v-model="input" clearable style="width: 350px;">
+                    <el-input placeholder="国家" v-model="input" clearable style="width: 350px;">
                     </el-input>
                     </el-input>
+                    <el-button @click="Inquireclick()" type="primary" style="margin-left: 10px;">搜 索</el-button>
                     <router-link to="/home/CountryFeeCostOperation">
                     <router-link to="/home/CountryFeeCostOperation">
                         <el-button type="primary" style="margin-left: 10px;">新增</el-button>
                         <el-button type="primary" style="margin-left: 10px;">新增</el-button>
                     </router-link>
                     </router-link>
-
                 </div>
                 </div>
             </div>
             </div>
             <template>
             <template>
-                <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
+                <el-table :data="tableData" border
                     style="width: 100%" v-loading="loading" element-loading-text="拼命加载中...">
                     style="width: 100%" v-loading="loading" element-loading-text="拼命加载中...">
                     <el-table-column prop="num" label="序 号" width="55">
                     <el-table-column prop="num" label="序 号" width="55">
                         <template slot-scope="scope">
                         <template slot-scope="scope">
@@ -93,7 +93,7 @@
             <div class="block">
             <div class="block">
                 <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
                 <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
                     :current-page="currentPage" :page-sizes="[10, 12, 15, 20]" :page-size="pageSize"
                     :current-page="currentPage" :page-sizes="[10, 12, 15, 20]" :page-size="pageSize"
-                    layout="total, sizes, prev, pager, next" :total="tableDatas.length">
+                    layout="total, sizes, prev, pager, next" :total="total">
                 </el-pagination>
                 </el-pagination>
             </div>
             </div>
         </div>
         </div>
@@ -116,7 +116,9 @@ export default {
             pageSize: 12,// 每页的数据条数
             pageSize: 12,// 每页的数据条数
             input: '',
             input: '',
             token: '',
             token: '',
-            userId: 0
+            userId: 0,
+            total: 0, // 总数据条数
+            visaFeeType:0,
         }
         }
     },
     },
     methods: {
     methods: {
@@ -124,14 +126,15 @@ export default {
         handleSizeChange(val) {
         handleSizeChange(val) {
             this.currentPage = 1;
             this.currentPage = 1;
             this.pageSize = val;
             this.pageSize = val;
+            this.QueryVisaCountryFeeCosts();
         },
         },
         //当前页改变时触发 跳转其他页
         //当前页改变时触发 跳转其他页
         handleCurrentChange(val) {
         handleCurrentChange(val) {
             this.currentPage = val;
             this.currentPage = val;
+            this.QueryVisaCountryFeeCosts();
         },
         },
-        HotelData() {
-            this.loading = true
-            var url = "/api/Resource/QueryCountryFeeCost"
+        QueryVisaCountryFeeCosts(){
+            var url = "/api/Resource/QueryVisaCountryFeeCosts"
             var that = this
             var that = this
             this.$axios({
             this.$axios({
                 method: 'post',
                 method: 'post',
@@ -141,57 +144,30 @@ export default {
                 },
                 },
                 data: {
                 data: {
                     portType: 1,
                     portType: 1,
+                    pageIndex: that.currentPage,
+                    pageSize: that.pageSize,
+                    visaFeeType: that.visaFeeType,
+                    countryName: that.input,
                 }
                 }
             }).then(function (res) {
             }).then(function (res) {
-                console.log(res)
-
-                if (res.data.code == 200) {
-
+                that.tableData=[];
+                if (res.data.code == 200) {            
+                    that.total=res.data.count;
                     that.tableData = res.data.data;
                     that.tableData = res.data.data;
-                    that.tableDatas = that.tableData;
-                    if (that.tableDatas.slice((that.currentPage - 1) * that.pageSize, that.currentPage * that.pageSize).length == 0) {
-                        if (that.currentPage > 1) {
-                            that.currentPage = that.currentPage - 1;
-                        }
-                    }
-                    if(JSON.parse(localStorage.getItem('qzfyval'))){
-                        that.currentPage=JSON.parse(localStorage.getItem('qzfyval')).currentPage;
-                        that.input=JSON.parse(localStorage.getItem('qzfyval')).input;
-                        var newarr = [];
-                        if (that.input == "") {
-                            newarr = that.tableData;
-                        } else {
-                            for (var i = 0; i < that.tableData.length; i++) {
-                                if (that.tableData[i].visaCountry.indexOf(that.input) != -1) {
-                                    newarr.push(that.tableData[i]);
-                                }
-                            }
-                        }
-                        that.tableDatas = newarr;
-                    }
+                    console.log(that.tableData);
+                    
                 }
                 }
-                that.loading = false
             }).catch(function (error) {
             }).catch(function (error) {
-                that.loading = false
-                that.$message.error("网络错误,请稍后重试");
+                that.$message.error("数据加载失败,请稍联系信息部!");
             });
             });
         },
         },
+        HotelData() {
+            this.QueryVisaCountryFeeCosts();
+        },
         //搜索框处理
         //搜索框处理
         Inquireclick() {
         Inquireclick() {
-            var newarr = [];
-            if (this.input == "") {
-                newarr = this.tableData;
-            } else {
-
-                for (var i = 0; i < this.tableData.length; i++) {
-                    if (this.tableData[i].visaCountry.indexOf(this.input) != -1) {
-                        newarr.push(this.tableData[i]);
-                    }
-                }
-            }
-
-            this.tableDatas = newarr;
             this.currentPage = 1;
             this.currentPage = 1;
+            this.QueryVisaCountryFeeCosts();
         },
         },
         rounding(row, column) {
         rounding(row, column) {
             return parseFloat(row[column.property]).toFixed(2)
             return parseFloat(row[column.property]).toFixed(2)
@@ -228,10 +204,7 @@ export default {
                         DeleteUserId: this.userId
                         DeleteUserId: this.userId
                     }
                     }
                 }).then(function (res) {
                 }).then(function (res) {
-                    console.log(res)
-
                     if (res.data.code == 200) {
                     if (res.data.code == 200) {
-
                         that.$message({
                         that.$message({
                             message: '删除成功',
                             message: '删除成功',
                             type: 'success'
                             type: 'success'

+ 100 - 34
src/components/Resource/CountryFeeCostOperation.vue

@@ -1,19 +1,26 @@
 <template>
 <template>
-    <div v-loading="loading" element-loading-text="跳转中..." class="car_add">
+    <div v-loading="loading" element-loading-text="跳转中..." class="car_add" style="min-width: 1000px;">
         <div class="communal-title">
         <div class="communal-title">
             <div>签证费用资料</div>
             <div>签证费用资料</div>
         </div>
         </div>
         <div>
         <div>
-            <el-form :model="addData" :rules="rules" ref="addData" label-width="100px" class="demo-ruleForm">
+            <el-form :model="addData" :rules="rules" ref="addData" label-width="110px" class="demo-ruleForm">
                 <div style="display: flex;">
                 <div style="display: flex;">
-                    <div style="width: 49%;">
-                        <el-form-item label="所在洲" label-width="125px" prop="VisaContinent">
+                    <div style="width: 20%;">
+                        <el-form-item label="签证费用类型" label-width="140px">
+                            <el-select v-model="addData.visaFeeType" placeholder="签证费用类型">
+                                <el-option v-for="(item,index) in visaFeeTypearr" :key="index" :label="item.label" :value="item.value"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 39%;">
+                        <el-form-item label="所在洲" label-width="140px" prop="VisaContinent">
                             <el-input placeholder="所在洲" v-model="addData.VisaContinent">
                             <el-input placeholder="所在洲" v-model="addData.VisaContinent">
                             </el-input>
                             </el-input>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
-                    <div style="width: 49%;">
-                        <el-form-item label="国家名称" label-width="125px" prop="VisaCountry">
+                    <div style="width: 39%;">
+                        <el-form-item label="国家名称" label-width="140px" prop="VisaCountry">
                             <el-input placeholder="国家名称" v-model="addData.VisaCountry">
                             <el-input placeholder="国家名称" v-model="addData.VisaCountry">
                             </el-input>
                             </el-input>
                         </el-form-item>
                         </el-form-item>
@@ -21,15 +28,15 @@
                 </div>
                 </div>
                 <div style="display: flex;">
                 <div style="display: flex;">
                     <div style="width: 98%;">
                     <div style="width: 98%;">
-                        <el-form-item label="签证地址" label-width="125px" prop="VisaAddress">
+                        <el-form-item label="签证地址" label-width="140px" prop="VisaAddress">
                             <el-input placeholder="签证地址" v-model="addData.VisaAddress">
                             <el-input placeholder="签证地址" v-model="addData.VisaAddress">
                             </el-input>
                             </el-input>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
                 </div>
                 </div>
                 <div style="display: flex;">
                 <div style="display: flex;">
-                    <div style="width: 25%;">
-                        <el-form-item label="签证类型" label-width="125px">
+                    <div v-if="!addData.visaFeeType" style="width: 25%;">
+                        <el-form-item label="签证类型" label-width="140px">
                             <el-select v-model="addData.VisaType" placeholder="请选择签证类型">
                             <el-select v-model="addData.VisaType" placeholder="请选择签证类型">
                                 <el-option key="暂无" label="暂无" value="暂无">
                                 <el-option key="暂无" label="暂无" value="暂无">
                                 </el-option>
                                 </el-option>
@@ -43,23 +50,23 @@
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
                     <div style="width: 25%;">
                     <div style="width: 25%;">
-                        <el-form-item label="是否免签" label-width="125px">
+                        <el-form-item label="是否免签" label-width="140px">
                             <el-radio-group v-model="addData.IsVisaExemption">
                             <el-radio-group v-model="addData.IsVisaExemption">
                                 <el-radio :label="0">是</el-radio>
                                 <el-radio :label="0">是</el-radio>
                                 <el-radio :label="1">否</el-radio>
                                 <el-radio :label="1">否</el-radio>
                             </el-radio-group>
                             </el-radio-group>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
-                    <div style="width: 25%;">
-                        <el-form-item label="是否落地签" label-width="125px">
+                    <div v-if="!addData.visaFeeType" style="width: 25%;">
+                        <el-form-item label="是否落地签" label-width="140px">
                             <el-radio-group v-model="addData.IsVisaOnArrival">
                             <el-radio-group v-model="addData.IsVisaOnArrival">
                                 <el-radio :label="0">是</el-radio>
                                 <el-radio :label="0">是</el-radio>
                                 <el-radio :label="1">否</el-radio>
                                 <el-radio :label="1">否</el-radio>
                             </el-radio-group>
                             </el-radio-group>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
-                    <div style="width: 25%;">
-                        <el-form-item label="是否电子签" label-width="125px">
+                    <div v-if="!addData.visaFeeType" style="width: 25%;">
+                        <el-form-item label="是否电子签" label-width="140px">
                             <el-radio-group v-model="addData.IsElectronicSignature">
                             <el-radio-group v-model="addData.IsElectronicSignature">
                                 <el-radio :label="0">是</el-radio>
                                 <el-radio :label="0">是</el-radio>
                                 <el-radio :label="1">否</el-radio>
                                 <el-radio :label="1">否</el-radio>
@@ -69,14 +76,14 @@
                 </div>
                 </div>
                 <div style="display: flex;flex-wrap: wrap;">
                 <div style="display: flex;flex-wrap: wrap;">
                     <div style="width: 49%;">
                     <div style="width: 49%;">
-                        <el-form-item label="普通签证时间" label-width="125px" prop="VisaTime">
+                        <el-form-item label="普通签证时间" label-width="140px" prop="VisaTime">
                             <el-input style="width: 100%;" placeholder="普通签证时间" v-model="addData.VisaTime">
                             <el-input style="width: 100%;" placeholder="普通签证时间" v-model="addData.VisaTime">
                                 <template slot="append">天</template>
                                 <template slot="append">天</template>
                             </el-input>
                             </el-input>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
                     <div style="width: 49%;">
                     <div style="width: 49%;">
-                        <el-form-item label="签证费用" label-width="125px" prop="VisaPrice">
+                        <el-form-item label="签证费用" label-width="140px" prop="VisaPrice">
                             <el-input-number style="width:100%" v-model="addData.VisaPrice" auto-complete="off"
                             <el-input-number style="width:100%" v-model="addData.VisaPrice" auto-complete="off"
                                 :precision="2" :controls="false"></el-input-number>
                                 :precision="2" :controls="false"></el-input-number>
                             <!-- <el-input placeholder="签证费用" v-model="addData.VisaPrice">
                             <!-- <el-input placeholder="签证费用" v-model="addData.VisaPrice">
@@ -84,15 +91,15 @@
                             </el-input> -->
                             </el-input> -->
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
-                    <div style="width: 49%;">
-                        <el-form-item label="大公务代办费 " label-width="125px">
+                    <div v-if="!addData.visaFeeType" style="width: 49%;">
+                        <el-form-item label="大公务代办费 " label-width="140px">
                             <el-input-number style="width:100%" v-model="addData.grandBusinessAgencyFee" auto-complete="off"
                             <el-input-number style="width:100%" v-model="addData.grandBusinessAgencyFee" auto-complete="off"
                                 :precision="2" :controls="false"></el-input-number>
                                 :precision="2" :controls="false"></el-input-number>
                            
                            
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
-                    <div style="width: 49%;">
-                        <el-form-item label="小公务代办费" label-width="125px">
+                    <div v-if="!addData.visaFeeType" style="width: 49%;">
+                        <el-form-item label="小公务代办费" label-width="140px">
                             <el-input-number style="width:100%" v-model="addData.pettyBusinessAgencyFee" auto-complete="off"
                             <el-input-number style="width:100%" v-model="addData.pettyBusinessAgencyFee" auto-complete="off"
                                 :precision="2" :controls="false"></el-input-number>
                                 :precision="2" :controls="false"></el-input-number>
                         </el-form-item>
                         </el-form-item>
@@ -100,31 +107,61 @@
                 </div>
                 </div>
                 <div style="display: flex;">
                 <div style="display: flex;">
                     <div style="width: 98%;">
                     <div style="width: 98%;">
-                        <el-form-item label="签证价格描述" label-width="125px" prop="VisaPriceDesc">
+                        <el-form-item label="签证价格描述" label-width="140px" prop="VisaPriceDesc">
                             <el-input type="textarea" :rows="3" placeholder="签证价格描述"
                             <el-input type="textarea" :rows="3" placeholder="签证价格描述"
                                 v-model="addData.VisaPriceDesc"></el-input>
                                 v-model="addData.VisaPriceDesc"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
                 </div>
                 </div>
 
 
-                <div style="display: flex;">
-                    <div style="width: 49%;">
-                        <el-form-item label="加急签证时间" label-width="125px" prop="UrgentTime">
+                <div style="display: flex;flex-wrap: wrap;">
+                    <div v-if="!addData.visaFeeType" style="width: 49%;">
+                        <el-form-item label="加急签证时间" label-width="140px" prop="UrgentTime">
                             <el-input  style="width: 100%;" placeholder="加急签证时间" v-model="addData.UrgentTime">
                             <el-input  style="width: 100%;" placeholder="加急签证时间" v-model="addData.UrgentTime">
                                 <template slot="append">天</template>
                                 <template slot="append">天</template>
                             </el-input>
                             </el-input>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
-                    <div style="width: 49%;">
-                        <el-form-item label="加急签证费用" label-width="125px" prop="UrgentPrice">
+                    <div v-if="!addData.visaFeeType" style="width: 49%;">
+                        <el-form-item label="加急签证费用" label-width="140px" prop="UrgentPrice">
                             <el-input-number style="width:100%" v-model="addData.UrgentPrice" auto-complete="off"
                             <el-input-number style="width:100%" v-model="addData.UrgentPrice" auto-complete="off"
                                 :precision="2" :controls="false"></el-input-number>
                                 :precision="2" :controls="false"></el-input-number>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
+                    <div style="width: 49%;">
+                        <el-form-item label="云南代办费" label-width="140px">
+                            <el-input-number style="width:100%" v-model="addData.yunNanAgencyFee" auto-complete="off"
+                                :precision="2" :controls="false"></el-input-number>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 49%;">
+                        <el-form-item label="贵州代办费" label-width="140px">
+                            <el-input-number style="width:100%" v-model="addData.guiZhouAgencyFee" auto-complete="off"
+                                :precision="2" :controls="false"></el-input-number>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 49%;">
+                        <el-form-item label="重庆代办费" label-width="140px">
+                            <el-input-number style="width:100%" v-model="addData.chongQingAgencyFee" auto-complete="off"
+                                :precision="2" :controls="false"></el-input-number>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 49%;">
+                        <el-form-item label="重庆外办费用(普通)" label-width="140px" title="重庆外办出入境证明费用 - 普通">
+                            <el-input-number style="width:100%" v-model="addData.chongQingNormalFee" auto-complete="off"
+                                :precision="2" :controls="false"></el-input-number>
+                        </el-form-item>
+                    </div>
+                    <div style="width: 49%;">
+                        <el-form-item label="重庆外办费用(加急)" label-width="140px" title="重庆外办出入境证明费用 - 加急">
+                            <el-input-number style="width:100%" v-model="addData.chongQingUrgentFee" auto-complete="off"
+                                :precision="2" :controls="false"></el-input-number>
+                        </el-form-item>
+                    </div>
                 </div>
                 </div>
                 <div style="display: flex;">
                 <div style="display: flex;">
-                    <div style="width: 98%;">
-                        <el-form-item label="加急签证价格描述" label-width="125px" prop="UrgentPriceDesc">
+                    <div v-if="!addData.visaFeeType" style="width: 98%;">
+                        <el-form-item label="加急签证价格描述" label-width="140px" prop="UrgentPriceDesc">
                             <el-input type="textarea" :rows="3" placeholder="加急签证价格描述"
                             <el-input type="textarea" :rows="3" placeholder="加急签证价格描述"
                                 v-model="addData.UrgentPriceDesc"></el-input>
                                 v-model="addData.UrgentPriceDesc"></el-input>
                         </el-form-item>
                         </el-form-item>
@@ -132,7 +169,7 @@
                 </div>
                 </div>
                 <div style="display: flex;">
                 <div style="display: flex;">
                     <div style="width: 98%;">
                     <div style="width: 98%;">
-                        <el-form-item label="签证备注" label-width="125px" prop="Remark">
+                        <el-form-item label="签证备注" label-width="140px" prop="Remark">
                             <el-input type="textarea" :rows="3" placeholder="签证备注" v-model="addData.Remark"></el-input>
                             <el-input type="textarea" :rows="3" placeholder="签证备注" v-model="addData.Remark"></el-input>
                         </el-form-item>
                         </el-form-item>
                     </div>
                     </div>
@@ -220,10 +257,23 @@ export default {
                 UrgentPriceDesc: '',
                 UrgentPriceDesc: '',
                 VisaAddress: '',
                 VisaAddress: '',
                 CreateUserId: 0,
                 CreateUserId: 0,
-                Remark: ''
+                Remark: '',
+                //添加新字段
+                visaFeeType:0,//签证费用类型 0 因公 1 因私签证费用类型 0 因公 1 因私
+                yunNanAgencyFee:0,//云南代办费
+                guiZhouAgencyFee:0,//贵州代办费
+                chongQingAgencyFee:0,//重庆代办费
+                chongQingNormalFee:0,//重庆外办出入境证明费用 - 普通
+                chongQingUrgentFee:0,//重庆外办出入境证明费用 - 加急
             },
             },
-            CountryFeeCostData: {}
-
+            CountryFeeCostData: {},
+            visaFeeTypearr:[{
+                label: '因公',
+                value: 0
+            }, {
+                label: '因私',
+                value: 1
+            }],
         }
         }
     },
     },
     methods: {
     methods: {
@@ -264,8 +314,18 @@ export default {
 
 
         addBtn() {
         addBtn() {
             const that = this;
             const that = this;
+            if (that.addData.visaFeeType) {
+                that.addData.VisaType = '';
+                that.addData.IsVisaOnArrival = 1;
+                that.addData.IsElectronicSignature = 1;
+                that.addData.grandBusinessAgencyFee = 0;
+                that.addData.pettyBusinessAgencyFee = 0;
+                that.addData.UrgentTime = '0';
+                that.addData.UrgentPrice = 0;
+                that.addData.UrgentPriceDesc = "";
+            }
+            that.addData.CreateUserId = that.userId;
 
 
-            that.addData.CreateUserId = that.userId
             that.$refs.addData.validate((valid) => {
             that.$refs.addData.validate((valid) => {
                 if (valid) {
                 if (valid) {
                     console.log(that.addData)
                     console.log(that.addData)
@@ -307,7 +367,6 @@ export default {
                     break;
                     break;
                 }
                 }
             }
             }
-            console.log(this.CountryFeeCostData);
             this.addData.Status = 2;
             this.addData.Status = 2;
             this.addData.Id = this.CountryFeeCostData.id;
             this.addData.Id = this.CountryFeeCostData.id;
             this.addData.VisaContinent = this.CountryFeeCostData.visaContinent;
             this.addData.VisaContinent = this.CountryFeeCostData.visaContinent;
@@ -330,6 +389,13 @@ export default {
             this.addData.VisaAddress = this.CountryFeeCostData.visaAddress;
             this.addData.VisaAddress = this.CountryFeeCostData.visaAddress;
             this.addData.CreateUserId = this.CountryFeeCostData.createUserId;
             this.addData.CreateUserId = this.CountryFeeCostData.createUserId;
             this.addData.Remark = this.CountryFeeCostData.remark;
             this.addData.Remark = this.CountryFeeCostData.remark;
+            //
+            this.addData.visaFeeType = this.CountryFeeCostData.visaFeeType;
+            this.addData.yunNanAgencyFee = this.CountryFeeCostData.yunNanAgencyFee;
+            this.addData.guiZhouAgencyFee = this.CountryFeeCostData.guiZhouAgencyFee;
+            this.addData.chongQingAgencyFee = this.CountryFeeCostData.chongQingAgencyFee;
+            this.addData.chongQingNormalFee = this.CountryFeeCostData.chongQingNormalFee;
+            this.addData.chongQingUrgentFee = this.CountryFeeCostData.chongQingUrgentFee;
         },
         },
     },
     },
 
 

+ 1 - 1
src/components/Resource/GroundDetailedfees.vue

@@ -127,7 +127,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .grounddetafees-head-li label{
 .grounddetafees-head-li label{
     color: #606266;
     color: #606266;

+ 1 - 1
src/components/Resource/WorldGamescost.vue

@@ -338,7 +338,7 @@ export default {
     padding: 10px;
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 
 
 .worldgamescost-table {
 .worldgamescost-table {

+ 0 - 3
src/components/child/index.vue

@@ -115,7 +115,6 @@ export default {
                     portType: 1,
                     portType: 1,
                 }
                 }
             }).then(function (res) {
             }).then(function (res) {
-                console.log(res)
                 if (res.data.code == 200) {
                 if (res.data.code == 200) {
                     that.tableData = res.data.data
                     that.tableData = res.data.data
                     that.tableData.forEach(item => {
                     that.tableData.forEach(item => {
@@ -160,7 +159,6 @@ export default {
                         }
                         }
                     })
                     })
                     that.tableDatas = that.tableData;
                     that.tableDatas = that.tableData;
-                    console.log(that.tableDatas)
                 }
                 }
             })
             })
         },
         },
@@ -174,7 +172,6 @@ export default {
     },
     },
     mounted() {
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
-        console.log(this.token)
         this.Getemployees();
         this.Getemployees();
     }
     }
 }
 }

+ 1 - 1
src/components/statistics/Groupreports.vue

@@ -292,7 +292,7 @@ export default {
         padding: 10px;
         padding: 10px;
         box-shadow: 0 0 5px #0005;
         box-shadow: 0 0 5px #0005;
         border-radius: 10px;
         border-radius: 10px;
-        min-height: 840px;
+        min-height: 830px;
     }
     }
     .reports-list .block{
     .reports-list .block{
         margin-top: 10px;
         margin-top: 10px;

+ 1 - 1
src/components/statistics/Reportstbale.vue

@@ -1377,7 +1377,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .reportsbale-info{
 .reportsbale-info{
     display: flex;
     display: flex;

+ 1 - 1
src/components/statistics/TellerStatement.vue

@@ -258,7 +258,7 @@ export default {
         padding: 10px;
         padding: 10px;
         box-shadow: 0 0 5px #0005;
         box-shadow: 0 0 5px #0005;
         border-radius: 10px;
         border-radius: 10px;
-        min-height: 840px;
+        min-height: 830px;
     }
     }
     .reports-list .block{
     .reports-list .block{
         margin-top: 10px;
         margin-top: 10px;

+ 1 - 1
src/components/statistics/TellerStatementTB.vue

@@ -1018,7 +1018,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .reportsbale-info{
 .reportsbale-info{
     display: flex;
     display: flex;

+ 1 - 1
src/components/statistics/enterpriseProfit.vue

@@ -248,7 +248,7 @@ export default {
     padding: 10px;
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .enterpriseprofit-haed{
 .enterpriseprofit-haed{
     display: flex;
     display: flex;

+ 1 - 1
src/components/system/AssignTasks.vue

@@ -407,7 +407,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .AssignTasks-title{
 .AssignTasks-title{
     font-size: 17px;
     font-size: 17px;

+ 1 - 1
src/components/system/MyTasksinif.vue

@@ -226,7 +226,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     border-radius: 10px;
     height: 100%;
     height: 100%;
-    min-height: 840px;
+    min-height: 830px;
 }
 }
 .mytasksinif-title{
 .mytasksinif-title{
     font-size: 17px;
     font-size: 17px;