Explorar el Código

增加方太图可以调整床位,还未完全实现

unknown hace 4 meses
padre
commit
b281a15cd8

+ 2 - 2
src/views/elderly/elder/bed-change/Form.vue

@@ -24,11 +24,11 @@ const dialogVisible = ref(false) // 弹窗
 const processFormRef = ref()
 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
 /** 打开弹窗 */
-const open = async (tId, id, detail, status) => {
+const open = async (tId, id, detail, status,elderly=undefined) => {
   dialogVisible.value = true
   nextTick(() => {
     processFormRef.value.setTenantId(tId)
-    processFormRef.value.init(id, detail, status)
+    processFormRef.value.init(id, detail, status,elderly)
   })
 }
 defineExpose({ open }) // 提供 open 方法,用于打开弹窗

+ 6 - 1
src/views/elderly/elder/bed-change/ProcessForm.vue

@@ -331,10 +331,15 @@ const processStatus = ref('')
 
 const isDetail = ref(false)
 /** 打开弹窗 */
-const init = async (id, detail, status) => {
+const init = async (id, detail, status,elderly=undefined) => {
   dataForm.value.startTenantId = getTenantId()
   getTreeData()
   isDetail.value = detail
+  if(elderly){
+    //等新接口,查询后赋值
+
+
+  }
   if (id) {
     const res = await getBedChangeRecordById(id, status,isDetail.value)
     dataForm.value = res

+ 3 - 3
src/views/elderly/fee/bill-pay/preview.vue

@@ -4,8 +4,8 @@
       <el-tab-pane label="打印类型A(含固定费明细)" name="first">
         <div class="first" id="printTab1">
           <div class="header">
-            <p class="title">{{ tenantName }}对账单预览</p>
-            <div class="info-wrap">
+            <p class="title" style="font-size: 18px">{{ tenantName }}对账单预览</p>
+            <div class="info-wrap" style="margin-top: -4px">
               <span><b>姓名:</b> {{
                   dataForm.elderName
                 }}{{ (dataForm.contractNumber == null || dataForm.contractNumber == '')?'':`(${dataForm.contractNumber})`}}</span>
@@ -30,7 +30,7 @@
 
 <!--            </div>-->
           </div>
-          <el-divider style="margin-top: 2px"/>
+          <el-divider style="margin-top: 0px"/>
           <div class="content">
 <!--            <p class="info">以下是账单明细</p>-->
             <div class="flex">

+ 3 - 3
src/views/elderly/fee/bill-pay/unpay-preview.vue

@@ -9,8 +9,8 @@
   >
     <div class="first" id="printTab1">
       <div class="header">
-        <p class="title">缴费通知单</p>
-        <div class="info-wrap">
+        <p class="title" style="font-size: 18px;">缴费通知单</p>
+        <div class="info-wrap" style="margin-top: -4px">
           <span><b>机构:</b> {{ tenantName }}</span>
           <span><b>姓名:</b> {{ dataForm.elderName }}</span>
           <span><b>编号:</b> {{ dataForm.billOrderNumber }}</span>
@@ -32,7 +32,7 @@
 <!--          <span><b>打印时间:</b> {{ dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss') }}</span>-->
 <!--        </div>-->
       </div>
-      <el-divider style="margin-top: 2px"/>
+      <el-divider style="margin-top: 0px"/>
       <div class="content">
 <!--        <p class="info">以下是账单明细</p>-->
         <div class="flex">

+ 35 - 39
src/views/elderly/kanban/room-diagram/index.vue

@@ -171,46 +171,27 @@
                   <!-- 房间 -->
                   <el-scrollbar v-if="item.roomUsage=='1'">
                     <div class="item-wrap">
-                      <div @click="bedClick(i,item.roomName)" :style="{border: (i.select?systemTheme:'#00000000')+' solid '+ (i.select?'2px':'0')}" class="item" v-for="(i) in item.bedList" :key="i">
+                      <div  :style="{border: (i.select?systemTheme:'#00000000')+' solid '+ (i.select?'2px':'0')}" class="item" v-for="(i) in item.bedList" :key="i">
                         <div class="tag">{{ i.bedName }}</div>
-                        <img class="bed" src="@/assets/imgs/bed13.png" v-if="i.status == 1"/>
-                        <img class="bed" src="@/assets/imgs/bed14.png" v-if="i.status == 0"/>
-                        <img class="people" src="@/assets/imgs/bed10.png" v-if="i.elderSex == 2"/>
-                        <img class="people" src="@/assets/imgs/bed9.png" v-if="i.elderSex == 1"/>
-                        <img class="people" src="@/assets/imgs/nan-2.png" v-if="i.status == 0"/>
-                        <span class="name">{{ i.status == 0 ? '空床' : i.elderName  }}</span>
-                        <span class="desc">{{ i.status == 0 ? '无护理' : i.nurseLevelName }}</span>
-<!--                        <el-popover-->
-<!--                          :width="220"-->
-<!--                          placement="top"-->
-<!--                          trigger="click"-->
-<!--                          popper-style="box-shadow: rgb(14 18 22 / 35%) 0px 10px 38px -10px, rgb(14 18 22 / 20%) 0px 10px 20px -15px; padding: 30px;border-radius:10px"-->
-<!--                        >-->
-<!--                          <template #reference>-->
-<!--                            <div class="item">-->
-<!--                             -->
-<!--                              <el-tooltip :content="i.status == 0 ? '无护理' : i.nurseLevelName">-->
-<!--                                <span class="desc">{{ i.status == 0 ? '无护理' : i.nurseLevelName }}</span>-->
-<!--                              </el-tooltip>-->
-<!--                            </div>-->
-
-<!--                          </template>-->
-<!--                          <template #default>-->
-<!--                            <div-->
-<!--                              style="display: flex; align-items: center;flex-direction: column;"-->
-<!--                            >-->
-<!--                              <div>-->
-<!--                                <span class="name">{{ i.status == 0 ? '空床' : i.elderName  }}</span>-->
-<!--                                <span class="desc ml-3" v-if="i.nurseLevelName!=null">{{ i.status == 0 ? '无护理' : i.nurseLevelName }}</span>-->
-<!--                              </div>-->
-<!--                              <div class="mt-4">-->
-<!--                                <span class="desc" v-if="i.elderSex!=null">性别:{{ i.elderSex == 1 ? '男' : '女' }}</span>-->
-<!--                                <span class="desc ml-4">床位号:{{ i.bedName  }}</span>-->
-<!--                              </div>-->
-<!--                              -->
-<!--                            </div>-->
-<!--                          </template>-->
-<!--                        </el-popover>-->
+
+                        <el-dropdown size="large" >
+                         <div style="display: flex;flex-direction: column;align-items: center;">
+                           <img class="bed" src="@/assets/imgs/bed13.png" v-if="(i.status == 1 && i.elderName)"/>
+                           <img class="bed" src="@/assets/imgs/bed14.png" v-else/>
+                           <img class="people" src="@/assets/imgs/bed10.png" v-if="i.elderSex == 2"/>
+                           <img class="people" src="@/assets/imgs/bed9.png" v-if="i.elderSex == 1"/>
+                           <img class="people" src="@/assets/imgs/nan-2.png" v-if="i.status == 0"/>
+                           <span class="name">{{ (i.status == 1 && i.elderName) ?i.elderName: '空床'   }}</span>
+                           <span class="desc">{{ (i.status == 1 && i.nurseLevelName) ? i.nurseLevelName:'无护理'  }}</span>
+                         </div>
+                          <template #dropdown>
+                            <el-dropdown-menu>
+                              <el-dropdown-item @click="bedClick(i,item.roomName)" :disabled="!(i.status == 1 && i.elderName)">长者信息</el-dropdown-item>
+                              <el-dropdown-item @click="bedChangeClick(i)" :disabled="!(i.status == 1 && i.elderName)">床位变更</el-dropdown-item>
+                            </el-dropdown-menu>
+                          </template>
+                        </el-dropdown>
+
 
                       </div>
                     </div>
@@ -227,6 +208,9 @@
         </div>
       </div>
   </el-row>
+
+  <Form ref="bedChangeFormRef"   />
+
 </template>
 <script setup lang="ts">
 import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
@@ -238,6 +222,7 @@ import {useAppStore} from "@/store/modules/app";
 import { cancelRequest } from '@/config/axios/service';
 import { generateUUID } from '@/utils'
 import { values } from 'lodash-es'
+import Form from "@/views/elderly/elder/bed-change/Form.vue";
 const router = useRouter()
 const buildList = ref<{ id: string, buildName: string, floorList: [] }[]>([])
 const floorList = ref<{id: string, floorName: string}[]>([])
@@ -245,6 +230,7 @@ const roomList = ref<{roomName: string, roomSettings: string, orientation: strin
 const currBuild = ref<{id?: string, buildName?: string}>({})
 const currFloor = ref<{id?: string, floorName?: string}>({})
 const oldFloorId = ref('') // 旧楼层id
+const bedChangeFormRef = ref()
 const appStore = useAppStore()
 const systemTheme = ref(appStore.getTheme.elColorPrimary)
 const userStore = useUserStore()
@@ -335,6 +321,16 @@ const getList = async () => {
   }
 }
 
+let tempElder = {}
+
+const bedChangeClick = (i) => {
+  tempElder = i
+  if(i){
+    bedChangeFormRef.value.open(props.tenantId, undefined,false, undefined,i)
+  }
+  console.log( i)
+}
+
 const buildData = ref<{totalRoomCount?: number, totalBedCount?: number, usedBedCount?: number, unusedBedCount?: number, temporaryOccupationCount?: number}>({})
 const handleClickBuild = async (item) => {
   floorList.value = item.floorList