Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
4c22f91a 1 parent 5148feda

逻辑修正，参数修正

Inline Side-by-side
Showing 3 changed files with 48 additions and 11 deletions
...@@ -355,6 +355,9 @@ export default { ...@@ -355,6 +355,9 @@ export default {
355 arr.push(this.formatDate(new Date().getTime()).split(" ")[0]); 355 arr.push(this.formatDate(new Date().getTime()).split(" ")[0]);
356 this.sreachFormData.createTime = arr; 356 this.sreachFormData.createTime = arr;
357 this.search(0); 357 this.search(0);
358 + if (this.status == 0) {
359 + this.status = 1;
360 + }
358 }, 361 },
359 activated() { 362 activated() {
360 if (this.status == 0) { 363 if (this.status == 0) {
......
...@@ -290,6 +290,10 @@ ...@@ -290,6 +290,10 @@
290 class="item" 290 class="item"
291 effect="dark" 291 effect="dark"
292 :content="headData.shipperContactName" 292 :content="headData.shipperContactName"
293 + :disabled="
294 + headData.shipperContactName == '' ||
295 + headData.shipperContactName == null
296 + "
293 placement="top" 297 placement="top"
294 > 298 >
295 <el-input 299 <el-input
...@@ -310,6 +314,10 @@ ...@@ -310,6 +314,10 @@
310 class="item" 314 class="item"
311 effect="dark" 315 effect="dark"
312 :content="headData.shipperCompany" 316 :content="headData.shipperCompany"
317 + :disabled="
318 + headData.shipperCompany == '' ||
319 + headData.shipperCompany == null
320 + "
313 placement="top" 321 placement="top"
314 > 322 >
315 <el-input 323 <el-input
...@@ -330,6 +338,10 @@ ...@@ -330,6 +338,10 @@
330 class="item" 338 class="item"
331 effect="dark" 339 effect="dark"
332 :content="headData.shipperAddrLine" 340 :content="headData.shipperAddrLine"
341 + :disabled="
342 + headData.shipperAddrLine == '' ||
343 + headData.shipperAddrLine == null
344 + "
333 placement="top" 345 placement="top"
334 > 346 >
335 <el-input 347 <el-input
...@@ -369,6 +381,9 @@ ...@@ -369,6 +381,9 @@
369 class="item" 381 class="item"
370 effect="dark" 382 effect="dark"
371 :content="headData.shipperCity" 383 :content="headData.shipperCity"
384 + :disabled="
385 + headData.shipperCity == '' || headData.shipperCity == null
386 + "
372 placement="top" 387 placement="top"
373 > 388 >
374 <el-input 389 <el-input
...@@ -427,6 +442,10 @@ ...@@ -427,6 +442,10 @@
427 class="item" 442 class="item"
428 effect="dark" 443 effect="dark"
429 :content="headData.recipientContactName" 444 :content="headData.recipientContactName"
445 + :disabled="
446 + headData.recipientContactName == '' ||
447 + headData.recipientContactName == null
448 + "
430 placement="top" 449 placement="top"
431 > 450 >
432 <el-input 451 <el-input
...@@ -447,6 +466,10 @@ ...@@ -447,6 +466,10 @@
447 class="item" 466 class="item"
448 effect="dark" 467 effect="dark"
449 :content="headData.recipientCompany" 468 :content="headData.recipientCompany"
469 + :disabled="
470 + headData.recipientCompany == '' ||
471 + headData.recipientCompany == null
472 + "
450 placement="top" 473 placement="top"
451 > 474 >
452 <el-input 475 <el-input
...@@ -480,6 +503,10 @@ ...@@ -480,6 +503,10 @@
480 class="item" 503 class="item"
481 effect="dark" 504 effect="dark"
482 :content="headData.recipientAddrLine" 505 :content="headData.recipientAddrLine"
506 + :disabled="
507 + headData.recipientAddrLine == '' ||
508 + headData.recipientAddrLine == null
509 + "
483 placement="top" 510 placement="top"
484 > 511 >
485 <el-input 512 <el-input
...@@ -519,6 +546,10 @@ ...@@ -519,6 +546,10 @@
519 class="item" 546 class="item"
520 effect="dark" 547 effect="dark"
521 :content="headData.recipientCity" 548 :content="headData.recipientCity"
549 + :disabled="
550 + headData.recipientCity == '' ||
551 + headData.recipientCity == null
552 + "
522 placement="top" 553 placement="top"
523 > 554 >
524 <el-input 555 <el-input
...@@ -890,35 +921,38 @@ export default { ...@@ -890,35 +921,38 @@ export default {
890 this.dataBoxTtype = !this.dataBoxTtype; 921 this.dataBoxTtype = !this.dataBoxTtype;
891 }, 922 },
892 //通过用户标志判断是否出现提示 923 //通过用户标志判断是否出现提示
893 - tipOpen(id, blurType, status) { 924 + tipOpen(data, blurType, status) {
894 let flag = 1; 925 let flag = 1;
895 if (status == 1) { 926 if (status == 1) {
896 - console.log(this.$store.getters.userData);
897 flag = this.$store.getters.userData.addflag1; 927 flag = this.$store.getters.userData.addflag1;
898 } else if (status == 2) { 928 } else if (status == 2) {
899 flag = this.$store.getters.userData.addflag2; 929 flag = this.$store.getters.userData.addflag2;
900 } 930 }
901 931
902 - if (flag == 1) { 932 + if (flag == 1 && this.tipcontent != "" && this.tipcontent != null) {
903 this.tipVisible = true; 933 this.tipVisible = true;
904 this.$refs.tipDialog.$on("cancel", (res) => { 934 this.$refs.tipDialog.$on("cancel", (res) => {
905 this.tipVisible = false; 935 this.tipVisible = false;
906 if (res) { 936 if (res) {
907 - this.tipCancel(id, blurType); 937 + this.tipCancel(data, blurType);
908 } else { 938 } else {
909 this.oldData.consignmentCode = this.headData.consignmentCode; 939 this.oldData.consignmentCode = this.headData.consignmentCode;
910 this.oldData.userInputShipperAccount = 940 this.oldData.userInputShipperAccount =
911 this.headData.userInputShipperAccount; 941 this.headData.userInputShipperAccount;
912 } 942 }
913 }); 943 });
914 - } else if (flag == 2) { 944 + } else if (
915 - this.tipCancel(id, blurType); 945 + flag == 2 ||
946 + this.tipcontent == "" ||
947 + this.tipcontent == null
948 + ) {
949 + this.tipCancel(data, blurType);
916 } 950 }
917 }, 951 },
918 //提示语操作状态 952 //提示语操作状态
919 tipCancel(id, blurType) { 953 tipCancel(id, blurType) {
920 if (id != null && id != "") { 954 if (id != null && id != "") {
921 - this.$emit("sreachEntry", id); 955 + this.$emit("searchWaybillData", id);
922 } else { 956 } else {
923 this.formItemDisableType([true, false, false], id, blurType); 957 this.formItemDisableType([true, false, false], id, blurType);
924 } 958 }
......
...@@ -55,10 +55,10 @@ export default { ...@@ -55,10 +55,10 @@ export default {
55 watch: { 55 watch: {
56 dialogVisible(val) { 56 dialogVisible(val) {
57 if (val) { 57 if (val) {
58 - if (typeStatus == 1) { 58 + if (this.typeStatus == 1) {
59 this.checked = 59 this.checked =
60 this.$store.getters.userData.addflag1 == 1 ? false : true; 60 this.$store.getters.userData.addflag1 == 1 ? false : true;
61 - } else if (typeStatus == 2) { 61 + } else if (this.typeStatus == 2) {
62 this.checked = 62 this.checked =
63 this.$store.getters.userData.addflag2 == 1 ? false : true; 63 this.$store.getters.userData.addflag2 == 1 ? false : true;
64 } 64 }
...@@ -71,9 +71,9 @@ export default { ...@@ -71,9 +71,9 @@ export default {
71 addFlag1: this.$store.getters.userData.addflag1, 71 addFlag1: this.$store.getters.userData.addflag1,
72 addFlag2: this.$store.getters.userData.addflag1, 72 addFlag2: this.$store.getters.userData.addflag1,
73 }; 73 };
74 - if (typeStatus == 1) { 74 + if (this.typeStatus == 1) {
75 obj.addFlag1 = val ? 2 : 1; 75 obj.addFlag1 = val ? 2 : 1;
76 - } else if (typeStatus == 2) { 76 + } else if (this.typeStatus == 2) {
77 obj.addFlag2 = val ? 2 : 1; 77 obj.addFlag2 = val ? 2 : 1;
78 } 78 }
79 uploadUserTipFlag(obj) 79 uploadUserTipFlag(obj)
......