朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 d7b6d1468ee6272310320c2af59fbb0953c26cfc 2 个父辈 77fae0fe 78a57f03

合并分支 'nmms-import-dev' 到 'master' 

优化机场代码，国家代码，关区代码



查看合并请求 !7
内嵌 并排对比
正在显示 5 个修改的文件 包含 127 行增加 和 41 行删除
... ... @@ -203,11 +203,11 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage4"
:current-page="currentPage"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="400">
:total="total">
</el-pagination>
</div>
</el-col>
... ... @@ -520,7 +520,9 @@
tableData: [],
multipleSelection: [],
labelPosition:'left',
currentPage4: 4,
currentPage:1,
pageSize:10,
total:0,
dialogStatus:'',
IouterVisible: false,
AouterVisible: false,
... ... @@ -618,25 +620,33 @@
console.log(row);
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize=val;
this.Query();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage=val;
this.query();
},
//条件查询
Query(){
this.listLoading = true;
QueryData(this.defaultQuery).then(res =>{
//console.log(res);
console.log(res);
let response=res.data.data;
this.tableData=response;
this.tableData=response.list;
this.total=response.total;
this.listLoading = false;
});
},
getList(){
this.defaultQuery=this.$route.params;
this.listLoading = true;
QueryData(this.defaultQuery).then(res =>{
//console.log(res);
let response=res.data.data;
this.tableData=response;
this.tableData=response.list;
this.total=response.total;
this.listLoading = false;
});
},
//运抵信息编辑
... ...
... ... @@ -26,9 +26,14 @@
</el-col>
<el-col :span="5">
<el-form-item label="始发站" prop="originstation">
<el-select v-model="ruleForm.originstation" filterable
<el-select v-model="ruleForm.originstation"
filterable
allow-create
default-first-option filterable placeholder="请选择">
default-first-option
remote
:remote-method="remoteMethod"
:loading="loading"
placeholder="请选择">
<el-option
v-for="item in options"
:key="item.airportid"
... ... @@ -44,7 +49,10 @@
<el-form-item label="目的站" prop="destinationstation">
<el-select v-model="ruleForm.destinationstation" filterable
allow-create
default-first-option filterable placeholder="请选择">
default-first-option
remote
:remote-method="remoteMethod"
:loading="loading" placeholder="请选择">
<el-option
v-for="item in options2"
:key="item.airportid"
... ... @@ -92,6 +100,7 @@
options: [],
options2:[],
airportid:'',
loading: false,
/*表单校验规则*/
rules: {
flightno: [
... ... @@ -113,11 +122,24 @@
};
},
methods:{
getFlightList:function() {
let params={};
selectAirport(params).then(res=>{
this.options=res.data.data;
this.options2=res.data.data;
remoteMethod:function(query) {
this.options = [];
this.options2=[];
let param={airportid:query};
this.loading = true;
selectAirport(param).then(res=>{
if (res !== '') {
setTimeout(() => {
this.loading = false;
this.options=res.data.data;
this.options2=res.data.data;
}, 200);
} else {
this.options = [];
this.options2=[];
}
//this.options=res.data.data;
//this.options2=res.data.data;
});
},
/*按钮点击请求方法*/
... ... @@ -150,7 +172,7 @@
/*渲染方法*/
mounted(){
this.getDefaultData();
this.getFlightList();
//this.getFlightList();
}
};
</script>
... ...
... ... @@ -31,7 +31,11 @@
<el-form-item label="始发站" prop="originstation">
<el-select v-model="ruleForm.originstation" filterable
allow-create
default-first-option filterable placeholder="请选择">
default-first-option
remote
:remote-method="remoteMethod"
:loading="loading"
placeholder="请选择">
<el-option
v-for="item in options"
:key="item.airportid"
... ... @@ -48,9 +52,14 @@
<el-input placeholder="" v-model="ruleForm.destinationstation" :disabled="true"></el-input>
</el-form-item>-->
<el-form-item label="目的站" prop="destinationstation">
<el-select v-model="ruleForm.destinationstation" filterable
<el-select v-model="ruleForm.destinationstation"
filterable
allow-create
default-first-option filterable placeholder="请选择">
default-first-option
remote
:remote-method="remoteMethod"
:loading="loading"
placeholder="请选择">
<el-option
v-for="item in options"
:key="item.airportid"
... ... @@ -118,10 +127,20 @@
};
},
methods:{
getFlightList:function() {
let params={};
remoteMethod:function(query) {
this.options = [];
let params={airportid:query};
this.loading = true;
selectAirport(params).then(res=>{
this.options=res.data.data;
if (res !== '') {
setTimeout(() => {
this.loading = false;
this.options=res.data.data;
this.options2=res.data.data;
}, 200);
} else {
this.options = [];
}
});
},
/*按钮点击请求方法*/
... ...
... ... @@ -361,9 +361,13 @@
</el-col>
<el-col :span="6">
<el-form-item label="海关关区" prop="customcode">
<el-select v-model="ruleForm.customcode" filterable
<el-select v-model="ruleForm.customcode"
filterable
allow-create
default-first-option filterable placeholder="请选择" style="display:inline">
default-first-option
remote
:remote-method="remoteMethod2"
:loading="loading" placeholder="请选择" style="display:inline">
<el-option
v-for="item in customcodes"
:key="item.customcode"
... ... @@ -404,9 +408,13 @@
</el-select>
</el-form-item>-->
<el-form-item label="国家代码" prop="awbinfo.shprcountyr">
<el-select v-model="ruleForm.awbinfo.shprcountyr" filterable
<el-select v-model="ruleForm.awbinfo.shprcountyr"
filterable
allow-create
default-first-option filterable placeholder="请选择">
default-first-option
remote
:remote-method="remoteMethod"
:loading="loading" placeholder="请选择">
<el-option
v-for="item in shprcountyrs"
:key="item.countryCode"
... ... @@ -444,9 +452,13 @@
<el-col :span="6">
<el-form-item label="国家代码" prop="awbinfo.cnscountyr">
<el-select v-model="ruleForm.awbinfo.cnscountyr" filterable
<el-select v-model="ruleForm.awbinfo.cnscountyr"
filterable
allow-create
default-first-option filterable placeholder="请选择">
default-first-option
remote
:remote-method="remoteMethod"
:loading="loading" placeholder="请选择">
<el-option
v-for="item in cnscountyrs"
:key="item.countryCode"
... ... @@ -763,7 +775,8 @@
{
value: '008',
label: '惰性物料'
}],
}
],
customcodes:[],
customcode:'',
rules: {
... ... @@ -938,20 +951,40 @@
});
},
/*获取国家代码*/
getCountryCode(){
let params={};
remoteMethod:function(query){
this.shprcountyrs=[];
this.cnscountyrs=[];
let params={countryCode:query};
this.loading = true;
getCountryCode(params).then(res =>{
//console.log(res);
this.shprcountyrs=res.data.data;
this.cnscountyrs=res.data.data;
if (res !== '') {
setTimeout(() => {
this.loading = false;
this.shprcountyrs=res.data.data;
this.cnscountyrs=res.data.data;
}, 200);
} else {
this.shprcountyrs = [];
this.cnscountyrs=[];
}
});
},
//获取关区代码
selectCustomcode(){
let params={};
remoteMethod2:function(query){
this.customcodes=[];
let params={customcode:query};
this.loading = true;
selectCustomcode(params).then(res =>{
//console.log(res);
this.customcodes=res.data.data;
if (res !== '') {
setTimeout(() => {
this.loading = false;
this.customcodes=res.data.data;
}, 200);
} else {
this.customcodes = [];
}
});
},
//新增原始舱单按钮
... ...
... ... @@ -105,7 +105,7 @@
<el-button
v-else
@click="handleTally(scope.row)" type="text" size="small">进港理货</el-button>
<el-button @click="handleClick(scope.row)" type="text" size="small">修改状态</el-button>
<el-button @click="handleStuts(scope.row)" type="text" size="small">修改状态</el-button>
</template>
</el-table-column>
<el-table-column
... ... @@ -268,6 +268,8 @@
this.currentPage=val;
this.QueryData();
},
//修改状态
handleStuts(){},
//条件查询方法
QueryData(){
let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier,
... ...