页面修改

src/components/Hotel/roomReservationsDetails.vue

@@ -5,9 +5,11 @@
     margin: 5px auto;
     font-size: 12px;
   }
+
   .rq_importNote {
     color: red;
   }
+
   .rq_disImNote {
     color: #ea6d6d;
   }
@@ -125,7 +127,8 @@
                     <td width="70" style="text-align:center;" colspan="2">
                       <span style="color:red">{{subItem.NewHotelName}}</span>
                       <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
-                        <comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList" :UseDate="item.UseTimeStr">
+                        <comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
+                          :UseDate="item.UseTimeStr">
                         </comCheckHotel>
                         <el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"
                           slot="reference" style="cursor:pointer;"
@@ -250,7 +253,7 @@
                         <el-option label='请选择' :value='0'></el-option>
                         <el-option label='现付' :value='1'></el-option>
                         <el-option label='签单' :value='2'></el-option>
-                        <el-option label='实物抵扣' :value='3' ></el-option>
+                        <el-option label='实物抵扣' :value='3'></el-option>
                         <el-option label='预付' :value='4'></el-option>
                         <el-option label='预付款抵扣' :value='5'></el-option>
                       </el-select>
@@ -297,7 +300,8 @@
                   <tr>
                     <td width="70" style="text-align:right;">提醒供应商:</td>
                     <td>
-                      <el-select class='w135 sel' v-model='subItem.SupplierHotelStatus' :placeholder="$t('pub.pleaseSel')">
+                      <el-select class='w135 sel' v-model='subItem.SupplierHotelStatus'
+                        :placeholder="$t('pub.pleaseSel')">
                         <el-option label='请选择' :value='0'></el-option>
                         <el-option label='一般提醒' :value='1'></el-option>
                         <el-option label='重要提醒' :value='2'></el-option>
@@ -313,10 +317,11 @@
                       <el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
                     </td>
                   </tr>
-                   <tr v-if="subItem.SupplierToDmcRemarks">
+                  <tr v-if="subItem.SupplierToDmcRemarks">
                     <td width="70" style="text-align:right;">供应商对地接备注：</td>
                     <td>
-                      <span :class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
+                      <span
+                        :class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
                         {{subItem.SupplierToDmcRemarks}}
                       </span>
                     </td>
@@ -561,7 +566,7 @@
                 })
               });
               this.list = list;
-              console.log(this.list,'listttt');
+              console.log(this.list, 'listttt');
               this.$forceUpdate();
             }
           } else {
@@ -624,7 +629,11 @@
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
             subItem.OrderDetailsList.forEach(y => {
-              y.HouseTypeCount = parseFloat(y.HouseTypeCount);
+              if (y.HouseTypeCount) {
+                y.HouseTypeCount = parseFloat(y.HouseTypeCount);
+              } else {
+                y.HouseTypeCount = 0;
+              }
               if (y.UnitPrice) {
                 y.UnitPrice = parseInt(y.UnitPrice);
               } else {
@@ -658,8 +667,13 @@
         this.list.forEach(item => {
           item.HotelOrderList.forEach(subItem => {
             subItem.OrderDetailsList.forEach(y => {
-              y.HouseTypeCount = parseFloat(y.HouseTypeCount);
-               if (y.UnitPrice) {
+              if (y.HouseTypeCount) {
+                y.HouseTypeCount = parseFloat(y.HouseTypeCount);
+              } else {
+                y.HouseTypeCount = 0;
+              }
+
+              if (y.UnitPrice) {
                 y.UnitPrice = parseInt(y.UnitPrice);
               } else {
                 y.UnitPrice = 0;