From ba9095178bbf5ff88cce02921f65ea2335fe71a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=95=E9=98=B3=E5=BE=AE=E7=AC=911?=
 <12457268+sunset-smile-1@user.noreply.gitee.com>
Date: Wed, 20 Nov 2024 13:38:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9Bbug=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/index.js                        | 49 +++++++++++++++----
 .../distributionManagement/deliveryDetail.vue | 27 +++++++---
 .../client/custAccount/index.vue              |  3 +-
 .../driver/shipDetails/detail.vue             |  3 +-
 .../driver/shipDetails/index.vue              |  3 +-
 .../driver/shipProfits/index.vue              |  4 +-
 .../supplier/supplierAccount/index.vue        |  3 +-
 7 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/src/api/order/index.js b/src/api/order/index.js
index 7088b5c..d4b6f92 100644
--- a/src/api/order/index.js
+++ b/src/api/order/index.js
@@ -93,22 +93,42 @@ export const tinyDelivery = ({
   page,
   page_len,
   order_num,
+  // delivery_id,
   driver_name,
   driver_account,
+  // driver_phone,
   start_time,
   end_time,
   supplier_name,
-  site_name
+  // transit_name,
+  // variety_num,
+  site_name,
+  // product_type,
+  // order_ton,
+  // over_ton,
+  // post_fee,
+  // create_time
+  enterprise_id,
 }) => fetch('/admin/order/tiny_delivery', {
   page,
   page_len,
   order_num,
+  // delivery_id,
   driver_name,
   driver_account,
+  // driver_phone,
   start_time,
   end_time,
   supplier_name,
-  site_name
+  // transit_name,
+  // variety_num,
+  site_name,
+  // product_type,
+  // order_ton,
+  // over_ton,
+  // post_fee,
+  // create_time
+  enterprise_id,
 }, 'POST')
 
 // 录入运费
@@ -224,14 +244,16 @@ export const listDriverTiny = ({
   // driver_name,
   // driver_account,
   start_time,
-  end_time
+  end_time,
+  enterprise_id
 }) => fetch('/admin/order/list_head_order', {
   page,
   page_len,
   head_id,
   head_name,
   start_time,
-  end_time
+  end_time,
+  enterprise_id
 }, 'POST')
 
 // 编辑运费
@@ -289,7 +311,12 @@ export const listCost = ({
 }, 'POST')
 
 //运费成本详情
-export const detailCost = (cost_id) => fetch('/admin/order/detail_cost', {cost_id}, 'POST')
+export const detailCost = ({
+  cost_id,
+  enterprise_id
+}
+  
+) => fetch('/admin/order/detail_cost', {cost_id,enterprise_id}, 'POST')
 
 // 运费成本删除
 export const deleteCost = (cost_id) => fetch('/admin/order/delete_cost', {cost_id}, 'POST')
@@ -499,13 +526,15 @@ export const listClientAccount = ({
   page_len,
   client_name,
   client_company,
-  account_date
+  account_date,
+  enterprise_id
 }) => fetch('/admin/order/list_client_account', {
   page,
   page_len,
   client_name,
   client_company,
-  account_date
+  account_date,
+  enterprise_id
 }, 'POST')
 
 // 客户账款-收款明细
@@ -672,12 +701,14 @@ export const listSupplierAccount = ({
   page,
   page_len,
   supplier_name,
-  account_date
+  account_date,
+  enterprise_id,
 }) => fetch('/admin/order/list_supplier_account', {
   page,
   page_len,
   supplier_name,
-  account_date
+  account_date,
+  enterprise_id
 }, 'POST')
 
 // 供应商账款-付款明细
diff --git a/src/views/distributionManagement/deliveryDetail.vue b/src/views/distributionManagement/deliveryDetail.vue
index af8ce0d..054ce61 100644
--- a/src/views/distributionManagement/deliveryDetail.vue
+++ b/src/views/distributionManagement/deliveryDetail.vue
@@ -1,3 +1,4 @@
+//配送明细
 <template>
   <div class="app-container">
     <!-- 搜索 -->
@@ -108,7 +109,9 @@ export default {
       searchForm: {
         page: 1,
         page_len: 10,
-        start_time: ''
+        craet_time: '',
+        // 'transit name':'惠州中转站',
+        enterprise_id:1
       },
       downloadLoading: false,  // 导出按钮状态
       dialogEntry: false, // 录入信息弹窗
@@ -127,19 +130,27 @@ export default {
     this.fetchData()
   },
   methods: {
-    // 获取企业列表
+    // 获取配送列表
     fetchData(obj={}) {
       if(obj.page) {
         this.searchForm.page = obj.page
         this.searchForm.page_len = obj.page_len
       }
-      this.searchForm.start_time = this.$route.query.start_time?this.$route.query.start_time:this.searchForm.start_time;
-      this.listLoading = true
+      this.searchForm.start_time = this.$route.query.start_time || this.searchForm.start_time;
       this.$http(tinyDelivery(this.searchForm), (res) => {
-        this.firmList = res.data.result
-        this.total = res.data.data_sum
-        this.listLoading = false
-      })
+        if (res.code === 0) {
+          this.firmList = res.data.result;  // 将结果数组赋值给 firmList
+          // console.log('获取到的企业列表:', this.firmList);
+          
+          this.total = res.data.data_sum;  // 更新 total 为 data_sum
+          this.listLoading = false;
+        } else {
+          console.error('获取数据出错:', res.message);
+          this.listLoading = true;
+        }
+      }).catch(error => {
+        console.error('请求失败:', error);
+      });
     },
     // 录入信息
     handleEntry(id) {
diff --git a/src/views/financialManagement/client/custAccount/index.vue b/src/views/financialManagement/client/custAccount/index.vue
index de8e048..54a8d65 100644
--- a/src/views/financialManagement/client/custAccount/index.vue
+++ b/src/views/financialManagement/client/custAccount/index.vue
@@ -224,7 +224,8 @@ export default {
       // 搜索相关数据
       searchForm: {
         page: 1,
-        page_len: 100000000
+        page_len: 100000000,
+        enterprise_id:1
       },
       baseUrl,
       percentage: 0, // 进度条数据
diff --git a/src/views/financialManagement/driver/shipDetails/detail.vue b/src/views/financialManagement/driver/shipDetails/detail.vue
index 05feec3..dfe1452 100644
--- a/src/views/financialManagement/driver/shipDetails/detail.vue
+++ b/src/views/financialManagement/driver/shipDetails/detail.vue
@@ -97,7 +97,8 @@ export default {
       // 搜索相关数据
       searchForm: {
         page: 1,
-        page_len: 10
+        page_len: 10,
+        enterprise_id:1
       },
       dialogEntry: false,
       entryInfo: {
diff --git a/src/views/financialManagement/driver/shipDetails/index.vue b/src/views/financialManagement/driver/shipDetails/index.vue
index a92b91c..5ce9870 100644
--- a/src/views/financialManagement/driver/shipDetails/index.vue
+++ b/src/views/financialManagement/driver/shipDetails/index.vue
@@ -94,7 +94,8 @@ export default {
       // 搜索相关数据
       searchForm: {
         page: 1,
-        page_len: 10
+        page_len: 10,
+        enterprise_id:1
       },
       dialogEntry: false,
       entryInfo: {
diff --git a/src/views/financialManagement/driver/shipProfits/index.vue b/src/views/financialManagement/driver/shipProfits/index.vue
index 1055e40..ce1e998 100644
--- a/src/views/financialManagement/driver/shipProfits/index.vue
+++ b/src/views/financialManagement/driver/shipProfits/index.vue
@@ -139,6 +139,7 @@ export default {
       listLoading: true,
       chilTotal: 0, // 子列表总数
       msgListLoading: false,
+      enterprise_id:1,
       // 搜索相关数据
       searchForm: {
         page: 1,
@@ -233,7 +234,8 @@ export default {
       cost_id ? this.title = '编辑司机成本记录' : this.title = '新增司机成本记录'
       this.fetchDriver()
       if(cost_id) {
-        this.$http(detailCost(cost_id), res => {
+
+        this.$http(detailCost(cost_id,enterprise_id), res => {
           this.entryInfo = res.data
           this.dialog = true
         })
diff --git a/src/views/financialManagement/supplier/supplierAccount/index.vue b/src/views/financialManagement/supplier/supplierAccount/index.vue
index 6cd46e4..a0a24bb 100644
--- a/src/views/financialManagement/supplier/supplierAccount/index.vue
+++ b/src/views/financialManagement/supplier/supplierAccount/index.vue
@@ -182,7 +182,8 @@ export default {
       // 搜索相关数据
       searchForm: {
         page: 1,
-        page_len: 100000000
+        page_len: 100000000,
+        enterprise_id: 1
       },
       baseUrl,
       clientHeight: 0, // 屏幕的高度