|
|
@@ -370,13 +370,25 @@
|
|
|
>
|
|
|
<el-button slot="reference" type="text" size="small">取消订单</el-button>
|
|
|
</el-popconfirm>
|
|
|
- <el-button
|
|
|
- type="text"
|
|
|
- size="small"
|
|
|
- v-if="['SPTG', 'DFH'].includes(order.orderStatus) && $restrict('deliver')"
|
|
|
- @click="showLogistics(order, 'add')"
|
|
|
- >发货</el-button
|
|
|
- >
|
|
|
+
|
|
|
+ <template v-if="['SPTG', 'DFH'].includes(order.orderStatus) && $restrict('deliver')">
|
|
|
+ <el-popconfirm
|
|
|
+ v-if="['PART_PAID', 'NO_PAID'].includes(order.payStatus)"
|
|
|
+ title="是否确定操作发货？"
|
|
|
+ @confirm="
|
|
|
+ () => {
|
|
|
+ showLogistics(order, 'add')
|
|
|
+ }
|
|
|
+ "
|
|
|
+ style="margin-left: 10px"
|
|
|
+ >
|
|
|
+ <el-button slot="reference" size="small" type="primary">发货</el-button>
|
|
|
+ </el-popconfirm>
|
|
|
+ <el-button type="text" size="small" v-else @click="showLogistics(order, 'add')"
|
|
|
+ >发货</el-button
|
|
|
+ >
|
|
|
+ </template>
|
|
|
+
|
|
|
<el-button
|
|
|
type="text"
|
|
|
size="small"
|
linwenxin