|
|
@@ -6,7 +6,7 @@
|
|
|
<div class="contentx" v-if="item!=null">
|
|
|
<div class="desct"></div>
|
|
|
<div class="order-status" v-if="item!=null" >
|
|
|
- <el-steps :active="order.status==3?order.status+1:order.status" align-center>
|
|
|
+ <el-steps :active="item.status==3?item.status+1:item.status" align-center>
|
|
|
<el-step title="待支付"></el-step>
|
|
|
<el-step title="待发货"></el-step>
|
|
|
<el-step title="待收货"></el-step>
|
|
|
@@ -76,57 +76,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>
|
|
|
-
|
|
|
- <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.deliverSn}}</p>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="物流公司名称" width="300" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <p>{{scope.row.deliverName}}</p>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="物流单号" width="300" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <p>{{scope.row.deliverId}}</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>
|
|
|
-
|
|
|
- <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 style="margin-top: 20px">-->
|
|
|
+<!-- <div class="desct">-->
|
|
|
+<!-- 物流信息-->
|
|
|
+<!-- </div>-->
|
|
|
+<!-- -->
|
|
|
+<!-- <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.deliverSn}}</p>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </el-table-column>-->
|
|
|
+<!-- <el-table-column label="物流公司名称" width="300" align="center">-->
|
|
|
+<!-- <template slot-scope="scope">-->
|
|
|
+<!-- <p>{{scope.row.deliverName}}</p>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </el-table-column>-->
|
|
|
+<!-- <el-table-column label="物流单号" width="300" align="center">-->
|
|
|
+<!-- <template slot-scope="scope">-->
|
|
|
+<!-- <p>{{scope.row.deliverId}}</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>-->
|
|
|
+<!-- -->
|
|
|
+<!-- <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">
|
|
|
商品信息
|