yangg 3 months ago
parent
commit
ff35f6237e

+ 1 - 1
manager-admin/dist/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><script>var ua = window.navigator.userAgent
     var isIe = /MSIE|Trident/.test(ua)
-    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.f93fc3c1be3c5102666b22266a79ad30.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.349acd73ae8097eba443.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.1fb762d679dd05080021.js></script></body></html>
+    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.f93fc3c1be3c5102666b22266a79ad30.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.c6e3a4688d8215885c77.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.34cf871bdbc531540f62.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/10.4ff235388d5dd4c4e480.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/10.9c6b137d9e5e6f5bc8f1.js


BIN
manager-admin/dist/static/js/10.9c6b137d9e5e6f5bc8f1.js.gz


BIN
manager-admin/dist/static/js/11.718ca8996be66c70db05.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/11.c5c814bafd8fbcef9e66.js


BIN
manager-admin/dist/static/js/11.c5c814bafd8fbcef9e66.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/19.20334d3d7a6ca3fba7e6.js


BIN
manager-admin/dist/static/js/19.20334d3d7a6ca3fba7e6.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/19.e9c8a322dc62c61d7daf.js


BIN
manager-admin/dist/static/js/19.e9c8a322dc62c61d7daf.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/8.28d2aaf3e46c4ed25c4f.js


BIN
manager-admin/dist/static/js/8.28d2aaf3e46c4ed25c4f.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js


BIN
manager-admin/dist/static/js/8.595ae593b34020f76494.js.gz → manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/9.c275f597a7b6f62a86cc.js


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/app.34cf871bdbc531540f62.js


BIN
manager-admin/dist/static/js/app.1fb762d679dd05080021.js.gz → manager-admin/dist/static/js/app.34cf871bdbc531540f62.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/manifest.c6e3a4688d8215885c77.js


+ 28 - 9
manager-admin/src/views/stock/goodsExchange/goodsExchange.vue

@@ -549,6 +549,7 @@ export default {
         this.GET_WarehouseEntry();
       }
     },
+    
     /** 获取出库单列表 */
     GET_GoodsExchangeList() {
       this.loading = true;
@@ -570,19 +571,37 @@ export default {
           // 使用 Promise.all 处理所有异步请求
           Promise.all(
             response.data.map((el) => {
-              return API_GoodsExchange.getGoodsExchangeInfo(el.id).then(
-                (res) => {
-                  // 使用 map 获取所有商品名称,然后用逗号连接
-                  el.goodsName = res.product_list
-                    .map((e) => e.product_vo.name)
-                    .join(", ");
+              return API_GoodsExchange.getGoodsExchangeInfo(el.id)
+                .then((res) => {
+                  try {
+                    // 使用 map 获取所有商品名称,然后用逗号连接
+                    if (res && res.product_list && Array.isArray(res.product_list)) {
+                      el.goodsName = res.product_list
+                        .map((e) => (e && e.product_vo ? e.product_vo.name : '未知商品'))
+                        .join(", ");
+                    } else {
+                      el.goodsName = '无商品信息';
+                    }
+                  } catch (error) {
+                    console.error('处理商品名称时出错:', error);
+                    el.goodsName = '获取商品信息失败';
+                  }
                   return el;
-                }
-              );
+                })
+                .catch((error) => {
+                  console.error(`获取ID为${el.id}的商品信息失败:`, error);
+                  el.goodsName = '获取商品信息失败';
+                  return el; // 即使请求失败也返回原始元素
+                });
             })
-          ).then(() => {
+          )
+          .then((results) => {
             console.log(response);
             this.tableData = response;
+          })
+          .catch((error) => {
+            console.error('处理商品列表时出错:', error);
+            this.tableData = response; // 确保即使出错也能显示基本数据
           });
         })
         .catch(() => {

+ 1 - 1
ui-domain/api.js

@@ -9,7 +9,7 @@
 module.exports = {
   // 开发环境 192.168.8.103:9999
   dev: {
-    admin: window.__ENV__.API_ADMIN || 'http://apidoc.raycos.net'//https://apidoc.raycos.net http://192.168.8.103:9999
+    admin: window.__ENV__.API_ADMIN || 'http://apidoc.raycos.net'//https://apidoc.raycos.net http://apidoc.raycos.net
   },
   // 测试环境apidoc.raycos.net 60.204.236.53:9999
   test: {

Some files were not shown because too many files changed in this diff