调整为弹窗

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

@@ -2,6 +2,7 @@
   <el-dialog :title="this.$i18n.t('temp.modify')"
              :modal="false"
              :close-on-click-modal="false"
+             append-to-body
              :visible.sync="visible">
     <el-form :model="dataForm"
              ref="dataForm"

src/views/modules/order/orderInvoice.vue

@@ -94,7 +94,7 @@
             width="200"
           >
             <template slot-scope="{row}">
-              <el-button type="text" @click="viewOrderHandle(row.orderNumber)">
+              <el-button type="text" @click="viewOrderHandle(row.orderNumber, row.shopId, row.status, )">
                 {{ $t('order.viewOrder') }}
               </el-button>
               <el-button v-if="isAuth('order:orderInvoice:update')" type="text" @click="addOrUpdateHandle(row.orderInvoiceId)">
@@ -122,13 +122,17 @@
       ref="addOrUpdate"
       @refreshDataList="refreshChange"></add-or-update>
 
+    <order-info ref="orderInfo"></order-info>
+
   </div>
 </template>
 
 <script>
 import AddOrUpdate from './orderInvoice-add-or-update'
+import OrderInfo from "./orderInfo";
 export default {
   components: {
+    OrderInfo,
     AddOrUpdate
   },
   data () {
@@ -199,13 +203,18 @@ export default {
     /**
      * 查看订单
      */
-    viewOrderHandle (id) {
-      this.$router.push({
+    viewOrderHandle (orderNumber, shopId, status) {
+      this.$refs.orderInfo.init({
+        orderNumber: orderNumber,
+        shopId: shopId,
+        status: status
+      })
+      /*this.$router.push({
         path: '/order-orderInfo',
         query: {
           orderNumber: id
         }
-      })
+      })*/
     },
 
     // 新增 / 修改

src/views/modules/order/orderRefund.vue

@@ -476,7 +476,7 @@
                   <div class="operate">
                     <div
                       class="default-btn text-btn operate-btn"
-                      @click="viewOrderHandle(orderRefund.orderNumber)"
+                      @click="viewOrderHandle(orderRefund.orderNumber, orderRefund.shopId, orderRefund.status, )"
                       >{{ $t("order.viewOrder") }}</div
                     >
                     <div
@@ -526,14 +526,22 @@
       :total="page.total"
       layout="total, sizes, prev, pager, next, jumper"
     ></el-pagination>
+
+    <order-info ref="orderInfo"></order-info>
+    <refund-order-info ref="refundOrderInfo"></refund-order-info>
+
   </div>
 </template>
 
 <script>
 import moment from 'moment'
 import ProdPic from '@/components/prod-pic'
+import OrderInfo from "./orderInfo";
+import RefundOrderInfo from "./refundOrderInfo";
 export default {
   components: {
+    RefundOrderInfo,
+    OrderInfo,
     ProdPic
   },
   data () {
@@ -762,13 +770,18 @@ export default {
     /**
      * 查看订单
      */
-    viewOrderHandle (id) {
-      this.$router.push({
+    viewOrderHandle (orderNumber, shopId, status) {
+      this.$refs.orderInfo.init({
+        orderNumber: orderNumber,
+        shopId: shopId,
+        status: status
+      })
+      /*this.$router.push({
         path: '/order-orderInfo',
         query: {
-          orderNumber: id
+          orderNumber: orderNumber
         }
-      })
+      })*/
     },
     // 前往消息盒子
     toImbox (order) {
@@ -777,17 +790,19 @@ export default {
     /**
      * 处理退款
      */
-    refundHandle (id, shopId) {
+    refundHandle (refundId, shopId) {
       // this.addOrUpdateVisible = true
       // this.$nextTick(() => {
       //   this.$refs.addOrUpdate.init(id)
       // })
-      this.$router.push({
+      /*this.$router.push({
         path: '/order-refundOrderInfo',
         query: {
-          refundId: id
+          refundId: refundId
         }
-      })
+      })*/
+      // refundOrderInfo
+      this.$refs.refundOrderInfo.init(refundId)
     },
     /**
      * 根据选项设置时间

src/views/modules/order/refundOrderInfo.vue

@@ -1,526 +1,533 @@
 <template>
-  <div class="orderRefund">
-    <div class="new-page-title">
-      <div class="line" />
-      <div class="text">
-        {{ $t('order.refundProcessing') }}
-      </div>
-    </div>
-    <el-form
-      :model="dataForm"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmit()"
-      label-width="auto">
-      <div class="mod-order-refundOrderInfo">
-        <div class="refundId">
-          <span class="title">{{ $t('order.refundId') }}</span>
-          <span class="text">{{ dataForm.refundSn }}</span>
+  <el-dialog
+    title="退款情况"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    width="80%"
+  >
+    <div class="orderRefund">
+      <div class="new-page-title">
+        <div class="line" />
+        <div class="text">
+          {{ $t('order.refundProcessing') }}
         </div>
-        <div class="content">
-          <div class="order-number">
-            <div class="num-cont">
-              <div class="state-title">
-                <div class="item">
-                  <div class="title">{{ $t('order.returnType') }}：</div>
-                  <div class="text">
-                    <div v-if="dataForm.refundType === 1">{{ $t("order.wholeOrderRefund") }}</div>
-                    <div v-if="dataForm.refundType === 2">{{ $t("order.singleItemRefund") }}</div>
-                  </div>
-                </div>
-                <div class="item">
-                  <div class="title">{{ $t('order.returnMethod') }}：</div>
-                  <div class="text">
-                    <div v-if="dataForm.applyType === 1">{{ $t("order.onlyRefund") }}</div>
-                    <div v-if="dataForm.applyType === 2">{{ $t("order.refundAndMoney") }}</div>
-                  </div>
-                </div>
-                <div v-if="isAuth('admin:orderRefund:update') && dataForm.decisionTime && !dataForm.refundTime" class="item">
-                  <div class="default-btn primary-btn" @click="refundRequest(dataForm.refundSn)">{{ $t("order.issueARefund") }}</div>
-                </div>
-              </div>
-              <div class="refund-progress">
-                <div class="item" v-if="dataForm.applyType === 1">
-                  <el-steps :active="onlyRefundStepsStatus" align-center :process-status="onlyRefundProcessStatus">
-                    <el-step :title="$t('order.buyer') + ' ' + $t('order.requestARefund')"/>
-                    <el-step :title="$t('admin.merAgreeRefund')"/>
-                    <el-step :title="$t('order.refundsuccessfully')"/>
-                  </el-steps>
-                </div>
-                <div class="item" v-else>
-                  <el-steps :active="stepsStatus" align-center :process-status="dataForm.returnMoneySts === -1 ? 'error' : 'wait'">
-                    <el-step :title="$t('order.buyer') + ' ' + $t('order.requestARefundT')"></el-step>
-                    <el-step :title="$t('admin.merAgreeRefund')"></el-step>
-                    <el-step :title="$t('order.shippedByBuyer')"></el-step>
-                    <el-step :title="$t('order.merchant') + ' ' + $t('order.successfulProcessing')"></el-step>
-                    <el-step :title="$t('order.refundsuccessfully')"></el-step>
-                  </el-steps>
-                </div>
-              </div>
-            </div>
+      </div>
+      <el-form
+        :model="dataForm"
+        ref="dataForm"
+        @keyup.enter.native="dataFormSubmit()"
+        label-width="auto">
+        <div class="mod-order-refundOrderInfo">
+          <div class="refundId">
+            <span class="title">{{ $t('order.refundId') }}</span>
+            <span class="text">{{ dataForm.refundSn }}</span>
           </div>
-          <div class="order-state">
-            <div class="state-cont">
-              <div class="order-info">
-                <div class="order-details">
-                  <div class="detail-title">
-                    <span class="prompt">{{ $t("order.returnDetails") }}</span>
+          <div class="content">
+            <div class="order-number">
+              <div class="num-cont">
+                <div class="state-title">
+                  <div class="item">
+                    <div class="title">{{ $t('order.returnType') }}：</div>
+                    <div class="text">
+                      <div v-if="dataForm.refundType === 1">{{ $t("order.wholeOrderRefund") }}</div>
+                      <div v-if="dataForm.refundType === 2">{{ $t("order.singleItemRefund") }}</div>
+                    </div>
                   </div>
-                  <div class="detail-cont">
-                    <div class="detail01">
-                      <div class="text-width">
-                        <!-- <span class="revise-addr"
-                              @click="changeAddr(dataForm.addrOrderId)">
-                          <img src="~@/assets/img/revise.png"
-                               alt="" />{{$t("temp.modify")}}地址
-                        </span>-->
-                        <div class="text-width-item">
-                          <span class="title">{{ $t('order.number') }}：</span>
-                          <span class="text">{{ dataForm.orderNumber }}</span>
-                        </div>
-                        <div class="text-width-item">
-                          <span class="title">{{ $t('order.orderActuallyPaid') }}：</span>
-                          <span class="text">{{ dataForm.orderAmount }}</span>
-                        </div>
-                        <div class="text-width-item">
-                          <span class="title">{{ $t('order.refundAmount') }}：</span>
-                          <span class="text">{{dataForm.refundAmount + $t("admin.dollar") + "+ " + dataForm.refundScore + $t("order.integral") }}</span>
-                        </div>
-                        <div class="text-width-item">
-                          <span class="title">{{ $t('order.applicationTime') }}：</span>
-                          <span class="text">{{ dataForm.applyTime }}</span>
-                        </div>
-                        <div class="text-width-item">
-                          <span class="title">{{ $t('order.reasonForReturn') }}：</span>
-                          <span class="text">{{ dataForm.buyerReason }}</span>
-                        </div>
-                        <div class="text-width-item">
-                          <span class="title">{{ $t('order.refundInstructions') }}：</span>
-                          <span class="text">{{ dataForm.buyerDesc }}</span>
-                        </div>
-                      </div>
+                  <div class="item">
+                    <div class="title">{{ $t('order.returnMethod') }}：</div>
+                    <div class="text">
+                      <div v-if="dataForm.applyType === 1">{{ $t("order.onlyRefund") }}</div>
+                      <div v-if="dataForm.applyType === 2">{{ $t("order.refundAndMoney") }}</div>
                     </div>
                   </div>
+                  <div v-if="isAuth('admin:orderRefund:update') && dataForm.decisionTime && !dataForm.refundTime" class="item">
+                    <div class="default-btn primary-btn" @click="refundRequest(dataForm.refundSn)">{{ $t("order.issueARefund") }}</div>
+                  </div>
                 </div>
-                <!-- 退款凭证 -->
-                <div class="buyers">
-                  <div class="detail-title">{{ $t('order.returnCertificate') }}</div>
-                  <div class="buyers-info">
-                    <div class="img-up">
-                      <imgs-upload v-model="dataForm.photoFiles" :disabled="true" :modal="true" :prompt="false"/>
-                    </div>
+                <div class="refund-progress">
+                  <div class="item" v-if="dataForm.applyType === 1">
+                    <el-steps :active="onlyRefundStepsStatus" align-center :process-status="onlyRefundProcessStatus">
+                      <el-step :title="$t('order.buyer') + ' ' + $t('order.requestARefund')"/>
+                      <el-step :title="$t('admin.merAgreeRefund')"/>
+                      <el-step :title="$t('order.refundsuccessfully')"/>
+                    </el-steps>
+                  </div>
+                  <div class="item" v-else>
+                    <el-steps :active="stepsStatus" align-center :process-status="dataForm.returnMoneySts === -1 ? 'error' : 'wait'">
+                      <el-step :title="$t('order.buyer') + ' ' + $t('order.requestARefundT')"></el-step>
+                      <el-step :title="$t('admin.merAgreeRefund')"></el-step>
+                      <el-step :title="$t('order.shippedByBuyer')"></el-step>
+                      <el-step :title="$t('order.merchant') + ' ' + $t('order.successfulProcessing')"></el-step>
+                      <el-step :title="$t('order.refundsuccessfully')"></el-step>
+                    </el-steps>
                   </div>
                 </div>
               </div>
-              <div class="order-info" v-if="this.dataForm.refundDelivery && (this.dataForm.refundDelivery.deyNu || this.dataForm.refundDelivery.imgs)">
-                <div class="order-details">
-                  <template>
+            </div>
+            <div class="order-state">
+              <div class="state-cont">
+                <div class="order-info">
+                  <div class="order-details">
                     <div class="detail-title">
-                      <span class="prompt">{{$t("order.logisticsDetails")}}</span>
+                      <span class="prompt">{{ $t("order.returnDetails") }}</span>
                     </div>
                     <div class="detail-cont">
                       <div class="detail01">
                         <div class="text-width">
-                          <div class="text-width-item" v-if="this.dataForm.refundDelivery && this.dataForm.refundDelivery.deyName">
-                            <span class="title">{{ $t('order.logisticsName')  }}：</span>
-                            <span class="text">{{this.dataForm.refundDelivery.deyName }}</span>
+                          <!-- <span class="revise-addr"
+                                @click="changeAddr(dataForm.addrOrderId)">
+                            <img src="~@/assets/img/revise.png"
+                                 alt="" />{{$t("temp.modify")}}地址
+                          </span>-->
+                          <div class="text-width-item">
+                            <span class="title">{{ $t('order.number') }}：</span>
+                            <span class="text">{{ dataForm.orderNumber }}</span>
                           </div>
-                          <div
-                            v-if="this.dataForm.refundDelivery && this.dataForm.refundDelivery.deyNu" class="text-width-item">
-                            <span class="title">{{ $t('order.trackingNumber') }}：</span>
-                            <span class="text">{{this.dataForm.refundDelivery.deyNu }}</span>
+                          <div class="text-width-item">
+                            <span class="title">{{ $t('order.orderActuallyPaid') }}：</span>
+                            <span class="text">{{ dataForm.orderAmount }}</span>
                           </div>
-                          <div class="text-width-item" v-if="this.dataForm.refundDelivery && this.dataForm.refundDelivery.senderRemarks">
-                            <span class="title">{{ $t('order.compradorMsg') }}：</span>
-                            <span class="text">{{this.dataForm.refundDelivery.senderRemarks }}</span>
+                          <div class="text-width-item">
+                            <span class="title">{{ $t('order.refundAmount') }}：</span>
+                            <span class="text">{{dataForm.refundAmount + $t("admin.dollar") + "+ " + dataForm.refundScore + $t("order.integral") }}</span>
                           </div>
-                          <div v-if="this.dataForm.refundDelivery && this.dataForm.refundDelivery.senderMobile" class="text-width-item">
-                            <span class="title">{{ $t('order.buyerPhone')  }}：</span>
-                            <span>{{this.dataForm.refundDelivery.senderMobile }}</span>
+                          <div class="text-width-item">
+                            <span class="title">{{ $t('order.applicationTime') }}：</span>
+                            <span class="text">{{ dataForm.applyTime }}</span>
+                          </div>
+                          <div class="text-width-item">
+                            <span class="title">{{ $t('order.reasonForReturn') }}：</span>
+                            <span class="text">{{ dataForm.buyerReason }}</span>
+                          </div>
+                          <div class="text-width-item">
+                            <span class="title">{{ $t('order.refundInstructions') }}：</span>
+                            <span class="text">{{ dataForm.buyerDesc }}</span>
                           </div>
                         </div>
                       </div>
                     </div>
-                    <div class="detail-title">
-                      <!-- 物流凭证 -->
-                      <span>{{ $t('order.logisticsCertificate') }}</span>
-                    </div>
+                  </div>
+                  <!-- 退款凭证 -->
+                  <div class="buyers">
+                    <div class="detail-title">{{ $t('order.returnCertificate') }}</div>
                     <div class="buyers-info">
-                      <div class="detail02">
-                        <imgs-upload v-model="refundDeliveryPhotos" :disabled="true" :modal="true" :prompt="false"/>
-                        <!-- <div class="refundImg" v-for="(item, index) in refundDeliveryPhotos" :key="index">
-                          <el-popover placement="right" title trigger="click">
-                            <img slot="reference" :src="resourcesUrl + item"
-                              style="max-height: 79px !important;max-width: 79px !important;" class="showLicense"/>
-                            <img :src="resourcesUrl + item" style="max-height: 720px; max-width: 720px"/>
-                          </el-popover>
-                        </div> -->
+                      <div class="img-up">
+                        <imgs-upload v-model="dataForm.photoFiles" :disabled="true" :modal="true" :prompt="false"/>
                       </div>
                     </div>
-                  </template>
+                  </div>
                 </div>
-                <div class="buyers">
-                  <template>
-                    <div class="detail-title" v-if="deliveryDto">
-                      <!-- 退款物流信息 -->
-                      <span>{{ $t('order.logisticsStatus') }}：</span>
-                      <span class="l-state" v-if="deliveryDto.state === 0">{{ $t("order.noRecord") }}</span>
-                      <span class="l-state" v-if="deliveryDto.state === 1">{{ $t("order.collected") }}</span>
-                      <span class="l-state" v-if="deliveryDto.state === 2">{{ $t("order.delivering") }}</span>
-                      <span class="l-state" v-if="deliveryDto.state === 3">{{ $t("order.haveBeenReceived") }}</span>
-                      <span class="l-state" v-if="deliveryDto.state === 4">{{ $t("order.problemPiece") }}</span>
-                      <span class="l-state" v-if="deliveryDto.state === 201">{{ $t("order.reachTheDestinationCity") }}</span>
-                    </div>
-                    <div class="logistics-box" v-if="deliveryDto">
-                      <!-- 退款时间 -->
-                      <div class="item" v-if="dataForm.returnMoneySts === 5 && dataForm.refundTime !== null">
-                        <div class="time">{{ dataForm.refundTime }}</div>
-                        <div class="text">
-                          {{ $t("refund.refundMoney") }}
-                        </div>
+                <div class="order-info" v-if="this.dataForm.refundDelivery && (this.dataForm.refundDelivery.deyNu || this.dataForm.refundDelivery.imgs)">
+                  <div class="order-details">
+                    <template>
+                      <div class="detail-title">
+                        <span class="prompt">{{$t("order.logisticsDetails")}}</span>
                       </div>
-                      <!-- 收货时间 -->
-                      <div class="item" v-if="dataForm.returnMoneySts === 5 && dataForm.receiveTime !== null">
-                        <div class="time">{{ dataForm.receiveTime }}</div>
-                        <div class="text">
-                          {{ $t("refund.receivedGoods") }}
+                      <div class="detail-cont">
+                        <div class="detail01">
+                          <div class="text-width">
+                            <div class="text-width-item" v-if="this.dataForm.refundDelivery && this.dataForm.refundDelivery.deyName">
+                              <span class="title">{{ $t('order.logisticsName')  }}：</span>
+                              <span class="text">{{this.dataForm.refundDelivery.deyName }}</span>
+                            </div>
+                            <div
+                              v-if="this.dataForm.refundDelivery && this.dataForm.refundDelivery.deyNu" class="text-width-item">
+                              <span class="title">{{ $t('order.trackingNumber') }}：</span>
+                              <span class="text">{{this.dataForm.refundDelivery.deyNu }}</span>
+                            </div>
+                            <div class="text-width-item" v-if="this.dataForm.refundDelivery && this.dataForm.refundDelivery.senderRemarks">
+                              <span class="title">{{ $t('order.compradorMsg') }}：</span>
+                              <span class="text">{{this.dataForm.refundDelivery.senderRemarks }}</span>
+                            </div>
+                            <div v-if="this.dataForm.refundDelivery && this.dataForm.refundDelivery.senderMobile" class="text-width-item">
+                              <span class="title">{{ $t('order.buyerPhone')  }}：</span>
+                              <span>{{this.dataForm.refundDelivery.senderMobile }}</span>
+                            </div>
+                          </div>
                         </div>
                       </div>
-                      <div class="item" v-for="(trace, index) in deliveryDto.traces" :key="index">
-                        <div class="time">{{ trace.acceptTime }}</div>
-                        <div class="text">{{ trace.acceptStation }}</div>
-                      </div>
-                      <div class="item" v-if="deliveryDto.traces &&deliveryDto.traces.length < 1">
-                        {{ $t("order.noLogisticsInformation") }}
+                      <div class="detail-title">
+                        <!-- 物流凭证 -->
+                        <span>{{ $t('order.logisticsCertificate') }}</span>
                       </div>
-                      <!-- 发货时间 -->
-                      <div class="item" v-if="dataForm.returnMoneySts >= 3 && dataForm.shipTime !== null">
-                        <div class="time">{{ dataForm.shipTime }}</div>
-                        <div class="text">
-                          {{ $t("refund.buyerHasShipped") }}
+                      <div class="buyers-info">
+                        <div class="detail02">
+                          <imgs-upload v-model="refundDeliveryPhotos" :disabled="true" :modal="true" :prompt="false"/>
+                          <!-- <div class="refundImg" v-for="(item, index) in refundDeliveryPhotos" :key="index">
+                            <el-popover placement="right" title trigger="click">
+                              <img slot="reference" :src="resourcesUrl + item"
+                                style="max-height: 79px !important;max-width: 79px !important;" class="showLicense"/>
+                              <img :src="resourcesUrl + item" style="max-height: 720px; max-width: 720px"/>
+                            </el-popover>
+                          </div> -->
                         </div>
                       </div>
-                      <!-- 同意退款时间 -->
-                      <div class="item" v-if="dataForm.returnMoneySts >= 2 && dataForm.decisionTime !== null">
-                        <div class="time">{{ dataForm.decisionTime }}</div>
-                        <div class="text">{{ $t("refund.merchantHasAgree") }}</div>
+                    </template>
+                  </div>
+                  <div class="buyers">
+                    <template>
+                      <div class="detail-title" v-if="deliveryDto">
+                        <!-- 退款物流信息 -->
+                        <span>{{ $t('order.logisticsStatus') }}：</span>
+                        <span class="l-state" v-if="deliveryDto.state === 0">{{ $t("order.noRecord") }}</span>
+                        <span class="l-state" v-if="deliveryDto.state === 1">{{ $t("order.collected") }}</span>
+                        <span class="l-state" v-if="deliveryDto.state === 2">{{ $t("order.delivering") }}</span>
+                        <span class="l-state" v-if="deliveryDto.state === 3">{{ $t("order.haveBeenReceived") }}</span>
+                        <span class="l-state" v-if="deliveryDto.state === 4">{{ $t("order.problemPiece") }}</span>
+                        <span class="l-state" v-if="deliveryDto.state === 201">{{ $t("order.reachTheDestinationCity") }}</span>
                       </div>
-                      <!-- 申请时间 -->
-                      <div :class="['item', dataForm.returnMoneySts >= 1?'left-line':'']" v-if="dataForm.returnMoneySts >= 1">
-                        <div class="time">{{ dataForm.applyTime }}</div>
-                        <div class="text">
-                          {{ $t("refund.buyerApply") }}
+                      <div class="logistics-box" v-if="deliveryDto">
+                        <!-- 退款时间 -->
+                        <div class="item" v-if="dataForm.returnMoneySts === 5 && dataForm.refundTime !== null">
+                          <div class="time">{{ dataForm.refundTime }}</div>
+                          <div class="text">
+                            {{ $t("refund.refundMoney") }}
+                          </div>
                         </div>
-                      </div>
-                    </div>
-                  </template>
-                </div>
-              </div>
-              <div class="item-list">
-                <el-table
-                  :data="prodList"
-                  header-cell-class-name="table-header"
-                  row-class-name="table-row"
-                  :row-style="{ height:'82px'}">
-                  <el-table-column prop :label="this.$i18n.t('order.refundGoods')" width="280">
-                    <template slot-scope="scope">
-                      <div class="prod-info">
-                        <!-- <img :src="resourcesUrl + scope.row.pic" class="prod-img" /> -->
-                        <prod-pic
-                          height="60"
-                          width="60"
-                          :pic="scope.row.pic"
-                        ></prod-pic>
-                        <div class="con">
-                          <span class="gift-icon" v-if="scope.row.giveawayOrderItemId">{{ $t("order.giveawayPord") }}</span>
-                          <span>{{ scope.row.prodName }}</span>
+                        <!-- 收货时间 -->
+                        <div class="item" v-if="dataForm.returnMoneySts === 5 && dataForm.receiveTime !== null">
+                          <div class="time">{{ dataForm.receiveTime }}</div>
+                          <div class="text">
+                            {{ $t("refund.receivedGoods") }}
+                          </div>
                         </div>
-                      </div>
-                      <!-- 赠品 -->
-                      <div v-if="dataForm.orderItems.length > 1" class="gift-prod">
-                        <div v-for="item in scope.row.giveawayList" class="item">
-                          <span class="name">{{'【' + $t("order.giveawayPord") + '】'}}{{item.prodName}}</span>
-                          <span class="num">×{{item.prodCount}}</span>
+                        <div class="item" v-for="(trace, index) in deliveryDto.traces" :key="index">
+                          <div class="time">{{ trace.acceptTime }}</div>
+                          <div class="text">{{ trace.acceptStation }}</div>
+                        </div>
+                        <div class="item" v-if="deliveryDto.traces &&deliveryDto.traces.length < 1">
+                          {{ $t("order.noLogisticsInformation") }}
+                        </div>
+                        <!-- 发货时间 -->
+                        <div class="item" v-if="dataForm.returnMoneySts >= 3 && dataForm.shipTime !== null">
+                          <div class="time">{{ dataForm.shipTime }}</div>
+                          <div class="text">
+                            {{ $t("refund.buyerHasShipped") }}
+                          </div>
+                        </div>
+                        <!-- 同意退款时间 -->
+                        <div class="item" v-if="dataForm.returnMoneySts >= 2 && dataForm.decisionTime !== null">
+                          <div class="time">{{ dataForm.decisionTime }}</div>
+                          <div class="text">{{ $t("refund.merchantHasAgree") }}</div>
+                        </div>
+                        <!-- 申请时间 -->
+                        <div :class="['item', dataForm.returnMoneySts >= 1?'left-line':'']" v-if="dataForm.returnMoneySts >= 1">
+                          <div class="time">{{ dataForm.applyTime }}</div>
+                          <div class="text">
+                            {{ $t("refund.buyerApply") }}
+                          </div>
                         </div>
                       </div>
-                      <!-- / 赠品 -->
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    prop="price"
-                    :label="this.$i18n.t('order.unitPrice')">
-                    <template slot-scope="scope">
-                      <span>￥{{ scope.row.price | price }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    prop="count"
-                    :label="this.$i18n.t('order.quantity')">
-                    <template slot-scope="scope">
-                      <span v-if="dataForm.refundType === 1">{{scope.row.prodCount }}</span>
-                      <span v-if="dataForm.refundType === 2">{{dataForm.goodsNum }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    prop="productTotalAmount"
-                    :label="this.$i18n.t('order.prodTotalPrice')">
-                    <template slot-scope="scope">
-                      <span v-if="dataForm.refundType === 1 && !scope.row.giveawayOrderItemId">￥{{scope.row.productTotalAmount | price }}</span>
-                      <span v-if="dataForm.refundType === 2 && !scope.row.giveawayOrderItemId">￥{{
-                        bigProductTotalAmount(
-                          scope.row.price,
-                          dataForm.goodsNum
-                        ) | price }}</span>
-                      <span v-if="scope.row.giveawayOrderItemId">￥{{scope.row.giveawayAmount | price }}</span></template>
-                  </el-table-column>
-
-                  <el-table-column
-                    prop="actualTotal"
-                    :label="this.$i18n.t('order.actualAmount')">
-                    <template slot-scope="scope">
-                      <span v-if="dataForm.refundType === 1 && !scope.row.giveawayOrderItemId">￥{{scope.row.actualTotal | price }}</span>
-                      <span v-if="dataForm.refundType === 2 && !scope.row.giveawayOrderItemId">￥{{
-                        bigActualTotal(
-                          scope.row.actualTotal,
-                          scope.row.prodCount
-                        ) | price
-                      }}</span>
-                      <span v-if="scope.row.giveawayOrderItemId">-</span>
-                      <el-tag
-                        v-if="scope.row.shareReduce > 0 && !scope.row.giveawayOrderItemId"
-                        type="danger" size="mini" effect="dark">{{ $t("order.discount") }}</el-tag>
                     </template>
-                  </el-table-column>
-                  <el-table-column
-                    v-if="dataForm.refundType === 2"
-                    prop="productTotalAmount"
-                    :label="this.$i18n.t('order.returnAmount')">
-                    <template slot-scope="scope">
-                      <!-- <span>{{dataForm.refundAmount}}</span> -->
-                      <span v-if="!scope.row.giveawayOrderItemId">{{
-                        dataForm.refundAmount +
-                        $t("admin.dollar") +
-                        " + " +
-                        dataForm.refundScore +
-                        $t("order.integral") }}</span>
-                      <span v-if="scope.row.giveawayOrderItemId">-</span>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-
-              <div v-if="dataForm.returnMoneySts === 1" class="sellerRemark">
-                <div class="remark-title">{{ $t("order.applyForApproval") }}：</div>
-                <div class="remark-content">
-                  <el-radio-group v-model="isAgreeRefund">
-                    <!-- <el-radio :label="1">待审核</el-radio> -->
-                    <el-radio :label="2">{{dataForm.applyType === 1 ? $t("order.agreeToRefundA") : $t("order.agree") }}</el-radio>
-                    <el-radio :label="3">{{$t("order.disagree") }}</el-radio>
-                  </el-radio-group>
+                  </div>
                 </div>
-              </div>
-
-              <div class="sellerRemark" v-if="dataForm.applyType === 2 && isAgreeRefund === 2 && dataForm.returnMoneySts !== -1">
-                <div class="remark-title" v-if="dataForm.refundDelivery">{{ $t("publics.deliveryAddr") }}：</div>
-                <div v-if="dataForm.returnMoneySts === 1" class="remark-content">
-                  <el-select
-                    v-model="dataForm.refundAddrId"
-                    size="small"
-                    style="width: 350px"
-                    :placeholder="this.$i18n.t('tip.select')"
-                    @change="$forceUpdate()">
-                    <el-option
-                      v-for="item in addrList"
-                      :key="item.refundAddrId"
-                      :label="item.receiverName+'，'+item.receiverMobile+'，'+item.province + item.city + item.area + item.addr"
-                      :value="item.refundAddrId"></el-option>
-                  </el-select>
-                  <!--            新建/刷新-->
-                  <div class="default-btn text-btn"
-                              @click="refreshChange">{{$t('admin.refresh')}}</div>
-                  <el-divider direction="vertical"></el-divider>
-                  <div class="default-btn text-btn"
-                              @click.stop="addOrUpdateHandle()">{{$t('admin.newConstruction')}}</div>
+                <div class="item-list">
+                  <el-table
+                    :data="prodList"
+                    header-cell-class-name="table-header"
+                    row-class-name="table-row"
+                    :row-style="{ height:'82px'}">
+                    <el-table-column prop :label="this.$i18n.t('order.refundGoods')" width="280">
+                      <template slot-scope="scope">
+                        <div class="prod-info">
+                          <!-- <img :src="resourcesUrl + scope.row.pic" class="prod-img" /> -->
+                          <prod-pic
+                            height="60"
+                            width="60"
+                            :pic="scope.row.pic"
+                          ></prod-pic>
+                          <div class="con">
+                            <span class="gift-icon" v-if="scope.row.giveawayOrderItemId">{{ $t("order.giveawayPord") }}</span>
+                            <span>{{ scope.row.prodName }}</span>
+                          </div>
+                        </div>
+                        <!-- 赠品 -->
+                        <div v-if="dataForm.orderItems.length > 1" class="gift-prod">
+                          <div v-for="item in scope.row.giveawayList" class="item">
+                            <span class="name">{{'【' + $t("order.giveawayPord") + '】'}}{{item.prodName}}</span>
+                            <span class="num">×{{item.prodCount}}</span>
+                          </div>
+                        </div>
+                        <!-- / 赠品 -->
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      prop="price"
+                      :label="this.$i18n.t('order.unitPrice')">
+                      <template slot-scope="scope">
+                        <span>￥{{ scope.row.price | price }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      prop="count"
+                      :label="this.$i18n.t('order.quantity')">
+                      <template slot-scope="scope">
+                        <span v-if="dataForm.refundType === 1">{{scope.row.prodCount }}</span>
+                        <span v-if="dataForm.refundType === 2">{{dataForm.goodsNum }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      prop="productTotalAmount"
+                      :label="this.$i18n.t('order.prodTotalPrice')">
+                      <template slot-scope="scope">
+                        <span v-if="dataForm.refundType === 1 && !scope.row.giveawayOrderItemId">￥{{scope.row.productTotalAmount | price }}</span>
+                        <span v-if="dataForm.refundType === 2 && !scope.row.giveawayOrderItemId">￥{{
+                            bigProductTotalAmount(
+                              scope.row.price,
+                              dataForm.goodsNum
+                            ) | price }}</span>
+                        <span v-if="scope.row.giveawayOrderItemId">￥{{scope.row.giveawayAmount | price }}</span></template>
+                    </el-table-column>
+
+                    <el-table-column
+                      prop="actualTotal"
+                      :label="this.$i18n.t('order.actualAmount')">
+                      <template slot-scope="scope">
+                        <span v-if="dataForm.refundType === 1 && !scope.row.giveawayOrderItemId">￥{{scope.row.actualTotal | price }}</span>
+                        <span v-if="dataForm.refundType === 2 && !scope.row.giveawayOrderItemId">￥{{
+                            bigActualTotal(
+                              scope.row.actualTotal,
+                              scope.row.prodCount
+                            ) | price
+                          }}</span>
+                        <span v-if="scope.row.giveawayOrderItemId">-</span>
+                        <el-tag
+                          v-if="scope.row.shareReduce > 0 && !scope.row.giveawayOrderItemId"
+                          type="danger" size="mini" effect="dark">{{ $t("order.discount") }}</el-tag>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      v-if="dataForm.refundType === 2"
+                      prop="productTotalAmount"
+                      :label="this.$i18n.t('order.returnAmount')">
+                      <template slot-scope="scope">
+                        <!-- <span>{{dataForm.refundAmount}}</span> -->
+                        <span v-if="!scope.row.giveawayOrderItemId">{{
+                            dataForm.refundAmount +
+                            $t("admin.dollar") +
+                            " + " +
+                            dataForm.refundScore +
+                            $t("order.integral") }}</span>
+                        <span v-if="scope.row.giveawayOrderItemId">-</span>
+                      </template>
+                    </el-table-column>
+                  </el-table>
                 </div>
-                <div v-if="dataForm.refundDelivery.receiverAddr" class="remark-content">
-                  {{ dataForm.refundDelivery.receiverName +'，'+dataForm.refundDelivery.receiverMobile+'，'+dataForm.refundDelivery.receiverAddr}}
+
+                <div v-if="dataForm.returnMoneySts === 1" class="sellerRemark">
+                  <div class="remark-title">{{ $t("order.applyForApproval") }}：</div>
+                  <div class="remark-content">
+                    <el-radio-group v-model="isAgreeRefund">
+                      <!-- <el-radio :label="1">待审核</el-radio> -->
+                      <el-radio :label="2">{{dataForm.applyType === 1 ? $t("order.agreeToRefundA") : $t("order.agree") }}</el-radio>
+                      <el-radio :label="3">{{$t("order.disagree") }}</el-radio>
+                    </el-radio-group>
+                  </div>
                 </div>
-              </div>
 
-              <div
-                v-if="dataForm.shipTime &&!dataForm.cancelTime &&!dataForm.rejectTime" class="sellerRemark">
-                <div class="remark-title">{{ $t("order.returnStatus") }}：</div>
-                <div class="remark-content">
-                  <el-radio-group v-model="isReceiver" :disabled="dataForm.returnMoneySts !== 3">
-                    <!-- <el-radio :label="1">待审核</el-radio> -->
-                    <el-radio :label="1">{{$t("order.received") }}</el-radio>
-                    <el-radio :label="0">{{$t("order.unreceived") }}</el-radio>
-                  </el-radio-group>
+                <div class="sellerRemark" v-if="dataForm.applyType === 2 && isAgreeRefund === 2 && dataForm.returnMoneySts !== -1">
+                  <div class="remark-title" v-if="dataForm.refundDelivery">{{ $t("publics.deliveryAddr") }}：</div>
+                  <div v-if="dataForm.returnMoneySts === 1" class="remark-content">
+                    <el-select
+                      v-model="dataForm.refundAddrId"
+                      size="small"
+                      style="width: 350px"
+                      :placeholder="this.$i18n.t('tip.select')"
+                      @change="$forceUpdate()">
+                      <el-option
+                        v-for="item in addrList"
+                        :key="item.refundAddrId"
+                        :label="item.receiverName+'，'+item.receiverMobile+'，'+item.province + item.city + item.area + item.addr"
+                        :value="item.refundAddrId"></el-option>
+                    </el-select>
+                    <!--            新建/刷新-->
+                    <div class="default-btn text-btn"
+                         @click="refreshChange">{{$t('admin.refresh')}}</div>
+                    <el-divider direction="vertical"></el-divider>
+                    <div class="default-btn text-btn"
+                         @click.stop="addOrUpdateHandle()">{{$t('admin.newConstruction')}}</div>
+                  </div>
+                  <div v-if="dataForm.refundDelivery.receiverAddr" class="remark-content">
+                    {{ dataForm.refundDelivery.receiverName +'，'+dataForm.refundDelivery.receiverMobile+'，'+dataForm.refundDelivery.receiverAddr}}
+                  </div>
                 </div>
-              </div>
 
-              <div
-                v-if="dataForm.shipTime &&!dataForm.cancelTime &&!dataForm.rejectTime" class="sellerRemark">
-                <div class="remark-title">{{ $t("order.returnRequest") }}：</div>
-                <div class="remark-content">
-                  <el-radio-group v-model="isAgreeRefund" :disabled="dataForm.returnMoneySts !== 3">
-                    <!-- <el-radio :label="1">待审核</el-radio> -->
-                    <el-radio :label="2">{{$t("order.agreeToRefundA") }}</el-radio>
-                    <el-radio :label="3">{{$t("order.refusalToRefund") }}</el-radio>
-                  </el-radio-group>
+                <div
+                  v-if="dataForm.shipTime &&!dataForm.cancelTime &&!dataForm.rejectTime" class="sellerRemark">
+                  <div class="remark-title">{{ $t("order.returnStatus") }}：</div>
+                  <div class="remark-content">
+                    <el-radio-group v-model="isReceiver" :disabled="dataForm.returnMoneySts !== 3">
+                      <!-- <el-radio :label="1">待审核</el-radio> -->
+                      <el-radio :label="1">{{$t("order.received") }}</el-radio>
+                      <el-radio :label="0">{{$t("order.unreceived") }}</el-radio>
+                    </el-radio-group>
+                  </div>
                 </div>
-              </div>
 
-              <div class="sellerRemark" v-if="isAgreeRefund === 3">
-                <div class="input-bar">
-                  <div class="remark-title denial" >{{ $t('order.denialReason') }}：</div>
-                  <el-input
-                    type="textarea"
-                    style="width: 100%;outline-style: none;"
-                    v-model="dataForm.rejectMessage"
-                    maxlength="250"
-                    show-word-limit
-                  ></el-input>
+                <div
+                  v-if="dataForm.shipTime &&!dataForm.cancelTime &&!dataForm.rejectTime" class="sellerRemark">
+                  <div class="remark-title">{{ $t("order.returnRequest") }}：</div>
+                  <div class="remark-content">
+                    <el-radio-group v-model="isAgreeRefund" :disabled="dataForm.returnMoneySts !== 3">
+                      <!-- <el-radio :label="1">待审核</el-radio> -->
+                      <el-radio :label="2">{{$t("order.agreeToRefundA") }}</el-radio>
+                      <el-radio :label="3">{{$t("order.refusalToRefund") }}</el-radio>
+                    </el-radio-group>
+                  </div>
                 </div>
-              </div>
-              <div class="sellerRemark">
-                <div v-if="dataForm.returnMoneySts !== 1" style="display: flex;align-items: baseline;">
-                  <div class="remark-title" v-if="dataForm.sellerMsg">{{ $t('order.merchantNotes') }}：</div>
-                  <div class="remark-content" v-if="dataForm.sellerMsg">{{ dataForm.sellerMsg }}</div>
+
+                <div class="sellerRemark" v-if="isAgreeRefund === 3">
+                  <div class="input-bar">
+                    <div class="remark-title denial" >{{ $t('order.denialReason') }}：</div>
+                    <el-input
+                      type="textarea"
+                      style="width: 100%;outline-style: none;"
+                      v-model="dataForm.rejectMessage"
+                      maxlength="250"
+                      show-word-limit
+                    ></el-input>
+                  </div>
                 </div>
-                <div class="input-bar" v-else>
-                  <div class="remark-title">{{ $t('order.merchantNotes') }}：</div>
-                  <el-input
-                    type="textarea"
-                    style="width: 100%;outline-style: none;"
-                    v-model="dataForm.sellerMsg"
-                    :disabled="dataForm.returnMoneySts !== 1"
-                    maxlength="250"
-                    show-word-limit
-                  >
-                  </el-input>
+                <div class="sellerRemark">
+                  <div v-if="dataForm.returnMoneySts !== 1" style="display: flex;align-items: baseline;">
+                    <div class="remark-title" v-if="dataForm.sellerMsg">{{ $t('order.merchantNotes') }}：</div>
+                    <div class="remark-content" v-if="dataForm.sellerMsg">{{ dataForm.sellerMsg }}</div>
+                  </div>
+                  <div class="input-bar" v-else>
+                    <div class="remark-title">{{ $t('order.merchantNotes') }}：</div>
+                    <el-input
+                      type="textarea"
+                      style="width: 100%;outline-style: none;"
+                      v-model="dataForm.sellerMsg"
+                      :disabled="dataForm.returnMoneySts !== 1"
+                      maxlength="250"
+                      show-word-limit
+                    >
+                    </el-input>
+                  </div>
                 </div>
-              </div>
 
-              <div class="btn-bar">
-                <!-- 仅退款的时候进行的处理操作 -->
+                <div class="btn-bar">
+                  <!-- 仅退款的时候进行的处理操作 -->
                   <div
                     v-if="isAuth('admin:orderRefund:update') && dataForm.returnMoneySts === 1"
                     class="default-btn primary-btn"
                     @click="checkHandel()"
-                    >{{ $t("order.confirmTreatment") }}</div
+                  >{{ $t("order.confirmTreatment") }}</div
                   >
                   <!-- 退货退款的时候进行的处理操作 -->
                   <div
                     v-if="isAuth('admin:orderRefund:update') && dataForm.returnMoneySts === 3"
                     class="default-btn primary-btn"
                     @click="returnMoneyHandle()"
-                    >{{ $t("order.confirmTreatment") }}</div
+                  >{{ $t("order.confirmTreatment") }}</div
                   >
+                </div>
               </div>
             </div>
-          </div>
 
-          <div class="order-log">
-            <div class="log-title">
-              <span>{{ $t("order.refundLog") }}</span>
-            </div>
-            <div class="log-cont">
-              <div v-if="dataForm.applyTime">
-                <span
-                  >{{ dataForm.applyTime }}
-                  {{ $t("order.submitARefundRequestWa") }}</span
-                >
+            <div class="order-log">
+              <div class="log-title">
+                <span>{{ $t("order.refundLog") }}</span>
               </div>
-              <div
-                v-if="dataForm.applyType === 2 && dataForm.handelTime  && !dataForm.rejectTime"
-              >
-                <span
-                  >{{ dataForm.handelTime }}
-                  {{ $t("order.merchantHasProcessedWaBuy") }}</span
+              <div class="log-cont">
+                <div v-if="dataForm.applyTime">
+                    <span
+                    >{{ dataForm.applyTime }}
+                      {{ $t("order.submitARefundRequestWa") }}</span
+                    >
+                </div>
+                <div
+                  v-if="dataForm.applyType === 2 && dataForm.handelTime  && !dataForm.rejectTime"
                 >
-              </div>
+                    <span
+                    >{{ dataForm.handelTime }}
+                      {{ $t("order.merchantHasProcessedWaBuy") }}</span
+                    >
+                </div>
 
-              <div
-                v-if="dataForm.applyType === 1 && dataForm.handelTime  && !dataForm.rejectTime"
-              >
-                <span
-                  >{{ dataForm.handelTime }}
-                  {{ $t("order.merchantHasProcessedWaSh") }}</span
-                >
-              </div>
-              <div v-if="dataForm.shipTime">
-                <span
-                  >{{ dataForm.shipTime }}
-                  {{ $t("order.buyerShipmentWaPro") }}</span
-                >
-              </div>
-              <div v-if="dataForm.receiveTime" >
-                <span
-                  >{{ dataForm.receiveTime }}
-                  {{ $t("order.merchantHasReceivedWaShGr") }}</span
-                >
-              </div>
-              <div v-if="dataForm.decisionTime">
-                <span
-                  >{{ dataForm.decisionTime }}
-                  {{ $t("order.agreeToRefund") }}</span
-                >
-              </div>
-              <div v-if="dataForm.refundTime">
-                <span
-                  >{{ dataForm.refundTime }}
-                  {{ $t("order.refundsuccessfully") }}</span
+                <div
+                  v-if="dataForm.applyType === 1 && dataForm.handelTime  && !dataForm.rejectTime"
                 >
-              </div>
+                    <span
+                    >{{ dataForm.handelTime }}
+                      {{ $t("order.merchantHasProcessedWaSh") }}</span
+                    >
+                </div>
+                <div v-if="dataForm.shipTime">
+                    <span
+                    >{{ dataForm.shipTime }}
+                      {{ $t("order.buyerShipmentWaPro") }}</span
+                    >
+                </div>
+                <div v-if="dataForm.receiveTime" >
+                    <span
+                    >{{ dataForm.receiveTime }}
+                      {{ $t("order.merchantHasReceivedWaShGr") }}</span
+                    >
+                </div>
+                <div v-if="dataForm.decisionTime">
+                    <span
+                    >{{ dataForm.decisionTime }}
+                      {{ $t("order.agreeToRefund") }}</span
+                    >
+                </div>
+                <div v-if="dataForm.refundTime">
+                    <span
+                    >{{ dataForm.refundTime }}
+                      {{ $t("order.refundsuccessfully") }}</span
+                    >
+                </div>
 
-              <div
-                v-if="dataForm.handelTime && dataForm.returnMoneySts === -1  && !dataForm.rejectTime"
-              >
-                <span
-                  >{{ dataForm.updateTime }}
-                  {{ $t("order.refundClosed") }}</span
+                <div
+                  v-if="dataForm.handelTime && dataForm.returnMoneySts === -1  && !dataForm.rejectTime"
                 >
-              </div>
-              <div
-                v-if="dataForm.returnMoneySts === -1 && dataForm.cancelTime"
-              >
-                <span
-                  >{{ dataForm.cancelTime }} {{ $t("order.refundClosed") }}
-                  {{ $t("order.buyerHasWithdrawn") }}</span
+                    <span
+                    >{{ dataForm.updateTime }}
+                      {{ $t("order.refundClosed") }}</span
+                    >
+                </div>
+                <div
+                  v-if="dataForm.returnMoneySts === -1 && dataForm.cancelTime"
                 >
-              </div>
-              <div
-                v-if="dataForm.returnMoneySts === -1 && dataForm.rejectTime"
-              >
-                <span
-                  >{{ dataForm.rejectTime }} {{ $t("order.refundFailed") }}
-                  {{ $t("order.merchantRejected") }}</span
+                    <span
+                    >{{ dataForm.cancelTime }} {{ $t("order.refundClosed") }}
+                      {{ $t("order.buyerHasWithdrawn") }}</span
+                    >
+                </div>
+                <div
+                  v-if="dataForm.returnMoneySts === -1 && dataForm.rejectTime"
                 >
-              </div>
-              <div
-                v-if="dataForm.returnMoneySts === -1 && dataForm.rejectTime && dataForm.rejectMessage"
-                class="reject-info"
-              >
-                <div class="reason">{{$t('order.denialReason')}}：</div>
-                <div class="content"
-                  >{{ dataForm.rejectMessage }} </div
+                    <span
+                    >{{ dataForm.rejectTime }} {{ $t("order.refundFailed") }}
+                      {{ $t("order.merchantRejected") }}</span
+                    >
+                </div>
+                <div
+                  v-if="dataForm.returnMoneySts === -1 && dataForm.rejectTime && dataForm.rejectMessage"
+                  class="reject-info"
                 >
+                  <div class="reason">{{$t('order.denialReason')}}：</div>
+                  <div class="content"
+                  >{{ dataForm.rejectMessage }} </div
+                  >
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-    </el-form>
-    <!-- 弹窗, 新增 / 修改 -->
-    <or-add-or-update
-      v-if="orAddOrUpdateVisible"
-      ref="orAddOrUpdate"
-      @refreshDataList="orRefreshChange"
-    ></or-add-or-update>
-    <add-or-update v-if="addOrUpdateVisible"
-                   ref="addOrUpdate"
-                   @refreshDataList="getRefundAddrList"></add-or-update>
-  </div>
+      </el-form>
+      <!-- 弹窗, 新增 / 修改 -->
+      <or-add-or-update
+        v-if="orAddOrUpdateVisible"
+        ref="orAddOrUpdate"
+        @refreshDataList="orRefreshChange"
+      ></or-add-or-update>
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getRefundAddrList"></add-or-update>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
@@ -531,6 +538,7 @@ import Big from 'big.js'
 import ProdPic from '@/components/prod-pic'
 
 export default {
+  name: 'refund-order-info',
   filters: {
     price (value) {
       if (!value) {
@@ -676,8 +684,8 @@ export default {
 
   },
   mounted () {
-    const refundId = this.$route.query.refundId
-    this.init(refundId)
+    // const refundId = this.$route.query.refundId
+    // this.init(refundId)
   },
   methods: {
     init (id) {