From f133684afd2650246913bc517d9a19692c4a57a8 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 07 四月 2026 12:04:51 +0800
Subject: [PATCH] 运单列表添加组织筛选,编辑修改

---
 src/views/logistics/transportGPS/WL_YayBill.vue          |    6 +++---
 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue |   42 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index dee3a6d..855f0a5 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -942,6 +942,7 @@
                     this.form.HDriverID = data.鍙告満ID
                     this.form.HDriverName = data.鍙告満鍚嶇О
                     this.form.HTransportLineName = data.杩愯緭璺嚎鍚嶇О
+                    console.log(data)
                     //瀛愯〃  璧嬪��
                     for (var i = 0; i < result.data.length; i++) {
                         var qty = parseFloat(result.data[i].HQty) || 0;
@@ -987,6 +988,11 @@
                     }
                     this.formShow = true
                     this.formLoading = false
+                    
+                    // 鍔犺浇杩愯緭绾胯矾銆佽繍杈撶被鍨嬨�佽溅鍨嬪垪琛�
+                    if (this.form.HContractTransportInterID) {
+                        this.loadTransportData()
+                    }
 
                     // 鍔犺浇宸蹭笂浼犵殑鏂囦欢鍒楄〃
                     this.getFileList();
@@ -1176,7 +1182,7 @@
                         this.form.HCarrierName = response.data[0].渚涘簲鍟嗗悕绉�
                         this.form.HCurID = response.data[0].甯佸埆
                         this.form.HCurName = response.data[0].璐у竵鍚嶇О
-                        this.form.HExRate = response.data[0].姹囩巼 == null ? 0 : response.data[0].姹囩巼
+                        this.form.HExRate = response.data[0].姹囩巼 == null ? 0 : response.data[0].姹囩巼-0
                         this.form.HSSID = response.data[0].缁撶畻鏂瑰紡
                         this.form.HSSName = response.data[0].缁撶畻鏂瑰紡鍚嶇О
                         this.transportList = [...new Set(response.data.map(item => item.杩愯緭璺嚎鍚嶇О))]
@@ -1497,6 +1503,7 @@
                     var sSubStr = JSON.stringify(this.editData);
                     // var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
                     var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"]
+                    console.log(sMainSub)
                     axios({
                         method: 'post',
                         url: this.baseURL + "/WLYayBillController/SaveBill",
@@ -2091,6 +2098,37 @@
             });
         },
 
+        // 鍔犺浇杩愯緭鐩稿叧鏁版嵁
+        loadTransportData() {
+            axios.get(this.$baseUrl + '/WLYayBillController/initDataForSelectContractTransportBill', {
+                params: {
+                    "hmainid": this.form.HContractTransportInterID,
+                },
+            }).then(res => {
+                let response = res.data
+                if (response.code == 1) {
+                    // 杩愯緭绾胯矾鍘婚噸
+                    this.transportList = [...new Set(response.data.map(item => item.杩愯緭璺嚎鍚嶇О))]
+                    
+                    // 杩愯緭绫诲瀷鍘婚噸
+                    this.transTypeList = [...new Set(response.data.map(item => item.杩愯緭绫诲瀷))]
+                    
+                    // 杞﹀瀷鍘婚噸
+                    const carTypeMap = new Map()
+                    response.data.forEach(item => {
+                        const key = item.杩愯緭鏂瑰紡鍚嶇О
+                        if (!carTypeMap.has(key)) {
+                            carTypeMap.set(key, { value: item.杩愯緭鏂瑰紡鍚嶇О, id: item.杩愯緭鏂瑰紡 })
+                        }
+                    })
+                    this.HCarTypeNameList = Array.from(carTypeMap.values())
+                } else {
+                    this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
         // 鑾峰彇宸蹭笂浼犳枃浠跺垪琛�
         getFileList() {
         },
@@ -2189,7 +2227,7 @@
                         this.form.HBeginAddr = response.data[0].濮嬪彂鍦�
                         this.form.HEndAddrName = response.data[0].鐩殑鍦板悕绉�
                         this.form.HEndAddr = response.data[0].鐩殑鍦�
-                        this.form.HCarTypeMaxVolume = response.data[0].杞﹁締鏈�澶у绉�
+                        this.form.HCarTypeMaxVolume = response.data[0].杞﹀瀷鏈�澶у绉�
                         this.form.HDistance = response.data[0].璺濈
                         this.form.HTransportTimes = response.data[0].杩愯緭鏃舵晥
                         this.form.HTransportTyep = response.data[0].杩愯緭绫诲瀷
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 6b42ca1..35f8fa2 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -788,9 +788,9 @@
                 this.sWhere += " and 鐗╂祦鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
             }
 
-            // if (this.queryParams.HOrgID) {
-            //     this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
-            // }
+             if (this.queryParams.HOrgID) {
+                 this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+             }
             console.log("swhere", this.sWhere)
             this.clearData()
             this.getList()

--
Gitblit v1.9.1