Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/components/AddRules/src/components/NotiFrequency.vue

@@ -266,9 +266,9 @@ defineExpose({
 <template>
   <div style="margin-top: 11px">
     <el-radio-group v-model="radio" @change="ChangeFrequency">
-      <!-- <el-radio :value="1" v-if="user_type != null && user_type != 'customer'"
+      <el-radio :value="1" v-if="user_type != null && user_type != 'customer'"
         >Instant notification for each update</el-radio
-      > -->
+      >
       <el-radio :value="2">
         <div>Daily Summary</div>
         <div class="Daily" v-if="isDaily">

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

@@ -207,7 +207,7 @@ const changedefaultradio = (val:any) => {
     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)
 }
 //切换默认值
@@ -228,7 +228,7 @@ const changedefaultradioETA = (val:any) => {
     clampedETAValueStart.value = 0
     clampedETAValueEnd.value = 0
   }
-  Timestr = 'ETD: 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)
 }
 const handleCloseCreateRule = (val: any) => {