feat:修改Time的bug

src/components/AddRules/src/AddRules.vue

@@ -284,8 +284,8 @@ const ChangeETDOceanRules = (val: any) => {
   if (val.ETD != '') {
     if (val.ETD.indexOf('≥') != -1) {
       savesubscribeobj.ocean_etd_change = false
-      savesubscribeobj.ocean_etd_old_sub_new = val.ETD.split(' ')[6]
-      savesubscribeobj.ocean_etd_old_sub_new_unit = val.ETD.split(' ')[7]
+      savesubscribeobj.ocean_etd_old_sub_new = val.ETD.split(' ')[7]
+      savesubscribeobj.ocean_etd_old_sub_new_unit = val.ETD.split(' ')[8]
     } else {
       savesubscribeobj.ocean_etd_change = true
     }
@@ -298,8 +298,8 @@ const ChangeETDOceanRules = (val: any) => {
   if (val.ETA != '') {
     if (val.ETA.indexOf('≥') != -1) {
       savesubscribeobj.ocean_eta_change = false
-      savesubscribeobj.ocean_eta_old_sub_new = val.ETA.split(' ')[6]
-      savesubscribeobj.ocean_eta_old_sub_new_unit = val.ETA.split(' ')[7]
+      savesubscribeobj.ocean_eta_old_sub_new = val.ETA.split(' ')[7]
+      savesubscribeobj.ocean_eta_old_sub_new_unit = val.ETA.split(' ')[8]
     } else {
       savesubscribeobj.ocean_eta_change = true
     }

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -69,6 +69,11 @@ const ShipmentRangeDep = ref()
 const ShipmentRangeETD = ref()
 
 const MonitoringList = ref()
+//选择create new rules
+const createListMilestone = ref([])
+const createListContainer = ref([])
+const createListDeparture = ref([])
+const createListETDChange = ref([])
 const getInitMonitoring = () => {
   $api
     .MonitoringInit({})
@@ -128,7 +133,10 @@ const Initdata = () => {
                 AirCheckList.value.push(option.label)
               }
             })
-            createListMilestone.value = res.data.Milestone_Update.shipment_details
+            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]
+            createListMilestone.value.push(createObj.Transportstr)
+            createListMilestone.value.push(createObj.Timestr)
           } else if (editTablerules_type == 'Container_Status_Update') {
             ContainerOceanCode.value = []
             ContainerOceanListInit.value = res.data.Container_Status_Update.CtnrCheckBoxList
@@ -145,6 +153,10 @@ const Initdata = () => {
             FrequencyDataCon.value = res.data.Container_Status_Update
             MethodsDataCon.value = res.data.Container_Status_Update
             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]
+            createListContainer.value.push(createObj.Transportstr)
+            createListContainer.value.push(createObj.Timestr)
           } else if (editTablerules_type == 'Departure/Arrival_Delay') {
             let OceanObj: any = {}
             OceanObj.atd_etd = res.data['Departure/Arrival_Delay'].ocean_atd_sub_etd
@@ -161,6 +173,10 @@ const Initdata = () => {
             FrequencyDataDep.value = res.data['Departure/Arrival_Delay']
             MethodsDataDep.value = res.data['Departure/Arrival_Delay']
             ShipmentRangeDep.value = res.data['Departure/Arrival_Delay']
+            createObj.Transportstr = res.data['Departure/Arrival_Delay'].shipment_details.split(';\r\n')[0]
+            createObj.Timestr = res.data['Departure/Arrival_Delay'].shipment_details.split(';\r\n')[1]
+            createListDeparture.value.push(createObj.Transportstr)
+            createListDeparture.value.push(createObj.Timestr)
           } else if (editTablerules_type == 'ETD/ETA_Change') {
             let OceanChange: any = {}
             OceanChange.ETDradio = res.data['ETD/ETA_Change'].ocean_etd_change
@@ -181,6 +197,10 @@ const Initdata = () => {
             FrequencyDataETD.value = res.data['ETD/ETA_Change']
             MethodsDataETD.value = res.data['ETD/ETA_Change']
             ShipmentRangeETD.value = res.data['ETD/ETA_Change']
+            createObj.Transportstr = res.data['ETD/ETA_Change'].shipment_details.split(';\r\n')[0]
+            createObj.Timestr = res.data['ETD/ETA_Change'].shipment_details.split(';\r\n')[1]
+            createListETDChange.value.push(createObj.Transportstr)
+            createListETDChange.value.push(createObj.Timestr)
           }
         }
       })
@@ -244,11 +264,6 @@ const ChangeCheckAirRules = (val: any, value: any) => {
   AirCheckListCode.value = value
 }
 
-//选择create new rules
-const createListMilestone = ref()
-const createListContainer = ref()
-const createListDeparture = ref()
-const createListETDChange = ref()
 
 let createObj: any = {
   Transportstr: '',
@@ -479,8 +494,8 @@ const ChangeETDOceanRules = (val: any) => {
   if (val.ETD != '') {
     if (val.ETD.indexOf('≥') != -1) {
       savesubscribeobj.ocean_etd_change = false
-      savesubscribeobj.ocean_etd_old_sub_new = val.ETD.split(' ')[6]
-      savesubscribeobj.ocean_etd_old_sub_new_unit = val.ETD.split(' ')[7]
+      savesubscribeobj.ocean_etd_old_sub_new = val.ETD.split(' ')[7]
+      savesubscribeobj.ocean_etd_old_sub_new_unit = val.ETD.split(' ')[8]
     } else {
       savesubscribeobj.ocean_etd_change = true
     }
@@ -493,8 +508,8 @@ const ChangeETDOceanRules = (val: any) => {
   if (val.ETA != '') {
     if (val.ETA.indexOf('≥') != -1) {
       savesubscribeobj.ocean_eta_change = false
-      savesubscribeobj.ocean_eta_old_sub_new = val.ETA.split(' ')[6]
-      savesubscribeobj.ocean_eta_old_sub_new_unit = val.ETA.split(' ')[7]
+      savesubscribeobj.ocean_eta_old_sub_new = val.ETA.split(' ')[7]
+      savesubscribeobj.ocean_eta_old_sub_new_unit = val.ETA.split(' ')[8]
     } else {
       savesubscribeobj.ocean_eta_change = true
     }
@@ -516,8 +531,8 @@ const ChangeETDAirRules = (val: any) => {
   if (val.ETD != '') {
     if (val.ETD.indexOf('≥') != -1) {
       savesubscribeobj.air_etd_change = false
-      savesubscribeobj.air_etd_old_sub_new = val.ETD.split(' ')[6]
-      savesubscribeobj.air_etd_old_sub_new_unit = val.ETD.split(' ')[7]
+      savesubscribeobj.air_etd_old_sub_new = val.ETD.split(' ')[7]
+      savesubscribeobj.air_etd_old_sub_new_unit = val.ETD.split(' ')[8]
     } else {
       savesubscribeobj.air_etd_change = true
     }
@@ -530,8 +545,8 @@ const ChangeETDAirRules = (val: any) => {
   if (val.ETA != '') {
     if (val.ETA.indexOf('≥') != -1) {
       savesubscribeobj.air_eta_change = false
-      savesubscribeobj.air_eta_old_sub_new = val.ETA.split(' ')[6]
-      savesubscribeobj.air_eta_old_sub_new_unit = val.ETA.split(' ')[7]
+      savesubscribeobj.air_eta_old_sub_new = val.ETA.split(' ')[7]
+      savesubscribeobj.air_eta_old_sub_new_unit = val.ETA.split(' ')[8]
     } else {
       savesubscribeobj.air_eta_change = true
     }
@@ -561,7 +576,6 @@ const SaveSuceessful = () => {
     })
     .then((res: any) => {
       if (res.code === 200) {
-        console.log(res.data)
         if(res.data.msg == 'Update Successful') {
           SaveedVisible.value = true
           setTimeout(() => {

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

@@ -127,19 +127,14 @@ const changeETARadio = (val: any) => {
   emit('ChangeCheckRules', ETDETAList.value)
 }
 const changedeparture = (val: any) => {
-  console.log(clampedValue.value)
-  console.log(ETDSelect.value)
-  console.log(ETDstr)
   if (val == 'ETD') {
     if(ETDstr.includes('all changes')) {
       ETDETAList.value.ETD = ETDstr
     } else {
-      ETDstr = 'ETD: Notify only when time difference ≥' + clampedValue.value + ' ' + ETDSelect.value
+      ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
       if (ETDSelect.value != '' && clampedValue.value!= '' && clampedValue.value!= undefined ) {
-        console.log(1)
         ETDETAList.value.ETD = ETDstr
       } else {
-        console.log(22)
         ETDETAList.value.ETD = ''
       }
     }

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

@@ -44,13 +44,13 @@ const ShipmentRangeInit = () => {
     TransportCheckedList.value = ShipmentRange_data.value?.shipment_transport_mode.split(';')
     CheckChange(ShipmentRange_data.value?.shipment_transport_mode)
   }
-  if (ShipmentRange_data.value?.shipment_eta_limit != '') {
+  if (typeof ShipmentRange_data.value?.shipment_eta_limit == 'number' && typeof ShipmentRange_data.value?.shipment_eta_limit_from == 'number') {
     ETATimeStart.value = ShipmentRange_data.value?.shipment_eta_limit_from
     ETATimeEnd.value = ShipmentRange_data.value?.shipment_eta_limit
     TimeChecked.value = 2
     changeTime(2)
   }
-  if (ShipmentRange_data.value?.shipment_etd_limit != '' && ShipmentRange_data.value?.shipment_etd_limit_from != '') {
+  if (typeof ShipmentRange_data.value?.shipment_etd_limit == 'number' && typeof ShipmentRange_data.value?.shipment_etd_limit_from == 'number') {
     ETDTimeStart.value = ShipmentRange_data.value?.shipment_etd_limit_from
     ETDTimeEnd.value = ShipmentRange_data.value?.shipment_etd_limit
     TimeChecked.value = 1
@@ -144,7 +144,18 @@ const changeTime = (val: any) => {
     ETATimeStart.value = ''
     ETATimeEnd.value = ''
     if(typeof clampedETDValueStart.value == 'number' && typeof clampedETDValueEnd.value == 'number') {
-      Timestr = 'ETD: minus' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
+      if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 30) {
+        defaultradio.value = 'Next 30 days'
+      } else if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 60) {
+        defaultradio.value = 'Next 60 days'
+      } else if(clampedETDValueStart.value == 10 && clampedETDValueEnd.value == 60) {
+        defaultradio.value = 'Past 10 days to next 60 day'
+      } else if(clampedETDValueStart.value == 30 && clampedETDValueEnd.value == 0) {
+        defaultradio.value = 'Past 30 days'
+      } else {
+        defaultradio.value = 'Customize'
+      }
+      Timestr = 'ETD: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
     } else{
       Timestr = ''
     }
@@ -156,8 +167,19 @@ const changeTime = (val: any) => {
     defaultradio.value =''
     ETDTimeStart.value = ''
     ETDTimeEnd.value = ''
-    if(clampedETAValueStart.value != '' && clampedETAValueStart.value != undefined || clampedETAValueStart.value == 0 && clampedETAValueEnd.value != '' && clampedETAValueEnd.value != undefined  || clampedETAValueEnd.value == 0 ) {
-      Timestr = 'ETA: minus' + clampedETAValueStart.value + ' Day(s) to Plus'+ clampedETAValueEnd.value + ' Day(s)'
+    if(typeof clampedETAValueStart.value == 'number' && typeof clampedETAValueEnd.value == 'number') {
+      if(clampedETAValueStart.value == 0 && clampedETAValueEnd.value == 30) {
+        defaultradio2.value = 'Next 30 days'
+      } else if(clampedETAValueStart.value == 0 && clampedETAValueEnd.value == 60) {
+        defaultradio2.value = 'Next 60 days'
+      } else if(clampedETAValueStart.value == 10 && clampedETAValueEnd.value == 60) {
+        defaultradio2.value = 'Past 10 days to next 60 day'
+      } else if(clampedETAValueStart.value == 30 && clampedETAValueEnd.value == 0) {
+        defaultradio2.value = 'Past 30 days'
+      } else {
+        defaultradio2.value = 'Customize'
+      }
+      Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus '+ clampedETAValueEnd.value + ' Day(s)'
     } else{
       Timestr = ''
     }
@@ -178,11 +200,14 @@ const changedefaultradio = (val:any) => {
   } else if(val == 'Past 30 days') {
     clampedETDValueStart.value = 30
     clampedETDValueEnd.value = 0
-  } else {
+  } else if(val == 'Past 10 days to next 60 days') {
     clampedETDValueStart.value = 10
     clampedETDValueEnd.value = 60
+  } else {
+    clampedETDValueStart.value = 0
+    clampedETDValueEnd.value = 0
   }
-  Timestr = 'ETD: minus' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
+  Timestr = 'ETD: minus ' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
   emit('ChangeCheckTimeRules', Timestr, clampedETDValueStart.value,clampedETDValueEnd.value)
 }
 //切换默认值
@@ -196,11 +221,14 @@ const changedefaultradioETA = (val:any) => {
   } else if(val == 'Past 30 days') {
     clampedETAValueStart.value = 30
     clampedETAValueEnd.value = 0
-  } else {
+  } else if(val == 'Past 10 days to next 60 days') {
     clampedETAValueStart.value = 10
     clampedETAValueEnd.value = 60
+  } else {
+    clampedETAValueStart.value = 0
+    clampedETAValueEnd.value = 0
   }
-  Timestr = 'ETD: minus' + clampedETAValueStart.value + ' Day(s) to Plus'+ clampedETAValueEnd.value + ' Day(s)'
+  Timestr = 'ETD: minus ' + clampedETAValueStart.value + ' Day(s) to Plus'+ clampedETAValueEnd.value + ' Day(s)'
   emit('ChangeCheckTimeRules', Timestr, clampedETAValueStart.value,clampedETAValueEnd.value)
 }
 const handleCloseCreateRule = (val: any) => {
@@ -255,6 +283,7 @@ defineExpose({
                   <el-radio-button label="Next 60 days" value="Next 60 days" />
                   <el-radio-button label="Past 10 days to next 60 days" value="Past 10 days to next 60 days" />
                   <el-radio-button label="Past 30 days" value="Past 30 days" />
+                  <el-radio-button label="Customize" value="Customize" />
                 </el-radio-group>
                 <div class="flex" style="align-items: end;margin-bottom: 8.5px;">
                   <div>
@@ -295,6 +324,7 @@ defineExpose({
                   <el-radio-button label="Next 60 days" value="Next 60 days" />
                   <el-radio-button label="Past 10 days to next 60 days" value="Past 10 days to next 60 days" />
                   <el-radio-button label="Past 30 days" value="Past 30 days" />
+                  <el-radio-button label="Customize" value="Customize" />
                 </el-radio-group>
                 <div class="flex" style="align-items: end;margin-bottom: 8.5px;">
                   <div>