瀏覽代碼

订单状态为已取消时不可发货

chenrui 4 年之前
父節點
當前提交
ce57bf7d6e
共有 2 個文件被更改,包括 8 次插入4 次删除
  1. 7 3
      src/views/shop/GoodsOrder.vue
  2. 1 1
      src/views/shop/orderDetail.vue

+ 7 - 3
src/views/shop/GoodsOrder.vue

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

+ 1 - 1
src/views/shop/orderDetail.vue

@@ -56,7 +56,7 @@
         <!-- 商品订单 -->
         <div v-if="orderData && orderData.orderGoodsList">
           <!-- 待发货 -->
-          <GoodsOrder type="orderGoods" :orderData="orderData.orderGoodsList" :isReset="isReset" @sendGoods="sendGoods" />
+          <GoodsOrder type="orderGoods" :orderData="orderData.orderGoodsList" :orderState="orderDetail.orderState" :isReset="isReset" @sendGoods="sendGoods" />
         </div>
         <div v-if="orderData && orderData.orderExpressList">
           <!-- 已发货 -->