|
@@ -5,7 +5,7 @@
|
|
|
<!-- 待发货 -->
|
|
|
<div class="unDelivered" v-if="type == 'orderGoods'">
|
|
|
<p class="order-status">待发货</p>
|
|
|
- <a-button v-if="$hasPermissions('B_order_sendGoods') && (orderState != 'CANCEL')" id="goodsOrder-send" type="primary" size="small" @click="sendGoods">立即发货</a-button>
|
|
|
+ <a-button v-if="$hasPermissions('B_order_sendGoods') && (orderState != 'WAIT_PAY') && (orderState != 'CANCEL')" id="goodsOrder-send" type="primary" size="small" @click="sendGoods">立即发货</a-button>
|
|
|
</div>
|
|
|
<!-- 已发货 -->
|
|
|
<div class="delivered" v-if="type == 'express'">
|
|
@@ -65,8 +65,8 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
rowSelection: function () {
|
|
|
- // 订单状态不可为"已取消" 且 "待发货" 且 有立即发货 权限的即可操作表格
|
|
|
- if (this.orderState != 'CANCEL' && this.type == 'orderGoods' && this.$hasPermissions('B_order_sendGoods')) {
|
|
|
+ // 订单状态不可为"待支付"、"已取消" 且 "待发货" 且 有立即发货 权限的即可操作表格
|
|
|
+ if (this.orderState != 'CANCEL' && this.orderState != 'WAIT_PAY' && this.type == 'orderGoods' && this.$hasPermissions('B_order_sendGoods')) {
|
|
|
return { selectedRowKeys: this.selectedRowKeys, onChange: this.onSelectChange }
|
|
|
} else {
|
|
|
return null
|