From dddd984c312d79775298fc44db51c8f2a3150f15 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 27 Feb 2024 15:47:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=9C=AA?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AE=8C=E6=AF=95=E9=A1=B5=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/storage/StorageForm.vue           | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index 2124f1de..0b450a51 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -101,7 +101,7 @@
                         <!-- <el-select v-model="scope.row.matId" placeholder="物料编码/名称" :remote-method="remoteMatCodeSearch" v-bind:disabled="ctrView || ctrSave" remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading" @change="(val) => handleMatCode(scope, val)" class="!w-180px">
                           <el-option v-for="item in matList" :key="item.id" :label="item.code" :value="item.id" />
                         </el-select> -->
-                         <MaterialSelect v-model="scope.row.matId" @update:newValue="handleSelectedMaterial(scope.$index,$event)" />
+                        <MaterialSelect v-model="scope.row.matId" @update:newValue="handleSelectedMaterial(scope.$index,$event)" />
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -193,7 +193,7 @@
                   </el-button>
                 </el-upload>
               </el-col>
-              <el-table :data="formData.attachments" class="hl-table">
+              <el-table :data="formData.attachments" class="hl-table" v-loading.fullscreen.lock="uploading" element-loading-text="附件上传中..." element-loading-background="rgba(122, 122, 122, 0.6)">
                 <el-table-column prop="name" label="文件名称" align="center">
                   <!-- <template #default="scope">
                     <a :href="scope.row.url" target="_blank" style="color: #409eff">{{ scope.row.name }} </a>
@@ -390,6 +390,7 @@ const handleStockType = async (typeid) => {
 const uploadUrl = ref(import.meta.env.VITE_UPLOAD_BATCH_URL)
 const matUploadRef = ref()
 const matUploadFiles = ref<UploadUserFile[]>([])
+const uploading = ref(false)
 const matUploadData = ref({
   businessType: 'STORAGE',
   businessId: formData.value.id,
@@ -445,7 +446,6 @@ const refreshAttachments = (files, type) => {
     file.createTime = new Date()
     formData.value.attachments.push(file)
   }
-
   // 排序
   formData.value.attachments.sort((v1, v2) => v1.createTime - v2.createTime)
 
@@ -453,7 +453,10 @@ const refreshAttachments = (files, type) => {
   const sum = successfulUploadsCount.value + failedUploadsCount.value
   console.log('上传总数', sum)
   console.log('要上传文件数量', sumbefore.value)
-  if (sum == sumbefore.value && sumbefore.value > 0 && sum > 0) {
+  if (sumbefore.value !== sum) {
+    console.log('要上传文件数量不等于上传总数时等待')
+    uploading.value = true
+  } else if (sum == sumbefore.value && sumbefore.value > 0 && sum > 0) {
     console.log('要上传文件数量等于上传总数 刷新页面并给出提示')
     if (failedUploadsCount.value > 0) {
       ElMessageBox.alert(
@@ -468,6 +471,7 @@ const refreshAttachments = (files, type) => {
       )
     }
     reload()
+    uploading.value = false
   }
 }