From 39b711bf2cffdcfd2046d8df78ce5be99be547c3 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 10 Oct 2024 17:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Transferwarehousestatistics.vue           |  2 +-
 .../cost/storagecost/WarehouseMonthly.vue     | 39 ++++++++++++++++++-
 src/views/cost/storagecost/Warehousedaily.vue | 38 +++++++++++++++++-
 .../turndelivery/deliveryDiscuss.vue          | 29 +++++++++-----
 4 files changed, 95 insertions(+), 13 deletions(-)

diff --git a/src/views/cost/storagecost/Transferwarehousestatistics.vue b/src/views/cost/storagecost/Transferwarehousestatistics.vue
index 95d6ad44..e0c94028 100644
--- a/src/views/cost/storagecost/Transferwarehousestatistics.vue
+++ b/src/views/cost/storagecost/Transferwarehousestatistics.vue
@@ -178,7 +178,7 @@
     columnList,
   
     /** 列表数据 */
-    data: [{}],
+    data: [],
     /** 页面loading */
     loadingObj: {
       /** 列表加载loading */
diff --git a/src/views/cost/storagecost/WarehouseMonthly.vue b/src/views/cost/storagecost/WarehouseMonthly.vue
index 63492e69..667a62b8 100644
--- a/src/views/cost/storagecost/WarehouseMonthly.vue
+++ b/src/views/cost/storagecost/WarehouseMonthly.vue
@@ -14,7 +14,18 @@
                 multiple
                 placeholder="请选择仓库"
                 style="min-width: 340px"
+                collapse-tags
+                :max-collapse-tags="2"
               >
+                <template #header>
+                  <el-checkbox
+                    v-model="warehousecheckAll"
+                    :indeterminate="indeterminate"
+                    @change="handleCheckAll"
+                  >
+                    全选
+                  </el-checkbox>
+                </template>
                 <el-option
                   v-for="item in warehouseList"
                   :key="item.value"
@@ -154,7 +165,10 @@ const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
 const warehouseList = ref([]); //仓库
 const monthList = ref([]); //月份
-const queryTop = ref({}); //顶部查询
+const warehousecheckAll = ref(false);
+const indeterminate = ref(false);
+const queryTop = ref({
+}); //顶部查询
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -271,6 +285,29 @@ const timesc = (index, row) => {
   }
 };
 
+watch(
+  () => queryTop.value.warehouse,
+  val => {
+    if (!val.length) {
+      warehousecheckAll.value = false;
+      indeterminate.value = false;
+    } else if (val.length === warehouseList.value.length) {
+      warehousecheckAll.value = true;
+      indeterminate.value = false;
+    } else {
+      indeterminate.value = true;
+    }
+  }
+);
+
+const handleCheckAll = val => {
+  indeterminate.value = false;
+  if (val) {
+    queryTop.value.warehouse = warehouseList.value.map(_ => _.value);
+  } else {
+    queryTop.value.warehouse = [];
+  }
+};
 /** 表格表头输入框搜索 */
 const btnsc = val => {
   console.log(val);
diff --git a/src/views/cost/storagecost/Warehousedaily.vue b/src/views/cost/storagecost/Warehousedaily.vue
index 48c88122..609d161b 100644
--- a/src/views/cost/storagecost/Warehousedaily.vue
+++ b/src/views/cost/storagecost/Warehousedaily.vue
@@ -14,7 +14,18 @@
                 multiple
                 placeholder="请选择仓库"
                 style="min-width: 340px"
+                collapse-tags
+                :max-collapse-tags="2"
               >
+                <template #header>
+                  <el-checkbox
+                    v-model="warehousecheckAll"
+                    :indeterminate="indeterminate"
+                    @change="handleCheckAll"
+                  >
+                    全选
+                  </el-checkbox>
+                </template>
                 <el-option
                   v-for="item in warehouseList"
                   :key="item.value"
@@ -154,6 +165,8 @@ const $route = useRoute(); //获取地址栏参数
 const warehouseList = ref([]); //仓库
 const monthList = ref([]); //月份
 const queryTop = ref({}); //顶部查询
+const warehousecheckAll = ref(false);
+const indeterminate = ref(false);
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -283,6 +296,29 @@ const selectionChange = list => {
   console.log(list);
   details.selectionList = list;
 };
+watch(
+  () => queryTop.value.warehouse,
+  val => {
+    if (!val.length) {
+      warehousecheckAll.value = false;
+      indeterminate.value = false;
+    } else if (val.length === warehouseList.value.length) {
+      warehousecheckAll.value = true;
+      indeterminate.value = false;
+    } else {
+      indeterminate.value = true;
+    }
+  }
+);
+
+const handleCheckAll = val => {
+  indeterminate.value = false;
+  if (val) {
+    queryTop.value.warehouse = warehouseList.value.map(_ => _.value);
+  } else {
+    queryTop.value.warehouse = [];
+  }
+};
 // 网页顶部搜索按钮
 const searchChange = () => {
   if (queryTop.value.costSettlementYear?.length) {
@@ -295,7 +331,7 @@ const searchChange = () => {
   }
   if (queryTop.value.warehouse) {
     details.query.warehouseNameQuery = queryTop.value.warehouse.join(',');
-  }else{
+  } else {
     delete details.query.warehouseNameQuery;
   }
   onLoad();
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index c2e6336a..0ace8365 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -212,6 +212,12 @@
                   <el-radio label="1" size="large">商配</el-radio>
                 </el-radio-group>
               </el-form-item>
+              <el-form-item label="是否整车"    v-if="kind">
+                <el-radio-group v-model="DataSubmit.isAll">
+                  <el-radio :value="1" size="large">是 </el-radio>
+                  <el-radio :value="0" size="large">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
               <!-- 备货区域  -->
               <!-- <el-form-item label="备货区域">
                 <el-select
@@ -807,6 +813,7 @@ const DataSubmit = ref({
   ],
   masterDriverName: null, //主司机
   masterVehicleNub: null, //主车辆
+  isAll:0,
   remarks: null, //备注
   reservation: {
     deliveryType: '1', //配送类型  固定商配
@@ -977,7 +984,7 @@ onMounted(() => {
     // wrapLoading.value = true; //表示这是编辑状态
     editLoading.value = true; //开启加载
     getDeliveryList(route.query.id)
-      .then(res => {
+      .then( async res => {
         console.log(res, '页面信息');
 
         //司机配置
@@ -1028,6 +1035,7 @@ onMounted(() => {
               }
             });
           }
+          DataSubmit.value.isAll =res.data.data.isAll;//是否整车
         }
 
         wrapDataInfo.value = res.data.data.stockArticleList || ''; // 订单包件
@@ -1038,20 +1046,21 @@ onMounted(() => {
         DataSubmit.value.stockup.unloaderId = res.data.data.unloadingTeamId || ''; //卸车班组ID
         DataSubmit.value.stockup.unloaderName = res.data.data.unloadingTeamName || ''; //卸车班组名称
         DataSubmit.value.remarks = res.data.data.remarks; //备注信息
+        DataSubmit.value.taskTime = res.data.data.taskTime; //配送日期
         if (!res.data.data.stockupInfo) {
           return;
         }
-        DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftId || ''; //备货人员名称
-        DataSubmit.value.stockup.forkliftId = res.data.data.stockupInfo.forkliftId || ''; //备货人员ID
+        const { stockupInfo } = res.data.data;
+        DataSubmit.value.stockup.forkliftName = stockupInfo.forkliftId || ''; //备货人员名称
+        DataSubmit.value.stockup.forkliftId = stockupInfo.forkliftId || ''; //备货人员ID
         // DataSubmit.value.stockup.goodsAreaId = res.data.data.stockupInfo.goodsAreaId||''; //备货区域ID
-        DataSubmit.value.stockup.goodsAreaName = res.data.data.stockupInfo.stockupArea || ''; //备货区域名称
-        DataSubmit.value.stockup.outboundDate = res.data.data.stockupInfo.outboundDate || ''; //出库时间
-        DataSubmit.value.stockup.stockupDate = res.data.data.stockupInfo.stockupDate || ''; //备货时间
-        DataSubmit.value.taskTime = res.data.data.taskTime; //配送日期
-        editLoading.value = false; //所有信息获取完成关闭弹窗
-        tooSUM();
+        DataSubmit.value.stockup.goodsAreaName = stockupInfo.stockupArea || ''; //备货区域名称
+        DataSubmit.value.stockup.outboundDate = stockupInfo.outboundDate || ''; //出库时间
+        DataSubmit.value.stockup.stockupDate = stockupInfo.stockupDate || ''; //备货时间
+        await  tooSUM();
+      })
+      .catch((e) => {console.log(e,'error');
       })
-      .catch(() => {})
       .finally(() => {
         editLoading.value = false; //关闭加载
       });