Merge branch 'dev' into dev_zyh

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

@@ -67,6 +67,7 @@ const InitRuleData = () => {
         countryCheckedList.value = returnData.station
         CountryCheckboxList.value = returnData.CountryCheckedList
         recommendata.value = returnData.RcommendDeliveryDate
+        getKLNList()
       }
     })
   }
@@ -81,7 +82,7 @@ const CreateRuleDisabled = computed(() => {
     windowRadio.value === undefined ||
     recommendRadio.value === undefined ||
     KLNPLCvalue.value === '' || 
-    KLNPLCvalue.value === '无搜索结果'
+    KLNPLCvalue.value === 'No Data'
   ) {
     return true;
   }
@@ -127,11 +128,10 @@ const CreateRuleDisabled = computed(() => {
   // 4. 所有条件都满足，返回 false（不禁用）
   return false;
 });
-// select country
+// select country 
 const handleClickSelectCountry = (val:any) =>{
   selectedCountry.value = val
   countryCheckedList.value = []
-  getKLNList()
 }
 // select station list
 const handleChangeStation = (val:any) =>{
@@ -445,7 +445,7 @@ onMounted(() => {
                     ></use>
                   </svg>
                 </span>
-                <span class="stars_red">*</span>KLN PLC
+                <span class="stars_red">*</span>KLN PIC
               </div>
             </template>
             <div>
@@ -506,6 +506,8 @@ onMounted(() => {
 .setting-top-title {
   background-color: var(--color-shipment-status-header-bg);
   height: 48px;
+  font-size: 18px;
+  font-weight: bold;
   padding: 0 16px;
   display: flex;
   align-items: center;

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

@@ -71,7 +71,7 @@ const querySearchAsync = (queryString: string, cb: (arg: any) => void) => {
     if(results.length == 0) {
       cb([{ 
         isNoData: true, 
-        value: '无搜索结果' 
+        value: 'No Data' 
       }]);
     } else {
       cb(results)

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

@@ -55,7 +55,7 @@ watch(
 const initGetPortsList = (val: any) => {
   PortList.value = val.map(item => ({
     ...item,
-    checked: value.value.includes(item.value)
+    checked: checkAll.value? true : value.value.includes(item.value)
   }));
 }
 const emits = defineEmits(['changeSelectedValue', 'handelremovetag'])

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

@@ -80,7 +80,6 @@ const ModeType = ref([
 ])
 
 // 设置无法点击
-
 const isNotClickAddress = computed(() => {
   if(a == undefined) {
     if(Object.keys(getAddressListData.value).length == 0) {
@@ -95,6 +94,15 @@ const isNotClickAddress = computed(() => {
   return false
 })
 
+// 设置文案显示
+const isNotSameConfiguration = computed(() => {
+  if(NoPermissionVisible.value || NoEligibleVisible.value || isDisabled.value) {
+    return true
+  }
+
+  return false
+})
+
 // 设置无法保存
 const isNotSubmit = computed(() => {
   if(NoPermissionVisible.value || NoEligibleVisible.value || isDisabled.value) {
@@ -699,8 +707,8 @@ onMounted(() => {
     <el-divider v-if="a != undefined" style="margin: 8px 0" />
     <!-- Select Shipments -->
     <div class="select_shipments">
-      <div v-if="isNotClickAddress" class="alertIndormation">Please select same consignee with same delivery information </div>
-      <div style="margin-bottom: 16px;"><span class="stars_red">*</span>Select Shipments<span class="title_warning">*Please select items with the same consignee.</span></div>
+      <div v-if="isNotSameConfiguration" class="alertIndormation">Please select same consignee with same delivery information </div>
+      <div style="margin-bottom: 16px;font-weight: bold;"><span class="stars_red">*</span>Select Shipments<span class="title_warning">*Please select items with the same consignee.</span></div>
       <div class="shipments_search" v-if="a == undefined">
         <div class="flex">
           <el-input
@@ -1225,6 +1233,7 @@ onMounted(() => {
   margin-left: 8px;
   color: var(--color-neutral-2);
   font-size: 12px;
+  font-weight: 400;
 }
 .shipments_search {
   margin: 0 0 8px 0;