fix: 时间框

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -9,6 +9,7 @@
         ref="ruleForm"
         class="demo-form-inline"
       >
+        <div>
           <el-form-item label="活动名称：" prop="marketing_id">
             <el-select
               v-model="orderQueryObj.marketing_id"
@@ -26,7 +27,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="订单状态：" prop="order_status">
-          <el-select v-model="orderQueryObj.order_status" placeholder="请选择">
+            <el-select
+              v-model="orderQueryObj.order_status"
+              placeholder="请选择"
+            >
               <el-option
                 v-for="item in orderStatusArr"
                 :key="item.value"
@@ -50,6 +54,8 @@
               ></el-option>
             </el-select>
           </el-form-item>
+        </div>
+        <div>
           <el-form-item label="收货人：" prop="cust_user">
             <el-input
               placeholder="请输入收货人姓名或手机号"
@@ -80,6 +86,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
+        </div>
 
         <el-form-item label="详细地址：" prop="take_place_address">
           <el-select
@@ -390,7 +397,7 @@ import {
   newOrderItemList,
   newOrderRefundReject,
   newRefundOrder,
-  newGetOrderExportURL,
+  newGetOrderExportURL
 } from "@/service/Groupmeal/groupmeal";
 import page from "../components/Pagination/index.vue";
 import dayJs from "dayjs";
@@ -398,7 +405,7 @@ export default {
   name: "orderManagement",
   components: {
     Layout,
-    page,
+    page
   },
   data() {
     return {
@@ -414,7 +421,7 @@ export default {
         sub_shop_id: "", // 自提点
         take_place_address: "", //详细地址
         create_time_start: "", // 开始时间
-        create_time_end: "", // 结束时间
+        create_time_end: "" // 结束时间
       },
       order_time: [], // 下单时间
       // 下拉框数据
@@ -424,36 +431,36 @@ export default {
       orderStatusArr: [
         {
           value: "0",
-          label: "全部",
+          label: "全部"
         },
         {
           value: "1",
-          label: "未支付",
+          label: "未支付"
         },
         {
           value: "2",
-          label: "已支付",
+          label: "已支付"
         },
         {
           value: "3",
-          label: "待退款",
+          label: "待退款"
         },
         {
           value: "4",
-          label: "已退款",
+          label: "已退款"
         },
         {
           value: "5",
-          label: "退款中",
+          label: "退款中"
         },
         {
           value: "6",
-          label: "已拒绝",
+          label: "已拒绝"
         },
         {
           value: "7",
-          label: "售后",
-        },
+          label: "售后"
+        }
       ],
       // 商品名称
       tradeNameArr: [],
@@ -482,9 +489,9 @@ export default {
           refundedGoodsSel: false,
           payment: "",
           // restoreInventory: false,
-          goods_name: "",
-        },
-      ],
+          goods_name: ""
+        }
+      ]
     };
   },
 
@@ -497,7 +504,7 @@ export default {
     },
     exportURL3() {
       return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3");
-    },
+    }
   },
 
   methods: {
@@ -524,7 +531,7 @@ export default {
       this.orderQueryObj.sub_shop_id = "";
       this.orderQueryObj.take_place_address = "";
       const params = {
-        marketing_id: val,
+        marketing_id: val
       };
       const res = await newGetGoodsList(params); // 商品名称
       this.getSubShopListMet(val); //自提点
@@ -590,6 +597,7 @@ export default {
 
     // 获取今天日期
     today() {
+      this.order_time = [];
       this.order_time[0] = dayJs(
         new Date(new Date(new Date().toLocaleDateString()).getTime())
       ).format("YYYY-MM-DD HH:mm:ss");
@@ -603,6 +611,7 @@ export default {
 
     // 获取昨天日期
     yesterday() {
+      this.order_time = [];
       this.order_time[0] = dayJs(
         new Date(
           new Date(new Date().toLocaleDateString()).getTime() -
@@ -618,7 +627,7 @@ export default {
     resetOrder(formName) {
       if (this.$route.query.marketing_type == "4") {
         this.$router.push({
-          path: "/op/groupmeal/newOrderManagement",
+          path: "/op/groupmeal/newOrderManagement"
         });
         this.$route.query.marketing_type = "";
       }
@@ -638,7 +647,7 @@ export default {
     searchOrder() {
       if (this.$route.query.marketing_type == "4") {
         this.$router.push({
-          path: "/op/groupmeal/newOrderManagement",
+          path: "/op/groupmeal/newOrderManagement"
         });
         this.$route.query.marketing_type = "";
       }
@@ -688,7 +697,7 @@ export default {
     async printOrderMet(forcePrint) {
       const params = {
         marketing_id: this.orderQueryObj.marketing_id,
-        force_print: forcePrint ? "1" : "",
+        force_print: forcePrint ? "1" : ""
       };
       const res = await newOrderPrint(params);
       return res;
@@ -708,7 +717,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: "success",
-          message: "打印成功",
+          message: "打印成功"
         });
         return;
       }
@@ -726,7 +735,7 @@ export default {
         try {
           await this.$confirm(res.reason, "打印", {
             cancelButtonText: "取消",
-            confirmButtonText: "确定",
+            confirmButtonText: "确定"
           });
         } catch (e) {
           // 取消
@@ -752,7 +761,7 @@ export default {
             goods_id: "",
             cust_user: "",
             order_id: "",
-            sub_shop_id: "",
+            sub_shop_id: ""
           });
         } else {
           res = await newGetOrderList(this.orderQueryObj);
@@ -777,21 +786,21 @@ export default {
       try {
         await this.$confirm("确定要拒绝退款么?", "拒绝", {
           cancelButtonText: "取消",
-          confirmButtonText: "确定",
+          confirmButtonText: "确定"
         });
       } catch (e) {
         // 取消
         return;
       }
       const params = {
-        order_id: val.order_id,
+        order_id: val.order_id
       };
       const res = await newOrderRefundReject(params);
 
       if (res.code === 0) {
         this.$message({
           type: "success",
-          message: "订单已驳回",
+          message: "订单已驳回"
         });
       } else {
         this.$message.error(res.reason);
@@ -817,7 +826,7 @@ export default {
       this.checkAll = false;
       this.refundGoods = [];
       const params = {
-        order_id: val.order_id,
+        order_id: val.order_id
       };
       const res = await newOrderItemList(params);
       this.refundGoods = res.result;
@@ -846,15 +855,15 @@ export default {
       //   }
       // }
 
-      const convertToNumber = (str) => {
+      const convertToNumber = str => {
         return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0;
       };
 
-      const processRefundItem = (item) => {
+      const processRefundItem = item => {
         return {
           order_item_id: item.order_item_id,
           refund_num: item.refundableQuantity || 0,
-          refund_amount: convertToNumber(item.amountToRefund),
+          refund_amount: convertToNumber(item.amountToRefund)
           // refund_type: item.refund_type
         };
       };
@@ -877,13 +886,13 @@ export default {
         return;
       }
       this.$message.error(res.reason);
-    },
+    }
   },
   created() {
     this.getMarketingListMet(); // 活动名称
     this.getSubShopListMet(); // 自提点
     this.getOrderListMet(); // table列表
-  },
+  }
 };
 </script>