From bb5448f036c5616a7040f355f8b93f90cc8406df Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 2 Sep 2024 09:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vehicle/basicdataVehicleAddForm.vue       | 28 +++++++++++++++++--
 .../distribution/inventory/CreateOrder.vue    |  3 +-
 src/views/waybill/CreateZeroOrder.vue         |  1 +
 src/views/waybill/TemporaryStorageList.vue    |  1 +
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/views/basicdata/vehicle/basicdataVehicleAddForm.vue b/src/views/basicdata/vehicle/basicdataVehicleAddForm.vue
index 44ae3465..ecb2f38c 100644
--- a/src/views/basicdata/vehicle/basicdataVehicleAddForm.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicleAddForm.vue
@@ -117,7 +117,7 @@
           </el-upload>
 
           <div class="imgRow">
-            <div v-for="(value, index) in item.imgList" :key="value.url">
+            <div v-for="(value, index) in item.imgList" :key="value.url" class="img_box">
               <el-image
                 class="img"
                 :src="value.url"
@@ -129,6 +129,12 @@
                 :initial-index="index"
                 fit="cover"
               />
+
+              <div class="mask">
+                <el-icon color="#f00" size="20" class="pointer">
+                  <CircleCloseFilled />
+                </el-icon>
+              </div>
             </div>
           </div>
         </div>
@@ -827,11 +833,29 @@ const handleSubmit = async () => {
     }
 
     .img {
-      margin: 10px;
       border-radius: 5px;
       width: 100px;
       height: 100px;
     }
+
+    .img_box {
+      position: relative;
+      margin: 10px;
+
+      .mask {
+        position: absolute;
+        top: 4px;
+        right: 4px;
+        opacity: 0;
+        transition: all 0.3s;
+      }
+
+      &:hover {
+        .mask {
+          opacity: 1;
+        }
+      }
+    }
   }
 }
 
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index a4447ab8..e890e427 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -698,6 +698,7 @@
                           :step="0.1"
                           v-model="query.totalFreight"
                           :value-on-clear="0"
+                          disabled
                         ></el-input-number>
                       </el-form-item>
 
@@ -3503,7 +3504,7 @@ const handleRepetition = () => {
   }
 
   handleChooseOrder();
-  resetForm(ruleFormRef.value);
+  // resetForm(ruleFormRef.value);
 };
 
 /** 查询货物 */
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index f4f1a8ce..d169bd47 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -643,6 +643,7 @@
                         :min="0"
                         :step="0.1"
                         v-model="query.totalFreight"
+                        disabled
                         :value-on-clear="0"
                       ></el-input-number>
                     </el-form-item>
diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue
index 26e6f984..d039d7db 100644
--- a/src/views/waybill/TemporaryStorageList.vue
+++ b/src/views/waybill/TemporaryStorageList.vue
@@ -1420,6 +1420,7 @@ onActivated(() => {
   if ($store.state.isRefresh.refreshObj.TemporaryStorageList) {
     // 重新请求数据
     details.query = {};
+    handleClearTableQuery(details.columnList);
     details.page.pageNum = 1;
     onLoad({}, true);