zhanbo.xu

feat: 修复BUG

1 // base color 1 // base color
2 $blue: #324157; 2 $blue: #324157;
3 -$light-blue: #3A71A8; 3 +$light-blue: #3a71a8;
4 -$red: #C03639; 4 +$red: #c03639;
5 -$pink: #E65D6E; 5 +$pink: #e65d6e;
6 -$green: #30B08F; 6 +$green: #30b08f;
7 -$tiffany: #4AB7BD; 7 +$tiffany: #4ab7bd;
8 -$yellow: #FEC171; 8 +$yellow: #fec171;
9 -$panGreen: #30B08F; 9 +$panGreen: #30b08f;
10 10
11 // sidebar 11 // sidebar
12 $menuText: #bfcbd9; 12 $menuText: #bfcbd9;
13 -$menuActiveText: #4D148C; 13 +$menuActiveText: #4d148c;
14 -$subMenuActiveText: #4D148C; // https://github.com/ElemeFE/element/issues/12951 14 +$subMenuActiveText: #4d148c; // https://github.com/ElemeFE/element/issues/12951
15 15
16 $menuBg: #304156; 16 $menuBg: #304156;
17 $menuHover: #263445; 17 $menuHover: #263445;
...@@ -24,16 +24,16 @@ $sidebarLightTitle: #001529; ...@@ -24,16 +24,16 @@ $sidebarLightTitle: #001529;
24 $subMenuBg: #1f2d3d; 24 $subMenuBg: #1f2d3d;
25 $subMenuHover: #001528; 25 $subMenuHover: #001528;
26 26
27 -$sideBarWidth: 220px; 27 +$sideBarWidth: 210px;
28 -$fedexColor: #4D148C; 28 +$fedexColor: #4d148c;
29 -$fedexBorder: #E3E3E3; 29 +$fedexBorder: #e3e3e3;
30 -$fedexButton: #007AB7; 30 +$fedexButton: #007ab7;
31 $fedexError: #de002e; 31 $fedexError: #de002e;
32 -$fedexBottonColor: #FF6200; 32 +$fedexBottonColor: #ff6200;
33 -$formItemBackgroundColor: #F2F2F2; 33 +$formItemBackgroundColor: #f2f2f2;
34 -$fedexTablebackgroundColor: #FAFAFA; 34 +$fedexTablebackgroundColor: #fafafa;
35 $fedexTableBorderColor: #e3e3e3; 35 $fedexTableBorderColor: #e3e3e3;
36 -$formDisabledColor: #8E8E8E; 36 +$formDisabledColor: #8e8e8e;
37 37
38 // the :export directive is the magic sauce for webpack 38 // the :export directive is the magic sauce for webpack
39 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass 39 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
...@@ -59,5 +59,4 @@ $formDisabledColor: #8E8E8E; ...@@ -59,5 +59,4 @@ $formDisabledColor: #8E8E8E;
59 formDisabledColor: $formDisabledColor; 59 formDisabledColor: $formDisabledColor;
60 fedexTablebackgroundColor: $fedexTablebackgroundColor; 60 fedexTablebackgroundColor: $fedexTablebackgroundColor;
61 fedexTableBorderColor: $fedexTableBorderColor; 61 fedexTableBorderColor: $fedexTableBorderColor;
62 -
63 -}
...\ No newline at end of file ...\ No newline at end of file
62 +}
......
This diff is collapsed. Click to expand it.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <el-dialog 2 <el-dialog
3 class="entryDialog classCUploadDialog" 3 class="entryDialog classCUploadDialog"
4 :title="pageData.ebpName" 4 :title="pageData.ebpName"
5 - :visible.sync="outerVisible" 5 + :visible="outerVisible"
6 :show-close="false" 6 :show-close="false"
7 width="900px" 7 width="900px"
8 :close-on-click-modal="false" 8 :close-on-click-modal="false"
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
21 </div> 21 </div>
22 <Table 22 <Table
23 class="fedexDetialTable fedexSreachTable" 23 class="fedexDetialTable fedexSreachTable"
24 - ref="entryTable"
25 :data="pageData.value" 24 :data="pageData.value"
26 :headerData="headerData" 25 :headerData="headerData"
26 + :maxHeight="tableMaxheight"
27 :border="true" 27 :border="true"
28 :pagination="true" 28 :pagination="true"
29 :order="false" 29 :order="false"
...@@ -36,12 +36,13 @@ ...@@ -36,12 +36,13 @@
36 @tableSelect="tableSelect" 36 @tableSelect="tableSelect"
37 @tableSelectAll="tableSelectAll" 37 @tableSelectAll="tableSelectAll"
38 :selected="tableSelected" 38 :selected="tableSelected"
39 + :loading="loadings.searchLoading"
39 > 40 >
40 </Table> 41 </Table>
41 <div class="dialogOption entrySave"> 42 <div class="dialogOption entrySave">
42 <el-button 43 <el-button
43 class="entrySaveButton" 44 class="entrySaveButton"
44 - :disabled="loadings.submitLoading" 45 + :loading="loadings.submitLoading"
45 @click="submit" 46 @click="submit"
46 > 47 >
47 提 交 48 提 交
...@@ -80,6 +81,7 @@ export default { ...@@ -80,6 +81,7 @@ export default {
80 loadings: { 81 loadings: {
81 dialogLoading: false, 82 dialogLoading: false,
82 submitLoading: false, 83 submitLoading: false,
84 + searchLoading: false,
83 }, 85 },
84 title: "", 86 title: "",
85 tableSelected: [], 87 tableSelected: [],
...@@ -126,8 +128,12 @@ export default { ...@@ -126,8 +128,12 @@ export default {
126 align: "left", 128 align: "left",
127 }, 129 },
128 ], 130 ],
131 + tableMaxheight: null,
129 }; 132 };
130 }, 133 },
134 + mounted() {
135 + this.tableMaxheight = window.innerHeight - 400;
136 + },
131 methods: { 137 methods: {
132 tableSelect(val) { 138 tableSelect(val) {
133 this.tableSelected = val.selection; 139 this.tableSelected = val.selection;
...@@ -136,20 +142,28 @@ export default { ...@@ -136,20 +142,28 @@ export default {
136 this.tableSelected = val; 142 this.tableSelected = val;
137 }, 143 },
138 fetchPreview() { 144 fetchPreview() {
145 + this.loadings.searchLoading = true;
139 preview({ 146 preview({
140 ...this.selected, 147 ...this.selected,
141 ...this.page, 148 ...this.page,
142 - }).then((res) => { 149 + })
143 - if (res.code === "200") { 150 + .then((res) => {
144 - console.log(res.data); 151 + if (res.code === "200") {
145 - this.pageData = { 152 + console.log(res.data);
146 - ...res.data, 153 + this.pageData = {
147 - value: res.data.pageData.value, 154 + ...res.data,
148 - }; 155 + value: res.data.pageData.value,
149 - console.log(this.pageData); 156 + };
150 - this.page.total = res.data.pageData.totalItems; 157 + console.log(this.pageData);
151 - } 158 + this.page.total = res.data.pageData.totalItems;
152 - }); 159 + }
160 + })
161 + .catch((err) => {
162 + console.log(err);
163 + })
164 + .finally(() => {
165 + this.loadings.searchLoading = false;
166 + });
153 }, 167 },
154 search(val) { 168 search(val) {
155 if (val == 0) { 169 if (val == 0) {
...@@ -171,18 +185,29 @@ export default { ...@@ -171,18 +185,29 @@ export default {
171 this.msgError("请选择数据"); 185 this.msgError("请选择数据");
172 return; 186 return;
173 } 187 }
188 + this.loadings.submitLoading = true;
174 189
175 declareSummaryApplication({ 190 declareSummaryApplication({
176 ...this.selected, 191 ...this.selected,
177 logisticsNos: this.tableSelected.map((item) => item.logisticsNo), 192 logisticsNos: this.tableSelected.map((item) => item.logisticsNo),
178 - }).then((response) => { 193 + })
179 - if (response.data) { 194 + .then((response) => {
180 - this.msgSuccess("汇总申报成功"); 195 + if (response.data) {
181 - this.$router.push("summaryDataSearch"); 196 + this.msgSuccess("汇总申报成功");
182 - } else { 197 + this.close(true);
183 - this.msgError(response.message); 198 + this.$nextTick(() => {
184 - } 199 + this.$router.push("summaryDataSearch");
185 - }); 200 + });
201 + } else {
202 + this.msgError(response.message);
203 + }
204 + })
205 + .catch((err) => {
206 + console.log(err);
207 + })
208 + .finally(() => {
209 + this.loadings.submitLoading = false;
210 + });
186 }, 211 },
187 //新增 212 //新增
188 addapi(val) { 213 addapi(val) {
...@@ -216,4 +241,11 @@ export default { ...@@ -216,4 +241,11 @@ export default {
216 241
217 <style lang="scss" scoped> 242 <style lang="scss" scoped>
218 @import "@/assets/styles/variables.scss"; 243 @import "@/assets/styles/variables.scss";
244 +.entryDialog {
245 + ::v-deep {
246 + .el-dialog {
247 + margin-top: 5vh !important;
248 + }
249 + }
250 +}
219 </style> 251 </style>
......