no message

src/views/mallManagement/order/order_list/index.vue

@@ -248,12 +248,8 @@
                           v-if="order.orderStatus === 'DQR' && $restrict('confirmOrder')">
                           <el-button slot="reference" type="text" size="small">确认订单</el-button>
                         </el-popconfirm>
-                        <el-popconfirm title="确定取消发货吗？" @confirm="cancelOrder(order.orderId)"
-                          v-if="order.orderStatus === 'DQR' && $restrict('cancelOrder')">
-                          <el-button slot="reference" type="text" size="small">取消发货</el-button>
-                        </el-popconfirm>
                         <el-popconfirm title="确定取消订单吗？" @confirm="cancelOrder(order.orderId)"
-                          v-if="order.orderStatus === 'NOPAY' && $restrict('cancelOrder')">
+                          v-if="(order.orderStatus === 'NOPAY' || order.orderStatus === 'DQR') && $restrict('cancelOrder')">
                           <el-button slot="reference" type="text" size="small">取消订单</el-button>
                         </el-popconfirm>
                         <el-button type="text" size="small" v-if="order.orderStatus === 'DFH' && $restrict('deliver')"