提交 修复BUG

1

src/views/oms/order/index.vue

@@ -173,12 +173,12 @@
               @click="handleViewOrder(scope.$index, scope.row)"
               >查看订单</el-button
             >
-            <el-button
+            <!-- <el-button
               size="mini"
               @click="handleCloseOrder(scope.$index, scope.row)"
               v-show="scope.row.status === 0 || scope.row.status === 6"
               >关闭订单</el-button
-            >
+            > -->
             <el-button
               size="mini"
               @click="handleDeliveryOrder(scope.$index, scope.row)"
@@ -380,7 +380,9 @@ export default {
         return "支付宝";
       } else if (value === 2) {
         return "微信";
-      } else {
+      } else if (value === 3) {
+        return "余额";
+      }else {
         return "未支付";
       }
     },

src/views/oms/order/orderDetail.vue

@@ -44,9 +44,9 @@
             >修改费用信息</el-button
           >
           <!-- <el-button size="mini" @click="showMessageDialog">发送站内信</el-button> -->
-          <el-button size="mini" @click="showCloseOrderDialog"
+          <!-- <el-button size="mini" @click="showCloseOrderDialog"
             >关闭订单</el-button
-          >
+          > -->
           <el-button size="mini" @click="showMarkOrderDialog"
             >备注订单</el-button
           >
@@ -561,7 +561,9 @@ export default {
         return "支付宝";
       } else if (value === 2) {
         return "微信";
-      } else {
+      } else if (value === 3) {
+        return "余额";
+      }else {
         return "未支付";
       }
     },

src/views/pms/product/index.vue

@@ -353,6 +353,7 @@ const defaultListQuery = {
   productSn: null,
   productCategoryId: null,
   brandId: null,
+  stock:null
 };
 export default {
   name: "productList",