From 6dbb7a5c7115430de11277a40118566ebd871695 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 29 Aug 2024 20:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E9=85=8D=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=BC=96=E8=BE=91=E3=80=82=E4=BF=AE=E5=A4=8D=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  3 +--
 .../goodsShelf/basicdataGoodsShelfView.vue    |  6 +++++-
 .../checkInventoryTask/createTask.vue         |  1 +
 .../turndelivery/deliveryDiscuss.vue          | 21 +++++++++++--------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 156180b2..7603eb8b 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,7 @@
     "prod": "vite --mode production",
     "build": "vite build",
     "build:prod": "vite build --mode production",
-    "serve": "vite preview --host",
-    "type": "module"
+    "serve": "vite preview --host"
   },
   "dependencies": {
     "@antfu/utils": "^0.7.2",
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index 04d3ee14..225fae0c 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -11,6 +11,7 @@
         class=""
         placeholder="请选择仓库"
         @change="checkcso"
+        style="width: 200px"
       >
         <el-option
           v-for="(item, index) in arrlist"
@@ -25,6 +26,7 @@
         v-model="checkregionselect"
         class="regionsele"
         placeholder="请选择区域"
+           style="width: 200px"
         @change="checkregion"
       >
         <el-option
@@ -2833,6 +2835,7 @@ const {
 .el-sel {
   display: flex !important;
   align-items: center;
+  width: 50%;
   :deep(.el-select) {
     height: 32px;
     .el-input {
@@ -2843,12 +2846,13 @@ const {
 .el-sel-title {
   font-size: 17px;
   margin-right: 10px;
+  width:10%;
 }
 .el-sel-title:nth-of-type(2) {
   margin-left: 20px;
 }
 .el-exp {
-  width: 110px;
+  width:200px;
   height: 32px;
   border: 1px solid #d3832a;
   display: flex;
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index 105db9f9..98df5dec 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -87,6 +87,7 @@
                 v-model="item.values"
                 :placeholder="`请输入${item.label}`"
               />
+              <span v-else></span>
             </template>
 
             <template #default="props">
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 3efe863e..7b9ad6eb 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -818,6 +818,8 @@ const VehicleInformationCopy=ref([]);//拷贝司机信息
 const StockInfo = ref({
   createDate: new Date(), //默认日期
   radio: 1,
+  Cl:[],
+  Sj:[],
   //司机信息
   DriverInformation: [
     {
@@ -1757,9 +1759,7 @@ const wrap = ref([
   },
 ]);
 // 获取表格数据
-function onLoad() {
-  loading.value = true; //开启加载效果
-}
+
 
 statisticsList.value = menuData.value.filter(item => item.statistics); //筛选出要统计的
 console.log(statisticsList.value, '需要统计的字段');
@@ -1808,26 +1808,29 @@ onMounted(() => {
             driverName: item.driverName, //司机姓名
             driverPhone: item.driverPhone, //司机电话
           });
+          console.log(DriverTemporaryStorage.value,'处理好的司机');
           chooseDriverIds.value.push(item.driverId);
-
           VehicleTemporaryStorage.value.push({
             vehicleId: item.vehicleId, //车辆ID
             vehicleNub: item.vehicleNub, //车牌号
           });
           chooseCarIds.value.push(item.vehicleId);
           // 配送司机
-          StockInfo.value.Sj.push(item.driverId);
+          StockInfo.value.Sj.push(item.driverId);    
+          
           // 配送车辆
           StockInfo.value.Cl.push(item.vehicleId);
           if (item.isMaster == 2) {
             DataSubmit.value.masterDriverName = item.driverName; //主司机名称
             DataSubmit.value.masterVehicleNub = item.vehicleNub; //司机车牌号
           }
+
         });
+
         }
 
       }
-      console.log(res.data.data,'123');
+
       
       wrapDataInfo.value = res.data.data.stockArticleList||''; // 订单包件
       dataInfo.value = res.data.data.stockArticleList||''; //订单列表
@@ -1852,7 +1855,7 @@ onMounted(() => {
     }).catch(()=>{
 
     }).finally(()=>{
-      editLoading.value = false; //开启加载
+      editLoading.value = false; //关闭加载
     });
   }
 });
@@ -2923,7 +2926,7 @@ const Outsourcing = val => {
     if(SJname.length){
       if(SJname[0].vehicleVOList){
       if(SJname[0].vehicleVOList.length===1 &&  !StockInfo.value.Cl.length){
-        //带出来的车辆如果只有1辆并且车辆没有选择值，就直接进行带出赋值
+        //带出来的车辆如果只有1辆并且车辆没有选择值，就直接进行带出赋值        
       StockInfo.value.Cl.push(SJname[0].vehicleVOList[0].id);//输入框赋值
       DataSubmit.value.masterVehicleNub = SJname[0].vehicleVOList[0].vehicleNub; //主车牌赋值
       CLchangeSelect([SJname[0].vehicleVOList[0].id])
@@ -3327,7 +3330,7 @@ sjInput.value=''
 <style lang="scss" scoped>
 .orderPage,
 .orderPageS {
-  height: 100%;
+  height: auto;
   :deep(.el-form) {
     display: flex;
     align-items: flex-start;