朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 6587f59ced47907b1ae292611900f890f546692d 1 个父辈 0d3c7025 master ... ExportOrder flightplan2.0 kako_vue master_dev master_dev_markdown master_dev_permission master_ffmTemp message_bus vehicle_dispatch zhidan

20200623-trans

内嵌 并排对比
正在显示 13 个修改的文件 包含 399 行增加 和 111 行删除
... ... @@ -204,7 +204,7 @@
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryArrival',query:{flightNo:JSON.stringify(this.arrival.flightNo),flightDate:JSON.stringify(this.arrival.flightDate)},});
this.$router.push({path:'/queryArrival',query:{flightNo:this.arrival.flightNo,flightDate:this.arrival.flightDate}});
}else{
this.msg=response.msg;
}
... ...
... ... @@ -77,6 +77,7 @@
flightNo:undefined,
ietype:undefined,
reamrk:undefined,
accessFlag:'1'
},
rules: {
flightNo: [
... ... @@ -94,7 +95,6 @@
tableData:[],
msg:undefined,
centerDialogVisible:false,
accessFlag:'1'
}
},
methods:{
... ... @@ -107,7 +107,7 @@
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryConfigure',query:{flightNo:JSON.stringify(this.queryConfigure.flightNo)},});
this.$router.push({path:'/queryConfigure',query:{flightNo:this.configure.flightNo}});
}else{
this.msg=response.msg;
}
... ...
... ... @@ -177,7 +177,7 @@
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryConfirmatory',query:{flightNo:JSON.stringify(this.confirmatory.flightNo),flightDate:JSON.stringify(this.confirmatory.flightDate)},});
this.$router.push({path:'/queryConfirmatory',query:{flightNo:this.confirmatory.flightNo,flightDate:this.confirmatory.flightDate}});
}else{
this.msg=response.msg;
}
... ...
... ... @@ -23,6 +23,8 @@
<el-date-picker
v-model="declare.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:275px"
placeholder="选择日期">
</el-date-picker>
... ... @@ -30,17 +32,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
<el-input v-model="declare.departuredatetime"></el-input>
<el-input v-model="declare.departuredatetime"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出发港" prop="departurePort" label-width="120px">
<el-input v-model="declare.departurePort"></el-input>
<el-input v-model="declare.departurePort" @input="e => declare.departurePort=inputMe(e)"
maxLength='3'></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
<el-input v-model="declare.customDistrictNo"></el-input>
<el-input v-model="declare.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
maxLength='4'></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
... ... @@ -54,6 +63,20 @@
<el-col :span="24"> <el-button type="primary" @click="submitForm('declare')">保 存</el-button>
<el-button type="success">保存并发送</el-button></el-col>
</el-row>
<!--对话提示框-->
<el-row>
<el-dialog
title="系统提示"
:visible.sync="centerDialogVisible"
width="30%"
center>
<span>{{msg}}</span>
<span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
</span>
</el-dialog>
</el-row>
</el-main>
</el-container>
</template>
... ... @@ -76,6 +99,8 @@
.el-col{margin-right: 0px;}
</style>
<script>
import {addConfirm} from "../../api/transport";
export default {
data(){
return{
... ... @@ -111,31 +136,45 @@
],
},
tableData:[]
tableData:[],
msg:undefined,
centerDialogVisible:false,
}
},
methods:{
//新增出港确报申报（保存按钮）
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
} else {
console.log('error submit!!');
return false;
addConfirm(this.declare).then(res=>{
let response=res.data;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryDeclare',query:{flightNo:this.declare.flightNo,flightDate:this.declare.flightDate}});
}else{
this.msg=response.msg;
}
});
},
submitPerson(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
} else {
console.log('error submit!!');
return false;
}
});
},
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.declare, this.$route.query);
}
},
// 过滤中英文
inputMe(e){
return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
}
},
mounted(){
this.defaultData();
}
}
</script>
\ No newline at end of file
... ...
... ... @@ -23,6 +23,8 @@
<el-date-picker
v-model="departure.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:275px"
placeholder="选择日期">
</el-date-picker>
... ... @@ -30,22 +32,30 @@
</el-col>
<el-col :span="8">
<el-form-item label="出发港" prop="departurePort" label-width="120px">
<el-input v-model="departure.departurePort"></el-input>
<el-input v-model="departure.departurePort" @input="e => departure.departurePort=inputMe(e)"
maxLength='3'></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="目的港" prop="arrivalPort" label-width="120px">
<el-input v-model="departure.arrivalPort"></el-input>
<el-input v-model="departure.arrivalPort" @input="e => departure.arrivalPort=inputMe(e)"
maxLength='3'></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关区代码" prop="customDistrictNo" label-width="120px">
<el-input v-model="departure.customDistrictNo"></el-input>
<el-input v-model="departure.customDistrictNo" oninput="value=value.replace(/[^\d]/g,'')"
maxLength='4'></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
<el-input v-model="departure.departuredatetime"></el-input>
<el-input v-model="departure.departuredatetime"
type="date"
format="yyyyMMdd"
value-format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -64,6 +74,20 @@
<el-col :span="24"> <el-button type="primary" @click="submitForm('departure')">保 存</el-button>
<el-button type="success">保存并发送</el-button></el-col>
</el-row>
<!--对话提示框-->
<el-row>
<el-dialog
title="系统提示"
:visible.sync="centerDialogVisible"
width="30%"
center>
<span>{{msg}}</span>
<span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
</span>
</el-dialog>
</el-row>
</el-main>
</el-container>
</template>
... ... @@ -86,6 +110,8 @@
.el-col{margin-right: 0px;}
</style>
<script>
import {addPrediction} from "../../api/transport";
export default {
data(){
return{
... ... @@ -129,31 +155,45 @@
{required: true, message: '请输入', trigger: 'blur'}
],
},
tableData:[]
tableData:[],
centerDialogVisible:false,
msg:undefined,
}
},
methods:{
//新增出港预报申报（保存按钮）
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
} else {
console.log('error submit!!');
return false;
addPrediction(this.departure).then(res=>{
let response=res.data;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryDeparture',query:{flightNo:this.departure.flightNo,flightDate:this.departure.flightDate}});
}else{
this.msg=response.msg;
}
});
},
submitPerson(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
} else {
console.log('error submit!!');
return false;
}
});
},
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.departure, this.$route.query);
}
},
// 过滤中英文
inputMe(e){
return e.replace(/[^a-zA-Z]/g,'').toUpperCase();
}
},
mounted(){
this.defaultData();
}
}
</script>
\ No newline at end of file
... ...
... ... @@ -32,6 +32,20 @@
<el-col :span="24"> <el-button type="primary" @click="submitForm('outConfigure')">保 存</el-button>
</el-col>
</el-row>
<!--对话提示框-->
<el-row>
<el-dialog
title="系统提示"
:visible.sync="centerDialogVisible"
width="30%"
center>
<span>{{msg}}</span>
<span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
</span>
</el-dialog>
</el-row>
</el-main>
</el-container>
</template>
... ... @@ -54,6 +68,8 @@
.el-col{margin-right: 0px;}
</style>
<script>
import {addSchedule} from "../../api/transport";
export default {
data(){
return{
... ... @@ -76,31 +92,41 @@
{value:'1',label:'进港'},
{value:'2',label:'出港'}
],
tableData:[]
tableData:[],
msg:undefined,
centerDialogVisible:false,
}
},
methods:{
//新增出港确报申报（保存按钮）
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
} else {
console.log('error submit!!');
return false;
addSchedule(this.outConfigure).then(res=>{
let response=res.data;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryFlightConfigure',query:{flightNo:this.outConfigure.flightNo}});
}else{
this.msg=response.msg;
}
});
},
submitPerson(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
alert('submit!');
} else {
console.log('error submit!!');
return false;
}
});
},
//加载默认值
defaultData(){
if(this.$route.query!=null){
let ob=Object.assign(this.outConfigure, this.$route.query);
}
},
},
mounted(){
this.defaultData();
}
}
</script>
\ No newline at end of file
... ...
... ... @@ -213,8 +213,10 @@
},
//获取默认值
defaultData() {
this.flightNo = JSON.parse(this.$route.query.flightNo);
this.flightDate = JSON.parse(this.$route.query.flightDate);
Object.assign(this.queryArrival, this.$route.query);
// this.flightNo = JSON.parse(this.$route.query.flightNo);
// this.flightDate = JSON.parse(this.$route.query.flightDate);
},
//编辑进港预报
handleEdit(index,row){
... ...
... ... @@ -105,7 +105,7 @@
<el-button
size="mini"
type="success"
@click="handleEdit(scope.$index, scope.row)">查看</el-button>
@click="dialogTableVisible = true">查看</el-button>
<el-button
size="mini"
type="danger"
... ... @@ -127,6 +127,16 @@
</el-pagination>
</div>
</el-row>
//查看回执弹框
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="date" label="操作时间" width="150"></el-table-column>
<el-table-column property="name" label="操作人" width="200"></el-table-column>
<el-table-column property="address" label="航班号"></el-table-column>
<el-table-column property="dat" label="航班日期" width="150"></el-table-column>
<el-table-column property="nam" label="回执内容" width="200"></el-table-column>
</el-table>
</el-dialog>
</el-main>
</el-container>
</template>
... ... @@ -165,7 +175,11 @@
currentPage: 1,
pageSize:10,
total:0,
tableData:[]
tableData:[],
gridData:{
},
dialogTableVisible: false,
}
},
methods: {
... ...
... ... @@ -193,7 +193,9 @@
},
//获取默认值
defaultData() {
this.flightNo = JSON.parse(this.$route.query.flightNo);
Object.assign(this.queryConfigure, this.$route.query);
// this.flightNo = JSON.parse(this.$route.query.flightNo);
},
//编辑进港航班配置
handleEdit(index,row){
... ...
... ... @@ -214,7 +214,9 @@
},
//获取默认值
defaultData() {
this.flightNo = JSON.parse(this.$route.query.flightNo);
Object.assign(this.queryConfirmatory, this.$route.query);
// this.flightNo = JSON.parse(this.$route.query.flightNo);
},
//编辑进港确报
handleEdit(index,row){
... ...
... ... @@ -8,13 +8,13 @@
</el-row>
<!-- 搜索区域-->
<el-row>
<el-form :label-position="labelPosition" :model="queryDeclare" :rules="rules" ref="queryFlight"
<el-form :label-position="labelPosition" :model="queryDeclare" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
<el-form-item label="承运人：" prop="awcd" label-width="80px">
<el-input v-model="queryDeclare.awcd" style="width:190px"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6" >-->
<!-- <el-form-item label="承运人：" prop="awcd" label-width="80px">-->
<!-- <el-input v-model="queryDeclare.awcd" style="width:190px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6" >
<el-form-item label="航班号：" prop="flightNo" label-width="80px">
<el-input v-model="queryDeclare.flightNo" style="width:190px"></el-input>
... ... @@ -40,6 +40,7 @@
<el-table
:data="tableData"
border
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
... ... @@ -122,10 +123,10 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="400">
:total="total">
</el-pagination>
</div>
</el-row>
... ... @@ -151,37 +152,89 @@
</style>
<script>
import {editConfirm, selectConfirm} from "../../api/transport";
export default {
data(){
return{
queryDeclare:{
awcd:undefined,
// awcd:undefined,
flightNo:undefined,
flightDate:undefined,
},
rules:{
awcd: [
{required: true, message: '请输入', trigger: 'blur'}
],
flightNo: [
{required: true, message: '请输入', trigger: 'blur'}
],
flightDate: [
{required: true, message: '请选择', trigger: 'change'}
],
},
labelPosition:'left',
currentPage: 4,
currentPage: 1,
pageSize:10,
total:0,
tableloading:false,
tableData:[]
}
},
methods: {
//分页
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize=val;
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage=val;
this.submitForm();
},
//获取进港确报查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryDeclare.flightNo,
flightDate: this.queryDeclare.flightDate
};
this.tableloading = true;
selectConfirm(params).then(res => {
let response = res.data.data;
this.tableData = response.list;
this.tableloading = false;
this.total = response.total;
});
},
//列表删除功能
handleDel(index, row) {
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
editConfirm(row).then(res => {
let response = res.data;
if (response.code == '200') {
this.$message({
type: 'info',
message: '删除成功'
});
this.submitForm();
} else {
this.$message({
type: 'info',
message: '删除失败'
});
}
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
//获取默认值
defaultData() {
Object.assign(this.queryDeclare, this.$route.query);
},
//编辑进港确报
handleEdit(index,row){
this.$router.push({path:'/declare',query: row})
},
},
//渲染方法
mounted(){
this.defaultData();
this.submitForm();
}
}
</script>
\ No newline at end of file
... ...
... ... @@ -8,13 +8,13 @@
</el-row>
<!-- 搜索区域-->
<el-row>
<el-form :label-position="labelPosition" :model="queryDeparture" :rules="rules" ref="queryFlight"
<el-form :label-position="labelPosition" :model="queryDeparture" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
<el-form-item label="承运人：" prop="awcd" label-width="80px">
<el-input v-model="queryDeparture.awcd" style="width:190px"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6" >-->
<!-- <el-form-item label="承运人：" prop="awcd" label-width="80px">-->
<!-- <el-input v-model="queryDeparture.awcd" style="width:190px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6" >
<el-form-item label="航班号：" prop="flightNo" label-width="80px">
<el-input v-model="queryDeparture.flightNo" style="width:190px"></el-input>
... ... @@ -40,6 +40,7 @@
<el-table
:data="tableData"
border
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
... ... @@ -122,10 +123,10 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="400">
:total="total">
</el-pagination>
</div>
</el-row>
... ... @@ -151,37 +152,88 @@
</style>
<script>
import {editPrediction, selectPrediction} from "../../api/transport";
export default {
data(){
return{
queryDeparture:{
awcd:undefined,
flightNo:undefined,
flightDate:undefined,
},
rules:{
awcd: [
{required: true, message: '请输入', trigger: 'blur'}
],
flightNo: [
{required: true, message: '请输入', trigger: 'blur'}
],
flightDate: [
{required: true, message: '请选择', trigger: 'change'}
],
},
labelPosition:'left',
currentPage: 4,
tableData:[]
currentPage: 1,
pageSize:10,
total:0,
tableData:[],
tableloading:false
}
},
methods: {
//分页
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize=val;
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage=val;
this.submitForm();
},
//获取出港预报查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryDeparture.flightNo,
flightDate: this.queryDeparture.flightDate
};
this.tableloading = true;
selectPrediction(params).then(res => {
let response = res.data.data;
this.tableData = response.list;
this.tableloading = false;
this.total = response.total;
});
},
//列表删除功能
handleDel(index, row) {
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
editPrediction(row).then(res => {
let response = res.data;
if (response.code == '200') {
this.$message({
type: 'info',
message: '删除成功'
});
this.submitForm();
} else {
this.$message({
type: 'info',
message: '删除失败'
});
}
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
//获取默认值
defaultData() {
Object.assign(this.queryDeparture, this.$route.query);
},
//编辑进港预报
handleEdit(index,row){
this.$router.push({path:'/departure',query: row})
},
},
//渲染方法
mounted(){
this.defaultData();
this.submitForm();
}
}
</script>
\ No newline at end of file
... ...
... ... @@ -8,7 +8,7 @@
</el-row>
<!-- 搜索区域-->
<el-row>
<el-form :label-position="labelPosition" :model="queryFlightConfigure" :rules="rules" ref="queryFlight"
<el-form :label-position="labelPosition" :model="queryFlightConfigure" ref="queryFlight"
label-width="130px" class="demo-ruleForm">
<el-col :span="6" >
... ... @@ -26,6 +26,7 @@
<el-table
:data="tableData"
border
v-loading="tableloading"
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
... ... @@ -94,10 +95,10 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="400">
:total="total">
</el-pagination>
</div>
</el-row>
... ... @@ -123,29 +124,86 @@
</style>
<script>
import {editSchedule, selectSchedule} from "../../api/transport";
export default {
data(){
return{
queryFlightConfigure:{
flightNo:undefined,
},
rules:{
flightNo: [
{required: true, message: '请输入', trigger: 'blur'}
],
},
labelPosition:'left',
currentPage: 4,
currentPage: 1,
pageSize:10,
total:0,
tableloading:false,
tableData:[]
}
},
methods: {
//分页
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize=val;
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.currentPage=val;
this.submitForm();
},
//获取出港航班配置查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryFlightConfigure.flightNo,
};
this.tableloading = true;
selectSchedule(params).then(res => {
let response = res.data.data;
this.tableData = response.list;
this.tableloading = false;
this.total = response.total;
});
},
//列表删除功能
handleDel(index, row) {
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
editSchedule(row).then(res => {
let response = res.data;
if (response.code == '200') {
this.$message({
type: 'info',
message: '删除成功'
});
this.submitForm();
} else {
this.$message({
type: 'info',
message: '删除失败'
});
}
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
//获取默认值
defaultData() {
Object.assign(this.queryFlightConfigure, this.$route.query);
},
//编辑出港航班配置
handleEdit(index,row){
this.$router.push({path:'/outConfigure',query: row})
},
},
//渲染方法
mounted(){
this.defaultData();
this.submitForm();
}
}
</script>
\ No newline at end of file
... ...