Sfoglia il codice sorgente

Merge branch 'test' into dev_zyh

zhouyuhao 7 mesi fa
parent
commit
43ae68017d

+ 0 - 1
src/components/AddRules/src/components/NotiMethods.vue

@@ -45,7 +45,6 @@ const MethodsInit = () => {
 
 // 选中Method
 const changeMethod = (val: any) => {
-  console.log(val)
   if (val.indexOf('By Email') != -1) {
     savesubscribeobj.method_by_email = true
   } else {

+ 0 - 1
src/components/CreateAddRules/src/CreateAddRules.vue

@@ -160,7 +160,6 @@ const Initdata = () => {
             ShipmentRangeCon.value = res.data.Container_Status_Update
             createObj.Transportstr = res.data.Container_Status_Update.shipment_details.split(';\r\n')[0]
             createObj.Timestr = res.data.Container_Status_Update.shipment_details.split(';\r\n')[1]
-            console.log(res.data.Container_Status_Update.shipment_details.split(';\r\n')[1])
             createListContainer.value.push(createObj.Transportstr)
             createListContainer.value.push(createObj.Timestr)
           } else if (editTablerules_type == 'Departure/Arrival_Delay') {

+ 0 - 1
src/components/CreateAddRules/src/components/ShipmentRange.vue

@@ -40,7 +40,6 @@ watch(
 )
 
 const ShipmentRangeInit = () => {
-  console.log(ShipmentRange_data.value)
   if (ShipmentRange_data.value?.shipment_transport_mode != undefined) {
     TransportCheckedList.value = ShipmentRange_data.value?.shipment_transport_mode.split(';')
     CheckChange(ShipmentRange_data.value?.shipment_transport_mode)

+ 4 - 2
src/components/SelectTableSelect/src/SelectTableSelect.vue

@@ -75,14 +75,16 @@ const changeSelect = (val: any) => {
 const emit = defineEmits(['changeAutoSelectAddType', 'delSelect', 'changeAutoSelect'])
 const errorBoolean = ref(false)
 let AutoSelectObj: any = {}
+let AutoSelectObj2: any = {}
 const changeAutoSelect = (val: any, value: any) => {
   if (value.length) {
     errorBoolean.value = true
   } else {
     errorBoolean.value = false
   }
-  AutoSelectObj[val] = value
-  emit('changeAutoSelect', AutoSelectObj, errorBoolean.value)
+  AutoSelectObj[val] = value.join()
+  AutoSelectObj2[val] = value
+  emit('changeAutoSelect', AutoSelectObj, AutoSelectObj2,errorBoolean.value)
 }
 const typeSelectFocus = (index: any, e: any) => {
   typeSelectIndex.value = index

+ 1 - 0
src/views/Tracking/src/TrackingView.vue

@@ -259,6 +259,7 @@ const DateRangeSearch = (val: any, value: any) => {
 }
 //MoreFiltersSearch
 const MoreFiltersSearch = (val: any, value: any) => {
+  console.log(val,value)
   filterData.morefiltersData = []
   if (Object.keys(value).length == 0) {
     delete searchTableQeuryTracking.shipper