From 5e832c0dbe8a191fbe757770954224365d707fed Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Wed, 17 Apr 2024 17:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wmsManagement/WmMaterial.vue    | 16 +++++++++++++++-
 src/views/wmsManagement/WmpatchSearch.vue |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/wmsManagement/WmMaterial.vue b/src/views/wmsManagement/WmMaterial.vue
index 850481d..7dbbae8 100644
--- a/src/views/wmsManagement/WmMaterial.vue
+++ b/src/views/wmsManagement/WmMaterial.vue
@@ -275,6 +275,7 @@
 <script>
 import { listWmMaterial, addWmMaterial, delWmMaterial, updateWmMaterial, getWmMaterial } from '@/api/wmsManagement/wmMaterial.js'
 import { getToken } from '@/utils/auth'
+import { formatDate } from '@/utils/index'
 export default {
   name: 'wmmaterial',
   data() {
@@ -385,6 +386,8 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + '/mes/wm/WmMaterial/importData',
       },
+
+      fullloading: null,
     }
   },
   created() {
@@ -393,6 +396,9 @@ export default {
 
     var dictParams = []
   },
+  mounted() {
+    this.upload.time =window.localStrorage.getItem('material')
+  },
   methods: {
     // 查询数据
     getList() {
@@ -546,7 +552,6 @@ export default {
     importTemplate() {
       //  @/utils/ruoyi"
       this.download('/mes/wm/WmMaterial/download_template', '物料清单导入模板')
-    
     },
 
     // todo 文件上传中处理
@@ -556,12 +561,21 @@ export default {
     //todo  提交上传文件
     submitFileForm() {
       this.$refs.upload.submit()
+      this.fullloading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+      })
+      //保存数据
+      window.localStorage.setItem('material', new Date())
     },
     //todo 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
+      this.fullloading.close()
       if (response.code == 200) {
         this.$alert(response.data, '导入结果', { dangerouslyUseHTMLString: true })
       } else {
diff --git a/src/views/wmsManagement/WmpatchSearch.vue b/src/views/wmsManagement/WmpatchSearch.vue
index 8bbd581..45ef664 100644
--- a/src/views/wmsManagement/WmpatchSearch.vue
+++ b/src/views/wmsManagement/WmpatchSearch.vue
@@ -23,6 +23,7 @@
     </el-form>
 
     <vxe-table
+      keep-source
       resizable
       ref="xTable"
       :tree-config="{ transform: true, rowField: 'packageCodeClient_son', parentField: 'packageCodeClient_short_parent' }"