From fa58ca00c331f89b307cccec4b6103371f7b2512 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 9 Oct 2024 15:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=85=A8=E9=83=A8=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=95=B4?=
 =?UTF-8?q?=E8=BD=A6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/storagecost/WarehouseMonthly.js       | 11 +++++++++++
 src/option/storagecost/Warehousedaily.js         | 11 +++++++++++
 .../DeliveryCostPricingTemplate.vue              |  2 +-
 .../Deliverymaintenancecosts.vue                 |  3 ++-
 .../WarehouseDeliveryCost.vue                    | 10 ++++++++--
 .../deliverylist/distributionDeliveryList.vue    | 16 ++++++++--------
 6 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/option/storagecost/WarehouseMonthly.js b/src/option/storagecost/WarehouseMonthly.js
index b1c1ee59..2e790aa1 100644
--- a/src/option/storagecost/WarehouseMonthly.js
+++ b/src/option/storagecost/WarehouseMonthly.js
@@ -91,6 +91,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'wholeVehicleCost',
+    label: '整车单价',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'rentedItemsDispatchedQuantity',
     label: '租用出库件数',
diff --git a/src/option/storagecost/Warehousedaily.js b/src/option/storagecost/Warehousedaily.js
index aa28efab..78678d63 100644
--- a/src/option/storagecost/Warehousedaily.js
+++ b/src/option/storagecost/Warehousedaily.js
@@ -113,6 +113,17 @@ export const columnList = [
       sortable: true,
       head: false,
     },
+    {
+      prop: 'wholeVehicleCost',
+      label: '整车单价',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      head: false,
+    },
     {
       prop: 'customerTotalLeasingCost',
       label: '客户租用总成本',
diff --git a/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue b/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
index 7b09dd10..8745901f 100644
--- a/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
+++ b/src/views/cost/Deliverycostmanagement/DeliveryCostPricingTemplate.vue
@@ -250,7 +250,7 @@ const preservation = async () => {
       });
     }
   }
-  await onLoad();
+  
 };
 const Reset = () => {
   copyform.value = deepClone(form.value);
diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index 493dfbd7..ef04c1d0 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -136,7 +136,7 @@
           <div class="el_Kilometers_box">
             <span class="title">整车计费单价</span>
             <el-input-number
-              v-model="form.kilometerCost"
+              v-model="form.wholeVehicleCost"
               :min="0"
               :controls="false"
               :precision="2"
@@ -331,6 +331,7 @@ const OversizedbillingData = ref([]);
 const loading = ref(false); //页面loading
 const form = ref({
   kilometerCost: 0, //公里数单价
+  wholeVehicleCost:0,//整车费用
   subsidyInitKilometer: 0, //补贴起步公里数
   subsidyCost: 0, //补贴单价
   overZoneKilometer: 0, //统一超区公里数
diff --git a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue
index 7f29d501..19ac8eb6 100644
--- a/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue
@@ -9,6 +9,8 @@
           <div>
             <el-form-item label="目的仓">
               <el-select
+                collapse-tags
+                :max-collapse-tags="3"
                 v-model="queryTop.warehouse"
                 multiple
                 placeholder="请选择仓库"
@@ -32,7 +34,11 @@
             </el-form-item>
 
             <el-form-item label="结算月">
-              <el-select v-model="queryTop.costSettlementMonth" placeholder="请选择月份">
+              <el-select
+                style="width: 240px"
+                v-model="queryTop.costSettlementMonth"
+                placeholder="请选择月份"
+              >
                 <el-option
                   v-for="item in monthList"
                   :key="item.value"
@@ -276,7 +282,7 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  onLoad();
+  onLoad(queryTop.value);
 };
 // 每页多少条
 const sizeChange = val => {
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index d542a5b1..84b386db 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -14,7 +14,7 @@
           <el-form-item label="配送日期:" class="el-times">
             <el-date-picker
               class="w100"
-              v-model="query.taskTimeArr"
+              v-model="Deliverydate"
               type="daterange"
               unlink-panels
               range-separator="至"
@@ -335,6 +335,7 @@ export default {
   data() {
     return {
       currentdate: true,
+      Deliverydate: [],
       height: 0,
       // 弹框标题
       title: '',
@@ -1088,20 +1089,19 @@ export default {
       const startDate = currentDate.subtract(1, 'month');
       // 格式化日期为 'YYYY-MM-DD'
       const formatDate = date => date.format('YYYY-MM-DD');
-      this.query.taskTimeArr = [];
-      (this.query.taskTimeArr[0] = formatDate(startDate)), // 一个月前的日期
-        (this.query.taskTimeArr[1] = formatDate(currentDate)); // 当前日期
+      this.Deliverydate = [];
+      this.Deliverydate[0] = formatDate(startDate); // 一个月前的日期
+      this.Deliverydate[1] = formatDate(currentDate); // 当前日期
     },
     async onLoad(page, params = {}) {
       this.loading = true;
       if (this.currentdate) {
         await this.Getcurrentdate();
       }
-      if (getObjType(this.query.taskTimeArr) === 'array') {
-        params.taskTimeStart = this.query.taskTimeArr[0];
-        params.taskTimeEnd = this.query.taskTimeArr[1];
+      if (getObjType(this.Deliverydate) === 'array') {
+        params.taskTimeStart = this.Deliverydate[0];
+        params.taskTimeEnd = this.Deliverydate[1];
       }
-
       getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         // eslint-disable-next-line no-empty