代码提交

src/views/firstOrder/components/inDialog.vue

@@ -412,22 +412,21 @@ export default {
       console.log(file);
       const fileUrl = file.url || (file.response && file.response.result && file.response.result.fileUrl);
       if (!fileUrl) return;
-
-      // 如果需要携带 Token，且后端支持 URL 参数传参，可以拼接 Token
-      // const token = this.$store.getters.access_token;
-      // const previewUrl = `${fileUrl}?token=${token}`;
-
-      // 大多数情况下，OSS 或静态资源服务器是公开读的，直接打开即可
       window.open(fileUrl, '_blank');
     },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 6 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
+
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleUploadSuccess(response, file, fileList) {
-      this.fileList = fileList;
+      console.log(response, file, fileList);
+      this.fileList.push({
+        ...response.data.result,
+        name:response.data.result.fileName
+      })
     },
     beforeAvatarUpload(file) {
       // 1. 校验文件类型
@@ -472,7 +471,8 @@ export default {
             stat.theInboundQuantity = detail.theInboundQuantity; //本次入库数量
             stat.totalQuantity = stat.num + detail.theInboundQuantity;
             stat.unitPrice = detail.unitPrice;
-          } else {
+          } 
+          if (stat.type == "NY" && stat.num != 0) {
             stat.theInboundQuantity = 0; //本次入库数
             stat.unitPrice = stat.unitPrice;
             stat.totalQuantity = stat.num + detail.theInboundQuantity;
@@ -493,6 +493,7 @@ export default {
             (item) =>
               item.materialId === stat.materialId && item.type === stat.type
           );
+          console.log(detail,'detail',this.sizeForm.singleData);
           if (stat.type == "YH") {
             stat.theInboundQuantity = detail.theInboundQuantity; //本次入库数量
             stat.totalQuantity = stat.num + detail.theInboundQuantity;
@@ -502,7 +503,8 @@ export default {
             stat.theInboundQuantity = detail.theInboundQuantity; //本次入库数量
             stat.totalQuantity = stat.num + detail.theInboundQuantity;
             stat.unitPrice = detail.unitPrice;
-          } else {
+          } 
+          if (stat.type == "NY" && stat.num != 0) {
             stat.theInboundQuantity = 0; //本次入库数
             stat.unitPrice = stat.unitPrice;
             stat.totalQuantity = stat.num + detail.theInboundQuantity;
@@ -836,13 +838,12 @@ export default {
         this.sizeForm.onePutStorageFilesList = []
         this.fileList.forEach(item => {
           this.sizeForm.onePutStorageFilesList.push({
-            fileName: item.response.result.fileName,
+            fileName: item.fileName,
-            fileUrl: item.response.result.fileUrl,
+            fileUrl: item.fileUrl,
-            mediaId: item.response.result.mediaId,
+            mediaId: item.mediaId,
           })
         })
       }
-      console.log(this.sizeForm, 99);
       try {
         const res = await submitData(this.sizeForm);
         if (res.data.success) {

vue.config.js

@@ -27,7 +27,7 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.1.4:8088',
-        target: 'http://124.221.142.15:8090/api',
+        target: 'http://124.221.142.15:8333/api',
         //远程演示服务地址,可用于直接启动项目
         // target: 'https://saber.bladex.cn/api',
         ws: true,
@@ -35,28 +35,29 @@ module.exports = {
           '^/api': '/'
         }
       },
-      '/smartpark': {
+      '/smartparkAPP/': {
         //本地服务接口地址
-        // target: 'http://192.168.1.4:8088',
+        // target: 'http://192.168.1.4:8333',
-        target: 'http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableWebTestFront/smartpark',
+        target: 'http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableTest',
         //远程演示服务地址,可用于直接启动项目
         // target: 'https://saber.bladex.cn/api',
         ws: true,
         pathRewrite: {
-          '^/smartpark/': '/'
+          '^/smartparkAPP/': '/'
         }
       },
-      '/smartparkAPP': {
+      '/smartpark': {
         //本地服务接口地址
-        // target: 'http://192.168.1.4:8088',
+        // target: 'http://192.168.1.4:8333',
-        target: 'http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableTest',
+        target: 'http://atcflight.com:10094/6583e0b6-a422-4c74-aa40-df48e059b4de/lowDurableWebTestFront/smartpark',
         //远程演示服务地址,可用于直接启动项目
         // target: 'https://saber.bladex.cn/api',
         ws: true,
         pathRewrite: {
           '^/smartpark/': '/'
         }
-      }
+      },
+      
     }
   }
 };