Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@@ -358,16 +358,22 @@
         });
       },
      async beforeOpen(done, type) {
+        // if (["edit", "view"].includes(type)) {
+        // await  getDetail(this.form.id).then(async res => {
+        //     // 这里还需要进行二维码图片显示
+        //    await getQRCode(this.form.qrCode).then(res=>{
+        //       let url = window.URL.createObjectURL(res.data);
+        //      console.log("url>>>>>>>",url);
+        //       this.form.qrCodeUrl = url;
+        //       console.log(res);
+        //     })
+        //     console.log(this.form);
+        //     this.form = res.data.data;
+        //   });
+        // }
+        // done();
        if (["edit", "view"].includes(type)) {
-        await  getDetail(this.form.id).then(async res => {
-            // 这里还需要进行二维码图片显示
-           await getQRCode(this.form.qrCode).then(res=>{
-              let url = window.URL.createObjectURL(res.data);
-             console.log("url>>>>>>>",url);
-              this.form.qrCodeUrl = url;
-              console.log(res);
-            })
-            console.log(this.form);
+         getDetail(this.form.id).then(res => {
            this.form = res.data.data;
          });
        }