对接接口

src/api/fwApi.js

@@ -0,0 +1,53 @@
+import { axios } from '@/utils/request'
+
+export class HousekeepingApi {
+
+    /**
+     * 获取锁房记录列表
+     * @returns 
+     */
+    static getAllData(){
+        return axios({
+            url: '/fw/fwRoomRepair/list',
+            method: 'get',
+        })
+    }
+
+    /**
+     * 获取今日锁房总数
+     * @returns 
+     */
+    static getLockedRoom(){
+        let str = new Date().toLocaleDateString()
+        str = str.replace(/\//g, '-')
+        return axios({
+            url: `/fw/fwRoomLock/list?startTime=${str}&endTime=${str}`,
+            method: 'get',
+        })
+    }
+
+    /**
+     * 获取今日完成维修总数
+     * @returns
+     */
+    static getRepairRoom(){
+        let str = new Date().toLocaleDateString()
+        str = str.replace(/\//g, '-')
+        return axios({
+            url: `/fw/fwRoomRepair/list?status=2&createTime=${str}`,
+            method: 'get',
+        })
+    }
+
+    /**
+     * 获取正在维修中总数 
+     * @returns 
+     */
+    static getInRepair(){
+        return axios({
+            url: `/fw/fwRoomRepair/list?status=1`,
+            method: 'get',
+        })
+    }
+
+}

src/views/fangwu/index.vue

@@ -8,7 +8,7 @@
                     <div class="grid-day">
                         <div>
                             <div>今日锁房</div>
-                            <div>0间</div>
+                            <div>{{LockedRoom}}间</div>
                         </div>
                         <div>
                             <div>正在维修中房间</div>
@@ -181,6 +181,7 @@ import {
     delAll
 } from '@/api/roomBuildingApi'
 
+import { HousekeepingApi } from '@/api/fwApi.js'
 let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
 export default {
     mixins: [JeecgListMixin],
@@ -201,6 +202,13 @@ export default {
             dataSource:[],
             assignVisible: false,
             handVisible: false,
+            //锁房总数
+            LockedRoom:'0',
+            //正在维修中总数
+            RepairingRoom:'0',
+            //今日完成维修总数
+            TodayRepairRoom:'0',
+
             // 表头
             columns: [{
                     title: "姓名",
@@ -290,7 +298,15 @@ export default {
                 this.loadData();
             }
         });
-        
+        HousekeepingApi.getLockedRoom().then(res=>{
+            this.LockedRoom = res.result.total
+        })
+        HousekeepingApi.getInRepair().then(res=>{
+            this.RepairingRoom = res.result.total
+        })
+        HousekeepingApi.getRepairRoom().then(res=>{
+            this.TodayRepairRoom = res.result.total
+        })
     }
 }
 </script>

src/views/fangwu/tabList/LockRoomRecords.vue

@@ -40,6 +40,11 @@
             <template slot="layoutId" slot-scope="text, record">
                 {{ getLayoutName(record) }}
             </template>
+
+            <template slot="status" slot-scope="text, record">
+                {{'锁房中'}}
+            </template>
+            
             <template slot="prefix_name" slot-scope="text, record">
                 {{ (record.prefix || "") + record.name }}
             </template>
@@ -110,22 +115,25 @@ export default {
             columns: [{
                     title: "房间号",
                     align: "center",
-                    dataIndex: "hotelName",
+                    dataIndex: "roomNo",
                 },
                 {
                     title: "状态",
                     // align: "center",
-                    dataIndex: "buildName",
+                    dataIndex: "status",
+                    scopedSlots: {
+                        customRender: "status",
+                    },
                 },
                 {
                     title: "原因",
                     // align: "center",
-                    dataIndex: "floorName",
+                    dataIndex: "remark",
                 }
             ],
             url: {
                 // list: 'org.jeecg.modules.business/busMarketMember/list',
-                list: "/rooms/cesRooms/list",
+                list: "/fw/fwRoomLock/list",
                 delete: "/rooms/cesRooms/remove",
                 deleteBatch: "/rooms/cesRooms/deleteBatch",
                 exportXlsUrl: "/rooms/cesRooms/exportXls",

src/views/fangwu/tabList/clearRecords.vue

@@ -135,7 +135,7 @@ export default {
             columns: [{
                     title: "房屋人员",
                     align: "center",
-                    dataIndex: "hotelName",
+                    dataIndex: "waiterName",
                 },
                 {
                     title: "退房",
@@ -172,7 +172,7 @@ export default {
                     align: "center",
                     dataIndex: "name",
                     scopedSlots: {
-                        customRender: "prefix_name"
+                        customRender: ""
                     },
                 },
                 {
@@ -193,7 +193,7 @@ export default {
             ],
             url: {
                 // list: 'org.jeecg.modules.business/busMarketMember/list',
-                list: "/rooms/cesRooms/list",
+                list: "/fw/fwRoomClean/list",
                 delete: "/rooms/cesRooms/remove",
                 deleteBatch: "/rooms/cesRooms/deleteBatch",
                 exportXlsUrl: "/rooms/cesRooms/exportXls",

src/views/fangwu/tabList/clearRoomManagement.vue

@@ -40,6 +40,11 @@
             <template slot="layoutId" slot-scope="text, record">
                 {{ getLayoutName(record) }}
             </template>
+
+            <template slot="status" slot-scope="text, record">
+                {{ record.status == 0 ? "未打扫" : "已打扫" }}
+            </template>
+
             <template slot="prefix_name" slot-scope="text, record">
                 {{ (record.prefix || "") + record.name }}
             </template>
@@ -110,43 +115,43 @@ export default {
             columns: [{
                     title: "房扫时间",
                     align: "center",
-                    dataIndex: "hotelName",
+                    dataIndex: "createTime",
                 },
                 {
                     title: "房扫人员",
                     // align: "center",
-                    dataIndex: "buildName",
+                    dataIndex: "waiterName",
                 },
                 {
                     title: "房间号",
                     // align: "center",
-                    dataIndex: "floorName",
+                    dataIndex: "roomNo",
                 },
+                // {
+                //     title: "是否续住",
+                //     align: "center",
+                //     dataIndex: "layoutId",
+                //     scopedSlots: {
+                //         customRender: "layoutId"
+                //     },
+                // },
                 {
-                    title: "是否续住",
+                    title: "打扫状态",
                     align: "center",
-                    dataIndex: "layoutId",
+                    dataIndex: "status",
                     scopedSlots: {
-                        customRender: "layoutId"
+                        customRender: "status"
                     },
                 },
-                {
-                    title: "脏房类型",
-                    align: "center",
-                    dataIndex: "name",
-                    scopedSlots: {
-                        customRender: "prefix_name"
-                    },
-                },
-                {
-                    title: "操作人",
-                    align: "center",
-                    dataIndex: "createAt",
-                }
+                // {
+                //     title: "操作人",
+                //     align: "center",
+                //     dataIndex: "createAt",
+                // }
             ],
             url: {
                 // list: 'org.jeecg.modules.business/busMarketMember/list',
-                list: "/rooms/cesRooms/list",
+                list: "/fw/fwRoomClean/list",
                 delete: "/rooms/cesRooms/remove",
                 deleteBatch: "/rooms/cesRooms/deleteBatch",
                 exportXlsUrl: "/rooms/cesRooms/exportXls",

src/views/fangwu/tabList/maintenanceRecords.vue

@@ -37,6 +37,10 @@
           onChange: onSelectChange,
         }" class="j-table-force-nowrap" @change="handleTableChange">
 
+            <template slot="status" slot-scope="text, record">
+                {{ record.status == 1 ? '正在进行' : '已完成维修' }}
+            </template>
+
             <template slot="layoutId" slot-scope="text, record">
                 {{ getLayoutName(record) }}
             </template>
@@ -80,6 +84,7 @@ import {
     delBatch,
     delAll
 } from '@/api/roomBuildingApi'
+import { HousekeepingApi } from '@/api/fwApi.js'
 let hotelInfo = JSON.parse(localStorage.getItem("storeInfo"));
 export default {
     mixins: [JeecgListMixin],
@@ -110,43 +115,38 @@ export default {
             columns: [{
                     title: "房间号",
                     align: "center",
-                    dataIndex: "hotelName",
+                    dataIndex: "roomNo",
                 },
                 {
                     title: "开始时间",
                     // align: "center",
-                    dataIndex: "buildName",
+                    dataIndex: "startDate",
                 },
                 {
                     title: "结束时间",
                     // align: "center",
-                    dataIndex: "floorName",
+                    dataIndex: "endDate",
                 },
                 {
                     title: "维修状态",
                     align: "center",
-                    dataIndex: "layoutId",
+                    dataIndex: "status",
                     scopedSlots: {
-                        customRender: "layoutId"
+                        customRender: "status"
                     },
                 },
                 {
                     title: "维修原因",
                     align: "center",
-                    dataIndex: "name",
-                    scopedSlots: {
-                        customRender: "prefix_name"
-                    },
-                },
-                {
-                    title: "维修结果",
-                    align: "center",
-                    dataIndex: "createAt",
+                    dataIndex: "remark",
+                    // scopedSlots: {
+                    //     customRender: "prefix_name"
+                    // },
                 }
             ],
             url: {
                 // list: 'org.jeecg.modules.business/busMarketMember/list',
-                list: "/rooms/cesRooms/list",
+                list: "/fw/fwRoomRepair/list",
                 delete: "/rooms/cesRooms/remove",
                 deleteBatch: "/rooms/cesRooms/deleteBatch",
                 exportXlsUrl: "/rooms/cesRooms/exportXls",
@@ -172,6 +172,10 @@ export default {
                 this.loadData();
             }
         });
+        // HousekeepingApi.getAllData().then(res=>{
+        //     debugger
+        //     console.log(res);
+        // })
     },
     methods: {
         onImgSave() {