abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

病患营养配餐前端页面

Browse Source
This commit is contained in:
ryoeiken 2020-12-31 17:12:29 +08:00
parent f006cb9fba
commit 416ed16118
2 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml
View File

@ -21,15 +21,28 @@
</resultMap>
<select id="listNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtCateringDao">
select a.*, b.name, b.bed_id, c.depart_name, b.hospital_id, d.name as food_name from ft_catering a
SELECT
a.*,
b.`name`,
b.bed_id,
c.depart_name,
b.hospital_id,
d.`name` AS food_name
FROM
ft_catering a
LEFT JOIN ft_nutrition_food d ON d.id = a.number
LEFT JOIN ft_patient b
LEFT JOIN ft_depart c on b.depart_id = c.depart_id on a.patient_id = b.patient_id where b.off_flag = 0
LEFT JOIN ft_depart c ON b.depart_id = c.depart_id ON a.patient_id = b.patient_id
WHERE
b.off_flag = 0
<if test="name != null and name !=''">and b.name = #{name}</if>
<if test="bedId != null">and b.bed_id = #{bedId}</if>
<if test="departId != null">and b.depart_id = #{departId}</if>
<if test="hospitalId != null">and b.hospital_id = #{hospitalId}</if>
<if test="flag != null">and a.flag = #{flag}</if>
ORDER BY
b.patient_id,
`type` ASC
</select>
<select id="getByIdNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtCateringDao">

30
ruoyi-ui/src/views/fantang/catering/index.vue
View File

@ -224,6 +224,7 @@
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page-sizes="[12, 24]"
@pagination="getList"
/>
@ -307,7 +308,7 @@
<!-- :value="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<el-input v-model="form.frequency" placeholder="频次" :disabled="true"/>
<el-input v-model="form.frequency" placeholder="频次"/>
</el-form-item>
</el-col>
</el-row>
@ -469,7 +470,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 12,
flag: null,
hospitalId: null,
name: null,
@ -500,9 +501,9 @@ export default {
// 控制合并列
objectSpanMethod({row, column, rowIndex, columnIndex}) {
if (columnIndex === 1) {
if (rowIndex % 3 === 0) {
if (rowIndex % 4 === 0) {
return {
rowspan: 3,
rowspan: 4,
colspan: 1
};
} else {
@ -512,9 +513,9 @@ export default {
};
}
} else if (columnIndex === 2) {
if (rowIndex % 3 === 0) {
if (rowIndex % 4 === 0) {
return {
rowspan: 3,
rowspan: 4,
colspan: 1
};
} else {
@ -525,9 +526,21 @@ export default {
}
} else if (columnIndex === 3) {
if (rowIndex % 3 === 0) {
if (rowIndex % 4 === 0) {
return {
rowspan: 3,
rowspan: 4,
colspan: 1
};
} else {
return {
rowspan: 0,
colspan: 0
};
}
}else if (columnIndex === 4) {
if (rowIndex % 4 === 0) {
return {
rowspan: 4,
colspan: 1
};
} else {
@ -536,7 +549,6 @@ export default {
colspan: 0
};
}
}
},