ccj 2 år sedan
förälder
incheckning
2d73d34ea8
1 ändrade filer med 70 tillägg och 54 borttagningar
  1. 70 54
      public/static/weightCheckOutNew.html

+ 70 - 54
public/static/weightCheckOutNew.html

@@ -212,31 +212,31 @@
                         </tr> -->
 
                         <tr class="row">
-                            <td class="col col-bgc">毛重(公斤)</td>
-                            <td class="col">{{item.grossWeight}}</td>
+                            <td class="col col-bgc" >毛重(公斤)</td>
+                            <td class="col" colspan="2">{{item.grossWeight}}</td>
                             <td class="col col-bgc">皮重(公斤)</td>
                             <td class="col">{{item.tare}}</td>
-                            <td class="col col-bgc">扣重(公斤)</td>
-                            <td class="col">{{item.buckleMiscellaneous}}</td>
+                            <!-- <td class="col col-bgc">扣重(公斤)</td>
+                            <td class="col">{{item.buckleMiscellaneous}}</td> -->
                             <td class="col col-bgc">净重(公斤)</td>
                             <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 col-bgc">运输方式</td> -->
+                            <!-- <td class="col" >{{item.outType}}</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 col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>封号</td>
                             <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
-                                {{item.boxNo}} {{item.boxNoOther}}
+                                {{item.titleNo}}   {{item.titleNoOther}}
+                            </td>
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>箱号</td>
+                            <td class="col" colspan="3" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
+                                {{item.boxNo}}       {{item.boxNoOther}}
                             </td>
                             <td class="col" colspan="2" v-if='item.outType=="火运"'>
                                 {{item.wingNumber}} {{item.wingNumberOther}}
@@ -244,10 +244,15 @@
                             <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>
-                            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                            <td class="col" colspan="2">{{item.tareDate}}</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.carNumber}}
+                            </td>
+                            <td class="col col-bgc" >毛重检斤时间</td>
+                            <td class="col" >{{item.grossDate}}</td>
+                            <td class="col col-bgc" > 皮重检斤时间</td>
+                            <td class="col">{{item.tareDate}}</td>
                         </tr>
                     </table>
                     <div class="bottom">
@@ -333,31 +338,31 @@
                             <td class="col " colspan="2"></td>
                         </tr> -->
                         <tr class="row">
-                            <td class="col col-bgc">毛重(公斤)</td>
-                            <td class="col">{{item.grossWeight}}</td>
+                            <td class="col col-bgc" >毛重(公斤)</td>
+                            <td class="col" colspan="2">{{item.grossWeight}}</td>
                             <td class="col col-bgc">皮重(公斤)</td>
                             <td class="col">{{item.tare}}</td>
-                            <td class="col col-bgc">扣重(公斤)</td>
-                            <td class="col">{{item.buckleMiscellaneous}}</td>
+                            <!-- <td class="col col-bgc">扣重(公斤)</td>
+                            <td class="col">{{item.buckleMiscellaneous}}</td> -->
                             <td class="col col-bgc">净重(公斤)</td>
                             <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 col-bgc">运输方式</td> -->
+                            <!-- <td class="col" >{{item.outType}}</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 col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>封号</td>
                             <td class="col" colspan="2" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
-                                {{item.boxNo}} {{item.boxNoOther}}
+                                {{item.titleNo}}   {{item.titleNoOther}}
+                            </td>
+                            <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>箱号</td>
+                            <td class="col" colspan="3" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
+                                {{item.boxNo}}       {{item.boxNoOther}}
                             </td>
                             <td class="col" colspan="2" v-if='item.outType=="火运"'>
                                 {{item.wingNumber}} {{item.wingNumberOther}}
@@ -365,10 +370,15 @@
                             <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>
-                            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                            <td class="col" colspan="2">{{item.tareDate}}</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.carNumber}}
+                            </td>
+                            <td class="col col-bgc" >毛重检斤时间</td>
+                            <td class="col" >{{item.grossDate}}</td>
+                            <td class="col col-bgc" > 皮重检斤时间</td>
+                            <td class="col">{{item.tareDate}}</td>
                         </tr>
                     </table>
                     <div class="bottom">
@@ -457,30 +467,31 @@
                         <td class="col " colspan="2"></td>
                     </tr> -->
                     <tr class="row">
-                        <td class="col col-bgc">毛重(公斤)</td>
-                        <td class="col">{{_item.grossWeight}}</td>
+                        <td class="col col-bgc" >毛重(公斤)</td>
+                        <td class="col" colspan="2">{{_item.grossWeight}}</td>
                         <td class="col col-bgc">皮重(公斤)</td>
                         <td class="col">{{_item.tare}}</td>
-                        <td class="col col-bgc">扣重(公斤)</td>
-                        <td class="col">{{_item.buckleMiscellaneous}}</td>
+                        <!-- <td class="col col-bgc">扣重(公斤)</td>
+                        <td class="col">{{_item.buckleMiscellaneous}}</td> -->
                         <td class="col col-bgc">净重(公斤)</td>
                         <td class="col">{{_item.netWeight}}</td>
-                        <td class="col " colspan="2"></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 col-bgc">运输方式</td> -->
+                        <!-- <td class="col" >{{_item.outType}}</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 col-bgc" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>封号</td>
                         <td class="col" colspan="2" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>
-                            {{_item.boxNo}} {{_item.boxNoOther}}
+                            {{_item.titleNo}}   {{_item.titleNoOther}}
+                        </td>
+                        <td class="col col-bgc" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>箱号</td>
+                        <td class="col" colspan="3" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>
+                            {{_item.boxNo}}       {{_item.boxNoOther}}
                         </td>
                         <td class="col" colspan="2" v-if='_item.outType=="火运"'>
                             {{_item.wingNumber}} {{_item.wingNumberOther}}
@@ -488,10 +499,15 @@
                         <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>
-                        <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                        <td class="col" colspan="2">{{_item.tareDate}}</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.carNumber}}
+                        </td>
+                        <td class="col col-bgc" >毛重检斤时间</td>
+                        <td class="col" >{{_item.grossDate}}</td>
+                        <td class="col col-bgc" > 皮重检斤时间</td>
+                        <td class="col">{{_item.tareDate}}</td>
                     </tr>
                 </table>
                 <div class="bottom">