Просмотр исходного кода

Merge branch 'five-second-add' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into six

Tang 3 лет назад
Родитель
Сommit
111e1af818

+ 1 - 1
src/views/Marketing/order/offlineOrder/billingBillCharges/index.vue

@@ -336,7 +336,7 @@ export default {
               item.refundStatus !== 1 &&
               item.refundStatus !== 2 &&
               item.goodsPayStatus !== 3 &&
-              item.goodsPayStatus !== 4
+              item.goodsPayStatus !== 4 && item.orderGoodsStatus !== -1
             );
           });
           this.costList = ary;

+ 3 - 2
src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue

@@ -384,12 +384,13 @@ export default {
             item.refundStatus !== 1 &&
             item.refundStatus !== 2 &&
             item.goodsPayStatus !== 3 &&
-            item.goodsPayStatus !== 4
+            item.goodsPayStatus !== 4 && 
+            item.orderGoodsStatus !== -1
           );
         });
         if (!status) {
           this.$message.error(
-            "请勿选择(完全收费、免费)或退款状态为(退款中、已退款)的订单"
+            "请勿选择(完全收费、免费)或退款状态为(退款中、已退款)或订单状态为关闭的订单"
           );
           return;
         }