Merge remote-tracking branch 'origin/dev' into dev

public/static/内部领物单.html

@@ -13,7 +13,7 @@
         }
 
         .max_box {
-            width: 756px;
+            width: 1000px;
             /* height: 1086px; */
             margin: auto;
         }
@@ -54,7 +54,7 @@
         }
         .neirtb>div{
             text-align: center;
-            height: 30px;
+            height: 70px;
             line-height: 30px;
             border-bottom: 2px solid #000000;
             border-right: 2px solid #000000;
@@ -159,7 +159,7 @@
     <!--startprint-->
         <div class="max_box">
             <div>新疆分公司内部领物单</div>
-            <div>年&nbsp;&nbsp;&nbsp;&nbsp;月&nbsp;&nbsp;&nbsp;&nbsp;日</div>
+            <div id="">年&nbsp;&nbsp;&nbsp;&nbsp;月&nbsp;&nbsp;&nbsp;&nbsp;日</div>
             <div class="danweixx">
                 <div>
                     <div>用料单位：</div>
@@ -167,7 +167,7 @@
                 </div>
                 <div>
                     <div>用途：</div>
-                    <div></div>
+                    <div id="yt"></div>
                 </div>
                 <div>
                     <div>库存数量：</div>
@@ -229,21 +229,46 @@
 </body>
 <script>
     let dom1 = document.getElementsByClassName('maxbiox')[0]
-    let htmls = ''
-    for (let i = 1; i <= 3; i++) {
+    // let htmls = ''
+    // for (let i = 1; i <= 3; i++) {
+    //     htmls += `<div class="neirtb">
+    //                     <div></div>
+    //                     <div></div>
+    //                     <div></div>
+    //                     <div></div>
+    //                     <div></div>
+    //                     <div></div>
+    //                     <div></div>
+    //                 </div>`
+    // }
+    // dom1.innerHTML = htmls
+    // console.log(dom1);
+    window.addEventListener('message', messageEvent=> {
+      if(messageEvent.source!=window.parent.window.parent) {
+        return ;
+      };
+      console.log('儿子收到vue的数据：>>>>>>>>>>>>>>>>>>>>',messageEvent.data);
+    let  data = messageEvent.data;
+      console.log("data>>>>>>>>>>>>>>>>>>>>",data);
+      let yt=document.getElementById('yt')
+      let yt1 = data[0].equipment
+        if(data[0].equipment !=null){
+          yt.innerHTML=yt1
+        }
+      let htmls = ``
+      data.map((item,index)=>{
         htmls += `<div class="neirtb">
-                        <div></div>
-                        <div></div>
-                        <div></div>
-                        <div></div>
-                        <div></div>
-                        <div></div>
-                        <div></div>
-                    </div>`
-    }
-    dom1.innerHTML = htmls
-    console.log(dom1);
-
+                    <div></div>
+                    <div>${item.materialName}</div>
+                    <div>${item.materialUnit}</div>
+                    <div>${item.pleaseSendNumber}</div>
+                    <div>${item.actualSendNumber}</div>
+                    <div>${item.materialPrice}</div>
+                    <div>${item.materialAmount}</div>
+                </div>`
+      })
+      dom1.innerHTML = htmls
+    });
     function preview() {
         bdhtml = window.document.body.innerHTML;
         sprnstr = "<!--startprint-->"; //开始打印标识字符串有17个字符

src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue

@@ -44,7 +44,7 @@ name: "ProcessMaterialsDeliveryStatement",
       showSessionId : '',
       srcHtml : '',
       url:{
-        list: "/hy/processMaterialsDelivery/listStockRemoval",
+        list: "/hy/processMaterialsDelivery/stockRemovalDetails",
       },
       Wslist:[]
     }
@@ -99,7 +99,6 @@ name: "ProcessMaterialsDeliveryStatement",
           console.log(res);
           if (res.success) {
             this.Wslist = res.result.records;
-            console.log("res.result>>>>>>>>>>>>>>>>",res.result)
           }
           if(res.code===510){
             this.$message.warning(res.message)