From 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Mon Sep 17 00:00:00 2001
From: big-y <804609860@qq.com>
Date: Thu, 10 Aug 2023 16:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionStockArticleDetails.vue       | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 9d10de61..15215c58 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -259,10 +259,10 @@
       <el-dialog
         title="二维码"
         :visible.sync="dialogVisible"
-        width="30%"
+        width="640px"
         v-model="dialogVisible">
         <div >
-          <div>
+          <div v-html="html">
 
           </div>
 
@@ -562,7 +562,7 @@ export default {
           hide: true,
         },
       ],
-      html:null // 页面包条码内容
+      html:'' // 页面包条码内容
     }
   },
   mounted () {
@@ -1172,24 +1172,31 @@ export default {
       // this.view = true;
       // this.box = true;
       this.materialQRCode = row;
- 
+
       let qr ={
         id : row.id,
         qrCode: row.orderPackageCode
       }
       showOrderPackgeCode(qr).then(res => {
+          this.html='';
+          console.log(res.data);
+        this.orderPackageCode = res.data;
+        let strhtml=JSON.parse(JSON.stringify( this.orderPackageCode.data.templateHtml))
+          this.orderPackageCode .data.dataList.map(item=>{
 
-        this.orderPackageCode = res.data
-        
-        this.arrs.map(item=>{
-			  let strhtml=JSON.parse(JSON.stringify(this.htmls))
+			  // let strhtml=JSON.parse(JSON.stringify( this.orderPackageCode.data.templateHtml))
 			  for(let key in item){
-				  strhtml=strhtml.replace(`{{${key}}}`,item[key])
+                  // if(!item.hasOwnProperty(key)){
+                  //     item[key]=" ";
+                  // }
+                  let str="${"+key+"}";
+			      // console.log(item[key]);
+				  strhtml=strhtml.replace(str,item[key])
 			  }
-			  console.log(strhtml);
-			  this.html+=strhtml
+			   console.log(strhtml);
+			  this.html+=strhtml;
 		})
-        
+
       });
 
       this.dialogVisible = true;