瀏覽代碼

修改检斤导入打印

mxx 3 年之前
父節點
當前提交
6a913d8037

+ 4 - 9
public/static/weightCheck.html

@@ -22,12 +22,7 @@
         width: 1000px;
         width: 1000px;
         padding: 30px 20px 20px 20px;
         padding: 30px 20px 20px 20px;
         font-size: 18px;
         font-size: 18px;
-        height: 90vh;
-        /* position: absolute; */
-        /*        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0; */
+        height: 65vh;
       }
       }
 
 
       .a5-content {
       .a5-content {
@@ -146,7 +141,7 @@
               </tr>
               </tr>
               <tr class="row">
               <tr class="row">
                 <td class="col col-bgc">收货单位</td>
                 <td class="col col-bgc">收货单位</td>
-                <td class="col" colspan="2">{{item.compName}}</td>
+                <td class="col" colspan="2">{{item.receivingUnit}}</td>
                 <td class="col col-bgc">联系人</td>
                 <td class="col col-bgc">联系人</td>
                 <td class="col">{{item.person}}</td>
                 <td class="col">{{item.person}}</td>
                 <td class="col col-bgc">联系电话</td>
                 <td class="col col-bgc">联系电话</td>
@@ -234,7 +229,7 @@
             </tr>
             </tr>
             <tr class="row">
             <tr class="row">
               <td class="col col-bgc">收货单位</td>
               <td class="col col-bgc">收货单位</td>
-              <td class="col" colspan="2">{{tableData.compName}}</td>
+              <td class="col" colspan="2">{{tableData.receivingUnit}}</td>
               <td class="col col-bgc">联系人</td>
               <td class="col col-bgc">联系人</td>
               <td class="col">{{tableData.person}}</td>
               <td class="col">{{tableData.person}}</td>
               <td class="col col-bgc">联系电话</td>
               <td class="col col-bgc">联系电话</td>
@@ -328,7 +323,7 @@
         </div>
         </div>
         <div class="small-row">
         <div class="small-row">
           <div>收货单位</div>
           <div>收货单位</div>
-          <div>{{tableData.compName}}</div>
+          <div>{{tableData.receivingUnit}}</div>
         </div>
         </div>
         <div class="small-row">
         <div class="small-row">
           <div>联系人</div>
           <div>联系人</div>

+ 2 - 1
src/views/houseSelfCollect/weighingManagement.vue

@@ -215,6 +215,7 @@
         // }
         // }
       },
       },
       handleChange(file, fileList) {
       handleChange(file, fileList) {
+        this.jjSelectPrintList = []
         this.fileTemp = file.raw
         this.fileTemp = file.raw
         let fileName = file.raw.name
         let fileName = file.raw.name
         let fileType = fileName.substring(fileName.lastIndexOf('.') + 1);
         let fileType = fileName.substring(fileName.lastIndexOf('.') + 1);
@@ -287,7 +288,7 @@
               obj.customer = v.客户姓名
               obj.customer = v.客户姓名
               obj.customerPhone = v.客户电话
               obj.customerPhone = v.客户电话
               obj.carNumber = v.车牌号
               obj.carNumber = v.车牌号
-              obj.compName = v.收货单位
+              obj.receivingUnit = v.收货单位
               obj.person = v.联系人
               obj.person = v.联系人
               obj.personPhone = v.联系电话
               obj.personPhone = v.联系电话
               obj.goodsName = v.货名
               obj.goodsName = v.货名

+ 6 - 5
src/views/warehouse/warehouseManagementList.vue

@@ -511,6 +511,7 @@ export default {
           }else{
           }else{
             var warehousePrint = response.records
             var warehousePrint = response.records
             if(this.parameter.proportion){
             if(this.parameter.proportion){
+
                var countWeight = 0
                var countWeight = 0
             for(let i = 0 ; i < warehousePrint.length ; i++){
             for(let i = 0 ; i < warehousePrint.length ; i++){
               countWeight += Number(warehousePrint[i].netWeight)
               countWeight += Number(warehousePrint[i].netWeight)
@@ -554,12 +555,12 @@ export default {
                       }
                       }
                     response1.splice(index,1)//删除已添加过得假数据车牌号
                     response1.splice(index,1)//删除已添加过得假数据车牌号
                   }
                   }
-                    sessionStorage.setItem("inOutWarehouse_Print",JSON.stringify(warehousePrint))
-                    let i = ""
-                    i = this.parameter.radio+"&warehouseName=" + this.parameter.warehouseName
-                    window.open('../../../../../static/warehousePrint.html?type=' + i)
                     // return
                     // return
-                }
+                } 
+                sessionStorage.setItem("inOutWarehouse_Print",JSON.stringify(warehousePrint))
+                    let _i = ""
+                    _i = this.parameter.radio+"&warehouseName=" + this.parameter.warehouseName
+                    window.open('../../../../../static/warehousePrint.html?type=' + _i)
               //  },2000)
               //  },2000)
                 
                 
              }) 
              })