Merge branch 'dev' into pre-production

src/views/mail/reservation/list.vue

@@ -44,8 +44,8 @@
                 <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
                   >添加预约
                 </el-button>
-           
-             
+
+
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(1)" plain
                   >导出
                 </el-button>
@@ -80,7 +80,7 @@
                     @click="viewReservation(slotProps.scope)"
                     >查看
                   </el-text>
-            
+
                   <el-text
                     size="small"
                     type="primary"
@@ -89,7 +89,7 @@
                     @click="cancelReservation(slotProps.scope)"
                     >取消预约
                   </el-text>
-              
+
                 </template>
               </tablecmt>
             </template>
@@ -103,7 +103,7 @@
             <div class="avue-crud__header">
               <!-- 头部左侧按钮模块 -->
               <div class="avue-crud__left">
-                
+
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo(2)" plain
                   >导出
                 </el-button>
@@ -138,7 +138,7 @@
                     @click="viewReservation(slotProps.scope)"
                     >查看
                   </el-text>
-                  
+
                 </template>
               </tablecmt>
             </template>
@@ -410,7 +410,7 @@ export default {
           fixed: false,
           sortable: true,
         },
-   
+
         {
           prop: 'periodOfTimeName',
           label: '时段',
@@ -1365,10 +1365,10 @@ export default {
       //   this.query.reservationStatus = '1';
       // }
       let query = this.queryB;
-      query.reservationStatus = '2';
+      query.reservationStatus = '20';
       if (this.activename === 'nocheck') {
         query = this.queryA;
-        query.reservationStatus = this.queryA.reservationStatus || '1';
+        query.reservationStatus= '10';
       }
       // if (this.queryA.reservationStatus)
       getReservationList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
@@ -1381,7 +1381,7 @@ export default {
                 item.orderSource = a.dictValue;
               }
             });
-    
+
             this.resvervationStatusData.forEach(e => {
               if (item.reservationStatus === e.dictKey) {
                 item.reservationStatus = e.dictValue;