feat:修改etd和departure的Bug

src/components/AddRules/src/components/DelayedType.vue

@@ -85,7 +85,7 @@ const CheckChange = (val: any) => {
     if (val.includes('Arrival Delayed (ATA-ETA)')) {
       isArrival.value = true
       if(clampedArrivalValue.value != '' && clampedArrivalValue.value!= undefined) {
-        Arrivalstr = 'Departure Delayed' + ' ≥ ' + clampedArrivalValue.value + ' ' + DepartureSelect.value
+        Arrivalstr = 'Arrival Delayed (ATA-ETA)' + ' ≥ ' + clampedArrivalValue.value + ' ' + ArrivalSelect.value
       } else {
         Arrivalstr = ''
       }
@@ -102,7 +102,7 @@ const CheckChange = (val: any) => {
     if (val.includes('Arrival Delayed (ATA-ETA)')) {
       isArrival.value = true
       if(clampedArrivalValue.value != '' && clampedArrivalValue.value!= undefined) {
-        Arrivalstr = 'Departure Delayed' + ' ≥ ' + clampedArrivalValue.value + ' ' + DepartureSelect.value
+        Arrivalstr = 'Arrival Delayed (ATA-ETA)' + ' ≥ ' + clampedArrivalValue.value + ' ' + ArrivalSelect.value
       } else {
         Arrivalstr = ''
       }
@@ -119,7 +119,7 @@ const CheckChange = (val: any) => {
 const changedeparture = (val: any) => {
   if (val == 'Departure') {
     if(clampedValue.value != '' && clampedValue.value!= undefined) {
-      Departurestr = 'Departure Delayed' + ' ≥ ' + clampedValue.value + ' ' + DepartureSelect.value
+      Departurestr = 'Departure Delayed (ATA-ETA)' + ' ≥ ' + clampedValue.value + ' ' + DepartureSelect.value
     } else {
       Departurestr = ''
     }
@@ -128,7 +128,7 @@ const changedeparture = (val: any) => {
     }
     if (val == 'Arrival') {
       if(clampedArrivalValue.value != '' && clampedArrivalValue.value!= undefined) {
-        Arrivalstr = 'Departure Delayed' + ' ≥ ' + clampedArrivalValue.value + ' ' + DepartureSelect.value
+        Arrivalstr = 'Arrival Delayed (ATA-ETA)' + ' ≥ ' + clampedArrivalValue.value + ' ' + ArrivalSelect.value
       } else {
         Arrivalstr = ''
       }
@@ -139,7 +139,7 @@ const changedeparture = (val: any) => {
   } else {
     if (val == 'Arrival') {
       if(clampedArrivalValue.value != '' && clampedArrivalValue.value!= undefined) {
-        Arrivalstr = 'Departure Delayed' + ' ≥ ' + clampedArrivalValue.value + ' ' + DepartureSelect.value
+        Arrivalstr = 'Arrival Delayed (ATA-ETA)' + ' ≥ ' + clampedArrivalValue.value + ' ' + ArrivalSelect.value
       } else {
         Arrivalstr = ''
       }

src/components/AddRules/src/components/ETDShipments.vue

@@ -140,29 +140,39 @@ const changeETARadio = (val: any) => {
 }
 const changedeparture = (val: any) => {
   if (val == 'ETD') {
-    ETDstr = 'ETD: Notify for all changes ≥ ' + clampedValue.value + ' ' + ETDSelect.value
-    if (ETDSelect.value != '' && clampedValue.value!= '') {
+    if(ETDstr.includes('all changes')) {
       ETDETAList.value.ETD = ETDstr
     } else {
-      ETDETAList.value.ETD = ''
+      ETDstr = 'ETD: Notify for all changes ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+      if (ETDSelect.value != '' && clampedValue.value!= '') {
+        ETDETAList.value.ETD = ETDstr
+      } else {
+        ETDETAList.value.ETD = ''
+      }
     }
     if (val == 'ETA') {
-      ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
-      if (ETASelect.value != '' && clampedETAValue.value!= '') {
+      if(ETAstr.includes('all changes')) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETDETAList.value.ETA = ''
+        ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+        if (ETASelect.value != '' && clampedETAValue.value!= '') {
+          ETDETAList.value.ETA = ETAstr
+        } else {
+          ETDETAList.value.ETA = ''
+        }
       }
     }
   } else {
-    if (val == 'ETA') {
-      ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
-      if (ETASelect.value != '' && clampedETAValue.value!= '') {
+    if(ETAstr.includes('all changes')) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETDETAList.value.ETA = ''
+        ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+        if (ETASelect.value != '' && clampedETAValue.value!= '') {
+          ETDETAList.value.ETA = ETAstr
+        } else {
+          ETDETAList.value.ETA = ''
+        }
       }
-    }
   }
   emit('ChangeCheckRules', ETDETAList.value)
 }

src/components/CreateAddRules/src/components/DelayedType.vue

@@ -85,7 +85,7 @@ const CheckChange = (val: any) => {
     if (val.includes('Arrival Delayed (ATA-ETA)')) {
       isArrival.value = true
       if(clampedArrivalValue.value != '' && clampedArrivalValue.value!= undefined) {
-        Arrivalstr = 'Departure Delayed' + ' ≥ ' + clampedArrivalValue.value + ' ' + DepartureSelect.value
+        Arrivalstr = 'Arrival Delayed (ATA-ETA)' + ' ≥ ' + clampedArrivalValue.value + ' ' + ArrivalSelect.value
       } else {
         Arrivalstr = ''
       }
@@ -102,7 +102,7 @@ const CheckChange = (val: any) => {
     if (val.includes('Arrival Delayed (ATA-ETA)')) {
       isArrival.value = true
       if(clampedArrivalValue.value != '' && clampedArrivalValue.value!= undefined) {
-        Arrivalstr = 'Departure Delayed' + ' ≥ ' + clampedArrivalValue.value + ' ' + DepartureSelect.value
+        Arrivalstr = 'Arrival Delayed (ATA-ETA)' + ' ≥ ' + clampedArrivalValue.value + ' ' + ArrivalSelect.value
       } else {
         Arrivalstr = ''
       }
@@ -128,7 +128,7 @@ const changedeparture = (val: any) => {
     }
     if (val == 'Arrival') {
       if(clampedArrivalValue.value != '' && clampedArrivalValue.value!= undefined) {
-        Arrivalstr = 'Departure Delayed' + ' ≥ ' + clampedArrivalValue.value + ' ' + DepartureSelect.value
+        Arrivalstr = 'Arrival Delayed (ATA-ETA)' + ' ≥ ' + clampedArrivalValue.value + ' ' + ArrivalSelect.value
       } else {
         Arrivalstr = ''
       }
@@ -139,7 +139,7 @@ const changedeparture = (val: any) => {
   } else {
     if (val == 'Arrival') {
       if(clampedArrivalValue.value != '' && clampedArrivalValue.value!= undefined) {
-        Arrivalstr = 'Departure Delayed' + ' ≥ ' + clampedArrivalValue.value + ' ' + DepartureSelect.value
+        Arrivalstr = 'Arrival Delayed (ATA-ETA)' + ' ≥ ' + clampedArrivalValue.value + ' ' + ArrivalSelect.value
       } else {
         Arrivalstr = ''
       }

src/components/CreateAddRules/src/components/ETDShipments.vue

@@ -65,25 +65,17 @@ let ETAstr: any = ''
 const CheckChange = (val: any) => {
   if (val.includes('ETD')) {
     isETD.value = true
-    if(ETDstr.includes('all changes')) {
+    if (ETDSelect.value != ''  && clampedValue.value!= '') {
       ETDETAList.value.ETD = ETDstr
     } else {
-      if (ETDSelect.value != ''  && clampedValue.value!= '') {
-        ETDETAList.value.ETD = ETDstr
-      } else {
-        ETDETAList.value.ETD = ''
-      }
+      ETDETAList.value.ETD = ''
     }
     if (val.includes('ETA')) {
       isETA.value = true
-      if(ETAstr.includes('all changes')) {
+      if (ETASelect.value != ''  && clampedETAValue.value!= '') {
         ETDETAList.value.ETA = ETAstr
       } else {
-        if (ETASelect.value != ''  && clampedETAValue.value!= '') {
-          ETDETAList.value.ETA = ETAstr
-        } else {
-          ETDETAList.value.ETA = ''
-        }
+        ETDETAList.value.ETA = ''
       }
     } else {
       isETA.value = false
@@ -94,14 +86,10 @@ const CheckChange = (val: any) => {
     ETDETAList.value.ETD = ''
     if (val.includes('ETA')) {
       isETA.value = true
-      if(ETAstr.includes('all changes')) {
+      if (ETASelect.value != ''  && clampedETAValue.value!= '') {
         ETDETAList.value.ETA = ETAstr
       } else {
-        if (ETASelect.value != ''  && clampedETAValue.value!= '') {
-          ETDETAList.value.ETA = ETAstr
-        } else {
-          ETDETAList.value.ETA = ''
-        }
+        ETDETAList.value.ETA = ''
       }
     } else {
       isETA.value = false
@@ -140,29 +128,39 @@ const changeETARadio = (val: any) => {
 }
 const changedeparture = (val: any) => {
   if (val == 'ETD') {
-    ETDstr = 'ETD: Notify for all changes ≥ ' + clampedValue.value + ' ' + ETDSelect.value
-    if (ETDSelect.value != '' && clampedValue.value!= '') {
+    if(ETDstr.includes('all changes')) {
       ETDETAList.value.ETD = ETDstr
     } else {
-      ETDETAList.value.ETD = ''
+      ETDstr = 'ETD: Notify for all changes ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+      if (ETDSelect.value != '' && clampedValue.value!= '') {
+        ETDETAList.value.ETD = ETDstr
+      } else {
+        ETDETAList.value.ETD = ''
+      }
     }
     if (val == 'ETA') {
-      ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
-      if (ETASelect.value != '' && clampedETAValue.value!= '') {
+      if(ETAstr.includes('all changes')) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETDETAList.value.ETA = ''
+        ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+        if (ETASelect.value != '' && clampedETAValue.value!= '') {
+          ETDETAList.value.ETA = ETAstr
+        } else {
+          ETDETAList.value.ETA = ''
+        }
       }
     }
   } else {
-    if (val == 'ETA') {
-      ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
-      if (ETASelect.value != '' && clampedETAValue.value!= '') {
+    if(ETAstr.includes('all changes')) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETDETAList.value.ETA = ''
+        ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+        if (ETASelect.value != '' && clampedETAValue.value!= '') {
+          ETDETAList.value.ETA = ETAstr
+        } else {
+          ETDETAList.value.ETA = ''
+        }
       }
-    }
   }
   emit('ChangeCheckRules', ETDETAList.value)
 }