出库检斤单添加仓位号，汽运报表添加清空服务费，清空税点

public/static/weightCheckOutNew.html

@@ -159,21 +159,21 @@
                     <table class="table">
                         <tr class="row">
                             <td class="col col-bgc">发货单位</td>
-                            <td class="col" colspan="2">{{item.customer}}</td>
+                            <td class="col" >{{item.customer}}</td>
                             <!-- <td class="col" colspan="2">{{item.customer}}</td> -->
                             <td class="col col-bgc">联系电话</td>
                             <td class="col">{{kehuphone}}</td>
                             <!-- <td class="col">{{item.customerPhone}}</td> -->
                             <td class="col col-bgc">货名</td>
-                            <td class="col" colspan="2">{{item.goodsName}}</td>
+                            <td class="col" >{{item.goodsName}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">收货单位</td>
-                            <td class="col" colspan="2">{{item.compName}}</td>
+                            <td class="col" >{{item.compName}}</td>
                             <td class="col col-bgc">联系人</td>
                             <td class="col">{{item.person}}</td>
                             <td class="col col-bgc">联系电话</td>
-                            <td class="col" colspan="2">{{item.personPhone}}</td>
+                            <td class="col" >{{item.personPhone}}</td>
                         </tr>
 
 
@@ -215,7 +215,7 @@
 
                         <tr class="row">
                             <td class="col col-bgc" >毛重（公斤）</td>
-                            <td class="col" colspan="2">{{item.grossWeight}}</td>
+                            <td class="col" >{{item.grossWeight}}</td>
                             <td class="col col-bgc">皮重（公斤）</td>
                             <td class="col">{{item.tare}}</td>
                             <!-- <td class="col col-bgc">扣重（公斤）</td>
@@ -233,17 +233,19 @@
                             <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=="汽运"'>
+                            <td class="col" colspan="1" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
                                 {{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=="汽运"'>
+                            <td class="col" colspan="1" 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>
+                            <td class="col col-bgc" >仓位号</td>
+                            <td class="col" colspan="1" >{{item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>车牌号</td>
@@ -289,20 +291,20 @@
                     <table class="table">
                         <tr class="row">
                             <td class="col col-bgc">发货单位</td>
-                            <td class="col" colspan="2">{{item.customer}}</td>
+                            <td class="col" >{{item.customer}}</td>
                             <td class="col col-bgc">联系电话</td>
                             <td class="col">{{kehuphone}}</td>
                             <!-- <td class="col">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td> -->
                             <td class="col col-bgc">货名</td>
-                            <td class="col" colspan="2">{{item.goodsName}}</td>
+                            <td class="col" >{{item.goodsName}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">收货单位</td>
-                            <td class="col" colspan="2">{{item.compName}}</td>
+                            <td class="col" >{{item.compName}}</td>
                             <td class="col col-bgc">联系人</td>
                             <td class="col">{{item.person}}</td>
                             <td class="col col-bgc">联系电话</td>
-                            <td class="col" colspan="2">{{item.personPhone}}</td>
+                            <td class="col" >{{item.personPhone}}</td>
                         </tr>
 
                         <!-- <tr class="row">
@@ -342,7 +344,7 @@
                         </tr> -->
                         <tr class="row">
                             <td class="col col-bgc" >毛重（公斤）</td>
-                            <td class="col" colspan="2">{{item.grossWeight}}</td>
+                            <td class="col" >{{item.grossWeight}}</td>
                             <td class="col col-bgc">皮重（公斤）</td>
                             <td class="col">{{item.tare}}</td>
                             <!-- <td class="col col-bgc">扣重（公斤）</td>
@@ -360,17 +362,19 @@
                             <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=="汽运"'>
+                            <td class="col" colspan="1" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>
                                 {{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=="汽运"'>
+                            <td class="col" colspan="1" 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>
+                            <td class="col col-bgc" >仓位号</td>
+                            <td class="col" colspan="1" >{{item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc" v-if='item.outType=="集装箱船"||item.outType=="汽运"'>车牌号</td>
@@ -415,7 +419,7 @@
                 <table class="table">
                     <tr class="row">
                         <td class="col col-bgc">发货单位</td>
-                        <td class="col" colspan="2">{{_item.compName}}</td>
+                        <td class="col" >{{_item.compName}}</td>
                         <td class="col col-bgc">联系人</td>
                         <td class="col">{{kehu}}</td>
                         <!-- <td class="col">{{_item.person}}</td> -->
@@ -425,7 +429,7 @@
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货单位</td>
-                        <td class="col" colspan="2">{{_item.customer}}</td>
+                        <td class="col" >{{_item.customer}}</td>
                         <td class="col col-bgc">联系电话</td>
                         <td class="col">{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
                         <td class="col col-bgc">货名</td>
@@ -473,7 +477,7 @@
                     </tr> -->
                     <tr class="row">
                         <td class="col col-bgc" >毛重（公斤）</td>
-                        <td class="col" colspan="2">{{_item.grossWeight}}</td>
+                        <td class="col" >{{_item.grossWeight}}</td>
                         <td class="col col-bgc">皮重（公斤）</td>
                         <td class="col">{{_item.tare}}</td>
                         <!-- <td class="col col-bgc">扣重（公斤）</td>
@@ -491,23 +495,25 @@
                         <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=="汽运"'>
+                        <td class="col" colspan="1" v-if='_item.outType=="集装箱船"||_item.outType=="汽运"'>
                             {{_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=="汽运"'>
+                        <td class="col" colspan="1" 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>
+                        <td class="col col-bgc" >仓位号</td>
+                            <td class="col" colspan="1" >{{_item.binNumber}}</td>
                     </tr>
                     <tr class="row">
                         <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 class="col"  v-if='_item.outType=="集装箱船"||_item.outType=="汽运"||_item.outType=="火运"'>{{_item.carNumber}}
                         </td>
                         <td class="col col-bgc" >毛重检斤时间</td>
                         <td class="col" >{{_item.grossDate}}</td>

src/views/statisticalReport/autoSettlementList.vue

@@ -718,6 +718,9 @@ export default {
   },
   methods: {
     batchEmpty(status){
+      if(this.modification.length==0){
+        this.$message.warning('请至少勾选一条条目！')
+      }
       for (var i = 0; i < this.modification.length; i++) {
           if (!this.modification[i].unloadingWeight&&status==1||this.modification[i].status != '待请款'&&status==1 ) {
             this.$message.warning('只有已卸车并且未请款的条目才可清空服务费！')