1、优化产品

src/views/modules/print/print-order-info.vue

@@ -233,11 +233,14 @@ export default {
   methods: {
     closeDialog(){
       this.visible = false;
+      this.dataForm.orderNumber = null;
+      this.orderStatus = null;
+      this.$emit('printOrderClose');
     },
     init (params) {
-      this.dataForm.orderNumber = params.orderNumber || 0
-      this.dataForm.shopId = params.shopId || null
-      this.orderStatus = params.status || null
+      this.dataForm.orderNumber = params.orderNumber || null;
+      this.dataForm.shopId = params.shopId || null;
+      this.orderStatus = params.status || null;
 
       this.visible = true
       this.$nextTick(() => {

src/views/modules/print/print-order.vue

@@ -427,7 +427,7 @@
       </div>
     </el-dialog>
     <!-- 订单详情 -->
-    <print-order-info ref="printOrderInfo"></print-order-info>
+    <print-order-info ref="printOrderInfo" v-if="printOrderDialogVisible" @printOrderClose="printOrderClose"></print-order-info>
     <!-- 波次订单 -->
     <wave-print-order ref="wavePrintOrder"></wave-print-order>
 
@@ -540,6 +540,7 @@
         printChannel: "KuaiYin",
         addToWaveDialogVisible: false,
         printOrderDialogVisible: false
+
       }
     },
     components: {
@@ -578,6 +579,9 @@
 
     },
     methods: {
+      printOrderClose(){
+        this.printOrderDialogVisible = false;
+      },
       wavePrintOrderClose(){
         this.wavePrintOrderVisible = false;
       },
@@ -585,9 +589,12 @@
         this.$refs.wavePrintOrder.openAndQueryPrintOrder({orderNumber: orderNumber, waveId: waveId})
       },
       openPrintOrderDialog(orderNumber){
-        this.$refs.printOrderInfo.init({
-          orderNumber: orderNumber,
-        })
+        this.printOrderDialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs.printOrderInfo.init({
+            orderNumber: orderNumber,
+          })
+        });
       },
       openGenerateWaveDialog(){
         if(this.dataListSelections.size === 0){

src/views/modules/print/wave-print-order.vue

@@ -271,6 +271,7 @@
               >
                 <template slot-scope="scope">
                   <div style="display: inline-block;float: left;">
+<!--                    <el-button size="mini" type="text" @click="openPrintOrderInfo(scope.row.orderNumber)">查看</el-button>-->
                     <el-button v-if="scope.row.workStatus === 0 || scope.row.workStatus == 3" size="mini" @click="generatePdfCombination(scope.row)" :disabled="wave.productionStatus == 0">生成PDF</el-button>
                     <el-button size="mini" @click="openModifyExpressBillDialog(scope.row)">修改运单号</el-button>
                     <el-button key="removeFromWaveBtn" size="mini" type="text" v-if="wave.productionStatus == 0 || scope.row.status != 3" :disabled="wave.productionStatus == 1" @click="removeFromWave(scope.row)">移出波次</el-button>
@@ -342,10 +343,8 @@
   import moment from 'moment';
   import {downloadPdf} from "@/utils/pdf";
   import {downloadXls} from "@/utils/excel";
-  import {downloadZip} from "@/utils/zip";
   import { saveAs } from 'file-saver';
   import JSzip from 'jszip';
-  import axios from 'axios'
 
   export default {
     data () {
@@ -436,14 +435,14 @@
         wavePrintOrderPdfDownloadLoading: false,
         modifyExpressBillVisible: false,
         printOrder:{},
-        expandRowDetail:{}
+        expandRowDetail:{},
       }
     },
     components: {
       ProdPic,
       InputNumberRange,
       ExpressBillUpload,
-      OrderScanDelivery
+      OrderScanDelivery,
     },
     computed: {