订单详情查看-改为弹窗

src/views/modules/order/order-delivery-update.vue

@@ -3,6 +3,7 @@
     :title="this.$i18n.t('order.orderShipping')"
     :close-on-click-modal="false"
     :visible.sync="visible"
+    append-to-body
     width="1045px"
   >
     <div class="mod-order-orderInfo">

src/views/modules/order/order.vue

@@ -817,6 +817,9 @@
     </el-dialog>
     <!-- /修改物流弹窗 -->
     <order-upload v-if="uploadVisible" ref="spuUpload" :param="dataForm" @refreshDataList1="getWaitingConsignmentExcel" />
+
+    <order-info ref="orderInfo"></order-info>
+
   </div>
 </template>
 
@@ -828,6 +831,7 @@ import OrderDeliveryUpdate from './order-delivery-update'
 import OrderUpload from './order-upload'
 import moment from 'moment'
 import ProdPic from '@/components/prod-pic'
+import OrderInfo from "./orderInfo";
 
 export default {
   data () {
@@ -978,6 +982,7 @@ export default {
     }
   },
   components: {
+    OrderInfo,
     OrderStation,
     OrderAmountUpdate,
     OrderDeliveryUpdate,
@@ -1414,6 +1419,12 @@ export default {
     },
     // 查看订单
     addOrUpdateHandle (orderNumber, shopId, status) {
+      this.$refs.orderInfo.init({
+        orderNumber: orderNumber,
+        shopId: shopId,
+        status: status
+      })
+      /*
       this.$router.push({
         path: '/order-orderInfo',
         query: {
@@ -1421,7 +1432,7 @@ export default {
           shopId: shopId,
           status: status
         }
-      })
+      })*/
     },
     // 前往消息盒子
     toImbox (order) {

src/views/modules/order/orderInfo.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="detail-dialog">
-    <!-- <el-dialog
+<!--  <div class="detail-dialog">-->
+   <el-dialog
       :title="
         !dataForm.orderNumber
           ? this.$i18n.t('crud.addTitle')
@@ -9,7 +9,7 @@
       :close-on-click-modal="false"
       :visible.sync="visible"
       width="80%"
-    > -->
+   >
     <div class="new-page-title">
       <div class="line" />
       <div class="text">
@@ -758,8 +758,8 @@
             v-if="devyVisible"
             ref="orderDeliveryUpdate"
     ></order-delivery-update>
-    <!-- </el-dialog> -->
-  </div>
+   </el-dialog>
+<!--  </div>-->
 </template>
 
 <script>
@@ -772,6 +772,7 @@ import OrderPdfGenerate from '@/components/order-pdf-generate'
 import OrderDeliveryUpdate from './order-delivery-update'
 
 export default {
+  name: 'order-info',
   data () {
     return {
       visible: false,
@@ -876,14 +877,18 @@ export default {
     }
   },
   created () {
-    this.dataForm.orderNumber = this.$route.query.orderNumber || 0
-    this.dataForm.shopId = this.$route.query.shopId || null
-    this.orderStatus = this.$route.query.status || null
-    this.init()
-    this.initPrintOrder();
+    // this.dataForm.orderNumber = this.$route.query.orderNumber || 0
+    // this.dataForm.shopId = this.$route.query.shopId || null
+    // this.orderStatus = this.$route.query.status || null
+    // this.init()
+    // this.initPrintOrder()
   },
   methods: {
-    init () {
+    init (params) {
+      this.dataForm.orderNumber = params.orderNumber || 0
+      this.dataForm.shopId = params.shopId || null
+      this.orderStatus = params.status || null
+
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
@@ -896,6 +901,7 @@ export default {
           method: 'get',
           params: this.$http.adornParams()
         }).then(({ data }) => {
+          console.log(data)
           // console.log('deliveryDto', this.deliveryExpresse)
           this.dataForm = data
           this.deliveryExpresse = this.dataForm.deliveryExpresses[0]
@@ -910,6 +916,7 @@ export default {
             // 单个商品且有赠品时，将主商品和赠品放在同一级列表中展示
             this.prodList = [...data.orderItems, ...data.orderItems[0].giveawayList]
           }
+          this.initPrintOrder()
         })
       }
     },