房间可输小数

src/components/CarDealerOrder/components/OrderList.vue

@@ -837,15 +837,6 @@
             </el-table-column>
             <el-table-column :label="$t('objFill.caravanshopcol.t1')" min-width="180" style="background: #eaeaea">
               <template slot-scope="scope">
-                 <div v-if="scope.row.ProductTypeName">{{ scope.row.ProductTypeName }}</div>
-                  <div class="row wrap" v-if="scope.row.CostIncludesName.length > 0">
-                    <span class="mr">
-                      {{ $t('sm.feiyongbaohan') }}:
-                    </span>
-                    <template v-if="scope.row.CostIncludesName&&scope.row.CostIncludesName.length > 0">
-                      <el-tag size="mini" v-for="(x,costIndex) in scope.row.CostIncludesName" :key="costIndex" class="mr">{{ x }}</el-tag>
-                    </template>
-                  </div>
                 <div v-if="scope.row.CarModel">
                   {{ scope.row.CarModel.CarName + "/" + scope.row.CarModel.CarNo }}
                 </div>
@@ -853,6 +844,19 @@
                 <span style="color: #999999">/ {{ scope.row.UseDay }}{{ $t("hotel.hotel_day") }}</span>
               </template>
             </el-table-column>
+            <el-table-column :label="$t('objFill.chanpinglx')" min-width="180" style="background: #eaeaea">
+              <template slot-scope="scope">
+                 <div v-if="scope.row.ProductTypeName">{{ scope.row.ProductTypeName }}</div>
+                 <div class="mr" v-if="scope.row.CostIncludesName&&scope.row.CostIncludesName.length > 0">
+                    {{ $t('sm.feiyongbaohan') }}:
+                  </div>
+                  <div class="row wrap" v-if="scope.row.CostIncludesName&&scope.row.CostIncludesName.length > 0">
+                    <template v-if="scope.row.CostIncludesName&&scope.row.CostIncludesName.length > 0">
+                      <el-tag size="mini" v-for="(x,costIndex) in scope.row.CostIncludesName" :key="costIndex" class="mr">{{ x }}</el-tag>
+                    </template>
+                  </div>
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('objFill.caravanshopcol.t2')" min-width="160" style="background: #eaeaea">
               <template slot-scope="scope">
                 <div class="RoomList text-center">

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -174,7 +174,7 @@
             <em>{{ $t('objFill.chanpinglx') }}</em>
             <el-select v-model="msg.ProductType" @change="handleCurrentChange(1)"
             filterable>
-              <el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
+              <el-option :key="0" :value="0" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for="item in ProductTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
             </el-select>
           </span>

src/components/Hotel/roomReservationsDetails.vue

@@ -1241,7 +1241,7 @@
                 y.HouseTypeCount = 0;
               }
               if (y.UnitPrice) {
-                y.UnitPrice = parseInt(y.UnitPrice);
+                // y.UnitPrice = parseInt(y.UnitPrice);
               } else {
                 y.UnitPrice = 0;
               }