1、订单详情PDF生成展示

src/views/modules/order/orderInfo.vue

@@ -572,7 +572,7 @@
                     <div class="item">
                       <div class="text">PDF文件：</div>
                       <el-link v-if="printOrder.printChannel === 'Lightning' && printOrder.pdfList.length > 0" type="primary" :underline="false" :href="resourcesUrl + printOrder.pdfList[0].pdfUrl" target="_blank">查看文件</el-link>
-                      <el-button :loading="generatePdfLoading" v-if="printOrder.printChannel === 'Lightning'" type="primary" size="mini" @click="generatePdf">生成PDF</el-button>
+                      <el-button :loading="generatePdfLoading" v-if="printOrder.printChannel === 'Lightning' && dataForm.status === 2" type="primary" size="mini" @click="generatePdf">生成PDF</el-button>
                     </div>
                   </el-col>
                   <el-col :span="12">
@@ -587,7 +587,7 @@
                 <el-row>
                   <el-col :span="24">
                     <div class="item">
-                      <div class="item" style="width:360px;">物流信息：{{printOrder.logisticName}} | {{printOrder.deliveryCode}}</div>
+                      <div class="item" style="width:360px;">物流信息：{{printOrder.deliveryName}} | {{printOrder.deliveryNo}}</div>
                       <el-button type="primary" size="mini" v-if="orderStatus == 2" @click="openDeliveryDialog">发货</el-button>
                     </div>
                   </el-col>
@@ -999,33 +999,39 @@ export default {
       }
     },
     generatePdf () {
-      this.generatePdfLoading = true;
-      this.$http({
-        url: this.$http.adornUrl('/printOrderPdf/printOrderPdf/generateLightningPdf'),
-        method: 'post',
-        data: this.$http.adornData({
-          orderNumber: this.dataForm.orderNumber
-        }),
-      }).then(({ data }) => {
-        this.generatePdfLoading = false;
-        if(data){
-          this.$message({
-            message: data,
-            type: 'success'
-          })
-        }else{
+      this.$confirm('确认要生成PDF吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.generatePdfLoading = true;
+        this.$http({
+          url: this.$http.adornUrl('/printOrderPdf/printOrderPdf/generateLightningPdf'),
+          method: 'post',
+          data: this.$http.adornData({
+            orderNumber: this.dataForm.orderNumber
+          }),
+        }).then(({ data }) => {
+          this.generatePdfLoading = false;
+          if(data){
+            this.$message({
+              message: data,
+              type: 'success'
+            })
+          }else{
+            this.$message({
+              message: data,
+              type: 'error'
+            })
+          }
+        }).catch(e =>{
+          this.generatePdfLoading = false
           this.$message({
-            message: data,
+            message: e,
             type: 'error'
           })
-        }
-      }).catch(e =>{
-        this.generatePdfLoading = false
-        this.$message({
-          message: e,
-          type: 'error'
         })
-      })
+      });
     },
     initPrintOrder() {
       if (this.dataForm.orderNumber) {