From db8e73b120963810d6febdb939612db12d26996e Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期四, 18 十二月 2025 14:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue |   65 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
index 14ca8c9..ff759c8 100644
--- a/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
+++ b/ui/admin-ui3/src/views/tms/tmsDispatchOrder/index.vue
@@ -128,7 +128,7 @@
 
       <template #shipperId-form="{disabled}">
         <div style="display:flex; align-items: center;justify-content: space-between">
-          <avue-input-table :props="consignorProps"
+          <avue-input-table :props="consignorProps" dataType="string"
                             :children="consignorOption" :disabled="disabled"
                             :on-load="onShipperLoad" suffixIcon="search"
                             v-model="form.shipperId" style="width: 80%"
@@ -140,7 +140,7 @@
       <template #receiverId-form="{disabled}">
         <div style="display:flex; align-items: center;justify-content: space-between">
           <avue-input-table :props="consignorProps"
-                            :children="consignorOption"
+                            :children="consignorOption" dataType="string"
                             :on-load="onConsignorLoad" suffixIcon="search"
                             v-model="form.receiverId"  :disabled="disabled"
                             @change="changeReceiver" style="width: 80%"
@@ -413,13 +413,11 @@
           ],
           type: 'table', suffixIcon: 'search',dataType: 'string',
           change: (val: any) => {
-            console.log(val)
             const table = crudRef.value?.getPropRef?.('quoteDetailId')?.$refs?.temp;
             if (!table) return;
             let active = table.active;
             if (Array.isArray(active)) active = active[0];
             if (active) {
-              console.log(active)
               Object.assign(form.value, {
                 quoteDetailId: active.quoteDetailId,
                 transportLine: active.transportRoute,
@@ -435,6 +433,14 @@
                 requiredVehicleTypes: active.vehicleType,
                 quotePlanId: active.quotePlanId,
               });
+              form.value.shipperId = undefined;
+              form.value.shipperRegionLabel = undefined;
+              form.value.shipperAddress = undefined;
+              form.value.shipperMobile = undefined;
+              form.value.receiverId = undefined;
+              form.value.receiverRegionLabel = undefined;
+              form.value.receiverAddress = undefined;
+              form.value.receiverMobile = undefined;
             }
           },
           children: {
@@ -1526,13 +1532,21 @@
       type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/tms_dispatch_order_status',
       display: false,
       hide: false, fixed: 'right',
-      search: true,
+      search: false,
       rules: [
         {
           required: true,
           message: "鐘舵�佷笉鑳戒负绌�", trigger: "change"
         }
       ],
+    },
+    inStatusList: {
+      label: '鐘舵��', minWidth: 150,
+      type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/tms_dispatch_order_status',
+      display: false,multiple:true,
+      hide: true,
+      search: true,
+
     },
     confirmTime: {
       label: '纭鏃堕棿', minWidth: 180,
@@ -1546,13 +1560,34 @@
       hide: false,
       search: false,
     },
+    createBy: {
+      label: '鍒涘缓浜�', minWidth: 150,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: false,
+      search: true,
+    },
+    createTime: {
+      label: '鍒涘缓鏃堕棿', minWidth: 180,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      hide: false,
+      search: false,
+    },
+    createTimeRange: {
+      label: '鍒涘缓鏃堕棿', display: false, search: true, searchRange: true, type: 'date',
+      format: 'YYYY-MM-DD', hide: true, searchSpan: 5,
+      valueFormat: 'YYYY-MM-DD',
+    },
     updateBy: {
       label: '鏇存柊浜�', minWidth: 150,
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
       hide: false,
-      search: false,
+      search: true,
     },
     updateTime: {
       label: '鏇存柊鏃堕棿', minWidth: 180,
@@ -1702,8 +1737,7 @@
       label: '琛岀▼鍑瘉',
       display: true,
       span: 24, dataType: 'string',
-      type: 'upload',
-      action: '/common/upload2',
+      type: 'img',
 
     },
 
@@ -2483,6 +2517,11 @@
     queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.confirmTimeRange, 'confirmTime') || {};
     queryParams.value = proxy.addDateRangeNew(queryParams.value, queryParams.value?.okTimeRange, 'okTime') || {};
   },
+  handleBeforeOpenFunc:(type:string)=>{
+    if(type == 'add'){
+      form.value = {};
+    }
+  }
 
 })
 const handleConfirm = (row: any) => {
@@ -2710,7 +2749,10 @@
       pageF.isUploading = false;
     })
   }else if (optionType.value === 'customs') {
-    customsOrder({id:form.value.id}).then(res => {
+    customsOrder({id:form.value.id,
+      customsServiceProviderId: form.value.customsServiceProviderId,
+      customsServiceProviderName: form.value.customsServiceProviderName,
+    }).then(res => {
       ElMessage({
         message: "鎻愪氦鎴愬姛锛�",
         type: 'success'
@@ -2721,7 +2763,10 @@
       pageF.isUploading = false;
     })
   }else if (optionType.value === 'loading') {
-    loadingOrder({id:form.value.id}).then(res => {
+    loadingOrder({id:form.value.id,
+      loadingServiceProviderId: form.value.loadingServiceProviderId,
+      loadingServiceProviderName: form.value.loadingServiceProviderName,
+    }).then(res => {
       ElMessage({
         message: "鎻愪氦鎴愬姛锛�",
         type: 'success'

--
Gitblit v1.8.0