Merge branch 'master' of http://47.107.245.0:3000/xiongxing/kyj-yanglao-web-new

src/api/elderly/assess/blood-glucose/index.ts

@@ -3,50 +3,47 @@ import request from '@/config/axios'
 // ==================血糖记录=========================
 
 // 获得分页
-export const getBloodGlucosePage = (query) => {
+export const getBloodGlucosePage = (query: any) => {
   return request.get({
-    url: 'elderly/bloodGlucose/page',
+    url: '/elderly-blood-sugar-record/page',
     params: query
   })
 }
 
 // 获取详情
-export const getBloodGlucoseDetail = (id) => {
+export const getBloodGlucoseDetail = (id: number | string) => {
   return request.get({
-    url: `elderly/bloodGlucose/get?id=${id}`
+    url: `/elderly-blood-sugar-record/get?id=${id}`
   })
 }
 
 // 新增
-export const createBloodGlucose = (data) => {
+export const createBloodGlucose = (data: any) => {
   return request.post({
-    url: `elderly/bloodGlucose/create`,
+    url: `/elderly-blood-sugar-record/create`,
     data
   })
 }
 
 // 修改
-export const updateBloodGlucose = (data) => {
+export const updateBloodGlucose = (data: any) => {
   return request.put({
-    url: `elderly/bloodGlucose/update`,
+    url: `/elderly-blood-sugar-record/update`,
     data
   })
 }
 
 // 删除
-export const deleteBloodGlucose = (id) => {
-  return request.post({
-    url: `elderly/bloodGlucose/delete`,
-    data: [id]
+export const deleteBloodGlucose = (id: number | string) => {
+  return request.delete({
+    url: `/elderly-blood-sugar-record/delete?id=${id}`
   })
 }
 
 // 导出
-export const exportBloodGlucoseExcel = (data) => {
+export const exportBloodGlucoseExcel = (params: any) => {
   return request.download({
-    url: `elderly/bloodGlucose/exportExcel`,
-    params: data
+    url: `/elderly-blood-sugar-record/exportExcel`,
+    params
   })
-}
-
-
+}

src/views/elderly/assess/blood-glucose/component/form.vue

@@ -103,17 +103,17 @@
 
         <el-row>
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-            <el-form-item label="血糖值" prop="bloodGlucoseValue">
+            <el-form-item label="血糖值" prop="bloodSugar">
               <el-input-number
                 v-if="!isDetail"
-                v-model="dataForm.bloodGlucoseValue"
+                v-model="dataForm.bloodSugar"
                 :min="0"
                 :max="999"
                 :precision="2"
                 style="width: 100%"
                 placeholder="请输入血糖值"
               />
-              <el-text v-else>{{ dataForm.bloodGlucoseValue }}</el-text>
+              <el-text v-else>{{ dataForm.bloodSugar }}</el-text>
             </el-form-item>
           </el-col>
         </el-row>
@@ -182,17 +182,17 @@ const dataForm = ref<any>({
   bedName: '',
   nurseLevelName: '',
   recordDate: dayjs().format('YYYY-MM-DD'),
-  bloodGlucoseValue: undefined,
+  bloodSugar: undefined,
   remark: ''
 })
 
 const dataRule = reactive<FormRules>({
   elderId: [{ required: true, message: '长者姓名不能为空', trigger: 'blur' }],
   recordDate: [{ required: true, message: '记录日期不能为空', trigger: 'change' }],
-  bloodGlucoseValue: [{ required: true, message: '血糖值不能为空', trigger: 'blur' }]
+  bloodSugar: [{ required: true, message: '血糖值不能为空', trigger: 'blur' }]
 })
 
-const elderUp = (e) => {
+const elderUp = (e: any) => {
   dataForm.value.elderName = e.elderName
   dataForm.value.elderId = e.id
   dataForm.value.elderSex = e.elderSex === 1 ? '男' : '女'
@@ -216,13 +216,13 @@ const resetForm = () => {
     bedName: '',
     nurseLevelName: '',
     recordDate: dayjs().format('YYYY-MM-DD'),
-    bloodGlucoseValue: undefined,
+    bloodSugar: undefined,
     remark: ''
   }
   formRef.value?.resetFields()
 }
 
-const open = async (tenantId, id?: any, type: number = 1) => {
+const open = async (tenantId: any, id?: any, type: number = 1) => {
   resetForm()
   dialogVisible.value = true
   dataForm.value.tenantId = tenantId
@@ -232,7 +232,7 @@ const open = async (tenantId, id?: any, type: number = 1) => {
   if (type === 1) title.value = '新增-血糖记录'
   if (type === 2) title.value = '编辑-血糖记录'
   if (type === 3) title.value = '详情-血糖记录'
-
+  console.log('id', id)
   if (id) {
     try {
       loading.value = true

src/views/elderly/assess/blood-glucose/index.vue

@@ -8,15 +8,20 @@
       label-width="90px"
     >
       <TenantSelect v-model="queryParams.tenantIds" placeholder="请选择机构名称" prop="tenantIds" />
+      <el-form-item label="长者姓名" prop="elderName">
+        <el-input v-model="queryParams.elderName" placeholder="请输入长者姓名" class="!w-240px" />
+      </el-form-item>
       <el-form-item label="记录日期" prop="recordDate">
         <el-date-picker
           type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+          date-format="YYYY-MM-DD"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           v-model="queryParams.recordDate"
           class="!w-240px"
+          @clear="handleDateClose"
         />
       </el-form-item>
       <el-form-item>
@@ -29,11 +34,11 @@
   <ContentWrap>
     <div class="mb-10px" style="display:flex;align-items:center;justify-content: space-between;gap: 10px;">
       <div style="display:flex;align-items:center;gap: 10px;">
-        <el-button type="primary" plain @click="openForm()">
+        <el-button type="primary" plain @click="openForm()" v-hasPermi="['elderly:blood-glucose:add']">
           <Icon icon="ep:plus" class="mr-5px" />
           新增
         </el-button>
-        <el-button type="success" plain @click="handleExport">
+        <el-button type="warning" plain @click="exportExcel" v-hasPermi="['elderly:blood-glucose:export']">
           <Icon icon="ep:download" class="mr-5px" />
           导出
         </el-button>
@@ -47,8 +52,8 @@
       :queryParams="queryParams"
     >
       <template #pre="{scope}">
-        <el-button link type="primary" @click="openForm(scope.row, 2)">编辑</el-button>
-        <el-button link type="primary" @click="handleDelete(scope.row)">删除</el-button>
+        <el-button link type="primary" @click="openForm(scope, 2)" v-hasPermi="['elderly:blood-glucose:edit']">编辑</el-button>
+        <el-button link type="danger" @click="handleDelete(scope)" v-hasPermi="['elderly:blood-glucose:delete']">删除</el-button>
       </template>
     </Table2>
 
@@ -67,11 +72,13 @@
 import { reactive, ref } from 'vue'
 import { useUserStore } from '@/store/modules/user'
 import Form from './component/form.vue'
+import { DICT_TYPE } from '@/utils/dict'
 import {
   deleteBloodGlucose,
-  exportBloodGlucoseExcel,
-  getBloodGlucosePage
+  getBloodGlucosePage,
+  exportBloodGlucoseExcel
 } from '@/api/elderly/assess/blood-glucose'
+import download from '@/utils/download'
 
 defineOptions({ name: 'BloodGlucose' })
 
@@ -87,21 +94,26 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   tenantIds: userStore.orgTenantId,
-  recordDate: undefined
+  recordDate: undefined,
+  elderName: undefined
 })
 
 const queryFormRef = ref()
 
 const columns = reactive([
-  { label: '所属机构', field: 'tenantName', type: '99' },
   { label: '长者姓名', field: 'elderName' },
   { label: '房间号', field: 'roomName' },
-  { label: '性别', field: 'elderSexText' },
+  { label: '床位号', field: 'bedName' },
+  { label: '性别', field: 'elderSex', type: '1', dictArr: DICT_TYPE.SYSTEM_USER_SEX },
   { label: '记录日期', field: 'recordDate' },
-  { label: '血糖值', field: 'bloodGlucoseValue' },
+  { label: '血糖值', field: 'bloodSugar' },
   { label: '备注', field: 'remark' },
 ])
 
+const handleDateClose = () => {
+  queryParams.recordDate = undefined
+}
+
 const getList = async () => {
   loading.value = true
   try {
@@ -129,9 +141,10 @@ const resetQuery = () => {
 const formRef = ref()
 const openForm = (row: any = {}, type: number = 1) => {
   if (queryParams.tenantIds.length == 0 || (queryParams.tenantIds.length > 1 && !row.tenantId)) {
-    message.error('新增只能选择一个机构')
+    message.error(`${type === 1 ? '新增' : '编辑'}只能选择一个机构`)
     return
   }
+  console.log('row', row)
   formRef.value.open(row.tenantId || queryParams.tenantIds[0], row.id, type)
 }
 
@@ -144,8 +157,13 @@ const handleDelete = async (row: any) => {
   } catch {}
 }
 
-const handleExport = async () => {
-  await exportBloodGlucoseExcel(queryParams)
+const exportExcel = async () => {
+  try {
+    await message.exportConfirm()
+    const data = await exportBloodGlucoseExcel(queryParams)
+    download.excel(data, '血糖记录.xls')
+  } catch {
+  }
 }
 
 onMounted(() => {

src/views/elderly/elder/column.ts

@@ -193,6 +193,11 @@ export const ElderFileColumns = reactive([
     type: '1',
     width: 130
   },
+  {
+    label: '合同号',
+    field: 'contractNumber',
+    width: 150
+  },
   {
     label: '档案号',
     field: 'fileNumber',

src/views/elderly/fee/bill-pay/bill-generator.vue

@@ -16,7 +16,8 @@
         </el-col>
         <el-col :span="12" :xs="24">
           <el-form-item label="账单月" prop="billingMonth">
-            <TgDatePicker v-model="dataForm.billingMonth" type="month" @change="handleChange" :disabled="!dataForm.elderId" :disabledDate="disabledDate"/>
+            <TgDatePicker v-model="dataForm.billingMonth" type="month" @change="handleChange" :disabled="!dataForm.elderId" />
+            <!-- :disabledDate="disabledDate" -->
           </el-form-item>
         </el-col>
       </el-row>

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

@@ -315,7 +315,7 @@ const calcTotalPrice = (item) => {
     }else if(settingStore.getAdmissionBill == 4){ // 四舍五入保留整数
       return formatNum(item.roundAmount)
     }else{ // 应收
-      formatNum(item.totalAmount)
+      return formatNum(item.totalAmount)
     }
   }else if(item.expenseSource == 'long_term_care_insurance'){
     return formatNum(item.totalAmount)

src/views/elderly/presale/deposit/Form.vue

@@ -209,6 +209,7 @@ const submitForm = async () => {
       dataForm.value.depositAmount += item.payAmount || 0
     })
     
+    delete dataForm.value.id
     const res = await payFees(dataForm.value)
     if (res) {
       message.success(t('common.updateSuccess'))