Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
57bbd9d9 1 parent 91cd51b0

feat: 修复BUG

Inline Side-by-side
Showing 10 changed files with 63 additions and 39 deletions
...@@ -28,15 +28,16 @@ ...@@ -28,15 +28,16 @@
28 size="mini" 28 size="mini"
29 :loading="closeLoading" 29 :loading="closeLoading"
30 @click="close" 30 @click="close"
31 - >{{ $t("system.confirm") }}</el-button
32 > 31 >
32 + {{ $t("system.confirm") }}
33 + </el-button>
33 </span> 34 </span>
34 </el-dialog> 35 </el-dialog>
35 </div> 36 </div>
36 </template> 37 </template>
37 38
38 <script> 39 <script>
39 -import { setTime, getTime, getToken, removeToken } from "@/utils/auth"; 40 +import { setTime } from "@/utils/auth";
40 import { getTokenTime } from "@/api/system/user.js"; 41 import { getTokenTime } from "@/api/system/user.js";
41 export default { 42 export default {
42 name: "App", 43 name: "App",
...@@ -63,13 +64,11 @@ export default { ...@@ -63,13 +64,11 @@ export default {
63 // if (getToken()) { 64 // if (getToken()) {
64 // this.upDateTokenTime(); 65 // this.upDateTokenTime();
65 // } 66 // }
66 -
67 // let upDateTime = setInterval(() => { 67 // let upDateTime = setInterval(() => {
68 // if (getToken()) { 68 // if (getToken()) {
69 // this.upDateTokenTime(); 69 // this.upDateTokenTime();
70 // } 70 // }
71 // }, this.timeOption.updateTime); 71 // }, this.timeOption.updateTime);
72 -
73 // let timeInterval = setInterval(() => { 72 // let timeInterval = setInterval(() => {
74 // if (getTime() && getToken()) { 73 // if (getTime() && getToken()) {
75 // let three = 1000 * 60 * this.timeOption.tokenTimeLength; 74 // let three = 1000 * 60 * this.timeOption.tokenTimeLength;
......
...@@ -543,8 +543,6 @@ export default { ...@@ -543,8 +543,6 @@ export default {
543 }, 543 },
544 watch: { 544 watch: {
545 $route(val, oldval) { 545 $route(val, oldval) {
546 - console.log("========================");
547 -
548 this.popoverClose(); 546 this.popoverClose();
549 this.popperClose(); 547 this.popperClose();
550 }, 548 },
......
...@@ -153,8 +153,8 @@ export default { ...@@ -153,8 +153,8 @@ export default {
153 data() { 153 data() {
154 return { 154 return {
155 sreachFormData: { 155 sreachFormData: {
156 - logisticsNo: [], 156 + logisticsNo: "",
157 - billNo: [], 157 + billNo: "",
158 returnStatus: "", 158 returnStatus: "",
159 preNo: "", 159 preNo: "",
160 }, 160 },
...@@ -255,6 +255,11 @@ export default { ...@@ -255,6 +255,11 @@ export default {
255 mounted() { 255 mounted() {
256 this.tableMaxheight = window.innerHeight - 220; 256 this.tableMaxheight = window.innerHeight - 220;
257 }, 257 },
258 + watch: {
259 + $route(val, oldval) {
260 + this.popoverClose();
261 + },
262 + },
258 methods: { 263 methods: {
259 popoverClose(val) { 264 popoverClose(val) {
260 this.tableData.forEach((item) => { 265 this.tableData.forEach((item) => {
...@@ -316,8 +321,8 @@ export default { ...@@ -316,8 +321,8 @@ export default {
316 // 清空 321 // 清空
317 clear() { 322 clear() {
318 this.sreachFormData = { 323 this.sreachFormData = {
319 - logisticsNo: [], 324 + logisticsNo: "",
320 - billNo: [], 325 + billNo: "",
321 returnStatus: "", 326 returnStatus: "",
322 preNo: "", 327 preNo: "",
323 }; 328 };
......
...@@ -186,8 +186,8 @@ export default { ...@@ -186,8 +186,8 @@ export default {
186 data() { 186 data() {
187 return { 187 return {
188 sreachFormData: { 188 sreachFormData: {
189 - logisticsNo: [], 189 + logisticsNo: "",
190 - orderNo: [], 190 + orderNo: "",
191 ebccode: "", 191 ebccode: "",
192 returnStatus: "", 192 returnStatus: "",
193 createTime: [], 193 createTime: [],
...@@ -361,8 +361,8 @@ export default { ...@@ -361,8 +361,8 @@ export default {
361 //重置 361 //重置
362 clear() { 362 clear() {
363 this.sreachFormData = { 363 this.sreachFormData = {
364 - logisticsNo: [], 364 + logisticsNo: "",
365 - orderNo: [], 365 + orderNo: "",
366 ebccode: "", 366 ebccode: "",
367 returnStatus: "", 367 returnStatus: "",
368 createTime: [], 368 createTime: [],
......
...@@ -295,11 +295,11 @@ export default { ...@@ -295,11 +295,11 @@ export default {
295 return { 295 return {
296 customDialogShow: false, 296 customDialogShow: false,
297 sreachFormData: { 297 sreachFormData: {
298 - billNo: [], 298 + billNo: "",
299 ebcName: "", 299 ebcName: "",
300 invtNo: "", 300 invtNo: "",
301 - logisticsNo: [], 301 + logisticsNo: "",
302 - orderNo: [], 302 + orderNo: "",
303 returnStatus: "", 303 returnStatus: "",
304 summaryApplicationStatus: "", 304 summaryApplicationStatus: "",
305 createTime: [], 305 createTime: [],
...@@ -486,10 +486,11 @@ export default { ...@@ -486,10 +486,11 @@ export default {
486 //重置 486 //重置
487 clear() { 487 clear() {
488 this.sreachFormData = { 488 this.sreachFormData = {
489 - orderNo: [], 489 + orderNo: "",
490 - billNo: [], 490 + billNo: "",
491 returnStatus: "", 491 returnStatus: "",
492 createTime: [], 492 createTime: [],
493 + logisticsNo: "",
493 ebcName: "", 494 ebcName: "",
494 statisticsFlag: "", 495 statisticsFlag: "",
495 summaryApplicationStatus: "", 496 summaryApplicationStatus: "",
......
...@@ -176,10 +176,10 @@ export default { ...@@ -176,10 +176,10 @@ export default {
176 data() { 176 data() {
177 return { 177 return {
178 sreachFormData: { 178 sreachFormData: {
179 - billNo: [], 179 + billNo: "",
180 returnStatus: "", 180 returnStatus: "",
181 createTime: [], 181 createTime: [],
182 - logisticsNo: [], 182 + logisticsNo: "",
183 }, 183 },
184 page: { 184 page: {
185 pageIndex: 1, 185 pageIndex: 1,
...@@ -285,6 +285,11 @@ export default { ...@@ -285,6 +285,11 @@ export default {
285 mounted() { 285 mounted() {
286 this.tableMaxheight = window.innerHeight - 220; 286 this.tableMaxheight = window.innerHeight - 220;
287 }, 287 },
288 + watch: {
289 + $route(val, oldval) {
290 + this.popoverClose();
291 + },
292 + },
288 methods: { 293 methods: {
289 //查询详情 294 //查询详情
290 view(val) { 295 view(val) {
...@@ -300,7 +305,9 @@ export default { ...@@ -300,7 +305,9 @@ export default {
300 if (val == 0) { 305 if (val == 0) {
301 this.page.pageIndex = 1; 306 this.page.pageIndex = 1;
302 } 307 }
303 - let obj = this.sreachFormData; 308 + let obj = {
309 + ...this.sreachFormData,
310 + };
304 obj.pageIndex = this.page.pageIndex; 311 obj.pageIndex = this.page.pageIndex;
305 obj.pageSize = this.page.pageSize; 312 obj.pageSize = this.page.pageSize;
306 obj.createTimeStart = ""; 313 obj.createTimeStart = "";
...@@ -348,8 +355,8 @@ export default { ...@@ -348,8 +355,8 @@ export default {
348 //重置 355 //重置
349 clear() { 356 clear() {
350 this.sreachFormData = { 357 this.sreachFormData = {
351 - logisticsNo: [], 358 + logisticsNo: "",
352 - billNo: [], 359 + billNo: "",
353 returnStatus: "", 360 returnStatus: "",
354 createTime: [], 361 createTime: [],
355 }; 362 };
......
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
165 data() { 165 data() {
166 return { 166 return {
167 sreachFormData: { 167 sreachFormData: {
168 - logisticsNo: [], 168 + logisticsNo: "",
169 returnStatus: "", 169 returnStatus: "",
170 createTime: [], 170 createTime: [],
171 }, 171 },
...@@ -267,6 +267,11 @@ export default { ...@@ -267,6 +267,11 @@ export default {
267 mounted() { 267 mounted() {
268 this.tableMaxheight = window.innerHeight - 220; 268 this.tableMaxheight = window.innerHeight - 220;
269 }, 269 },
270 + watch: {
271 + $route(val, oldval) {
272 + this.popoverClose();
273 + },
274 + },
270 methods: { 275 methods: {
271 //查询详情 276 //查询详情
272 view(val) { 277 view(val) {
...@@ -319,8 +324,7 @@ export default { ...@@ -319,8 +324,7 @@ export default {
319 //重置 324 //重置
320 clear() { 325 clear() {
321 this.sreachFormData = { 326 this.sreachFormData = {
322 - logisticsNo: [], 327 + logisticsNo: "",
323 -
324 returnStatus: "", 328 returnStatus: "",
325 createTime: [], 329 createTime: [],
326 }; 330 };
......
...@@ -171,10 +171,10 @@ export default { ...@@ -171,10 +171,10 @@ export default {
171 data() { 171 data() {
172 return { 172 return {
173 sreachFormData: { 173 sreachFormData: {
174 - billNo: [], 174 + billNo: "",
175 returnStatus: "", 175 returnStatus: "",
176 createTime: [], 176 createTime: [],
177 - logisticsNo: [], 177 + logisticsNo: "",
178 }, 178 },
179 originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串 179 originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串
180 page: { 180 page: {
...@@ -281,6 +281,11 @@ export default { ...@@ -281,6 +281,11 @@ export default {
281 mounted() { 281 mounted() {
282 this.tableMaxheight = window.innerHeight - 220; 282 this.tableMaxheight = window.innerHeight - 220;
283 }, 283 },
284 + watch: {
285 + $route(val, oldval) {
286 + this.popoverClose();
287 + },
288 + },
284 methods: { 289 methods: {
285 //查询详情 290 //查询详情
286 view(val) { 291 view(val) {
...@@ -345,8 +350,8 @@ export default { ...@@ -345,8 +350,8 @@ export default {
345 this.sreachFormData = { 350 this.sreachFormData = {
346 returnStatus: "", 351 returnStatus: "",
347 createTime: [], 352 createTime: [],
348 - billNo: [], 353 + billNo: "",
349 - logisticsNo: [], 354 + logisticsNo: "",
350 }; 355 };
351 this.originalLogisticsNo = ""; 356 this.originalLogisticsNo = "";
352 }, 357 },
......
...@@ -171,8 +171,8 @@ export default { ...@@ -171,8 +171,8 @@ export default {
171 data() { 171 data() {
172 return { 172 return {
173 sreachFormData: { 173 sreachFormData: {
174 - billNo: [], 174 + billNo: "",
175 - logisticsNo: [], 175 + logisticsNo: "",
176 returnStatus: "", 176 returnStatus: "",
177 createTime: [], 177 createTime: [],
178 }, 178 },
...@@ -287,6 +287,11 @@ export default { ...@@ -287,6 +287,11 @@ export default {
287 mounted() { 287 mounted() {
288 this.tableMaxheight = window.innerHeight - 220; 288 this.tableMaxheight = window.innerHeight - 220;
289 }, 289 },
290 + watch: {
291 + $route(val, oldval) {
292 + this.popoverClose();
293 + },
294 + },
290 methods: { 295 methods: {
291 //查询详情 296 //查询详情
292 view(val) { 297 view(val) {
...@@ -351,8 +356,8 @@ export default { ...@@ -351,8 +356,8 @@ export default {
351 //重置 356 //重置
352 clear() { 357 clear() {
353 this.sreachFormData = { 358 this.sreachFormData = {
354 - billNo: [], 359 + billNo: "",
355 - logisticsNo: [], 360 + logisticsNo: "",
356 returnStatus: "", 361 returnStatus: "",
357 createTime: [], 362 createTime: [],
358 }; 363 };
......
...@@ -174,10 +174,10 @@ export default { ...@@ -174,10 +174,10 @@ export default {
174 data() { 174 data() {
175 return { 175 return {
176 sreachFormData: { 176 sreachFormData: {
177 - orderNo: [], 177 + orderNo: "",
178 forwardStatus: "", 178 forwardStatus: "",
179 returnStatus: "", 179 returnStatus: "",
180 - logisticsNo: [], 180 + logisticsNo: "",
181 createTime: [], 181 createTime: [],
182 }, 182 },
183 originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串 183 originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串
...@@ -282,10 +282,10 @@ export default { ...@@ -282,10 +282,10 @@ export default {
282 // 清空 282 // 清空
283 clear() { 283 clear() {
284 this.sreachFormData = { 284 this.sreachFormData = {
285 - orderNo: [], 285 + orderNo: "",
286 forwardStatus: "", 286 forwardStatus: "",
287 returnStatus: "", 287 returnStatus: "",
288 - logisticsNo: [], 288 + logisticsNo: "",
289 createTime: [], 289 createTime: [],
290 }; 290 };
291 this.originalLogisticsNo = ""; 291 this.originalLogisticsNo = "";
......