瀏覽代碼

Merge branch 'dev' into dev_zyh

Jack Zhou 3 月之前
父節點
當前提交
9d6d20680f

+ 4 - 4
src/views/DestinationDelivery/src/components/ConfiguRations/src/components/CreateNewRule.vue

@@ -30,7 +30,7 @@ const CancelRulesVisible = ref(false)
 const SaveedVisible = ref(false)
 const UnableSaveVisible = ref(false)
 const missingmessage = ref('')
-const KLNPLCvalue = ref('')
+const KLNPLCvalue = ref([])
 interface KLNItem {
   value: string
   label: string
@@ -50,7 +50,7 @@ const InitRuleData = () => {
     .then((res: any) => {
       if (res.code === 200) {
         const { returnData } = res.data
-        KLNPLCvalue.value = returnData.kln_pic
+        KLNPLCvalue.value = returnData.KLNPLCvalue
         selectedCountry.value = returnData.country
         setbookingdata.value = returnData.SetBookingWindow
         windowRadio.value = returnData.SetBookingWindow.windowradio
@@ -81,8 +81,7 @@ const CreateRuleDisabled = computed(() => {
     selectedCountry.value === '' ||
     windowRadio.value === undefined ||
     recommendRadio.value === undefined ||
-    KLNPLCvalue.value === '' || 
-    KLNPLCvalue.value === 'No Data'
+    KLNPLCvalue.value.length === 0
   ) {
     return true;
   }
@@ -453,6 +452,7 @@ onMounted(() => {
                 v-model="KLNPLCvalue"
                 filterable
                 remote
+                multiple
                 placeholder="Select Employee Account"
                 :remote-method="querySearchAsync"
                 :loading="loading"

+ 0 - 1
src/views/DestinationDelivery/src/components/CreateNewBooking/src/CreateNewbooking.vue

@@ -8,7 +8,6 @@ import NotShipment from './images/default_no_shipment@2x.png'
 import submitsucessful from './images/icon_success_big@2x.png'
 import { useUserStore } from '@/stores/modules/user'
 import { useRouter } from 'vue-router'
-import { length } from '@turf/turf'
 
 
 const userStore = useUserStore()