后厨商品导入导出增加加载20240830-打包提交

dist/asset-manifest.json

@@ -1,6 +1,6 @@
 {
   "/umi.css": "/umi.2d7db433.css",
-  "/umi.js": "/umi.f6ff2c12.js",
+  "/umi.js": "/umi.9daee39b.js",
   "/t__plugin-layout__Layout.css": "/t__plugin-layout__Layout.e1129705.chunk.css",
   "/t__plugin-layout__Layout.js": "/t__plugin-layout__Layout.87f875be.async.js",
   "/p__user__login.css": "/p__user__login.2f84d6a8.chunk.css",
@@ -23,7 +23,7 @@
   "/p__database__goods__goodstypemanage.js": "/p__database__goods__goodstypemanage.22dd50b7.async.js",
   "/p__database__goods__goodsattribute.js": "/p__database__goods__goodsattribute.4738ebf1.async.js",
   "/p__database__goods__newgoods.css": "/p__database__goods__newgoods.648d67d4.chunk.css",
-  "/p__database__goods__newgoods.js": "/p__database__goods__newgoods.92f66b44.async.js",
+  "/p__database__goods__newgoods.js": "/p__database__goods__newgoods.1b937ba1.async.js",
   "/p__database__goods__goodsInfo.js": "/p__database__goods__goodsInfo.3cab935f.async.js",
   "/p__database__goods__goodsbom.js": "/p__database__goods__goodsbom.bf9c6572.async.js",
   "/p__database__goods__goodstechnology.css": "/p__database__goods__goodstechnology.bee21a79.chunk.css",

dist/authorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/authorization/platformAuthorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/authorization/storeAuthorization/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/company/account/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/company/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/basic/batching/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/bom/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/goods/goodsInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/goods/goodsattribute/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/goods/goodsattributeprice/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/goods/goodsbom/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/goods/goodsclassify/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/goods/goodstechnology/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/goods/goodstypemanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/goods/newgoods/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/database/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/device/deviceInfo/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/device/deviceVesion/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/device/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/device/product/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/device/productmanage/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/device/technology/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/device/warehousepostion/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/order/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/order/orderflow/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/order/thirdAuthorize/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/order/thirdOrder/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/org/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/org/orgamange/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/org/roles/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/org/users/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/push/batchingpush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/push/bompush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/push/goodspush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/push/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/push/technologypush/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/scene/foodmenu/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/scene/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/scene/store/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/sys/dictionary/dicttype/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/sys/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/sys/menus/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/user/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/user/login/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

dist/welcome/index.html

@@ -221,6 +221,6 @@
       </div>
     </div>
 
-    <script src="/umi.f6ff2c12.js"></script>
+    <script src="/umi.9daee39b.js"></script>
   </body>
 </html>

src/pages/database/goods/newgoods/index.jsx

@@ -321,6 +321,7 @@ const GoodsManage = () => {
   ];
 
   const importMessage = (json) =>{
+    const hide = message.loading('正在导入');
     const formDataAll = new FormData();
     formDataAll.append('file', importFile);
     formDataAll.append('json', json);
@@ -339,6 +340,7 @@ const GoodsManage = () => {
     }).catch(error => {
       message.error(error);
     });
+    hide();
   }
 
   /**
@@ -415,36 +417,38 @@ const GoodsManage = () => {
       message.error('请选择一个设备！');
       return;
     }
-      await GoodsExport({ goodId: goodId, deviceId: deviceId, goodsId: goodsId }).then((r) => {
-        if (r.succeeded) {
-          const base64String = r.data;
-          // 解码 Base64 数据
-          const binaryString = atob(base64String);
-          // 转换为 Uint8Array
-          const bytes = new Uint8Array(binaryString.length);
-          for (let i = 0; i < binaryString.length; i++) {
-            bytes[i] = binaryString.charCodeAt(i);
-          }
-          // 创建 Blob 对象
-          const blob = new Blob([bytes], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
-          // 创建一个临时的 URL，指向 Blob 对象
-          const url = window.URL.createObjectURL(blob);
-          // 创建 <a> 元素，用于下载文件
-          const link = document.createElement('a');
-          const fileName = "商品.zip";
-          link.href = url;
-          link.setAttribute('download', fileName);
-          // 将 <a> 元素添加到页面中
-          document.body.appendChild(link);
-          // 模拟用户点击下载链接，触发文件下载
-          link.click();
-          // 下载完成后，移除 <a> 元素
-          document.body.removeChild(link);
-          message.success("下载成功");
-        }else{
-          message.error(r.errors);
+    const hide = message.loading('正在下载');
+    await GoodsExport({ goodId: goodId, deviceId: deviceId, goodsId: goodsId }).then((r) => {
+      if (r.succeeded) {
+        const base64String = r.data;
+        // 解码 Base64 数据
+        const binaryString = atob(base64String);
+        // 转换为 Uint8Array
+        const bytes = new Uint8Array(binaryString.length);
+        for (let i = 0; i < binaryString.length; i++) {
+          bytes[i] = binaryString.charCodeAt(i);
         }
-      })
+        // 创建 Blob 对象
+        const blob = new Blob([bytes], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+        // 创建一个临时的 URL，指向 Blob 对象
+        const url = window.URL.createObjectURL(blob);
+        // 创建 <a> 元素，用于下载文件
+        const link = document.createElement('a');
+        const fileName = "商品.zip";
+        link.href = url;
+        link.setAttribute('download', fileName);
+        // 将 <a> 元素添加到页面中
+        document.body.appendChild(link);
+        // 模拟用户点击下载链接，触发文件下载
+        link.click();
+        // 下载完成后，移除 <a> 元素
+        document.body.removeChild(link);
+        message.success("下载成功");
+      } else {
+        message.error(r.errors);
+      }
+    })
+    hide();
   }
 
   return (