检索记录

src/views/order/orderStatistics/index.vue

@@ -135,13 +135,15 @@ export default {
 				: (this.listQuery.startTime = null)
 			!!this.listQuery.time[1]
 				? (this.listQuery.endTime = this.listQuery.time[1].getTime())
-				: (this.listQuery.endTime = null)
+				: (this.listQuery.endTime = null);
+			this.listQuery.page = 1;
 			this.getList()
 		},
 		//统计方式筛选
 		changeWay(val) {
 			this.isactive = val.label
-			this.listQuery.type = val.id
+			this.listQuery.type = val.id;
+      this.listQuery.page = 1;
 			this.getList()
 		},
 		//导出
@@ -223,4 +225,4 @@ export default {
 	color: #409eff;
 	font-weight: bold;
 }
-</style>
+</style>
\ No newline at end of file

src/views/userManagement/employeesInput.vue

@@ -449,6 +449,7 @@ export default {
 		},
 		//搜索
 		handleFilter() {
+      this.listQuery.page = 1;
       if(this.listQuery){
         localStorage.setItem("employeesInput", JSON.stringify(this.listQuery));
       }

src/views/userManagement/memberEnter.vue

@@ -495,6 +495,7 @@
        * 搜索
        */
       handleFilter() {
+        this.listQuery.page = 1;
         this.getList();
       },
       handleSizeChange(val) {

src/views/userManagement/userList/index.vue

@@ -820,7 +820,6 @@
         if(queryJson.limit){
           t.listQuery.limit = queryJson.limit;
         }
-
         if(queryJson.mobileList){
           t.listQuery.mobileList = queryJson.mobileList;
         }
@@ -1062,6 +1061,7 @@
        *查询
        */
       handleFilter() {
+        this.listQuery.page = 1;
         if(this.listQuery){
           localStorage.setItem("userList", JSON.stringify(this.listQuery));
         }

src/views/vehicle/vehicleDepartureLog/index.vue

@@ -345,6 +345,7 @@
             this.handleFilter();
           },
             handleFilter() {
+              this.listQuery.page = 1
               if(this.listQuery){
                 localStorage.setItem("vehicleDepartureLog", JSON.stringify(this.listQuery));
               }

src/views/vehicle/vehicleInfo/index.vue

@@ -2072,10 +2072,7 @@
             },
             handleFilter() {
               let t = this;
-              let query =  localStorage.getItem("vehicleInfo");
-              if(query =="null" || !query){
-                this.listQuery.page = 1;
-              }
+              this.listQuery.page = 1;
               this.$refs.queryForm.validate(valid => {
                   if (valid) {
                     if(t.listQuery){

src/views/vehicle/vehicleSchedulManage/vehicleExhibitionModal.vue

@@ -31,7 +31,8 @@
         <span>{{currentItem.ii.vehicleBookRecord.remark}}</span>
       </el-form-item>
     </el-form>
-    <div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2&&bookRecord_btn_unbook&&currentItem.ii.vehicleBookRecord.vehicleDepartureLogVo!=undefined' class="dialog-footer">
+    <!--客户租车-已审核过-取消按钮权限-未出行-->
+    <div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==2 && currentItem.ii.bookType==9 &&bookRecord_btn_unbook && !currentItem.ii.vehicleBookRecord.vehicleDepartureLogVo' class="dialog-footer">
       <el-button @click="cancel()">取消用车</el-button>
     </div>
     <div slot="footer" v-if='currentItem.ii.vehicleBookRecord.status==1' class="dialog-footer">
@@ -91,21 +92,28 @@
        * 弹框-取消
        * */
       cancel() {
-        console.log("展览取消用车");
         var obj = {
             vehicleBookRecordId:this.currentItem.ii.vehicleBookRecord.id
-        }
-        cancleBook(obj).then(response => {
-          if(response.code==1){
-            this.$emit("zhanlanDialogEvent", true);
-          }else{
-            this.$notify({
-              title: '失败',
-              message: response.message,
-              type: 'error',
-              duration: 2000
-            });
-          }
+        };
+        this.$confirm('确定取消吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          cancleBook(obj).then(response => {
+            if(response.code==1){
+              this.$emit("zhanlanDialogEvent", true);
+            }else{
+              this.$notify({
+                title: '失败',
+                message: response.message,
+                type: 'error',
+                duration: 2000
+              });
+            }
+          });
+        }).catch(() => {
+          console.log("cancel");
         });
       },
       /**

src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue

@@ -224,6 +224,7 @@
         this.getList();
       },
       handleFilter() {
+        this.listQuery.page = 1;
         if(this.listQuery){
           localStorage.setItem("vehicleRecords", JSON.stringify(this.listQuery));
         }

src/views/vehicle/vehicleUpkeepLog/index.vue

@@ -149,6 +149,7 @@
         this.handleFilter();
       },
       handleFilter() {
+        this.listQuery.page = 1;
         if(this.listQuery){
           localStorage.setItem("vehicleUpkeepLog", JSON.stringify(this.listQuery));
         }

src/views/vehicle/vehicleWarningMsg/index.vue

@@ -300,6 +300,7 @@
       },
       handleFilter() {
         let t = this;
+        this.listQuery.page = 1
         this.$refs.queryForm.validate(valid => {
           if (valid) {
             if(t.listQuery){