linwenxin преди 10 месеца
родител
ревизия
652e0f9e7a
променени са 2 файла, в които са добавени 7 реда и са изтрити 2 реда
  1. 5 1
      src/views/mallManagement/order/order_detail/index.vue
  2. 2 1
      src/views/mallManagement/order/order_list/index.vue

+ 5 - 1
src/views/mallManagement/order/order_detail/index.vue

@@ -26,7 +26,11 @@
                 </div>
                 <div class="order-main-opt-btn">
                   <template v-if="orderDetail.orderStatus === 'NOPAY'">
-                    <el-popconfirm title="确定收款吗?" @confirm="confirmOrder">
+                    <el-popconfirm
+                      v-if="!['WECHAT'].includes(orderDetail.payTypeId)"
+                      title="确定收款吗?"
+                      @confirm="confirmOrder"
+                    >
                       <el-button slot="reference" size="small">确认收款</el-button>
                     </el-popconfirm>
                     <el-button size="small" @click="showDialog('price')" style="margin-left: 10px">修改价格</el-button>

+ 2 - 1
src/views/mallManagement/order/order_list/index.vue

@@ -352,7 +352,8 @@
                           @confirm="quediingshoukuan(order.orderId)"
                           v-if="
                             ['NO_PAID', 'PART_PAID'].includes(order.payStatus) &&
-                            !['DQR', 'CLOSE'].includes(order.orderStatus)
+                            !['DQR', 'CLOSE'].includes(order.orderStatus) &&
+                            !['WECHAT'].includes(order.payTypeId)
                           "
                         >
                           <el-button slot="reference" type="text" size="small">收款</el-button>