页面修改

src/components/Hotel/roomReservations.vue

@@ -291,28 +291,32 @@
             }
             this.list.forEach(outItem => {
               outItem.StaticsReportList.forEach(item => {
-                item.CommonReport['valueLength'] = item.CommonReport.HotelOrderListReport.length
-                if (item.CommonReport.HotelOrderListReport.length < res.data.data.pageData.columnsCount) {
-                  let _cha = res.data.data.pageData.columnsCount - item.CommonReport.HotelOrderListReport.length
-                  let _chaArr = new Array()
-                  for (let i = 0; i < _cha; i++) {
-                    _chaArr.push({
-                      'HotelName': ''
-                    })
-                  }
-                  item.CommonReport.HotelOrderListReport = item.CommonReport.HotelOrderListReport.concat(_chaArr)
-                }
+                //item.CommonReport['valueLength'] = item.CommonReport.HotelOrderListReport.length
+                // if (item.CommonReport.HotelOrderListReport.length < res.data.data.pageData.columnsCount) {
+                //   let _cha = res.data.data.pageData.columnsCount - item.CommonReport.HotelOrderListReport.length
+                //   let _chaArr = new Array()
+                //   for (let i = 0; i < _cha; i++) {
+                //     _chaArr.push({
+                //       'HotelName': ''
+                //     })
+                //   }
+                //   item.CommonReport.HotelOrderListReport = item.CommonReport.HotelOrderListReport.concat(_chaArr)
+                // }
               })
             })
 
             this.list.forEach(x=>{
               x.StaticsReportList.forEach(y=>{
                   y.CommonReport.newHotel=[];
-                  y.CommonReport.HotelOrderListReport.forEach(z=>{
-                    z.HotelOrderList.forEach(q=>{
-                      y.CommonReport.newHotel.push(q);
-                    })
-                  })
+                  if(y.CommonReport.HotelOrderListReport!=null && y.CommonReport.HotelOrderListReport.length>0)
+                  {
+                    y.CommonReport.HotelOrderListReport.forEach(z=>{
+                                    z.HotelOrderList.forEach(q=>{
+                                      y.CommonReport.newHotel.push(q);
+                                    })
+                      })
+                  }
+              
                 y.colNum = 9+y.CommonReport.newHotel.length;
               })
             })

src/components/systemManagement/lineManagement.vue

@@ -337,7 +337,9 @@ input[type="number"] {
                 </el-col>
                 <el-col :span="2">
                     <div class="_LowDisMoney">
-                        <div>{{item.lineDirection==1?'入境':'出境'}}</div>
+                        <div v-if="item.lineDirection==1">入境</div>
+                        <div v-else-if="item.lineDirection==2">出境</div>
+                        <div v-else-if="item.lineDirection==3">一日游</div>
                         <div>线路方向</div>
                     </div>
                 </el-col>
@@ -495,6 +497,7 @@ input[type="number"] {
                 <el-select v-model="addMsg.LineDirection" :placeholder="$t('pub.pleaseSel')" class="w290">
                   <el-option label='入境' :value='1'></el-option>
                   <el-option label='出境' :value='2'></el-option>
+                  <el-option label='一日游' :value='3'></el-option>
                 </el-select>
               </el-form-item>
           </el-col>