新增酒店统计

src/components/Hotel/roomSure.vue

@@ -109,7 +109,11 @@
 
         <el-table-column :label="$t('leader.leader_Guide')" prop="GuideName" width="150">
           <template #default="{row}">
-            <span v-if="row.isFirst">{{row.parent.GuideName}}({{row.parent.GuideSpareTel}})</span>
+            <span v-if="row.isFirst">{{row.parent.GuideName}}
+              <template v-if="row.parent.GuideSpareTel&&row.parent.GuideSpareTel!=''">
+                ({{row.parent.GuideSpareTel}})
+              </template>
+            </span>
           </template>
         </el-table-column>
 
@@ -284,7 +288,7 @@
         // 需要合并的列（根据上面 el-table-column 的顺序）：0..8 以及最后一列动作 (共 10 列)
         // 我们只按列属性判断，合并那些基于父级显示的列
         const mergeCols = ['DMCNum', 'TCNUM', 'OutBranchName', 'LeaderName', 'GuideName', 'LtName', 'seat', 'UseTime',
-          'NewHotelName', 'actions','StartDate'
+          'NewHotelName', 'actions', 'StartDate'
         ];
         if (row.isFirst && mergeCols.includes(column.property)) {
           return [span, 1];
@@ -458,14 +462,10 @@
         parseInt(myDate.getMonth() + 1) +
         "-" +
         myDate.getDate();
-      if (this.$route.query.hotelId) {
-        this.msg.HotelId = this.$route.query.hotelId;
-      }
-      if (this.$route.query.dateStr) {
-        this.msg.DateStr = this.$route.query.dateStr;
-      }
-      if (this.$route.query.hotelId || this.$route.query.dateStr) {
-        this.msg.StartDate = "";
+
+      if (this.$route.query.dateStr && this.$route.query.dateStr != '') {
+        this.msg.StartDate = this.$route.query.dateStr;
+        this.msg.EndDate = this.$route.query.dateStr
       } else {
         this.msg.StartDate = nowDate;
       }
@@ -473,7 +473,6 @@
         this.msg.LineId = 14;
         this.getLineTeamList();
       }
-      //this.GetHotelList();
       this.getList();
     },
   }

src/router/config.js

@@ -1476,6 +1476,14 @@ export default {
               meta: {
                 title: '房型确认'
               },
+            },
+                     {
+              path: '/roomStatic', //订房统计
+              name: 'roomStatic',
+              component: resolve => require(['@/components/Hotel/roomStatic'], resolve),
+              meta: {
+                title: '订房统计'
+              },
             },
             {
               path: '/roomSure', //订房确认