feat:修改etd change 输入逻辑问题

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

@@ -115,7 +115,7 @@ const changeETDRadio = (val: any) => {
     ETDstr = 'ETD: Notify for all changes'
     ETDETAList.value.ETD = ETDstr
   } else if (val == 2) {
-    ETDstr = 'ETD: Notify for all changes ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+    ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
     if (ETDSelect.value != '' && clampedValue.value!= '') {
       ETDETAList.value.ETD = ETDstr
     } else {
@@ -129,7 +129,7 @@ const changeETARadio = (val: any) => {
     ETAstr = 'ETA: Notify for all changes'
     ETDETAList.value.ETA = ETAstr
   } else if (val == 2) {
-    ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+    ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
     if (ETASelect.value != '' && clampedValue.value!= '') {
       ETDETAList.value.ETA = ETAstr
     } else {
@@ -143,7 +143,7 @@ const changedeparture = (val: any) => {
     if(ETDstr.includes('all changes')) {
       ETDETAList.value.ETD = ETDstr
     } else {
-      ETDstr = 'ETD: Notify for all changes ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+      ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
       if (ETDSelect.value != '' && clampedValue.value!= '') {
         ETDETAList.value.ETD = ETDstr
       } else {
@@ -154,7 +154,7 @@ const changedeparture = (val: any) => {
       if(ETAstr.includes('all changes')) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+        ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
         if (ETASelect.value != '' && clampedETAValue.value!= '') {
           ETDETAList.value.ETA = ETAstr
         } else {
@@ -166,7 +166,7 @@ const changedeparture = (val: any) => {
     if(ETAstr.includes('all changes')) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+        ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
         if (ETASelect.value != '' && clampedETAValue.value!= '') {
           ETDETAList.value.ETA = ETAstr
         } else {
@@ -253,7 +253,7 @@ const clampedETAValue = computed({
                   <el-radio value="1">Notify for all changes</el-radio>
                   <el-radio value="2"
                     >Notify only when time difference
-                    <span class="delayedIcon">></span>
+                    <span class="delayedIcon">≥</span>
                     <el-input
                       v-model="clampedValue"
                       class="input-with-select"
@@ -280,7 +280,7 @@ const clampedETAValue = computed({
                   <el-radio value="1">Notify for all changes</el-radio>
                   <el-radio value="2"
                     >Notify only when time difference
-                    <span class="delayedIcon">></span>
+                    <span class="delayedIcon">≥</span>
                     <el-input
                       v-model="clampedETAValue"
                       class="input-with-select"

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -662,8 +662,16 @@ const Savesubscribe = () => {
       ContainerOceanList.value == undefined ||
       ContainerOceanList.value.length == 0 ||
       ConFrequencyList.value.length == 0 ||
-      ConMethodsList.value.length == 0
+      ConMethodsList.value.length == 0 ||
+      createObj.Transportstr == '' ||
+      createObj.Timestr == ''
     ) {
+      if (createObj.Transportstr == '') {
+        missingmessage.value += 'Transport Mode, '
+      }
+      if (createObj.Timestr == '') {
+        missingmessage.value += 'Time, '
+      }
       if (ContainerOceanList.value == undefined || ContainerOceanList.value.length == 0) {
         missingmessage.value += 'Ocean Shipments, '
       }
@@ -689,8 +697,16 @@ const Savesubscribe = () => {
       DelayedAirdList.value == undefined ||
       DelayedAirdList.value.length == 0 ||
       DepFrequencyList.value.length == 0 ||
-      DepMethodsList.value.length == 0
+      DepMethodsList.value.length == 0 ||
+      createObj.Transportstr == '' ||
+      createObj.Timestr == ''
     ) {
+      if (createObj.Transportstr == '') {
+        missingmessage.value += 'Transport Mode, '
+      }
+      if (createObj.Timestr == '') {
+        missingmessage.value += 'Time, '
+      }
       if (DelayedDeparturedList.value == undefined || DelayedDeparturedList.value.length == 0) {
         missingmessage.value += 'Ocean Shipments, '
       }
@@ -718,8 +734,16 @@ const Savesubscribe = () => {
       ETDAirList.value == undefined ||
       ETDAirList.value.length == 0 ||
       ETDFrequencyList.value.length == 0 ||
-      ETDMethodsList.value.length == 0
+      ETDMethodsList.value.length == 0 ||
+      createObj.Transportstr == '' ||
+      createObj.Timestr == ''
     ) {
+      if (createObj.Transportstr == '') {
+        missingmessage.value += 'Transport Mode, '
+      }
+      if (createObj.Timestr == '') {
+        missingmessage.value += 'Time, '
+      }
       if (ETDOceanList.value == undefined || ETDOceanList.value.length == 0) {
         missingmessage.value += 'Ocean Shipments, '
       }

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

@@ -212,7 +212,7 @@ defineExpose({
                       @change="changedeparture('Departure')"
                     >
                       <el-option label="Day(s)" value="Day(s)" />
-                      <el-option label="Hour(s)" value="Hour(s)" />
+                      <el-option v-if="props.Title == 'Air shipments'" label="Hour(s)" value="Hour(s)" />
                     </el-select>
                   </template>
                 </el-input>
@@ -235,7 +235,7 @@ defineExpose({
                       @change="changedeparture('Arrival')"
                     >
                       <el-option label="Day(s)" value="Day(s)" />
-                      <el-option label="Hour(s)" value="Hour(s)" />
+                      <el-option v-if="props.Title == 'Air shipments'" label="Hour(s)" value="Hour(s)" />
                     </el-select>
                   </template>
                 </el-input>

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

@@ -103,7 +103,7 @@ const changeETDRadio = (val: any) => {
     ETDstr = 'ETD: Notify for all changes'
     ETDETAList.value.ETD = ETDstr
   } else if (val == 2) {
-    ETDstr = 'ETD: Notify for all changes ≥ ' + clampedValue.value + ' ' + ETDSelect.value
+    ETDstr = 'ETD: Notify only when time difference ≥ ' + clampedValue.value + ' ' + ETDSelect.value
     if (ETDSelect.value != '' && clampedValue.value!= '') {
       ETDETAList.value.ETD = ETDstr
     } else {
@@ -117,7 +117,7 @@ const changeETARadio = (val: any) => {
     ETAstr = 'ETA: Notify for all changes'
     ETDETAList.value.ETA = ETAstr
   } else if (val == 2) {
-    ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+    ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
     if (ETASelect.value != '' && clampedValue.value!= '') {
       ETDETAList.value.ETA = ETAstr
     } else {
@@ -127,14 +127,19 @@ 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 for all changes ≥ ' + clampedValue.value + ' ' + ETDSelect.value
-      if (ETDSelect.value != '' && clampedValue.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 = ''
       }
     }
@@ -142,7 +147,7 @@ const changedeparture = (val: any) => {
       if(ETAstr.includes('all changes')) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+        ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
         if (ETASelect.value != '' && clampedETAValue.value!= '') {
           ETDETAList.value.ETA = ETAstr
         } else {
@@ -154,7 +159,7 @@ const changedeparture = (val: any) => {
     if(ETAstr.includes('all changes')) {
         ETDETAList.value.ETA = ETAstr
       } else {
-        ETAstr = 'ETA: Notify for all changes ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
+        ETAstr = 'ETA: Notify only when time difference ≥ ' + clampedETAValue.value + ' ' + ETASelect.value
         if (ETASelect.value != '' && clampedETAValue.value!= '') {
           ETDETAList.value.ETA = ETAstr
         } else {
@@ -241,7 +246,7 @@ const clampedETAValue = computed({
                   <el-radio value="1">Notify for all changes</el-radio>
                   <el-radio value="2"
                     >Notify only when time difference
-                    <span class="delayedIcon">></span>
+                    <span class="delayedIcon">≥</span>
                     <el-input
                       v-model="clampedValue"
                       class="input-with-select"
@@ -268,7 +273,7 @@ const clampedETAValue = computed({
                   <el-radio value="1">Notify for all changes</el-radio>
                   <el-radio value="2"
                     >Notify only when time difference
-                    <span class="delayedIcon">></span>
+                    <span class="delayedIcon">≥</span>
                     <el-input
                       v-model="clampedETAValue"
                       class="input-with-select"