Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-tenant-frontend

解决冲突文件

src/views/room/fangtailive.vue

@@ -5,33 +5,73 @@
       <a-tab-pane key="2" tab="大床房"> </a-tab-pane>
       <a-tab-pane key="3" tab="麻将房"> </a-tab-pane>
     </a-tabs>
-    <div style="display: flex">
+    <div style="display: flex; height: calc(100vh - 240px)">
       <div class="course-week">
-        <div class="week-top">
-          <!-- <div class="week-btn-wrap">
-          <span @click="getLastWeek">上周</span>
-          <span @click="getCurWeek">本周</span>
-          <span @click="getNextWeek">下周</span>
-        </div>
-        <span class="w-today-date"> {{ todayDate }}</span> -->
-          <div class="w-choose-status">
-            <div v-for="sta in cardStatus">
-              <span class="square" :style="{ background: sta.color }"></span>
-              <span class="title">{{ sta.title }}</span>
-            </div>
-          </div>
-          <div class="w-choose-status">
-            <a-input-search
-              style="width: 300px; margin-left: 8px"
-              placeholder="房间号/姓名/手机号/身份证号"
-              enter-button="搜索"
-              v-model="keyWord"
+        <div style="display: flex; flex-direction: column">
+          <div style="display: flex; gap: 5px">
+            <a-dropdown>
+              <a-menu slot="overlay" @click="scheduleClick">
+                <a-menu-item key="1"> 散客预定 </a-menu-item>
+                <a-menu-item key="2"> 团队预定</a-menu-item>
+              </a-menu>
+              <a-button type="danger"> 预定 <a-icon type="down" /> </a-button>
+            </a-dropdown>
+            <a-dropdown>
+              <a-menu slot="overlay" @click="handleMenuClick">
+                <a-menu-item key="1"> 散客入住 </a-menu-item>
+                <a-menu-item key="2"> 团队入住</a-menu-item>
+              </a-menu>
+              <a-button type="danger">
+                入住 <a-icon type="down" />
+              </a-button> </a-dropdown
+            ><a-button
+              style="margin-bottom: 10px"
+              @click="handleAdd"
+              type="danger"
+              >置干净</a-button
+            ><a-button
+              style="margin-bottom: 10px"
+              @click="handleAdd"
+              type="danger"
+              >置脏</a-button
+            ><a-button
+              style="margin-bottom: 10px"
+              @click="handleAdd"
               type="danger"
-              @search="handleAdd"
-            />
+              >置维修</a-button
+            ><a-button
+              style="margin-bottom: 10px"
+              @click="handleAdd"
+              type="danger"
+              >锁房</a-button
+            ><a-button
+              style="margin-bottom: 10px"
+              @click="handleAdd"
+              type="danger"
+              >联房</a-button
+            ><a-button
+              style="margin-bottom: 10px"
+              @click="handleAdd"
+              type="danger"
+              >批量制卡</a-button
+            >
+          </div>
+          <div class="week-top">
+            <div class="w-choose-status">
+              <div v-for="sta in cardStatus">
+                <span class="square" :style="{ background: sta.color }"></span>
+                <span class="title">{{ sta.title }}</span>
+              </div>
+            </div>
+            <div class="w-choose-status">
+              批量操作<a-switch
+                v-model="multipleRoom"
+                @change="multipleRoomChange"
+              />
+            </div>
           </div>
         </div>
-        <div class="week-table">
+        <div class="week-table" style="overflow: hidden auto">
           <div id="components-grid-demo-playground" class="w-time-period-list">
             <template v-for="(i, iIndex) in planList2">
               <!--循环时段，看时段有多少个-->
@@ -67,12 +107,28 @@
                     v-for="(roomLive, roomLiveIndex) in period.schedule"
                     :key="`i${iIndex}-period${cIndex}roomLive${roomLiveIndex}`"
                     :span="3"
+                    @click.stop="roomItemClick(roomLive)"
+                    @dblclick.stop="handleBillInfo(roomLive)"
                   >
+                    <!-- <div class="post-mark"></div> -->
+
                     <div
+                      class="room-item"
                       :style="{
                         background: cardStatus[roomLive.detail.status].color,
                       }"
                     >
+                      <div
+                        class="select-cell"
+                        v-if="roomLive.detail.check == 1"
+                      >
+                        <a-icon
+                          type="check-circle"
+                          theme="twoTone"
+                          two-tone-color="#52c41a"
+                          style="font-size: 40px"
+                        />
+                      </div>
                       <a-popover placement="rightTop">
                         <template
                           slot="content"
@@ -205,10 +261,17 @@
         </div>
       </div>
       <div style="width: 1%"></div>
-      <div style="width: 19%">
-        <a-button style="margin-bottom: 10px" @click="handleAdd" type="danger"
-          >批量制卡</a-button
-        >
+      <div style="width: 19%; overflow: hidden auto">
+        <div>
+          <a-input-search
+            style="width: 100%; margin-bottom: 8px"
+            placeholder="房间号/姓名/手机号/身份证号"
+            enter-button="搜索"
+            v-model="keyWord"
+            type="danger"
+            @search="handleAdd"
+          />
+        </div>
         <p style="font-size: 16px; font-weight: 600; color: rgb(0, 186, 173)">
           按楼层
         </p>
@@ -310,6 +373,18 @@
       </div>
     </div>
     <upkeep-room-modal ref="modalForm" @ok="modalFormOk"></upkeep-room-modal>
+    <bill-room-info-modal
+      ref="ModalBillRoomInfo"
+      @ok="modalFormOk"
+    ></bill-room-info-modal>
+    <bill-room-form-modal
+      ref="ModalBillRoomForm"
+      @ok="modalFormOk"
+    ></bill-room-form-modal>
+    <schedule-room-modal
+      ref="ModalScheduleRoom"
+      @ok="modalFormOk"
+    ></schedule-room-modal>
   </a-card>
 </template>
 
@@ -319,6 +394,9 @@ import "@/assets/less/TableExpand.less";
 // import { JeecgListMixin } from "@/mixins/JeecgListMixin";
 import { httpAction, getAction } from "@/api/manage";
 import UpkeepRoomModal from "./modules/upkeep/UpkeepRoomModal.vue";
+import BillRoomInfoModal from "./modules/checkIn/BillRoomInfoModal.vue";
+import BillRoomFormModal from "./modules/checkIn/BillRoomFormModal.vue";
+import ScheduleRoomModal from "./modules/schedule/ScheduleRoomModal.vue";
 import { TreeSelect } from "ant-design-vue";
 const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 const treeData = [
@@ -358,280 +436,183 @@ const treeData = [
     ],
   },
 ];
+
+const planList = [
+  {
+    timePeriod: "1层",
+    count: 12,
+    checkInCount: 5,
+    vacantCount: 7,
+    collapse: 1,
+    schedule: [
+      {
+        id: "1-1001",
+        roomNo: "1001",
+        detail: {
+          status: 0,
+          roomType: "高级商务大床房",
+          occupant: "张三",
+          day: 1,
+          date: "03-20",
+          amout: 300,
+          payAmount: 500,
+          balance: 200,
+          isGroup: 1,
+          remark: "靠马路，噪音大",
+          roomStatusName: "空净",
+          startDate: "2023-03-20 18:00",
+          endDate: "2023-03-21 18:00",
+          source: 1,
+          check: 0,
+        },
+      },
+    ],
+  },
+  {
+    timePeriod: "2层",
+    count: 12,
+    checkInCount: 5,
+    vacantCount: 7,
+    collapse: 1,
+    schedule: [
+      {
+        id: "2-2001",
+        roomNo: "2001",
+        detail: {
+          status: 1,
+          roomType: "高级商务大床房",
+          occupant: "张三",
+          day: 1,
+          date: "03-20",
+          amout: 300,
+          payAmount: 500,
+          balance: 200,
+          isGroup: 1,
+          remark: "靠马路，噪音大",
+          roomStatusName: "空净",
+          startDate: "2023-03-20 18:00",
+          endDate: "2023-03-21 18:00",
+          source: 1,
+          check: 0,
+        },
+      },
+    ],
+  },
+  {
+    timePeriod: "3层",
+    count: 0,
+    checkInCount: 0,
+    vacantCount: 0,
+    collapse: 1,
+    schedule: [
+      {
+        id: "3-3001",
+        roomNo: "3001",
+        detail: {
+          status: 1,
+          roomType: "高级商务大床房",
+          occupant: "张三",
+          day: 1,
+          date: "03-20",
+          amout: 300,
+          payAmount: 500,
+          balance: 200,
+          isGroup: 1,
+          remark: "靠马路，噪音大",
+          roomStatusName: "空净",
+          startDate: "2023-03-20 18:00",
+          endDate: "2023-03-21 18:00",
+          source: 1,
+          check: 0,
+        },
+      },
+    ],
+  },
+];
+
+for (let i = 2; i < 25; i++) {
+  planList[0].schedule.push({
+    id: "1-100" + i,
+    roomNo: 1000 + i,
+    detail: {
+      status: i == 5 ? 1 : 0,
+      roomType: "高级商务大床房",
+      occupant: "张三",
+      day: 1,
+      date: "03-20",
+      amout: 300,
+      payAmount: 500,
+      balance: 200,
+      isGroup: 1,
+      remark: "靠马路，噪音大",
+      roomStatusName: "空净",
+      startDate: "2023-03-20 18:00",
+      endDate: "2023-03-21 18:00",
+      source: 1,
+      check: 0,
+    },
+  });
+}
+for (let i = 2; i < 25; i++) {
+  planList[1].schedule.push({
+    id: "2-100" + i,
+    roomNo: 2000 + i,
+    detail: {
+      status: i == 7 ? 1 : 0,
+      roomType: "高级商务大床房",
+      occupant: "张三",
+      day: 1,
+      date: "03-20",
+      amout: 300,
+      payAmount: 500,
+      balance: 200,
+      isGroup: 1,
+      remark: "靠马路，噪音大",
+      roomStatusName: "空净",
+      startDate: "2023-03-20 18:00",
+      endDate: "2023-03-21 18:00",
+      source: 1,
+      check: 0,
+    },
+  });
+}
+for (let i = 2; i < 25; i++) {
+  planList[2].schedule.push({
+    id: "3-100" + i,
+    roomNo: 2000 + i,
+    detail: {
+      status: i == 12 ? 1 : 0,
+      roomType: "高级商务大床房",
+      occupant: "张三",
+      day: 1,
+      date: "03-20",
+      amout: 300,
+      payAmount: 500,
+      balance: 200,
+      isGroup: 1,
+      remark: "靠马路，噪音大",
+      roomStatusName: "空净",
+      startDate: "2023-03-20 18:00",
+      endDate: "2023-03-21 18:00",
+      source: 1,
+      check: 0,
+    },
+  });
+}
 export default {
   name: "BusMeetingRoomList",
   // mixins: [JeecgListMixin, mixinDevice],
   components: {
     UpkeepRoomModal,
+    BillRoomInfoModal,
+    BillRoomFormModal,
+    ScheduleRoomModal,
   },
   data() {
-    const planList = [
-      {
-        timePeriod: "1层",
-        count: 12,
-        checkInCount: 5,
-        vacantCount: 7,
-        collapse: 1,
-        schedule: [
-          {
-            roomNo: "1001",
-            detail: {
-              status: 0,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1002",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1003",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1004",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1005",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1006",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1007",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1008",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1009",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1010",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-          {
-            roomNo: "1011",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-              remark: "靠马路，噪音大",
-              roomStatusName: "空净",
-              startDate: "2023-03-20 18:00",
-              endDate: "2023-03-21 18:00",
-              source: 1,
-            },
-          },
-        ],
-      },
-      {
-        timePeriod: "2层",
-        count: 12,
-        checkInCount: 5,
-        vacantCount: 7,
-        collapse: 1,
-        schedule: [
-          {
-            roomNo: "2001",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-            },
-          },
-          {
-            roomNo: "2002",
-            detail: {
-              status: 1,
-              roomType: "高级商务大床房",
-              occupant: "张三",
-              day: 1,
-              date: "03-20",
-              amout: 300,
-              payAmount: 500,
-              balance: 200,
-              isGroup: 1,
-            },
-          },
-        ],
-      },
-      {
-        timePeriod: "3层",
-        count: 0,
-        checkInCount: 0,
-        vacantCount: 0,
-        collapse: 1,
-        schedule: [],
-      },
-    ];
     return {
-      keyWord:'',
+      timeId: null,
+      multipleRoom: false,
+      keyWord: "",
       value: ["0-0-0"],
       treeData,
       SHOW_PARENT,
@@ -702,7 +683,111 @@ export default {
     // 禁用右键
     // document.oncontextmenu = new Function("event.returnValue=false");
   },
+  mounted() {
+    // this.handleBillInfo();
+    // this.handleCheckInAdd()
+    // this.$refs.ModalScheduleRoom.addList([]);
+    //   this.$refs.ModalScheduleRoom.title = "预定登记";
+    //   this.$refs.ModalScheduleRoom.disableSubmit = false;
+  },
   methods: {
+    scheduleClick() {
+      var selectRoom = [];
+      this.planList2.forEach((t) => {
+        t.child.forEach((c) => {
+          c.schedule.forEach((s) => {
+            if (s.detail.check === 1) {
+              selectRoom.push(s);
+            }
+          });
+        });
+      });
+      if (selectRoom.length === 0) {
+        this.$message.warning("请先选择房间");
+        return;
+      }
+      this.$refs.ModalScheduleRoom.addList(selectRoom);
+      this.$refs.ModalScheduleRoom.title = "预定登记";
+      this.$refs.ModalScheduleRoom.disableSubmit = false;
+    },
+    handleMenuClick(e) {
+      console.log("click", e);
+      var selectRoom = [];
+      this.planList2.forEach((t) => {
+        t.child.forEach((c) => {
+          c.schedule.forEach((s) => {
+            if (s.detail.check === 1) {
+              selectRoom.push(s);
+            }
+          });
+        });
+      });
+      if (selectRoom.length === 0) {
+        this.$message.warning("请先选择房间");
+        return;
+      }
+      this.$refs.ModalBillRoomForm.addList(selectRoom);
+      this.$refs.ModalBillRoomForm.title = "入住登记";
+      this.$refs.ModalBillRoomForm.disableSubmit = false;
+    },
+    roomItemClick(roomLive) {
+      // 清除上一次的定时器
+      if (this.timeId) {
+        clearTimeout(this.timeId);
+      }
+      this.timeId = setTimeout(() => {
+        if (!this.multipleRoom && roomLive.detail.check === 0) {
+          this.planList2.forEach((item) => {
+            item.child.forEach((c) => {
+              c.schedule.forEach((s) => {
+                if (s.detail.check === 1) {
+                  s.detail.check = 0;
+                }
+              });
+            });
+          });
+        }
+        if (roomLive.detail.check === 0) {
+          roomLive.detail.check = 1;
+        } else {
+          roomLive.detail.check = 0;
+        }
+        // 清除定时器
+        clearTimeout(this.timeId);
+      }, 100);
+    },
+    handleBillInfo(roomLive) {
+      console.log("handleBillInfo");
+      if (this.timeId) {
+        clearTimeout(this.timeId);
+      }
+      if (roomLive.detail.status === 0) {
+        this.handleCheckInAdd(roomLive);
+      } else {
+        this.$refs.ModalBillRoomInfo.add();
+        this.$refs.ModalBillRoomInfo.title = "账单";
+        this.$refs.ModalBillRoomInfo.disableSubmit = true;
+      }
+    },
+    handleCheckInAdd(roomLive) {
+      if (this.timeId) {
+        clearTimeout(this.timeId);
+      }
+      this.$refs.ModalBillRoomForm.add(roomLive);
+      this.$refs.ModalBillRoomForm.title = "入住登记";
+      this.$refs.ModalBillRoomForm.disableSubmit = false;
+    },
+    multipleRoomChange() {
+      this.planList2.forEach((item) => {
+        item.child.forEach((c) => {
+          c.schedule.forEach((s) => {
+            if (s.detail.check === 1) {
+              s.detail.check = 0;
+            }
+          });
+        });
+      });
+    },
     onChange() {},
     tabsClick() {},
     collapseClick(row, value) {
@@ -756,8 +841,34 @@ li {
   /* border: 1px solid #ddd; */
   /* padding: 1%; */
   box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+}
+.post-mark {
+  position: relative;
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
+}
+.select-cell {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  z-index: 10;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  background: rgba(102, 102, 102, 0.5);
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  border-radius: 5px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
-
 .week-top {
   display: flex;
   justify-content: space-between;
@@ -974,7 +1085,7 @@ li {
   background: transparent;
   border: 0;
 }
-#components-grid-demo-playground [class~="ant-col"] > div {
+#components-grid-demo-playground .room-item {
   background: rgba(67, 207, 124, 1);
   height: 125px;
   /* line-height: 200px; */
@@ -983,6 +1094,7 @@ li {
   padding: 2px;
   border-radius: 5px;
   cursor: pointer;
+  position: relative;
 }
 #components-grid-demo-playground pre {
   background: #f9f9f9;

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

@@ -0,0 +1,90 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
+    @cancel="handleCancel"
+    okText="确认入住"
+    cancelText="关闭"
+  >
+    <bill-room-form ref="realForm" @ok="submitCallback"></bill-room-form>
+  </j-modal>
+</template>
+
+<script>
+import BillRoomForm from "./BillRoomForm";
+export default {
+  name: "BillRoomFormModal",
+  components: {
+    BillRoomForm,
+  },
+  data() {
+    return {
+      title: "",
+      width: 1200,
+      visible: false,
+      disableSubmit: false,
+    };
+  },
+  methods: {
+    add(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.add2(record);
+      });
+    },
+    addList(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.addList(record);
+      });
+    },
+    edit(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      });
+    },
+    close() {
+      this.$emit("close");
+      this.visible = false;
+    },
+    handleOk() {
+      this.$refs.realForm.submitForm();
+    },
+    submitCallback() {
+      this.$emit("ok");
+      this.visible = false;
+    },
+    handleCancel() {
+      this.close();
+    },
+  },
+};
+</script>
+
+<style scoped>
+/deep/.ant-modal-body {
+  padding: 12px;
+  max-height: calc(80vh - 150px);
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #e3e3e6;
+    border-radius: 6px;
+  }
+
+  &::-webkit-scrollbar-track {
+    background: transparent;
+    border-radius: 5px;
+  }
+}
+</style>

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

@@ -0,0 +1,516 @@
+<template>
+  <div>
+    <div style="display: flex; gap: 15px">
+      <div style="width: 40%">
+        <div style="display: flex; justify-content: space-between">
+          <h4
+            style="
+              color: rgba(255, 141, 26, 1);
+              font-weight: 600;
+              margin-top: 15px;
+            "
+          >
+            入住信息
+          </h4>
+          <div style="display: flex">
+            <div style="display: flex; flex-direction: column">
+              <a-icon
+                type="clock-circle"
+                style="color: rgba(255, 141, 26, 1); font-size: 18px"
+              /><a-button type="link"> 叫醒服务 </a-button>
+            </div>
+            <div style="display: flex; flex-direction: column">
+              <a-icon
+                type="compass"
+                style="color: rgba(255, 141, 26, 1); font-size: 18px"
+              /><a-button type="link"> 拆分房间 </a-button>
+            </div>
+          </div>
+        </div>
+        <a-divider />
+
+        <a-descriptions :column="2">
+          <a-descriptions-item label="主客姓名">
+            张三
+            <a-icon
+              type="edit"
+              style="color: rgba(255, 141, 26, 1); font-size: 18px"
+          /></a-descriptions-item>
+          <a-descriptions-item label="房间数量"> 3间 </a-descriptions-item>
+          <a-descriptions-item label="手机号">
+            1588888888
+            <a-icon
+              type="edit"
+              style="color: rgba(255, 141, 26, 1); font-size: 18px"
+          /></a-descriptions-item>
+          <a-descriptions-item label="房间号"> 8888/9999 </a-descriptions-item>
+          <a-descriptions-item label="宾客类型">
+            散客
+            <a-icon
+              type="edit"
+              style="color: rgba(255, 141, 26, 1); font-size: 18px"
+          /></a-descriptions-item>
+          <a-descriptions-item label="入住时间">
+            2023-03-21 18：55
+          </a-descriptions-item>
+          <a-descriptions-item label="房价方案">
+            会员京卡折扣
+          </a-descriptions-item>
+          <a-descriptions-item label="预离时间">
+            2023-03-21 18：55
+          </a-descriptions-item>
+          <a-descriptions-item label="订单来源">
+            美团
+            <a-icon
+              type="edit"
+              style="color: rgba(255, 141, 26, 1); font-size: 18px"
+          /></a-descriptions-item>
+          <a-descriptions-item label="已住时长"> 3天 </a-descriptions-item>
+          <a-descriptions-item label="外部单号">
+            MT8888888888
+          </a-descriptions-item>
+          <a-descriptions-item label="销售员工">
+            无
+            <a-icon
+              type="edit"
+              style="color: rgba(255, 141, 26, 1); font-size: 18px"
+          /></a-descriptions-item>
+          <a-descriptions-item label="订单备注" :span="2">
+            该房间打碎玻璃杯1只，应赔付80元<a-icon
+              type="edit"
+              style="color: rgba(255, 141, 26, 1); font-size: 18px"
+            />
+          </a-descriptions-item>
+          <a-descriptions-item
+            label="叫醒服务"
+            :span="2"
+            v-for="(item, index) in wakeList"
+            :key="index"
+          >
+            <a-select
+              style="width: 100px"
+              placeholder="房间号"
+              @change="onChange"
+            >
+              <a-select-option value="jack"> 1001 </a-select-option>
+              <a-select-option value="lucy"> 1002 </a-select-option>
+            </a-select>
+            <a-date-picker
+              style="width: 120px; margin-left: 2px"
+              placeholder="日期"
+              @change="onChange"
+            />
+            <a-time-picker
+              style="width: 100px; margin-left: 2px"
+              :default-value="moment('12:08', 'HH:mm')"
+              format="HH:mm"
+            />
+            <a-icon
+              v-if="wakeList.length - 1 == index"
+              type="plus-circle"
+              class="dynamic-delete-button"
+              @click="puls()"
+            />
+            <a-icon
+              type="minus-circle"
+              style="color: #f56c6c"
+              class="dynamic-delete-button"
+              v-if="wakeList.length > 1"
+              @click="() => remove(index)"
+            />
+          </a-descriptions-item>
+        </a-descriptions>
+        <h4
+          style="
+            color: rgba(255, 141, 26, 1);
+            font-weight: 600;
+            margin-top: 50px;
+          "
+        >
+          会员信息
+        </h4>
+        <a-divider />
+        <a-descriptions :column="2">
+          <a-descriptions-item label="姓名"> 张三 </a-descriptions-item>
+          <a-descriptions-item label="证件号"
+            >888888888888
+          </a-descriptions-item>
+          <a-descriptions-item label="卡号"> 1588888888 </a-descriptions-item>
+          <a-descriptions-item label="手机号"> 1588888888 </a-descriptions-item>
+          <a-descriptions-item label="会员级别"> 金卡 </a-descriptions-item>
+          <a-descriptions-item label="余额"> 3000.00元 </a-descriptions-item>
+          <a-descriptions-item label="积分"> 888888分 </a-descriptions-item>
+        </a-descriptions>
+      </div>
+      <div style="width: 40%">
+        <div style="display: flex; justify-content: space-between">
+          <h4
+            style="
+              color: rgba(255, 141, 26, 1);
+              font-weight: 600;
+              margin-top: 15px;
+            "
+          >
+            消费详情
+          </h4>
+          <div style="display: flex">
+            <div style="display: flex; flex-direction: column">
+              <a-icon
+                type="import"
+                style="color: rgba(255, 141, 26, 1); font-size: 18px"
+              /><a-button type="link"> 退单 </a-button>
+            </div>
+            <div style="display: flex; flex-direction: column">
+              <a-icon
+                type="tool"
+                style="color: rgba(255, 141, 26, 1); font-size: 18px"
+              /><a-button type="link"> 补单 </a-button>
+            </div>
+            <div style="display: flex; flex-direction: column">
+              <a-icon
+                type="property-safety"
+                style="color: rgba(255, 141, 26, 1); font-size: 18px"
+              /><a-button type="link"> 部分结账 </a-button>
+            </div>
+          </div>
+        </div>
+        <a-divider />
+        <a-table
+          :columns="columns"
+          :data-source="data"
+          :pagination="false"
+          :scroll="{ y: 160, x: 500 }"
+          rowKey="id"
+          :rowSelection="{
+            selectedRowKeys: selectedRowKeys,
+            onChange: onSelectChange,
+          }"
+        />
+        <div
+          style="
+            color: rgba(255, 87, 51, 1);
+            font-weight: 600;
+            text-align: right;
+          "
+        >
+          合计消费：2922:00
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            margin-top: 30px;
+          "
+        >
+          <h4
+            style="
+              color: rgba(255, 141, 26, 1);
+              font-weight: 600;
+              margin-top: 15px;
+            "
+          >
+            收款详情
+          </h4>
+          <div style="display: flex">
+            <div style="display: flex; flex-direction: column">
+              <a-icon
+                type="transaction"
+                style="color: rgba(255, 141, 26, 1); font-size: 18px"
+              /><a-button type="link"> 收款 </a-button>
+            </div>
+            <div style="display: flex; flex-direction: column">
+              <a-icon
+                type="trademark"
+                style="color: rgba(255, 141, 26, 1); font-size: 18px"
+              /><a-button type="link"> 退款 </a-button>
+            </div>
+            <div style="display: flex; flex-direction: column">
+              <a-icon
+                type="pound"
+                style="color: rgba(255, 141, 26, 1); font-size: 18px"
+              /><a-button type="link"> 冲账 </a-button>
+            </div>
+          </div>
+        </div>
+        <a-divider />
+        <a-table
+          :columns="columns2"
+          :data-source="data2"
+          :pagination="false"
+          :scroll="{ y: 160, x: 500 }"
+          rowKey="id"
+          :rowSelection="{
+            selectedRowKeys: selectedRowKeys,
+            onChange: onSelectChange,
+          }"
+        />
+        <div
+          style="
+            color: rgba(255, 87, 51, 1);
+            font-weight: 600;
+            text-align: right;
+          "
+        >
+          合计收款：2922:00
+        </div>
+      </div>
+      <div style="width: 20%">
+        <h4 style="color: rgba(255, 141, 26, 1); font-weight: 600">财务汇总</h4>
+        <a-divider />
+        <a-descriptions :column="1">
+          <a-descriptions-item label="合计收款"> + 2500 </a-descriptions-item>
+          <a-descriptions-item label="合计消费">-2500 </a-descriptions-item>
+          <a-descriptions-item label="结账应退"> 0 </a-descriptions-item>
+        </a-descriptions>
+
+        <a-button @click="handleAdd" type="danger" style="margin-left: 100px"
+          >结账退款</a-button
+        >
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { httpAction, getAction } from "@/api/manage";
+import { validateDuplicateValue } from "@/utils/util";
+import moment from "moment";
+const columns = [
+  // {
+  //     title: "",
+  //     dataIndex: "key",
+  //     width: 20,
+  //   },
+  {
+    title: "房间号",
+    dataIndex: "name",
+    width: 80,
+  },
+  {
+    title: "费项",
+    dataIndex: "age",
+    width: 80,
+  },
+  {
+    title: "入账日期",
+    dataIndex: "address",
+    width: 100,
+  },
+  {
+    title: "单价",
+    dataIndex: "address2",
+    width: 60,
+  },
+  {
+    title: "优惠价",
+    dataIndex: "address3",
+    width: 80,
+  },
+  {
+    title: "数量",
+    dataIndex: "address4",
+    width: 60,
+  },
+  {
+    title: "小计",
+    dataIndex: "address5",
+    width: 60,
+  },
+];
+const columns2 = [
+  {
+    title: "入账时间",
+    dataIndex: "name",
+    width: 160,
+  },
+  {
+    title: "支付方式",
+    dataIndex: "age",
+    width: 100,
+  },
+  {
+    title: "备注",
+    dataIndex: "remark",
+    width: 120,
+  },
+  {
+    title: "金额",
+    dataIndex: "amount",
+    width: 60,
+  },
+];
+const data = [];
+for (let i = 0; i < 100; i++) {
+  data.push({
+    key: i,
+    name: `100${i}`,
+    age: "房费",
+    address: 280,
+  });
+}
+const data2 = [];
+for (let i = 0; i < 8; i++) {
+  data2.push({
+    key: i,
+    name: `2023-02-0${i} 10:52`,
+    age: "支付宝",
+    remark: "押金",
+    amount: 888,
+  });
+}
+export default {
+  name: "BusMeetingRoomForm",
+  components: {},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    return {
+      selectedRowKeys: [],
+      data,
+      columns,
+      data2,
+      columns2,
+      wakeList: [{}],
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        dateRange: [{ required: true, message: "请选择维修时间!" }],
+        remark: [{ required: true, message: "请输入维修原因!" }],
+      },
+      url: {
+        add: "/business/busMeetingRoom/add",
+        edit: "/business/busMeetingRoom/edit",
+        queryById: "/business/busMeetingRoom/queryById",
+      },
+    };
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled;
+    },
+  },
+  created() {
+    var _info = JSON.parse(localStorage.getItem("storeInfo"));
+    if (_info) {
+      this.model.hotelId = _info.id;
+    }
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    onSelectChange(selectedRowKeys, selectionRows) {
+      this.selectedRowKeys = selectedRowKeys;
+      this.selectionRows = selectionRows;
+    },
+    handleAdd() {},
+    puls() {
+      this.wakeList.push({});
+    },
+    remove(index) {
+      this.wakeList.splice(index, 1);
+    },
+    moment,
+    onChange(e) {
+      console.log(e);
+    },
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.visible = true;
+    },
+    submitForm() {
+      const that = this;
+      that.$message.warning("未实现");
+      return;
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true;
+          let httpurl = "";
+          let method = "";
+          if (!this.model.id) {
+            httpurl += this.url.add;
+            method = "post";
+          } else {
+            httpurl += this.url.edit;
+            method = "put";
+          }
+          httpAction(httpurl, this.model, method)
+            .then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit("ok");
+              } else {
+                that.$message.warning(res.message);
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false;
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+/deep/ .ant-btn-link {
+  flex: 1;
+  color: rgba(255, 141, 26, 1) !important;
+}
+.menu {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  color: #fff;
+  margin-top: 12px;
+}
+.dynamic-delete-button {
+  cursor: pointer;
+  position: relative;
+  /* top: 4px; */
+  margin-left: 5px;
+  font-size: 18px;
+  color: #1890ff;
+  transition: all 0.3s;
+}
+.dynamic-delete-button:hover {
+  color: #777;
+}
+.dynamic-delete-button[disabled] {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+/deep/.ant-table-thead > tr > th {
+  background: rgba(42, 130, 228, 1);
+  color: #ffffff;
+}
+/deep/.ant-divider-horizontal {
+  margin: 12px 0 !important;
+}
+/deep/ .ant-table-tbody .ant-table-row td {
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+/deep/.ant-table-thead > tr > th,
+.ant-table-tbody > tr > td {
+  padding: 5px 5px !important;
+  overflow-wrap: break-word;
+}
+</style>

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

@@ -0,0 +1,172 @@
+<template>
+  <j-modal
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <template slot="title">
+      <div
+        style="
+          display: flex;
+          background-color: rgba(255, 141, 26, 1);
+          height: 80px;
+        "
+      >
+        <div class="menu">
+          <a-icon
+            type="retweet"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 联房 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="shopping"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 增加消费 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="account-book"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 调价 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="container"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 自定义账单 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="printer"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 打印账单 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="message"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 客户留言 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="block"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 物品借用 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="pay-circle"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 结账退房 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="euro"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 先走不结 </a-button>
+        </div>
+        <div class="menu">
+          <a-icon
+            type="database"
+            style="color: #fff; font-size: 30px"
+          /><a-button type="link"> 房间日志 </a-button>
+        </div>
+      </div></template
+    >
+    <bill-room-info ref="realForm" @ok="submitCallback"></bill-room-info>
+  </j-modal>
+</template>
+
+<script>
+
+  import BillRoomInfo from './BillRoomInfo'
+  export default {
+    name: 'BillRoomInfoModal',
+    components: {
+      BillRoomInfo
+    },
+    data () {
+      return {
+        title:'',
+        width:1200,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+<style scoped>
+/deep/ .ant-btn-link {
+  flex: 1;
+  color: #fff;
+}
+.menu {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  color: #fff;
+  margin-top: 12px;
+}
+/deep/.ant-modal-header{
+  padding: 0 !important;
+  background-color: rgb(255, 141, 26);
+
+}
+/deep/.ant-modal-close{
+  color: #fff !important;
+}
+</style>
+<style scoped>
+/deep/.ant-modal-body {
+  padding: 12px;
+  max-height: calc(80vh - 150px);
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+  }
+ 
+  &::-webkit-scrollbar-thumb {
+    background: #e3e3e6;
+    border-radius: 6px;
+  }
+ 
+  &::-webkit-scrollbar-track {
+    background: transparent;
+    border-radius: 5px;
+  }
+}
+</style>

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

@@ -0,0 +1,93 @@
+<template>
+  <div class="editable-cell">
+    <div v-if="editable" class="editable-cell-input-wrapper">
+      <a-input-number
+        v-model="value"
+        @change="handleChange"
+        @pressEnter="check"
+        style="width: 70px;"
+      /><a-icon type="check" class="editable-cell-icon-check" @click="check" />
+    </div>
+    <div v-else class="editable-cell-text-wrapper">
+      {{ value || " " }}
+      <a-icon type="edit" class="editable-cell-icon" @click="edit" />
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "EditableCell",
+  components: {},
+  props: {
+    text: {
+      type: Number,
+      default:0
+    },
+  },
+  data() {
+    return {
+      value: this.text,
+      editable: false,
+    };
+  },
+  methods: {
+    handleChange(e) {
+      // const value = e.target.value;
+      // this.value = value;
+    },
+    check() {
+      this.editable = false;
+      this.$emit("change", this.value);
+    },
+    edit() {
+      this.editable = true;
+    },
+  },
+};
+</script>
+<style>
+.editable-cell {
+  position: relative;
+}
+
+.editable-cell-input-wrapper,
+.editable-cell-text-wrapper {
+  /* padding-right: 24px; */
+}
+
+.editable-cell-text-wrapper {
+  padding: 5px 24px 5px 5px;
+}
+
+.editable-cell-icon,
+.editable-cell-icon-check {
+  position: absolute;
+  right: 0;
+  width: 20px;
+  cursor: pointer;
+}
+
+.editable-cell-icon {
+  line-height: 18px;
+  /* display: none; */
+}
+
+.editable-cell-icon-check {
+  line-height: 28px;
+}
+
+.editable-cell:hover .editable-cell-icon {
+  display: inline-block;
+}
+
+.editable-cell-icon:hover,
+.editable-cell-icon-check:hover {
+  color: #108ee9;
+}
+
+.editable-add-btn {
+  margin-bottom: 8px;
+}
+</style>

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

@@ -0,0 +1,257 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model
+        ref="form"
+        :model="model"
+        :rules="validatorRules"
+        slot="detail"
+      >
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item
+              label="房型"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="roomType"
+            >
+              <a-checkbox-group
+                v-model="model.roomType"
+                :options="roomTypeOptions"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="房态"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="roomStatus"
+            >
+              <a-checkbox-group
+                v-model="model.roomStatus"
+                :options="roomStatusOptions"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="已选"
+              :labelCol="labelCol"
+              :wrapperCol="{
+                xs: { span: 24 },
+                sm: { span: 20 },
+              }"
+              prop="roomStatus"
+            >
+              <a-tag
+                color="blue"
+                closable
+                :visible="visible"
+                @close.stop="tagClose2(index, item.roomNo)"
+                v-for="(item, index) in model.rooms"
+                :key="index"
+                >{{ item.roomNo }}</a-tag
+              >
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="房间"
+              :labelCol="labelCol"
+              :wrapperCol="{
+                xs: { span: 24 },
+                sm: { span: 20 },
+              }"
+            >
+              <a-tabs
+                :default-active-key="0"
+                tab-position="left"
+                :style="{ height: '300px' }"
+              >
+                <a-tab-pane
+                  v-for="(room, index) in roomList"
+                  :key="index"
+                  :tab="room.key"
+                >
+                  <div
+                    id="components-grid-demo-playground"
+                    style="height: 300px; overflow: hidden auto"
+                  >
+                    <a-row :gutter="[8, 8]">
+                      <a-col
+                        :span="3"
+                        v-for="(r, rIndex) in room.child"
+                        :key="rIndex"
+                      >
+                        <div
+                          :class="[
+                            r.check == 1 ? 'check' : '',
+                            r.kz == 1 ? 'kz' : '',
+                          ]"
+                          @click="checkRoomClick(r)"
+                        >
+                          {{ r.roomNo }}
+                        </div></a-col
+                      >
+                    </a-row>
+                  </div>
+                </a-tab-pane>
+              </a-tabs>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+import { httpAction, getAction } from "@/api/manage";
+import { validateDuplicateValue } from "@/utils/util";
+export default {
+  name: "SelectRoomForm",
+  components: {},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    const rooms = [];
+    for (let i = 0; i < 100; i++) {
+      rooms.push({
+        id: "100" + i,
+        roomNo: 1000 + i,
+        check: 0,
+        kz: i == 1 ? 1 : 0,
+      });
+    }
+    const rooms2 = [];
+    for (let i = 0; i < 50; i++) {
+      rooms2.push({
+        id: "200" + i,
+        roomNo: 2000 + i,
+        check: 0,
+        kz: i == 5 ? 1 : 0,
+      });
+    }
+    return {
+      visible: true,
+      roomList: [
+        { key: "1层", child: rooms },
+        { key: "2层", child: rooms2 },
+      ],
+      roomTypeOptions: ["休闲家庭房", "特价房"],
+      roomStatusOptions: ["空净", "空脏"],
+      model: { rooms: [] },
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 2 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        dateRange: [{ required: true, message: "请选择维修时间!" }],
+        remark: [{ required: true, message: "请输入维修原因!" }],
+      },
+      url: {
+        add: "/business/busMeetingRoom/add",
+        edit: "/business/busMeetingRoom/edit",
+        queryById: "/business/busMeetingRoom/queryById",
+      },
+    };
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled;
+    },
+  },
+  created() {
+    var _info = JSON.parse(localStorage.getItem("storeInfo"));
+    if (_info) {
+      this.model.hotelId = _info.id;
+    }
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    checkRoomClick(row) {
+      if (row.check === 1) {
+        row.check = 0;
+        var index = this.model.rooms.findIndex((t) => t.key1 == row.key1);
+        this.model.rooms.splice(index, 1);
+      } else {
+        row.check = 1;
+        this.model.rooms.push(row);
+      }
+    },
+    tagClose2(index, key1) {
+      this.model.rooms.splice(index, 1);
+      this.roomList.some((t) => {
+        var r = t.child.some((c) => {
+          if (c.roomNo === key1) {
+            c.check = 0;
+            return true;
+          }
+          return false;
+        });
+        if (r === true) {
+          return true;
+        }
+      });
+    },
+    onChange(date, dateString) {
+      console.log(date, dateString);
+    },
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.visible = true;
+    },
+    submitForm() {
+      const that = this;
+      if (that.model.rooms.length === 0) {
+        that.$message.warning("请先选择房间");
+        return;
+      }
+      that.$emit("ok", that.model.rooms);
+    },
+  },
+};
+</script>
+<style scoped>
+#components-grid-demo-playground [class~="ant-col"] {
+  background: transparent;
+  border: 0;
+}
+#components-grid-demo-playground [class~="ant-col"] > div {
+  /* background: #00a0e9; */
+  height: 28px;
+  line-height: 28px;
+  font-size: 13px;
+  text-align: center;
+  cursor: pointer;
+  border-radius: 5px;
+}
+#components-grid-demo-playground .check {
+  border: 1px solid #00a0e9;
+}
+#components-grid-demo-playground .kz {
+  background: rgba(166, 166, 166, 1);
+}
+#components-grid-demo-playground pre {
+  background: #f9f9f9;
+  border-radius: 6px;
+  font-size: 13px;
+  padding: 8px 16px;
+}
+</style>

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

@@ -0,0 +1,65 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <select-room-form
+      ref="realForm"
+      @ok="submitCallback"
+      :disabled="disableSubmit"
+    ></select-room-form>
+  </j-modal>
+</template>
+
+<script>
+import SelectRoomForm from "./SelectRoomForm";
+export default {
+  name: "SelectRoomFormModal",
+  components: {
+    SelectRoomForm,
+  },
+  data() {
+    return {
+      title: "",
+      width: 800,
+      visible: false,
+      disableSubmit: false,
+    };
+  },
+  methods: {
+    add() {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.add();
+      });
+    },
+    edit(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      });
+    },
+    close() {
+      this.$emit("close");
+      this.visible = false;
+    },
+    handleOk() {
+      this.$refs.realForm.submitForm();
+    },
+    submitCallback(e) {
+      console.log("e", e);
+      this.$emit("ok", e);
+      this.visible = false;
+    },
+    handleCancel() {
+      this.close();
+    },
+  },
+};
+</script>

src/views/room/modules/schedule/ScheduleRoomForm.vue

@@ -0,0 +1,492 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model
+        ref="form"
+        :model="model"
+        :rules="validatorRules"
+        slot="detail"
+      >
+        <a-row>
+          <div style="display: flex; gap: 15px">
+            <div style="width: 39%">
+              <h4 style="color: rgba(255, 141, 26, 1); font-weight: 600">
+                订价信息
+              </h4>
+              <a-divider />
+              <a-col :span="24">
+                <a-form-model-item
+                  label="入住类型"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-select placeholder="入住类型">
+                    <a-select-option value="全天"> 全天 </a-select-option>
+                    <a-select-option value="钟点"> 钟点 </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+
+              <a-col :span="24">
+                <a-form-model-item
+                  label="预抵时间"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <j-date
+                    placeholder="预抵时间"
+                    v-model="model.endTime"
+                    style="width: 180px"
+                  />
+                  <a-time-picker
+                    style="width: 80px; margin-left: 2px"
+                    :default-value="moment('18:00', 'HH:mm')"
+                    format="HH:mm"
+                  />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="预离时间"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <j-date
+                    placeholder="预离时间"
+                    v-model="model.endTime"
+                    style="width: 180px"
+                  />
+                  <a-time-picker
+                    style="width: 80px; margin-left: 2px"
+                    :default-value="moment('12:00', 'HH:mm')"
+                    format="HH:mm"
+                  />
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="客人来源"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-select placeholder="订单来源">
+                    <a-select-option value="散客"> 散客 </a-select-option>
+                    <a-select-option value="美团"> 美团 </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="天数"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-input-number
+                    v-model="model.userName"
+                    placeholder="天数"
+                    :min="1"
+                  ></a-input-number>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="预定方式"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-select placeholder="预定方式">
+                    <a-select-option value="美团酒店">
+                      美团酒店
+                    </a-select-option>
+                    <a-select-option value="携程酒店">
+                      携程酒店
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="客人类型"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-select placeholder="客人类型">
+                    <a-select-option value="散客"> 散客 </a-select-option>
+                    <a-select-option value="会员"> 会员 </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="房价方案"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-select placeholder="房价方案">
+                    <a-select-option value="会员价"> 会员价 </a-select-option>
+                    <a-select-option value="平日价"> 平日价 </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <h4 style="color: rgba(255, 141, 26, 1); font-weight: 600">
+                其他信息
+              </h4>
+              <a-divider />
+              <a-col :span="24">
+                <a-form-model-item
+                  label="联系人"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-auto-complete
+                    v-model="model.key1"
+                    placeholder="联系人"
+                    @search="handleSearch"
+                    @select="(e) => handleSelectMember(e)"
+                  >
+                    <template slot="dataSource">
+                      <a-select-option v-for="item in result" :key="item">{{
+                        item
+                      }}</a-select-option>
+                    </template>
+                  </a-auto-complete>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="电话"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-input v-model="model.mobile" placeholder="电话"></a-input>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="担保方式"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-select placeholder="担保方式">
+                    <a-select-option value="无担保"> 无担保 </a-select-option>
+                    <a-select-option value="有担保"> 有担保 </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="销售员"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-select placeholder="销售员">
+                    <a-select-option value="a"> a </a-select-option>
+                    <a-select-option value="b"> b </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="外部单号"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="sex"
+                >
+                  <a-input
+                    v-model="model.mobile"
+                    placeholder="外部单号"
+                  ></a-input>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="24">
+                <a-form-model-item
+                  label="备注"
+                  :labelCol="labelCol"
+                  :wrapperCol="wrapperCol"
+                  prop="remark"
+                >
+                  <a-textarea
+                    v-model="model.remark"
+                    rows="4"
+                    placeholder="备注"
+                  />
+                </a-form-model-item>
+              </a-col>
+            </div>
+            <div style="width: 61%">
+              <h4 style="color: rgba(255, 141, 26, 1); font-weight: 600">
+                选择房间
+              </h4>
+              <a-divider />
+              <p>
+                <span>占房天数：1晚</span>
+                <span style="padding-left: 10px">总价：599.00</span>
+              </p>
+              <a-table
+                :columns="columns"
+                :data-source="model.data"
+                :pagination="false"
+                rowKey="id"
+              >
+                <div
+                  slot="expandedRowRender"
+                  slot-scope="text, record, index"
+                  style="margin: 0"
+                >
+                  <p>
+                    已排房：<a-tag
+                      color="blue"
+                      closable
+                      :visible="visible"
+                      @close.stop="tagClose2(rindex, index)"
+                      v-for="(item, rindex) in text.rooms"
+                      :key="rindex"
+                      >{{ item.roomNo }}</a-tag
+                    >
+                  </p>
+                  <p>未排房：0间</p>
+                </div>
+                <template slot="key3" slot-scope="text, record, index">
+                  <editable-cell
+                    :text="text"
+                    @change="onCellChange('key3', index, $event)"
+                  />
+                </template>
+                <template slot="key6" slot-scope="text, record, index">
+                  <div>
+                    <a-input-number v-model="model.data[index].key6" :min="0" />
+                  </div>
+                </template>
+                <span slot="action" slot-scope="text, record, index">
+                  <a @click="pulsRoom(index)">排房</a>
+                </span>
+              </a-table>
+            </div>
+          </div>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+    <select-room-form-modal
+      ref="modalSelectRoomForm"
+      @ok="modalFormOk"
+    ></select-room-form-modal>
+  </a-spin>
+</template>
+
+<script>
+import { httpAction, getAction } from "@/api/manage";
+import { validateDuplicateValue } from "@/utils/util";
+import moment from "moment";
+import EditableCell from "@views/room/modules/checkIn/EditableCell.vue";
+import SelectRoomFormModal from "./SelectRoomFormModal.vue";
+const columns = [
+  // {
+  //     title: "",
+  //     dataIndex: "key",
+  //     width: 20,
+  //   },
+  {
+    title: "房型",
+    dataIndex: "key1",
+    width: 150,
+  },
+  {
+    title: "门市价",
+    dataIndex: "key2",
+    width: 100,
+  },
+  {
+    title: "优惠价",
+    dataIndex: "key3",
+    width: 120,
+    scopedSlots: { customRender: "key3" },
+  },
+  {
+    title: "可订数/可超数",
+    dataIndex: "key4",
+    width: 170,
+    customRender: function (text, record) {
+      return text + "/" + record.key5;
+    },
+  },
+  {
+    title: "预定间数",
+    dataIndex: "key6",
+    width: 100,
+    scopedSlots: { customRender: "key6" },
+  },
+  {
+    title: "操作",
+    dataIndex: "action",
+    align: "center",
+    fixed: "right",
+    width: 70,
+    scopedSlots: { customRender: "action" },
+  },
+];
+const data = [];
+for (let i = 0; i < 2; i++) {
+  data.push({
+    id: i,
+    key1: `双人床` + i,
+    key2: 298,
+    key3: 298,
+    key4: 8,
+    key5: 0,
+    key6: 0,
+  });
+}
+export default {
+  name: "ScheduleRoomForm",
+  components: { EditableCell, SelectRoomFormModal },
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    return {
+      visible: true,
+      columns,
+      model: { data: data },
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        dateRange: [{ required: true, message: "请选择维修时间!" }],
+        remark: [{ required: true, message: "请输入维修原因!" }],
+      },
+      url: {
+        add: "/business/busMeetingRoom/add",
+        edit: "/business/busMeetingRoom/edit",
+        queryById: "/business/busMeetingRoom/queryById",
+      },
+      result: [],
+      selectIndex: 0,
+    };
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled;
+    },
+  },
+  created() {
+    var _info = JSON.parse(localStorage.getItem("storeInfo"));
+    if (_info) {
+      this.model.hotelId = _info.id;
+    }
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    tagClose2(rindex, index) {
+      this.model.data[index].rooms.splice(rindex, 1);
+    },
+    modalFormOk(e) {
+      // this.modelDefault = Object.assign({}, this.modelDefault, {
+      //   rooms: e,
+      // });
+      // this.edit(this.modelDefault);
+      this.$set(this.model.data[this.selectIndex], "rooms", e);
+    },
+    pulsRoom(index) {
+      this.selectIndex = index;
+      this.$refs.modalSelectRoomForm.add();
+      this.$refs.modalSelectRoomForm.title = "排房";
+      this.$refs.modalSelectRoomForm.disableSubmit = false;
+    },
+    handleSearch(value) {
+      let result;
+      if (!value) {
+        result = [];
+      } else {
+        result = ["a", "b", "c"].map(
+          (domain) => `${value}${domain}(15888888888)`
+        );
+      }
+      this.result = result;
+    },
+    handleSelectMember(e) {
+      this.model.mobile = "158888888888";
+    },
+    moment,
+    onChange(date, dateString) {
+      console.log(date, dateString);
+    },
+    add() {
+      this.edit(this.modelDefault);
+    },
+    addList(roomLiveList) {
+      this.modelDefault = Object.assign({}, this.modelDefault, {
+        rooms: roomLiveList,
+      });
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.visible = true;
+    },
+    submitForm() {
+      const that = this;
+      that.$message.warning("未实现");
+      return;
+      // 触发表单验证
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          that.confirmLoading = true;
+          let httpurl = "";
+          let method = "";
+          if (!this.model.id) {
+            httpurl += this.url.add;
+            method = "post";
+          } else {
+            httpurl += this.url.edit;
+            method = "put";
+          }
+          httpAction(httpurl, this.model, method)
+            .then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit("ok");
+              } else {
+                that.$message.warning(res.message);
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false;
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+/deep/.ant-divider-horizontal {
+  margin: 12px 0 !important;
+}
+/deep/ .ant-form-item {
+  margin-bottom: 5px !important;
+}
+</style>

src/views/room/modules/schedule/ScheduleRoomModal.vue

@@ -0,0 +1,88 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <schedule-room-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></schedule-room-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ScheduleRoomForm from './ScheduleRoomForm'
+  export default {
+    name: 'ScheduleRoomModal',
+    components: {
+      ScheduleRoomForm
+    },
+    data () {
+      return {
+        title:'',
+        width:1300,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      addList(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.addList(record);
+      });
+    },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+<style scoped>
+/deep/.ant-modal-body {
+  padding: 12px;
+  max-height: calc(80vh - 150px);
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    width: 6px;
+    /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #e3e3e6;
+    border-radius: 6px;
+  }
+
+  &::-webkit-scrollbar-track {
+    background: transparent;
+    border-radius: 5px;
+  }
+}
+</style>

src/views/room/modules/schedule/SelectRoomForm.vue

@@ -0,0 +1,266 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model
+        ref="form"
+        :model="model"
+        :rules="validatorRules"
+        slot="detail"
+      >
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item
+              label="房型"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="roomType"
+            >
+              <a-checkbox-group
+                v-model="model.roomType"
+                :options="roomTypeOptions"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="房态"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="roomStatus"
+            >
+              <a-checkbox-group
+                v-model="model.roomStatus"
+                :options="roomStatusOptions"
+              />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+            label="已排房"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+            >
+            {{model.rooms.length||0}}/1间
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="已选"
+              :labelCol="labelCol"
+              :wrapperCol="{
+                xs: { span: 24 },
+                sm: { span: 20 },
+              }"
+              prop="roomStatus"
+            >
+              <a-tag
+                color="blue"
+                closable
+                :visible="visible"
+                @close.stop="tagClose2(index, item.roomNo)"
+                v-for="(item, index) in model.rooms"
+                :key="index"
+                >{{ item.roomNo }}</a-tag
+              >
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="房间"
+              :labelCol="labelCol"
+              :wrapperCol="{
+                xs: { span: 24 },
+                sm: { span: 20 },
+              }"
+            >
+              <a-tabs
+                :default-active-key="0"
+                tab-position="left"
+                :style="{ height: '300px' }"
+              >
+                <a-tab-pane
+                  v-for="(room, index) in roomList"
+                  :key="index"
+                  :tab="room.key"
+                >
+                  <div
+                    id="components-grid-demo-playground"
+                    style="height: 300px; overflow: hidden auto"
+                  >
+                    <a-row :gutter="[8, 8]">
+                      <a-col
+                        :span="3"
+                        v-for="(r, rIndex) in room.child"
+                        :key="rIndex"
+                      >
+                        <div
+                          :class="[
+                            r.check == 1 ? 'check' : '',
+                            r.kz == 1 ? 'kz' : '',
+                          ]"
+                          @click="checkRoomClick(r)"
+                        >
+                          {{ r.roomNo }}
+                        </div></a-col
+                      >
+                    </a-row>
+                  </div>
+                </a-tab-pane>
+              </a-tabs>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+import { httpAction, getAction } from "@/api/manage";
+import { validateDuplicateValue } from "@/utils/util";
+export default {
+  name: "SelectRoomForm",
+  components: {},
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false,
+    },
+  },
+  data() {
+    const rooms = [];
+    for (let i = 0; i < 100; i++) {
+      rooms.push({
+        id: "100" + i,
+        roomNo: 1000 + i,
+        check: 0,
+        kz: i == 1 ? 1 : 0,
+      });
+    }
+    const rooms2 = [];
+    for (let i = 0; i < 50; i++) {
+      rooms2.push({
+        id: "200" + i,
+        roomNo: 2000 + i,
+        check: 0,
+        kz: i == 5 ? 1 : 0,
+      });
+    }
+    return {
+      visible: true,
+      roomList: [
+        { key: "1层", child: rooms },
+        { key: "2层", child: rooms2 },
+      ],
+      roomTypeOptions: ["休闲家庭房", "特价房"],
+      roomStatusOptions: ["空净", "空脏"],
+      model: { rooms: [] },
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 2 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
+      confirmLoading: false,
+      validatorRules: {
+        dateRange: [{ required: true, message: "请选择维修时间!" }],
+        remark: [{ required: true, message: "请输入维修原因!" }],
+      },
+      url: {
+        add: "/business/busMeetingRoom/add",
+        edit: "/business/busMeetingRoom/edit",
+        queryById: "/business/busMeetingRoom/queryById",
+      },
+    };
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled;
+    },
+  },
+  created() {
+    var _info = JSON.parse(localStorage.getItem("storeInfo"));
+    if (_info) {
+      this.model.hotelId = _info.id;
+    }
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    checkRoomClick(row) {
+      if (row.check === 1) {
+        row.check = 0;
+        var index = this.model.rooms.findIndex((t) => t.key1 == row.key1);
+        this.model.rooms.splice(index, 1);
+      } else {
+        row.check = 1;
+        this.model.rooms.push(row);
+      }
+    },
+    tagClose2(index, key1) {
+      this.model.rooms.splice(index, 1);
+      this.roomList.some((t) => {
+        var r = t.child.some((c) => {
+          if (c.roomNo === key1) {
+            c.check = 0;
+            return true;
+          }
+          return false;
+        });
+        if (r === true) {
+          return true;
+        }
+      });
+    },
+    onChange(date, dateString) {
+      console.log(date, dateString);
+    },
+    add() {
+      this.edit(this.modelDefault);
+    },
+    edit(record) {
+      this.model = Object.assign({}, record);
+      this.visible = true;
+    },
+    submitForm() {
+      const that = this;
+      if (that.model.rooms.length === 0) {
+        that.$message.warning("请先选择房间");
+        return;
+      }
+      that.$emit("ok", that.model.rooms);
+    },
+  },
+};
+</script>
+<style scoped>
+#components-grid-demo-playground [class~="ant-col"] {
+  background: transparent;
+  border: 0;
+}
+#components-grid-demo-playground [class~="ant-col"] > div {
+  /* background: #00a0e9; */
+  height: 28px;
+  line-height: 28px;
+  font-size: 13px;
+  text-align: center;
+  cursor: pointer;
+  border-radius: 5px;
+}
+#components-grid-demo-playground .check {
+  border: 1px solid #00a0e9;
+}
+#components-grid-demo-playground .kz {
+  background: rgba(166, 166, 166, 1);
+}
+#components-grid-demo-playground pre {
+  background: #f9f9f9;
+  border-radius: 6px;
+  font-size: 13px;
+  padding: 8px 16px;
+}
+</style>

src/views/room/modules/schedule/SelectRoomFormModal.vue

@@ -0,0 +1,65 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <select-room-form
+      ref="realForm"
+      @ok="submitCallback"
+      :disabled="disableSubmit"
+    ></select-room-form>
+  </j-modal>
+</template>
+
+<script>
+import SelectRoomForm from "./SelectRoomForm";
+export default {
+  name: "SelectRoomFormModal",
+  components: {
+    SelectRoomForm,
+  },
+  data() {
+    return {
+      title: "",
+      width: 800,
+      visible: false,
+      disableSubmit: false,
+    };
+  },
+  methods: {
+    add() {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.add();
+      });
+    },
+    edit(record) {
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs.realForm.edit(record);
+      });
+    },
+    close() {
+      this.$emit("close");
+      this.visible = false;
+    },
+    handleOk() {
+      this.$refs.realForm.submitForm();
+    },
+    submitCallback(e) {
+      console.log("e", e);
+      this.$emit("ok", e);
+      this.visible = false;
+    },
+    handleCancel() {
+      this.close();
+    },
+  },
+};
+</script>

src/views/settings/components/modules/payInterfaceConfigForm.vue

@@ -0,0 +1,165 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="关联支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTypeId">
+<!--              <a-input v-model="model.payTypeId" placeholder="请输入关联支付方式"  ></a-input>-->
+              <a-select
+                      v-model="model.payTypeId"
+                      placeholder="请选择支付方式"
+                      :allowClear="true"
+              >
+                <a-select-option :value="item.id" v-for="(item,index) in payTypeList" :key="index">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="merchantNo">
+              <a-input v-model="model.merchantNo" placeholder="请输入商户号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="终端号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="terminalNo">
+              <a-input v-model="model.terminalNo" placeholder="请输入终端号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="TOKEN令牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="token">
+              <a-input v-model="model.token" placeholder="请输入TOKEN令牌"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <a-select v-model="model.status" style="width: 100%">
+                <a-select-option value="0">关闭</a-select-option>
+                <a-select-option value="1">启用</a-select-option>
+              </a-select>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'payInterfaceConfigForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+          status: [
+              { required: true, message: '请选择是否启用!'},
+           ],
+           payTypeId: [
+              { required: true, message: '请输入关联支付方式!'},
+           ],
+           merchantNo: [
+              { required: true, message: '请输入商户号!'},
+           ],
+           terminalNo: [
+              { required: true, message: '请输入终端号!'},
+           ],
+           token: [
+              { required: true, message: '请输入TOKEN令牌!'},
+           ],
+        },
+        url: {
+          add: "/business/busPayInterfaceConfig/add",
+          edit: "/business/busPayInterfaceConfig/edit",
+          queryById: "/business/busPayInterfaceConfig/queryById",
+          query_payType: "/business/busRoomPayType/queryList",
+        },
+        payTypeList:[]
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      getAction(this.url.query_payType,{}).then((res)=>{
+        if(res.success){
+          this.payTypeList = res.result
+        }else{
+
+        }
+      })
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        if(!this.model.id){
+          this.model.status = "1";
+        }else{
+          this.model.status = record.status.toString();
+        }
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+              var info = JSON.parse(localStorage.getItem("storeInfo"));
+              this.model.hotelId = info.id;
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
+</script>

src/views/settings/components/modules/payInterfaceConfigModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <pay-interface-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-interface-config-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import payInterfaceConfigForm from './payInterfaceConfigForm'
+
+  export default {
+    name: 'payInterfaceConfigModal',
+    components: {
+      payInterfaceConfigForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

src/views/settings/components/modules/payInterfaceConfigModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <pay-interface-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-interface-config-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import payInterfaceConfigForm from './payInterfaceConfigForm'
+  export default {
+    name: 'payInterfaceConfigModal',
+    components: {
+      payInterfaceConfigForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/settings/components/modules/waiterForm.vue

@@ -13,6 +13,16 @@
               <a-input v-model="model.name" placeholder="请输入服务员姓名"  ></a-input>
             </a-form-model-item>
           </a-col>
+            <a-col :span="24">
+                <a-form-model-item label="身份证号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idCard">
+                    <a-input v-model="model.idCard" placeholder="请输入身份证号"  ></a-input>
+                </a-form-model-item>
+            </a-col>
+            <a-col :span="24">
+                <a-form-model-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+                    <a-input v-model="model.phone" placeholder="请输入手机号"  ></a-input>
+                </a-form-model-item>
+            </a-col>
           <a-col :span="24">
             <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
 <!--              <a-input-number v-model="model.sex" placeholder="请输入性别(0-默认未知,1-男,2-女)" style="width: 100%" />-->
@@ -45,112 +55,116 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'waiterForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-          workNo: [
-              { required: true, message: '请输入服务员工号!'},
-           ],
-          name: [
-            { required: true, message: '请输入服务员姓名!'},
-          ],
-          sex: [
-            { required: true, message: '请选择服务员性别!'},
-          ],
-          status: [
-              { required: true, message: '请选择服务员是否有效!'},
-           ],
-        },
-        url: {
-          add: "/business/busWaiter/add",
-          edit: "/business/busWaiter/edit",
-          queryById: "/business/busWaiter/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
+      name: 'waiterForm',
+      components: {},
+      props: {
+          //表单禁用
+          disabled: {
+              type: Boolean,
+              default: false,
+              required: false
+          }
       },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        //初始化默认值
-        this.edit(this.modelDefault);
-        this.edit({status:true });
+      data() {
+          return {
+              model: {},
+              labelCol: {
+                  xs: {span: 24},
+                  sm: {span: 5},
+              },
+              wrapperCol: {
+                  xs: {span: 24},
+                  sm: {span: 16},
+              },
+              confirmLoading: false,
+              validatorRules: {
+                  workNo: [
+                      {required: true, message: '请输入服务员工号!'},
+                  ],
+                  name: [
+                      {required: true, message: '请输入服务员姓名!'},
+                  ],
+                  idCard: [
+                      {required: true, message: '请输入身份证号!'},
+                  ],
+                  phone: [
+                      {required: true, message: '请输入手机号!'},
+                  ],
+                  sex: [
+                      {required: true, message: '请选择服务员性别!'},
+                  ],
+                  status: [
+                      {required: true, message: '请选择服务员是否有效!'},
+                  ],
+              },
+              url: {
+                  add: "/business/busWaiter/add",
+                  edit: "/business/busWaiter/edit",
+                  queryById: "/business/busWaiter/queryById"
+              }
+          }
       },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        if (this.model.status == 1){
-          this.model.status = true;
-        }else {
-          this.model.status = false;
-        }
-
+      computed: {
+          formDisabled() {
+              return this.disabled
+          },
       },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              var info = JSON.parse(localStorage.getItem("storeInfo"));
-              this.model.hotelId = info.id;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            if (this.model.status){
-              this.model.status = 1;
-            }else {
-              this.model.status = 0;
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
+      created() {
+          //备份model原始值
+          this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      },
+      methods: {
+          add() {
+              //初始化默认值
+              this.edit(this.modelDefault);
+              this.edit({status: true});
+          },
+          edit(record) {
+              this.model = Object.assign({}, record);
+              this.visible = true;
+              if (record.status == 1) {
+                  this.model.status = true;
+              } else {
+                  this.model.status = false;
               }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
 
-        })
-      },
-    }
+          },
+          submitForm() {
+              const that = this;
+              // 触发表单验证
+              this.$refs.form.validate(valid => {
+                  if (valid) {
+                      that.confirmLoading = true;
+                      let httpurl = '';
+                      let method = '';
+                      if (!this.model.id) {
+                          httpurl += this.url.add;
+                          var info = JSON.parse(localStorage.getItem("storeInfo"));
+                          this.model.hotelId = info.id;
+                          method = 'post';
+                      } else {
+                          httpurl += this.url.edit;
+                          method = 'put';
+                      }
+                      if (this.model.status) {
+                          this.model.status = 1;
+                      } else {
+                          this.model.status = 0;
+                      }
+                      httpAction(httpurl, this.model, method).then((res) => {
+                          if (res.success) {
+                              that.$message.success(res.message);
+                              that.$emit('ok');
+                          } else {
+                              that.$message.warning(res.message);
+                          }
+                      }).finally(() => {
+                          that.confirmLoading = false;
+                      })
+                  }
+
+              })
+          },
+      }
   }
 </script>

src/views/settings/components/payApiSettings.vue

@@ -1,135 +1,389 @@
+<!--<template>-->
+<!--    <a-spin :spinning="confirmLoading">-->
+<!--        <j-form-container :disabled="formDisabled">-->
+<!--            <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">-->
+<!--                <a-form-item v-show="false"><a-input v-model="model.id"/></a-form-item>-->
+<!--                <a-row>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">-->
+<!--                            <a-select v-model="model.status" style="width: 100%">-->
+<!--                                <a-select-option value="0">关闭</a-select-option>-->
+<!--                                <a-select-option value="1">启用</a-select-option>-->
+<!--                                &lt;!&ndash;                                <a-select-option v-for="(item,index) in cardinalList" style="width: 100%"&ndash;&gt;-->
+<!--                                &lt;!&ndash;                                                 :key="index" :value="item.value">{{ item.text || item.label }}</a-select-option>&ndash;&gt;&ndash;&gt;-->
+<!--                            </a-select>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="绑定" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTypeId">-->
+<!--                            <a-select-->
+<!--                                    v-model="model.payTypeId"-->
+<!--                                    placeholder="请选择支付方式"-->
+<!--                                    :allowClear="true"-->
+<!--                            >-->
+<!--                                <a-select-option :value="item.id" v-for="(item,index) in payTypeList" :key="index">{{ item.name }}</a-select-option>-->
+<!--                            </a-select>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="商户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="merchantNo">-->
+<!--                            <a-input v-model="model.merchantNo" placeholder="请输入商户号"  ></a-input>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="终端号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="terminalNo">-->
+<!--                            <a-input v-model="model.terminalNo" placeholder="请输入终端号"  ></a-input>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                    <a-col :span="24">-->
+<!--                        <a-form-model-item label="TOKEN令牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="token">-->
+<!--                            <a-input v-model="model.token" placeholder="请输入TOKEN令牌"  ></a-input>-->
+<!--                        </a-form-model-item>-->
+<!--                    </a-col>-->
+<!--                </a-row>-->
+<!--                <a-button type="primary" @click="submitForm">确定</a-button>-->
+<!--            </a-form-model>-->
+<!--        </j-form-container>-->
+<!--    </a-spin>-->
+<!--</template>-->
+
+<!--<script>-->
+
+<!--    import { httpAction, getAction } from '@/api/manage'-->
+<!--    import { validateDuplicateValue } from '@/utils/util'-->
+<!--    import {getPayApiConfigInfo} from "../../../api/api";-->
+
+<!--    export default {-->
+<!--        name: 'payApiSettings',-->
+<!--        components: {-->
+<!--        },-->
+<!--        props: {-->
+<!--            //表单禁用-->
+<!--            disabled: {-->
+<!--                type: Boolean,-->
+<!--                default: false,-->
+<!--                required: false-->
+<!--            }-->
+<!--        },-->
+<!--        data () {-->
+<!--            return {-->
+<!--                model:{-->
+<!--                },-->
+<!--                labelCol: {-->
+<!--                    xs: { span: 24 },-->
+<!--                    sm: { span: 3 },-->
+<!--                },-->
+<!--                wrapperCol: {-->
+<!--                    xs: { span: 24 },-->
+<!--                    sm: { span: 20 },-->
+<!--                },-->
+<!--                confirmLoading: false,-->
+<!--                validatorRules: {-->
+<!--                    status: [-->
+<!--                        { required: true, message: '请选择是否启用!'},-->
+<!--                    ],-->
+<!--                    payTypeId: [-->
+<!--                        { required: true, message: '请选择关联支付方式!'},-->
+<!--                    ],-->
+<!--                    merchantNo: [-->
+<!--                        { required: true, message: '请输入商户号!'},-->
+<!--                    ],-->
+<!--                    terminalNo: [-->
+<!--                        { required: true, message: '请输入终端号!'},-->
+<!--                    ],-->
+<!--                    token: [-->
+<!--                        { required: true, message: '请输入TOKEN令牌!'},-->
+<!--                    ],-->
+<!--                },-->
+<!--                url: {-->
+<!--                    add: "/business/busPayInterfaceConfig/add",-->
+<!--                    edit: "/business/busPayInterfaceConfig/edit",-->
+<!--                    query_payType: "/business/busRoomPayType/queryList",-->
+<!--                },-->
+<!--                payTypeList:[]-->
+<!--            }-->
+<!--        },-->
+<!--        computed: {-->
+<!--            formDisabled(){-->
+<!--                return this.disabled-->
+<!--            },-->
+<!--        },-->
+<!--        created () {-->
+<!--            //备份model原始值-->
+<!--            this.modelDefault = JSON.parse(JSON.stringify(this.model));-->
+<!--            var _info = JSON.parse(localStorage.getItem("storeInfo"));-->
+<!--            setTimeout(() => {-->
+<!--                getPayApiConfigInfo({-->
+<!--                }).then(res => {-->
+<!--                    console.log(res)-->
+<!--                    if (res.code == 200 && res.result ) {-->
+<!--                        var info = res.result-->
+<!--                        this.model = {-->
+<!--                            id: info.id,-->
+<!--                            status :info.status.toString(),-->
+<!--                            payTypeId:info.payTypeId,-->
+<!--                            merchantNo:info.merchantNo,-->
+<!--                            terminalNo:info.terminalNo,-->
+<!--                            token:info.token-->
+<!--                        };-->
+<!--                    }-->
+<!--                })-->
+<!--            }, 100)-->
+
+<!--            getAction(this.url.query_payType,{}).then((res)=>{-->
+<!--                if(res.success){-->
+<!--                    this.payTypeList = res.result-->
+<!--                }else{-->
+
+<!--                }-->
+<!--            })-->
+<!--        },-->
+<!--        methods: {-->
+<!--            add () {-->
+<!--                this.edit(this.modelDefault);-->
+<!--            },-->
+<!--            edit (record) {-->
+<!--                this.model = Object.assign({}, record);-->
+<!--                this.visible = true;-->
+<!--            },-->
+<!--            submitForm () {-->
+<!--                const that = this;-->
+<!--                // 触发表单验证-->
+<!--                this.$refs.form.validate(valid => {-->
+<!--                    if (valid) {-->
+<!--                        that.confirmLoading = true;-->
+<!--                        let httpurl = '';-->
+<!--                        let method = '';-->
+<!--                        if(!this.model.id){-->
+<!--                            httpurl+=this.url.add;-->
+<!--                            method = 'post';-->
+<!--                            var info = JSON.parse(localStorage.getItem("storeInfo"));-->
+<!--                            this.model.hotelId = info.id;-->
+<!--                        }else{-->
+<!--                            httpurl+=this.url.edit;-->
+<!--                            method = 'put';-->
+<!--                        }-->
+<!--                        httpAction(httpurl,this.model,method).then((res)=>{-->
+<!--                            if(res.success){-->
+<!--                                that.$message.success(res.message);-->
+<!--                                that.$emit('ok');-->
+<!--                                that.model.id = res.result.id-->
+<!--                            }else{-->
+<!--                                that.$message.warning(res.message);-->
+<!--                            }-->
+<!--                        }).finally(() => {-->
+<!--                            that.confirmLoading = false;-->
+<!--                        })-->
+<!--                    }-->
+
+<!--                })-->
+<!--            },-->
+<!--        }-->
+<!--    }-->
+<!--</script>-->
+
 <template>
-    <a-spin :spinning="confirmLoading">
-        <j-form-container :disabled="formDisabled">
-            <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-                <a-form-item v-show="false"><a-input v-model="model.id"/></a-form-item>
-                <a-row>
-                    <a-col :span="24">
-                        <a-form-model-item label="是否启用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-                            <a-select v-model="model.status" style="width: 100%">
-                                <a-select-option value="0">关闭</a-select-option>
-                                <a-select-option value="1">启用</a-select-option>
-                                <!--                                <a-select-option v-for="(item,index) in cardinalList" style="width: 100%"-->
-                                <!--                                                 :key="index" :value="item.value">{{ item.text || item.label }}</a-select-option>&ndash;&gt;-->
-                            </a-select>
-                        </a-form-model-item>
-                    </a-col>
-                    <a-col :span="24">
-                        <a-form-model-item label="绑定" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTypeId">
+    <a-card :bordered="false">
+        <!-- 查询区域 -->
+        <div class="table-page-search-wrapper">
+            <a-form layout="inline" @keyup.enter.native="searchQuery">
+                <a-row :gutter="24">
+                    <a-col :md="6" :sm="8">
+                        <a-form-item>
                             <a-select
-                                    v-model="model.payTypeId"
-                                    placeholder="请选择支付方式"
+                                    v-model="queryParam.payTypeId"
+                                    placeholder="请选择"
                                     :allowClear="true"
                             >
                                 <a-select-option :value="item.id" v-for="(item,index) in payTypeList" :key="index">{{ item.name }}</a-select-option>
                             </a-select>
-                        </a-form-model-item>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="4" :sm="6">
+                        <a-form-item>
+                            <j-input placeholder="请输入商户号" v-model="queryParam.merchantNo"></j-input>
+                        </a-form-item>
                     </a-col>
-                    <a-col :span="24">
-                        <a-form-model-item label="商户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="merchantNo">
-                            <a-input v-model="model.merchantNo" placeholder="请输入商户号"  ></a-input>
-                        </a-form-model-item>
+                    <a-col :md="4" :sm="6">
+                        <a-form-item>
+                            <j-input placeholder="请输入终端号" v-model="queryParam.terminalNo"></j-input>
+                        </a-form-item>
                     </a-col>
-                    <a-col :span="24">
-                        <a-form-model-item label="终端号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="terminalNo">
-                            <a-input v-model="model.terminalNo" placeholder="请输入终端号"  ></a-input>
-                        </a-form-model-item>
+                    <a-col :md="4" :sm="6">
+                        <a-form-item>
+                            <j-input placeholder="请输入TOKEN令牌" v-model="queryParam.token"></j-input>
+                        </a-form-item>
                     </a-col>
-                    <a-col :span="24">
-                        <a-form-model-item label="TOKEN令牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="token">
-                            <a-input v-model="model.token" placeholder="请输入TOKEN令牌"  ></a-input>
-                        </a-form-model-item>
+                    <a-col :md="4" :sm="6">
+                        <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                        </span>
                     </a-col>
                 </a-row>
-                <a-button type="primary" @click="submitForm">确定</a-button>
-            </a-form-model>
-        </j-form-container>
-    </a-spin>
+            </a-form>
+        </div>
+        <!-- 查询区域-END -->
+
+        <!-- 操作按钮区域 -->
+        <div class="table-operator">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--            <a-button type="primary" icon="download" @click="handleExportXls('支付接口配置')">导出</a-button>-->
+<!--            <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--                <a-button type="primary" icon="import">导入</a-button>-->
+<!--            </a-upload>-->
+<!--            &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--            <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+            <a-dropdown v-if="selectedRowKeys.length > 0">
+<!--                <a-menu slot="overlay">-->
+<!--                    <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--                </a-menu>-->
+<!--                <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+
+                <a-button @click="batchDel" type="danger" icon="delete">批量删除</a-button>
+            </a-dropdown>
+        </div>
+
+        <!-- table区域-begin -->
+        <div>
+            <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+                <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+                <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+            </div>
+
+            <a-table
+                    ref="table"
+                    size="middle"
+                    :scroll="{x:true}"
+                    bordered
+                    rowKey="id"
+                    :columns="columns"
+                    :dataSource="dataSource"
+                    :pagination="ipagination"
+                    :loading="loading"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                    class="j-table-force-nowrap"
+                    @change="handleTableChange">
+
+                <template slot="htmlSlot" slot-scope="text">
+                    <div v-html="text"></div>
+                </template>
+                <span slot="status" slot-scope="text,record">
+                    <a-tag v-if="text == 1" color="green">启用</a-tag>
+                    <a-tag v-else color="grey">关闭</a-tag>
+                </span>
+                <template slot="imgSlot" slot-scope="text,record">
+                    <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+                    <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+                </template>
+                <template slot="fileSlot" slot-scope="text">
+                    <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+                    <a-button
+                            v-else
+                            :ghost="true"
+                            type="primary"
+                            icon="download"
+                            size="small"
+                            @click="downloadFile(text)">
+                        下载
+                    </a-button>
+                </template>
+
+                <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+            </a-table>
+        </div>
+
+        <pay-interface-config-modal ref="modalForm" @ok="modalFormOk"></pay-interface-config-modal>
+    </a-card>
 </template>
 
 <script>
 
+    import '@/assets/less/TableExpand.less'
+    import { mixinDevice } from '@/utils/mixin'
+    import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+    import payInterfaceConfigModal from './modules/payInterfaceConfigModal'
     import { httpAction, getAction } from '@/api/manage'
-    import { validateDuplicateValue } from '@/utils/util'
-    import {getPayApiConfigInfo} from "../../../api/api";
 
     export default {
         name: 'payApiSettings',
+        mixins:[JeecgListMixin, mixinDevice],
         components: {
-        },
-        props: {
-            //表单禁用
-            disabled: {
-                type: Boolean,
-                default: false,
-                required: false
-            }
+            payInterfaceConfigModal
         },
         data () {
             return {
-                model:{
-                },
-                labelCol: {
-                    xs: { span: 24 },
-                    sm: { span: 3 },
-                },
-                wrapperCol: {
-                    xs: { span: 24 },
-                    sm: { span: 20 },
-                },
-                confirmLoading: false,
-                validatorRules: {
-                    status: [
-                        { required: true, message: '请选择是否启用!'},
-                    ],
-                    payTypeId: [
-                        { required: true, message: '请选择关联支付方式!'},
-                    ],
-                    merchantNo: [
-                        { required: true, message: '请输入商户号!'},
-                    ],
-                    terminalNo: [
-                        { required: true, message: '请输入终端号!'},
-                    ],
-                    token: [
-                        { required: true, message: '请输入TOKEN令牌!'},
-                    ],
-                },
+                description: '支付接口配置管理页面',
+                // 表头
+                columns: [
+                    {
+                        title:'支付方式',
+                        align:"center",
+                        dataIndex: 'payTypeId_dictText'
+                    },
+                    {
+                        title:'商户号',
+                        align:"center",
+                        dataIndex: 'merchantNo'
+                    },
+                    {
+                        title:'终端号',
+                        align:"center",
+                        dataIndex: 'terminalNo'
+                    },
+                    {
+                        title:'TOKEN令牌',
+                        align:"center",
+                        dataIndex: 'token'
+                    },
+                    {
+                        title:'状态',
+                        align:"center",
+                        dataIndex: 'status',
+                        scopedSlots: { customRender: 'status' },
+                    },
+                    {
+                        title: '操作',
+                        dataIndex: 'action',
+                        align:"center",
+                        fixed:"right",
+                        width:147,
+                        scopedSlots: { customRender: 'action' }
+                    }
+                ],
                 url: {
-                    add: "/business/busPayInterfaceConfig/add",
-                    edit: "/business/busPayInterfaceConfig/edit",
+                    list: "/business/busPayInterfaceConfig/list",
+                    delete: "/business/busPayInterfaceConfig/delete",
+                    deleteBatch: "/business/busPayInterfaceConfig/deleteBatch",
+                    exportXlsUrl: "/business/busPayInterfaceConfig/exportXls",
+                    importExcelUrl: "business/busPayInterfaceConfig/importExcel",
                     query_payType: "/business/busRoomPayType/queryList",
                 },
+                dictOptions:{},
+                superFieldList:[],
                 payTypeList:[]
             }
         },
-        computed: {
-            formDisabled(){
-                return this.disabled
-            },
-        },
-        created () {
-            //备份model原始值
-            this.modelDefault = JSON.parse(JSON.stringify(this.model));
-            var _info = JSON.parse(localStorage.getItem("storeInfo"));
-            setTimeout(() => {
-                getPayApiConfigInfo({
-                }).then(res => {
-                    console.log(res)
-                    if (res.code == 200 && res.result ) {
-                        var info = res.result
-                        this.model = {
-                            id: info.id,
-                            status :info.status.toString(),
-                            payTypeId:info.payTypeId,
-                            merchantNo:info.merchantNo,
-                            terminalNo:info.terminalNo,
-                            token:info.token
-                        };
-                    }
-                })
-            }, 100)
-
+        created() {
+            this.getSuperFieldList();
             getAction(this.url.query_payType,{}).then((res)=>{
                 if(res.success){
                     this.payTypeList = res.result
@@ -138,46 +392,30 @@
                 }
             })
         },
-        methods: {
-            add () {
-                this.edit(this.modelDefault);
-            },
-            edit (record) {
-                this.model = Object.assign({}, record);
-                this.visible = true;
+        computed: {
+            importExcelUrl: function(){
+                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
             },
-            submitForm () {
-                const that = this;
-                // 触发表单验证
-                this.$refs.form.validate(valid => {
-                    if (valid) {
-                        that.confirmLoading = true;
-                        let httpurl = '';
-                        let method = '';
-                        if(!this.model.id){
-                            httpurl+=this.url.add;
-                            method = 'post';
-                            var info = JSON.parse(localStorage.getItem("storeInfo"));
-                            this.model.hotelId = info.id;
-                        }else{
-                            httpurl+=this.url.edit;
-                            method = 'put';
-                        }
-                        httpAction(httpurl,this.model,method).then((res)=>{
-                            if(res.success){
-                                that.$message.success(res.message);
-                                that.$emit('ok');
-                                that.model.id = res.result.id
-                            }else{
-                                that.$message.warning(res.message);
-                            }
-                        }).finally(() => {
-                            that.confirmLoading = false;
-                        })
-                    }
-
-                })
+        },
+        methods: {
+            initDictConfig(){
             },
+            getSuperFieldList(){
+                let fieldList=[];
+                fieldList.push({type:'string',value:'tenantId',text:'关联租户'})
+                fieldList.push({type:'string',value:'hotelId',text:'关联酒店'})
+                fieldList.push({type:'string',value:'payTypeId',text:'关联支付方式'})
+                fieldList.push({type:'string',value:'merchantNo',text:'商户号'})
+                fieldList.push({type:'string',value:'terminalNo',text:'终端号'})
+                fieldList.push({type:'string',value:'token',text:'TOKEN令牌'})
+                fieldList.push({type:'int',value:'status',text:'状态(0-关闭；1-启用)'})
+                fieldList.push({type:'int',value:'minute',text:'预定超时时间'})
+                fieldList.push({type:'int',value:'delFlag',text:'删除状态(0-正常,1-已删除)'})
+                this.superFieldList = fieldList
+            }
         }
     }
 </script>
+<style scoped>
+    @import '~@assets/less/common.less';
+</style>

src/views/settings/components/roomModules/marketObjectiveList.vue

@@ -0,0 +1,277 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :md="4" :sm="6">
+            <a-form-item label="选择年度">
+              <a-date-picker
+                             mode="year"
+                             placeholder="请选择年份"
+                             format='YYYY'
+                             v-model="queryParam.year"
+                             :open='yearShowOne'
+                             @openChange="openChangeOne"
+                             @panelChange="panelChangeOne" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="6">
+             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+             </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('销售目标')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+<!--      </a-dropdown>-->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        :columns="columns"
+        rowKey="month"
+        :dataSource="dataSource"
+        :pagination="false"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+          <template slot="turnoverSlot" slot-scope="text,record">
+              <a-input-number v-model="record.turnover"  style="width: 70%" :min="0" :step="1" :precision="2"/>
+          </template>
+          <template slot="rentalRateSlot" slot-scope="text,record">
+<!--              <a-input-number :min="0" :step="1" :precision="2"-->
+<!--                              :formatter="value => `${value}%`" :parser="value => value.replace('%', '')"-->
+<!--                              addon-after=".com">-->
+<!--                  <a-icon slot="prefix" type="user" />-->
+<!--              </a-input-number>-->
+<!--              <a-input addon-after="%" />-->
+              <a-input-group compact>
+                  <a-input-number v-model="record.rentalRate" style="width: 60%" :min="0" :step="1" :precision="2"/>
+                  <a-input disabled value="%" style="width: 40px;"/>
+              </a-input-group>
+<!--              <div style="display: flex;flex-direction: row">-->
+<!--                  <div style="flex: 3">-->
+<!--                      <a-input-number :min="0" :step="1" :precision="2"/>-->
+<!--                  </div>-->
+<!--                  <div style="flex: 1">-->
+<!--                      <a-input disabled="" value="%"/>-->
+<!--                  </div>-->
+<!--              </div>-->
+          </template>
+          <template slot="roomPriceSlot" slot-scope="text,record">
+              <a-input-number v-model="record.roomPrice" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          </template>
+          <template slot="revperSlot" slot-scope="text,record">
+              <a-input-number v-model="record.revper" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          </template>
+          <template slot="nightSlot" slot-scope="text,record">
+              <a-input-number v-model="record.night" style="width: 70%" :min="0" :step="1" :precision="2"/>
+          </template>
+      </a-table>
+    </div>
+    <a-button type="primary" @click="submitData" style="margin-top: 20px">保存</a-button>
+<!--    <bus-market-objective-modal ref="modalForm" @ok="modalFormOk"></bus-market-objective-modal>-->
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import moment from "moment";
+  import { httpAction, getAction } from '@/api/manage'
+  // import BusMarketObjectiveModal from './modules/BusMarketObjectiveModal'
+
+  export default {
+      name: 'marketObjectiveList',
+      mixins: [JeecgListMixin, mixinDevice],
+      components: {
+          // BusMarketObjectiveModal
+      },
+      data() {
+          return {
+              description: '销售目标管理页面',
+              // 表头
+              columns: [
+                  {
+                      title: '月份',
+                      align: "center",
+                      dataIndex: 'month',
+                      width:200
+                  },
+                  {
+                      title: '营业额销售目标',
+                      align: "center",
+                      dataIndex: 'turnover',
+                      scopedSlots: { customRender: 'turnoverSlot' }
+                  },
+                  {
+                      title: '出租率销售目标',
+                      align: "center",
+                      dataIndex: 'rentalRate',
+                      scopedSlots: { customRender: 'rentalRateSlot' }
+                  },
+                  {
+                      title: '平均房价销售目标',
+                      align: "center",
+                      dataIndex: 'roomPrice',
+                      scopedSlots: { customRender: 'roomPriceSlot' }
+                  },
+                  {
+                      title: 'RevPer销售目标',
+                      align: "center",
+                      dataIndex: 'revper',
+                      scopedSlots: { customRender: 'revperSlot' }
+                  },
+                  {
+                      title: '夜间数销售目标',
+                      align: "center",
+                      dataIndex: 'night',
+                      scopedSlots: { customRender: 'nightSlot' }
+                  },
+              ],
+              url: {
+                  list: "/business/busMarketObjective/queryList",
+                  delete: "/business/busMarketObjective/delete",
+                  deleteBatch: "/business/busMarketObjective/deleteBatch",
+                  exportXlsUrl: "/business/busMarketObjective/exportXls",
+                  importExcelUrl: "business/busMarketObjective/importExcel",
+                  batchAddOrUpdate: "/business/busMarketObjective/batchAddOrUpdate",
+              },
+              dictOptions: {},
+              superFieldList: [],
+              yearShowOne: false,
+              hotelId:''
+          }
+      },
+      beforeCreate() {
+
+      },
+      created() {
+          this.getSuperFieldList();
+          this.queryParam.year = moment(new Date().getFullYear(),'YYYY')
+          //new Date().getFullYear();//
+      },
+      mounted(){
+          console.log(this.dataSource)
+          // this.$nextTick(() => {
+          //     console.log(this.$refs.table.dataSource)
+          // })
+          var info = JSON.parse(localStorage.getItem("storeInfo"));
+          this.hotelId = info.id;
+      },
+      updated () {
+          // this.handleAddStatistics()
+          console.log(this.dataSource)
+      },
+      computed: {
+          importExcelUrl: function () {
+              return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+          },
+      },
+      methods: {
+          initDictConfig() {
+          },
+          getSuperFieldList() {
+              let fieldList = [];
+              fieldList.push({type: 'string', value: 'tenantId', text: '关联租户'})
+              fieldList.push({type: 'string', value: 'hotelId', text: '关联酒店'})
+              fieldList.push({type: 'int', value: 'year', text: '年份'})
+              fieldList.push({type: 'string', value: 'month', text: '月份'})
+              fieldList.push({type: 'number', value: 'turnover', text: '营业额销售目标'})
+              fieldList.push({type: 'number', value: 'rentalRate', text: '出租率销售目标'})
+              fieldList.push({type: 'number', value: 'roomPrice', text: '平均房价销售目标'})
+              fieldList.push({type: 'number', value: 'revper', text: 'RevPer销售目标'})
+              fieldList.push({type: 'number', value: 'night', text: '夜间数销售目标'})
+              fieldList.push({type: 'string', value: 'json', text: 'json'})
+              fieldList.push({type: 'int', value: 'delFlag', text: '删除状态(0-正常,1-已删除)'})
+              this.superFieldList = fieldList
+          },
+          // 弹出日历和关闭日历的回调
+          openChangeOne(status) {
+              if (status) {
+                  this.yearShowOne = true
+              }
+          },
+          // 得到年份选择器的值
+          panelChangeOne(value) {
+              this.queryParam.year = moment(new Date(value)).format('YYYY');
+              this.yearShowOne = false;
+          },
+          handleAddStatistics() {
+              console.log(this.$refs.table.dataSource)
+              const { count, dataSource } = this.$refs.table;
+              const newData = {
+                  key: count,
+                  month: '合计',
+                  turnover: '0.00',
+                  rentalRate: '0.00',
+                  roomPrice: '0.00',
+                  revper: '0.00',
+                  night: '0.00',
+              };
+              this.$refs.table.dataSource = [...dataSource, newData];
+              // this.$refs.table.count = count + 1;
+          },
+          submitData() {
+              var _dataSource = this.$refs.table.dataSource
+              _dataSource.forEach(t=>{
+                  t.hotelId = this.hotelId
+              })
+              var data = JSON.stringify(_dataSource)
+              console.log(data)
+              const that = this;
+              that.confirmLoading = true;
+              httpAction(this.url.batchAddOrUpdate, _dataSource, 'POST').then((res) => {
+                  if (res.success) {
+                      that.$message.success(res.message);
+                      that.$emit('ok');
+
+                      if(that.queryParam.year._isAMomentObject){
+                          that.queryParam.year = that.queryParam.year.format('YYYY')
+                      }
+                      that.loadData();
+                  } else {
+                      that.$message.warning(res.message);
+                  }
+              }).finally(() => {
+                  that.confirmLoading = false;
+              })
+          }
+      }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

src/views/settings/components/waiterSettings.vue

@@ -26,7 +26,8 @@
                     </a-col>
                     <a-col :md="4" :sm="6">
                         <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                          <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+                            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
                         </span>
                     </a-col>
                 </a-row>
@@ -150,6 +151,16 @@
                         dataIndex: 'sex_dictText',
                     },
                     {
+                        title:'身份证号',
+                        align:"center",
+                        dataIndex: 'idCard'
+                    },
+                    {
+                        title:'手机号',
+                        align:"center",
+                        dataIndex: 'phone'
+                    },
+                    {
                         title:'状态',
                         align:"center",
                         dataIndex: 'status',

src/views/settings/roomSettings.vue

@@ -61,6 +61,7 @@
                     <a-icon type="flag" />
                     销售目标设置
                 </span>
+                <market-objective-list></market-objective-list>
             </a-tab-pane>
             <a-tab-pane key="10">
                 <span slot="tab">
@@ -81,8 +82,10 @@ import allDaysRule from './components/roomModules/allDaysRoomFeeRule.vue'
 import MealCouponList from "./components/roomModules/mealCouponList";
 import ServiceRepairList from "./components/roomModules/serviceRepairList";
 import hourRoomRuleList from './components/roomModules/hourRoomRule/table.vue'
+import MarketObjectiveList from "./components/roomModules/marketObjectiveList";
 export default {
     components: {
+        MarketObjectiveList,
         ServiceRepairList,
         MealCouponList,
         roomLayoutList,

src/views/settings/systemInfo.vue

@@ -42,6 +42,10 @@
                     </a-card>
                     </a-form-item>
                     <a-button type="primary" @click="toClearBusinessData()">确定清除</a-button>
+<!--                    <a-popconfirm title="此操作将永久删除选中数据，是否继续?" @confirm="() => toClearBusinessData()">-->
+<!--                        <a-button type="primary">确定清除</a-button>-->
+<!--                    </a-popconfirm>-->
+
                 </div>
             </a-tab-pane>
             <a-tab-pane key="6">
@@ -130,9 +134,21 @@
         },
         methods:{
             toClearBusinessData(){
-                if (this.clearBusiness){
-                    console.log('清除数据')
-                }
+                var _this = this;
+                this.$confirm({
+                    title: '提示',
+                    content: '此操作将永久删除选中数据，是否继续?',
+                    okText: '确认',
+                    cancelText: '取消',
+                    onOk() {
+                        if (_this.clearBusiness){
+                            console.log('清除数据')
+                        }
+                    },
+                    onCancel() {
+                        console.log('Cancel');
+                    },
+                });
             }
         }
     }