Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/index/components/printReceipt.vue

@@ -18,10 +18,11 @@
       <div id="pdfDom" v-for="(item, index) in dataList" :key="index">
         <div class="blank"></div>
 
-        <div class="title" style="margin-bottom: 10px">
+        <div class="title" style="margin: auto">
           <h5 align="center">{{ shippername }} 物资送货单</h5>
           <!--        <h5 align="center">物资送货单</h5>-->
         </div>
+        <div style="height: 10px"></div>
         <div>
           <!-- tablePart0 -->
           <table
@@ -200,7 +201,7 @@
         </table>
       </div>-->
         <!--设置中间的间隔以及虚线-->
-        <div style="height: 60px" v-show="index < 2"></div>
+        <div style="height: 50px" v-show="index < 2"></div>
         <hr width="1500px" style="border:1px dashed black" v-show="index < 2"/>
         <div style="page-break-after:always" v-show="index ==1 && page"></div>
       </div>
@@ -274,6 +275,8 @@ export default {
   methods: {
     async getDeliveryOrder() {
       let orderNumber = this.$route.query.orderNumber
+      //空对象设置为null值
+      var deliver={};
       await this.axios
         .post('/api/v1/tms/getDeliveryOrder?orderNumber=' + orderNumber)
         .then(res => {
@@ -297,6 +300,9 @@ export default {
           console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
           if (res.data.deliveryOrderMaterialList.length > 2){
             this.page=true
+          }else if (res.data.deliveryOrderMaterialList.length ==1){
+            this.deliveryOrderMaterialList.push(deliver)
+            console.log(this.deliveryOrderMaterialList)
           }
           document.getElementById('printReceipt').click()
         })

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -910,6 +910,11 @@ export default {
                     this.updateDriverTel(row);
                   }
                 });
+              this.$message({
+                duration: 600,
+                message: "变更车牌号成功!",
+                type: "success"
+              });
               //this.$message.success("变更车牌号成功!");
               this.getSteelReport();
               loading.close();