Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
53a0e3f2 1 parent 4cfe11f4

无用代码删除，bug修正

Expand all
Inline Side-by-side
Showing 17 changed files with 37 additions and 77 deletions
import service from "../utils/request";
import request from '@/utils/request'
export function downLoadTemplate(template) {
......
import service from "../utils/request";
import request from '@/utils/request'
// 查询航班种类
......
......@@ -16,7 +16,6 @@
</div>
<el-dropdown-menu slot="dropdown">
<router-link to="/user/profile">
<!-- <el-dropdown-item>个人中心</el-dropdown-item> -->
</router-link>
<el-dropdown-item @click.native="logout">
<span>退出登录</span>
......
......@@ -12,6 +12,7 @@ const service = axios.create({
// baseURL: `http://47.103.140.98:7001/iMAC`,
baseURL: 'https://imacuat.zmd.apac.fedex.com/iMAC',
// baseURL: 'http://192.168.1.133:7001/iMAC',
// baseURL: 'http://192.168.1.133:7001/iMAC',//生产
// 超时
timeout: 30000,
......@@ -82,7 +83,7 @@ service.interceptors.response.use(res => {
type: 'error'
})
return Promise.reject(new Error(msg))
} else if (code !== 200 && code !== 201 && code !== 202) {
} else if (code !== 200 && code !== 201 && code !== 202 && code !== 603) {
Message({
message: msg,
type: 'error'
......
......@@ -8,6 +8,7 @@ const mimeMap = {
const baseUrl = 'https://imacuat.zmd.apac.fedex.com/iMAC' //uat服务器
// const baseUrl = 'http://47.103.140.98:7001/iMAC' //阿里云服务器
// const baseUrl = 'http://192.168.1.133:7001/iMAC' //测试服务器
// const baseUrl = 'http://192.168.1.133:7001/iMAC' //生产
export function downLoadZip(str, filename) {
var url = baseUrl + str
......
......@@ -852,7 +852,7 @@ export default {
.catch(() => {});
},
//查询
select() {
async select() {
this.loading = true;
this.dataInfo();
findCargoAllocationData(this.formData)
......
......@@ -129,8 +129,6 @@ import {
enableOrDisable,
} from "@/api/destinationFlight";
import { parseTime } from "@/utils/FedEx";
export default {
name: "FlightAllocConfig",
data() {
......
......@@ -391,7 +391,6 @@ export default {
}
}
});
console.log(errorList);
if (errorList.length != 0) {
this.$message({
showClose: true,
......
<template>
<div class="app-container">
<el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium">
<el-form
class="form-header"
:model="queryParams"
label-position="right"
label-width="auto"
size="medium"
>
<el-row>
<el-col :span="6">
<el-form-item label="航班日期从" prop="fltDateStart">
......@@ -87,27 +93,26 @@
</el-switch>
</el-col>
</el-row>
<div style="margin-top:25px">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button
type="warning"
:disabled="tableData.length == 0"
@click="xlse()"
:loading="downLoadingTip.downloading"
icon="el-icon-download"
size="mini"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出"
}}</el-button
>
<div style="margin-top: 25px">
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button
type="warning"
:disabled="tableData.length == 0"
@click="xlse()"
:loading="downLoadingTip.downloading"
icon="el-icon-download"
size="mini"
>{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出"
}}</el-button
>
</div>
</el-form>
<el-table
......
......@@ -13,7 +13,7 @@
</el-form-item>
</el-form>
<div style="font-size: 12px; font-weight: 700">
提示：<span style="color: #0000ff">以下为所提交的数据或出错信息</span>
提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
</div>
<el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" border>
<el-table-column label="行号" prop="line" fixed width="50" align="center">
......@@ -81,7 +81,6 @@
uploadExcel(option) {
//上传excel
const file = option.file;
console.log(option);
this.loading=true;
importcaPreReview(file, this.form.type).then((res) => {
this.loading=false;
......
......@@ -34,7 +34,7 @@
</el-form-item>
</el-form>
<div style="font-size: 12px; font-weight: 700">
提示：<span style="color: #0000ff">以下为所提交的数据或出错信息</span>
提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
</div>
<el-table
ref="filterTable"
......@@ -64,8 +64,7 @@
</el-table>
</div>
</template>
</div>
</template>
<script>
import {
filghtKindData,
......@@ -73,7 +72,7 @@ import {
importFlight,
} from "@/api/flightInfoImport";
export default {
name:"FlightInformationImport",
name: "FlightInformationImport",
data() {
return {
flightType: [],
......@@ -126,15 +125,14 @@ export default {
uploadExcel(option) {
//上传excel
const file = option.file;
console.log(option);
importFlight(file, this.form.type).then((res) => {
if (res.code != 200) {
if (res.code == 603) {
this.$alert(res.msg , "提示", {
this.$alert(res.msg, "提示", {
confirmButtonText: "确定",
type: "warning",
});
}else {
} else {
this.$message.error(res.msg);
this.tableData = res.data;
}
......
<template>
<div></div>
</template>
<script>
export default {
}
</script>
<style>
</style>
\ No newline at end of file
<template>
<div></div>
</template>
<script>
export default {
}
</script>
<style>
</style>
\ No newline at end of file
<template>
<div></div>
</template>
<script>
export default {
}
</script>
<style>
</style>
\ No newline at end of file
......@@ -37,6 +37,7 @@ module.exports = {
target: `https://imacuat.zmd.apac.fedex.com/iMAC`,
// target: `http://47.103.140.98:7001/iMAC`,
// target: `http://192.168.1.134:18080`,
// target: `http://47.103.140.98:7001/IMAC2`, //生产
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......