1

public/static/weightCheckOutNew.html

@@ -162,8 +162,8 @@
                             <td class="col" colspan="2">{{item.customer}}</td>
                             <td class="col col-bgc">联系电话</td>
                             <td class="col">{{item.customerPhone}}</td>
-                            <td class="col col-bgc">车牌号</td>
-                            <td class="col" colspan="2">{{item.carNumber}}</td>
+                            <td class="col col-bgc">货名</td>
+                            <td class="col" colspan="2">{{item.goodsName}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">收货单位</td>
@@ -173,9 +173,9 @@
                             <td class="col col-bgc">联系电话</td>
                             <td class="col" colspan="2">{{item.personPhone}}</td>
                         </tr>
-                        
-                       
-                        <tr class="row">
+
+
+                        <!-- <tr class="row">
                             <td class="col col-bgc">货名</td>
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
@@ -186,8 +186,8 @@
                             <td class="col col-bgc">不完善粒（%）</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
                             </td>
-                        </tr>
-                        <tr class="row">
+                        </tr> -->
+                        <!-- <tr class="row">
                             <td class="col col-bgc">等级</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
                             <td class="col col-bgc">水分（%）</td>
@@ -209,7 +209,8 @@
                             <td class="col">
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
                             <td class="col " colspan="2"></td>
-                        </tr>
+                        </tr> -->
+
                         <tr class="row">
                             <td class="col col-bgc">毛重（公斤）</td>
                             <td class="col">{{item.grossWeight}}</td>
@@ -222,6 +223,26 @@
                             <!-- <td class="col " colspan="2"></td> -->
 
                         </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">运输方式</td>
+                            <td class="col" colspan="2">{{item.outType}}</td>
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>车牌号</td>
+                            <td class="col col-bgc" v-if='item.outType=="火运"'>车号</td>
+                            <td class="col col-bgc" v-if='item.outType=="散船"'>船名</td>
+                            <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"||item.outType=="火运"'>{{item.carNo}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="散船"'>{{item.shipName}}</td>
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>箱号</td>
+                            <td class="col col-bgc" v-if='item.outType=="火运"'>车厢号</td>
+                            <td class="col col-bgc" v-if='item.outType=="散船"'>船次</td>
+                            <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
+                                {{item.boxNo}} {{item.boxNoOther}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="火运"'>
+                                {{item.wingNumber}} {{item.wingNumberOther}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="散船"'>{{item.shipNumber}}</td>
+                        </tr>
                         <tr class="row">
                             <td class="col col-bgc" colspan="2">毛重检斤时间</td>
                             <td class="col" colspan="2">{{item.grossDate}}</td>
@@ -260,12 +281,12 @@
                     <div class="number">{{item.number}}</div>
                     <table class="table">
                         <tr class="row">
-                            <td class="col col-bgc" >发货单位</td>
-                            <td class="col" colspan="2" >{{item.customer}}</td>
-                            <td class="col col-bgc" >联系电话</td>
-                            <td class="col" >{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
-                            <td class="col col-bgc">车牌号</td>
-                            <td class="col" colspan="2">{{item.carNumber}}</td>
+                            <td class="col col-bgc">发货单位</td>
+                            <td class="col" colspan="2">{{item.customer}}</td>
+                            <td class="col col-bgc">联系电话</td>
+                            <td class="col">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
+                            <td class="col col-bgc">货名</td>
+                            <td class="col" colspan="2">{{item.goodsName}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">收货单位</td>
@@ -275,8 +296,8 @@
                             <td class="col col-bgc">联系电话</td>
                             <td class="col" colspan="2">{{item.personPhone}}</td>
                         </tr>
-                        
-                        <tr class="row">
+
+                        <!-- <tr class="row">
                             <td class="col col-bgc">货名</td>
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
@@ -286,9 +307,9 @@
                             </td>
                             <td class="col col-bgc">不完善粒（%）</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
-                            </td>
-                        </tr>
-                        <tr class="row">
+                            </td> 
+                        </tr>-->
+                        <!-- <tr class="row">
                             <td class="col col-bgc">等级</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
                             <td class="col col-bgc">水分（%）</td>
@@ -310,7 +331,7 @@
                             <td class="col">
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
                             <td class="col " colspan="2"></td>
-                        </tr>
+                        </tr> -->
                         <tr class="row">
                             <td class="col col-bgc">毛重（公斤）</td>
                             <td class="col">{{item.grossWeight}}</td>
@@ -323,6 +344,26 @@
                             <!-- <td class="col " colspan="2"></td> -->
 
                         </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">运输方式</td>
+                            <td class="col" colspan="2">{{item.outType}}</td>
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>车牌号</td>
+                            <td class="col col-bgc" v-if='item.outType=="火运"'>车号</td>
+                            <td class="col col-bgc" v-if='item.outType=="散船"'>船名</td>
+                            <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"||item.outType=="火运"'>{{item.carNo}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="散船"'>{{item.shipName}}</td>
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>箱号</td>
+                            <td class="col col-bgc" v-if='item.outType=="火运"'>车厢号</td>
+                            <td class="col col-bgc" v-if='item.outType=="散船"'>船次</td>
+                            <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
+                                {{item.boxNo}} {{item.boxNoOther}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="火运"'>
+                                {{item.wingNumber}} {{item.wingNumberOther}}
+                            </td>
+                            <td class="col" colspan="2" v-if='item.outType=="散船"'>{{item.shipNumber}}</td>
+                        </tr>
                         <tr class="row">
                             <td class="col col-bgc" colspan="2">毛重检斤时间</td>
                             <td class="col" colspan="2">{{item.grossDate}}</td>
@@ -368,17 +409,17 @@
                         <td class="col" colspan="2">{{_item.personPhone}}</td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc" >收货单位</td>
-                        <td class="col" colspan="2" >{{_item.customer}}</td>
-                        <td class="col col-bgc" >联系电话</td>
-                        <td class="col" >{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
-                        <td class="col col-bgc">车牌号</td>
-                        <td class="col" colspan="2">{{_item.carNumber}}</td>
-                    </tr>
-                   
-                    <tr class="row">
+                        <td class="col col-bgc">收货单位</td>
+                        <td class="col" colspan="2">{{_item.customer}}</td>
+                        <td class="col col-bgc">联系电话</td>
+                        <td class="col">{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
                         <td class="col col-bgc">货名</td>
-                        <td class="col">{{_item.goodsName}}</td>
+                        <td class="col" colspan="2">{{_item.goodsName}}</td>
+                    </tr>
+
+                    <!--  <tr class="row">
+                       <td class="col col-bgc">货名</td>
+                        <td class="col">{{_item.goodsName}}</td> 
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{_item.type}}</td>
                         <td class="col col-bgc">容量（克/升）</td>
@@ -386,9 +427,9 @@
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
                         <td class="col col-bgc">不完善粒（%）</td>
                         <td class="col">
-                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td>
-                    </tr>
-                    <tr class="row">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td> 
+                    </tr>-->
+                    <!-- <tr class="row">
                         <td class="col col-bgc">等级</td>
                         <td class="col">{{_item.qualityInspectionManagement?_item.qualityInspectionManagement.grade:''}}
                         </td>
@@ -414,7 +455,7 @@
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
                         </td>
                         <td class="col " colspan="2"></td>
-                    </tr>
+                    </tr> -->
                     <tr class="row">
                         <td class="col col-bgc">毛重（公斤）</td>
                         <td class="col">{{_item.grossWeight}}</td>
@@ -426,6 +467,26 @@
                         <td class="col">{{_item.netWeight}}</td>
                         <td class="col " colspan="2"></td>
                     </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">运输方式</td>
+                        <td class="col" colspan="2">{{_item.outType}}</td>
+                        <td class="col col-bgc" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>车牌号</td>
+                        <td class="col col-bgc" v-if='_item.outType=="火运"'>车号</td>
+                        <td class="col col-bgc" v-if='_item.outType=="散船"'>船名</td>
+                        <td class="col" colspan="2" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"||_item.outType=="火运"'>{{_item.carNo}}
+                        </td>
+                        <td class="col" colspan="2" v-if='_item.outType=="散船"'>{{_item.shipName}}</td>
+                        <td class="col col-bgc" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>箱号</td>
+                        <td class="col col-bgc" v-if='_item.outType=="火运"'>车厢号</td>
+                        <td class="col col-bgc" v-if='_item.outType=="散船"'>船次</td>
+                        <td class="col" colspan="2" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>
+                            {{_item.boxNo}} {{_item.boxNoOther}}
+                        </td>
+                        <td class="col" colspan="2" v-if='_item.outType=="火运"'>
+                            {{_item.wingNumber}} {{_item.wingNumberOther}}
+                        </td>
+                        <td class="col" colspan="2" v-if='_item.outType=="散船"'>{{_item.shipNumber}}</td>
+                    </tr>
                     <tr class="row">
                         <td class="col col-bgc" colspan="2">毛重检斤时间</td>
                         <td class="col" colspan="2">{{_item.grossDate}}</td>
@@ -600,25 +661,34 @@
             if (_data == 'null') {
                 this.selectPrint = true;
                 this.tableData1 = JSON.parse(localStorage.getItem('selectPrint_jjSelectPrintList'))
+                console.log("this.tableData1")
+                console.log(this.tableData1)
                 if (_ew == 'true') {
                     this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
+                    console.log("this.tableDataEW")
+                    console.log(this.tableDataEW)
                     this.isEWPrint = true
                 }
                 if (_ewdd == 'true') {
+
                     this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
                     this.isDDPrint = true
+                    console.log("this.ewdd")
+                    console.log(this.tableDataEW)
                 }
             } else {
                 this.tableData = JSON.parse(_data.replace(/baifenhao/g, '%'))
+                console.log("this.tableData")
+                console.log(this.tableData)
             }
             // sessionStorage.setItem('record_print', JSON.stringify(response))
             // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))
 
             document.title = "粮食检斤单"
-            window.print()
-            window.onafterprint = function(event) {
-                window.history.back(-1)
-            };
+                //window.print()
+                //window.onafterprint = function(event) {
+                //  window.history.back(-1)
+                //};
         },
         watch: {}
     })