unknown пре 1 месец
родитељ
комит
82aa031987

+ 1 - 1
src/main.ts

@@ -51,7 +51,7 @@ import { Flex } from 'ant-design-vue'
 import 'ant-design-vue/dist/reset.css'
 import fetchPlugin from './config/axios/fetch';
 //版本号
-export const MAIN_VERSION = '4.3.9'
+export const MAIN_VERSION = '4.4.0'
 
 // 创建实例
 const setupAll = async () => {

+ 39 - 2
src/views/elderly/apply/check-in-request/ProcessForm.vue

@@ -478,7 +478,7 @@
                   </TgSelect>
                 </el-form-item>
               </el-col>
-              <el-col :xs="12" :sm="12" :md="12" :lg="processType == 2 ? 12 : 12">
+              <el-col :xs="8" :sm="8" :md="8" :lg="processType == 2 ? 8 : 8">
                 <el-form-item prop="inStatusType">
                   <template #label>
                     <div class="flex-cc">
@@ -508,7 +508,7 @@
                   </TgSelect>
                 </el-form-item>
               </el-col>
-              <el-col :xs="12" :sm="12" :md="12" :lg="processType == 2 ? 12 : 12">
+              <el-col :xs="8" :sm="8" :md="8" :lg="processType == 2 ? 8 : 8">
                 <el-form-item prop="careType">
                   <template #label>
                     <div class="flex-cc">
@@ -530,6 +530,26 @@
                   </TgSelect>
                 </el-form-item>
               </el-col>
+
+              <el-col :xs="8" :sm="8" :md="8" :lg="processType == 2 ? 8 : 8">
+                <el-form-item prop="careType">
+                  <template #label>
+                    <div class="flex-cc">
+                      护理等级
+                    </div>
+                  </template>
+                  <TgSelect v-model="dataForm.nurseLevelId" placeholder="请选择" clearable :list="nurseLevelList" dict-label="nurseLevelName" dict-value="id" :toggle-type="isDetail">
+                    <el-option
+                      v-for="item in nurseLevelList"
+                      :key="item.id"
+                      :label="item.nurseLevelName"
+                      :value="item.id"
+                    />
+                  </TgSelect>
+                </el-form-item>
+              </el-col>
+
+
               <el-col :span="24">
                 <el-form-item label="居住地址" prop="address">
                   <TgInput
@@ -1187,6 +1207,7 @@ import { JieQi, Solar, Lunar } from 'lunar-typescript'
 import { isEmpty } from '@/utils/is'
 import { getParentNodesById } from '@/utils'
 import {NumberToChineseUtils} from "@/utils/dateUtil";
+import {getNursingLevelPage} from "@/api/elderly/nursing";
 defineOptions({ name: 'CheckInRequestProcessForm' })
 const { idCardValidity, validatePhone } = useValidator()
 const message = useMessage() // 消息弹窗
@@ -1205,6 +1226,7 @@ let dataForm = reactive<ChechInRequestFormType>({
   elderBlood: '',
   address: '',
   salesUserId: '',
+  nurseLevelId: '',
   contractNumber: '',
   censusRegister: '',
   idCard: '',
@@ -1448,8 +1470,23 @@ const open = async (res, detail, type, tId) => {
     dataForm.idCard2 = res.papersType != 1 ? res.idCard : '' // 不是居民身份证
     dataForm.idCard = res.papersType == 1 ? res.idCard : ''
   }
+  getNurseLevelList()
 }
 
+/** 查询护理等级列表 */
+const nurseLevelList = ref<{ id: number; nurseLevelName: string }[]>([])
+const getNurseLevelList = async () => {
+  try {
+    const data = await getNursingLevelPage({
+      pageNum: 1,
+      pageSize: 100
+    })
+    nurseLevelList.value = data.list
+  } finally {
+  }
+}
+
+
 const setTenantId = (tId, type=1) => {
   dataForm.tenantId = tId
   pageType.value = type

+ 11 - 0
src/views/living-home/serviceItemManage/serviceCombo/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+a
+</template>
+
+<style scoped lang="scss">
+
+</style>

+ 11 - 0
src/views/living-home/serviceItemManage/serviceItem/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+a
+</template>
+
+<style scoped lang="scss">
+
+</style>

+ 11 - 0
src/views/living-home/serviceItemManage/serviceType/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+a
+</template>
+
+<style scoped lang="scss">
+
+</style>

+ 11 - 0
src/views/living-home/serviceTeam/districtManagement/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+a
+</template>
+
+<style scoped lang="scss">
+
+</style>

+ 11 - 0
src/views/living-home/serviceTeam/servicePersonnelManage/index.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+a
+</template>
+
+<style scoped lang="scss">
+
+</style>