Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
629e1e97 1 parent 966e641a

代码更新

Inline Side-by-side
Showing 5 changed files with 230 additions and 119 deletions
import { login, logout, getInfo } from '@/api/login'
import { changeCurrentPort } from "@/api/system/user.js";
import { getToken, setToken, removeToken } from '@/utils/auth'
import { Message } from 'element-ui'
const user = {
state: {
......@@ -48,9 +49,11 @@ const user = {
return new Promise((resolve, reject) => {
login(username, password, rememberMe).then(res => {
setToken(res.data)
commit('SET_TOKEN', res.data)
resolve()
if(res.code === 200){
setToken(res.data)
commit('SET_TOKEN', res.data)
}
resolve(res)
}).catch(error => {
reject(error)
})
......@@ -63,7 +66,18 @@ const user = {
getInfo().then(res => {
const user = res.data.user
const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
let ports = user.portName.split(',');
let ports = [];
if(user.portName){
ports = user.portName.split(',');
commit('SET_PORTNAMES',ports)
commit('SET_ACTIVEPORTNAME', sessionStorage.getItem('portName')?sessionStorage.getItem('portName'):state.portNames[0])
}else{
Message({
message: "未找到口岸信息！请确认后再登录",
type: 'error'
})
this.login()
}
if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.data.roles)
commit('SET_PERMISSIONS', res.data.permissions)
......@@ -72,14 +86,6 @@ const user = {
}
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
commit('SET_PORTNAMES',ports)
//口岸选择
if (sessionStorage.getItem('portName')) {
commit('SET_ACTIVEPORTNAME', sessionStorage.getItem('portName'))
} else {
commit('SET_ACTIVEPORTNAME', "PVG")
}
resolve(res)
}).catch(error => {
reject(error)
......
......@@ -323,7 +323,7 @@
:limitStart="formData.limitStart"
:page="page"
:shiftKey="shiftKey"
height="350"
:height="tableHeight"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
@currentChange="currentChange"
......@@ -382,6 +382,7 @@ export default {
align: "center",
sorTable: false,
fixed: true,
disabled:true
},
{
type: "index",
......@@ -391,96 +392,107 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "口岸代码",
value: "portName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "取件日期",
value: "pickUpDate",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "取件扫描号",
value: "pickUpScanNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "站点",
value: "siteName",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "运单号",
value: "waybillNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "总单号",
value: "totalWaybillNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "服务类型",
value: "serviceTypeName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "服务代码",
value: "serviceCode",
width: "150",
width: "100",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "URSA",
value: "ursa",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "申报类型",
value: "typeName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -490,33 +502,37 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "subcategory",
value: "subCategory",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "件数",
value: "qty",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "实际重量",
value: "actualWeight",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -526,78 +542,87 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "品名描述",
value: "nameDescription",
width: "150",
width: "100",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "预审状态",
value: "preQualificationStatus",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "航班预审意见",
value: "caPretrialOpinion",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "货物状态",
value: "statusName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "终配航班号",
value: "finalFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "终配航班日期",
value: "finalFlightTime",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "二配航班号",
value: "twoMatchFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -607,15 +632,17 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "预配航班号",
value: "preplanFlightNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -625,6 +652,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -634,6 +662,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -643,15 +672,17 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "ACCS原航线",
value: "accsFlightRoute",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -661,24 +692,27 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "是否自动",
value: "cargoRulesStatus",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "发件人账号",
value: "shipperAccount",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -688,51 +722,57 @@ export default {
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "始发地城市名称",
value: "originCity",
width: "150",
width: "130",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "收件地",
value: "destinationSiteName",
width: "150",
width: "90",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "尺寸",
value: "sizeStr",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "300",
width: "250",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
name: "大货预审时间",
value: "bigPretrialTime",
width: "150",
width: "120",
align: "center",
sorTable: false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -742,6 +782,7 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
......@@ -751,24 +792,27 @@ export default {
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "创建人",
value: "createUserName",
width: "150",
width: "90",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
{
type: "",
name: "创建时间",
value: "createTime",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed: false,
disabled:true
},
], //表头数据
tableData: [], //表格数据
......@@ -790,6 +834,7 @@ export default {
size: 100,
allWeight: 0,
allQty: 0,
tableHeight:null,
dialogVisible: false,
shiftKey: false,
createDate: null,
......@@ -819,6 +864,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight-60
},
methods: {
//查询条件
......
......@@ -241,7 +241,7 @@
:limitStart="limitStart"
:page="page"
:shiftKey="shiftKey"
height="450"
:height="tableHeight"
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
@currentChange="currentChange"
......@@ -295,7 +295,8 @@ export default {
width: "50",
align: "center",
sorTable: false,
fixed:true,
fixed: true,
disabled:true
},
{
type: "index",
......@@ -304,43 +305,48 @@ export default {
width: "50",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "口岸代码",
value: "portName",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "取件日期",
value: "pickUpDate",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "取件扫描号",
value: "pickUpScanNo",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "站点",
value: "siteName",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -349,7 +355,8 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -358,43 +365,48 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "服务类型",
value: "serviceTypeName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "服务代码",
value: "serviceCode",
width: "150",
width: "90",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "URSA",
value: "ursa",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "申报类型",
value: "typeName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -403,7 +415,8 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -412,25 +425,28 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "件数",
value: "qty",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "实际重量",
value: "actualWeight",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -439,61 +455,68 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "品名描述",
value: "nameDescription",
width: "150",
width: "100",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "海关回执状态",
value: "customsReceiptStatusName",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "预审状态",
value: "preQualificationStatus",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "航班预审意见",
value: "caPretrialOpinion",
width: "150",
width: "140",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "货物状态",
value: "statusName",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "终配航班号",
value: "finalFlightNo",
width: "150",
width: "130",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -502,16 +525,18 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "二配航班号",
value: "twoMatchFlightNo",
width: "150",
width: "130",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -520,16 +545,18 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "预配航班号",
value: "preplanFlightNo",
width: "150",
width: "130",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -538,16 +565,18 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "ACCS原航班号",
value: "fltNoAccs",
width: "150",
width: "140",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -556,7 +585,8 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -565,7 +595,8 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -574,16 +605,18 @@ export default {
width: "170",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "是否自动",
value: "cargoRulesStatus",
width: "150",
width: "100",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -592,7 +625,8 @@ export default {
width: "150",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -601,7 +635,8 @@ export default {
width: "150",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -610,34 +645,38 @@ export default {
width: "150",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "收件地",
value: "destinationSiteName",
width: "150",
width: "90",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "尺寸",
value: "sizeStr",
width: "150",
width: "80",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "大货预审意见（是否可以配置航班）",
value: "bigPretrialOpinion",
width: "300",
width: "250",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -646,7 +685,8 @@ export default {
width: "150",
align: "center",
sorTable: false,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -655,7 +695,8 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
......@@ -664,25 +705,28 @@ export default {
width: "150",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "创建人",
value: "createUserName",
width: "150",
width: "90",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
{
type: "",
name: "创建时间",
value: "createTime",
width: "150",
width: "120",
align: "center",
sorTable: true,
fixed:false,
fixed: false,
disabled:true
},
], //表头数据
findConditionData: {}, //货物查询条件
......@@ -706,6 +750,7 @@ export default {
limitSize: 100, //无限制-1
page:1,
progress:0,
tableHeight:null,
formShow:true,
};
},
......@@ -747,6 +792,7 @@ export default {
this.shiftKey = false;
}
});
this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-50
},
methods: {
......
......@@ -105,10 +105,21 @@ export default {
localStorage.removeItem("password");
localStorage.removeItem('rememberMe');
}
this.$store.dispatch("Login", this.loginForm).then(() => {
this.$store.dispatch("Login", this.loginForm).then(res => {
this.loading = false;
if(res.code != 200){
this.$message({
message: res.msg,
type: "warning",
});
}
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
}).catch(err => {
this.loading = false;
this.$message({
message: err,
type: "warning",
});
//this.getCode();
});
}
......
......@@ -266,7 +266,9 @@ export default {
getRoleList({ size: null, page: null })
.then((res) => {
if (res.code === 200) {
this.roleList = res.data.list;
if(item.valid == 1){
this.roleList.push(item)
}
} else {
this.$message({
message: res.msg,
......