From 6a02437da5ca1fd368bae48622589f6f359bff95 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期三, 09 十月 2024 09:01:04 +0800
Subject: [PATCH] 更新营养筛查评估
---
src/views/home/components/dietary_survey.vue | 67 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/src/views/home/components/dietary_survey.vue b/src/views/home/components/dietary_survey.vue
index 5c3a55a..44516e1 100644
--- a/src/views/home/components/dietary_survey.vue
+++ b/src/views/home/components/dietary_survey.vue
@@ -1,17 +1,17 @@
<template>
<div class="dietarySurvey-home" >
- <el-row style="padding-left: 10px;">
+ <el-row v-if="patientsInfo.id" style="padding-left: 10px;">
<el-form size="small" :inline="true" :model="state.formInline">
- <!-- <el-form-item label="填报人">
+ <el-form-item label="调差表">
<el-select style="width: 120px;"
- v-model="state.formInline.user"
- placeholder="Activity zone"
+ v-model="state.formInline.formTableName"
+ placeholder="不选默认查全部"
clearable
>
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
+ <el-option label="营养膳食调查表" value="营养膳食调查表" />
+ <el-option label="膳食调查表" value="膳食调查表" />
</el-select>
- </el-form-item> -->
+ </el-form-item>
<el-form-item label="填报日期">
<el-date-picker
v-model="state.formInline.date"
@@ -24,12 +24,6 @@
format="YYYY/MM/DD"
value-format="YYYY-MM-DD"
/>
- <!-- <el-date-picker style="width: 120px;"
- v-model="state.formInline.date"
- type="date"
- placeholder="Pick a date"
- clearable
- /> -->
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
@@ -47,9 +41,18 @@
</template>
</el-table-column>
- <el-table-column prop="surveryTime" label="填表时间" show-overflow-tooltip />
+ <el-table-column prop="surveryTime" label="填表时间" show-overflow-tooltip >
+ <template #default="scope">
+ {{scope.row.surveryTime?.substring(0,11)}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="surveryTime" label="调查表名称" show-overflow-tooltip >
+ <template #default="scope">
+ {{scope.row.suveryFormName}}
+ </template>
+ </el-table-column>
<el-table-column prop="surveryPersonName" label="填表人" show-overflow-tooltip />
- <el-table-column prop="updateTime" label="更新时间" show-overflow-tooltip />
+ <!-- <el-table-column prop="updateTime" label="更新时间" show-overflow-tooltip /> -->
<el-table-column label="操作" >
<template #default="scope">
<el-button size="small" @click="handleEdit(scope.$index, scope.row)">
@@ -77,6 +80,7 @@
</div>
<el-empty v-if="!patientsInfo.id" description="无数据，请先选择患者"></el-empty>
<editDietary @shuaxin="onSubmit" ref="editDietaryRef"></editDietary>
+ <editDietary2 @shuaxin="onSubmit" ref="editDietaryRef2"></editDietary2>
</div>
</template>
@@ -85,7 +89,7 @@
import { usePatientsInfo } from '/@/stores/patientsInfo';
import {list,tiaochabiaoInfo,deleteId} from '/@/api/tiaochabiao/index'
import { computed, reactive, ref } from 'vue';
-import ItemTable from './dietaryDtaile.vue'
+import editDietary2 from './editDietary2.vue'
import editDietary from './editDietary.vue'
import { useRoute,useRouter } from 'vue-router';
import { ElLoading, ElMessage, ElMessageBox } from 'element-plus';
@@ -93,6 +97,7 @@
const { patientsInfo } = storeToRefs(storesPat);
const props = defineProps(['tableHeight'])
const editDietaryRef=ref()
+const editDietaryRef2=ref()
const router = useRouter()
const shortcuts = [
{
@@ -131,6 +136,7 @@
loading: false,
formInline:{
user: '',
+ formTableName:'',
date: [],
},
dialogTableVisible:false
@@ -154,11 +160,14 @@
const pasm={
page: state.page,
size: state.size,
- wherecondition: `patient_code = '${patientsInfo.value.code}'`,
+ wherecondition:`survery_form_type=0 and patient_code='${patientsInfo.value.code}'`,
ordercondition: 'survery_time desc'
}
if(state.formInline.date.length===2){
pasm.wherecondition+=` and survery_time BETWEEN '${state.formInline.date[0]} 00:00:00' AND '${state.formInline.date[1]} 23:59:59'`
+ }
+ if(state.formInline.formTableName){
+ pasm.wherecondition+=`and suvery_form_name='${state.formInline.formTableName}'`
}
const loading = ElLoading.service({
lock: true,
@@ -173,7 +182,16 @@
})
}
const addItem=()=>{
- editDietaryRef.value.openShow('add')
+
+ if(state.formInline.formTableName){
+ if(state.formInline.formTableName==='膳食调查表'){
+ editDietaryRef.value.openShow('add')
+ }else if(state.formInline.formTableName==='营养膳食调查表'){
+ editDietaryRef2.value.openShow('add')
+ }
+ }else{
+ ElMessage.warning('请先选择你要添加的表单名称！')
+ }
// router.push({path:'/tiaochabiao1',query:{type:'add',id:0}})
}
// 第一步：定义子组件里面的方法
@@ -181,11 +199,14 @@
const pasm = {
page: 1,
size: 10,
- wherecondition:`patient_code='${patientsInfo.value.code}'`,
+ wherecondition:`survery_form_type=0 and patient_code='${patientsInfo.value.code}'`,
ordercondition:'survery_time DESC'
}
if(state.formInline.date.length===2){
pasm.wherecondition+=`and survery_time BETWEEN '${state.formInline.date[0]} 00:00:00' AND '${state.formInline.date[1]} 23:59:59'`
+ }
+ if(state.formInline.formTableName){
+ pasm.wherecondition+=`and suvery_form_name='${state.formInline.formTableName}'`
}
const loading = ElLoading.service({
lock: true,
@@ -210,8 +231,12 @@
* 编辑
*/
const handleEdit = (index: number, row: any) => {
- console.log(index, row)
- editDietaryRef.value.openShow('update',row)
+ console.log(index, row,state.formInline.formTableName)
+ if(row.suveryFormName==='膳食调查表'){
+ editDietaryRef.value.openShow('update',row)
+ }else if(row.suveryFormName==='营养膳食调查表'){
+ editDietaryRef2.value.openShow('update',row)
+ }
}
const handleDelete = (index: number, row: any) => {
console.log(index, row)
--
Gitblit v1.8.0