diff --git a/src/components/staffList/staffratio/index.vue b/src/components/staffList/staffratio/index.vue
index 2aeca8d..08996a7 100644
--- a/src/components/staffList/staffratio/index.vue
+++ b/src/components/staffList/staffratio/index.vue
@@ -78,7 +78,6 @@ export default {
         form.ratio = row.ratio;
       }
       this.list.splice(index, 1, form);
-
       console.log(this.openList);
       this.changeStaff();
     },
diff --git a/src/pages/eashier/coursetorec/components/raiseList.vue b/src/pages/eashier/coursetorec/components/raiseList.vue
index b3b07de..1ffd867 100644
--- a/src/pages/eashier/coursetorec/components/raiseList.vue
+++ b/src/pages/eashier/coursetorec/components/raiseList.vue
@@ -99,9 +99,9 @@ export default {
   methods: {
     setStaffRatio() {
       var that = this;
-      setTimeout(() => {
+      this.$nextTick(() => {
         that.$refs.staffsles.show(that.proForm.staffLists);
-      }, 800);
+      });
     },
     //员工占比返回方法
     staffslesData(v) {
diff --git a/src/pages/eashier/roomCash/components/room/index.vue b/src/pages/eashier/roomCash/components/room/index.vue
index df39d30..4b38575 100644
--- a/src/pages/eashier/roomCash/components/room/index.vue
+++ b/src/pages/eashier/roomCash/components/room/index.vue
@@ -1,718 +1,718 @@
-<template>
-  <div>
-    <!-- <span class="text-xl">房间</span> -->
-    <div class="flex justify-between align-start flex-wrap ">
-      <div class="flex justify-start align-center flex-wrap">
-        <el-input class="form-width margin-right-xs" placeholder='搜索房间号' size="samll" pattern="[0-9]*" maxlength="11" v-model="form.roomNum">
-          <el-button size="mini" slot="append" icon="el-icon-search"></el-button>
-        </el-input>
-        <!-- <el-select style="width:100px" class="margin-right-xs" v-model="queryForm.num" placeholder="请选择">
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-          </el-option>
-        </el-select> -->
-        <div class="text-bold flex align-center justify-start">
-          <div class="flex align-center justify-start line-height" v-for="(item,index) in stateList" :key="index" @click="stateIndex=index,queryForm.state=item.value">
-            <div :class="stateIndex==index?'selcet-text':''" class="pointer padding-xss margin-left-xs">{{item.label}}</div>
-            <div :class="item.text">{{item.state}}</div>
-          </div>
-        </div>
-      </div>
-      <div>
-        <el-button @click="getPage" :icon="loading?'el-icon-loading':'el-icon-refresh'" :loading="loading" size="mini" type="success"> 刷新</el-button>
-        <el-button @click="openStaffList" size="mini" type="primary" style="margin-left: 16px;"> 员工列表</el-button>
-      </div>
-    </div>
-    <div class="flex justify-start align-start">
-    </div>
-    <div class="flex justify-center align-start flex-wrap room-body">
-      <div class="room margin-right margin-top" v-for="(item,index) in list" :key="index">
-        <div class="room-header flex justify-between align-center  text-bold" :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==3?'bg-red':'bg-blue'">
-          <div>
-            ({{item.roomNum}}){{item.roomName}}
-          </div>
-          <div class="padding-right-xs">
-            <!-- <button :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==4?'bg-red':'bg-cayn'" class="border-fff pointer text-white padding-xss border-radius-5 " title="联房" size="mini">联</button> -->
-            <!-- <button @click="changeR(item,index)" :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==4?'bg-red':'bg-cayn'" class="border-fff pointer text-white padding-xss border-radius-5" title="换房" size="mini">换</button> -->
-            <button @click="outRoom(item,index)" :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==4?'bg-red':'bg-cayn'" class="border-fff pointer text-white padding-xss border-radius-5" title="退房" size="mini">退</button>
-            <!-- <button :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==4?'bg-red':'bg-cayn'" class="border-fff pointer text-white padding-xss border-radius-5" title="补单" size="mini">补</button> -->
-          </div>
-        </div>
-        <div class="room-main" @click="openRoom(item)">
-          <div class="text-center padding-top" v-if="item.onState!=1">
-            <span class="text-xl text-bold" :class="item.onState==0?'text-green':item.onState==1?'text-blue':item.onState==2?'text-yellow':item.onState==4?'text-red':'text-cayn'">{{item.onState==0?'空闲':item.onState==1?'使用中':item.onState==2?'打扫中':item.onState==3?'超时':'等待'}}</span>
-            <div class="text-red" v-if="item.onState==0">点击开单</div><br>
-            <el-button v-if="item.onState==2" @click.stop="editRoom(item,0)" size="mini" type="warning">已打扫</el-button>
-          </div>
-          <div v-else class="text-left  padding-left-xs padding-right-xs padding-bottom-xs">
-            <div v-for="(items,indexs) in item.showList" :key="indexs" class="flex border-bottom justify-between align-center padding-top-xs padding-bottom-xs">
-              <div class="flex align-center">
-                <div class="text-cyan">({{items.list}})</div>
-                <div style="width:100px" class="text-cyan text-cut " :title="items.projectName">{{items.projectName}}</div>
-              </div>
-              <div class="flex align-center">
-                <span class="text-cyan">{{items.serviceTechnicianOneStaffName}}</span>
-                <i class="el-icon-time text-green"></i>
-                <span class="text-cyan" v-if="!items.serviceStartDate">{{items.servicingTime}}:00</span>
-                <span class="flex align-center " :class="items.serviceState==2?'text-red':'text-cyan'" v-else>
-                  <span v-if="items.serviceState==2">超</span>
-                  <span v-if="items.serviceState==1">服</span>
-                  <span v-if="items.serviceState==0">等</span>
-                  <!-- <showtime style="padding-top:5px" ref="time" @timeData="timeData"></showtime> -->
-                  <span>{{items.endTime}}</span>
-
-                </span>
-                <button v-if="!items.serviceStartDate" class="border pointer" title="上钟" @click.stop="stateEdit(items,indexs,0)">上钟</button>
-                <button v-if="items.serviceStartDate&&!items.serviceEndDate" class="border pointer" title="下钟" @click.stop="stateEdit(items,index,1)">下钟</button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="room-foot flex justify-between align-center">
-          <div class="padding-left-xs">
-            <i class="el-icon-alarm-clock"></i>
-            <!-- 45:00 -->
-          </div>
-          <div>
-            <i class="el-icon-user"></i>
-            <span>{{item.outRoomHand }} / {{ item.roomHand}}</span>
-            <el-button v-if="item.onState==1" size="mini" type="primary" class="border" @click="openAll(item)">结算</el-button>
-            <el-button v-else size="mini" type="primary" class="border">开</el-button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- 员工 -->
-    <transition-group class="container" name="sort">
-    </transition-group>
-    <div class="stafflist flex justify-start align-start padding-left-xs">
-      <div class="staff" v-for="(item,index) in staffList" :key="index" :draggable="true" @dragstart="dragstart(item)" @dragenter="dragenter(item,$event)" @dragend="getDragend(customApps, 'customer', $event)" :class="item.state==0?'bg-green':item.state==1?'bg-blue':item.state==2?'bg-cyan':item.state==3?'bg-red':item.state==4?'bg-yellow':'bg-olive'">
-        <div class="staff-head flex justify-between align-center">
-          <div class="text-out" style="width:145px" :title="item.staffName">
-            {{item.brandNumber}}--{{item.staffName}}
-          </div>
-          <el-popover placement="top" width="60" trigger="click" class="text-center">
-            <el-button v-if="item.state==2||item.state==3||item.state==4" type="text" @click="editStaffState(item,0)">轮牌</el-button>
-            <div v-else>
-              <el-button type="text" @click="editStaffState(item,2)">请假</el-button>
-              <el-button type="text" @click="editStaffState(item,3)">下班</el-button>
-              <el-button type="text" @click="editStaffState(item,4)">停牌</el-button>
-            </div>
-            <i slot="reference" title="调整轮牌状态" class="el-icon-s-operation pointer text-white"></i>
-          </el-popover>
-        </div>
-        <div class="staff-main text-bold text-black" v-if="item.state==0">空闲</div>
-        <div class="staff-main text-bold text-blue" v-if="item.state==1">服务中</div>
-        <div class="staff-main text-bold text-cyan" v-if="item.state==2">请假</div>
-        <div class="staff-main text-bold text-red" v-if="item.state==3">下班</div>
-        <div class="staff-main text-bold text-yellow" v-if="item.state==4">停牌</div>
-      </div>
-    </div>
-    <room ref="room" @roomDatas="roomDatas"></room>
-    <el-drawer title="员工列表" :visible.sync="openDrawer" direction="rtl" size="500px">
-      <el-button @click="upDate" size="mini" type="primary" style="margin-left: 16px;">排班</el-button>
-      <el-table class="margin-top" :data="staffTable" ref="staffTable" @row-click="getCurrentRow" @selection-change="handleSelectionChange">
-        <el-table-column align="center" type="selection" width="55"></el-table-column>
-        <el-table-column align="center" width="100" prop="brandNumber" label="水牌号"></el-table-column>
-        <el-table-column align="center" min-width="120" prop="staffName" label="名字"></el-table-column>
-        <el-table-column align="center" min-width="100" prop="grade" label="职务">
-          <template slot-scope="scope">
-            {{
-            scope.row.grade == 1
-              ? "店长"
-              : scope.row.grade == 2
-              ? "美发经理"
-              : scope.row.grade == 3
-              ? "美容经理"
-              : scope.row.grade == 4
-              ? "总监"
-              : scope.row.grade == 6
-              ? "员工"
-              : "美发师"
-          }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-drawer>
-    <change-room ref="changeRoom" @changeData="getPage"></change-room>
-  </div>
-</template>
-
-<script>
-import showtime from "@/components/timeEnd/index";
-import room from "./room.vue";
-import { roomPages, editStateRoom } from "@/api/storeManage.js";
-import { selectList } from "@/api/eashier.js";
-import {
-  addServiceOrder,
-  updateTime,
-  updateTimeX,
-  checkOut,
-  roomSatet,
-  editsServiceOrder,
-  serviceOrderLists,
-} from "@/api/api.js";
-import changeRoom from "./changeRoom.vue";
-export default {
-  components: { room, showtime, changeRoom },
-  data() {
-    return {
-      form: {}, //主对象
-      stateIndex: -1,
-      loading: false,
-      isShow: true,
-      stateList: [
-        { label: "全部", value: null },
-        { label: "超时", value: 4, text: "text-red" },
-        { label: "正在使用", value: 1, text: "text-blue" },
-        { label: "空闲", value: 0, text: "text-green" },
-        { label: "打扫", value: 2, text: "text-yellow" },
-        { label: "等待", value: 3, text: "text-cayn" },
-      ],
-      openDrawer: false,
-      queryForm: {
-        //查询对象
-        pageNum: 1,
-        pageSize: 99,
-        state: 1,
-      },
-      staffTable: [],
-      options: [{ value: "全部类型", label: "全部类型" }],
-      staffList: [],
-      selection: [],
-      list: [
-        {
-          num: "001",
-          name: "小清新",
-          oldNumber: 2,
-          list: [{ state: "空闲" }],
-          newNumber: 0,
-          type: "空闲",
-        },
-      ],
-      maxTime: -1,
-      timeValue: 10,
-      minutes: -1,
-      seconds: -1,
-      oldData: [],
-      newData: [],
-      customApps: [],
-      dragStartId: "",
-      dragEndId: "",
-      time: "",
-      flag: false,
-      endTime: "",
-      timer: null,
-      overtime: false,
-      isShow: true,
-    };
-  },
-  methods: {
-    editStaffState(item, number) {
-      console.log(item);
-      editsServiceOrder({ id: item.id, state: number }).then((res) => {
-        if (res.code == "000000") {
-          this.$message.success({ message: "操作成功!" });
-          this.getStaff();
-        } else {
-          this.$alert(res.message, "提示", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    timeData(v) {
-      var that = this;
-      let list = JSON.parse(JSON.stringify(this.list));
-      list.forEach((item) => {
-        if (v.form.roomId == item.id) {
-          item.showList.forEach((items) => {
-            if (items.serviceStartDate == v.form.serviceStartDate) {
-              items.endTime = v.time;
-            }
-          });
-        }
-      });
-      that.list = JSON.parse(JSON.stringify(that.list));
-    },
-    dragstart(value) {
-      this.oldData = value;
-      this.dragStartId = value.staffName;
-    },
-    dragenter(value) {
-      this.newData = value;
-      this.dragEndId = value.staffName;
-    },
-    getDragend(listData, type) {
-      if (this.oldData !== this.newData) {
-        let oldIndex = listData.indexOf(this.oldData);
-        let newIndex = listData.indexOf(this.newData);
-        let newItems = [...listData];
-        // 删除之前DOM节点
-        newItems.splice(oldIndex, 1);
-        // 在拖拽结束目标位置增加新的DOM节点
-        newItems.splice(newIndex, 0, this.oldData);
-        // 每次拖拽结束后，将拖拽处理完成的数据，赋值原数组，使DOM视图更新，页面显示拖拽动画
-        this.customApps = newItems;
-        // 每次拖拽结束后调用接口时时保存数据
-        console.log(this.dragStartId);
-        console.log(this.dragEndId);
-        // Api(this.dragStartId, this.dragEndId).then((res) => {});
-      }
-    },
-    changeR(item, index) {
-      this.$refs.changeRoom.show(item);
-    },
-    outRoom(item) {
-      this.$confirm("继续退房", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        cancelButtonClass: "cancelbtnFalses",
-        confirmButtonClass: "confirmbtnFalses",
-        type: "warning",
-      })
-        .then(() => {
-          checkOut({ id: item.id }).then((res) => {
-            if (res.code == "000000") {
-              this.getPage();
-              this.$message.success({ message: "退房成功!" });
-            } else {
-              this.$alert(res.message, "提示", {
-                confirmButtonText: "确定",
-                confirmButtonClass: "confirmbtnFalses",
-                type: "warning",
-                center: true,
-                callback: (action) => {},
-              });
-            }
-          });
-        })
-        .catch(() => {});
-    },
-    openAll(item) {
-      this.$emit("roomData", item.showList);
-    },
-    editRoom(item, number) {
-      editStateRoom({ id: item.id, onState: number }).then((res) => {
-        if (res.code == "000000") {
-          this.$message.success({ message: "操作成功!" });
-          this.getPage();
-        } else {
-          this.$alert(res.message, "提示", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    //开始倒计时
-    stateEdit(item, index, number) {
-      if (number == 0) {
-        updateTime({ id: item.id }).then((res) => {
-          if (res.code == "000000") {
-            this.$message.success({ message: "上钟成功!" });
-            this.getPage();
-          } else {
-            this.$alert(res.message, "提示", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: (action) => {},
-            });
-          }
-        });
-      } else {
-        updateTimeX({ id: item.id }).then((res) => {
-          if (res.code == "000000") {
-            this.$message.success({ message: "下钟成功!" });
-            this.getPage();
-            // this.$refs.time[0].show(item, "", 1);
-            // let endDate = "2022-05-14 14:59:00";
-          } else {
-            this.$alert(res.message, "提示", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: (action) => {},
-            });
-          }
-        });
-      }
-    },
-    timendData(v) {
-      if (v.form.id) {
-        this.list.forEach((item) => {
-          item.showList.forEach((items) => {
-            items.overtime = v.overtime;
-          });
-        });
-      }
-    },
-    openStaffList() {
-      let form = { id: null };
-      var that = this;
-      selectList(form).then((res) => {
-        this.listLoading = false;
-        this.openDrawer = true;
-        if (res.code == "000000") {
-          this.staffTable = res.rows;
-          this.staffTable.forEach((item) => {
-            item.staffId = item.id;
-            this.selection.push(item);
-            this.staffList.forEach((items) => {
-              if (item.staffId == items.staffId) {
-                console.log(this.$refs.staffTable);
-                setTimeout(() => {
-                  that.$refs.staffTable.toggleRowSelection(item, true);
-                }, 800);
-              }
-            });
-          });
-          this.selection = this.staffTable;
-        } else {
-          this.$alert(res.message, "提示", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    //多选方法
-    getCurrentRow(row) {
-      this.$refs["staffTable"].toggleRowSelection(row);
-    },
-    //多选变动方法
-    handleSelectionChange(selection) {
-      this.selection = selection;
-      console.log(this.selection);
-    },
-    upDate() {
-      addServiceOrder(this.selection).then((res) => {
-        if (res.code == "000000") {
-          this.$message.success({ message: "排班成功!" });
-          this.getPage();
-        } else {
-          this.$alert(res.message, "提示", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    //组件传值
-    show() {
-      this.getData();
-      this.getPage();
-      this.getStaff();
-    },
-    openRoom(item) {
-      if (item.onState == 2) {
-      } else {
-        this.$refs.room.show(item);
-      }
-    },
-    roomDatas(v) {
-      if (v) {
-        this.$emit("roomData", v);
-      } else {
-        this.$emit("roomData");
-      }
-      this.getPage();
-    },
-    addMin(v, n) {
-      if (v) {
-        v = new Date(v.valueOf());
-        v.setMinutes(v.getMinutes() + n);
-        return v;
-      }
-    },
-    getStaff() {
-      serviceOrderLists().then((res) => {
-        if (res.code == "000000") {
-          this.staffList = res.rows;
-        } else {
-          this.$alert(res.message, "加载员工列表", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    //获取数据
-    async getData() {
-      roomSatet({}).then((res) => {
-        if (res.code == "000000") {
-          this.stateList.forEach((item) => {
-            if (item.label == "超时") {
-              item.state = res.data.overtime;
-            }
-            if (item.label == "正在使用") {
-              item.state = res.data.use;
-            }
-            if (item.label == "空闲") {
-              item.state = res.data.leisure;
-            }
-            if (item.label == "打扫") {
-              item.state = res.data.sweep;
-            }
-            if (item.label == "等待") {
-              item.state = res.data.await;
-            }
-          });
-        } else {
-          this.$alert(res.message, "加载房间状态", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    getPage() {
-      this.loading = true;
-      roomPages(this.queryForm)
-        .then((res) => {
-          if (res.code == "000000") {
-            this.loading = false;
-            res.pageInfo.list.forEach((item) => {
-              let number = 0;
-              let list = [];
-              item.showList = [];
-              item.storeRoomHandList.forEach((items) => {
-                if (items.state == 1) {
-                  number++;
-                }
-                items.storeSettlement.forEach((itemss, index) => {
-                  itemss.servicingTimeChange = itemss.servicingTime;
-                  item.showList.push(itemss);
-                  if (itemss.serviceStartDate) {
-                    itemss.endDateTime = this.formatTime(
-                      this.addMin(
-                        itemss.serviceStartDate,
-                        itemss.servicingTime
-                      ),
-                      "YYYY-MM-DD hh:mm:ss"
-                    );
-                  }
-                });
-              });
-              item.outRoomHand = number;
-            });
-            this.list = res.pageInfo.list;
-            var that = this;
-            let nowDate = this.formatTime(new Date(), "YYYY-MM-DD hh:mm:ss");
-            this.list.forEach((item) => {
-              item.showList.forEach((items, index) => {
-                items.endTime = "";
-                if (items.endDateTime < nowDate) {
-                  items.serviceState = 2;
-                } else {
-                  items.serviceState = 1;
-                }
-                if (items.endDateTime) {
-                  if (items.serviceEndDate) {
-                    // setTimeout(() => {
-                    //   that.$refs.time[index].show(
-                    //     items,
-                    //     items.serviceEndDate,
-                    //     0
-                    //   );
-                    // }, 1000);
-                    items.serviceState = 0;
-                    items.endTime = this.shows(items, items.serviceEndDate, 0);
-                  } else {
-                    items.endTime = this.shows(items, items.endDateTime, 0);
-                    // setTimeout(() => {
-                    //   console.log(that.$refs.time[index]);
-                    //   console.log(items);
-                    //   console.log(items.endDateTime);
-                    //   that.$refs.time[index].show(items, items.endDateTime, 0);
-                    // }, 1000);
-                  }
-                }
-              });
-            });
-            var that = this;
-            setTimeout(() => {
-              that.getPage();
-              return;
-            }, 60000);
-          } else {
-            this.$alert(res.message, "加载房间列表", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: (action) => {},
-            });
-          }
-        })
-        .catch((err) => {
-          this.loading = false;
-        });
-      this.getData();
-      this.getStaff();
-    },
-    shows(form, endTime, number) {
-      this.rowForm = form;
-      if (number == 1) {
-        this.flag = true;
-        this.endTime = new Date();
-        return this.timeDown();
-      } else {
-        this.endTime = endTime;
-        this.flag = false;
-        return this.timeDown();
-      }
-      if (!endTime) {
-        this.endTime = "";
-        this.flag = false;
-        return this.timeDown();
-      }
-    },
-    timeDown() {
-      const endTime = new Date(this.endTime);
-      const nowTime = new Date();
-      let leftTime = parseInt((endTime.getTime() - nowTime.getTime()) / 1000);
-      let d = parseInt(leftTime / (24 * 60 * 60));
-      let h = this.formate(parseInt((leftTime / (60 * 60)) % 24));
-      let m = this.formate(parseInt((leftTime / 60) % 60));
-      let s = this.formate(parseInt(leftTime % 60));
-      var that = this;
-      if (leftTime <= 0) {
-        this.flag = true;
-        this.$emit("timendData", { form: this.form, overtime: this.overtime });
-      }
-      if (leftTime == 0) {
-        this.flag = true;
-        this.$emit("timendData", { form: this.form, overtime: this.overtime });
-      } else {
-        // setTimeout(() => {
-        //   that.timeDown();
-        // }, 1000);
-        if (m < 0 || s < 0 || h) {
-          m = this.formate(-m);
-          s = this.formate(-s);
-          h = this.formate(-h);
-          this.overtime = true;
-          clearInterval(this.timer);
-        } else {
-          this.overtime = false;
-        }
-        if (h > 0) {
-          m = m + h * 60;
-        }
-        this.time = `${m}:${s}`; // 需要修改时间样式的话 ，比如需要什么30分钟倒计时，就只保留分和秒
-        return this.time;
-      }
-    },
-    formate(time) {
-      if (time == NaN) {
-        clearInterval(this.timer);
-      }
-      if (time >= 10 || time <= 0) {
-        return time;
-      } else {
-        return `0${time}`;
-      }
-    },
-  },
-};
-</script>
-<style scoped>
-.room {
-  height: 200px;
-  width: 320px;
-  border: 1px solid burlywood;
-  border-radius: 10px;
-  overflow: hidden;
-}
-.room-body {
-  padding-bottom: 170px;
-  overflow: auto;
-}
-.selcet-text {
-  border-bottom: 3px blue solid;
-}
-.room-header {
-  height: 38px;
-  line-height: 38px;
-  /* background: rgb(2, 175, 2); */
-  padding-left: 15px;
-  font-size: 16px;
-  color: white;
-}
-.room-main {
-  height: 130px;
-  max-height: 130px;
-  overflow: auto;
-  background: white;
-}
-.room-main-line {
-  height: 130px;
-  line-height: 130px;
-  background: white;
-}
-.room-foot {
-  height: 32px;
-  padding-right: 15px;
-  background: white;
-  background: rgb(173, 201, 253);
-}
-.stafflist {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  height: 95px;
-  padding-top: 10px;
-  border: 1px solid rgb(247, 56, 8);
-  border-radius: 10px;
-  background: white;
-  overflow: auto;
-  z-index: 999;
-}
-.staff {
-  width: 130px;
-  height: 85px;
-  border: 1px solid #eee;
-  border-radius: 8px;
-  margin-right: 15px;
-  overflow: hidden;
-}
-.staff-head {
-  height: 35px;
-  line-height: 35px;
-  width: 100%;
-  color: white;
-}
-.sort-move {
-  transition: transform 1s;
-}
-.staff-main {
-  height: 42px;
-  width: 114px;
-  line-height: 42px;
-  margin: auto;
-  text-align: center;
-  background: #fff;
-}
-</style>
+<template>
+  <div>
+    <!-- <span class="text-xl">房间</span> -->
+    <div class="flex justify-between align-start flex-wrap ">
+      <div class="flex justify-start align-center flex-wrap">
+        <el-input class="form-width margin-right-xs" placeholder='搜索房间号' size="samll" pattern="[0-9]*" maxlength="11" v-model="form.roomNum">
+          <el-button size="mini" slot="append" icon="el-icon-search"></el-button>
+        </el-input>
+        <!-- <el-select style="width:100px" class="margin-right-xs" v-model="queryForm.num" placeholder="请选择">
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select> -->
+        <div class="text-bold flex align-center justify-start">
+          <div class="flex align-center justify-start line-height" v-for="(item,index) in stateList" :key="index" @click="stateIndex=index,queryForm.state=item.value">
+            <div :class="stateIndex==index?'selcet-text':''" class="pointer padding-xss margin-left-xs">{{item.label}}</div>
+            <div :class="item.text">{{item.state}}</div>
+          </div>
+        </div>
+      </div>
+      <div>
+        <el-button @click="getPage" :icon="loading?'el-icon-loading':'el-icon-refresh'" :loading="loading" size="mini" type="success"> 刷新</el-button>
+        <el-button @click="openStaffList" size="mini" type="primary" style="margin-left: 16px;"> 员工列表</el-button>
+      </div>
+    </div>
+    <div class="flex justify-start align-start">
+    </div>
+    <div class="flex justify-center align-start flex-wrap room-body">
+      <div class="room margin-right margin-top" v-for="(item,index) in list" :key="index">
+        <div class="room-header flex justify-between align-center  text-bold" :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==3?'bg-red':'bg-blue'">
+          <div>
+            ({{item.roomNum}}){{item.roomName}}
+          </div>
+          <div class="padding-right-xs">
+            <!-- <button :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==4?'bg-red':'bg-cayn'" class="border-fff pointer text-white padding-xss border-radius-5 " title="联房" size="mini">联</button> -->
+            <!-- <button @click="changeR(item,index)" :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==4?'bg-red':'bg-cayn'" class="border-fff pointer text-white padding-xss border-radius-5" title="换房" size="mini">换</button> -->
+            <button @click="outRoom(item,index)" :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==4?'bg-red':'bg-cayn'" class="border-fff pointer text-white padding-xss border-radius-5" title="退房" size="mini">退</button>
+            <!-- <button :class="item.onState==0?'bg-green':item.onState==1?'bg-blue':item.onState==2?'bg-yellow':item.onState==4?'bg-red':'bg-cayn'" class="border-fff pointer text-white padding-xss border-radius-5" title="补单" size="mini">补</button> -->
+          </div>
+        </div>
+        <div class="room-main" @click="openRoom(item)">
+          <div class="text-center padding-top" v-if="item.onState!=1">
+            <span class="text-xl text-bold" :class="item.onState==0?'text-green':item.onState==1?'text-blue':item.onState==2?'text-yellow':item.onState==4?'text-red':'text-cayn'">{{item.onState==0?'空闲':item.onState==1?'使用中':item.onState==2?'打扫中':item.onState==3?'超时':'等待'}}</span>
+            <div class="text-red" v-if="item.onState==0">点击开单</div><br>
+            <el-button v-if="item.onState==2" @click.stop="editRoom(item,0)" size="mini" type="warning">已打扫</el-button>
+          </div>
+          <div v-else class="text-left  padding-left-xs padding-right-xs padding-bottom-xs">
+            <div v-for="(items,indexs) in item.showList" :key="indexs" class="flex border-bottom justify-between align-center padding-top-xs padding-bottom-xs">
+              <div class="flex align-center">
+                <div class="text-cyan">({{items.list}})</div>
+                <div style="width:100px" class="text-cyan text-cut " :title="items.projectName">{{items.projectName}}</div>
+              </div>
+              <div class="flex align-center">
+                <span class="text-cyan">{{items.serviceTechnicianOneStaffName}}</span>
+                <i class="el-icon-time text-green"></i>
+                <span class="text-cyan" v-if="!items.serviceStartDate">{{items.servicingTime}}:00</span>
+                <span class="flex align-center " :class="items.serviceState==2?'text-red':'text-cyan'" v-else>
+                  <span v-if="items.serviceState==2">超</span>
+                  <span v-if="items.serviceState==1">服</span>
+                  <span v-if="items.serviceState==0">等</span>
+                  <!-- <showtime style="padding-top:5px" ref="time" @timeData="timeData"></showtime> -->
+                  <span>{{items.endTime}}</span>
+
+                </span>
+                <button v-if="!items.serviceStartDate" class="border pointer" title="上钟" @click.stop="stateEdit(items,indexs,0)">上钟</button>
+                <button v-if="items.serviceStartDate&&!items.serviceEndDate" class="border pointer" title="下钟" @click.stop="stateEdit(items,index,1)">下钟</button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="room-foot flex justify-between align-center">
+          <div class="padding-left-xs">
+            <i class="el-icon-alarm-clock"></i>
+            <!-- 45:00 -->
+          </div>
+          <div>
+            <i class="el-icon-user"></i>
+            <span>{{item.outRoomHand }} / {{ item.roomHand}}</span>
+            <el-button v-if="item.onState==1" size="mini" type="primary" class="border" @click="openAll(item)">结算</el-button>
+            <el-button v-else size="mini" type="primary" class="border">开</el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 员工 -->
+    <transition-group class="container" name="sort">
+    </transition-group>
+    <div class="stafflist flex justify-start align-start padding-left-xs">
+      <div class="staff" v-for="(item,index) in staffList" :key="index" :draggable="true" @dragstart="dragstart(item)" @dragenter="dragenter(item,$event)" @dragend="getDragend(customApps, 'customer', $event)" :class="item.state==0?'bg-green':item.state==1?'bg-blue':item.state==2?'bg-cyan':item.state==3?'bg-red':item.state==4?'bg-yellow':'bg-olive'">
+        <div class="staff-head flex justify-between align-center">
+          <div class="text-out" style="width:145px" :title="item.staffName">
+            {{item.brandNumber}}--{{item.staffName}}
+          </div>
+          <el-popover placement="top" width="60" trigger="click" class="text-center">
+            <el-button v-if="item.state==2||item.state==3||item.state==4" type="text" @click="editStaffState(item,0)">轮牌</el-button>
+            <div v-else>
+              <el-button type="text" @click="editStaffState(item,2)">请假</el-button>
+              <el-button type="text" @click="editStaffState(item,3)">下班</el-button>
+              <el-button type="text" @click="editStaffState(item,4)">停牌</el-button>
+            </div>
+            <i slot="reference" title="调整轮牌状态" class="el-icon-s-operation pointer text-white"></i>
+          </el-popover>
+        </div>
+        <div class="staff-main text-bold text-black" v-if="item.state==0">空闲</div>
+        <div class="staff-main text-bold text-blue" v-if="item.state==1">服务中</div>
+        <div class="staff-main text-bold text-cyan" v-if="item.state==2">请假</div>
+        <div class="staff-main text-bold text-red" v-if="item.state==3">下班</div>
+        <div class="staff-main text-bold text-yellow" v-if="item.state==4">停牌</div>
+      </div>
+    </div>
+    <room ref="room" @roomDatas="roomDatas"></room>
+    <el-drawer title="员工列表" :visible.sync="openDrawer" direction="rtl" size="500px">
+      <el-button @click="upDate" size="mini" type="primary" style="margin-left: 16px;">排班</el-button>
+      <el-table class="margin-top" :data="staffTable" ref="staffTable" @row-click="getCurrentRow" @selection-change="handleSelectionChange">
+        <el-table-column align="center" type="selection" width="55"></el-table-column>
+        <el-table-column align="center" width="100" prop="brandNumber" label="水牌号"></el-table-column>
+        <el-table-column align="center" min-width="120" prop="staffName" label="名字"></el-table-column>
+        <el-table-column align="center" min-width="100" prop="grade" label="职务">
+          <template slot-scope="scope">
+            {{
+            scope.row.grade == 1
+              ? "店长"
+              : scope.row.grade == 2
+              ? "美发经理"
+              : scope.row.grade == 3
+              ? "美容经理"
+              : scope.row.grade == 4
+              ? "总监"
+              : scope.row.grade == 6
+              ? "员工"
+              : "美发师"
+          }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-drawer>
+    <change-room ref="changeRoom" @changeData="getPage"></change-room>
+  </div>
+</template>
+
+<script>
+import showtime from "@/components/timeEnd/index";
+import room from "./room.vue";
+import { roomPages, editStateRoom } from "@/api/storeManage.js";
+import { selectList } from "@/api/eashier.js";
+import {
+  addServiceOrder,
+  updateTime,
+  updateTimeX,
+  checkOut,
+  roomSatet,
+  editsServiceOrder,
+  serviceOrderLists,
+} from "@/api/api.js";
+import changeRoom from "./changeRoom.vue";
+export default {
+  components: { room, showtime, changeRoom },
+  data() {
+    return {
+      form: {}, //主对象
+      stateIndex: -1,
+      loading: false,
+      isShow: true,
+      stateList: [
+        { label: "全部", value: null },
+        { label: "超时", value: 4, text: "text-red" },
+        { label: "正在使用", value: 1, text: "text-blue" },
+        { label: "空闲", value: 0, text: "text-green" },
+        { label: "打扫", value: 2, text: "text-yellow" },
+        { label: "等待", value: 3, text: "text-cayn" },
+      ],
+      openDrawer: false,
+      queryForm: {
+        //查询对象
+        pageNum: 1,
+        pageSize: 99,
+        state: 1,
+      },
+      staffTable: [],
+      options: [{ value: "全部类型", label: "全部类型" }],
+      staffList: [],
+      selection: [],
+      list: [
+        {
+          num: "001",
+          name: "小清新",
+          oldNumber: 2,
+          list: [{ state: "空闲" }],
+          newNumber: 0,
+          type: "空闲",
+        },
+      ],
+      maxTime: -1,
+      timeValue: 10,
+      minutes: -1,
+      seconds: -1,
+      oldData: [],
+      newData: [],
+      customApps: [],
+      dragStartId: "",
+      dragEndId: "",
+      time: "",
+      flag: false,
+      endTime: "",
+      timer: null,
+      overtime: false,
+      isShow: true,
+    };
+  },
+  methods: {
+    editStaffState(item, number) {
+      console.log(item);
+      editsServiceOrder({ id: item.id, state: number }).then((res) => {
+        if (res.code == "000000") {
+          this.$message.success({ message: "操作成功!" });
+          this.getStaff();
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+    timeData(v) {
+      var that = this;
+      let list = JSON.parse(JSON.stringify(this.list));
+      list.forEach((item) => {
+        if (v.form.roomId == item.id) {
+          item.showList.forEach((items) => {
+            if (items.serviceStartDate == v.form.serviceStartDate) {
+              items.endTime = v.time;
+            }
+          });
+        }
+      });
+      that.list = JSON.parse(JSON.stringify(that.list));
+    },
+    dragstart(value) {
+      this.oldData = value;
+      this.dragStartId = value.staffName;
+    },
+    dragenter(value) {
+      this.newData = value;
+      this.dragEndId = value.staffName;
+    },
+    getDragend(listData, type) {
+      if (this.oldData !== this.newData) {
+        let oldIndex = listData.indexOf(this.oldData);
+        let newIndex = listData.indexOf(this.newData);
+        let newItems = [...listData];
+        // 删除之前DOM节点
+        newItems.splice(oldIndex, 1);
+        // 在拖拽结束目标位置增加新的DOM节点
+        newItems.splice(newIndex, 0, this.oldData);
+        // 每次拖拽结束后，将拖拽处理完成的数据，赋值原数组，使DOM视图更新，页面显示拖拽动画
+        this.customApps = newItems;
+        // 每次拖拽结束后调用接口时时保存数据
+        console.log(this.dragStartId);
+        console.log(this.dragEndId);
+        // Api(this.dragStartId, this.dragEndId).then((res) => {});
+      }
+    },
+    changeR(item, index) {
+      this.$refs.changeRoom.show(item);
+    },
+    outRoom(item) {
+      this.$confirm("继续退房", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        cancelButtonClass: "cancelbtnFalses",
+        confirmButtonClass: "confirmbtnFalses",
+        type: "warning",
+      })
+        .then(() => {
+          checkOut({ id: item.id }).then((res) => {
+            if (res.code == "000000") {
+              this.getPage();
+              this.$message.success({ message: "退房成功!" });
+            } else {
+              this.$alert(res.message, "提示", {
+                confirmButtonText: "确定",
+                confirmButtonClass: "confirmbtnFalses",
+                type: "warning",
+                center: true,
+                callback: (action) => {},
+              });
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    openAll(item) {
+      this.$emit("roomData", item.showList);
+    },
+    editRoom(item, number) {
+      editStateRoom({ id: item.id, onState: number }).then((res) => {
+        if (res.code == "000000") {
+          this.$message.success({ message: "操作成功!" });
+          this.getPage();
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+    //开始倒计时
+    stateEdit(item, index, number) {
+      if (number == 0) {
+        updateTime({ id: item.id }).then((res) => {
+          if (res.code == "000000") {
+            this.$message.success({ message: "上钟成功!" });
+            this.getPage();
+          } else {
+            this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        });
+      } else {
+        updateTimeX({ id: item.id }).then((res) => {
+          if (res.code == "000000") {
+            this.$message.success({ message: "下钟成功!" });
+            this.getPage();
+            // this.$refs.time[0].show(item, "", 1);
+            // let endDate = "2022-05-14 14:59:00";
+          } else {
+            this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        });
+      }
+    },
+    timendData(v) {
+      if (v.form.id) {
+        this.list.forEach((item) => {
+          item.showList.forEach((items) => {
+            items.overtime = v.overtime;
+          });
+        });
+      }
+    },
+    openStaffList() {
+      let form = { id: null };
+      var that = this;
+      selectList(form).then((res) => {
+        this.listLoading = false;
+        this.openDrawer = true;
+        if (res.code == "000000") {
+          this.staffTable = res.rows;
+          this.staffTable.forEach((item) => {
+            item.staffId = item.id;
+            this.selection.push(item);
+            this.staffList.forEach((items) => {
+              if (item.staffId == items.staffId) {
+                console.log(this.$refs.staffTable);
+                this.$nextTick(() => {
+                  that.$refs.staffTable.toggleRowSelection(item, true);
+                });
+              }
+            });
+          });
+          this.selection = this.staffTable;
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+    //多选方法
+    getCurrentRow(row) {
+      this.$refs["staffTable"].toggleRowSelection(row);
+    },
+    //多选变动方法
+    handleSelectionChange(selection) {
+      this.selection = selection;
+      console.log(this.selection);
+    },
+    upDate() {
+      addServiceOrder(this.selection).then((res) => {
+        if (res.code == "000000") {
+          this.$message.success({ message: "排班成功!" });
+          this.getPage();
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+    //组件传值
+    show() {
+      this.getData();
+      this.getPage();
+      this.getStaff();
+    },
+    openRoom(item) {
+      if (item.onState == 2) {
+      } else {
+        this.$refs.room.show(item);
+      }
+    },
+    roomDatas(v) {
+      if (v) {
+        this.$emit("roomData", v);
+      } else {
+        this.$emit("roomData");
+      }
+      this.getPage();
+    },
+    addMin(v, n) {
+      if (v) {
+        v = new Date(v.valueOf());
+        v.setMinutes(v.getMinutes() + n);
+        return v;
+      }
+    },
+    getStaff() {
+      serviceOrderLists().then((res) => {
+        if (res.code == "000000") {
+          this.staffList = res.rows;
+        } else {
+          this.$alert(res.message, "加载员工列表", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+    //获取数据
+    async getData() {
+      roomSatet({}).then((res) => {
+        if (res.code == "000000") {
+          this.stateList.forEach((item) => {
+            if (item.label == "超时") {
+              item.state = res.data.overtime;
+            }
+            if (item.label == "正在使用") {
+              item.state = res.data.use;
+            }
+            if (item.label == "空闲") {
+              item.state = res.data.leisure;
+            }
+            if (item.label == "打扫") {
+              item.state = res.data.sweep;
+            }
+            if (item.label == "等待") {
+              item.state = res.data.await;
+            }
+          });
+        } else {
+          this.$alert(res.message, "加载房间状态", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+    getPage() {
+      this.loading = true;
+      roomPages(this.queryForm)
+        .then((res) => {
+          if (res.code == "000000") {
+            this.loading = false;
+            res.pageInfo.list.forEach((item) => {
+              let number = 0;
+              let list = [];
+              item.showList = [];
+              item.storeRoomHandList.forEach((items) => {
+                if (items.state == 1) {
+                  number++;
+                }
+                items.storeSettlement.forEach((itemss, index) => {
+                  itemss.servicingTimeChange = itemss.servicingTime;
+                  item.showList.push(itemss);
+                  if (itemss.serviceStartDate) {
+                    itemss.endDateTime = this.formatTime(
+                      this.addMin(
+                        itemss.serviceStartDate,
+                        itemss.servicingTime
+                      ),
+                      "YYYY-MM-DD hh:mm:ss"
+                    );
+                  }
+                });
+              });
+              item.outRoomHand = number;
+            });
+            this.list = res.pageInfo.list;
+            var that = this;
+            let nowDate = this.formatTime(new Date(), "YYYY-MM-DD hh:mm:ss");
+            this.list.forEach((item) => {
+              item.showList.forEach((items, index) => {
+                items.endTime = "";
+                if (items.endDateTime < nowDate) {
+                  items.serviceState = 2;
+                } else {
+                  items.serviceState = 1;
+                }
+                if (items.endDateTime) {
+                  if (items.serviceEndDate) {
+                    // setTimeout(() => {
+                    //   that.$refs.time[index].show(
+                    //     items,
+                    //     items.serviceEndDate,
+                    //     0
+                    //   );
+                    // }, 1000);
+                    items.serviceState = 0;
+                    items.endTime = this.shows(items, items.serviceEndDate, 0);
+                  } else {
+                    items.endTime = this.shows(items, items.endDateTime, 0);
+                    // setTimeout(() => {
+                    //   console.log(that.$refs.time[index]);
+                    //   console.log(items);
+                    //   console.log(items.endDateTime);
+                    //   that.$refs.time[index].show(items, items.endDateTime, 0);
+                    // }, 1000);
+                  }
+                }
+              });
+            });
+            var that = this;
+            setTimeout(() => {
+              that.getPage();
+              return;
+            }, 60000);
+          } else {
+            this.$alert(res.message, "加载房间列表", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        })
+        .catch((err) => {
+          this.loading = false;
+        });
+      this.getData();
+      this.getStaff();
+    },
+    shows(form, endTime, number) {
+      this.rowForm = form;
+      if (number == 1) {
+        this.flag = true;
+        this.endTime = new Date();
+        return this.timeDown();
+      } else {
+        this.endTime = endTime;
+        this.flag = false;
+        return this.timeDown();
+      }
+      if (!endTime) {
+        this.endTime = "";
+        this.flag = false;
+        return this.timeDown();
+      }
+    },
+    timeDown() {
+      const endTime = new Date(this.endTime);
+      const nowTime = new Date();
+      let leftTime = parseInt((endTime.getTime() - nowTime.getTime()) / 1000);
+      let d = parseInt(leftTime / (24 * 60 * 60));
+      let h = this.formate(parseInt((leftTime / (60 * 60)) % 24));
+      let m = this.formate(parseInt((leftTime / 60) % 60));
+      let s = this.formate(parseInt(leftTime % 60));
+      var that = this;
+      if (leftTime <= 0) {
+        this.flag = true;
+        this.$emit("timendData", { form: this.form, overtime: this.overtime });
+      }
+      if (leftTime == 0) {
+        this.flag = true;
+        this.$emit("timendData", { form: this.form, overtime: this.overtime });
+      } else {
+        // setTimeout(() => {
+        //   that.timeDown();
+        // }, 1000);
+        if (m < 0 || s < 0 || h) {
+          m = this.formate(-m);
+          s = this.formate(-s);
+          h = this.formate(-h);
+          this.overtime = true;
+          clearInterval(this.timer);
+        } else {
+          this.overtime = false;
+        }
+        if (h > 0) {
+          m = m + h * 60;
+        }
+        this.time = `${m}:${s}`; // 需要修改时间样式的话 ，比如需要什么30分钟倒计时，就只保留分和秒
+        return this.time;
+      }
+    },
+    formate(time) {
+      if (time == NaN) {
+        clearInterval(this.timer);
+      }
+      if (time >= 10 || time <= 0) {
+        return time;
+      } else {
+        return `0${time}`;
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+.room {
+  height: 200px;
+  width: 320px;
+  border: 1px solid burlywood;
+  border-radius: 10px;
+  overflow: hidden;
+}
+.room-body {
+  padding-bottom: 170px;
+  overflow: auto;
+}
+.selcet-text {
+  border-bottom: 3px blue solid;
+}
+.room-header {
+  height: 38px;
+  line-height: 38px;
+  /* background: rgb(2, 175, 2); */
+  padding-left: 15px;
+  font-size: 16px;
+  color: white;
+}
+.room-main {
+  height: 130px;
+  max-height: 130px;
+  overflow: auto;
+  background: white;
+}
+.room-main-line {
+  height: 130px;
+  line-height: 130px;
+  background: white;
+}
+.room-foot {
+  height: 32px;
+  padding-right: 15px;
+  background: white;
+  background: rgb(173, 201, 253);
+}
+.stafflist {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  height: 95px;
+  padding-top: 10px;
+  border: 1px solid rgb(247, 56, 8);
+  border-radius: 10px;
+  background: white;
+  overflow: auto;
+  z-index: 999;
+}
+.staff {
+  width: 130px;
+  height: 85px;
+  border: 1px solid #eee;
+  border-radius: 8px;
+  margin-right: 15px;
+  overflow: hidden;
+}
+.staff-head {
+  height: 35px;
+  line-height: 35px;
+  width: 100%;
+  color: white;
+}
+.sort-move {
+  transition: transform 1s;
+}
+.staff-main {
+  height: 42px;
+  width: 114px;
+  line-height: 42px;
+  margin: auto;
+  text-align: center;
+  background: #fff;
+}
+</style>
diff --git a/src/pages/eashier/roomRefund/components/detail.vue b/src/pages/eashier/roomRefund/components/detail.vue
index ee1fbd6..398b8df 100644
--- a/src/pages/eashier/roomRefund/components/detail.vue
+++ b/src/pages/eashier/roomRefund/components/detail.vue
@@ -260,21 +260,27 @@ export default {
         console.log(this.managerOptions);
         this.managerOptions.forEach((item, index) => {
           if (item.id == data) {
-            form[text].splice(0, 1, item);
+            item.ratio = 100;
+            form[text] = [];
+            form[text].push(item);
             form.texts = item.label;
           }
         });
       } else if (text == "adminList") {
         this.adminOptions.forEach((item, index) => {
           if (item.id == data) {
-            form[text].splice(0, 1, item);
+            item.ratio = 100;
+            form[text] = [];
+            form[text].push(item);
             form.texts = item.label;
           }
         });
       } else {
         this.options.forEach((item, index) => {
           if (item.id == data) {
-            form[text].splice(0, 1, item);
+            item.ratio = 100;
+            form[text] = [];
+            form[text].push(item);
             form.texts = item.label;
           }
         });
diff --git a/src/pages/promotion/giftCards/components/edit.vue b/src/pages/promotion/giftCards/components/edit.vue
index 0430e23..91208b7 100644
--- a/src/pages/promotion/giftCards/components/edit.vue
+++ b/src/pages/promotion/giftCards/components/edit.vue
@@ -1,178 +1,181 @@
-<template>
-  <el-dialog :close-on-click-modal="false" v-dialogDrag rechargeTypeId="form" :title="title" :visible.sync="dialogFormVisible" :before-close="handleClose">
-    <el-form :model="form" inline :rules="rules" ref="form" label-width="100px">
-      <el-form-item label="充值编码：" prop="rechargeTypeNum">
-        <div @click="openRec">
-          <span v-if="form.rechargeTypeNum" class="text-cyan">{{form.rechargeTypeNum}}</span>
-          <el-button v-else type="text">选择充值类别</el-button>
-        </div>
-      </el-form-item>
-      <el-form-item label="充值名称：" prop="rechargeTypeName">
-        {{form.rechargeTypeName}}
-      </el-form-item>
-      <el-form-item label="折扣(%)：" prop="discount">
-        <div class="text-bold">
-          {{form.discount}}
-        </div>
-      </el-form-item>
-      <el-form-item label="到期日期：" prop="expireDate">
-        <div class="block">
-          <el-date-picker v-model="form.expireDate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" type="date" placeholder="选择日期">
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <el-form-item label="赠送金额：" prop="rechargeMoney">
-        <el-input class="form-width" type="number" v-model="form.rechargeMoney" autocomplete="on"></el-input>
-      </el-form-item>
-      <el-form-item label="份数：" prop="quantity">
-        <el-input :disabled="title!='添加'" class="form-width" type="number" v-model="form.quantity" autocomplete="on"></el-input>
-      </el-form-item>
-      <el-table v-if="title=='修改'" class="margin-top-xs" border v-loading="listLoading" :data="form.baseZengkaIssues" :element-loading-text="elementLoadingText" max-height="400" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
-        <el-table-column type="index" width="40" align="center"></el-table-column>
-        <el-table-column show-overflow-tooltip align="center" min-width="100" prop="memberNum" label="会员编码"></el-table-column>
-        <el-table-column show-overflow-tooltip align="center" min-width="100" prop="memberCard" label="会员卡">
-          <template slot-scope="scope">
-            <div class="flex justify-center align-center">
-              <div class="border form-width-m" style="height:38px;line-height:38px" v-if="editIndex!=scope.$index" @click="editIndex = scope.$index">{{scope.row.memberCard}}</div>
-              <el-input class="form-width-m" v-focus v-else v-model="scope.row.memberCard" @blur="endEdit(scope.row,scope.$index)"></el-input>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column show-overflow-tooltip align="center" min-width="80" prop="state" label="状态">
-          <template slot-scope="scope">
-            <el-tag size="medium" effect="dark" :type=" scope.row.state ==1? 'success': '' ">
-              <div>
-                <span v-show="scope.row.state==0">未发放</span>
-                <span v-show="scope.row.state==1">已发放</span>
-              </div>
-            </el-tag>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-form>
-    <rec ref="rec" @recTypeData="recData"></rec>
-    <div slot="footer" class="dialog-footer">
-      <el-button size="mini" type="primary" plain @click="handleClose">取 消</el-button>
-      <el-button size="mini" type="primary" @click="confirm">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import rec from "@/components/recharge/type/index";
-import { addBaseZengka, editBaseZengka } from "@/api/promotion.js";
-export default {
-  components: { rec },
-  data() {
-    return {
-      rules: {
-        rechargeTypeNum: {
-          required: true,
-          message: "请输入充值类别编码",
-          trigger: ["blur", "change"],
-        },
-        quantity: {
-          required: true,
-          message: "请输入份数",
-          trigger: ["blur", "change"],
-        },
-
-        rechargeMoney: {
-          required: true,
-          message: "请输入赠送金额",
-          trigger: ["blur", "change"],
-        },
-      },
-      form: {}, //主对象
-      rowForm: {},
-      listLoading: false, //list加载提示开启动画
-      elementLoadingText: "加载中...", //list加载提示文字
-      title: "", //弹窗标题
-      dialogFormVisible: false, //弹窗开关
-      editIndex: -1,
-    };
-  },
-  methods: {
-    //关闭弹窗前的回调方法
-    handleClose() {
-      this.form = {};
-      this.dialogFormVisible = false;
-      this.$refs.form.clearValidate();
-    },
-    //打开选择会员充值卡包弹窗
-    openRec() {
-      this.$refs.rec.show(1);
-    },
-    endEdit(row, index) {
-      this.editIndex = -1;
-    },
-    //选中会员充值卡包返回方法
-    recData(v) {
-      let form = { ...this.form };
-      form.rechargeTypeNum = v.rechargeTypeNum;
-      form.rechargeTypeName = v.rechargeTypeName;
-      form.rechargeTypeId = v.id;
-      form.discount = v.discount;
-      this.form = JSON.parse(JSON.stringify(form));
-    },
-    //组件传值
-    show(form) {
-      this.form = {};
-      if (form == "添加") {
-        this.title = form;
-      } else {
-        this.title = "修改";
-        this.form = { ...form };
-      }
-      this.dialogFormVisible = true;
-    },
-
-    //确定返回方法
-    confirm() {
-      if (this.title == "添加") {
-        addBaseZengka(this.form)
-          .then((res) => {
-            if (res.code == "000000") {
-              this.$emit("editData");
-              this.dialogFormVisible = false;
-              this.$message.success({
-                message: "数据添加成功!",
-              });
-            } else {
-              this.$alert(res.message, "提示", {
-                confirmButtonText: "确定",
-                confirmButtonClass: "confirmbtnFalses",
-                type: "warning",
-                center: true,
-                callback: (action) => {},
-              });
-            }
-          })
-          .catch((err) => {
-            //console.log(err);
-          });
-      } else {
-        editBaseZengka(this.form).then((res) => {
-          if (res.code == "000000") {
-            this.$emit("editData");
-            this.dialogFormVisible = false;
-            this.$message.success({
-              message: res.message,
-            });
-          } else {
-            this.$alert(res.message, "提示", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: (action) => {},
-            });
-          }
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style>
-</style>
+<template>
+  <el-dialog :close-on-click-modal="false" v-dialogDrag rechargeTypeId="form" :title="title" :visible.sync="dialogFormVisible" :before-close="handleClose">
+    <el-form :model="form" inline :rules="rules" ref="form" label-width="100px">
+      <el-form-item label="充值编码：" prop="rechargeTypeNum">
+        <div @click="openRec">
+          <span v-if="form.rechargeTypeNum" class="text-cyan">{{form.rechargeTypeNum}}</span>
+          <el-button v-else type="text">选择充值类别</el-button>
+        </div>
+      </el-form-item>
+      <el-form-item label="充值名称：" prop="rechargeTypeName">
+        {{form.rechargeTypeName}}
+      </el-form-item>
+      <el-form-item label="折扣(%)：" prop="discount">
+        <div class="text-bold">
+          {{form.discount}}
+        </div>
+      </el-form-item>
+      <el-form-item label="到期日期：" prop="expireDate">
+        <div class="block">
+          <el-date-picker v-model="form.expireDate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" type="date" placeholder="选择日期">
+          </el-date-picker>
+        </div>
+      </el-form-item>
+      <el-form-item label="赠送金额：" prop="rechargeMoney">
+        <el-input class="form-width" type="number" v-model="form.rechargeMoney" autocomplete="on"></el-input>
+      </el-form-item>
+      <el-form-item label="份数：" prop="quantity">
+        <el-input :disabled="title!='添加'" class="form-width" type="number" v-model="form.quantity" autocomplete="on"></el-input>
+      </el-form-item>
+      <el-table v-if="title=='修改'" class="margin-top-xs" border v-loading="listLoading" :data="form.baseZengkaIssues" :element-loading-text="elementLoadingText" max-height="400" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
+        <el-table-column type="index" width="40" align="center"></el-table-column>
+        <el-table-column show-overflow-tooltip align="center" min-width="100" prop="memberNum" label="会员编码"></el-table-column>
+        <el-table-column show-overflow-tooltip align="center" min-width="100" prop="memberCard" label="会员卡">
+          <template slot-scope="scope">
+            <div class="flex justify-center align-center">
+              <div class="border form-width-m" style="height:38px;line-height:38px" v-if="editIndex!=scope.$index" @click="editIndex = scope.$index">{{scope.row.memberCard}}</div>
+              <el-input class="form-width-m" v-focus v-else v-model="scope.row.memberCard" @blur="endEdit(scope.row,scope.$index)"></el-input>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip align="center" min-width="80" prop="state" label="状态">
+          <template slot-scope="scope">
+            <el-tag size="medium" effect="dark" :type=" scope.row.state ==1? 'success': '' ">
+              <div>
+                <span v-show="scope.row.state==0">未发放</span>
+                <span v-show="scope.row.state==1">已发放</span>
+              </div>
+            </el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+    <rec ref="rec" @recTypeData="recData"></rec>
+    <div slot="footer" class="dialog-footer">
+      <el-button size="mini" type="primary" plain @click="handleClose">取 消</el-button>
+      <el-button size="mini" type="primary" @click="confirm">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import rec from "@/components/recharge/type/index";
+import { addBaseZengka, editBaseZengka } from "@/api/promotion.js";
+export default {
+  components: { rec },
+  data() {
+    return {
+      rules: {
+        rechargeTypeNum: {
+          required: true,
+          message: "请输入充值类别编码",
+          trigger: ["blur", "change"],
+        },
+        quantity: {
+          required: true,
+          message: "请输入份数",
+          trigger: ["blur", "change"],
+        },
+
+        rechargeMoney: {
+          required: true,
+          message: "请输入赠送金额",
+          trigger: ["blur", "change"],
+        },
+      },
+      form: {}, //主对象
+      rowForm: {},
+      listLoading: false, //list加载提示开启动画
+      elementLoadingText: "加载中...", //list加载提示文字
+      title: "", //弹窗标题
+      dialogFormVisible: false, //弹窗开关
+      editIndex: -1,
+    };
+  },
+  methods: {
+    //关闭弹窗前的回调方法
+    handleClose() {
+      this.form = {};
+      this.dialogFormVisible = false;
+      this.$refs.form.clearValidate();
+    },
+    //打开选择会员充值卡包弹窗
+    openRec() {
+      this.$refs.rec.show(1);
+    },
+    endEdit(row, index) {
+      this.editIndex = -1;
+    },
+    //选中会员充值卡包返回方法
+    recData(v) {
+      let form = { ...this.form };
+      form.rechargeTypeNum = v.rechargeTypeNum;
+      form.rechargeTypeName = v.rechargeTypeName;
+      form.rechargeTypeId = v.id;
+      form.discount = v.discount;
+      this.form = JSON.parse(JSON.stringify(form));
+    },
+    //组件传值
+    show(form) {
+      this.form = {};
+      if (form == "添加") {
+        this.title = form;
+      } else {
+        this.title = "修改";
+        this.form = { ...form };
+      }
+      this.dialogFormVisible = true;
+      setTimeout(() => {
+        this.$refs.form.clearValidate();
+      }, 300);
+    },
+
+    //确定返回方法
+    confirm() {
+      if (this.title == "添加") {
+        addBaseZengka(this.form)
+          .then((res) => {
+            if (res.code == "000000") {
+              this.$emit("editData");
+              this.dialogFormVisible = false;
+              this.$message.success({
+                message: "数据添加成功!",
+              });
+            } else {
+              this.$alert(res.message, "提示", {
+                confirmButtonText: "确定",
+                confirmButtonClass: "confirmbtnFalses",
+                type: "warning",
+                center: true,
+                callback: (action) => {},
+              });
+            }
+          })
+          .catch((err) => {
+            //console.log(err);
+          });
+      } else {
+        editBaseZengka(this.form).then((res) => {
+          if (res.code == "000000") {
+            this.$emit("editData");
+            this.dialogFormVisible = false;
+            this.$message.success({
+              message: res.message,
+            });
+          } else {
+            this.$alert(res.message, "提示", {
+              confirmButtonText: "确定",
+              confirmButtonClass: "confirmbtnFalses",
+              type: "warning",
+              center: true,
+              callback: (action) => {},
+            });
+          }
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/pages/storeManage/memberClass/index.vue b/src/pages/storeManage/memberClass/index.vue
index ff5d0a7..e5ce59f 100644
--- a/src/pages/storeManage/memberClass/index.vue
+++ b/src/pages/storeManage/memberClass/index.vue
@@ -16,7 +16,7 @@
           <div>{{scope.row.statisticsQuarter==0?'月度':scope.row.statisticsQuarter==1?'半年度':'一年度'}}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="classRow" label="等级编号" show-overflow-tooltip min-width="90" sortable></el-table-column>
+      <el-table-column align="center" prop="classRow" label="等级级别" show-overflow-tooltip min-width="90" sortable></el-table-column>
       <el-table-column align="center" prop="rechargeStandard" label="充值标准" show-overflow-tooltip min-width="90" sortable></el-table-column>
       <el-table-column align="center" prop="courseStandard" label="疗程标准" show-overflow-tooltip min-width="90" sortable></el-table-column>
       <el-table-column align="center" prop="cashDecimal" label="收银标准" show-overflow-tooltip min-width="90" sortable></el-table-column>
diff --git a/src/pages/storeManage/menmberAllot/components/alloted.vue b/src/pages/storeManage/menmberAllot/components/alloted.vue
index 42da63b..620b65c 100644
--- a/src/pages/storeManage/menmberAllot/components/alloted.vue
+++ b/src/pages/storeManage/menmberAllot/components/alloted.vue
@@ -1,255 +1,255 @@
-<template>
-  <div>
-    <hr />
-    <el-table :data="list" stripe style="width: 100%" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
-      <el-table-column align="center" prop="memberNum" label="编码" min-width="80" sortable></el-table-column>
-      <el-table-column align="center" prop="memberName" label="姓名" min-width="100" sortable></el-table-column>
-      <el-table-column align="center" prop="sex" label="性别" min-width="80">
-        <template slot-scope="scope">{{scope.row.label==1?'男':'女'}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="label" :show-overflow-tooltip="true" label="标签" min-width="80">
-        <template slot-scope="scope">{{scope.row.label==null?'暂时没有标签':scope.row.label}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="mobilePhone" label="手机" min-width="150" sortable>
-        <template slot-scope="scope">{{scope.row.mobilePhone | phone}}</template>
-      </el-table-column>
-
-      <!-- <el-table-column label="跟进人" align="center">
-        <el-table-column align="center" prop="staffId" label="编码" min-width="100" sortable></el-table-column>
-        <el-table-column align="center" prop="staffName" label="名称" min-width="100" sortable></el-table-column>
-      </el-table-column>-->
-      <el-table-column fixed="right" align="center" label="操作" min-width="150" v-role='4008001'>
-        <template slot-scope="scope" fixed="right">
-          <el-button size="small" type="primary" @click="changeAllote(scope.row,scope.$index,(changeVisible=true))" plain>改派</el-button>
-          <el-button size="small" type="primary" @click="allote(scope.row,scope.$index,(lookVisible=true))">查看</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="block" style="margin-top:15px;">
-      <!-- 分页组件 -->
-      <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
-    </div>
-    <!-- 查看 -->
-    <el-drawer :visible.sync="lookVisible" size="30%" direction="rtl">
-      <div class="drawerForm">
-        <el-form :model="lookDrawer">
-          <el-form-item label="会员编号:" :label-width="formLabelwidth">{{lookDrawer.memberNum}}</el-form-item>
-          <el-form-item label="会员名称:" :label-width="formLabelwidth">{{lookDrawer.memberName}}</el-form-item>
-          <el-form-item label="会员性别:" :label-width="formLabelwidth">{{lookDrawer.sex}}</el-form-item>
-          <el-form-item label="跟进人：" :label-width="formLabelwidth">{{lookDrawer.staffName}}</el-form-item>
-          <el-form-item label="标签：" :label-width="formLabelwidth">{{lookDrawer.label}}</el-form-item>
-        </el-form>
-      </div>
-
-    </el-drawer>
-    <!-- 改派 -->
-    <!-- 分派 -->
-    <el-dialog :close-on-click-modal="false" v-dialogDrag title="改派" :visible.sync="changeVisible" width="800px">
-      <el-form :model="allotForm" :inline="true">
-        <el-form-item label="会员编码：" :label-width="formLabelwidth">
-          <span>{{allotForm.memberNum}}</span>
-        </el-form-item>
-        <el-form-item label="会员名称：" :label-width="formLabelwidth">
-          <span>{{allotForm.memberName}}</span>
-        </el-form-item>
-        <el-form-item label="会员性别：" :label-width="formLabelwidth">
-          <span>{{allotForm.sex==1?'男':'女'}}</span>
-        </el-form-item>
-        <el-form-item label="原跟进人员：" :label-width="formLabelwidth">
-          <span>{{allotForm.allotstaff}}</span>
-        </el-form-item>
-        <br />
-        <el-form-item label="新跟进人员：" :label-width="formLabelwidth">
-          <span>{{newallotstaff}}</span>
-        </el-form-item>
-        <div style="width:400px;margin:0px auto">
-          <div class="tableDiv">
-            <el-table :data="staffList" style="padding-left:20px;" @current-change="changetable" @row-dblclick="confirm">
-              <el-table-column align="center" label="选择" width="100">
-                <template slot-scope="scope">
-                  <el-radio v-model="radiotable" :label="scope.row.id" @change.native="(scope.row)"></el-radio>
-                </template>
-              </el-table-column>
-              <el-table-column align="center" prop="brandNumber" label="水牌号" width="100"></el-table-column>
-              <el-table-column align="center" prop="staffName" label="名字" min-width="80"></el-table-column>
-            </el-table>
-          </div>
-          <div class="block" style="margin-top:15px;">
-            <!-- 分页组件 -->
-            <el-pagination align="left" @size-change="handleSizeChanges" @current-change="handleCurrentChanges" :current-page="pageNum" :page-sizes="[10,20,30,40,50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="staffList.length"></el-pagination>
-          </div>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="changeVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="confirm(changeVisible=false)">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { staffPage, pageassign, storeMemberassign } from "@/api/storeManage.js";
-export default {
-  data() {
-    return {
-      changeVisible: false, //改派弹窗
-      lookVisible: false, //查看抽屉开关
-      pageNum: 1, // 当前页码
-      total: "", // 总条数
-      pageSize: 10, // 每页的数据条数,
-      input: "", //当前页查询输入值
-      lookDrawer: {}, //查看分派表单
-      radiotable: "", //选中员工值
-      allotstaffList: "", //选中员工表单
-      formLabelwidth: "130px", //表单提示标题宽度
-      newallotstaff: "", //新的分派人员
-      list: [], //主数组
-      staffList: [], //员工列表
-      total: 0, //分页总条数
-      queryForm: {
-        //查询对象
-        pageNum: 1,
-        pageSize: 10,
-      },
-      allotForm: {}, //分派表单
-      pageInfo: {
-        total: 0, //分页总条数
-        tableList: [],
-      },
-      staffForm: {
-        pageNum: 1,
-        pageSize: 10,
-        state: 1,
-      },
-      Index: -1,
-    };
-  },
-  methods: {
-    //改派 显示员工信息
-    changeAllote(row, index) {
-      this.allotForm = { ...row };
-      this.allotForm.allotstaff = row.staffName;
-      //console.log(row);
-      this.getStaff();
-
-      this.radiotable = row.staffId;
-    },
-    //获取员工列表
-    getStaff() {
-      staffPage(this.staffForm).then((res) => {
-        this.staffList = res.pageInfo.list;
-      });
-    },
-    //选择改派员工
-    changetable(row) {
-      console.log(row);
-      if (row) {
-        this.newallotstaff = row.staffName;
-        this.radiotable = row.id;
-        this.allotstaffList = row;
-      }
-    },
-    //改派确定
-    //确定返回方法
-    confirm() {
-      // this.allotForm.allotstaff = this.allotstaff;
-      var allotForm = {
-        id: this.allotForm.id,
-        staffId: this.allotstaffList.id,
-        staffName: this.allotstaffList.staffName,
-      };
-      storeMemberassign(allotForm).then((res) => {
-        if (res.code == "000000") {
-          if (this.radiotable !== "") {
-            this.$message({
-              type: "success",
-              message: "已成功改派!",
-            });
-            this.visible = false;
-          } else {
-            this.$message({
-              type: "error",
-              message: "请选择改派人员!",
-            });
-          }
-          this.getData();
-        } else {
-          this.$alert(res.message, "提示", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    //查看
-    allote(row) {
-      this.lookDrawer = { ...row };
-    },
-    //分页方法
-    handleSizeChange(val) {
-      this.queryForm.pageSize = val;
-      this.getData();
-    },
-    handleCurrentChange(val) {
-      this.queryForm.pageNum = val;
-      this.getData();
-    },
-    //员工列表分页方法
-    handleSizeChanges(val) {
-      this.staffForm.pageSize = val;
-      this.getStaff();
-    },
-    handleCurrentChanges(val) {
-      this.staffForm.pageNum = val;
-      this.getStaff();
-    },
-    //获取数据
-    async getData() {
-      pageassign(this.queryForm).then((res) => {
-        if (res.code == "000000") {
-          this.list = res.pageInfo.list;
-          this.total = res.pageInfo.total;
-        }
-      });
-    },
-    //组件传值
-    show(form) {
-      if (form) {
-        this.queryForm = Object.assign(form, this.queryForm);
-      }
-      this.queryForm.assignState = 1;
-      this.queryForm.storeId = JSON.parse(
-        sessionStorage.getItem("storeInfo")
-      ).id;
-      this.getData();
-    },
-  },
-};
-</script>
-<style scoped>
-.el-drawer label {
-  margin: 0px 0px 20px 10px;
-  color: rgb(117, 117, 117);
-}
-.el-drawer hr {
-  margin: 10px auto;
-  margin-top: 10px;
-}
-.fenpai {
-  display: block;
-  margin-left: 110px;
-}
-.drawerForm .el-drawer label {
-  margin: 0;
-}
-.drawerForm .el-form-item {
-  margin-bottom: 5px;
-}
-.tableDiv /deep/ .el-radio__label {
-  display: none !important;
-}
-</style>
+<template>
+  <div>
+    <hr />
+    <el-table :data="list" stripe style="width: 100%" :header-cell-style="{background: 'linear-gradient(#6cb3ff, #1873d4)',color:'#eeeeee'}">
+      <el-table-column align="center" prop="memberNum" label="编码" min-width="80" sortable></el-table-column>
+      <el-table-column align="center" prop="memberName" label="姓名" min-width="100" sortable></el-table-column>
+      <el-table-column align="center" prop="sex" label="性别" min-width="80">
+        <template slot-scope="scope">{{scope.row.sex==1?'男':'女'}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="label" :show-overflow-tooltip="true" label="标签" min-width="80">
+        <template slot-scope="scope">{{scope.row.label==null?'暂时没有标签':scope.row.label}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="mobilePhone" label="手机" min-width="150" sortable>
+        <template slot-scope="scope">{{scope.row.mobilePhone | phone}}</template>
+      </el-table-column>
+
+      <!-- <el-table-column label="跟进人" align="center">
+        <el-table-column align="center" prop="staffId" label="编码" min-width="100" sortable></el-table-column>
+        <el-table-column align="center" prop="staffName" label="名称" min-width="100" sortable></el-table-column>
+      </el-table-column>-->
+      <el-table-column fixed="right" align="center" label="操作" min-width="150" v-role='4008001'>
+        <template slot-scope="scope" fixed="right">
+          <el-button size="small" type="primary" @click="changeAllote(scope.row,scope.$index,(changeVisible=true))" plain>改派</el-button>
+          <el-button size="small" type="primary" @click="allote(scope.row,scope.$index,(lookVisible=true))">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="block" style="margin-top:15px;">
+      <!-- 分页组件 -->
+      <el-pagination align="left" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="queryForm.pageNum" :page-sizes="[10,20,30,40,50]" :page-size="queryForm.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
+    </div>
+    <!-- 查看 -->
+    <el-drawer :visible.sync="lookVisible" size="30%" direction="rtl">
+      <div class="drawerForm">
+        <el-form :model="lookDrawer">
+          <el-form-item label="会员编号:" :label-width="formLabelwidth">{{lookDrawer.memberNum}}</el-form-item>
+          <el-form-item label="会员名称:" :label-width="formLabelwidth">{{lookDrawer.memberName}}</el-form-item>
+          <el-form-item label="会员性别:" :label-width="formLabelwidth">{{lookDrawer.sex}}</el-form-item>
+          <el-form-item label="跟进人：" :label-width="formLabelwidth">{{lookDrawer.staffName}}</el-form-item>
+          <el-form-item label="标签：" :label-width="formLabelwidth">{{lookDrawer.label}}</el-form-item>
+        </el-form>
+      </div>
+
+    </el-drawer>
+    <!-- 改派 -->
+    <!-- 分派 -->
+    <el-dialog :close-on-click-modal="false" v-dialogDrag title="改派" :visible.sync="changeVisible" width="800px">
+      <el-form :model="allotForm" :inline="true">
+        <el-form-item label="会员编码：" :label-width="formLabelwidth">
+          <span>{{allotForm.memberNum}}</span>
+        </el-form-item>
+        <el-form-item label="会员名称：" :label-width="formLabelwidth">
+          <span>{{allotForm.memberName}}</span>
+        </el-form-item>
+        <el-form-item label="会员性别：" :label-width="formLabelwidth">
+          <span>{{allotForm.sex==1?'男':'女'}}</span>
+        </el-form-item>
+        <el-form-item label="原跟进人员：" :label-width="formLabelwidth">
+          <span>{{allotForm.allotstaff}}</span>
+        </el-form-item>
+        <br />
+        <el-form-item label="新跟进人员：" :label-width="formLabelwidth">
+          <span>{{newallotstaff}}</span>
+        </el-form-item>
+        <div style="width:400px;margin:0px auto">
+          <div class="tableDiv">
+            <el-table :data="staffList" style="padding-left:20px;" @current-change="changetable" @row-dblclick="confirm">
+              <el-table-column align="center" label="选择" width="100">
+                <template slot-scope="scope">
+                  <el-radio v-model="radiotable" :label="scope.row.id" @change.native="(scope.row)"></el-radio>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="brandNumber" label="水牌号" width="100"></el-table-column>
+              <el-table-column align="center" prop="staffName" label="名字" min-width="80"></el-table-column>
+            </el-table>
+          </div>
+          <div class="block" style="margin-top:15px;">
+            <!-- 分页组件 -->
+            <el-pagination align="left" @size-change="handleSizeChanges" @current-change="handleCurrentChanges" :current-page="pageNum" :page-sizes="[10,20,30,40,50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="staffList.length"></el-pagination>
+          </div>
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="changeVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="confirm(changeVisible=false)">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { staffPage, pageassign, storeMemberassign } from "@/api/storeManage.js";
+export default {
+  data() {
+    return {
+      changeVisible: false, //改派弹窗
+      lookVisible: false, //查看抽屉开关
+      pageNum: 1, // 当前页码
+      total: "", // 总条数
+      pageSize: 10, // 每页的数据条数,
+      input: "", //当前页查询输入值
+      lookDrawer: {}, //查看分派表单
+      radiotable: "", //选中员工值
+      allotstaffList: "", //选中员工表单
+      formLabelwidth: "130px", //表单提示标题宽度
+      newallotstaff: "", //新的分派人员
+      list: [], //主数组
+      staffList: [], //员工列表
+      total: 0, //分页总条数
+      queryForm: {
+        //查询对象
+        pageNum: 1,
+        pageSize: 10,
+      },
+      allotForm: {}, //分派表单
+      pageInfo: {
+        total: 0, //分页总条数
+        tableList: [],
+      },
+      staffForm: {
+        pageNum: 1,
+        pageSize: 10,
+        state: 1,
+      },
+      Index: -1,
+    };
+  },
+  methods: {
+    //改派 显示员工信息
+    changeAllote(row, index) {
+      this.allotForm = { ...row };
+      this.allotForm.allotstaff = row.staffName;
+      //console.log(row);
+      this.getStaff();
+
+      this.radiotable = row.staffId;
+    },
+    //获取员工列表
+    getStaff() {
+      staffPage(this.staffForm).then((res) => {
+        this.staffList = res.pageInfo.list;
+      });
+    },
+    //选择改派员工
+    changetable(row) {
+      console.log(row);
+      if (row) {
+        this.newallotstaff = row.staffName;
+        this.radiotable = row.id;
+        this.allotstaffList = row;
+      }
+    },
+    //改派确定
+    //确定返回方法
+    confirm() {
+      // this.allotForm.allotstaff = this.allotstaff;
+      var allotForm = {
+        id: this.allotForm.id,
+        staffId: this.allotstaffList.id,
+        staffName: this.allotstaffList.staffName,
+      };
+      storeMemberassign(allotForm).then((res) => {
+        if (res.code == "000000") {
+          if (this.radiotable !== "") {
+            this.$message({
+              type: "success",
+              message: "已成功改派!",
+            });
+            this.visible = false;
+          } else {
+            this.$message({
+              type: "error",
+              message: "请选择改派人员!",
+            });
+          }
+          this.getData();
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+    //查看
+    allote(row) {
+      this.lookDrawer = { ...row };
+    },
+    //分页方法
+    handleSizeChange(val) {
+      this.queryForm.pageSize = val;
+      this.getData();
+    },
+    handleCurrentChange(val) {
+      this.queryForm.pageNum = val;
+      this.getData();
+    },
+    //员工列表分页方法
+    handleSizeChanges(val) {
+      this.staffForm.pageSize = val;
+      this.getStaff();
+    },
+    handleCurrentChanges(val) {
+      this.staffForm.pageNum = val;
+      this.getStaff();
+    },
+    //获取数据
+    async getData() {
+      pageassign(this.queryForm).then((res) => {
+        if (res.code == "000000") {
+          this.list = res.pageInfo.list;
+          this.total = res.pageInfo.total;
+        }
+      });
+    },
+    //组件传值
+    show(form) {
+      if (form) {
+        this.queryForm = Object.assign(form, this.queryForm);
+      }
+      this.queryForm.assignState = 1;
+      this.queryForm.storeId = JSON.parse(
+        sessionStorage.getItem("storeInfo")
+      ).id;
+      this.getData();
+    },
+  },
+};
+</script>
+<style scoped>
+.el-drawer label {
+  margin: 0px 0px 20px 10px;
+  color: rgb(117, 117, 117);
+}
+.el-drawer hr {
+  margin: 10px auto;
+  margin-top: 10px;
+}
+.fenpai {
+  display: block;
+  margin-left: 110px;
+}
+.drawerForm .el-drawer label {
+  margin: 0;
+}
+.drawerForm .el-form-item {
+  margin-bottom: 5px;
+}
+.tableDiv /deep/ .el-radio__label {
+  display: none !important;
+}
+</style>