Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
f4f41588 1 parent acede4ab

接口增加，订单，运单查询修改，申报页面增加

Expand all
Inline Side-by-side
Showing 15 changed files with 475 additions and 194 deletions
import request from '@/utils/request'
//获取自定义设置数据
/**
* @param billNo 提运单号
* @param orderNo 订单编号
* @param logisticsNo 运单编号
* @param startCreateTime 创建开始时间
* @param endCreateTime 创建结束时间
* @param receiptType 回执类型
* @param receiptStatus 回执状态
* @param pageNum *
* @param pageSize *
*/
export function searchDeclareData(data) {
return request({
url: '/bus-customer/declareData/getDeclareDataList',
method: 'post',
data: data,
})
}
//申报数据导入
/**
* @param multipartFile * 提运单号
*/
export function uploadDeclareData(data) {
let formData = new FormData
formData.append("multipartFile", data.multipartFile);
return request({
url: '/bus-customer/declareData/import',
method: 'post',
data: formData,
})
}
//数据申报
/**
* @param declareIds * id list
* @param type *
*/
export function declareDataUpload(data) {
return request({
url: '/bus-customer/declareData/' + data.type,
method: 'post',
data: data.declareIds,
})
}
import request from '@/utils/request'
//获取自定义设置数据
/**
* @param ebccode 电商企业代码
* @param orderNo 电商订单/海外仓订仓单编号
* @param returnStatus 回执状态
* @param createTimeStart 创建开始时间
* @param createTimeEnd 创建结束时间
* @param pageNum *
* @param pageSize *
*/
export function getAllExportingBills(data) {
return request({
url: '/bus-customer/exportOrder/search',
method: 'post',
data: data,
})
}
//获取自定义设置数据
/**
* @param logisticsNo 物流运单编号
* @param logisticsCode 物流企业代码
* @param returnStatus 回执状态
* @param createTimeStart 创建开始时间
* @param createTimeEnd 创建结束时间
* @param pageNum *
* @param pageSize *
*/
export function getAllExportingTransportBills(data) {
return request({
url: '/bus-customer/exportWaybill/search',
method: 'post',
data: data,
})
}
\ No newline at end of file
import request from '@/utils/request'
/**
*/
export function queryBills(data) {
return request({
url: '/bus-employees/rde/op/approve/check',
method: 'post',
data: data
})
}
/**
* 查询菜单
*/
export function getAllMenus() {
return request({
url: '/menu/selectAllMenu',
method: 'get'
})
}
export function getAllExportingBills(data) {
return request({
url: '/bus-customer/exportOrder/search',
method: 'post',
data
})
}
export function getAllTransportBills(data) {
return request({
url: '/bus-customer/exportWaybill/search',
method: 'post',
data
})
}
export function getAllListBills(data) {
return request({
url: '/bus-customer/exportList/search',
method: 'post',
data
})
}
......@@ -10,16 +10,16 @@
<script>
export default {
name: 'AppMain',
name: "AppMain",
computed: {
cachedViews() {
return this.$store.state.tagsView.cachedViews
return this.$store.state.tagsView.cachedViews;
},
key() {
return this.$route.fullPath
}
}
}
return this.$route.fullPath;
},
},
};
</script>
<style lang="scss" scoped>
......@@ -31,11 +31,11 @@ export default {
min-width: 1080px;
position: relative;
//overflow: hidden;
overflow: auto;
overflow: hidden;
background-color: #f2f2f2;
}
.fixed-header+.app-main {
.fixed-header + .app-main {
padding-top: 50px;
}
......@@ -45,7 +45,7 @@ export default {
min-height: calc(100vh - 84px);
}
.fixed-header+.app-main {
.fixed-header + .app-main {
padding-top: 84px;
}
}
......
......@@ -99,12 +99,15 @@ export default {
watch: {
$route(val) {
this.activeRoute = val;
this.setMainHeight();
},
},
mounted() {
},
mounted() {},
methods: {
setMainHeight(val) {
document.querySelector(".main-container").style.height =
"calc(100% - 64px)";
},
handleClickOutside() {
this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
},
......
......@@ -79,13 +79,13 @@ export const constantRoutes = [
component: Layout,
hidden: false,
redirect: 'index',
meta: { title: '系统管理', icon: 'fedexSystem' },
meta: { title: '申报数据管理', icon: 'upload' },
children: [
{
path: '/reportingData',
component: (resolve) => require(['@/views/AuditionEntrySearch/index'], resolve),
component: (resolve) => require(['@/views/reportingData/index'], resolve),
hidden: false,
meta: { title: '申报数据管理', icon: 'api' }
meta: { title: '申报数据管理', icon: 'upload' }
}
]
},
......@@ -94,76 +94,97 @@ export const constantRoutes = [
component: Layout,
hidden: false,
redirect: 'index',
meta: { title: '查询管理', icon: 'fedexSystem' },
meta: { title: '查询管理', icon: 'fedexExportIcon' },
children: [
{
path: '/exportBillQuery',
component: (resolve) => require(['@/views/exportBillQuery/index'], resolve),
hidden: false,
meta: { title: '出口订单查询', icon: 'api' },
meta: { title: '出口订单查询', icon: '' },
},
{
path: '/exportBillDetail',
component: (resolve) => require(['@/views/exportBillDetail/index'], resolve),
hidden: true,
meta: { title: '出口订单详情', icon: 'api' },
meta: { title: '出口订单详情', icon: '' },
},
{
path: '/exportTransportDetail',
component: (resolve) => require(['@/views/exportTransportDetail/index'], resolve),
hidden: true,
meta: { title: '出口运单详情', icon: 'api' },
meta: { title: '出口运单详情', icon: '' },
},
{
path: '/exportListDetail',
component: (resolve) => require(['@/views/exportListDetail/index'], resolve),
hidden: true,
meta: { title: '出口清单详情', icon: 'api' },
meta: { title: '出口清单详情', icon: '' },
},
{
path: '/exportTransportBillQuery',
component: (resolve) => require(['@/views/exportTransportBillQuery/index'], resolve),
hidden: false,
meta: { title: '出口运单查询', icon: 'api' },
meta: { title: '出口运单查询', icon: '' },
},
{
path: '/exportListQuery',
component: (resolve) => require(['@/views/exportListQuery/index'], resolve),
name: '首页',
meta: { title: '出口清单查询', icon: 'dashboard' }
meta: { title: '出口清单查询', icon: '' }
},
{
path: '/listBranchQuery',
component: (resolve) => require(['@/views/listBranchQuery/index'], resolve),
name: '首页',
hidden: false,
meta: { title: '清单总分单查询', icon: 'dashboard' }
meta: { title: '清单总分单查询', icon: '' }
},
{
path: '/listBranchDetail',
component: (resolve) => require(['@/views/listBranchDetail/index'], resolve),
name: '首页',
hidden: true,
meta: { title: '清单总分单详情', icon: 'dashboard' }
meta: { title: '清单总分单详情', icon: '' }
},
{
path: '/logisticsExitDetail',
component: (resolve) => require(['@/views/logisticsExitDetail/index'], resolve),
name: '首页',
hidden: true,
meta: { title: '物流离境单详情', icon: 'dashboard' }
meta: { title: '物流离境单详情', icon: '' }
},
{
path: '/logisticsExitQuery',
component: (resolve) => require(['@/views/logisticsExitQuery/index'], resolve),
name: '首页',
meta: { title: '物流离境单查询', icon: 'dashboard' }
meta: { title: '物流离境单查询', icon: '' }
},
{
path: 'index',
component: (resolve) => require(['@/views/index'], resolve),
name: '首页',
meta: { title: '出口撤销单查询', icon: 'dashboard' }
meta: { title: '出口撤销单查询', icon: '' }
}
]
},
{
path: '/',
component: Layout,
hidden: false,
redirect: 'index',
meta: { title: '汇总申报', icon: 'fedexSummary' },
children: [
{
path: '/summary',
component: (resolve) => require(['@/views/reportingData/index'], resolve),
hidden: false,
meta: { title: '汇总申报', icon: '' }
},
{
path: '/summaryDataSearch',
component: (resolve) => require(['@/views/reportingData/index'], resolve),
hidden: false,
meta: { title: '汇总申请单查询', icon: '' }
}
]
},
......
......@@ -84,8 +84,8 @@ const user = {
reject(res)
} else {
if (!getToken()) {
setToken(res.data.token)
commit('SET_TOKEN', res.data.token)
setToken(res.data)
commit('SET_TOKEN', res.data)
resolve(res)
} else {
resolve(res)
......
......@@ -37,23 +37,23 @@ export function removeUserId() {
}
export function setCookie(cookie) {
return localStorage.setItem('iClearLoginTIp', cookie)
return localStorage.setItem('EcomLoginTIp', cookie)
}
export function getCookie() {
return localStorage.getItem('iClearLoginTIp')
return localStorage.getItem('EcomLoginTIp')
}
export function setTime(date) {
return localStorage.setItem('iClearLoginTime', date)
return localStorage.setItem('EcomLoginTime', date)
}
export function getTime() {
return localStorage.getItem('iClearLoginTime')
return localStorage.getItem('EcomLoginTime')
}
export function removeTime() {
return localStorage.removeItem('iClearLoginTime')
return localStorage.removeItem('EcomLoginTime')
}
export function setLoginType(type) {
......
......@@ -18,21 +18,11 @@ const mimeMap = {
const apiUrl = {
//exl
customDownloadXls: '/bus-employees/export/custom/setting',//自定义导出
epoaDownload: '/bus-employees/port/op/download',//epoa文件下载
pbiListDownload: '/bus-employees/data/report/export/daily',//报表列表导出
pbiLogDownload: '/bus-employees/data/report/export/efficiency',//预审人员效绩统计
osprDownload: '/bus-employees/ospr/download',//opsr文件下载
portCDownload: '/bus-employees/port/op/decC/export',//C类申报导出
//other
portDownloadZip: '/bus-employees/port/op/downLoadZip',//口岸异步下载
staffEntryDownloadZip: '/bus-employees/chm/qry/downLoadZip',//运单查询异步下载
entryUploadData: '/bus-customer/consignment/upload/export',//批量导入数据导出
entryUploadModel: '/bus-customer/upload/excel/template/downLoad',//批量上传模版导出
opsrDownloadZip: '/bus-employees/ospr/export',//opsr批量导出
declareDataModel: '/bus-customer/declareData/downloadTemplate',
}
const baseUrl = process.env.VUE_APP_BASE_API
export function downLoadZip(urlStatus, str, filename, type, method, data) {
return new Promise((resolve, reject) => {
var url = ''
......@@ -41,6 +31,7 @@ export function downLoadZip(urlStatus, str, filename, type, method, data) {
} else if (urlStatus == 'res') {
url = str
}
console.log(url);
if (method == 'get' && data) {
url = url + '?';
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
<template>
<div style="width: 100%; height: 100%; position: relative" v-if="imgShow">
<el-image
:src="url"
fit="fill"
style="display: block; width: 100%; height: 100%; opacity: 0.9"
lazy
></el-image>
<div class="model"></div>
</div>
</template>
<script>
import indexBackground from "@/assets/images/indexBackground.jpg";
import { getLoginType } from "@/utils/auth";
export default {
props: {},
data() {
......@@ -22,36 +14,10 @@ export default {
};
},
created() {
getLoginType() ? (this.fcl = true) : (this.fcl = false);
this.checkImgType();
},
methods: {
checkImgType() {
let interval = setInterval(() => {
if (
this.$store.getters.userData.organization &&
this.$store.getters.userData.organization.code == "customer"
// ||getToken().split(".")[0] == "2"
) {
clearInterval(interval);
if (this.fcl) {
} else {
this.imgShow = false;
this.url = "";
this.$router.push({
path: "/newui_noentrySreach_parent/newui_noentrySreach_leaf",
});
}
} else if (
this.$store.getters.userData.organization &&
this.$store.getters.userData.organization.code != "customer"
) {
clearInterval(interval);
this.url = indexBackground;
this.imgShow = true;
}
}, 500);
},
},
};
</script>
......
......@@ -156,7 +156,10 @@
:loading="loadings.downloadLoading2"
@click="downloadBpiData('log')"
>
<svg-icon class="el-icon-user-solid" icon-class="fedexUpBlue"></svg-icon>
<svg-icon
class="el-icon-user-solid"
icon-class="fedexUpBlue"
></svg-icon>
导出
</el-button>
</div>
......@@ -192,8 +195,6 @@
</template>
<script>
import {getAllExportingBills, getAllTransportBills} from "@/api/query/query";
export default {
name: "index",
data() {
......@@ -242,86 +243,76 @@ export default {
{
name: "提运单号",
value: "orderNo",
width: '150',
align: 'left'
width: "150",
align: "left",
},
{
name: '运单编号',
value: 'orderType',
width: '150',
align: 'left'
name: "运单编号",
value: "orderType",
width: "150",
align: "left",
},
{
name: '物流企业名称',
value: 'ebccode',
width: '200',
align: 'left'
name: "物流企业名称",
value: "ebccode",
width: "200",
align: "left",
},
{
name: '运输方式',
value: 'ebcname',
width: '200',
align: 'left'
name: "运输方式",
value: "ebcname",
width: "200",
align: "left",
},
{
name: '运输工具名称',
value: 'createTime',
width: '150',
align: 'left'
name: "运输工具名称",
value: "createTime",
width: "150",
align: "left",
},
{
name: '航班航次号',
value: 'declaringEnterprise',
width: '200',
align: 'left'
name: "航班航次号",
value: "declaringEnterprise",
width: "200",
align: "left",
},
{
name: '离境时间',
value: 'declaringEnterprise',
width: '200',
align: 'left'
name: "离境时间",
value: "declaringEnterprise",
width: "200",
align: "left",
},
{
name: '报送类型',
value: 'declaringEnterprise',
width: '200',
align: 'left'
name: "报送类型",
value: "declaringEnterprise",
width: "200",
align: "left",
},
{
name: '业务状态',
value: 'declaringType',
width: '100',
align: 'left'
name: "业务状态",
value: "declaringType",
width: "100",
align: "left",
},
{
name: '申报日期',
value: 'declaringType',
width: '100',
align: 'left'
}
name: "申报日期",
value: "declaringType",
width: "100",
align: "left",
},
],
dictData: {
userport: [
{name: "Shanghai Port", code: "SH"},
{name: "Beijing Port", code: "BJ"},
{name: "Guangzhou Port", code: "GZ"},
{name: "Shenzhen Port", code: "SZ"},
{name: "Tianjin Port", code: "TJ"},
{ name: "Shanghai Port", code: "SH" },
{ name: "Beijing Port", code: "BJ" },
{ name: "Guangzhou Port", code: "GZ" },
{ name: "Shenzhen Port", code: "SZ" },
{ name: "Tianjin Port", code: "TJ" },
],
},
}
},
created() {
getAllTransportBills({
pageIndex: 1,
pageSize: 20
}).then((res) => {
console.log('res', res)
this.tableData = res.data.value;
this.total = res.data.totalItems;
debugger;
})
};
},
created() {},
methods: {
tableSelect(val) {
this.selected = val.selection;
......@@ -332,15 +323,14 @@ export default {
handleRowClick(row) {
const declareId = row.declareId;
this.$router.push({
path: '/logisticsExitDetail',
path: "/logisticsExitDetail",
query: {
declareId
}
declareId,
},
});
},
async search(val) {
try {
} catch (error) {
console.error("搜索出错：", error);
} finally {
......@@ -348,8 +338,8 @@ export default {
this.loadings.sreachLoading = false;
}
},
}
}
},
};
</script>
<style scoped lang="scss">
......
<template>
<el-dialog
class="entryDialog classCUploadDialog"
title="申报数据导入"
:visible.sync="outerVisible"
:show-close="false"
width="35%"
:close-on-click-modal="false"
v-loading="loadings.dialogLoading"
:element-loading-text="loadingText"
@close="close"
>
<div class="modelItem">
<div class="modelItem-title">
<div>数据导入</div>
<div>
<el-button
type="text"
icon="el-icon-download"
:loadings="$parent.loadings.dwonloadModelLoading"
@click="dwonloadModelFile"
>导入模板下载</el-button
>
</div>
</div>
<div class="uploadItem">
<div class="uploadbox">
<el-button
size="mini"
type="text"
v-loading="loadings.uploadLoading"
@click="uploadFile"
>上传文件
</el-button>
<el-upload
class="upload-demo"
ref="uploadFile"
action="/manager-server/attachment/picImg"
:http-request="fileUpload"
:auto-upload="true"
:show-file-list="false"
:data="{}"
accept=".xlsx"
:before-upload="beforeUpload"
:on-remove="handleRemove"
:on-success="handleSuccess"
:on-change="fileChange"
:file-list="fileList"
@clearFiles="clearFile"
>
</el-upload>
</div>
<div class="fileList" v-if="formData.file != null">
<div class="fileList-item">
<div class="uploadbox-fileName">
<svg-icon
class="el-icon-user-solid"
icon-class="exl"
style="font-size: 18px; color: #de002e"
/>
<Tooltip
:content="formData.file.name"
:refName="formData.file.name"
/>
</div>
<div class="uploadbox-option">
<el-popconfirm
:title="$t('entry.upload.delTip')"
@confirm="delTypeDFile"
>
<el-button slot="reference" type="text">{{
$t("entry.upload.del")
}}</el-button>
</el-popconfirm>
</div>
</div>
</div>
</div>
</div>
<div class="dialogOption entrySave">
<el-button
class="entrySaveButton"
:disabled="loadings.uploadLoading"
@click="close"
>关闭</el-button
>
</div>
</el-dialog>
</template>
<script>
import { uploadDeclareData } from "@/api/declareData-api.js";
export default {
props: {
outerVisible: {
type: Boolean,
default: false,
},
},
data() {
return {
formData: {
file: null,
},
searchForm: {},
loadings: {
dialogLoading: false,
uploadLoading: false,
sreachLoading: false,
},
uploadType: false,
fileList: [],
loadingText: "数据导入中，请稍后！",
};
},
watch: {
outerVisible(val) {
if (val) {
this.uploadType = false;
}
},
},
methods: {
dwonloadModelFile() {
this.$emit("dwonloadModelFile");
},
//文件上传
uploadFile() {
this.$refs.uploadFile.$refs["upload-inner"].handleClick();
},
//文件校验
beforeUpload(val) {
if (
val.type !=
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
) {
this.alertWarningMsg("请上传Excel文件！");
return false;
} else {
return true;
}
},
fileUpload(val) {
const reader = new FileReader();
reader.readAsDataURL(val.file);
reader.onload = (e) => {
this.loadings.dialogLoading = true;
let obj = {
multipartFile: this.base64ConvertFile(e.target.result, val.file.name),
};
uploadDeclareData(obj)
.then((res) => {
if (res.code === "200") {
this.msgSuccess("上传成功！");
this.handleRemove();
this.close();
this.uploadType = true;
} else {
this.alertWarningMsg(res.message);
this.loadings.dialogLoading = false;
}
})
.catch((err) => {
console.log(err);
this.loadings.dialogLoading = false;
});
};
},
fileChange(val) {},
handleSuccess() {},
handleRemove() {
this.fileList = [];
},
clearFile() {},
close() {
this.handleRemove();
this.$emit("close", this.uploadType);
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/styles/variables.scss";
.modelItem {
width: 100%;
.modelItem-title {
display: flex;
justify-content: space-between;
margin-bottom: 5px;
font-size: 14px;
font-weight: 600;
color: #333;
}
}
.uploadItem {
margin-bottom: 5px;
.uploadbox {
width: 100%;
height: 40px;
line-height: 20px;
background-color: $formItemBackgroundColor;
padding: 4px 8px;
margin-top: 5px;
display: flex;
justify-content: space-between;
.el-button {
font-weight: 400 !important;
}
}
}
.fileList {
width: 100%;
.fileList-item {
display: flex;
justify-content: space-between;
padding: 5px 15px 5px 5px;
background-color: $formItemBackgroundColor;
font-size: 14px;
.uploadbox-fileName {
display: flex;
align-items: center;
}
.uploadbox-option {
.fileSize {
display: inline-block;
color: #8e8e8e;
font-size: 12px;
}
}
.svg-icon {
display: inline-block;
color: $fedexError;
}
.text-tooltip {
max-width: 500px;
display: inline-block;
margin-left: 10px;
}
.fileList-item-empty {
display: inline-block;
margin: 5px;
height: max-content;
color: #8e8e8e;
}
}
}
.fedexformSreachBottomBorder {
border-top: 1px solid $fedexBorder;
border-left: 1px solid $fedexBorder;
border-right: 1px solid $fedexBorder;
}
.textCenter {
.el-button {
font-size: 20px;
}
}
</style>
This diff is collapsed. Click to expand it.