Merge branch 'feat_system_g' of United_Software/k_online_ui into feature

src/components/AddRules/src/AddRules.vue

@@ -549,6 +549,21 @@ const clearData = (val: any) => {
   }
 }
 
+// 删除Oceam shipments
+const MilOceanref = ref()
+const MilAirref = ref()
+const ContainerOcean = ref()
+const handleCloseMilestoneOcean = (val:any) => {
+  MilOceanref.value.hadleclose(val)
+}
+const handleCloseMilestoneAir = (val:any) => {
+  MilAirref.value.hadleclose(val)
+}
+
+const handleCloseContainer = (val:any) => {
+  ContainerOcean.value.hadleclose(val)
+}
+
 defineExpose({
   clearData
 })
@@ -578,6 +593,7 @@ defineExpose({
             <div>
               <RulesShipments
                 Title="Ocean shipments"
+                ref="MilOceanref"
                 @ChangeCheckRules="ChangeCheckOceanRules"
                 :CheckboxList="MilestoneOceanListInit"
                 :CheckedList="MilestoneOceanListChecked"
@@ -586,6 +602,7 @@ defineExpose({
             <div>
               <RulesShipments
                 Title="Air shipments"
+                ref="MilAirref"
                 @ChangeCheckRules="ChangeCheckAirRules"
                 :CheckboxList="MilestoneAirListInit"
                 :CheckedList="MilestoneAirListChecked"
@@ -614,6 +631,7 @@ defineExpose({
             <div>
               <RulesShipments
                 Title="Ocean shipments"
+                ref="ContainerOcean"
                 @ChangeCheckRules="ChangeContainerRules"
                 :CheckboxList="ContainerOceanListInit"
                 :CheckedList="ContainerOceanListChecked"
@@ -794,11 +812,13 @@ defineExpose({
       <AddedrluesTag
         v-if="props.TitleType == 'Milestone'"
         :CheckedList="OceanCheckList"
+        @handleCloseRadio="handleCloseMilestoneOcean"
         Title="Ocean Shipments"
       ></AddedrluesTag>
       <AddedrluesTag
         v-if="props.TitleType == 'Container'"
         :CheckedList="ContainerOceanList"
+        @handleCloseRadio="handleCloseContainer"
         Title="Ocean Shipments"
       ></AddedrluesTag>
       <AddedrluesTag
@@ -821,6 +841,7 @@ defineExpose({
       ></AddedrluesTag>
       <AddedrluesTag
         v-if="props.TitleType == 'Milestone'"
+        @handleCloseRadio="handleCloseMilestoneAir"
         :CheckedList="AirCheckList"
         Title="Air Shipments"
       ></AddedrluesTag>

src/components/AddRules/src/components/RulesShipments.vue

@@ -41,6 +41,16 @@ const CheckChange = (val: any) => {
   })
   emit('ChangeCheckRules', selectedLables.value, CheckedList.value)
 }
+
+const hadleclose = (val:any) => {
+  selectedLables.value = []
+  // 遍历选中的value值，找到对应的code值
+  const option = CheckboxList.value.find((item) => item.label === val)
+  CheckedList.value = CheckedList.value.filter((item) => item !== option.value)
+}
+defineExpose({
+  hadleclose
+})
 </script>
 <template>
   <div class="Ocean_collapse">

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -750,6 +750,21 @@ const clearData = (val: any) => {
   }
 }
 
+// 删除Oceam shipments
+const MilOceanref = ref()
+const MilAirref = ref()
+const ContainerOcean = ref()
+const handleCloseMilestoneOcean = (val:any) => {
+  MilOceanref.value.hadleclose(val)
+}
+const handleCloseMilestoneAir = (val:any) => {
+  MilAirref.value.hadleclose(val)
+}
+
+const handleCloseContainer = (val:any) => {
+  ContainerOcean.value.hadleclose(val)
+}
+
 defineExpose({
   clearData,
   Savesubscribe,
@@ -827,6 +842,7 @@ defineExpose({
             <div>
               <RulesShipments
                 Title="Ocean shipments"
+                ref="MilOceanref"
                 @ChangeCheckRules="ChangeCheckOceanRules"
                 :CheckboxList="MilestoneOceanListInit"
                 :CheckedList="MilestoneOceanListChecked"
@@ -835,6 +851,7 @@ defineExpose({
             <div>
               <RulesShipments
                 Title="Air shipments"
+                ref="MilAirref"
                 @ChangeCheckRules="ChangeCheckAirRules"
                 :CheckboxList="MilestoneAirListInit"
                 :CheckedList="MilestoneAirListChecked"
@@ -863,6 +880,7 @@ defineExpose({
             <div>
               <RulesShipments
                 Title="Ocean shipments"
+                ref="ContainerOcean"
                 @ChangeCheckRules="ChangeContainerRules"
                 :CheckboxList="ContainerOceanListInit"
                 :CheckedList="ContainerOceanListChecked"
@@ -1062,12 +1080,14 @@ defineExpose({
       ></AddedrluesTag>
       <AddedrluesTag
         v-if="props.TitleType == 'Milestone'"
+        @handleCloseRadio="handleCloseMilestoneOcean"
         :CheckedList="OceanCheckList"
         Title="Ocean Shipments"
       ></AddedrluesTag>
       <AddedrluesTag
         v-if="props.TitleType == 'Container'"
         :CheckedList="ContainerOceanList"
+        @handleCloseRadio="handleCloseContainer"
         Title="Ocean Shipments"
       ></AddedrluesTag>
       <AddedrluesTag
@@ -1091,6 +1111,7 @@ defineExpose({
       <AddedrluesTag
         v-if="props.TitleType == 'Milestone'"
         :CheckedList="AirCheckList"
+        @handleCloseRadio="handleCloseMilestoneAir"
         Title="Air Shipments"
       ></AddedrluesTag>
       <AddedrluesTag

src/components/CreateAddRules/src/components/RulesShipments.vue

@@ -41,6 +41,15 @@ const CheckChange = (val: any) => {
   })
   emit('ChangeCheckRules', selectedLables.value, CheckedList.value)
 }
+const hadleclose = (val:any) => {
+  selectedLables.value = []
+  // 遍历选中的value值，找到对应的code值
+  const option = CheckboxList.value.find((item) => item.label === val)
+  CheckedList.value = CheckedList.value.filter((item) => item !== option.value)
+}
+defineExpose({
+  hadleclose
+})
 </script>
 <template>
   <div class="Ocean_collapse">