Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
EcomWeb
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
zhanbo.xu
2025-09-05 14:25:24 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
931c5212dcf6a4d217088de800f76fc0b180af35
931c5212
1 parent
57bbd9d9
feat: 修复BUG
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
41 deletions
src/assets/styles/variables.scss
src/views/reportingData/index.vue
src/views/summaryEdit/dialog.vue
src/assets/styles/variables.scss
View file @
931c521
// base color
$blue
:
#324157
;
$light-blue
:
#3
A71A
8
;
$red
:
#
C
03639
;
$pink
:
#
E65D6E
;
$green
:
#30
B08F
;
$tiffany
:
#4
AB7BD
;
$yellow
:
#
FEC
171
;
$panGreen
:
#30
B08F
;
$light-blue
:
#3
a71a
8
;
$red
:
#
c
03639
;
$pink
:
#
e65d6e
;
$green
:
#30
b08f
;
$tiffany
:
#4
ab7bd
;
$yellow
:
#
fec
171
;
$panGreen
:
#30
b08f
;
// sidebar
$menuText
:
#bfcbd9
;
$menuActiveText
:
#4
D148C
;
$subMenuActiveText
:
#4
D148C
;
// https://github.com/ElemeFE/element/issues/12951
$menuActiveText
:
#4
d148c
;
$subMenuActiveText
:
#4
d148c
;
// https://github.com/ElemeFE/element/issues/12951
$menuBg
:
#304156
;
$menuHover
:
#263445
;
...
...
@@ -24,16 +24,16 @@ $sidebarLightTitle: #001529;
$subMenuBg
:
#1f2d3d
;
$subMenuHover
:
#001528
;
$sideBarWidth
:
2
2
0px
;
$fedexColor
:
#4
D148C
;
$fedexBorder
:
#
E3E3E
3
;
$fedexButton
:
#007
AB
7
;
$sideBarWidth
:
2
1
0px
;
$fedexColor
:
#4
d148c
;
$fedexBorder
:
#
e3e3e
3
;
$fedexButton
:
#007
ab
7
;
$fedexError
:
#de002e
;
$fedexBottonColor
:
#
FF
6200
;
$formItemBackgroundColor
:
#
F2F2F
2
;
$fedexTablebackgroundColor
:
#
FAFAFA
;
$fedexBottonColor
:
#
ff
6200
;
$formItemBackgroundColor
:
#
f2f2f
2
;
$fedexTablebackgroundColor
:
#
fafafa
;
$fedexTableBorderColor
:
#e3e3e3
;
$formDisabledColor
:
#8
E8E8E
;
$formDisabledColor
:
#8
e8e8e
;
// the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
...
...
@@ -59,5 +59,4 @@ $formDisabledColor: #8E8E8E;
formDisabledColor
:
$formDisabledColor
;
fedexTablebackgroundColor
:
$fedexTablebackgroundColor
;
fedexTableBorderColor
:
$fedexTableBorderColor
;
}
\ No newline at end of file
}
...
...
src/views/reportingData/index.vue
View file @
931c521
This diff is collapsed. Click to expand it.
src/views/summaryEdit/dialog.vue
View file @
931c521
...
...
@@ -2,7 +2,7 @@
<el-dialog
class="entryDialog classCUploadDialog"
:title="pageData.ebpName"
:visible
.sync
="outerVisible"
:visible="outerVisible"
:show-close="false"
width="900px"
:close-on-click-modal="false"
...
...
@@ -21,9 +21,9 @@
</div>
<Table
class="fedexDetialTable fedexSreachTable"
ref="entryTable"
:data="pageData.value"
:headerData="headerData"
:maxHeight="tableMaxheight"
:border="true"
:pagination="true"
:order="false"
...
...
@@ -36,12 +36,13 @@
@tableSelect="tableSelect"
@tableSelectAll="tableSelectAll"
:selected="tableSelected"
:loading="loadings.searchLoading"
>
</Table>
<div class="dialogOption entrySave">
<el-button
class="entrySaveButton"
:
disabled
="loadings.submitLoading"
:
loading
="loadings.submitLoading"
@click="submit"
>
提 交
...
...
@@ -80,6 +81,7 @@ export default {
loadings: {
dialogLoading: false,
submitLoading: false,
searchLoading: false,
},
title: "",
tableSelected: [],
...
...
@@ -126,8 +128,12 @@ export default {
align: "left",
},
],
tableMaxheight: null,
};
},
mounted() {
this.tableMaxheight = window.innerHeight - 400;
},
methods: {
tableSelect(val) {
this.tableSelected = val.selection;
...
...
@@ -136,20 +142,28 @@ export default {
this.tableSelected = val;
},
fetchPreview() {
this.loadings.searchLoading = true;
preview({
...this.selected,
...this.page,
}).then((res) => {
if (res.code === "200") {
console.log(res.data);
this.pageData = {
...res.data,
value: res.data.pageData.value,
};
console.log(this.pageData);
this.page.total = res.data.pageData.totalItems;
}
});
})
.then((res) => {
if (res.code === "200") {
console.log(res.data);
this.pageData = {
...res.data,
value: res.data.pageData.value,
};
console.log(this.pageData);
this.page.total = res.data.pageData.totalItems;
}
})
.catch((err) => {
console.log(err);
})
.finally(() => {
this.loadings.searchLoading = false;
});
},
search(val) {
if (val == 0) {
...
...
@@ -171,18 +185,29 @@ export default {
this.msgError("请选择数据");
return;
}
this.loadings.submitLoading = true;
declareSummaryApplication({
...this.selected,
logisticsNos: this.tableSelected.map((item) => item.logisticsNo),
}).then((response) => {
if (response.data) {
this.msgSuccess("汇总申报成功");
this.$router.push("summaryDataSearch");
} else {
this.msgError(response.message);
}
});
})
.then((response) => {
if (response.data) {
this.msgSuccess("汇总申报成功");
this.close(true);
this.$nextTick(() => {
this.$router.push("summaryDataSearch");
});
} else {
this.msgError(response.message);
}
})
.catch((err) => {
console.log(err);
})
.finally(() => {
this.loadings.submitLoading = false;
});
},
//新增
addapi(val) {
...
...
@@ -216,4 +241,11 @@ export default {
<style lang="scss" scoped>
@import "@/assets/styles/variables.scss";
.entryDialog {
::v-deep {
.el-dialog {
margin-top: 5vh !important;
}
}
}
</style>
...
...
Please
register
or
login
to post a comment