Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
xingru.liu
60b72fcc 1 parent 4bc94778

修复BUG

Inline Side-by-side
Showing 11 changed files with 49 additions and 35 deletions
......@@ -7,12 +7,14 @@ export function login(loginName, password, rememberMe, equipmentType, userAgent,
// password,
// rememberMe
// }
const data = {
"email": "247908967@qq.com",
"name": "肖玉兰",
"name": "测试用户",
"phone": 18221643976,
"port": "TSN",
"purpleId": '肖玉兰',
"purpleId": '测试用户',
"role": 170
}
return request({
......@@ -20,6 +22,17 @@ export function login(loginName, password, rememberMe, equipmentType, userAgent,
method: 'post',
data: data
})
// const data = {
// "loginName":loginName,
// "password":password,
// }
// return request({
// url: '/bus-customer/customerLogin',
// method: 'post',
// data: data
// })
}
// 退出方法
......
......@@ -153,26 +153,26 @@
.el-button,
.el-button.is-disabled {
border-top-color: $fedexButton !important;
border-bottom-color: $fedexButton !important;
border-top-color: $fedexBottonColor !important;
border-bottom-color: $fedexBottonColor !important;
border-width: 2px;
}
.el-button:first-child {
height: 100%;
border-left-color: $fedexButton !important;
border-left-color: $fedexBottonColor !important;
span {
color: $fedexButton ;
color: $fedexBottonColor ;
}
}
.el-button:last-child {
border-right-color: $fedexButton !important;
border-left: 1px solid $fedexButton !important;
border-right-color: $fedexBottonColor !important;
border-left: 1px solid $fedexBottonColor !important;
.el-dropdown__icon {
color: $fedexButton ;
color: $fedexBottonColor ;
}
}
......@@ -192,30 +192,30 @@
.el-button,
.el-button.is-disabled {
border-top-color: $fedexButton !important;
border-bottom-color: $fedexButton !important;
border-top-color: $fedexBottonColor !important;
border-bottom-color: $fedexBottonColor !important;
border-width: 2px;
}
.el-button:first-child {
height: 100%;
border-left-color: $fedexButton !important;
border-left-color: $fedexBottonColor !important;
span {
color: $fedexButton!important ;
color: $fedexBottonColor!important ;
svg {
color: $fedexButton!important ;
color: $fedexBottonColor!important ;
}
}
}
.el-button:last-child {
border-right-color: $fedexButton !important;
border-left: 1px solid $fedexButton !important;
border-right-color: $fedexBottonColor !important;
border-left: 1px solid $fedexBottonColor !important;
.el-dropdown__icon {
color: $fedexButton!important ;
color: $fedexBottonColor!important ;
}
}
......@@ -225,7 +225,7 @@
color: $formDisabledColor !important;
svg {
color: $fedexButton !important;
color: $fedexBottonColor !important;
}
}
}
......@@ -1082,7 +1082,7 @@ input:disabled {
.el-dropdown-menu {
min-width: 150px;
padding: 0px;
border: 1px solid $fedexButton;
border: 1px solid $fedexBottonColor;
.el-dropdown-menu__item {
font-size: 12px;
......
......@@ -93,14 +93,14 @@
</el-row>
</el-form>
<div class="optionButton">
<el-button
<!-- <el-button
class="entrySaveButton"
size="small"
icon="el-icon-download"
@click="downloadData"
>
导出
</el-button>
</el-button> -->
</div>
<Table
class="fedexDetialTable fedexSreachTable"
......
......@@ -157,14 +157,14 @@
</el-button> -->
</div>
<div>
<el-button
<!-- <el-button
class="entrySaveButton"
size="small"
icon="el-icon-download"
@click="downloadData"
>
导出
</el-button>
</el-button> -->
</div>
</div>
<Table
......
......@@ -88,14 +88,14 @@
</el-row>
</el-form>
<div class="optionButton">
<el-button
<!-- <el-button
class="entrySaveButton"
size="small"
icon="el-icon-download"
@click="downloadData"
>
导出
</el-button>
</el-button> -->
</div>
<Table
class="fedexDetialTable fedexSreachTable"
......
......@@ -93,14 +93,14 @@
</el-row>
</el-form>
<div class="optionButton">
<el-button
<!-- <el-button
class="entrySaveButton"
size="small"
icon="el-icon-download"
@click="downloadData"
>
导出
</el-button>
</el-button> -->
</div>
<Table
class="fedexDetialTable fedexSreachTable"
......
......@@ -88,14 +88,14 @@
</el-row>
</el-form>
<div class="optionButton">
<el-button
<!-- <el-button
class="entrySaveButton"
size="small"
icon="el-icon-download"
@click="downloadData"
>
导出
</el-button>
</el-button> -->
</div>
<Table
class="fedexDetialTable fedexSreachTable"
......
......@@ -214,7 +214,7 @@
:tableData="logData"
:headerData="logHeaderData"
/>
<div class="entryTitle" style="margin-top: 10px">商品明细</div>
<div class="entryTitle" style="margin-top: 10px">运单明细</div>
<ProductDetailTable
:tableData="detailData"
:bodyHeader="detialHeaderData"
......
......@@ -107,14 +107,14 @@
</el-row>
</el-form>
<div class="optionButton">
<el-button
<!-- <el-button
class="entrySaveButton"
size="small"
icon="el-icon-download"
@click="downloadData"
>
导出
</el-button>
</el-button> -->
</div>
<Table
class="fedexDetialTable fedexSreachTable"
......
......@@ -79,14 +79,14 @@
</el-button>
</div>
<div>
<el-button
<!-- <el-button
class="entrySaveButton"
size="small"
icon="el-icon-download"
@click="downloadData"
>
导出
</el-button>
</el-button> -->
</div>
</div>
<Table
......
......@@ -526,7 +526,8 @@ export default {
declareDataUpload(obj)
.then((res) => {
if (res.code === "200") {
this.alertSuccessMsg(res.message);
// this.alertSuccessMsg(res.message);
this.alertSuccessMsg("数据已成功提交申报，请等待海关回执。");
} else {
this.alertWarningMsg(res.message);
}
......