Merge branch 'dev' into dev_zyh

src/components/AddRules/src/AddRules.vue

@@ -38,10 +38,10 @@ const IsThreeActive = ref(true)
 const CancelRulesVisible = ref(false)
 const UnableSaveVisible = ref(false)
 const SaveedVisible = ref(false)
-const DelayedDeparturedList = ref()
-const DelayedAirdList = ref()
-const ETDOceanList = ref()
-const ETDAirList = ref()
+const DelayedDeparturedList = ref([])
+const DelayedAirdList = ref([])
+const ETDOceanList = ref([])
+const ETDAirList = ref([])
 const FrequencyDataMil = ref()
 const FrequencyDataCon = ref()
 const FrequencyDataDep = ref()
@@ -392,7 +392,7 @@ const Savesubscribe = () => {
       MilMethodsList.value.length == 0
     ) {
       if (OceanCheckList.value.length == 0 && AirCheckList.value.length == 0) {
-        missingmessage.value += 'Select Milstones, '
+        missingmessage.value += 'Select Milestone, '
       }
       if (MilFrequencyList.value.length == 0) {
         missingmessage.value += 'Notification Frequency, '
@@ -452,15 +452,13 @@ const Savesubscribe = () => {
   } else if (props.TitleType == 'Departure') {
     savesubscribeobj.rules_type = 'Departure/Arrival_Delay'
     if (
-      DelayedDeparturedList.value == undefined  &&
-      DelayedAirdList.value == undefined || 
       DelayedDeparturedList.value.length == 0 &&
       DelayedAirdList.value.length == 0 ||
       DepFrequencyList.value.length == 0 ||
       DepMethodsList.value == undefined ||
       DepMethodsList.value.length == 0
     ) {
-      if (DelayedDeparturedList.value.length == 0 && DelayedAirdList.value.length == 0 || DelayedDeparturedList.value == undefined && DelayedAirdList.value == undefined) {
+      if (DelayedDeparturedList.value.length == 0 && DelayedAirdList.value.length == 0) {
         missingmessage.value += 'Select Delayed Type, '
       }
       if (DepFrequencyList.value.length == 0) {
@@ -494,15 +492,13 @@ const Savesubscribe = () => {
   } else {
     savesubscribeobj.rules_type = 'ETD/ETA_Change'
     if (
-      ETDOceanList.value == undefined ||
-      ETDAirList.value == undefined &&
-      ETDOceanList.value.length == 0 ||
-      ETDAirList.value.length == 0 &&
+      ETDOceanList.value.length == 0 &&
+      ETDAirList.value.length == 0 ||
       ETDFrequencyList.value.length == 0 ||
       ETDMethodsList.value == undefined ||
       ETDMethodsList.value.length == 0
     ) {
-      if (ETDOceanList.value == undefined && ETDAirList.value == undefined || ETDOceanList.value.length == 0 && ETDAirList.value.length) {
+      if (ETDOceanList.value.length == 0 && ETDAirList.value.length) {
         missingmessage.value += 'Select Time Type, '
       }
       if (ETDFrequencyList.value.length == 0) {

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

@@ -73,8 +73,6 @@ const clampedArrivalValue = computed({
 const CheckChange = (val: any) => {
   if (val.includes('Departure Delayed')) {
     isDeparture.value = true
-    clampedArrivalValue.value = ''
-    ArrivalSelect.value = ''
     if(clampedValue.value != '' && clampedValue.value!= undefined) {
       Departurestr = 'Departure Delayed (ATD-ETD)' + ' ≥ ' + clampedValue.value + ' ' + DepartureSelect.value
     } else {
@@ -368,4 +366,7 @@ defineExpose({
   display: flex;
   align-items: center;
 }
+.titlecheckbox {
+  max-width: 198px;
+}
 </style>

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

@@ -43,7 +43,6 @@ const ETDInit = () => {
   CheckChange(OceanCheckedList.value)
   changeETDRadio(ETDRadio.value)
   changeETARadio(ETARadio.value)
-  changedeparture(OceanCheckedList.value)
 }
 const isETD = ref(false)
 const isETA = ref(false)
@@ -69,9 +68,6 @@ const CheckChange = (val: any) => {
   }
   if (val.includes('ETD')) {
     isETD.value = true
-    clampedETAValue.value = ''
-    ETARadio.value = ''
-    ETASelect.value = ''
     if(ETDstr.includes('all changes')) {
       ETDETAList.value.ETD = ETDstr
     } else {
@@ -98,6 +94,7 @@ const CheckChange = (val: any) => {
       clampedETAValue.value = ''
       ETARadio.value = ''
       ETASelect.value = ''
+      ETAstr = ''
     }
   } else {
     isETD.value = false
@@ -105,6 +102,7 @@ const CheckChange = (val: any) => {
     clampedValue.value = ''
     ETDRadio.value = ''
     ETDSelect.value = ''
+    ETDstr = ''
     if (val.includes('ETA')) {
       isETA.value = true
       if(ETAstr.includes('all changes')) {
@@ -122,6 +120,7 @@ const CheckChange = (val: any) => {
       clampedETAValue.value = ''
       ETARadio.value = ''
       ETASelect.value = ''
+      ETAstr = ''
     }
   }
   emit('ChangeCheckRules', ETDETAList.value)
@@ -168,41 +167,61 @@ const changedeparture = (val: any) => {
     ETASelect.value = 'Day(s)'
   }
   if (val == 'ETD') {
-    if(ETDstr.includes('all changes')) {
+    // if(ETDstr.includes('all changes')) {
+    //   ETDETAList.value.ETD = ETDstr
+    // } else {
+    //   ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+    //   if (ETDSelect.value != '' && clampedValue.value!= '' && clampedValue.value!= undefined) {
+    //     ETDRadio.value = '2'
+    //     ETDETAList.value.ETD = ETDstr
+    //   } else {
+    //     ETDETAList.value.ETD = ''
+    //   }
+    ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+    ETDRadio.value = '2'
+    if (ETDSelect.value != '' && clampedValue.value!= '' && clampedValue.value!= undefined) {
       ETDETAList.value.ETD = ETDstr
     } else {
-      ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
-      if (ETDSelect.value != '' && clampedValue.value!= '' && clampedValue.value!= undefined) {
-        ETDRadio.value = '2'
-        ETDETAList.value.ETD = ETDstr
-      } else {
-        ETDETAList.value.ETD = ''
-      }
+      ETDETAList.value.ETD = ''
     }
     if (val == 'ETA') {
-      if(ETAstr.includes('all changes')) {
+      // if(ETAstr.includes('all changes')) {
+      //   ETDETAList.value.ETA = ETAstr
+      // } else {
+      //   ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+      //   if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
+      //     ETARadio.value = '2'
+      //     ETDETAList.value.ETA = ETAstr
+      //   } else {
+      //     ETDETAList.value.ETA = ''
+      //   }
+      // }
+      ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+      ETARadio.value = '2'
+      if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
-        if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
-          ETARadio.value = '2'
-          ETDETAList.value.ETA = ETAstr
-        } else {
-          ETDETAList.value.ETA = ''
-        }
+        ETDETAList.value.ETA = ''
       }
     }
   } else {
-    if(ETAstr.includes('all changes')) {
+    // if(ETAstr.includes('all changes')) {
+    //   ETDETAList.value.ETA = ETAstr
+    // } else {
+    //   ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+    //   if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
+    //     ETARadio.value = '2'
+    //     ETDETAList.value.ETA = ETAstr
+    //   } else {
+    //     ETDETAList.value.ETA = ''
+    //   }
+    // }
+    ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+    ETARadio.value = '2'
+    if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
       ETDETAList.value.ETA = ETAstr
     } else {
-      ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
-      if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
-        ETARadio.value = '2'
-        ETDETAList.value.ETA = ETAstr
-      } else {
-        ETDETAList.value.ETA = ''
-      }
+      ETDETAList.value.ETA = ''
     }
   }
   emit('ChangeCheckRules', ETDETAList.value)
@@ -478,4 +497,7 @@ const clampedETAValue = computed({
   display: flex;
   align-items: center;
 }
+.titlecheckbox {
+  max-width: 28px;
+}
 </style>

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -47,10 +47,10 @@ const UnableSaveVisible = ref(false)
 const SaveVisibleError = ref(false)
 const SaveVisibleDetected = ref(false)
 const SaveedVisible = ref(false)
-const DelayedDeparturedList = ref()
-const DelayedAirdList = ref()
-const ETDOceanList = ref()
-const ETDAirList = ref()
+const DelayedDeparturedList = ref([])
+const DelayedAirdList = ref([])
+const ETDOceanList = ref([])
+const ETDAirList = ref([])
 const FrequencyDataMil = ref()
 const FrequencyDataCon = ref()
 const FrequencyDataDep = ref()
@@ -74,6 +74,11 @@ const createListMilestone = ref([])
 const createListContainer = ref([])
 const createListDeparture = ref([])
 const createListETDChange = ref([])
+
+let createObj: any = {
+  Transportstr: '',
+  Timestr: ''
+}
 const getInitMonitoring = () => {
   $api
     .MonitoringInit({})
@@ -155,6 +160,7 @@ const Initdata = () => {
             ShipmentRangeCon.value = res.data.Container_Status_Update
             createObj.Transportstr = res.data.Container_Status_Update.shipment_details.split(';\r\n')[0]
             createObj.Timestr = res.data.Container_Status_Update.shipment_details.split(';\r\n')[1]
+            console.log(res.data.Container_Status_Update.shipment_details.split(';\r\n')[1])
             createListContainer.value.push(createObj.Transportstr)
             createListContainer.value.push(createObj.Timestr)
           } else if (editTablerules_type == 'Departure/Arrival_Delay') {
@@ -263,12 +269,6 @@ const ChangeCheckAirRules = (val: any, value: any) => {
   AirCheckList.value = val
   AirCheckListCode.value = value
 }
-
-
-let createObj: any = {
-  Transportstr: '',
-  Timestr: ''
-}
 const changecheckCreateRulesMilestone = (val: any, value: any) => {
   createListMilestone.value = []
   createObj.Transportstr = val
@@ -636,7 +636,7 @@ const Savesubscribe = () => {
         missingmessage.value += 'Time, '
       }
       if (OceanCheckList.value.length == 0 && AirCheckList.value.length == 0 ) {
-        missingmessage.value += 'Select Milstones, '
+        missingmessage.value += 'Select Milestone, '
       }
       if (MilFrequencyList.value.length == 0) {
         missingmessage.value += 'Notification Frequency, '
@@ -702,9 +702,7 @@ const Savesubscribe = () => {
     }
   } else if (props.TitleType == 'Departure') {
     savesubscribeobj.rules_type = 'Departure/Arrival_Delay'
-    if (
-      DelayedDeparturedList.value == undefined  &&
-      DelayedAirdList.value == undefined || 
+    if ( 
       DelayedDeparturedList.value.length == 0 &&
       DelayedAirdList.value.length == 0 ||
       DepFrequencyList.value.length == 0 ||
@@ -719,7 +717,7 @@ const Savesubscribe = () => {
       if (createObj.Timestr == '') {
         missingmessage.value += 'Time, '
       }
-      if (DelayedDeparturedList.value.length == 0 && DelayedAirdList.value.length == 0 || DelayedDeparturedList.value == undefined && DelayedAirdList.value == undefined) {
+      if (DelayedDeparturedList.value.length == 0 && DelayedAirdList.value.length == 0) {
         missingmessage.value += 'Select Delayed Shipments, '
       }
       if (DepFrequencyList.value.length == 0) {
@@ -753,11 +751,10 @@ const Savesubscribe = () => {
   } else {
     savesubscribeobj.rules_type = 'ETD/ETA_Change'
     if (
-      ETDOceanList.value == undefined ||
-      ETDAirList.value == undefined &&
-      ETDOceanList.value.length == 0 ||
-      ETDAirList.value.length == 0 &&
+      ETDOceanList.value.length == 0 &&
+      ETDAirList.value.length == 0 ||
       ETDFrequencyList.value.length == 0 ||
+      ETDMethodsList.value == undefined ||
       ETDMethodsList.value.length == 0 ||
       createObj.Transportstr == '' ||
       createObj.Timestr == ''
@@ -768,7 +765,7 @@ const Savesubscribe = () => {
       if (createObj.Timestr == '') {
         missingmessage.value += 'Time, '
       }
-      if (ETDOceanList.value == undefined && ETDAirList.value == undefined || ETDOceanList.value.length == 0 && ETDAirList.value.length) {
+      if (ETDOceanList.value.length == 0 && ETDAirList.value.length) {
         missingmessage.value += 'Select Time Type, '
       }
       if (ETDFrequencyList.value.length == 0) {

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

@@ -74,8 +74,6 @@ const clampedArrivalValue = computed({
 const CheckChange = (val: any) => {
   if (val.includes('Departure Delayed')) {
     isDeparture.value = true
-    clampedArrivalValue.value = ''
-    ArrivalSelect.value = ''
     if(clampedValue.value != '' && clampedValue.value!= undefined) {
       Departurestr = 'Departure Delayed (ATD-ETD)' + ' ≥ ' + clampedValue.value + ' ' + DepartureSelect.value
     } else {
@@ -372,4 +370,7 @@ defineExpose({
   display: flex;
   align-items: center;
 }
+.titlecheckbox {
+  max-width: 198px;
+}
 </style>

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

@@ -43,7 +43,6 @@ const ETDInit = () => {
   CheckChange(OceanCheckedList.value)
   changeETDRadio(ETDRadio.value)
   changeETARadio(ETARadio.value)
-  changedeparture(OceanCheckedList.value)
 }
 const isETD = ref(false)
 const isETA = ref(false)
@@ -69,9 +68,6 @@ const CheckChange = (val: any) => {
   }
   if (val.includes('ETD')) {
     isETD.value = true
-    clampedETAValue.value = ''
-    ETARadio.value = ''
-    ETASelect.value = ''
     if (ETDSelect.value != ''  && clampedValue.value!= '' && clampedValue.value!= undefined) {
       ETDETAList.value.ETD = ETDstr
     } else {
@@ -90,6 +86,7 @@ const CheckChange = (val: any) => {
       clampedETAValue.value = ''
       ETARadio.value = ''
       ETASelect.value = ''
+      ETAstr = ''
     }
   } else {
     isETD.value = false
@@ -97,6 +94,7 @@ const CheckChange = (val: any) => {
     clampedValue.value = ''
     ETDRadio.value = ''
     ETDSelect.value = ''
+    ETDstr = ''
     if (val.includes('ETA')) {
       isETA.value = true
       if (ETASelect.value != ''  && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
@@ -110,6 +108,7 @@ const CheckChange = (val: any) => {
       clampedETAValue.value = ''
       ETARadio.value = ''
       ETASelect.value = ''
+      ETAstr = ''
     }
   }
   emit('ChangeCheckRules', ETDETAList.value)
@@ -154,41 +153,61 @@ const changedeparture = (val: any) => {
     ETASelect.value = 'Day(s)'
   }
   if (val == 'ETD') {
-    if(ETDstr.includes('all changes')) {
+    // if(ETDstr.includes('all changes')) {
+    //   ETDETAList.value.ETD = ETDstr
+    // } else {
+    //   ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+    //   if (ETDSelect.value != '' && clampedValue.value!= '' && clampedValue.value!= undefined) {
+    //     ETDRadio.value = '2'
+    //     ETDETAList.value.ETD = ETDstr
+    //   } else {
+    //     ETDETAList.value.ETD = ''
+    //   }
+    ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+    ETDRadio.value = '2'
+    if (ETDSelect.value != '' && clampedValue.value!= '' && clampedValue.value!= undefined) {
       ETDETAList.value.ETD = ETDstr
     } else {
-      ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
-      if (ETDSelect.value != '' && clampedValue.value!= '' && clampedValue.value!= undefined) {
-        ETDRadio.value = '2'
-        ETDETAList.value.ETD = ETDstr
-      } else {
-        ETDETAList.value.ETD = ''
-      }
+      ETDETAList.value.ETD = ''
     }
     if (val == 'ETA') {
-      if(ETAstr.includes('all changes')) {
+      // if(ETAstr.includes('all changes')) {
+      //   ETDETAList.value.ETA = ETAstr
+      // } else {
+      //   ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+      //   if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
+      //     ETARadio.value = '2'
+      //     ETDETAList.value.ETA = ETAstr
+      //   } else {
+      //     ETDETAList.value.ETA = ''
+      //   }
+      // }
+      ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+      ETARadio.value = '2'
+      if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
-        if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
-          ETARadio.value = '2'
-          ETDETAList.value.ETA = ETAstr
-        } else {
-          ETDETAList.value.ETA = ''
-        }
+        ETDETAList.value.ETA = ''
       }
     }
   } else {
-    if(ETAstr.includes('all changes')) {
+    // if(ETAstr.includes('all changes')) {
+    //   ETDETAList.value.ETA = ETAstr
+    // } else {
+    //   ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+    //   if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
+    //     ETARadio.value = '2'
+    //     ETDETAList.value.ETA = ETAstr
+    //   } else {
+    //     ETDETAList.value.ETA = ''
+    //   }
+    // }
+    ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+    ETARadio.value = '2'
+    if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
       ETDETAList.value.ETA = ETAstr
     } else {
-      ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
-      if (ETASelect.value != '' && clampedETAValue.value!= '' && clampedETAValue.value!= undefined) {
-        ETARadio.value = '2'
-        ETDETAList.value.ETA = ETAstr
-      } else {
-        ETDETAList.value.ETA = ''
-      }
+      ETDETAList.value.ETA = ''
     }
   }
   emit('ChangeCheckRules', ETDETAList.value)
@@ -464,4 +483,7 @@ const clampedETAValue = computed({
   display: flex;
   align-items: center;
 }
+.titlecheckbox {
+  max-width: 28px;
+}
 </style>

src/components/CreateAddRules/src/components/ShipmentRange.vue

@@ -40,6 +40,7 @@ watch(
 )
 
 const ShipmentRangeInit = () => {
+  console.log(ShipmentRange_data.value)
   if (ShipmentRange_data.value?.shipment_transport_mode != undefined) {
     TransportCheckedList.value = ShipmentRange_data.value?.shipment_transport_mode.split(';')
     CheckChange(ShipmentRange_data.value?.shipment_transport_mode)
@@ -158,7 +159,7 @@ const changeTime = (val: any) => {
       if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 0) {
         Timestr = ''
       } else {
-        Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
+        Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
       }
     } else{
       Timestr = ''
@@ -183,10 +184,10 @@ const changeTime = (val: any) => {
       } else {
         defaultradio2.value = 'Customize'
       }
-      if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 0) {
+      if(clampedETAValueStart.value == 0 && clampedETAValueEnd.value == 0) {
         Timestr = ''
       } else {
-        Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
+        Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
       }
     } else{
       Timestr = ''
@@ -218,7 +219,7 @@ const changedefaultradio = (val:any) => {
   if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 0) {
     Timestr = ''
   } else {
-    Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
+    Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
   }
   emit('ChangeCheckTimeRules', Timestr, clampedETDValueStart.value,clampedETDValueEnd.value)
 }
@@ -243,7 +244,7 @@ const changedefaultradioETA = (val:any) => {
   if(clampedETAValueStart.value == 0 && clampedETAValueEnd.value == 0) {
     Timestr = ''
   } else {
-    Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus'+ clampedETAValueEnd.value + ' Day(s)'
+    Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus '+ clampedETAValueEnd.value + ' Day(s)'
   }
   emit('ChangeCheckTimeRules', Timestr, clampedETAValueStart.value,clampedETAValueEnd.value)
 }

src/stores/modules/breadCrumb.ts

@@ -27,8 +27,6 @@ export const useBreadCrumb = defineStore('breadCrumb', {
   actions: {
     setRouteList(toRoute: any) {
       const index = this.routeList.findIndex((item) => item.label === toRoute.name)
-      console.log(this.routeList)
-      console.log(toRoute.name)
       if (index !== -1) {
         this.routeList.splice(index + 1)
       } else if (toRoute.name === 'Public Tracking Detail') {

src/views/SystemSettings/src/SystemSettings.vue

@@ -148,6 +148,17 @@ const getsubscribe = () => {
   })
 }
 
+const handleTabClick = (tab: any) => {
+  if(tab.paneName == 'Subscribe Notifications') {
+    isMilestoneChecked.value = false
+    isContainerChecked.value = false
+    isDepartureChecked.value = false
+    isETDChangeChecked.value = false
+    getsubscribe()
+    CollapseActive.value = ''
+  }
+}
+
 // 保存成功后更改表单数据
 const SavedAddedRules = (val: any, type: any) => {
   AddRulesTable.value.getTableData(val)
@@ -212,7 +223,7 @@ onMounted(() => {
 </script>
 <template>
   <div class="Title">System Settings</div>
-  <el-tabs v-model="TabActive" class="demo-tabs">
+  <el-tabs v-model="TabActive" class="demo-tabs" @tab-click="handleTabClick">
     <el-tab-pane label="Personal Profile" name="Personal Profile"><PersonalProfile /></el-tab-pane>
     <el-tab-pane label="Subscribe Notifications" name="Subscribe Notifications">
       <div class="subscribedTitle">Notification Events for Subscribed Shipments</div>

src/views/SystemSettings/src/components/SettingTable/src/SettingTable.vue

@@ -160,7 +160,7 @@ const getpaginationTableData = () => {
         </span>
       </template>
       <template #action="{ row }">
-        <el-popover :visible="row.visible" placement="left" :width="480">
+        <el-popover trigger="click" :visible="row.visible" placement="left" :width="480">
           <div class="delete_title">
             <span class="font_family icon_alert icon-icon_tipsfilled_b"></span>
             Delete Rule