Merge branch 'dev' into dev_zyh

src/views/DestinationDelivery/src/components/ConfiguRations/src/components/CreateNewRule.vue

@@ -234,12 +234,14 @@ const handleSubmitRule = () => {
       mergeData = [...mergeData , ...seaList]
     }
   }
-  airData = Object.keys(seaList?.[0])
-  airData.forEach((item) => {
-    Object.assign(airlistInfo, {
-      [item]: mergeData.map((row) => row[item])
+  if(seaList.length != 0) {
+    airData = Object.keys(seaList?.[0])
+    airData.forEach((item) => {
+      Object.assign(airlistInfo, {
+        [item]: mergeData.map((row) => row[item])
+      })
     })
-  })
+  }
   $api.handelSaveRule({
     serial_no: a != undefined ? a: '',
     country: selectedCountry.value,

src/views/DestinationDelivery/src/components/CreateNewBooking/src/CreateNewbooking.vue

@@ -1530,4 +1530,7 @@ onUnmounted(() => {
 .limit-reached {
   color: var(--color-warning-2);
 }
+:deep(header.el-dialog__header) {
+  background-color: var(--color-system-body-bg);
+}
 </style>