修改出库打印单

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -2860,8 +2860,9 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}出库单
+          {{ company }}
         </div>
+        <div style="font-size: 22px;margin-bottom: 5px;width: 100%;text-align: center">出库单</div>
         <div class="print_table" style="display: flex">
           <table
               border="0"
@@ -2873,10 +2874,10 @@
               <td>公司名称</td>
               <td colspan="3">{{ form.fCorpidName }}</td>
               <td>出库日期</td>
-              <td colspan="2" v-if="Printinglist.length">
+              <td colspan="3" v-if="Printinglist.length">
                 {{ Printinglist[0].fBsdate | fBsdateFormat }}{{ " " + ckTime }}
               </td>
-              <td colspan="2" v-else></td>
+              <td colspan="3" v-else></td>
             </tr>
             <tr>
               <td style="width: 15%">货物名称</td>
@@ -2885,6 +2886,7 @@
               <td>件数</td>
               <td>吨位</td>
               <td>车型</td>
+              <td>库位</td>
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
@@ -2897,6 +2899,7 @@
               </td>
               <td v-else></td>
               <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
+              <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -2906,15 +2909,15 @@
               </td>
               <td colspan="2" v-else></td>
               <td colspan="2">身份证号</td>
-              <td colspan="2" v-if="Printinglist.length">{{ Printinglist[0].fDriverIdCar }}</td>
-              <td colspan="2" v-else></td>
+              <td colspan="3" v-if="Printinglist.length">{{ Printinglist[0].fDriverIdCar }}</td>
+              <td colspan="3" v-else></td>
             </tr>
             <tr>
               <td>地址</td>
-              <td colspan="6">{{ stockaddr }}</td>
+              <td colspan="7">{{ stockaddr }}</td>
             </tr>
             <tr>
-              <td colspan="7">
+              <td colspan="8">
                 雨/雪天装货司机自愿装车，出现货物水湿与仓库无关！数量准确无误，货物包装完好！
               </td>
             </tr>
@@ -2927,7 +2930,7 @@
           <div>理货：</div>
           <div>叉车：</div>
           <div>司机：</div>
-          <div style="width: 200px">电话：</div>
+          <div style="width: 200px">电话：{{ Printinglist.length === 1 ? Printinglist[0].fDriverTel : '' }}</div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -5472,12 +5475,24 @@ export default {
             }
           })
           deliveryCalculation(list).then(res => {
-            this.warehouseDrList = res.data
-            this.warehouseDrList.forEach(index => {
+            let arr = [];
+            arr = res.data
+            arr.forEach(index => {
               index.fBillingway = JSON.stringify(index.fBillingway)
               index.fBusinessType = this.form.fBusinessType
               index.fAmt = index.fAmt.toFixed(2)
+              console.log(index.fFeeunitid )
+              index.fFeeUnitid = String(index.fFeeunitid)
+              index.fSrcTypeId = 1
             })
+            this.warehouseDrList = this.warehouseDrList.concat(arr)
+            console.log(this.warehouseDrList)
+            // this.warehouseDrList = res.data
+            // this.warehouseDrList.forEach(index => {
+            //   index.fBillingway = JSON.stringify(index.fBillingway)
+            //   index.fBusinessType = this.form.fBusinessType
+            //   index.fAmt = index.fAmt.toFixed(2)
+            // })
           })
         } catch (e) {
           if (e.message !== "EndIterative") throw e;