打印单修改

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -3569,9 +3569,9 @@
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
             <tr>
               <td>客户名称</td>
-              <td>{{ form.fCorpidName }}</td>
+              <td colspan="3">{{ form.fCorpidName }}</td>
               <td>入库日期</td>
-              <td>{{ form.fBsdate | fBsdateFormat }}</td>
+              <td colspan="2">{{ form.fBsdate | fBsdateFormat }}</td>
               <td>流水号</td>
               <td colspan="3" v-if="form.fBillno">
 <!--                {{ form.fBillno }}-{{ lsTime }}-->
@@ -3581,9 +3581,9 @@
             </tr>
             <tr>
               <td>车号</td>
-              <td>{{ form.fTruckno }}</td>
+              <td colspan="2">{{ form.fTruckno }}</td>
               <td>提单号</td>
-              <td>{{ form.fMblno }}</td>
+              <td colspan="3">{{ form.fMblno }}</td>
               <td>箱号</td>
               <td colspan="3" v-if="Printinglist1.length">
                 {{ Printinglist1[0].fCntrno }}
@@ -3598,27 +3598,30 @@
               <td>净重(吨)</td>
               <td>规格</td>
               <td>区位</td>
+              <td>车号</td>
+              <td>司机名</td>
+              <td>司机电话</td>
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist1" :key="index">
               <td>{{ item.fGoodsids }}</td>
               <td>{{ item.fCntqty }}</td>
               <td>{{ item.fQty }}</td>
-              <td v-if="item.fGrossweight">
-                {{ (item.fGrossweight / 1000).toFixed(4) }}
-              </td>
-              <td v-else></td>
-              <td>{{ (item.fNetweight/1000).toFixed(4)}}</td>
+              <td>{{ (item.fGrossweight? item.fGrossweight: 0 / 1000).toFixed(4) }}</td>
+              <td>{{ (item.fNetweight? item.fNetweight: 0/1000).toFixed(4)}}</td>
               <td>{{ item.fPackagespecs }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
+              <td>{{ item.fTruckno }}</td>
+              <td>{{ item.fDriverName }}</td>
+              <td>{{ item.fDriverTel }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
               <td>备注</td>
               <!--              <td colspan="4">不贴标签不卸货</td>-->
-              <td colspan="4">{{ form.remark }}</td>
+              <td colspan="5">{{ form.remark }}</td>
               <td>总件数</td>
-              <td colspan="2">{{ allfQty }}</td>
+              <td colspan="4">{{ allfQty }}</td>
             </tr>
           </table>
         </div>
@@ -7187,6 +7190,9 @@ export default {
               if (e.fQty) {
                 this.allfQty += e.fQty;
               }
+              if (e.fWarehouselocid) {
+                this.$set(e, 'fWarehouseInformation', this.fWarehouseidOptions.find(item => item.id == e.fWarehouselocid).fWarehouseInformation)
+              }
             });
             if (command == "a") {
               this.print_shd = true;