FIX: 账户流水查看订单详情

src/views/live/liveOrder/liveOrderDetails.vue

@@ -27,12 +27,6 @@
           <div class="operate-button-container"  v-if="item.status==2&&item.orderType==2">
             <el-button size="mini" @click="tuiOrder()" v-hasPermi="['his:liveOrder:sendHisGoods']" >推送订单</el-button>
           </div>
-<!--          <div class="operate-button-container" v-if="item.inquiryOrderId!=null&&item.inquiryOrderId!=''" v-hasPermi="['his:liveOrder:inquiry']">-->
-<!--            <el-button size="mini" @click="getInquiryOrder()" >问诊订单</el-button>-->
-<!--          </div>-->
-<!--          <div class="operate-button-container" v-if="item.packageOrderId!=null&&item.packageOrderId!=''" v-hasPermi="['his:liveOrder:package']" >-->
-<!--            <el-button size="mini" @click="getPackageOrder()" >套餐包订单</el-button>-->
-<!--          </div>-->
           <div class="operate-button-container"   v-if="item.deliverySn!=null" v-hasPermi="['his:liveOrder:express']">
             <el-button size="mini" @click="showExpress()" >查看物流</el-button>
           </div>
@@ -49,25 +43,9 @@
           <div class="operate-button-container" v-if="item.extendOrderId!=null && item.orderType==1"  v-hasPermi="['his:liveOrder:getEroOrder']"  >
             <el-button size="mini" @click="showErpOrder()" >ERP订单信息</el-button>
           </div>
-<!--          <div class="operate-button-container" v-if="item.tuiMoneyStatus==0 && item.status==4"  v-hasPermi="['his:liveOrder:editTuiMoney']"  >-->
-<!--            <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>-->
-<!--          </div>-->
-<!--          <div class="operate-button-container" v-if="item.tuiMoneyStatus==1 && item.status==4"  v-hasPermi="['his:liveOrder:editTuiMoney']"  >-->
-<!--            <el-button size="mini" @click="editTuiMoney2()" >冻结</el-button>-->
-<!--          </div>-->
-<!--          <div class="operate-button-container"  v-if="item.followTime!=null&&item.followTime!=''"   v-hasPermi="['his:liveOrder:msgList']"  >-->
-<!--            <el-button size="mini" @click="followMsg()" >随访记录</el-button>-->
-<!--          </div>-->
-
           <div class="operate-button-container" v-if="item.status>1">
             <el-button size="mini" @click="refund()" v-hasPermi="['his:liveOrder:refundOrderMoney']">退款</el-button>
           </div>
-<!--          <div class="operate-button-container" v-if="item.status== -2" >-->
-<!--            <el-button size="mini" @click="returnCost()"  v-hasPermi="['his:liveOrder:returnCost']" >成本退还</el-button>-->
-<!--          </div>-->
-<!--          <div class="operate-button-container" >-->
-<!--            <el-button size="mini" @click="sendFollowMsg()" v-if="item.status>1" v-hasPermi="['his:liveOrder:sendMsg']">发送随访消息</el-button>-->
-<!--          </div>-->
         </div>
         <div class="desct">
           基本信息
@@ -75,15 +53,12 @@
         <el-descriptions :column="3" border  >
           <el-descriptions-item label="订单编号"  ><span v-if="item!=null">{{item.orderCode}}</span></el-descriptions-item>
           <el-descriptions-item label="会员"><span v-if="item.nickName!=null">{{item.nickName}}({{item.phone}})</span></el-descriptions-item>
-          <el-descriptions-item label="会员ID"  ><span v-if="item!=null">{{item.userId}}</span></el-descriptions-item>
           <el-descriptions-item label="支付方式"  ><dict-tag :options="PayOptions" :value="item.payType"/></el-descriptions-item>
-          <el-descriptions-item label="订单来源"  ><dict-tag :options="sourceOptions" :value="item.source"/></el-descriptions-item>
-          <el-descriptions-item label="店铺名称"  ><span v-if="item!=null">{{item.storeName}}</span></el-descriptions-item>
           <el-descriptions-item label="收货人" >  <span v-if="item!=null">{{item.userName}}</span>  </el-descriptions-item>
-          <el-descriptions-item label="收货人电话" > <span v-if="item!=null">{{item.userPhone}}</span>
+          <el-descriptions-item label="手机号码" > <span v-if="item!=null">{{item.userPhone}}</span>
             <el-button icon="el-icon-search" size="mini" @click="handlePhone()" style="margin-left: 20px;" circle v-hasPermi="['his:liveOrder:queryPhone']"></el-button>
           </el-descriptions-item>
-          <el-descriptions-item label="详细地址" > <span>{{item.userAddress}}</span>  </el-descriptions-item>
+          <el-descriptions-item label="收货地址" > <span>{{item.userAddress}}</span>  </el-descriptions-item>
           <el-descriptions-item label="所属公司"><span v-if="item!=null">{{item.companyName}}</span></el-descriptions-item>
           <el-descriptions-item label="员工"><span v-if="item!=null">{{item.companyUserName}}</span></el-descriptions-item>
           <el-descriptions-item label="推广佣金" ><span v-if="item.tuiMoney!=null">{{item.tuiMoney.toFixed(2)}}</span></el-descriptions-item>
@@ -109,7 +84,57 @@
         </el-descriptions>
       </el-card>
     </div>
-
+    <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
+      <div style="margin-top: 20px">
+        <div class="desct">
+          物流信息
+        </div>
+        &nbsp;
+        <el-link  type="primary" @click="editDelivery(null)">添加物流信息</el-link>
+      </div>
+      <el-table
+        border
+        :data="deliverList"
+        size="small"
+        style="width: 100%;margin-top: 20px" >
+        <el-table-column label="物流公司编码" width="150" align="center">
+          <template slot-scope="scope">
+            <p>{{scope.row.deliveryCode}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="物流公司名称" width="300" align="center">
+          <template slot-scope="scope">
+            <p>{{scope.row.deliveryName}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="物流单号" width="300" align="center">
+          <template slot-scope="scope">
+            <p>{{scope.row.deliverySn}}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="物流状态" width="300" align="center">
+          <template slot-scope="scope">
+              <span>
+              <el-tag v-for="(item, index) in deliveryStatusOptions"    v-if="scope.row!=null&&scope.row.status==item.dictValue">
+              {{item.dictLabel}}
+              </el-tag>
+              </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发货时间" width="240" align="center">
+          <template slot-scope="scope">
+            {{scope.row.deliverySendTime}}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="240" align="center">
+          <template slot-scope="scope">
+            <el-link  type="primary" @click="showExpress(scope)">查看物流跟踪</el-link>
+            &nbsp;&nbsp;
+            <el-link  type="primary" @click="editDelivery(scope)">修改物流</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
     <div class="contentx" v-if="item!=null" style="padding-bottom: 70px;">
       <div class="desct">
         商品信息
@@ -143,16 +168,6 @@
             {{scope.row.otPrice}}
           </template>
         </el-table-column>
-<!--        <el-table-column label="数量" width="180" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{scope.row.num}}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="小计"  align="center">-->
-<!--          <template slot-scope="scope" >-->
-<!--            ￥{{(scope.row.num*scope.row.price).toFixed(2)}}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
       </el-table>
       <div style="float: right;margin: 20px" v-if="item.totalPrice!=null">
         合计：<span class="color-danger">￥{{item.totalPrice.toFixed(2)}}</span>
@@ -271,7 +286,7 @@ import {
   listOrderitem,
   tuiOrder,
   refundOrderMoney,
-  editDeliveryId, finishOrder
+  editDeliveryId, finishOrder,getByOrderId
 } from "@/api/live/liveOrder";
 import {getStoreOrderLive} from "@/api/store/storeOrder";
 
@@ -335,6 +350,7 @@ export default {
       express:null,
       traces:[],
       msg:[],
+      deliverList: [],
       sexOptions:[],
       refundOptions:[],
       channelOptions:[],
@@ -431,6 +447,7 @@ export default {
     this.getDicts("logistics_status").then(response => {
       this.deliveryTypeOptions = response.data;
     });
+
   },
   methods: {
 
@@ -777,14 +794,17 @@ export default {
         this.msgForm.userId=response.data.userId;
         this.msgForm.followDoctorId=response.data.followDoctorId;
         this.getlistOrderitem(this.item.orderId);
+        getByOrderId(this.item.orderId).then(response => {
+          this.deliverList = [response.data]
+          console.log(this.deliverList)
+        })
       });
+
     },
     getOrder(){
       getLiveOrder(this.item.orderId).then(response => {
         this.item = response.data;
         this.getlistOrderitem(this.item.orderId);
-        // this.getlogList(this.item.orderId);
-        // this.getPayment(this.item.orderId);
       });
     },
     submitEditDyForm(){
@@ -802,17 +822,6 @@ export default {
               });
             }
           })
-          // updateLiveOrder(this.editDyForm).then(response => {
-          //   if (response.code === 200) {
-          //     this.msgSuccess("操作成功");
-          //     this.editDy.open = false;
-          //     getLiveOrder(this.item.orderId).then(response => {
-          //       this.item = response.data;
-          //       // this.getlogList(this.item.orderId);
-          //       this.$parent.$parent.getList();
-          //     });
-          //   }
-          // });
         }
       });
     },