Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
8f3fc8f5 1 parent c3c02bd9

bug修复，文本修正

Inline Side-by-side
Showing 24 changed files with 70 additions and 37 deletions
......@@ -152,7 +152,7 @@ let tableHeaders = {
status: 1
},
{
columnChineseName: "subcategory",
columnChineseName: "Subcategory",
columnName: "subCategory",
columnWidth: "140",
ext1: "sorTable",
......@@ -749,7 +749,7 @@ let tableHeaders = {
status: 1
},
{
columnChineseName: "subcategory",
columnChineseName: "Subcategory",
columnName: "subCategory",
columnWidth: "140",
ext1: "sorTable",
......@@ -1800,7 +1800,7 @@ let tableHeaders = {
status: 1
},
{
columnChineseName: "申报类型",
columnChineseName: "申报类别",
columnName: "typeName",
columnWidth: "",
ext1: "",
......@@ -1814,7 +1814,7 @@ let tableHeaders = {
status: 1
},
{
columnChineseName: "subcategory",
columnChineseName: "Subcategory",
columnName: "subCategory",
columnWidth: "120",
ext1: "",
......@@ -2005,7 +2005,7 @@ let tableHeaders = {
status: 1
},
{
columnChineseName: "subcategory",
columnChineseName: "Subcategory",
columnName: "subCategory",
columnWidth: "120",
ext1: "",
......
......@@ -58,5 +58,5 @@ module.exports = {
/**
* 版本号
*/
version: 'version：1.7.8'
version: 'version：2.0.0'
}
......
......@@ -65,7 +65,7 @@ service.interceptors.response.use(res => {
type: 'warning'
}
).then(() => {
store.dispatch('FedLogOut').then(() => {
store.dispatch('LogOut').then(() => {
location.href = settings.routerBase + '/index';
})
})
......
<template>
<div>
<el-dialog title="货物配舱" width="80%" top="5vh" :visible.sync="dialogVisible" :close-on-click-modal="false"
:show-close="false" :append-to-body="true">
:show-close="false" :append-to-body="true" @close="dialogBeforeClose">
<el-divider content-position="left">已选货物信息</el-divider>
<el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
style="width: 100%">
......
<template>
<div>
<el-dialog title="航线优先级排序" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false"
append-to-body center>
@close="close" append-to-body center>
<el-form ref="routeOrder" label-width="auto" label-position="left" size="small" @submit.native.prevent>
<el-form-item label="航班号:" prop="fltNo">
<span>{{ fltNo }}</span>
......
......@@ -55,7 +55,7 @@
</Tables>
<!-- 查看目的航班对话框 -->
<el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false"
:show-close="false" :append-to-body="true">
:show-close="false" :append-to-body="true" @close="cancelFlightDate">
<el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
<el-table-column type="index" label="序号" align="center">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
......@@ -78,7 +78,7 @@
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false"
:show-close="false">
:show-close="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto" size="small">
<el-row>
<el-col :span="8">
......
......@@ -41,7 +41,7 @@
layout="total,prev, pager, next, jumper, ->" @tableSelect="tableSelection" @tableSelectAll="tableSelectAll">
</Tables>
<el-dialog title="新增预审航班" width="20%" :visible.sync="dialogVisible" :close-on-click-modal="false"
:show-close="false" :append-to-body="true">
:show-close="false" :append-to-body="true" @close="close">
<el-form ref="addForm" :model="newPre" label-width="auto" label-position="left" size="small" :rules="rules"
@submit.native.prevent>
<el-form-item label="航班号" prop="addFlitNo">
......@@ -230,4 +230,5 @@ export default {
};
</script>
<style rel="stylesheet/scss" lang="scss">
</style>
......
......@@ -68,10 +68,10 @@
<el-button class="mt10" type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
@click="whiteListSwitchStatus(0)" v-hasPermi="['base:flightInfo:whiteClose']">白名单自动配舱关闭
</el-button>
<el-button class="mt10" type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0"
<el-button class="mt10" type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0"
@click="BlackListSwitchStatus(1)">黑名单自动配舱开启
</el-button>
<el-button class="mt10" type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
<el-button class="mt10" type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
@click="BlackListSwitchStatus(0)">黑名单自动配舱关闭
</el-button>
<el-button class="mt10" type="danger" icon="el-icon-delete" size="mini" :disabled="ids.length == 0"
......@@ -97,7 +97,7 @@
</Tables>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true"
:show-close="false">
:show-close="false" @close="cancel">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto" size="small">
<el-row>
<el-col :span="12">
......@@ -273,7 +273,7 @@
</div>
</el-dialog>
<el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false"
:append-to-body="true">
:append-to-body="true" :close-on-press-escape="false">
<el-table :data="gridData">
<el-table-column property="fltNo" label="航班号"></el-table-column>
<el-table-column property="fltDate" label="航班日期"></el-table-column>
......
<template>
<div>
<el-dialog :title="openStatus == 'add' ? '新 增' : openStatus == 'downloadExcel' ? '导出Excel' : '导入Excel'"
:visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" append-to-body center>
:visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" append-to-body center
@close="close">
<el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
<div v-if="openStatus == 'add'">
......
<template>
<div>
<el-dialog :title="openStatus == 'add' ? '新 增' : openStatus == 'downloadExcel' ? '导出Excel' : '导入Excel'"
:visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" append-to-body center>
:visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false" append-to-body center
@close="close">
<el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
<div v-if="openStatus == 'add'">
......
<template>
<div>
<el-dialog title="新 增" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false"
append-to-body center>
append-to-body center @close="close">
<el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
<el-form-item label="货站名称" prop="goodsStation">
......
<template>
<div>
<el-dialog title="查看日志" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
:show-close="false" :append-to-body="true" top="2vh">
:show-close="false" :append-to-body="true" top="2vh" @close="close">
<el-form class="form-header" label-position="right" label-width="auto" size="small">
<el-row>
<el-col :span="4">
<el-form-item label="运单号">
<span>{{ data.waybillNo }}</span>
<span>{{ data.waybillNo }}</span>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="ACCSID">
<span>{{ data.accsId }}</span>
<span>{{ data.accsId }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -93,4 +93,5 @@ export default {
</script>
<style scoped>
</style>
\ No newline at end of file
......
......@@ -217,7 +217,7 @@
</template>
</Tables>
<el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
:show-close="false" :append-to-body="true">
:show-close="false" :append-to-body="true" @close="close">
<el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
<el-table-column type="index" label="序号" align="center">
</el-table-column>
......
<template>
<div>
<el-dialog title="货物配舱" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false"
:append-to-body="true">
:append-to-body="true" @close="dialogBeforeClose">
<el-divider content-position="left">已选货物信息</el-divider>
<el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
style="width: 100%">
......
......@@ -44,7 +44,7 @@
<el-row class="card2">
<el-col :span="1" v-for="item in fltBox">
<div class="fltBox" @click="rowClick({ fltNo: item.fltNo, fltDate: item.fltDate, route: '' })"
:style="{ backgroundColor: (item.percentage * 100).toFixed(2) >= 100 ? '#13ce66' : (item.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949' }">
:style="{ backgroundColor: (item.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (item.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949' }">
<div class="fltName">{{ item.fltNo }}</div>
<div class="fltWeight">{{ (item.percentage == 0 ? 0 : ((item.percentage) * 100).toFixed(2)) + '%' }}
</div>
......@@ -59,7 +59,7 @@
@currentChange="currentChange" @rowClick="rowClick">
<template v-slot:percentage="scope">
<el-progress stroke-width="100"
:color="(scope.row.percentage * 100).toFixed(2) >= 100 ? '#13ce66' : (scope.row.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949'"
:color="(scope.row.percentage * 100).toFixed(2) >= 90 ? '#13ce66' : (scope.row.percentage * 100).toFixed(2) >= 75 ? '#ffba00' : '#ff4949'"
:stroke-width="18"
:percentage="scope.row.percentage == 0 ? 0 : Number((scope.row.percentage * 100).toFixed(2))">
</el-progress>
......
......@@ -63,6 +63,7 @@ import {
importFlightDestination,
searchFlightDestination
} from "@/api/preMdeConfig";
import settings from "@/settings"
export default {
name: "FlightToArea",
......@@ -164,6 +165,17 @@ export default {
this.msgWarning(res.data.msg);
this.errorData = res.data.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightToArea' } })
} else if (res.data.code === 301) {
this.$confirm('登录状态已过期，需重新登录', '系统提示', {
closeOnClickModal: false,
showCancelButton: false,
confirmButtonText: '重新登录',
type: 'warning'
}).then(
this.$store.dispatch('LogOut').then(() => {
window.location.href = settings.loginURL;//wsso系统跳转
})
)
} else {
this.msgWarning(res.data.msg);
}
......
......@@ -39,7 +39,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="service type">
<el-form-item label="Service Type">
<el-select v-model="formData.serviceTypeArray" class="formItem" filterable multiple clearable
placeholder="不限">
<el-option v-for="item in selectOptionList.serviceType" :label="item.chineseName"
......@@ -61,7 +61,7 @@
<el-radio label="region">区域</el-radio>
<el-radio label="area">地区</el-radio>
<el-radio label="ursa">URSA</el-radio>
<el-radio label="serviceType">service type</el-radio>
<el-radio label="serviceType">Service Type</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
......
......@@ -65,6 +65,7 @@ import {
importUrsaDestination,
searchUrsaDestination
} from "@/api/preMdeConfig";
import settings from "@/settings"
export default {
name: "UrsaToArea",
......@@ -171,6 +172,17 @@ export default {
this.msgWarning(res.data.msg);
this.errorData = res.data.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
} else if (res.data.code === 301) {
this.$confirm('登录状态已过期，需重新登录', '系统提示', {
closeOnClickModal: false,
showCancelButton: false,
confirmButtonText: '重新登录',
type: 'warning'
}).then(
this.$store.dispatch('LogOut').then(() => {
window.location.href = settings.loginURL;//wsso系统跳转
})
)
} else {
this.msgWarning(res.data.msg);
}
......
<template>
<div>
<el-dialog :title="title" :visible.sync="open" width="25%" :close-on-click-modal="false" :show-close="false"
append-to-body center>
@close="close" append-to-body center>
<el-form ref="add" :model="newDictionary" label-width="auto" label-position="left" size="small"
:rules="rules" @submit.native.prevent>
<!-- 新增虚拟航班 -->
......
<template>
<div class="menuDrawer">
<el-dialog :title="drawerTitle" width="50%" :visible.sync="dialogVisible" :close-on-click-modal="false" :show-close="false"
:append-to-body="true">
<el-dialog :title="drawerTitle" width="50%" :visible.sync="dialogVisible" :close-on-click-modal="false"
:show-close="false" :append-to-body="true" @close="handleClose">
<el-form ref="userForm" :model="menuForm" :disabled="menuFormDisabled" :rules="rules" label-width="auto"
style="margin: 10px">
<el-row>
......@@ -125,4 +125,5 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
......
<template>
<div class="roleDrawer">
<el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" destroy-on-close
:close-on-click-modal="false" :wrapperClosable="false" :show-close="false">
:close-on-click-modal="false" :wrapperClosable="false" :show-close="false" @close="handleClose">
<el-form ref="roleForm" :model="roleForm" label-width="auto" :rules="rules" size="mini" style="margin: 10px"
@submit.native.prevent>
<el-row :gutter="10">
......@@ -176,4 +176,5 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
......
<template>
<div>
<el-dialog :title="title" :visible.sync="dialogVisible" width="60%" top="8vh" :before-close="close"
append-to-body :close-on-click-modal="false" @submit.native.prevent>
append-to-body :close-on-click-modal="false" @submit.native.prevent @close="close">
<el-form class="form-header" ref="superAllocationForm" :model="formData" label-width="auto"
label-position="left" style="margin-bottom:10px" @submit.native.prevent size="small" :rules="rules">
<el-row>
......
<template>
<div class="userDrawer">
<el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" :close-on-click-modal="false"
:wrapperClosable="false" :show-close="false">
:wrapperClosable="false" :show-close="false" @close="handleClose">
<el-form ref="userForm" :model="userForm" label-width="auto" :rules="rules" style="margin: 10px"
@submit.native.prevent>
<el-row :gutter="10">
......@@ -244,7 +244,7 @@ export default {
roleIds: [],
};
this.clearValidate('userForm')
this.$emit("handleClose", false);
this.$emit("handleClose");
},
//提交
submit() {
......@@ -276,4 +276,5 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
......
......@@ -41,7 +41,8 @@
>修改密码</el-button
> -->
<el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini"
v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{ scope.row.isValid == 1 ? "停用" : "启用"
v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{
scope.row.isValid == 1 ? "停用" : "启用"
}}</el-button>
<el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户
</el-button>
......@@ -236,7 +237,7 @@ export default {
.catch(() => { });
},
handleClose(val) {
this.drawer = val;
this.drawer = false;
this.userData = {};
this.selectUser();
},
......@@ -253,4 +254,5 @@ export default {
</script>
<style>
</style>
\ No newline at end of file
......