Merge branch 'dev' into pre-production

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -2848,6 +2848,7 @@ export default {
     },
     //库存品
     onLoadList(page, params = {}) {
+      console.log('111 :>> ', 111);
       this.loading = true;
       let a = {};
       if (this.$route.query.type == '1') {
@@ -2855,8 +2856,10 @@ export default {
       } else if (this.$route.query.type === '2') {
         a = this.dataList[0];
       } else if (this.$route.query.type == '3') {
-        a = this.dataOrder[0];
+        a = this.dataList[0];
       }
+      console.log('a :>> ', a);
+      console.log(' this.dataOrder :>> ', this.dataOrder);
       // let a = this.dataList[0];
       if (!!a.mallId) {
         params.marketId = a.mallId;
@@ -2872,6 +2875,10 @@ export default {
           this.selectionClear();
         });
       } else {
+        this.$message({
+          type: 'warning',
+          message: '无法获取商场信息',
+        });
         this.loading = false;
         this.pageStock.total = 0;
       }

vite.config.js

@@ -20,8 +20,8 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.75:8777',
           // tjj
-          target: 'http://192.168.10.29:13000',
-          // target: 'http://test.api.huitongys.com',
+          // target: 'http://192.168.10.29:13000',
+          target: 'http://test.api.huitongys.com',
           // target: 'http://h5uapi.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),