Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
paidaxing444 2020-11-03 11:21:37 +08:00
parent 80ad124580
commit 46129e0c94
4 changed files with 126 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-ui/src/views/benyi/contactpeople/index.vue
View File

@ -42,16 +42,16 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
disabled="true" :disabled="true"
v-hasPermi="['benyi:contactpeople:add']" v-hasPermi="['benyi:contactpeople:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -122,7 +122,7 @@
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择幼儿" prop="childid"> <el-form-item label="选择幼儿" prop="childid">
<el-select v-model="form.childid" placeholder="请输入选择幼儿" > <el-select v-model="form.childid" placeholder="请输入选择幼儿" :disabled="true">
<el-option <el-option
v-for="dict in childOptions" v-for="dict in childOptions"
:key="dict.id" :key="dict.id"
@ -390,11 +390,11 @@ export default {
this.multiple = !selection.length; this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { // handleAdd() {
this.reset(); // this.reset();
this.open = true; // this.open = true;
this.title = "添加幼儿紧急情况联系人"; // this.title = "添加幼儿紧急情况联系人";
}, // },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
@ -433,7 +433,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm( this.$confirm(
'是否确认删除幼儿紧急情况联系人编号为"' + ids + '"的数据项?', '是否确认删除幼儿紧急情况联系人数据项?',
"警告", "警告",
{ {
confirmButtonText: "确定", confirmButtonText: "确定",

153
ruoyi-ui/src/views/benyi/healthcheck/index.vue
View File

@ -9,7 +9,11 @@
size="small" size="small"
> >
<el-form-item label="班级信息" prop="classInfo"> <el-form-item label="班级信息" prop="classInfo">
<el-select v-model="queryParams.classInfo" placeholder="请选择班级信息"> <el-select
v-model="queryParams.classInfo"
placeholder="请选择班级信息"
@change="classInfoChange"
>
<el-option <el-option
v-for="dict in classInfoOptions" v-for="dict in classInfoOptions"
:key="dict.bjbh" :key="dict.bjbh"
@ -18,6 +22,18 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="幼儿姓名" prop="childId">
<el-select v-model="queryParams.childId" placeholder="请选择幼儿">
<el-option
v-for="dict in childInfoOptions.filter(
(c) => c.classid == this.queryParams.classInfo
)"
:key="dict.id"
:label="dict.name"
:value="dict.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="检查日期" prop="checkTime"> <el-form-item label="检查日期" prop="checkTime">
<el-date-picker <el-date-picker
clearable clearable
@ -111,7 +127,7 @@
>删除</el-button >删除</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
@ -120,7 +136,7 @@
v-hasPermi="['benyi:healthcheck:export']" v-hasPermi="['benyi:healthcheck:export']"
>导出</el-button >导出</el-button
> >
</el-col> </el-col> -->
</el-row> </el-row>
<el-table <el-table
@ -216,7 +232,7 @@
<!-- 添加或修改儿童常规体检记录对话框 --> <!-- 添加或修改儿童常规体检记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="班级信息" prop="classInfo"> <el-form-item label="班级信息" prop="classInfo">
<el-select <el-select
@ -235,7 +251,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="幼儿姓名" prop="childId"> <el-form-item label="幼儿姓名" prop="childId">
<el-select v-model="form.childId" placeholder="请选择班级信息"> <el-select v-model="form.childId" placeholder="请选择幼儿">
<el-option <el-option
v-for="dict in childInfoOptions.filter( v-for="dict in childInfoOptions.filter(
(c) => c.classid == this.form.classInfo (c) => c.classid == this.form.classInfo
@ -248,16 +264,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检查日期" prop="checkTime"> <el-form-item label="是否龋齿">
<el-date-picker <el-select
clearable v-model="form.decayedTooth"
size="small" placeholder="请选择是否龋齿"
style="width: 200px" >
v-model="form.checkTime" <el-option
type="date" v-for="dict in decayedToothOptions"
value-format="yyyy-MM-dd" :key="dict.dictValue"
placeholder="选择检查日期" :label="dict.dictLabel"
></el-date-picker> :value="dict.dictValue"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -276,18 +294,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否龋齿"> <el-form-item label="左眼视力" prop="eyesVisionLeft">
<el-select <el-input
v-model="form.decayedTooth" v-model="form.eyesVisionLeft"
placeholder="请选择是否龋齿" placeholder="请输入左眼视力"
> />
<el-option </el-form-item>
v-for="dict in decayedToothOptions" </el-col>
:key="dict.dictValue" <el-col :span="12">
:label="dict.dictLabel" <el-form-item label="右眼视力" prop="eyesVisionRight">
:value="dict.dictValue" <el-input
></el-option> v-model="form.eyesVisionRight"
</el-select> placeholder="请输入右眼视力"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -314,27 +333,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="保健师" prop="doctorName">
<el-input v-model="form.doctorName" placeholder="请输入保健师" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="左眼视力" prop="eyesVisionLeft">
<el-input
v-model="form.eyesVisionLeft"
placeholder="请输入左眼视力"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="右眼视力" prop="eyesVisionRight">
<el-input
v-model="form.eyesVisionRight"
placeholder="请输入右眼视力"
/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身高(cm)" prop="height"> <el-form-item label="身高(cm)" prop="height">
<el-input <el-input
@ -375,6 +374,24 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="保健师" prop="doctorName">
<el-input v-model="form.doctorName" placeholder="请输入保健师" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查日期" prop="checkTime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.checkTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择检查日期"
></el-date-picker>
</el-form-item>
</el-col>
</el-form> </el-form>
</el-row> </el-row>
@ -646,15 +663,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm( this.$confirm("是否确认删除儿童常规体检记录数据项?", "警告", {
'是否确认删除儿童常规体检记录编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
} })
)
.then(function () { .then(function () {
return delHealthcheck(ids); return delHealthcheck(ids);
}) })
@ -664,22 +677,22 @@ export default {
}) })
.catch(function () {}); .catch(function () {});
}, },
/** 导出按钮操作 */ // /** 导出按钮操作 */
handleExport() { // handleExport() {
const queryParams = this.queryParams; // const queryParams = this.queryParams;
this.$confirm("是否确认导出所有儿童常规体检记录数据项?", "警告", { // this.$confirm("是否确认导出所有儿童常规体检记录数据项?", "警告", {
confirmButtonText: "确定", // confirmButtonText: "确定",
cancelButtonText: "取消", // cancelButtonText: "取消",
type: "warning", // type: "warning",
}) // })
.then(function () { // .then(function () {
return exportHealthcheck(queryParams); // return exportHealthcheck(queryParams);
}) // })
.then((response) => { // .then((response) => {
this.download(response.msg); // this.download(response.msg);
}) // })
.catch(function () {}); // .catch(function () {});
}, // },
}, },
}; };
</script> </script>

5
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByChildContactpeopleController.java
View File

@ -111,12 +111,11 @@ public class ByChildContactpeopleController extends BaseController {
ByChildContactpeople byChildContactpeoplenew = new ByChildContactpeople(); ByChildContactpeople byChildContactpeoplenew = new ByChildContactpeople();
byChildContactpeoplenew.setChildid(byChildContactpeople.getChildid()); byChildContactpeoplenew.setChildid(byChildContactpeople.getChildid());
List<ByChildContactpeople> list = byChildContactpeopleService.selectByChildContactpeopleList(byChildContactpeoplenew); List<ByChildContactpeople> list = byChildContactpeopleService.selectByChildContactpeopleList(byChildContactpeoplenew);
if (list!=null&&list.size()>0){ if (list != null && list.size() > 0) {
return toAjax(byChildContactpeopleService.updateByChildContactpeople(byChildContactpeople)); return toAjax(byChildContactpeopleService.updateByChildContactpeople(byChildContactpeople));
}else{ } else {
return toAjax(byChildContactpeopleService.insertByChildContactpeople(byChildContactpeople)); return toAjax(byChildContactpeopleService.insertByChildContactpeople(byChildContactpeople));
} }
} }
/** /**

7
ruoyi/src/main/resources/mybatis/benyi/ByChildHealthCheckMapper.xml
View File

@ -22,8 +22,8 @@
<result property="totalAssessment" column="total_assessment"/> <result property="totalAssessment" column="total_assessment"/>
<result property="createtime" column="createtime"/> <result property="createtime" column="createtime"/>
<result property="createuser" column="createuser"/> <result property="createuser" column="createuser"/>
<association property="byChild" column="id" javaType="ByChild" resultMap="ByChildResult" /> <association property="byChild" column="id" javaType="ByChild" resultMap="ByChildResult"/>
<association property="byClass" column="bjbh" javaType="ByClass" resultMap="ByClassResult" /> <association property="byClass" column="bjbh" javaType="ByClass" resultMap="ByClassResult"/>
</resultMap> </resultMap>
<resultMap type="ByClass" id="ByClassResult"> <resultMap type="ByClass" id="ByClassResult">
@ -99,7 +99,7 @@
<select id="selectByChildHealthCheckList" parameterType="ByChildHealthCheck" resultMap="ByChildHealthCheckResult"> <select id="selectByChildHealthCheckList" parameterType="ByChildHealthCheck" resultMap="ByChildHealthCheckResult">
<include refid="selectByChildHealthCheckVo"/> <include refid="selectByChildHealthCheckVo"/>
<where> where c.name is not null
<if test="childId != null ">and child_id = #{childId}</if> <if test="childId != null ">and child_id = #{childId}</if>
<if test="classInfo != null and classInfo != ''">and class_info = #{classInfo}</if> <if test="classInfo != null and classInfo != ''">and class_info = #{classInfo}</if>
<if test="schoolName != null and schoolName != ''">and school_name like concat('%', #{schoolName}, '%') <if test="schoolName != null and schoolName != ''">and school_name like concat('%', #{schoolName}, '%')
@ -125,7 +125,6 @@
<if test="totalAssessment != null and totalAssessment != ''">and total_assessment = #{totalAssessment}</if> <if test="totalAssessment != null and totalAssessment != ''">and total_assessment = #{totalAssessment}</if>
<if test="createtime != null ">and createtime = #{createtime}</if> <if test="createtime != null ">and createtime = #{createtime}</if>
<if test="createuser != null ">and createuser = #{createuser}</if> <if test="createuser != null ">and createuser = #{createuser}</if>
</where>
</select> </select>
<select id="selectByChildHealthCheckById" parameterType="Long" resultMap="ByChildHealthCheckResult"> <select id="selectByChildHealthCheckById" parameterType="Long" resultMap="ByChildHealthCheckResult">