Merge branch 'xio_dev'

jazz

2023-12-13 d3f0ff6001c34c9ac37e9e776f090f5a696a1361

 src/pages/room/detail.vue

@@ -11,7 +11,7 @@
        </div>
      </div>
      <div class="right flex-1 flex flex-jcfe flex-ver">
        <el-button type="primary" icon="el-icon-refresh" class="reset_btn flex flex-center" size="small" style="width: 100px;" @click="getData">刷新</el-button>
        <el-button type="primary" icon="el-icon-refresh" class="reset_btn flex flex-center" size="small" style="width: 100px;" @click="resetPage">刷新</el-button>
        <div class="reset_btn flex flex-center" @click="resetStatus">重置房间状态</div>
        <div class="page_date">
          <div class="page_week">{{ timeObj.week }}</div>
@@ -22,7 +22,7 @@
      </div>
    </div>
    <!-- 未有安排 -->
    <div v-if="!occupyInfoView && (!assignTreatList || !assignTreatList.length)" class="page_container flex flex-1">
    <div v-if="!occupyInfoView && (!assignTreatListView || !assignTreatListView.length)" class="page_container flex flex-1">
      <div class="main flex-1">
        <div v-if="roomInfo && roomInfo.roomNo" class="room_title">{{ roomInfo.roomNo }}</div>
        <div v-if="roomInfo" class="room_main_tip" style="margin-top: 93px;line-height: 186px;font-size: 140px;">-{{ statusTx[roomInfo.status] }}-</div>
@@ -65,23 +65,23 @@
      </div>
    </div>
    <!-- 没有客人和有安排 -->
    <div v-if="!occupyInfoView && (assignTreatList && assignTreatList.length)" class="page_container flex flex-1">
    <div v-if="!occupyInfoView && (assignTreatListView && assignTreatListView.length)" class="page_container flex flex-1">
      <div class="main flex-1">
        <div v-if="roomInfo && roomInfo.roomNo" class="room_title">{{ roomInfo.roomNo }}</div>
        <div v-if="roomInfo" class="room_main_tip">-{{ statusTx[roomInfo.status] }}-</div>
        <div v-if="roomInfo && roomInfo.status >= 1" class="room_left_btn_box flex flex-ver">
          <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center yellow btn_ani" @click="setStatus('客人休息', 2)">客人休息</div>
          <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center gray btn_ani" @click="setStatus('打扫中', 3)">通知打扫</div>
          <div v-if="roomInfo.status == 2" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('打扫中', 3)">通知打扫</div>
          <div v-if="roomInfo.status == 3" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('空闲', 0)">结束打扫</div>
        <div v-show="roomInfo && roomInfo.status >= 1" class="room_left_btn_box flex flex-ver">
          <div v-show="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center yellow btn_ani" @click="setStatus('客人休息', 2)">客人休息</div>
          <div v-show="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center gray btn_ani" @click="setStatus('打扫中', 3)">通知打扫</div>
          <div v-show="roomInfo.status == 2" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('打扫中', 3)">通知打扫</div>
          <div v-show="roomInfo.status == 3" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('空闲', 0)">结束打扫</div>
        </div>
      </div>
      <div class="right">
        <div class="right_block flex flex-col">
          <div class="guest_title flex flex-center">等待诊疗</div>
          <div class="guest_block flex-1">
            <div v-if="assignTreatList && assignTreatList.length" class="guest_list">
              <div v-for="(item, index) in assignTreatList" :key="index" class="guest_list__row flex flex-ver" @click="selectCustomer(item)">
          <div class="guest_block flex-1" style="border-radius: 0 0 10px 10px;">
            <div v-if="assignTreatListView && assignTreatListView.length" class="guest_list">
              <div v-for="(item, index) in assignTreatListView" :key="index" class="guest_list__row flex flex-ver" @click="selectCustomer(item)">
                <div class="guest_list__td">
                  <div class="tx flex flex-ver">
                    <div class="flex-1 flex-1-w1 ell">{{ item.userName }}</div>
@@ -95,14 +95,14 @@
                  <span class="tx flex-1 flex-1-w1 ell">{{ item.aDoctorName?item.aDoctorName+'(医生)、':'' }}{{ item.aNurseName?item.aNurseName+'(护士)':'' }}</span>
                </div>
                <div class="guest_list__td flex flex-center">
                  <div class="tx">切换</div>
                  <div v-if="!item.act" class="tx" style="text-decoration: underline;color: #227beb;">切换</div>
                  <!-- <div class="icon">
                    <img class="img" src="static/imgs/choose.png">
                  </div> -->
                </div>
              </div>
            </div>
            <div v-if="!assignTreatList || !assignTreatList.length" class="guest_list">
            <div v-if="!assignTreatListView || !assignTreatListView.length" class="guest_list">
              <div class="guest_list__row flex flex-center rowtip">暂无数据</div>
            </div>
          </div>
@@ -131,12 +131,14 @@
          <div v-if="occupyInfoView.ciq" class="ciq">({{ occupyInfoView.ciq }})</div>
          <div v-if="occupyInfoView.startTime" class="time">安排治疗时间：{{ occupyInfoView.startTime }} 开始</div>
        </div>
        <div v-if="roomInfo" class="room_left_btn_box flex flex-ver" style="margin-top: 105px;">
          <div v-if="roomInfo.status == 0" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('使用中', 1)">开始治疗</div>
          <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center yellow btn_ani" @click="setStatus('客人休息', 2)">客人休息</div>
          <div v-if="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center gray btn_ani" @click="setStatus('打扫中', 3)">通知打扫</div>
          <div v-if="roomInfo.status == 2" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('打扫中', 3)">通知打扫</div>
          <div v-if="roomInfo.status == 3" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('空闲', 0)">结束打扫</div>
        <div v-show="roomInfo" class="room_left_btn_box flex flex-ver" style="margin-top: 105px;">
          <div v-show="roomInfo.status == 0" class="room_left_btn_box__item flex flex-1 flex-center b-green btn_ani" @click="setStatus('敷麻中', 4)">开始敷麻</div>
          <div v-show="roomInfo.status == 0" class="room_left_btn_box__item flex flex-1 flex-center green btn_ani" @click="setStatus('使用中', 1)">开始治疗</div>
          <div v-show="roomInfo.status == 4" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('使用中', 1)">开始治疗</div>
          <div v-show="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center yellow btn_ani" @click="setStatus('客人休息', 2)">客人休息</div>
          <div v-show="roomInfo.status == 1" class="room_left_btn_box__item flex-1 flex flex-center gray btn_ani" @click="setStatus('打扫中', 3)">通知打扫</div>
          <div v-show="roomInfo.status == 2" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('打扫中', 3)">通知打扫</div>
          <div v-show="roomInfo.status == 3" class="room_left_btn_box__item flex flex-center green btn_ani" @click="setStatus('空闲', 0)">结束打扫</div>
        </div>
      </div>
      <div class="right flex flex-col">
@@ -167,11 +169,11 @@
            </div>
          </div>
        </div>
        <div class="guest_box flex flex-col">
        <div class="guest_box flex flex-col" style="border-radius: 10px;">
          <div class="guest_title flex flex-center">等待诊疗</div>
          <div class="guest_block flex-1">
            <div v-if="assignTreatList && assignTreatList.length" class="guest_list">
              <div v-for="(item, index) in assignTreatList" :key="index" class="guest_list__row flex flex-ver" @click="selectCustomer(item)">
            <div v-if="assignTreatListView && assignTreatListView.length" class="guest_list">
              <div v-for="(item, index) in assignTreatListView" :key="index" class="guest_list__row flex flex-ver" @click="selectCustomer(item)">
                <div class="guest_list__td">
                  <div class="tx flex flex-ver">
                    <div class="flex-1 flex-1-w1 ell">{{ item.userName }}</div>
@@ -185,14 +187,14 @@
                  <span class="tx flex-1 flex-1-w1 ell">{{ item.aDoctorName?item.aDoctorName+'(医生)、':'' }}{{ item.aNurseName?item.aNurseName+'(护士)':'' }}</span>
                </div>
                <div class="guest_list__td flex flex-center">
                  <div class="tx">切换</div>
                  <div v-if="!item.act" class="tx" style="text-decoration: underline;color: #227beb;">切换</div>
                  <!-- <div class="icon">
                    <img class="img" src="static/imgs/choose.png">
                  </div> -->
                </div>
              </div>
            </div>
            <div v-if="!assignTreatList || !assignTreatList.length" class="guest_list">
            <div v-if="!assignTreatListView || !assignTreatListView.length" class="guest_list">
              <div class="guest_list__row flex flex-center rowtip">暂无数据</div>
            </div>
          </div>
@@ -217,6 +219,7 @@
// 更改房间状态窗
import XioRoomStatusChg from '@/components/xio_room_status_chg'
import Req from '../../utils/jun_httpInstall' // http 请求
// import xioFn from './utils/xio_fn.js'
var isUseDefault = false // 是否已使用默认客人
var isUseDefaultChg = 0// 已使用默认客人后房间是否有改变状态
export default {
@@ -232,31 +235,53 @@
      roomInfo: {},
      occupyInfo: '', // 当前占用人的信息
      assignTreatList: [],
      statusTx: ['空闲', '使用中', '客人休息', '打扫中'],
      timeObj: {} // week：星期，date：年月日，timeMin：时分，time：时分秒，timeStamp：时间戳
      statusTx: ['空闲', '使用中', '客人休息', '打扫中', '敷麻中'],
      timeObj: {}, // week：星期，date：年月日，timeMin：时分，time：时分秒，timeStamp：时间戳
      curTreatId: ''
    }
  },
  computed: {
    occupyInfoView() {
      // console.log('00000000000000000000000', this.occupyInfo, isUseDefault, isUseDefaultChg)
      // 有占用
      if (this.occupyInfo) {
        return this.occupyInfo
      // 没有占用
      console.log('00000000000000000000000', this.occupyInfo, isUseDefault, isUseDefaultChg)
      // 有当前选中的，根据需求修改增加选中不更改状态，由空闲开始
      if (this.curTreatId) {
        return this.gatCurTreatInfo()
      } else {
        // 还没使用默认客人值或者已使用默认客人值还没改变状态（适配轮询）
        if ((!isUseDefault || (isUseDefault && isUseDefaultChg === 0)) && this.assignTreatList && this.assignTreatList.length) {
          isUseDefault = true
          return this.assignTreatList[0]
        // 已使用过默认客人值
        // 有占用
        if (this.occupyInfo) {
          return this.occupyInfo
        // 没有占用
        } else {
          return ''
          // 还没使用默认客人值或者已使用默认客人值还没改变状态（适配轮询）
          if ((!isUseDefault || (isUseDefault && isUseDefaultChg === 0)) && this.assignTreatList && this.assignTreatList.length) {
            isUseDefault = true
            return this.assignTreatList[0]
          // 已使用过默认客人值
          } else {
            return ''
          }
        }
      }
    },
    assignTreatListView() {
      if (this.assignTreatList && this.assignTreatList.length) {
        this.assignTreatList.forEach((o) => {
          o.act = false
          if (this.occupyInfoView && this.occupyInfoView.id === o.id) {
            o.act = true
          }
        })
        return this.assignTreatList
      } else {
        return []
      }
    }
  },
  activated() {
    console.log('roomDetail mounted')
    // 记录当前的治疗ID
    var curTreatId = localStorage.getItem('curTreatId')
    this.curTreatId = curTreatId || ''
    this.id = this.$route.query.id || ''
    this.init()
  },
@@ -274,6 +299,16 @@
      // 轮询getData，8秒一次
      this.pollingAjaxFn(this, 'getData', 'detail', 8000)
      // this.getData()
    },
    // 获取当前治疗信息
    gatCurTreatInfo() {
      if (this.assignTreatList && this.assignTreatList.length) {
        return this.assignTreatList.find((o) => { return o.id === this.curTreatId })
      }
    },
    // 刷新浏览器页面
    resetPage() {
      window.location.reload()
    },
    // 获取房间详情
    getData() {
@@ -293,7 +328,7 @@
          data: {
            roomInfo: {
              roomNo: 'xx',
              status: 0 // 0空闲 1使用 2休息 3打扫
              status: 0 // 0空闲 1使用 2休息 3打扫 4 敷麻中
            },
            assignTreatList: [{
              startTime: '2023-12-08 00:00:00'
@@ -327,6 +362,7 @@
    },
    // 返回
    back() {
      // 重置默认已使用客人的参数
      isUseDefault = false
      isUseDefaultChg = 0
      // 关闭计时
@@ -389,7 +425,21 @@
      }).then((res) => {
        // 在已有默认客人的情况下，改变状态更改标识（适配轮询）
        if (isUseDefault) {
          console.log('在已有默认客人的情况下，改变状态更改标识')
          isUseDefaultChg = 1
        }
        // 当前选中的用户房间更改了状态，已经成为占用时，清除选中医疗记录id
        if (item && item.id && item.id === this.curTreatId) {
          console.log('当前选中的用户房间更改了状态，已经成为占用时，清除选中医疗记录id')
          localStorage.removeItem('curTreatId')
          this.curTreatId = ''
        }
        // 只要更改为空闲就重置参数
        if (status === 0) {
          console.log('更改为空闲')
          // 重置默认已使用客人的参数
          isUseDefault = false
          isUseDefaultChg = 0
        }
        // console.log('8888888888888888888888888888888888', res)
        cb && cb()
@@ -407,7 +457,10 @@
      // if (roomInfo && opt.status * 1 == roomInfo.status) {
      //   return
      // }
      this.changeStatusFn(occupyInfoView, opt.status, () => {
      // 清除选中医疗记录id
      localStorage.removeItem('curTreatId')
      this.curTreatId = ''
      this.changeStatusFn({}, opt.status, () => {
        // 刷新详情
        this.getData()
        // 关闭弹窗
@@ -416,6 +469,9 @@
    },
    // 选择客户
    selectCustomer(item = {}) {
      if (item.act) {
        return
      }
      // 打开弹窗
      this.$refs['XioCustomerSelect'].showDialog()
      // 组件客户数据处理
@@ -429,12 +485,18 @@
    // 选择客户确定
    selectCustomerSubmit(opt) {
      console.log('submit', opt)
      this.changeStatusFn(opt, 1, () => {
        // 刷新详情
        this.getData()
        // 关闭弹窗
        this.$refs['XioCustomerSelect'].hideDialog()
      })
      // 确定选择的用户，记录id
      localStorage.setItem('curTreatId', opt.id)
      this.curTreatId = opt.id
      // 重置房间状态
      if (this.roomInfo && this.roomInfo.status) {
        this.changeStatusFn({}, 0, () => {
          // 刷新详情
          this.getData()
        })
      }
      // 关闭弹窗
      this.$refs['XioCustomerSelect'].hideDialog()
    }
  }
}
@@ -548,6 +610,16 @@
  margin-top: 163px;
}
.page_container .main .room_left_btn_box__item {
  width: 500px;
  height: 150px;
  line-height: 73px;
  border-radius: 10px;
  font-size: 50px;
  text-align: center;
  margin: auto;
}
.page_container .main .room_left_btn_box__item.flex-1 {
  width: auto;
  height: 150px;
  line-height: 58px;
  border-radius: 10px;
@@ -557,9 +629,9 @@
  margin-right: 20px;
  font-weight: bold;
}
.page_container .main .room_left_btn_box__item:last-child {
/* .page_container .main .room_left_btn_box__item:last-child {
  margin-right: 0;
}
} */
.page_container .main .room_left_btn_box__item.yellow {
  color: rgba(255,255,255,1);
  background-color: rgba(233,157,66,1);
@@ -569,15 +641,12 @@
  color: rgba(79,79,79,1);
}
.page_container .main .room_left_btn_box__item.green {
  width: 500px;
  height: 150px;
  line-height: 73px;
  border-radius: 10px;
  background-color: rgba(47,174,206,1);
  color: rgba(255,255,255,1);
  font-size: 50px;
  text-align: center;
  margin: auto;
}
.page_container .main .room_left_btn_box__item.b-green {
  background-color: rgba(79,167,114,1);
  color: rgba(255,255,255,1);
}
.page_container .main .room_content {
  margin-top: 30px;