eight
2024-11-18 8d11e11a86bbfe84ea4156bd68e865bb2986e9bd
领用界面 自动叫号控制
已修改5个文件
39 ■■■■■ 文件已修改
src/views/ecg/appointment/AppointmentForm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ecg/devmanage/DeviceForm.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ecg/doctor/components/RoutinePanel.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ecg/doctor/index.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ecg/queue/QueueForm.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ecg/appointment/AppointmentForm.vue
@@ -26,7 +26,7 @@
              <el-radio
                  v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
                  :key="dict.value"
                  :label="dict.value"
                  :value="dict.value"
              >
                {{ dict.label }}
              </el-radio>
src/views/ecg/devmanage/DeviceForm.vue
@@ -57,13 +57,13 @@
      <el-form-item v-if="formType !== 'create'" label="状态" prop="state">
        <el-radio-group v-if="formType === 'devState'" v-model="formData.state">
          <el-radio key="0" :label="0"> 空闲中 </el-radio>
          <el-radio key="5" :label="5"> 已领取 </el-radio>
          <el-radio key="10" :label="10"> 已装机 </el-radio>
          <el-radio key="20" :label="20"> 已遗失 </el-radio>
          <el-radio key="30" :label="30"> 待维修 </el-radio>
          <el-radio key="30" :label="40"> 维修中 </el-radio>
          <el-radio key="40" :label="50"> 已报废 </el-radio>
          <el-radio key="0" :value="0"> 空闲中 </el-radio>
          <el-radio key="5" :value="5"> 已领取 </el-radio>
          <el-radio key="10" :value="10"> 已装机 </el-radio>
          <el-radio key="20" :value="20"> 已遗失 </el-radio>
          <el-radio key="30" :value="30"> 待维修 </el-radio>
          <el-radio key="30" :value="40"> 维修中 </el-radio>
          <el-radio key="40" :value="50"> 已报废 </el-radio>
        </el-radio-group>
        <span v-else>{{tranlateDevState(formData.state)}}</span>
      </el-form-item>
src/views/ecg/doctor/components/RoutinePanel.vue
@@ -166,7 +166,7 @@
    // 发送操作成功的事件
    emit('event_routine')
    resetForm()
    getList()
    getList()  // 医生作业历史
  } finally {
    formLoading.value = false
  }
src/views/ecg/doctor/index.vue
@@ -1,3 +1,4 @@
<!--设备领用操作界面-->
<script setup lang="ts">
import TitlePanel from "@/views/ecg/doctor/components/TitlePanel.vue";
import QueuePanel from "@/views/ecg/doctor/components/QueuePanel.vue";
@@ -29,6 +30,7 @@
    queuingNum: 0
})
const autoCall = ref<boolean>(false);
const state = ref<boolean>()
const patientList = ref<QueueVO[]>([])
@@ -152,7 +154,13 @@
const onEventDevReady = () => {
   //console.info("onDevRentPanelEvent...")
  onStagePatient.value.patId = ""
  console.info("autoCall " + autoCall.value)
  if (autoCall.value) {
    finishNextPatient()
  } else {
  initLoad()
  }
}
const onEventRecallFinish = () => {
@@ -181,6 +189,7 @@
      </el-aside>
    </el-container>
    <el-container class="right-bottom">
      <el-checkbox label="自动&nbsp;" v-model="autoCall" />
      <el-button :disabled="finishFlag" type="primary" @click="finishNextPatient">叫号</el-button>
      <el-button :disabled="passFlag" type="primary" @click="passNextPatient">过号</el-button>
      <el-button  type="primary" @click="callAgain">重叫</el-button>
@@ -193,7 +202,7 @@
.right-bottom {
  position: absolute;
  bottom: 50px;
  right: 100px;
  right: 80px;
  //background-color: #f00;
  //color: #fff;
  //padding: 10px;
src/views/ecg/queue/QueueForm.vue
@@ -15,7 +15,7 @@
      </el-form-item>
      <el-form-item label="患者性别" prop="patGender">
        <el-radio-group v-model="formData.patGender">
          <el-radio label="1">请选择字典生成</el-radio>
          <el-radio :value="1">请选择字典生成</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="预约时间段" prop="bookTimeslot">
@@ -23,7 +23,7 @@
      </el-form-item>
      <el-form-item label="预约检查类型" prop="bookCheckType">
        <el-radio-group v-model="formData.bookCheckType">
          <el-radio label="1">请选择字典生成</el-radio>
          <el-radio :value="1">请选择字典生成</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="排队序号" prop="seqNum">
@@ -31,17 +31,17 @@
      </el-form-item>
      <el-form-item label="5:过号 10:排队中 15:已召回 20:候诊准备 30:就诊中 40:就诊完成" prop="status">
        <el-radio-group v-model="formData.status">
          <el-radio label="1">请选择字典生成</el-radio>
          <el-radio :value="10">请选择字典生成</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="过号标记" prop="passed">
        <el-radio-group v-model="formData.passed">
          <el-radio label="1">请选择字典生成</el-radio>
          <el-radio :value="1">请选择字典生成</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="预约过期标记" prop="expired">
        <el-radio-group v-model="formData.expired">
          <el-radio label="1">请选择字典生成</el-radio>
          <el-radio :value="1">请选择字典生成</el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item label="诊室编号" prop="roomId">