FIX: 快递鸟

src/views/live/liveOrder/index.vue

@@ -109,7 +109,7 @@
         <el-date-picker clearable size="small"
           v-model="queryParams.payTime"
           type="date"
-          value-format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd hh:mm:ss"
           placeholder="选择支付时间">
         </el-date-picker>
       </el-form-item>
@@ -158,12 +158,21 @@
       <el-table-column label="地址" align="center" prop="userAddress" />
       <el-table-column label="支付金额" align="center" prop="payMoney" />
       <el-table-column label="订单金额" align="center" prop="totalPrice" />
-<!--      <el-table-column label="物流编号" align="center" prop="deliveryCode" />-->
-<!--      <el-table-column label="物流名称" align="center" prop="deliveryName" />-->
-<!--      <el-table-column label="物流单号" align="center" prop="deliverySn" />-->
+      <el-table-column label="物流编号" align="center" prop="deliveryCode" />
+      <el-table-column label="物流名称" align="center" prop="deliveryName" />
+      <el-table-column label="物流单号" align="center" prop="deliverySn" />
+      <el-table-column label="物流状态" align="center" prop="deliveryStatus">
+        <template slot-scope="item">
+        <dict-tag :options="deliveryStatusOptions" :value="item.row.deliveryStatus"/>
+      </template></el-table-column>
+      <el-table-column label="物流跟踪状态" align="center" prop="deliveryType">
+        <template slot-scope="item">
+          <dict-tag :options="deliveryTypeOptions" :value="item.row.deliveryType"/>
+        </template>
+        </el-table-column>
       <el-table-column label="支付时间" align="center" prop="payTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}-{m}-{s}') }}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="完成时间" align="center" prop="finishTime" width="180">-->
@@ -210,6 +219,7 @@ import {getCompanyList} from "@/api/company/company";
 import Treeselect from "@riophae/vue-treeselect";
 import {treeselect} from "@/api/company/companyDept";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {parseTime} from "../../../utils/common";
 
 export default {
   name: "LiveOrder",
@@ -234,6 +244,9 @@ export default {
       total: 0,
       // 订单表格数据
       liveOrderList: [],
+      deliveryStatusOptions:[],
+      deliveryTypeOptions:[],
+
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -277,8 +290,16 @@ export default {
     this.getDicts("sys_order_status").then(response => {
       this.orderOptions = response.data;
     });
+
+    this.getDicts("store_order_delivery_status").then(response => {
+      this.deliveryStatusOptions = response.data;
+    });
+    this.getDicts("logistics_status").then(response => {
+      this.deliveryTypeOptions = response.data;
+    });
   },
   methods: {
+    parseTime,
     // 查看详情
     handledetails(row){
       this.show.open=true;

src/views/live/liveOrder/liveOrderDetails.vue

@@ -18,9 +18,9 @@
                <span style="margin-left: 20px" class="color-danger">订单状态：
                   <el-tag prop="status" v-for="(ite, index) in orderOptions"    v-if="item.status==ite.dictValue">{{ite.dictLabel}}</el-tag>
                </span>
-<!--          <div class="operate-button-container" v-if="item.status==3">-->
-<!--            <el-button size="mini" @click="finishOrder()" v-hasPermi="['his:liveOrder:good']">确认收货</el-button>-->
-<!--          </div>-->
+          <div class="operate-button-container" v-if="item.status==3">
+            <el-button size="mini" @click="finishOrder()" v-hasPermi="['his:liveOrder:good']">确认收货</el-button>
+          </div>
           <div class="operate-button-container"  v-if="item.status==2&&item.orderType==1">
             <el-button size="mini" @click="sendVisible=true" v-hasPermi="['his:liveOrder:sendGoods']">发货</el-button>
           </div>
@@ -43,12 +43,12 @@
           <div class="operate-button-container" >
             <el-button size="mini" @click="editOrder()"  v-hasPermi="['his:liveOrder:edit']" >修改订单</el-button>
           </div>
-<!--          <div class="operate-button-container" v-if="item.status ==2 && item.extendOrderId == null && item.deliverySn == null&&item.orderType==1"   v-hasPermi="['his:liveOrder:createErpOrder']">-->
-<!--            <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>-->
-<!--          </div>-->
-<!--          <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.status ==2 && item.extendOrderId == null && item.deliverySn == null&&item.orderType==1"   v-hasPermi="['his:liveOrder:createErpOrder']">
+            <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>
+          </div>
+          <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>-->
@@ -271,7 +271,7 @@ import {
   listOrderitem,
   tuiOrder,
   refundOrderMoney,
-  editDeliveryId
+  editDeliveryId, finishOrder
 } from "@/api/live/liveOrder";
 
 
@@ -692,13 +692,12 @@ export default {
         var data={
           orderId:that.item.orderId
         }
-        return getGoods(data);
+        return finishOrder(data);
       }).then(() => {
         this.msgSuccess("操作成功");
         getLiveOrder(this.item.orderId).then(response => {
           this.item = response.data;
           this.getlistOrderitem(this.item.orderId);
-          // this.getlogList(this.item.orderId);
           this.$parent.$parent.getList();
         });
       }).catch(function() {});