diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index f528e7299..bdda3e9f4 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -35,6 +35,22 @@
                 />
             </el-form-item>
 
+            <el-form-item label="订单状态" prop="orderStatus">
+                <el-select
+                    v-model="queryParams.orderStatus"
+                    placeholder="请选择订单状态"
+                    clearable
+                    style="width: 140px"
+                >
+                    <el-option
+                        v-for="item1 in dict.type.order_status"
+                        :key="item1.value"
+                        :label="item1.label"
+                        :value="item1.value"
+                    />
+                </el-select>
+            </el-form-item>
+
             <el-form-item label="手机号码" prop="mobileNumber">
                 <el-input
                     v-model="queryParams.mobileNumber"
@@ -53,22 +69,6 @@
                     />
                 </el-form-item>
 
-                <el-form-item label="订单状态" prop="orderStatus">
-                    <el-select
-                        v-model="queryParams.orderStatus"
-                        placeholder="请选择订单状态"
-                        clearable
-                        style="width: 140px"
-                    >
-                        <el-option
-                            v-for="item1 in dict.type.order_status"
-                            :key="item1.value"
-                            :label="item1.label"
-                            :value="item1.value"
-                        />
-                    </el-select>
-                </el-form-item>
-
                 <el-form-item label="创建时间">
                     <el-date-picker
                         v-model="createTimeRange"
@@ -79,7 +79,7 @@
                         range-separator="-"
                         start-placeholder="开始日期"
                         end-placeholder="结束日期"
-                        :clearable="false"
+                        :clearable="true"
                     ></el-date-picker>
                 </el-form-item>
                 <el-form-item label="结算时间">
@@ -92,7 +92,7 @@
                         range-separator="-"
                         start-placeholder="开始日期"
                         end-placeholder="结束日期"
-                        :clearable="false"
+                        :clearable="true"
                     ></el-date-picker>
                 </el-form-item>
             </div>
@@ -252,7 +252,7 @@
                                 </el-descriptions-item>
                                 <el-descriptions-item label="结束充电时间"
                                     >{{ item.chargeEndTime || "一" }}
-                                </el-descriptions-item> 
+                                </el-descriptions-item>
                                 <el-descriptions-item label="启动方式"
                                     >{{ startMode(item.startMode )}}
                                 </el-descriptions-item>
@@ -673,17 +673,23 @@ export default {
     },
     watch: {
         createTimeRange(newValue, oldValue) {
-            // console.log("createTimeRange发生变化", newValue, oldValue);
+            console.log("createTimeRange发生变化", newValue, oldValue);
             if (newValue != null && newValue.length > 0) {
                 this.queryParams.startTime = newValue[0];
                 this.queryParams.endTime = newValue[1];
+            } else {
+                this.queryParams.startTime = null;
+                this.queryParams.endTime = null;
             }
         },
         comeTimeRange(newValue, oldValue) {
-            // console.log("comeTimeRange发生变化", newValue, oldValue);
+            console.log("comeTimeRange发生变化", newValue, oldValue);
             if (newValue != null && newValue.length > 0) {
                 this.queryParams.startSettleTime = newValue[0];
                 this.queryParams.endSettleTime = newValue[1];
+            } else {
+                this.queryParams.startSettleTime = null;
+                this.queryParams.endSettleTime = null;
             }
         }
     },