|
|
@@ -4,39 +4,9 @@
|
|
|
<div class="standards-head">
|
|
|
<div class="standards-head-li">
|
|
|
<div>
|
|
|
- <label>国家:</label>
|
|
|
- <!-- <el-input style="width:200px" v-model="input" placeholder="请输入内容"></el-input> -->
|
|
|
- <el-select style="width: 220px;margin-left: 10px;" v-model="input" @change="countrychange($event)" filterable placeholder="请选择国家">
|
|
|
- <el-option
|
|
|
- v-for="item in countrylist"
|
|
|
- :key="item.countryName"
|
|
|
- :label="item.countryName"
|
|
|
- :value="item.countryName">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <label>城市:</label>
|
|
|
- <el-select style="width: 220px;margin-left: 10px;" v-model="input2" @change="citychange" filterable placeholder="请选择公司">
|
|
|
- <el-option
|
|
|
- v-for="item in citylist"
|
|
|
- :key="item"
|
|
|
- :label="item"
|
|
|
- :value="item">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- <!-- <el-input style="width:200px" v-model="input2" placeholder="请输入内容"></el-input> -->
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <label>归属城市:</label>
|
|
|
- <el-select style="width: 220px;margin-left: 10px;" v-model="provinceId" @change="provinceIdchange" filterable placeholder="请选择归属城市">
|
|
|
- <el-option
|
|
|
- v-for="item in provinceIdarr"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
+ <label>搜索:</label>
|
|
|
+ <el-input style="width: 220px;margin-left: 10px;" v-model="input" placeholder="请输入内容"></el-input>
|
|
|
+ <el-button @click="OverseaVehicleList" type="primary">搜 索</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="standards-head-li">
|
|
|
@@ -50,48 +20,48 @@
|
|
|
border
|
|
|
style="width: 100%">
|
|
|
<el-table-column
|
|
|
- prop="rowNumber"
|
|
|
+ type="index"
|
|
|
label="序号"
|
|
|
width="55">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="continent"
|
|
|
+ prop="continentName"
|
|
|
label="洲"
|
|
|
width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="country"
|
|
|
+ prop="countryName"
|
|
|
label="国家/地区"
|
|
|
width="100">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="city"
|
|
|
+ prop="cityName"
|
|
|
label="城市"
|
|
|
width="180">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="currencyName"
|
|
|
+ prop="currency"
|
|
|
label="币种"
|
|
|
width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="roomCost"
|
|
|
- label="住宿费"
|
|
|
+ prop="guidePrice"
|
|
|
+ label="导游费用"
|
|
|
width="120">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="foodCost"
|
|
|
- label="伙食费"
|
|
|
+ prop="otherPrice1"
|
|
|
+ label="举牌接机"
|
|
|
width="120">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="publicCost"
|
|
|
- label="公杂费"
|
|
|
+ prop="otherPrice2"
|
|
|
+ label="送机协助值机"
|
|
|
width="120">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="trainCost"
|
|
|
- label="培训费"
|
|
|
+ prop="otherPrice3"
|
|
|
+ label="其他费用"
|
|
|
width="120">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -141,7 +111,7 @@
|
|
|
</el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-dialog :close-on-click-modal="false" width="720px" title="新增三公费用标准" :visible.sync="AdditionalFees">
|
|
|
+ <el-dialog :close-on-click-modal="false" width="1315px" title="编辑三公费用标准" :visible.sync="AdditionalFees">
|
|
|
<el-form :model="addfees" ref="addfees" :rules="addfeesrules">
|
|
|
<div class="standards-inif">
|
|
|
<el-form-item label="洲" prop="continent" :label-width="formLabelWidth">
|
|
|
@@ -153,44 +123,71 @@
|
|
|
<el-form-item label="城市" prop="city" :label-width="formLabelWidth">
|
|
|
<el-input size="medium" :controls="false" v-model="addfees.city"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="归属城市" prop="provinceId" :label-width="formLabelWidth">
|
|
|
- <el-select size="medium" v-model="addfees.provinceId" filterable placeholder="请选择归属城市">
|
|
|
- <el-option
|
|
|
- v-for="item in provinceIdarr"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="币种" prop="currency" :label-width="formLabelWidth">
|
|
|
- <el-select size="medium" @change="currencychange" style="height:36px" v-model="addfees.currency" filterable placeholder="请选择">
|
|
|
- <el-option
|
|
|
- v-for="item in options"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id">
|
|
|
+ <el-select size="medium" style="height:36px"
|
|
|
+ v-model="addfees.currency" filterable placeholder="请选择">
|
|
|
+ <el-option v-for="item in currencyDatas" :key="item.id" :label="item.name" :value="item.id">
|
|
|
</el-option>
|
|
|
- </el-select>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="住宿费" prop="roomCost" :label-width="formLabelWidth">
|
|
|
- <el-input-number :precision="2" size="medium" :controls="false" v-model="addfees.roomCost"></el-input-number>
|
|
|
+ <el-form-item label="导游费用" prop="roomCost" :label-width="formLabelWidth">
|
|
|
+ <el-input-number :precision="2" size="medium" :controls="false" v-model="addfees.guidePrice"></el-input-number>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="伙食费" prop="foodCost" :label-width="formLabelWidth">
|
|
|
- <el-input-number :precision="2" size="medium" :controls="false" v-model="addfees.foodCost"></el-input-number>
|
|
|
+ <el-form-item label="举牌接机" prop="foodCost" :label-width="formLabelWidth">
|
|
|
+ <el-input-number :precision="2" size="medium" :controls="false" v-model="addfees.otherPrice1"></el-input-number>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="公杂费" prop="publicCost" :label-width="formLabelWidth">
|
|
|
- <el-input-number :precision="2" size="medium" :controls="false" v-model="addfees.publicCost"></el-input-number>
|
|
|
+ <el-form-item label="送机协助值机" prop="publicCost" :label-width="formLabelWidth">
|
|
|
+ <el-input-number :precision="2" size="medium" :controls="false" v-model="addfees.otherPrice2"></el-input-number>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="培训费" prop="trainCost" :label-width="formLabelWidth">
|
|
|
- <el-input-number :precision="2" size="medium" :controls="false" v-model="addfees.trainCost"></el-input-number>
|
|
|
+ <el-form-item label="其他费用" prop="trainCost" :label-width="formLabelWidth">
|
|
|
+ <el-input-number :precision="2" size="medium" :controls="false" v-model="addfees.otherPrice3"></el-input-number>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="remark-box">
|
|
|
<el-form-item label="备注" :label-width="formLabelWidth">
|
|
|
- <el-input :rows="8" type="textarea" v-model="addfees.remark"></el-input>
|
|
|
+ <el-input :rows="2" type="textarea" v-model="addfees.remark"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
+ <div>
|
|
|
+ <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 5px;">
|
|
|
+ <label style="font-weight: 600;">具体车型</label>
|
|
|
+ <el-button @click="caraddYH" size="mini" type="primary">添 加</el-button>
|
|
|
+ </div>
|
|
|
+ <el-table border :data="addfees.carInfos">
|
|
|
+ <el-table-column label="车型名称" width="200">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input size="mini" :controls="false" v-model="scope.row.carTypeName"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="服务类型" width="180">
|
|
|
+ <template slot-scope="scope ">
|
|
|
+ <el-select size="mini" v-model="scope.row.serviceType" filterable
|
|
|
+ placeholder="请选择">
|
|
|
+ <el-option v-for="item in serviceTypeDatas" :key="item.value" :label="item.text"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="价格" width="180">
|
|
|
+ <template slot-scope="scope ">
|
|
|
+ <el-input-number style="width:100%" size="mini" :precision="2" :controls="false" v-model="scope.row.price"></el-input-number>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="备注">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input size="mini" :rows="1" type="textarea" v-model="scope.row.remark"></el-input>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="操作" width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button size="mini"
|
|
|
+ @click.native.prevent="carRemove(scope.$index, addfees.carInfos, scope.row)"
|
|
|
+ type="danger">移除</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="addsbtn('addfees')">保 存</el-button>
|
|
|
@@ -201,22 +198,18 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
+import { el } from '@fullcalendar/core/internal-common'
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
loginuserid:'',
|
|
|
- input:'全部',
|
|
|
- input2:'全部',
|
|
|
+ input:'',
|
|
|
tableData: [],
|
|
|
currentPage4: 1,
|
|
|
count:0,
|
|
|
pageSize:14,
|
|
|
pageIndex:1,
|
|
|
AdditionalFees:false,
|
|
|
- countrylist:[],
|
|
|
- citylist:[],
|
|
|
- provinceId:'',
|
|
|
- provinceIdarr:[],
|
|
|
//新增
|
|
|
addfees:{
|
|
|
id:0,
|
|
|
@@ -224,14 +217,21 @@ export default {
|
|
|
country:'', //国家
|
|
|
city:'',//城市
|
|
|
currency:807,//币种
|
|
|
- roomCost:0,//住宿费
|
|
|
- foodCost:0,//伙食费
|
|
|
- publicCost:0,//公杂费
|
|
|
- trainCost:0,//培训费
|
|
|
- provinceId:'',
|
|
|
+ guidePrice:0,//导游费用
|
|
|
+ otherPrice1:0,//举牌接机
|
|
|
+ otherPrice2:0,//送机协助值机
|
|
|
+ otherPrice3:0,//其他费用
|
|
|
remark:'',//备注
|
|
|
+ carInfos:[
|
|
|
+ {
|
|
|
+ carTypeName:'',
|
|
|
+ serviceType:'',
|
|
|
+ price:'',
|
|
|
+ id:0,
|
|
|
+ remark:''
|
|
|
+ }
|
|
|
+ ]
|
|
|
},
|
|
|
- options:[],
|
|
|
formLabelWidth:'100px',
|
|
|
addfeesrules:{
|
|
|
continent: [
|
|
|
@@ -246,73 +246,61 @@ export default {
|
|
|
currency: [
|
|
|
{ required: true, trigger: 'blur',message:'请选择币种' }
|
|
|
],
|
|
|
- provinceId: [
|
|
|
- { required: true, trigger: 'change' ,message:'请选择归属城市'},
|
|
|
- ],
|
|
|
- roomCost: [
|
|
|
- { required: true, trigger: 'change' ,message:'请填写住宿费'},
|
|
|
+ guidePrice: [
|
|
|
+ { required: true, trigger: 'change' ,message:'请填写导游费用'},
|
|
|
],
|
|
|
- foodCost: [
|
|
|
- { required: true, trigger: 'change',message:'请填写伙食费' },
|
|
|
+ otherPrice1: [
|
|
|
+ { required: true, trigger: 'change',message:'请填写举牌接机' },
|
|
|
],
|
|
|
- publicCost: [
|
|
|
- { required: true, trigger: 'change',message:'请填写公杂费' },
|
|
|
+ otherPrice2: [
|
|
|
+ { required: true, trigger: 'change',message:'请填写送机协助值机' },
|
|
|
],
|
|
|
- trainCost: [
|
|
|
- { required: true, trigger: 'change',message:'请填写培训费' },
|
|
|
+ otherPrice3: [
|
|
|
+ { required: true, trigger: 'change',message:'请填写其他费用' },
|
|
|
],
|
|
|
},
|
|
|
+ serviceTypeDatas:[],
|
|
|
+ currencyDatas:[]
|
|
|
}
|
|
|
},
|
|
|
methods:{
|
|
|
//获取基础数据
|
|
|
- GetEnterExitCostDataSource(){
|
|
|
- var url = "/api/Groups/GetEnterExitCostDataSource"
|
|
|
+ OverseaVehicleInit(){
|
|
|
+ var url = "/api/Resource/OverseaVehicleInit"
|
|
|
var that = this
|
|
|
this.$axios({
|
|
|
- method: 'post',
|
|
|
+ method: 'get',
|
|
|
url: url,
|
|
|
headers: {
|
|
|
Authorization: 'Bearer ' + this.token
|
|
|
},
|
|
|
- data:{
|
|
|
- portType: 1
|
|
|
- }
|
|
|
}).then(function (res) {
|
|
|
- console.log(res)
|
|
|
+ that.serviceTypeDatas=[];
|
|
|
+ that.currencyDatas=[];
|
|
|
if(res.data.code==200){
|
|
|
- that.options=res.data.data.currencyData;
|
|
|
+ that.serviceTypeDatas= res.data.data.serviceTypeDatas;
|
|
|
+ that.currencyDatas= res.data.data.currencyDatas;
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- //获取省份归属基础数据
|
|
|
- GetEnterExitProvBelongCostDataSource(){
|
|
|
- var url = "/api/Groups/GetEnterExitProvBelongCostDataSource"
|
|
|
- var that = this
|
|
|
- this.$axios({
|
|
|
- method: 'get',
|
|
|
- url: url,
|
|
|
- }).then(function (res) {
|
|
|
- if(res.data.code==200){
|
|
|
- that.provinceIdarr=res.data.data;
|
|
|
- }
|
|
|
+ //添加具体车型
|
|
|
+ caraddYH(){
|
|
|
+ this.addfees.carInfos.push({
|
|
|
+ carTypeName:'',
|
|
|
+ serviceType:'',
|
|
|
+ price:'',
|
|
|
+ id:0,
|
|
|
+ remark:''
|
|
|
})
|
|
|
},
|
|
|
- provinceIdchange(){
|
|
|
- this.GatPostNationalTravel();
|
|
|
+ //移除具体车型
|
|
|
+ carRemove(index, rows,inif){
|
|
|
+ rows.splice(index, 1)
|
|
|
},
|
|
|
//获取标准列表
|
|
|
- GatPostNationalTravel(){
|
|
|
- var url = "/api/Groups/PostNationalTravelFeePage"
|
|
|
+ OverseaVehicleList(){
|
|
|
+ var url = "/api/Resource/OverseaVehicleList"
|
|
|
var that = this
|
|
|
- var inputs=this.input
|
|
|
- var input2s=this.input2
|
|
|
- if(this.input=='全部'){
|
|
|
- inputs='';
|
|
|
- }
|
|
|
- if(this.input2=='全部'){
|
|
|
- input2s='';
|
|
|
- }
|
|
|
this.$axios({
|
|
|
method: 'post',
|
|
|
url: url,
|
|
|
@@ -323,12 +311,9 @@ export default {
|
|
|
portType: 1,
|
|
|
pageIndex:that.pageIndex,
|
|
|
pageSize:that.pageSize,
|
|
|
- provinceId:that.provinceId==''?0:that.provinceId,
|
|
|
- country:inputs,
|
|
|
- city:input2s,
|
|
|
+ search:that.input,
|
|
|
}
|
|
|
}).then(function (res) {
|
|
|
- console.log(res)
|
|
|
if(res.data.code==200){
|
|
|
that.tableData= res.data.data;
|
|
|
that.count= res.data.count;
|
|
|
@@ -336,105 +321,166 @@ export default {
|
|
|
|
|
|
}).catch(()=>{})
|
|
|
},
|
|
|
+ //获取详情
|
|
|
+ OverseaVehicleInfo(val){
|
|
|
+ var url = "/api/Resource/OverseaVehicleInfo/"+val
|
|
|
+ var that = this
|
|
|
+ this.$axios({
|
|
|
+ method: 'get',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' + this.token
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if(res.data.code==200){
|
|
|
+ return res.data.data;
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
//新增按钮
|
|
|
addclick(text,val){
|
|
|
- if (this.$refs.salaryinif){
|
|
|
+ if (this.$refs.addfees){
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs['salaryinif'].clearValidate();
|
|
|
+ this.$refs['addfees'].clearValidate();
|
|
|
})
|
|
|
}
|
|
|
- this.addfees={
|
|
|
- id:0,
|
|
|
- continent:'',//洲
|
|
|
- country:'', //国家
|
|
|
- city:'',//城市
|
|
|
- currency:807,//币种
|
|
|
- roomCost:0,//住宿费
|
|
|
- foodCost:0,//伙食费
|
|
|
- publicCost:0,//公杂费
|
|
|
- trainCost:0,//培训费
|
|
|
- provinceId:'',
|
|
|
- remark:'',//备注
|
|
|
- },
|
|
|
this.AdditionalFees=true;
|
|
|
+ var that = this
|
|
|
if(text=='修改'){
|
|
|
- console.log(val)
|
|
|
- this.addfees.id=val.id;
|
|
|
- this.addfees.continent=val.continent;
|
|
|
- this.addfees.country=val.country;
|
|
|
- this.addfees.city=val.city;
|
|
|
- this.addfees.currency=val.currency;
|
|
|
- this.addfees.roomCost=val.roomCost;
|
|
|
- this.addfees.provinceId=val.provinceId;
|
|
|
- this.addfees.foodCost=val.foodCost;
|
|
|
- this.addfees.publicCost=val.publicCost;
|
|
|
- this.addfees.trainCost=val.trainCost;
|
|
|
- this.addfees.remark=val.remark;
|
|
|
- this.pageIndex=1
|
|
|
- }else if(text=='新增'){
|
|
|
- this.addfees.id=0;
|
|
|
+ new Promise(function (resolve, reject) {
|
|
|
+ var url = "/api/Resource/OverseaVehicleInfo/" + val.id
|
|
|
+ that.$axios({
|
|
|
+ method: 'get',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' + that.token
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ var vals=[];
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ vals = res.data.data;
|
|
|
+ that.addfees.id = vals.id;
|
|
|
+ that.addfees.continent = vals.continentName;
|
|
|
+ that.addfees.country = vals.countryName;
|
|
|
+ that.addfees.city = vals.cityName;
|
|
|
+ that.addfees.currency = vals.currency;
|
|
|
+ that.addfees.guidePrice = vals.guidePrice;
|
|
|
+ that.addfees.otherPrice1 = vals.otherPrice1;
|
|
|
+ that.addfees.otherPrice2 = vals.otherPrice2;
|
|
|
+ that.addfees.otherPrice3 = vals.otherPrice3;
|
|
|
+ that.addfees.trainCost = vals.trainCost;
|
|
|
+ that.addfees.carInfos = vals.carInfos;
|
|
|
+ that.addfees.remark = vals.remark;
|
|
|
+ return resolve();
|
|
|
+ } else {
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }).then(() => {
|
|
|
+ that.OverseaVehicleInit();
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ this.OverseaVehicleInit();
|
|
|
+ this.addfees = {
|
|
|
+ id: 0,
|
|
|
+ continent: '',//洲
|
|
|
+ country: '', //国家
|
|
|
+ city: '',//城市
|
|
|
+ currency: 807,//币种
|
|
|
+ guidePrice: 0,//导游费用
|
|
|
+ otherPrice1: 0,//举牌接机
|
|
|
+ otherPrice2: 0,//送机协助值机
|
|
|
+ otherPrice3: 0,//其他费用
|
|
|
+ carInfos: [
|
|
|
+ {
|
|
|
+ carTypeName: '',
|
|
|
+ serviceType: '',
|
|
|
+ price: '',
|
|
|
+ id: 0,
|
|
|
+ remark: ''
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ trainCost: 0,//培训费
|
|
|
+ remark: '',//备注
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
handleSizeChange(val) {
|
|
|
- console.log(`每页 ${val} 条`);
|
|
|
this.pageSize=val;
|
|
|
- this.GatPostNationalTravel();
|
|
|
+ this.OverseaVehicleList();
|
|
|
},
|
|
|
handleCurrentChange(val) {
|
|
|
- console.log(`当前页: ${val}`);
|
|
|
this.pageIndex=val;
|
|
|
- this.GatPostNationalTravel()
|
|
|
- },
|
|
|
- //currencyselect
|
|
|
- currencychange(val){
|
|
|
- console.log(val)
|
|
|
- this.addfees.currency=val
|
|
|
+ this.OverseaVehicleList()
|
|
|
},
|
|
|
//新增,修改api
|
|
|
- PostNationalTravelFeeOperate(){
|
|
|
- var url = "/api/Groups/PostNationalTravelFeeOperate"
|
|
|
+ OverseaVehicleAddOrEdit(){
|
|
|
var that = this
|
|
|
- this.$axios({
|
|
|
- method: 'post',
|
|
|
- url: url,
|
|
|
- headers: {
|
|
|
- Authorization: 'Bearer ' + this.token
|
|
|
- },
|
|
|
- data:{
|
|
|
- portType: 1,
|
|
|
- id:that.addfees.id,
|
|
|
- userId:that.loginuserid,
|
|
|
- provinceId:that.addfees.provinceId,
|
|
|
- continent:that.addfees.continent,
|
|
|
- country:that.addfees.country,
|
|
|
- city:that.addfees.city,
|
|
|
- currency:that.addfees.currency,
|
|
|
- roomCost:that.addfees.roomCost,
|
|
|
- foodCost:that.addfees.foodCost,
|
|
|
- publicCost:that.addfees.publicCost,
|
|
|
- trainCost:that.addfees.trainCost,
|
|
|
- remark:that.addfees.remark,
|
|
|
+ new Promise(function (resolve, reject) {
|
|
|
+ //验证具体车型
|
|
|
+ if (that.addfees.carInfos.length==0){
|
|
|
+ that.$message.error('请添加具体车型信息');
|
|
|
+ return;
|
|
|
}
|
|
|
- }).then(function (res) {
|
|
|
- console.log(res)
|
|
|
- if(res.data.code==200){
|
|
|
- that.$message({
|
|
|
- type: 'success',
|
|
|
- message: res.data.msg
|
|
|
- });
|
|
|
- that.AdditionalFees=false
|
|
|
- that.GatPostNationalTravel();
|
|
|
- }else{
|
|
|
- that.$message.error(res.data.msg);
|
|
|
+ for(var i=0;i<that.addfees.carInfos.length;i++){
|
|
|
+ if(that.addfees.carInfos[i].carTypeName==''){
|
|
|
+ that.$message.error('请填写具体车型名称');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if(that.addfees.carInfos[i].serviceType==''){
|
|
|
+ that.$message.error('请选择具体车型服务类型');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if(that.addfees.carInfos[i].price==''||that.addfees.carInfos[i].price==null){
|
|
|
+ that.$message.error('请填写具体车型价格');
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
- }).catch(()=>{})
|
|
|
+ var url = "/api/Resource/OverseaVehicleAddOrEdit"
|
|
|
+ that.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' + that.token
|
|
|
+ },
|
|
|
+ data: {
|
|
|
+ id: that.addfees.id,
|
|
|
+ continentName: that.addfees.continent,
|
|
|
+ countryName: that.addfees.country,
|
|
|
+ cityName: that.addfees.city,
|
|
|
+ guidePrice: that.addfees.guidePrice,
|
|
|
+ otherPrice1: that.addfees.otherPrice1,
|
|
|
+ otherPrice2: that.addfees.otherPrice2,
|
|
|
+ otherPrice3: that.addfees.otherPrice3,
|
|
|
+ currency: that.addfees.currency,
|
|
|
+ carInfos: that.addfees.carInfos,
|
|
|
+ remark: that.addfees.remark,
|
|
|
+ currUserId: that.loginuserid,
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if (res.data.code == 200) {
|
|
|
+ that.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: res.data.msg
|
|
|
+ });
|
|
|
+ that.AdditionalFees = false
|
|
|
+ return resolve();
|
|
|
+ } else {
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }).then(() => {
|
|
|
+ that.OverseaVehicleList();
|
|
|
+ });
|
|
|
},
|
|
|
//新增-修改
|
|
|
addsbtn(formName){
|
|
|
this.$refs[formName].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- this.PostNationalTravelFeeOperate()
|
|
|
+ this.OverseaVehicleAddOrEdit()
|
|
|
} else {
|
|
|
this.$message.error('请将红框内容补全！');
|
|
|
return false;
|
|
|
@@ -443,38 +489,40 @@ export default {
|
|
|
},
|
|
|
//删除
|
|
|
deleteRow(index, rows,inif){
|
|
|
- this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
|
|
|
+ this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning',
|
|
|
center: true
|
|
|
}).then(() => {
|
|
|
- console.log(inif)
|
|
|
- var url = "/api/Groups/PostNationalTravelFeeDel"
|
|
|
+ var url = "/api/Resource/OverseaVehicleDel"
|
|
|
var that = this
|
|
|
- this.$axios({
|
|
|
- method: 'post',
|
|
|
- url: url,
|
|
|
- headers: {
|
|
|
- Authorization: 'Bearer ' + this.token
|
|
|
- },
|
|
|
- data:{
|
|
|
- id: inif.id,
|
|
|
- deleteUserId:that.loginuserid,
|
|
|
- }
|
|
|
- }).then(function (res) {
|
|
|
- console.log(res)
|
|
|
- if(res.data.code==200){
|
|
|
- rows.splice(index, 1)
|
|
|
- that.$message({
|
|
|
- type: 'success',
|
|
|
- message: res.data.msg
|
|
|
- });
|
|
|
- that.GatPostNationalTravel();
|
|
|
- }
|
|
|
-
|
|
|
- }).catch(()=>{})
|
|
|
-
|
|
|
+ new Promise(function (resolve, reject) {
|
|
|
+ that.$axios({
|
|
|
+ method: 'post',
|
|
|
+ url: url,
|
|
|
+ headers: {
|
|
|
+ Authorization: 'Bearer ' + that.token
|
|
|
+ },
|
|
|
+ data:{
|
|
|
+ id: inif.id,
|
|
|
+ currUserId:that.loginuserid,
|
|
|
+ }
|
|
|
+ }).then(function (res) {
|
|
|
+ if(res.data.code==200){
|
|
|
+ that.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: res.data.msg
|
|
|
+ });
|
|
|
+ return resolve();
|
|
|
+ }else{
|
|
|
+ that.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+ }).then(() => {
|
|
|
+ that.OverseaVehicleList();
|
|
|
+ });
|
|
|
}).catch(() => {
|
|
|
this.$message({
|
|
|
type: 'info',
|
|
|
@@ -482,51 +530,10 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
- //搜索数据源
|
|
|
- GetNationalTravelFeePageDataSource(){
|
|
|
- var url = "/api/Groups/GetNationalTravelFeePageDataSource"
|
|
|
- var that = this
|
|
|
- this.$axios({
|
|
|
- method: 'post',
|
|
|
- url: url,
|
|
|
- headers: {
|
|
|
- Authorization: 'Bearer ' + this.token
|
|
|
- }
|
|
|
- }).then(function (res) {
|
|
|
- console.log(res)
|
|
|
- if(res.data.code==200){
|
|
|
- that.countrylist=res.data.data
|
|
|
- that.countrylist.unshift({cityData:[],countryName:'全部'})
|
|
|
- }
|
|
|
-
|
|
|
- }).catch(()=>{})
|
|
|
- },
|
|
|
- //国家change
|
|
|
- countrychange(item){
|
|
|
- this.input2="全部"
|
|
|
- this.citylist='';
|
|
|
- var obj={}
|
|
|
- obj= this.countrylist.find(function(i){
|
|
|
- return i.countryName ===item
|
|
|
- });
|
|
|
- //在change中获取到整条对象数据
|
|
|
- console.log(obj);
|
|
|
-
|
|
|
- this.citylist=obj.cityData
|
|
|
- this.citylist.unshift('全部')
|
|
|
- this.GatPostNationalTravel();
|
|
|
- },
|
|
|
- //城市change
|
|
|
- citychange(){
|
|
|
- this.GatPostNationalTravel();
|
|
|
- }
|
|
|
},
|
|
|
mounted(){
|
|
|
this.loginuserid=JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
|
|
|
- this.GatPostNationalTravel();
|
|
|
- this.GetEnterExitProvBelongCostDataSource();
|
|
|
- this.GetEnterExitCostDataSource();
|
|
|
- this.GetNationalTravelFeePageDataSource();
|
|
|
+ this.OverseaVehicleList();
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
@@ -571,7 +578,16 @@ export default {
|
|
|
.standards-inif .el-input-number--medium{
|
|
|
width: 218px;
|
|
|
}
|
|
|
+.carinfo>div{
|
|
|
+ display: flex;
|
|
|
+}
|
|
|
+.carinfo .el-input--medium {
|
|
|
+ width: 218px;
|
|
|
+}
|
|
|
+.carinfo .standards-inif .el-input-number--medium{
|
|
|
+ width: 218px;
|
|
|
+}
|
|
|
.remark-box .el-textarea__inner{
|
|
|
- width: 93%;
|
|
|
+ width: 100%;
|
|
|
}
|
|
|
</style>
|
