0508lhj1023调整

src/components/OP/EntryDetails.vue

@@ -14,8 +14,8 @@
                     </el-select>
                 </div>
                 <div class="Entry-head-li">
-                    <!-- <el-button type="primary">计算费用</el-button>
-                    <el-button type="primary">全部清空</el-button> -->
+                    <!-- <el-button type="primary">计算费用</el-button> -->
+                    <el-button @click="cleanout" type="primary">全部清空</el-button>
                     <el-button @click="storage()" type="primary">保存</el-button>
                     <el-select style="width:202px" v-model="listvalue" placeholder="请选择">
                         <el-option
@@ -652,7 +652,8 @@ export default {
             gwctotal:0,//公务舱合计
 
             storageid:0,
-            visabeizhu:""
+            visabeizhu:"",
+            ID:''
         }
     },
     methods:{
@@ -744,7 +745,7 @@ export default {
         GetEnterExitCostInfobyDiId(){
             
             //初始化数据
-            
+            this.ID='';
             // this.currencys=[]
             this.TotalAccommodationFee=0;//住宿费合计
             this.TotalMeals=0;//伙食费合计
@@ -1157,6 +1158,7 @@ export default {
             }).then(function (res) {
                 if(res.data.code==200){
                     console.log(res)
+                    that.ID=res.data.data.id;
                     //汇率
                     that.currencys=res.data.data.currencys;
                     //境内费用
@@ -1214,6 +1216,46 @@ export default {
                 }
             })
         },
+        //全部清空
+        cleanout(){
+            this.$confirm('此操作将全部清空, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                var url = "/api/Groups/PostEnterExitCostOneClickClear"
+                var that = this
+                this.$axios({
+                    method: 'post',
+                    url: url,
+                    headers: {
+                        Authorization: 'Bearer ' + this.token
+                    },
+                    data:{
+                        portType: 1,
+                        diId: that.value,
+                        userId: that.userId,
+                        id:that.ID
+                    }
+                }).then(function (res) {
+                    if(res.data.code==200){
+                        that.$message({
+                            type: 'success',
+                            message: res.data.msg
+                        });
+                        that.GetEnterExitCostInfobyDiId()
+                    }else{
+                        that.$message.error(res.data.msg);
+                    }
+                })
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消清空'
+                });
+            });
+            
+        },
         //下拉
         handNodeClick(data,node,e){
             console.log(data)

src/components/OP/visaAgencyfee.vue

@@ -28,18 +28,11 @@
                 }}人</span>
         </div>
         <div class="visaAgencyfee-table">
-            <el-table 
-            border
-            :data="tableData"
-            tooltip-effect="dark"
-            style="width: 100%"
-            @selection-change="handleSelectionChange">
+            <el-table border :data="tableData" tooltip-effect="dark" style="width: 100%"
+                @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55">
                     <template slot-scope="scope">
-                        <el-checkbox 
-                        :true-label="1" 
-                        :false-label="0" 
-                        v-model="scope.row.isChecked">
+                        <el-checkbox :true-label="1" :false-label="0" v-model="scope.row.isChecked">
                         </el-checkbox>
                     </template>
                 </el-table-column>
@@ -48,19 +41,32 @@
                         <el-input v-model="scope.row.country" placeholder="请输入内容"></el-input>
                     </template>
                 </el-table-column>
+                <el-table-column prop="visaFee" label="公务类型" width="180">
+                    <template slot-scope="scope">
+                        <el-select style="width:100%" filterable 
+                            v-model="scope.row.obType" placeholder="请选择团组">
+                            <el-option  label="大公务" :value=1 key='1'></el-option>
+                            <el-option  label="小公务" :value=2 key='2'></el-option>
+                            <el-option  label="未选择" :value=0 key='0'></el-option>
+                        </el-select>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="visaFee" label="签证费" width="180">
                     <template slot-scope="scope">
-                        <el-input-number style="width:100%;" :controls="false" v-model="scope.row.visaFee" :precision="2"></el-input-number>
+                        <el-input-number style="width:100%;" :controls="false" v-model="scope.row.visaFee"
+                            :precision="2"></el-input-number>
                     </template>
                 </el-table-column>
                 <el-table-column prop="agencyFee" label="代办费" width="180">
                     <template slot-scope="scope">
-                        <el-input-number style="width:100%;" :controls="false" v-model="scope.row.agencyFee" :precision="2"></el-input-number>
+                        <el-input-number style="width:100%;" :controls="false" v-model="scope.row.agencyFee"
+                            :precision="2"></el-input-number>
                     </template>
                 </el-table-column>
                 <el-table-column prop="otherFee" label="其他费用" width="180">
                     <template slot-scope="scope">
-                        <el-input-number style="width:100%;" :controls="false" v-model="scope.row.otherFee" :precision="2"></el-input-number>
+                        <el-input-number style="width:100%;" :controls="false" v-model="scope.row.otherFee"
+                            :precision="2"></el-input-number>
                     </template>
                 </el-table-column>
                 <!-- <el-table-column prop="otherFee" label="备注">
@@ -83,6 +89,7 @@ export default {
                 isChecked: 0,
                 country: '',
                 visaFee: 0,
+                obType:0,
                 agencyFee: 0,
                 otherFee: 0,
             }, {
@@ -90,6 +97,7 @@ export default {
                 isChecked: 0,
                 country: '',
                 visaFee: 0,
+                obType:0,
                 agencyFee: 0,
                 otherFee: 0,
             }, {
@@ -97,6 +105,7 @@ export default {
                 isChecked: 0,
                 country: '',
                 visaFee: 0,
+                obType:0,
                 agencyFee: 0,
                 otherFee: 0,
             }, {
@@ -104,6 +113,7 @@ export default {
                 isChecked: 0,
                 country: '',
                 visaFee: 0,
+                obType:0,
                 agencyFee: 0,
                 otherFee: 0,
             }, {
@@ -111,6 +121,7 @@ export default {
                 isChecked: 0,
                 country: '',
                 visaFee: 0,
+                obType:0,
                 agencyFee: 0,
                 otherFee: 0,
             }, {
@@ -118,6 +129,7 @@ export default {
                 isChecked: 0,
                 country: '',
                 visaFee: 0,
+                obType:0,
                 agencyFee: 0,
                 otherFee: 0,
             }],
@@ -191,6 +203,7 @@ export default {
                                 isChecked: 0,
                                 country: '',
                                 visaFee: 0,
+                                obType:0,
                                 agencyFee: 0,
                                 otherFee: 0,
                             }, {
@@ -198,6 +211,7 @@ export default {
                                 isChecked: 0,
                                 country: '',
                                 visaFee: 0,
+                                obType:0,
                                 agencyFee: 0,
                                 otherFee: 0,
                             }, {
@@ -205,6 +219,7 @@ export default {
                                 isChecked: 0,
                                 country: '',
                                 visaFee: 0,
+                                obType:0,
                                 agencyFee: 0,
                                 otherFee: 0,
                             }, {
@@ -212,6 +227,7 @@ export default {
                                 isChecked: 0,
                                 country: '',
                                 visaFee: 0,
+                                obType:0,
                                 agencyFee: 0,
                                 otherFee: 0,
                             }, {
@@ -219,6 +235,7 @@ export default {
                                 isChecked: 0,
                                 country: '',
                                 visaFee: 0,
+                                obType:0,
                                 agencyFee: 0,
                                 otherFee: 0,
                             }, {
@@ -226,6 +243,7 @@ export default {
                                 isChecked: 0,
                                 country: '',
                                 visaFee: 0,
+                                obType:0,
                                 agencyFee: 0,
                                 otherFee: 0,
                             }

src/components/Resource/CountryFeeCostOperation.vue

@@ -7,8 +7,8 @@
             <el-form :model="addData" :rules="rules" ref="addData" label-width="100px" class="demo-ruleForm">
                 <div style="display: flex;">
                     <div style="width: 49%;">
-                        <el-form-item label="所在州" label-width="125px" prop="VisaContinent">
-                            <el-input placeholder="所在州" v-model="addData.VisaContinent">
+                        <el-form-item label="所在洲" label-width="125px" prop="VisaContinent">
+                            <el-input placeholder="所在洲" v-model="addData.VisaContinent">
                             </el-input>
                         </el-form-item>
                     </div>
@@ -67,10 +67,10 @@
                         </el-form-item>
                     </div>
                 </div>
-                <div style="display: flex;">
+                <div style="display: flex;flex-wrap: wrap;">
                     <div style="width: 49%;">
                         <el-form-item label="普通签证时间" label-width="125px" prop="VisaTime">
-                            <el-input placeholder="普通签证时间" v-model="addData.VisaTime">
+                            <el-input style="width: 100%;" placeholder="普通签证时间" v-model="addData.VisaTime">
                                 <template slot="append">天</template>
                             </el-input>
                         </el-form-item>
@@ -84,6 +84,19 @@
                             </el-input> -->
                         </el-form-item>
                     </div>
+                    <div style="width: 49%;">
+                        <el-form-item label="大公务代办费 " label-width="125px">
+                            <el-input-number style="width:100%" v-model="addData.grandBusinessAgencyFee" auto-complete="off"
+                                :precision="2" :controls="false"></el-input-number>
+                           
+                        </el-form-item>
+                    </div>
+                    <div style="width: 49%;">
+                        <el-form-item label="小公务代办费" label-width="125px">
+                            <el-input-number style="width:100%" v-model="addData.pettyBusinessAgencyFee" auto-complete="off"
+                                :precision="2" :controls="false"></el-input-number>
+                        </el-form-item>
+                    </div>
                 </div>
                 <div style="display: flex;">
                     <div style="width: 98%;">
@@ -97,7 +110,7 @@
                 <div style="display: flex;">
                     <div style="width: 49%;">
                         <el-form-item label="加急签证时间" label-width="125px" prop="UrgentTime">
-                            <el-input placeholder="加急签证时间" v-model="addData.UrgentTime">
+                            <el-input  style="width: 100%;" placeholder="加急签证时间" v-model="addData.UrgentTime">
                                 <template slot="append">天</template>
                             </el-input>
                         </el-form-item>
@@ -143,12 +156,17 @@ export default {
         return {
             rules: {
                 VisaContinent: [
-                    { required: true, message: '请输入所属州', trigger: 'blur' },
+                    { required: true, message: '请输入所属洲', trigger: 'blur' },
                 ],
                 VisaCountry: [
                     { required: true, message: '请输入国家', trigger: 'blur' },
                 ],
-
+                grandBusinessAgencyFee: [
+                    { required: true, message: '大公务代办费不能为空', trigger: 'blur' },
+                ],
+                pettyBusinessAgencyFee: [
+                    { required: true, message: '小公务代办费不能为空', trigger: 'blur' },
+                ],
                 VisaPrice: [
                     { required: true, message: '签证金额不能为空', trigger: 'blur' },
                     { pattern: /^(([1-9]?\d{0,8}(\.\d{1,2})?)|999999999|999999999\.(0){1,2})$/, message: '请输入正确的金额(最多2位小数)' }
@@ -193,6 +211,8 @@ export default {
                 VisaPrice: 0,
                 VisaPriceDesc: '',
                 VisaType: '',
+                grandBusinessAgencyFee:0,
+                pettyBusinessAgencyFee:0,
                 VisaTime: '0',
                 IsUrgent: 1,
                 UrgentTime: '0',
@@ -281,7 +301,6 @@ export default {
             })
         },
         upData() {
-            debugger
             for (var i = 0; i < this.tableData.length; i++) {
                 if (this.tableData[i].id == parseInt(this.addData.Id)) {
 
@@ -299,6 +318,8 @@ export default {
             this.addData.VisaPrice = this.CountryFeeCostData.visaPrice;
             this.addData.VisaPriceDesc = this.CountryFeeCostData.visaPriceDesc;
             this.addData.VisaType = this.CountryFeeCostData.visaType;
+            this.addData.grandBusinessAgencyFee = this.CountryFeeCostData.grandBusinessAgencyFee;
+            this.addData.pettyBusinessAgencyFee = this.CountryFeeCostData.pettyBusinessAgencyFee;
             this.addData.VisaTime = this.CountryFeeCostData.visaTime;
             this.addData.UrgentTime = this.CountryFeeCostData.urgentTime;
             if (this.addData.UrgentTime != "" && this.addData.UrgentTime != 0 && this.addData.UrgentTime != null) {
@@ -327,6 +348,7 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    
 }
 
 .car_add .communal-title {