Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/components/AddRules/src/AddRules.vue

@@ -968,7 +968,7 @@ defineExpose({
 }
 .Rules_right {
   width: 40%;
-  background-color: var(--more-filters-background-color);
+  background-color: var(--add-rules-background-color);
 }
 .right_Title {
   color: var(--color-neutral-1);

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -1320,7 +1320,7 @@ defineExpose({
 }
 .Rules_right {
   width: 40%;
-  background-color: var(--more-filters-background-color);
+  background-color: var(--add-rules-background-color);
 }
 .right_Title {
   color: var(--color-neutral-1);

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

@@ -155,7 +155,11 @@ const changeTime = (val: any) => {
       } else {
         defaultradio.value = 'Customize'
       }
-      Timestr = 'ETD: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
+      if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 0) {
+        Timestr = ''
+      } else {
+        Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
+      }
     } else{
       Timestr = ''
     }
@@ -179,7 +183,11 @@ const changeTime = (val: any) => {
       } else {
         defaultradio2.value = 'Customize'
       }
-      Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus '+ clampedETAValueEnd.value + ' Day(s)'
+      if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 0) {
+        Timestr = ''
+      } else {
+        Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
+      }
     } else{
       Timestr = ''
     }
@@ -207,7 +215,11 @@ const changedefaultradio = (val:any) => {
     clampedETDValueStart.value = 0
     clampedETDValueEnd.value = 0
   }
-  Timestr = 'ETD: minus ' + clampedETDValueStart.value + ' Day(s) to Plus '+ clampedETDValueEnd.value + ' Day(s)'
+  if(clampedETDValueStart.value == 0 && clampedETDValueEnd.value == 0) {
+    Timestr = ''
+  } else {
+    Timestr = 'ETA: minus ' + clampedETDValueStart.value + ' Day(s) to Plus'+ clampedETDValueEnd.value + ' Day(s)'
+  }
   emit('ChangeCheckTimeRules', Timestr, clampedETDValueStart.value,clampedETDValueEnd.value)
 }
 //切换默认值
@@ -228,7 +240,11 @@ const changedefaultradioETA = (val:any) => {
     clampedETAValueStart.value = 0
     clampedETAValueEnd.value = 0
   }
-  Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus'+ clampedETAValueEnd.value + ' Day(s)'
+  if(clampedETAValueStart.value == 0 && clampedETAValueEnd.value == 0) {
+    Timestr = ''
+  } else {
+    Timestr = 'ETA: minus ' + clampedETAValueStart.value + ' Day(s) to Plus'+ clampedETAValueEnd.value + ' Day(s)'
+  }
   emit('ChangeCheckTimeRules', Timestr, clampedETAValueStart.value,clampedETAValueEnd.value)
 }
 const handleCloseCreateRule = (val: any) => {
@@ -285,7 +301,7 @@ defineExpose({
                   <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: 0 8px 8px 0;">
+                <div class="flex" style="align-items: end;margin: 0 8px 8px 0;flex-wrap: wrap;">
                   <div class="date_flex">
                     <div class="time_title">Start Date</div>
                     <div class="flex">
@@ -326,7 +342,7 @@ defineExpose({
                   <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 class="flex" style="align-items: end;margin-bottom: 8.5px;flex-wrap: wrap;">
                   <div>
                     <div class="time_title">Start Date</div>
                     <div class="flex">
@@ -391,12 +407,12 @@ defineExpose({
 .currentTime {
   background-color: var(--el-disabled-bg-color);
   border-radius: 6px 0 0 6px;
-  padding: 0 20px;
+  padding: 0 16px;
   height: 32px;
   display: flex;
   align-items: center;
   justify-content: center;
-  border: 1px solid var(--color-system-border);
+  border: 1px solid var(--color-system-input-border);
 }
 .input-with-select {
   border-radius: 0;
@@ -411,8 +427,8 @@ defineExpose({
   align-items: center;
 }
 .Days {
-  width: 250px;
-  border: 1px solid var(--color-system-border);
+  width: 150px;
+  border: 1px solid var(--color-system-input-border);
   border-radius: 0 6px 6px 0;
   background-color: var(--color-system-body-bg);
   border-left: 0;
@@ -440,7 +456,6 @@ defineExpose({
   :deep(.el-radio-group) {
     display: flex;
     flex-direction: row;
-    margin-right: 8px;
 }
 }
 :deep(.el-radio) {
@@ -459,7 +474,7 @@ defineExpose({
 .oceanCheckbox2 {
   :deep(.el-radio-button) {
     flex: 1;
-    border: 1px solid var(--color-system-border);
+    border: 1px solid var(--color-system-input-border);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -469,6 +484,7 @@ defineExpose({
   }
   :deep(.el-radio-button:last-child) {
     border-radius: 0 6px 6px 0;
+    margin-right: 8px;
   }
 }
 :deep( .el-radio__inner) {
@@ -481,14 +497,15 @@ defineExpose({
   margin-top: 7px;
 }
 :deep(.el-input__wrapper) {
-  box-shadow: 0 0 0 1px var(--color-system-border-1) inset;
+  box-shadow: 0 0 0 1px var(--color-system-input-border) inset;
 }
 :deep(.el-input-group--append .el-input-group__append .el-select .el-select__wrapper) {
-  box-shadow: 0 1px 0 0 var(--color-system-border-1) inset,0 -1px 0 0 var(--color-system-border-1) inset,-1px 0 0 0 var(--color-system-border-1) inset;
+  box-shadow: 0 1px 0 0 var(--color-system-input-border) inset,0 -1px 0 0 var(--color-system-border-1) inset,-1px 0 0 0 var(--color-system-border-1) inset;
 }
 :deep(.el-radio-button__inner) {
   border: none;
   height: 32px;
+  flex: 1;
 }
 :deep(.el-radio-button:first-child .el-radio-button__inner) {
   border-left: none;

src/styles/theme-g.scss

@@ -51,6 +51,7 @@
   --color-table-header-bg: #343a43;
   --icon-color-black: #fff;
   --more-filters-background-color: #2a2e34;
+  --add-rules-background-color: rgba(249,249,249,0.05);
   --addparties-background-color: #343a43;
   --color-border-top: #3f434a;
 
@@ -77,4 +78,5 @@
   --color-system-notification-bg:#343a43;
   --color-system-card-bg:#2B2F36;
   --color-system-border-1: #3F434A;
+  --color-system-input-border: #656f7d;
 }

src/styles/theme.scss

@@ -138,6 +138,7 @@
 
   --icon-color-black: #202020;
   --more-filters-background-color: #f9f9f9;
+  --add-rules-background-color: #f9f9f9;
   --addparties-background-color: #eff1f5;
 
   --badge__content--warning: #ed6d00;
@@ -279,6 +280,7 @@
   --color-system-notification-bg: #f6f8fa;
   --color-system-card-bg: #fff;
   --color-system-border-1: #e8eaee;
+  --color-system-input-border: #e8eaee;
   --color-personal-preference-bg: #f5f7fa;
 }
 

src/views/SystemSettings/src/SystemSettings.vue

@@ -238,7 +238,7 @@ onMounted(() => {
               ></AddRules>
             </div>
           </el-collapse-item>
-          <el-collapse-item name="Container" :class="isContainerChecked ? 'border_ischecked' : ''">
+          <el-collapse-item style="margin: 8px 0;" name="Container" :class="isContainerChecked ? 'border_ischecked' : ''">
             <template #title>
               <div class="flex">
                 <div class="collapse_left" :class="isContainerAdded ? 'text_ischecked' : ''">
@@ -258,7 +258,7 @@ onMounted(() => {
               ></AddRules>
             </div>
           </el-collapse-item>
-          <el-collapse-item name="Departure" :class="isDepartureChecked ? 'border_ischecked' : ''">
+          <el-collapse-item style="margin-bottom: 8px;" name="Departure" :class="isDepartureChecked ? 'border_ischecked' : ''">
             <template #title>
               <div class="flex">
                 <div class="collapse_left" :class="isDepartureAdded ? 'text_ischecked' : ''">