添加长租房读表功能，修改客单、预约单

src/views/room/advanceOrder.vue

@@ -12,7 +12,22 @@
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="3">
+            <a-form-item>
+              <a-select
+                  placeholder="请选择房型"
+                  v-model="queryParam.layoutId"
+                  :allowClear="true">
+                <a-select-option
+                    :value="item.id"
+                    v-for="item in roomLayoutList"
+                    :key="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="4">
             <a-form-item label="">
               <a-range-picker
                   format="YYYY-MM-DD"
@@ -23,7 +38,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="8">
                 <a-form-item label="">
                   <a-radio-group v-model="queryParam.bookingStatus" button-style="solid" @change="bookingStatusChange">
                     <a-radio-button value="0">全部</a-radio-button>
@@ -31,6 +46,7 @@
                     <a-radio-button value="2">已入住</a-radio-button>
                     <a-radio-button value="3">已取消</a-radio-button>
                     <a-radio-button value="4">已失效</a-radio-button>
+                    <a-radio-button value="5">今日应到未到</a-radio-button>
                   </a-radio-group>
                 </a-form-item>
               </a-col>
@@ -43,15 +59,14 @@
                 type="primary"
                 @click="searchQuery"
                 icon="search"
-              >查询</a-button
-              >
-              <!-- <a-button
+              >查询</a-button>
+              <a-button
                 type="primary"
-                @click="searchReset"
-                icon="reload"
+                @click="handleExportXls('预约单')"
+                icon="download"
                 style="margin-left: 8px"
-                >重置</a-button
-              > -->
+                >导出</a-button
+              >
             </span>
           </a-col>
         </a-row>
@@ -160,6 +175,24 @@ export default {
           dataIndex: 'orderNo'
         },
         {
+          title: '状态',
+          align: 'center',
+          dataIndex: 'status',
+          customRender: function (text, record) {
+            if (record.bookingStatus === 1) {
+              if (record.livingId != null && record.livingId != ''){
+                return '已入住'
+              } else {
+                return moment(record.arrivalTime).isAfter(moment(new Date())) ? '预定中' : '今日应到未到'
+              }
+            } else if (record.bookingStatus === 2) {
+              return '已取消'
+            } else if (record.bookingStatus === 3) {
+              return '已失效'
+            }
+          }
+        },
+        {
           title: '客人/电话',
           align: 'center',
           dataIndex: 'customerName',
@@ -264,9 +297,11 @@ export default {
         list: '/business/busRoomBookingOrders/kedan-orders',
         delete: '/order/cesOrderMessage/delete',
         deleteBatch: '/order/cesOrderMessage/deleteBatch',
-        exportXlsUrl: '/order/cesOrderMessage/exportXls',
-        importExcelUrl: 'order/cesOrderMessage/importExcel'
+        // exportXlsUrl: '/order/cesOrderMessage/exportXls',
+        exportXlsUrl: '/business/busRoomBookingOrders/exportXls2',
+        importExcelUrl: '/order/cesOrderMessage/importExcel'
       },
+      roomLayoutList: [],
       dictOptions: {},
       superFieldList: [],
       hotelList: [],
@@ -274,7 +309,8 @@ export default {
         type: 2,
         bookingStatus: '0',
         startTime: moment(new Date()).format('YYYY-MM-DD'),
-        endTime: moment(endDate).format('YYYY-MM-DD')
+        endTime: moment(endDate).format('YYYY-MM-DD'),
+        layoutId: undefined
       },
       datetime: [
         moment(new Date(), 'YYYY-MM-DD'),
@@ -290,6 +326,14 @@ export default {
           }
         }
     )
+    /* 房型 */
+    getAction('/rooms/cesRoomLayout/list', { pageSize: 99999, pageNo: 1 }).then(
+        (res) => {
+          if (res.success) {
+            this.roomLayoutList = res.result.records
+          }
+        }
+    )
   },
   computed: {
     importExcelUrl: function () {

src/views/room/guestorders.vue

@@ -12,7 +12,35 @@
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
+          <a-col :span="3">
+            <a-form-item>
+              <a-select
+                placeholder="请选择房型"
+                v-model="queryParam.layoutId"
+                :allowClear="true">
+                <a-select-option
+                    :value="item.id"
+                    v-for="item in roomLayoutList"
+                    :key="item.id">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="2">
+            <a-form-item>
+              <a-select
+                placeholder="客人类型"
+                v-model="queryParam.customerType"
+                :allowClear="true">
+                  <a-select-option :value="1"> 散客 </a-select-option>
+                  <a-select-option :value="2"> 会员 </a-select-option>
+                  <a-select-option :value="3"> 协议单位 </a-select-option>
+                  <a-select-option :value="4"> 中介 </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="4">
             <a-form-item label="">
               <a-range-picker
                   format="YYYY-MM-DD"
@@ -24,18 +52,23 @@
             </a-form-item>
           </a-col>
 
-          <a-col :span="6">
+          <a-col :span="5">
             <a-form-item label="">
               <a-radio-group v-model="queryParam.livingStatus" button-style="solid">
                 <a-radio-button value="0">全部</a-radio-button>
                 <a-radio-button value="-1">正常入住</a-radio-button>
                 <a-radio-button value="1">已结</a-radio-button>
                 <a-radio-button value="2">先走未结</a-radio-button>
-                <a-radio-button value="3">联房退房</a-radio-button>
+<!--                <a-radio-button value="3">联房退房</a-radio-button>-->
               </a-radio-group>
             </a-form-item>
           </a-col>
-          <a-col :md="6" :sm="8">
+          <a-col :span="2">
+            <a-form-item label="">
+              <a-checkbox v-model="queryParam.onlyDebt">仅显示欠款</a-checkbox>
+            </a-form-item>
+          </a-col>
+          <a-col :span="4">
             <span
               style="float: left; overflow: hidden"
               class="table-page-search-submitButtons"
@@ -44,15 +77,13 @@
                 type="primary"
                 @click="searchQuery"
                 icon="search"
-              >查询</a-button
-              >
-              <!-- <a-button
-                type="primary"
-                @click="searchReset"
-                icon="reload"
-                style="margin-left: 8px"
-                >重置</a-button
-              > -->
+                style="margin-right: 10px"
+              >查询</a-button>
+              <a-button
+                  type="primary"
+                  icon="download"
+                  @click="handleExportXls('入住单')"
+              >导出</a-button>
             </span>
           </a-col>
         </a-row>
@@ -78,6 +109,61 @@
         class="j-table-force-nowrap"
         @change="handleTableChange"
       >
+        <template slot="roomName" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ text ? text : '排房' }}
+          </span>
+        </template>
+        <template slot="layoutName" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ text }}
+          </span>
+        </template>
+        <template slot="customerName" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ record.customerName + '/' + record.customerPhone }}
+          </span>
+        </template>
+        <template slot="settleType" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ getSettleTypeText(record) }}
+          </span>
+        </template>
+        <template slot="customerType" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ getCustomerTypeText(record) }}
+          </span>
+        </template>
+        <template slot="otype" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ getOtypeText(record) }}
+          </span>
+        </template>
+        <template slot="arrivalTime" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ text }}
+          </span>
+        </template>
+        <template slot="dueOutTime" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ text }}
+          </span>
+        </template>
+        <template slot="price" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ record.livingDayPrices && record.livingDayPrices.length > 0 ? record.livingDayPrices[0].price : '--' }}
+          </span>
+        </template>
+        <template slot="consumption" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ record.yushou - record.yuE }}
+          </span>
+        </template>
+        <template slot="yushou" slot-scope="text, record">
+          <span :class="record.yuE < 0 ? 'textColor' : ''">
+            {{ text }}
+          </span>
+        </template>
         <template slot="yuE" slot-scope="text, record">
           <span :class="record.yuE < 0 ? 'textColor' : ''">
             {{ record.yuE }}
@@ -162,98 +248,68 @@ export default {
           title: '房号',
           align: 'center',
           dataIndex: 'roomName',
-          customRender: function (text, record) {
-            return !text ? '排房' : text
-          }
+          scopedSlots: { customRender: 'roomName' }
+
         },
         {
           title: '房型',
           align: 'center',
-          dataIndex: 'layoutName'
+          dataIndex: 'layoutName',
+          scopedSlots: { customRender: 'layoutName' }
         },
         {
           title: '客人/电话',
           align: 'center',
           dataIndex: 'customerName',
-          customRender: function (text, record) {
-            return record.customerName + '/' + record.customerPhone
-          }
+          scopedSlots: { customRender: 'customerName' }
+        },
+        {
+          title: '状态',
+          align: 'center',
+          dataIndex: 'settleType',
+          scopedSlots: { customRender: 'settleType' }
         },
         {
           title: '客人类型',
           align: 'center',
           dataIndex: 'customerType',
-          customRender: function (text) {
-            if (text === 1) {
-              return '散客'
-            } else if (text === 2) {
-              return '会员'
-            } else if (text === 3) {
-              return '协议单位'
-            } else if (text === 4) {
-              return '中介'
-            }
-          }
+          scopedSlots: { customRender: 'customerType' }
         },
         {
           title: '入住类型',
           align: 'center',
-          dataIndex: 'isLiving',
-          customRender: function (text, record) {
-            if (record.livingDayPrices && record.livingDayPrices.length > 0) {
-              return record.livingDayPrices[0].livingType === 1
-                ? '全天'
-                : '钟点'
-            }
-            if (record.bookingDayPrices && record.bookingDayPrices.length > 0) {
-              return record.bookingDayPrices[0].livingType === 1
-                ? '全天'
-                : '钟点'
-            }
-            return '--'
-          }
+          dataIndex: 'otype',
+          scopedSlots: { customRender: 'otype' }
         },
         {
-          title: '房价',
+          title: '预抵时间',
           align: 'center',
-          dataIndex: 'createDate',
-          customRender: function (text, record) {
-            if (record.livingDayPrices && record.livingDayPrices.length > 0) {
-              return record.livingDayPrices[0].price
-            }
-            if (record.bookingDayPrices && record.bookingDayPrices.length > 0) {
-              return record.bookingDayPrices[0].price
-            }
-            return '--'
-          }
+          dataIndex: 'arrivalTime',
+          scopedSlots: { customRender: 'arrivalTime' }
         },
-        // {
-        //   title: "状态",
-        //   align: "center",
-        //   dataIndex: "createDate",
-        // },
         {
-          title: '预抵时间',
+          title: '预离时间',
           align: 'center',
-          dataIndex: 'arrivalTime'
+          dataIndex: 'dueOutTime',
+          scopedSlots: { customRender: 'dueOutTime' }
+
         },
         {
-          title: '预离时间',
+          title: '房价',
           align: 'center',
-          dataIndex: 'dueOutTime'
+          scopedSlots: { customRender: 'price' }
         },
         {
           title: '消费合计',
           align: 'center',
           // dataIndex: 'yuE',
-          customRender: function (text, record) {
-            return record.yushou - record.yuE
-          }
+          scopedSlots: { customRender: 'consumption' }
         },
         {
           title: '收款合计',
           align: 'center',
           dataIndex: 'yushou',
+          scopedSlots: { customRender: 'yushou' }
         },
         {
           title: '余额',
@@ -275,17 +331,22 @@ export default {
         list: '/business/busRoomBookingOrders/kedan-orders',
         delete: '/order/cesOrderMessage/delete',
         deleteBatch: '/order/cesOrderMessage/deleteBatch',
-        exportXlsUrl: '/order/cesOrderMessage/exportXls',
+        // exportXlsUrl: '/order/cesOrderMessage/exportXls',
+        exportXlsUrl: '/business/busRoomBookingOrders/exportXls2',
         importExcelUrl: 'order/cesOrderMessage/importExcel'
       },
       dictOptions: {},
       superFieldList: [],
       hotelList: [],
+      roomLayoutList: [],
       queryParam: {
         type: 1,
         startTime: moment(new Date()).format('YYYY-MM-DD'),
         endTime: moment(endDate).format('YYYY-MM-DD'),
-        livingStatus: '0'
+        livingStatus: '0',
+        layoutId: undefined,
+        customerType: undefined,
+        onlyDebt: false
       },
       datetime: [
         moment(new Date(), 'YYYY-MM-DD'),
@@ -301,6 +362,14 @@ export default {
         }
       }
     )
+    /* 房型 */
+    getAction('/rooms/cesRoomLayout/list', { pageSize: 99999, pageNo: 1 }).then(
+        (res) => {
+          if (res.success) {
+            this.roomLayoutList = res.result.records
+          }
+        }
+    )
   },
   computed: {
     importExcelUrl: function () {
@@ -308,6 +377,36 @@ export default {
     }
   },
   methods: {
+    getSettleTypeText(record) {
+      if (record.settleType === -1) {
+        return '正常入住'
+      } else if (record.settleType === 1) {
+        return '结账退房'
+      } else if (record.settleType === 2) {
+        return '未结退房'
+      }
+      return '--'
+    },
+    getCustomerTypeText(record) {
+      if (record.customerType === 1) {
+        return '散客'
+      } else if (record.customerType === 2) {
+        return '会员'
+      } else if (record.customerType === 3) {
+        return '协议单位'
+      } else if (record.customerType === 4) {
+        return '中介'
+      }
+    },
+    getOtypeText(record) {
+      if (record.otype === 1) {
+        return '全天'
+      } else if (record.otype === 2) {
+        return '钟点'
+      } else if (record.otype === 5) {
+        return '长租'
+      }
+    },
     setOrderStatus(record) {
       postAction('/business/busRoomBookingOrders/set-booking-status', {
         id: record.id,

src/views/room/modules/checkIn/BillRoomForm.vue

@@ -1919,7 +1919,7 @@ export default {
     }).then((res) => {
       if (res.success) {
         this.customerSourceList = res.result.records
-        if (this.customerSourceList) {
+        if (this.customerSourceList && this.customerSourceList.length > 0) {
           this.model.orderInfo.customerSource = this.customerSourceList[0].id
         }
       }
@@ -3320,7 +3320,7 @@ export default {
       await this.loadScheme()
 
       if (this.customerSourceList) {
-        if (!this.model.orderInfo.customerSource) {
+        if (!this.model.orderInfo.customerSource && this.customerSourceList.length > 0) {
           this.model.orderInfo.customerSource = this.customerSourceList[0].id
         }
       }
@@ -3454,7 +3454,7 @@ export default {
           this.specialSchemeList = resp.result.filter(e => e.schemeType === 3)
           this.housePriceSchemeList = this.specialSchemeList.filter(e => e.guestType == null)
           // 处理节假日方案
-          if (this.holidayScheme != null) {
+          if (this.holidayScheme != null && this.holidayScheme.holiday) {
             let holidayStrArr = this.holidayScheme.holiday.split(',')
             let allHolidayArr = []
             holidayStrArr.forEach(e => {
@@ -3474,7 +3474,7 @@ export default {
             this.$set(this.holidayScheme, 'allHolidayArr', allHolidayArr)
           }
           // 处理周末方案
-          if (this.weekScheme != null) {
+          if (this.weekScheme != null && this.weekScheme.weekend) {
             let weekends = this.weekScheme.weekend.split(',')
             this.$set(this.weekScheme, 'weekends', weekends)
           }
@@ -3505,7 +3505,7 @@ export default {
         }
       }
       // 节假日
-      if (this.holidayScheme != null && this.holidayScheme.allHolidayArr.some(e => { return e.list[0] <= date && e.list[1] >= date })) {
+      if (this.holidayScheme != null && this.holidayScheme.allHolidayArr && this.holidayScheme.allHolidayArr.some(e => { return e.list[0] <= date && e.list[1] >= date })) {
         let findSchemeLayout = this.holidayScheme.schemeLayouts.find(e => e.layoutId === layoutId)
         if (findSchemeLayout) {
           // let find = findSchemeLayout.schemeLayoutDailyPriceList.find(e => moment(e.date) === date)
@@ -3517,7 +3517,7 @@ export default {
         }
       }
       // 周末
-      if (this.weekScheme != null && this.weekScheme.weekends.includes(moment(value).format('E'))) {
+      if (this.weekScheme != null && this.weekScheme.weekends && this.weekScheme.weekends.includes(moment(value).format('E'))) {
         let findSchemeLayout = this.weekScheme.schemeLayouts.find(e => e.layoutId === layoutId)
         if (findSchemeLayout) {
           let find = findSchemeLayout.schemeLayoutDailyPriceList.find(e => e.date === value)

src/views/room/modules/checkIn/BillRoomInfo.vue

@@ -479,19 +479,19 @@
               <template slot="originalPrice" slot-scope="text, record, index" class="strike_style">
                 <span class="strike_style" v-if="record.returnItem">--</span>
                 <span v-else-if="record.subjectType === 6 || record.subjectType === 7">{{ record.feeGoodVo.originalPrice ? record.feeGoodVo.originalPrice : record.originalMoney }}</span>
-                <span v-else>{{ record.subjectType === 11 && record.num ? (record.originalMoney/record.num).toFixed(2) : record.originalMoney }}</span>
+                <span v-else>{{ record.subjectType === 11 && record.longRentMeterLog.price ? record.longRentMeterLog.price : record.originalMoney }}</span>
               </template>
               <!--优惠价-->
               <template slot="money" slot-scope="text, record, index" class="strike_style">
                 <span class="strike_style" v-if="record.returnItem">--</span>
                 <span v-else-if="record.subjectType === 6 || record.subjectType === 7" >{{ record.feeGoodVo.price ? record.feeGoodVo.price : record.originalMoney }}</span>
-                <span v-else-if="record.subjectType === 11 && record.num">{{ (record.originalMoney/record.num).toFixed(2) }}</span>
+                <span v-else-if="record.subjectType === 11 && record.longRentMeterLog.price">{{ record.longRentMeterLog.price }}</span>
                 <span v-else>{{ record.originalMoney }}</span>
               </template>
               <template slot="num" slot-scope="text, record, index" class="strike_style">
                 <span class="strike_style" v-if="record.returnItem">{{ record.returnNum }}</span>
                 <span v-else-if="record.subjectType === 6 || record.subjectType === 7">{{ record.feeGoodVo.num ? record.feeGoodVo.num : 1 }}</span>
-                <span v-else>{{ record.subjectType === 11 && record.num ? record.num : '1' }}</span>
+                <span v-else>{{ record.subjectType === 11 && record.longRentMeterLog.startRead ? Math.abs(record.longRentMeterLog.startRead - record.longRentMeterLog.endRead).toFixed(2) : '1' }}</span>
               </template>
               <!-- 小计 -->
               <template slot="originalMoney" slot-scope="text, record, index" class="strike_style">
@@ -857,7 +857,7 @@ const columns0 = [
   {
     title: '数量',
     dataIndex: 'num',
-    width: 60,
+    width: 65,
     align: 'center',
     scopedSlots: { customRender: 'num' },
     // customRender: function (text, record) {
@@ -907,8 +907,8 @@ const columns1 = [
     customRender: function (text, record) {
       if ((record.subjectType === 6 || record.subjectType === 7) && record.feeGoodVo.originalPrice) {
         return record.feeGoodVo.originalPrice
-      } else if (record.subjectType === 11 && record.num){
-        return (record.originalMoney / record.num).toFixed(2)
+      } else if (record.subjectType === 11 && record.longRentMeterLog.price) {
+        return record.longRentMeterLog.price
       }
       return record.originalMoney
     }
@@ -922,8 +922,8 @@ const columns1 = [
     customRender: function (text, record) {
       if ((record.subjectType === 6 || record.subjectType === 7) && record.feeGoodVo.price) {
         return record.feeGoodVo.price
-      } else if (record.subjectType === 11 && record.num){
-        return (record.originalMoney / record.num).toFixed(2)
+      } else if (record.subjectType === 11 && record.longRentMeterLog.price) {
+        return record.longRentMeterLog.price
       }
       return record.originalMoney
     }
@@ -931,14 +931,14 @@ const columns1 = [
   {
     title: '数量',
     dataIndex: 'num',
-    width: 60,
+    width: 65,
     align: 'center',
     // scopedSlots: { customRender: 'num' },
     customRender: function (text, record) {
       if ((record.subjectType === 6 || record.subjectType === 7) && record.feeGoodVo.num) {
         return record.feeGoodVo.num
-      } else if (record.subjectType === 11 && record.num){
-        return record.num
+      } else if (record.subjectType === 11 && record.longRentMeterLog.startRead) {
+        return Math.abs(record.longRentMeterLog.startRead - record.longRentMeterLog.endRead).toFixed(2)
       }
       return 1
     }