Merge branch 'feat_system_g' of United_Software/k_online_ui into feature

src/components/AddRules/src/AddRules.vue

@@ -75,7 +75,9 @@ watch(
 const Initdata = (val: any) => {
   MilestoneOceanListInit.value = val.Milestone_Update.OceanCheckBoxList
   OceanCheckList.value = []
+  OceanCheckCode.value = []
   MilestoneOceanListChecked.value = val.Milestone_Update.OceanCheckedList
+  OceanCheckCode.value = val.Milestone_Update.OceanCheckedList
   // 遍历选中的value值，找到对应的label值
   MilestoneOceanListChecked.value.forEach((value) => {
     const option = MilestoneOceanListInit.value.find((item) => item.value === value)
@@ -83,8 +85,10 @@ const Initdata = (val: any) => {
       OceanCheckList.value.push(option.label)
     }
   })
+  AirCheckListCode.value = []
   MilestoneAirListInit.value = val.Milestone_Update.AirCheckBoxList
   MilestoneAirListChecked.value = val.Milestone_Update.AirCheckedList
+  AirCheckListCode.value = val.Milestone_Update.AirCheckedList
   AirCheckList.value = []
   // 遍历选中的value值，找到对应的label值
   MilestoneAirListChecked.value.forEach((value) => {
@@ -93,8 +97,10 @@ const Initdata = (val: any) => {
       AirCheckList.value.push(option.label)
     }
   })
+  ContainerOceanCode.value = []
   ContainerOceanListInit.value = val.Container_Status_Update.CtnrCheckBoxList
   ContainerOceanListChecked.value = val.Container_Status_Update.CtnrCheckedList
+  ContainerOceanCode.value = val.Container_Status_Update.CtnrCheckedList
   ContainerOceanList.value = []
   // 遍历选中的value值，找到对应的label值
   ContainerOceanListChecked.value.forEach((value) => {
@@ -402,6 +408,8 @@ const Savesubscribe = () => {
       missingmessage.value = missingmessage.value.substring(0, missingmessage.value.length - 2)
       UnableSaveVisible.value = true
     } else {
+      console.log(OceanCheckCode.value)
+      console.log(AirCheckListCode.value)
       savesubscribeobj.ocean_milestone = OceanCheckCode.value
       savesubscribeobj.air_milestone = AirCheckListCode.value
       str =

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -105,7 +105,9 @@ const Initdata = () => {
             MethodsDataMil.value = res.data.Milestone_Update
             ShipmentRangeMil.value = res.data.Milestone_Update
             MilestoneOceanListInit.value = res.data.Milestone_Update.OceanCheckBoxList
+            OceanCheckListCode.value = []
             MilestoneOceanListChecked.value = res.data.Milestone_Update.OceanCheckedList
+            OceanCheckListCode.value = res.data.Milestone_Update.OceanCheckedList
             OceanCheckList.value = []
             // 遍历选中的value值，找到对应的label值
             MilestoneOceanListChecked.value.forEach((value) => {
@@ -114,8 +116,10 @@ const Initdata = () => {
                 OceanCheckList.value.push(option.label)
               }
             })
+            AirCheckListCode.value = []
             MilestoneAirListInit.value = res.data.Milestone_Update.AirCheckBoxList
             MilestoneAirListChecked.value = res.data.Milestone_Update.AirCheckedList
+            AirCheckListCode.value = res.data.Milestone_Update.AirCheckedList
             AirCheckList.value = []
             // 遍历选中的value值，找到对应的label值
             MilestoneAirListChecked.value.forEach((value) => {
@@ -126,8 +130,10 @@ const Initdata = () => {
             })
             createListMilestone.value = res.data.Milestone_Update.shipment_details
           } else if (editTablerules_type == 'Container_Status_Update') {
+            ContainerOceanCode.value = []
             ContainerOceanListInit.value = res.data.Container_Status_Update.CtnrCheckBoxList
             ContainerOceanListChecked.value = res.data.Container_Status_Update.CtnrCheckedList
+            ContainerOceanCode.value = res.data.Container_Status_Update.CtnrCheckedList
             ContainerOceanList.value = []
             // 遍历选中的value值，找到对应的label值
             ContainerOceanListChecked.value.forEach((value) => {

src/styles/elementui.scss

@@ -404,7 +404,6 @@ div .el-checkbox__inner:hover {
 }
 div .el-checkbox__inner {
   border: 1px solid var(--color-system-checkbox-border);
-  background-color: transparent;
 }
 div .el-checkbox__input.is-checked .el-checkbox__inner:after {
   border-color: var(--color-mode);