完成订单管理页面接口处理

admin/package-lock.json

@@ -4337,6 +4337,11 @@
         }
       }
     },
+    "dayjs": {
+      "version": "1.11.5",
+      "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz",
+      "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA=="
+    },
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",

admin/package.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "axios": "^0.27.2",
     "better-scroll": "^2.4.2",
+    "dayjs": "^1.11.5",
     "element-ui": "^2.15.2",
     "file-saver": "^2.0.5",
     "js-cookie": "^3.0.1",

admin/src/api/api.js

@@ -3,6 +3,7 @@ import * as doorLock from './doorLock'
 import * as fileServes from './fileServes'
 import * as hotelOrder from './hotelOrder'
 import * as hotelAdmin from './hotelAdmin'
+import * as hotelStaff from './hotelStaff'
 import * as houseType from './houseType'
 import * as normalUser from './normalUser'
 import * as room from './room'
@@ -39,7 +40,8 @@ export default {
     doorLock,      // 门锁
     fileServes,    // 文件服务
     hotelOrder,    // 酒店订单
-    hotelAdmin,    // 酒店员工
+    hotelAdmin,    // 酒店管理员
+    hotelStaff,    // 酒店员工
     houseType,     // 房型
     normalUser,    // 普通用户
     room,          // 房间

admin/src/api/hotelOrder.js

@@ -44,9 +44,9 @@ export function hotelOrderOrderBill(orderId, params) {
 
 
 
-//  删除订单【用户端】
-export function hotelOrderUserDelete(orderId, params) {
-    return http.delete(`${resquest}/user/order/${orderId}`, params, contentType)
+//  删除订单【管理端】
+export function hotelOrderAdminDelete(orderId, params) {
+    return http.delete(`${resquest}/admin/order/${orderId}`, params, contentType)
 }
 
 // 取消订单

admin/src/api/hotelStaff.js

@@ -0,0 +1,27 @@
+import http from '../utils/http'
+let resquest = "/api/ihotel/ihotel/hotelStaff"
+
+// 员工列表
+export function hotelStaffList(params) {
+    return http.get(`${resquest}/list`, params)
+}
+
+// 员工信息
+export function hotelStaffInfo(id, params) {
+    return http.get(`${resquest}/info/${id}`, params)
+}
+
+// 新增员工
+export function hotelStaffSave(params) {
+    return http.post(`${resquest}/save`, params)
+}
+
+// 修改管理员
+export function hotelStaffUpdate(params) {
+    return http.put(`${resquest}/update`, params)
+}
+
+// 删除管理员
+export function hotelStaffDelete(params) {
+    return http.delete(`${resquest}/delete`, params)
+}

admin/src/api/roomRealTimeStatu.js

@@ -3,6 +3,5 @@ let resquest = "/api/ihotel/roomRealTimeStatu"
 
 //  房态信息
 export function realData(params) {
-    console.log(params);
-    return http.get(`${resquest}/realData`, params)
+    return http.get(`${resquest}/realData/${params}`)
 }

admin/src/utils/http.js

@@ -14,9 +14,9 @@ const http = {
             url: url,
             headers: ContentType ? ContentType : { 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8' }
         }
-        // if (params) {
-        //     config.params = params
-        // }
+        if (params) {
+            config.params = params
+        }
 
         return request(config)
     },

admin/src/views/home/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card class="box-card">
+  <el-card class="box-card" v-show="cardShow">
     <div slot="header" class="clearfix">
       <div class="header-left">
         <span class="title">房态管理 </span>
@@ -151,8 +151,8 @@
                 >
                   <div class="title">
                     <span>{{ item.build }}栋{{ item.roomno }}</span>
-                    <div class="state" :style="bgState(item.state)">
-                      {{ item.roomTypeName }}
+                    <div class="state">
+                      {{ item.roomInfo }}
                     </div>
                   </div>
                   <div class="teacher">老师</div>
@@ -260,11 +260,12 @@
 </template>
 
 <script>
-import moment from "moment";
+import dayjs from "dayjs";
 export default {
   name: "Home",
   data() {
     return {
+      cardShow: "false",
       clickId: "",
       // 门锁管理
       doorLock: false,
@@ -327,23 +328,7 @@ export default {
           ],
         },
       ],
-      floorRoomDatas: [
-        // [
-        //   {
-        //     roomUnit: "17栋1单元2层01房",
-        //     state: "已锁定",
-        //     name: "张强",
-        //     water: "25",
-        //     electricity: "25",
-        //     outRoom: "00:13:26",
-        //     roomLock: {
-        //       id: "123456789",
-        //       serialNumber: "123456789",
-        //       password: "123456789",
-        //     },
-        //   },
-        // ],
-      ],
+      floorRoomDatas: [],
 
       defaultProps: {
         children: "children",
@@ -401,47 +386,70 @@ export default {
     document.getElementsByClassName(
       "el-button--plain"
     )[2].children[0].innerText = ">";
-
-    this.API.room.roomPageGroup().then((res) => {
-      res.data.list.forEach((item) => {
-        this.floorRoomDatas.push(item.floors[0]);
-      });
-      this.floorRoomDatas.forEach((item) => {
-        item.room.forEach((items) => {
-          items.roomno =
-            items.roomNo.split("-")[0] +
-            "单元" +
-            items.roomNo.split("-")[1] +
-            "层" +
-            items.roomNo.split("-")[2] +
-            "房";
+    this.roomList();
+  },
+  methods: {
+    roomList() {
+      this.API.room.roomPageGroup().then((res) => {
+        console.log(res);
+        res.data.list.forEach((item) => {
+          this.floorRoomDatas.push(item.floors[0]);
         });
-      });
-      let roomIds = [];
-      this.floorRoomDatas.forEach((item) => {
-        console.log(item.room);
-        item.room.forEach((item) => {
-          roomIds.push(item.id);
+        this.floorRoomDatas.forEach((item) => {
+          item.room.forEach((items) => {
+            items.roomno =
+              items.roomNo.split("-")[0] +
+              "单元" +
+              items.roomNo.split("-")[1] +
+              "层" +
+              items.roomNo.split("-")[2] +
+              "房";
+          });
         });
-      });
-      console.log(roomIds);
-      let startDay = moment().format("YYYY-MM-dd");
-      let endDay = moment(startDay).add(1, "days").format("YYYY-MM-dd");
-      this.API.roomRealTimeStatu
-        .realData({ startDay, endDay, roomIds })
-        .then((res) => {
-          console.log(res);
+        let ids = [];
+        this.floorRoomDatas.forEach((item) => {
+          item.room.forEach((item) => {
+            ids.push(item.id);
+          });
         });
-    });
-  },
-  methods: {
+        let roomIds = [];
+        ids.forEach((item) => {
+          roomIds.push("roomIds=" + item);
+        });
+        roomIds = roomIds.join("&");
+        let startDay = dayjs(new Date()).format("YYYY-MM-DD");
+        let endDay = dayjs(new Date()).add(1, "day").format("YYYY-MM-DD");
+        let params =
+          "?" +
+          "startDay=" +
+          startDay +
+          "&" +
+          "endDay=" +
+          endDay +
+          "&" +
+          roomIds;
+        this.API.roomRealTimeStatu.realData(params).then((res) => {
+          // console.log(res.data);
+          this.floorRoomDatas.forEach((item) => {
+            // console.log(item.room);
+            item.room.forEach((i) => {
+              // console.log(i);
+              res.data.forEach((resItem) => {
+                // console.log(resItem);
+                if (i.id == resItem.roomId) {
+                  i.roomInfo = resItem;
+                }
+              });
+            });
+          });
+        });
+        this.cardShow = true;
+      });
+    },
     bgState(e) {
       let color = ["#D3DBE6", "#296DE3", "#00BAAD", "#FF5733", "#3BB1E3"];
-      let index = this.cities.findIndex((item) => {
-        return e == item;
-      });
-      let bg = color[index];
-      return { background: bg };
+      console.log(e);
+      return { background: color[e] };
     },
     EachRoom(i, item, $event) {
       // console.log($event.currentTarget.id);

admin/src/views/order/index.vue

@@ -18,6 +18,7 @@
             <span class="demonstration">支付时间</span>
             <el-date-picker
               v-model="payTime"
+              :default-time="['00:00:00', '23:59:59']"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="timePay"
@@ -34,6 +35,7 @@
             <span class="demonstration">创建时间</span>
             <el-date-picker
               v-model="creationTime"
+              :default-time="['00:00:00', '23:59:59']"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="timeCreation"
@@ -75,77 +77,72 @@
               background: 'rgba(240, 243, 247, 1)',
             }"
           >
+            <el-table-column type="selection" align="center"></el-table-column>
             <el-table-column
-              type="selection"
-              width="60"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="orderNum"
-              width="120"
+              prop="order.orderNo"
+              width="350"
               label="订单号"
               align="center"
             >
             </el-table-column>
 
             <el-table-column
-              prop="state"
-              width="100"
+              prop="order.orderStatu"
               align="center"
               label="状态"
             >
             </el-table-column>
 
             <el-table-column
-              prop="room"
-              width="160"
+              prop="order.roomNo"
+              width="100"
               align="center"
               label="房间"
             >
             </el-table-column>
             <el-table-column
-              prop="electricity"
+              prop="order.priceOfElectric"
               align="center"
-              width="130"
+              width="100"
               label="电费（元）"
             >
             </el-table-column>
             <el-table-column
-              prop="water"
-              width="130"
+              prop="order.priceOfWater"
               align="center"
+              width="100"
               label="水费（元）"
             >
             </el-table-column>
             <el-table-column
               prop="imprest"
               align="center"
-              width="150"
+              width="140"
               label="收预付款（元）"
             >
             </el-table-column>
             <el-table-column
               prop="refund"
-              width="150"
               align="center"
+              width="140"
               label="退预付款（元）"
             >
             </el-table-column>
             <el-table-column
-              prop="create"
+              prop="order.createTime"
               width="180"
               align="center"
               label="创建时间"
             >
             </el-table-column>
             <el-table-column
-              prop="pay"
+              prop="order.payTime"
               width="180"
               align="center"
               label="支付时间"
             >
             </el-table-column>
-            <el-table-column prop="address" align="center" label="操作">
+            <el-table-column align="center" width="150" label="操作">
               <template slot-scope="scope">
                 <span
                   @click="handleEdit(scope.$index, scope.row)"
@@ -163,46 +160,47 @@
                   <div class="info">
                     <div class="user">
                       <div class="name">姓名</div>
-                      <el-input value="刘老师"></el-input>
+                      <el-input :value="orderInfo.userName"></el-input>
                     </div>
                     <div class="user">
                       <div class="name">联系方式</div>
-                      <el-input value="13234564"></el-input>
+                      <el-input :value="orderInfo.userPhone"></el-input>
                     </div>
                   </div>
                   <div class="info">
                     <div class="user">
                       <div class="name">订单号</div>
-                      <el-input value="261691612"></el-input>
+                      <el-input :value="orderInfo.orderNo"></el-input>
                     </div>
                     <div class="user">
                       <div class="name">预付款金额（元）</div>
-                      <el-input value="20.00"></el-input>
+                      <el-input :value="orderInfo.imprest"></el-input>
                     </div>
                   </div>
                   <div class="info">
                     <div class="user">
                       <div class="name">入住时间</div>
-                      <el-input value="2022-07-26"></el-input>
+                      <el-input :value="orderInfo.enableStartTime"></el-input>
                     </div>
                     <div class="user">
                       <div class="name">离住时间</div>
-                      <el-input value="2022-07-26"></el-input>
+                      <el-input :value="orderInfo.enableEndTime"></el-input>
                     </div>
                   </div>
                   <div class="info">
                     <div class="user">
                       <div class="name">入住天数</div>
-                      <el-input value="1"></el-input>
+                      <el-input :value="orderInfo.dayNum"></el-input>
                     </div>
                     <div class="user">
                       <div class="name">支付时间</div>
-                      <el-input value="2022-07-27   15:15:15"></el-input>
+                      <el-input :value="orderInfo.payTime"></el-input>
                     </div>
                   </div>
                   <div class="rate">水费明细</div>
                   <div class="water">
-                    表计：101 楼层：12栋1单元2层01 抄表时间：2022-07-27 15:15:15
+                    表计:101 &nbsp;&nbsp;楼层:12栋1单元2层01
+                    &nbsp;&nbsp;抄表时间:2022-07-27 &nbsp;&nbsp;15:15:15
                   </div>
                   <el-table
                     :data="waterTable"
@@ -259,7 +257,8 @@
 
                   <div class="rate">电费明细</div>
                   <div class="water">
-                    表计：101 楼层：12栋1单元2层01 抄表时间：2022-07-27 15:15:15
+                    表计:101 &nbsp;&nbsp;楼层:12栋1单元2层01
+                    &nbsp;&nbsp;抄表时间:2022-07-27 &nbsp;&nbsp;15:15:15
                   </div>
                   <el-table
                     :data="waterTable"
@@ -338,65 +337,64 @@
             }"
           >
             <el-table-column
-              prop="orderNum"
-              width="120"
+              prop="order.orderNo"
+              width="350"
               label="订单号"
               align="center"
             >
             </el-table-column>
 
             <el-table-column
-              prop="state"
-              width="100"
+              prop="order.orderStatu"
               align="center"
               label="状态"
             >
             </el-table-column>
 
             <el-table-column
-              prop="room"
-              width="160"
+              prop="order.roomNo"
+              width="100"
               align="center"
               label="房间"
             >
             </el-table-column>
             <el-table-column
-              prop="electricity"
+              prop="order.priceOfElectric"
               align="center"
-              width="130"
+              width="100"
               label="电费（元）"
             >
             </el-table-column>
             <el-table-column
-              prop="water"
-              width="130"
+              prop="order.priceOfWater"
               align="center"
+              width="100"
               label="水费（元）"
             >
             </el-table-column>
             <el-table-column
               prop="imprest"
               align="center"
-              width="150"
+              width="140"
               label="收预付款（元）"
             >
             </el-table-column>
             <el-table-column
               prop="refund"
-              width="150"
               align="center"
+              width="140"
               label="退预付款（元）"
             >
             </el-table-column>
             <el-table-column
-              prop="create"
+              prop="order.createTime"
               width="180"
               align="center"
               label="创建时间"
             >
             </el-table-column>
             <el-table-column
-              prop="pay"
+              prop="order.payTime"
               width="180"
               align="center"
               label="支付时间"
@@ -417,65 +415,64 @@
             }"
           >
             <el-table-column
-              prop="orderNum"
-              width="120"
+              prop="order.orderNo"
+              width="350"
               label="订单号"
               align="center"
             >
             </el-table-column>
 
             <el-table-column
-              prop="state"
-              width="100"
+              prop="order.orderStatu"
               align="center"
               label="状态"
             >
             </el-table-column>
 
             <el-table-column
-              prop="room"
-              width="160"
+              prop="order.roomNo"
+              width="100"
               align="center"
               label="房间"
             >
             </el-table-column>
             <el-table-column
-              prop="electricity"
+              prop="order.priceOfElectric"
               align="center"
-              width="130"
+              width="100"
               label="电费（元）"
             >
             </el-table-column>
             <el-table-column
-              prop="water"
-              width="130"
+              prop="order.priceOfWater"
               align="center"
+              width="100"
               label="水费（元）"
             >
             </el-table-column>
             <el-table-column
               prop="imprest"
               align="center"
-              width="150"
+              width="140"
               label="收预付款（元）"
             >
             </el-table-column>
             <el-table-column
               prop="refund"
-              width="150"
               align="center"
+              width="140"
               label="退预付款（元）"
             >
             </el-table-column>
             <el-table-column
-              prop="create"
+              prop="order.createTime"
               width="180"
               align="center"
               label="创建时间"
             >
             </el-table-column>
             <el-table-column
-              prop="pay"
+              prop="order.payTime"
               width="180"
               align="center"
               label="支付时间"
@@ -488,7 +485,7 @@
             background
             @current-change="handleCurrentChange"
             current-page.sync="1"
-            :page-size="8"
+            :page-size="10"
             :current-page="currentPage"
             layout="prev, pager, next, jumper"
             :total="tableData.length"
@@ -503,7 +500,7 @@
 <script>
 import FileSaver from "file-saver";
 import * as XLSX from "xlsx";
-
+import * as dayjs from "dayjs";
 export default {
   name: "Inform",
   data() {
@@ -514,174 +511,12 @@ export default {
       Tdata: [],
       // 查询出来的总数据
       inquireTable: [],
+      // 支付时间查询数据
+      payTable: [],
+      // 创建时间查询
+      createTable: [],
       // 显示的总数据
-      tableData: [
-        {
-          orderNum: "116161656",
-          state: "已入住",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2013.07.02 08:50:50",
-          pay: "2013.07.02 08:50:50",
-        },
-        {
-          orderNum: "116161656",
-          state: "空房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2014.07.02 08:50:50",
-          pay: "2014.07.02 08:50:50",
-        },
-        {
-          orderNum: "116161656",
-          state: "空房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2015.07.02 08:50:50",
-          pay: "2015.07.02 08:50:50",
-        },
-        {
-          orderNum: "116161656",
-          state: "已锁定",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2016.07.02 08:50:50",
-          pay: "2016.07.02 08:50:50",
-        },
-        {
-          orderNum: "116161656",
-          state: "脏房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2014.07.02 08:50:50",
-          pay: "2014.07.02 08:50:50",
-        },
-        {
-          orderNum: "116161656",
-          state: "脏房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2012.07.02 08:50:50",
-          pay: "2012.07.02 08:50:50",
-        },
-        {
-          orderNum: "216161656",
-          state: "保留房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2021.07.02 08:50:50",
-          pay: "2021.07.02 08:50:50",
-        },
-        {
-          orderNum: "316161656",
-          state: "空房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2020.07.02 08:50:50",
-          pay: "2020.07.02 08:50:50",
-        },
-        {
-          orderNum: "416161656",
-          state: "已住",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2019.07.02 08:50:50",
-          pay: "2019.07.02 08:50:50",
-        },
-        {
-          orderNum: "516161656",
-          state: "已锁定",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2012.07.02 08:50:50",
-          pay: "2012.07.02 08:50:50",
-        },
-        {
-          orderNum: "616161656",
-          state: "已入住",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2013.07.02 08:50:50",
-          pay: "2013.07.02 08:50:50",
-        },
-        {
-          orderNum: "716161656",
-          state: "脏房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2022.07.02 08:50:50",
-          pay: "2022.07.02 08:50:50",
-        },
-        {
-          orderNum: "816161656",
-          state: "脏房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2022.07.02 08:50:50",
-          pay: "2022.07.02 08:50:50",
-        },
-        {
-          orderNum: "916161656",
-          state: "空房",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2022.07.02 08:50:50",
-          pay: "2022.07.02 08:50:50",
-        },
-        {
-          orderNum: "106161656",
-          state: "已锁定",
-          room: "17栋1单元2层04房",
-          electricity: "2.09",
-          water: "0.00",
-          imprest: "20.00",
-          refund: "20.00",
-          create: "2022.07.02 08:50:50",
-          pay: "2022.07.02 08:50:50",
-        },
-      ],
+      tableData: [],
       // 多选框按钮勾选的数据
       selectionTable: [],
 
@@ -707,11 +542,20 @@ export default {
           label: "保留房",
         },
       ],
-
+      // 订单详情
+      orderInfo: {
+        userName: "",
+        userPhone: "",
+        orderNo: "",
+        imprest: "", //预付款金额（元）
+        enableStartTime: "",
+        enableEndTime: "",
+        dayNum: "", // 入住天数
+      },
       state: "",
       value: "",
-      payTime: "",
-      creationTime: "",
+      payTime: [],
+      creationTime: [],
       dialogVisible: false,
       waterTable: [
         {
@@ -730,11 +574,18 @@ export default {
     document.getElementsByClassName(
       "el-pagination__jump"
     )[0].childNodes[0].nodeValue = "跳转到";
-
-    this.handleCurrentChange(this.currentPage);
-    this.Tdata = this.tableData;
+    this.orderList();
   },
   methods: {
+    orderList() {
+      this.API.hotelOrder.hotelOrderAdminPage().then((res) => {
+        console.log(res);
+        this.Tdata = res.data.list;
+        this.inquireTable = this.Tdata;
+        this.tableData = this.Tdata;
+        this.handleCurrentChange(this.currentPage);
+      });
+    },
     // 导出表格
     excel(id) {
       let xlsxParam = { raw: true };
@@ -766,10 +617,6 @@ export default {
       }
     },
 
-    allRead($event, index) {
-      this.className = this.className.map((item) => (item = ""));
-      this.className[index] = "active";
-    },
     rowbg(row) {
       if (row.rowIndex % 2 != 0) {
         return { background: "rgba(240, 243, 247, 1)", "border-radius": "5px" };
@@ -778,8 +625,8 @@ export default {
 
     handleCurrentChange(val) {
       this.currentPage = val;
-      if (this.tableData.length >= 8) {
-        this.data = this.tableData.slice((val - 1) * 8, val * 8);
+      if (this.tableData.length >= 10) {
+        this.data = this.tableData.slice((val - 1) * 10, val * 10);
       } else {
         this.data = this.tableData;
       }
@@ -789,28 +636,42 @@ export default {
 
     // 表格操作
     handleEdit(index, row) {
-      console.log(index, row);
+      console.log(row);
+      //  orderInfo: {
+      //   userName: "",
+      //   userPhone: "",
+      //   orderNo: "",
+      //   imprest: "", //预付款金额（元）
+      //   enableStartTime: "",
+      //   enableEndTime: "",
+      //   dayNum: "", // 入住天数
+      // },
+      this.orderInfo = {
+        userName: row.order.userName,
+        userPhone: row.order.userPhone,
+        orderNo: row.order.orderNo,
+        imprest: "", //预付款金额（元）
+        enableStartTime: row.order.enableStartTime,
+        enableEndTime: row.order.enableEndTime,
+        dayNum: "", // 入住天数
+      };
       this.dialogVisible = true;
     },
 
     handleDelete(index, row) {
-      // console.log(index, row);
+      console.log(index, row);
+      let id = row.order.id;
       this.$confirm("确认删除？")
         .then((res) => {
           if (res == "confirm") {
-            let data = this.tableData.filter((item) => {
-              return item.orderNum !== row.orderNum;
-            });
-            this.tableData = data;
-            this.Tdata = this.Tdata.filter((item) => {
-              return item.orderNum !== row.orderNum;
+            this.API.hotelOrder.hotelOrderAdminDelete(id).then((res) => {
+              console.log(res);
+              if (this.data.length <= 1) {
+                this.currentPage = this.currentPage - 1;
+              }
+              this.orderList();
             });
           }
-          // console.log(this.currentPage);
-          if (this.data.length <= 1) {
-            this.currentPage = this.currentPage - 1;
-          }
-          this.handleCurrentChange(this.currentPage);
         })
         .catch((res) => {
           console.log(res);
@@ -825,18 +686,16 @@ export default {
       } else {
         this.state = "";
         let quireData = this.Tdata.filter((item) => {
-          if (item.orderNum.includes(this.value)) {
-            return item.orderNum;
+          if (item.order.orderNo.includes(this.value)) {
+            return item;
           }
         });
-        this.inquireTable = quireData;
+        this.inquireTable = quireData; // 查询的数据
         this.tableData = quireData;
       }
       this.currentPage = 1;
 
       this.handleCurrentChange(this.currentPage);
-      console.log(this.Tdata);
-      console.log(this.tableData);
     },
 
     handleClose(done) {
@@ -845,32 +704,37 @@ export default {
 
     // 支付时间
     timePay() {
-      // console.log(this.payTime);
+      console.log(this.payTime);
       if (this.value == "") {
         this.state = "";
-        let reg = new RegExp("-", "g");
-        let startTime = new Date(this.payTime[0].replace(reg, "/"));
-        let endTime = new Date(this.payTime[1].replace(reg, "/"));
+        let startTime = this.payTime[0];
+        let endTime = this.payTime[1];
+
         const quireData = this.Tdata.filter((item) => {
-          let nowTime = new Date(item.pay.substr(0, 10).replace(reg, "/"));
-          return nowTime >= startTime && nowTime <= endTime;
+          let nowTime = item.order.payTime;
+          return (
+            dayjs(nowTime).isAfter(dayjs(startTime)) &&
+            dayjs(nowTime).isBefore(dayjs(endTime))
+          );
         });
-
-        this.inquireTable = quireData;
+        // console.log(startTime, endTime);
+        this.payTable = quireData;
         this.tableData = quireData;
         this.currentPage = 1;
         this.handleCurrentChange(this.currentPage);
       } else {
         this.state = "";
-        let reg = new RegExp("-", "g");
-        let startTime = new Date(this.payTime[0].replace(reg, "/"));
-        let endTime = new Date(this.payTime[1].replace(reg, "/"));
+        let startTime = this.payTime[0];
+        let endTime = this.payTime[1];
 
         const quireData = this.inquireTable.filter((item) => {
-          let nowTime = new Date(item.pay.substr(0, 10).replace(reg, "/"));
-          return nowTime >= startTime && nowTime <= endTime;
+          let nowTime = item.order.payTime;
+          return (
+            dayjs(nowTime).isAfter(dayjs(startTime)) &&
+            dayjs(nowTime).isBefore(dayjs(endTime))
+          );
         });
-        this.inquireTable = quireData;
+        this.payTable = quireData;
         this.tableData = quireData;
         this.currentPage = 1;
         this.handleCurrentChange(this.currentPage);
@@ -878,19 +742,41 @@ export default {
     },
     // 创建时间
     timeCreation() {
-      this.state = "";
       // console.log(this.creationTime);
-      let reg = new RegExp("-", "g");
-      let startTime = new Date(this.creationTime[0].replace(reg, "/"));
-      let endTime = new Date(this.creationTime[1].replace(reg, "/"));
-      const quireData = this.Tdata.filter((item) => {
-        let nowTime = new Date(item.create.substr(0, 10).replace(reg, "/"));
-        return nowTime >= startTime && nowTime <= endTime;
-      });
-      this.inquireTable = quireData;
-      this.tableData = quireData;
-      this.currentPage = 1;
-      this.handleCurrentChange(this.currentPage);
+      if (this.value == "") {
+        this.state = "";
+        let startTime = this.creationTime[0];
+        let endTime = this.creationTime[1];
+        const quireData = this.Tdata.filter((item) => {
+          let nowTime = item.order.createTime;
+          return (
+            dayjs(nowTime).isAfter(dayjs(startTime)) &&
+            dayjs(nowTime).isBefore(dayjs(endTime))
+          );
+        });
+        // console.log(startTime, endTime);
+        this.createTable = quireData;
+        this.tableData = quireData;
+        this.currentPage = 1;
+        this.handleCurrentChange(this.currentPage);
+      } else {
+        this.state = "";
+        let startTime = this.creationTime[0];
+        let endTime = this.creationTime[1];
+
+        const quireData = this.inquireTable.filter((item) => {
+          let nowTime = item.order.createTime;
+          console.log(nowTime);
+          return (
+            dayjs(nowTime).isAfter(dayjs(startTime)) &&
+            dayjs(nowTime).isBefore(dayjs(endTime))
+          );
+        });
+        this.createTable = quireData;
+        this.tableData = quireData;
+        this.currentPage = 1;
+        this.handleCurrentChange(this.currentPage);
+      }
     },
 
     // 挑选状态
@@ -1030,7 +916,7 @@ export default {
           }
         }
         tr {
-          height: 64px;
+          height: 52px;
           td {
             .cell {
               .el-checkbox.is-checked {
@@ -1126,6 +1012,7 @@ export default {
                       }
                       .el-table__body-wrapper {
                         overflow: visible;
+                        height: 520px !important;
                       }
                     }
                   }

admin/src/views/staff/index.vue

@@ -220,7 +220,8 @@ export default {
   methods: {
     hotelList() {
       let cook = Cookies.get("cook");
-      this.API.hotelAdmin.hotelAdminList(cook).then((res) => {
+      this.API.hotelStaff.hotelStaffList().then((res) => {
+        console.log(res.data);
         this.data = res.data.list;
         this.datas = JSON.parse(JSON.stringify(this.data));
         this.handleCurrentChange(this.currentPage);