Skip to content

P
pet-business-web
Commit b9db9ac3 authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

bug fix

parent 67e2e881
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 71 deletions
src/views/article-management/article-detail.vue
View file @ b9db9ac3
......@@ -19,9 +19,16 @@
</div>
<!-- 0-- 文章信息的页面--修改文章信息 -->
<div class="base-msg">
<div style="display:flex;">
<el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="left">
<el-form-item label="文章标题" prop="articleTitle" style="padding-top: 32px;">
<div style="display: flex">
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="80px"
label-position="left"
style="padding-left: 13px"
>
<el-form-item label="文章标题" prop="articleTitle" style="padding-top: 32px">
<el-input v-model="form.articleTitle" disabled placeholder="请输入文章标题" />
</el-form-item>
<el-form-item label="权重" prop="articleWeight">
......@@ -57,23 +64,23 @@
<!-- <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>-->
</div>
</el-form-item>
<!-- 2-- 文章信息--文章内容 -->
<div style="display: flex">
<!-- 文章内容-->
<div class="tip-green" />
<div
class="title-font-style"
>文章内容
</div>
</div>
<!-- 2-- 文章信息的页面--文章内容 -->
<div class="base-msg" style="padding-top: 32px; padding-bottom: 20px; padding-left: 1%;">
<el-row>
<div v-html="form.articleContent" />
</el-row>
</div>
</el-form>
</div>
<!-- 2-- 文章信息--文章内容 -->
<div style="display: flex">
<!-- 文章内容-->
<div class="tip-green" />
<div
class="title-font-style"
>文章内容
</div>
</div>
<!-- 2-- 文章信息的页面--文章内容 -->
<div class="base-msg" style="padding-top: 32px; padding-bottom: 20px; padding-left: 13px;">
<el-row>
<div v-html="form.articleContent" />
</el-row>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button class="resetBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
......@@ -256,8 +263,9 @@ export default {
color: #333333;
line-height: 24px;
}
//最上方文字样式
.top-title-style{
.top-title-style {
font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
......
src/views/article-management/article-edit.vue
View file @ b9db9ac3
......@@ -280,7 +280,7 @@ export default {
//grid-template-columns: repeat(3, auto);
margin-top: 20px;
margin-bottom: 20px;
margin-left: 5%;
margin-left: 13px;
}
//表格内容选中后的样式-all
......
src/views/article-management/article-insert.vue
View file @ b9db9ac3
......@@ -234,7 +234,7 @@ export default {
//grid-template-columns: repeat(3, auto);
margin-top: 20px;
margin-bottom: 20px;
margin-left: 5%;
margin-left: 13px;
}
//表格内容选中后的样式-all
......
src/views/article-management/article-management.vue
View file @ b9db9ac3
......@@ -15,10 +15,11 @@
</el-form-item>
<el-form-item style="margin-left: 10px;" prop="articleStatus">
<el-select v-model.trim="queryParams.articleStatus" clearable placeholder="状态">
<el-option label="全部" :value="null" />
<el-option
v-for="item in dict.type.article_status"
:key="item.value"
:label="item.label"
:label="item.label.substring(1)"
:value="item.value"
/>
</el-select>
......@@ -114,7 +115,7 @@
row-key="id"
@selection-change="handleSelectionChange"
>
<el-table-column reserve-selection type="selection" width="55" />
<el-table-column align="center" reserve-selection type="selection" width="55" />
<el-table-column label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column label="文章标题" prop="articleTitle" show-overflow-tooltip width="200" />
<el-table-column
......@@ -125,7 +126,7 @@
/>
<el-table-column label="权重" min-width="55" prop="articleWeight" show-overflow-tooltip />
<el-table-column
label="创建时间"
label="创建日期"
min-width="80"
prop="articleCreateTime"
show-overflow-tooltip
......@@ -143,7 +144,7 @@
<el-table-column class-name="small-padding fixed-width" label="操作" min-width="100">
<template slot-scope="scope">
<div style="display: flex;">
<div style="padding-right: 20px;padding-left: 40px;">
<div style="padding-right: 20px;">
<el-button
icon="el-icon-document"
plain
......@@ -514,7 +515,7 @@ export default {
sort: this.queryParams.params.sort,
idList: this.ids
}
}, `文章管理-${moment().format('YYYY-MM-DD')}.xlsx`)
}, `文章管理-${moment().format('YYYYMMDD')}.xlsx`)
// 重置选择
.then(_ => {
this.effectTableSelect([])
......
src/views/medical-record-management/medical-edit.vue
View file @ b9db9ac3
......@@ -126,8 +126,9 @@ color: #333333;"
<el-col :span="8">
<!--宠物体重-->
<el-form-item label="宠物体重" prop="petWeight">
<el-input v-model="detailInfo.petWeight" :disabled="!isEdit" />
kg
<el-input v-model="detailInfo.petWeight" :disabled="!isEdit">
<template #suffix>kg</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -268,7 +269,8 @@ color: #333333;"
<el-form-item label="状态">
<el-select v-model="detailInfo.petOwnerBo.status" disabled>
<el-option
v-for="({value, label}) in statusList"
v-for="({value, label}, index) in statusList"
:key="index"
:label="label"
:value="value"
/>
......@@ -368,6 +370,7 @@ color: #333333;"
maxlength="400"
placeholder="请输入患者主诉"
type="textarea"
style="width: 85% !important"
/>
</el-form-item>
</el-col>
......@@ -379,6 +382,7 @@ color: #333333;"
maxlength="200"
placeholder="请输入医嘱"
type="textarea"
style="width: 85% !important"
/>
</el-form-item>
</el-col>
......@@ -389,6 +393,7 @@ color: #333333;"
:disabled="!isEdit"
maxlength="30"
placeholder="请输入诊断结果"
style="width: 85% !important"
/>
</el-form-item>
</el-col>
......@@ -522,13 +527,13 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<div class="table-content">
<el-form ref="checkForm" :model="checkForm" :rules="checkRules" class="demo-ruleForm" label-width="0">
<el-table :data="checkManageBos" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-form ref="checkForm" :model="checkManageBos" class="demo-ruleForm" label-width="0">
<el-table :data="checkManageBos" class="check-manage-bos__table" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="检查类型" prop="checkType">
<template slot-scope="scope">
<el-form-item
v-if="scope.row.inputShow"
:prop="'checkManageBos.'+scope.$index+'.checkType'"
:prop="scope.$index+'.checkType'"
:rules="checkRules.checkType"
>
<el-select
......@@ -558,8 +563,14 @@ color: #333333;"
<template slot-scope="scope">
<el-form-item
v-if="scope.row.inputShow"
:prop="'checkManageBos.'+scope.$index+'.checkItemsId'"
:rules="drugRules.checkItemsName"
:prop="scope.$index+'.checkItemsId'"
:rules="[{
validator: (rule, value, callback) => {
if (scope.row.checkType && isEmpty(value)) callback(new Error('请选择检查项目'))
else callback()
},
trigger: 'change'
}]"
>
<el-select
v-model="scope.row.checkItemsId"
......@@ -571,7 +582,7 @@ color: #333333;"
v-for="(item, index) in checkItemOptions"
:key="index"
:label="item.label"
:value="item.value"
:value="`${item.value}`"
/>
</el-select>
</el-form-item>
......@@ -690,14 +701,14 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<div class="table-content">
<el-form ref="treatForm" :model="treatForm" :rules="treatRules" class="demo-ruleForm" label-width="0">
<el-table :data="treatManageBo" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-form ref="treatForm" :model="treatManageBo" class="demo-ruleForm" label-width="0">
<el-table :data="treatManageBo" class="treat-manage-bo__table" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="治疗项目" prop="treatItemsName">
<template slot-scope="scope">
<el-form-item
v-if="scope.row.inputShow"
:prop="'treatManageBo.'+scope.$index+'.treatItemsId'"
:rules="treatRules.treatItemsId"
:prop="scope.$index+'.treatItemsId'"
:rules="[{ required: true, message: '请选择治疗项目', trigger: 'change' }]"
>
<el-select
v-model="scope.row.treatItemsId"
......@@ -916,6 +927,7 @@ color: #333333;"
maxlength="200"
placeholder="请输入回访情况"
type="textarea"
style="width: 85% !important"
/>
</el-form-item>
</el-col>
......@@ -936,7 +948,7 @@ color: #333333;"
</div>
</template>
<script>
import { parseTime, selectDictLabel } from '@/utils/ruoyi'
import { isEmpty, parseTime, selectDictLabel } from '@/utils/ruoyi'
// 引入进度信息模组件
import scheduleInfo from '@/views/service-management/registration-queue/components/schedule-info'
import {
......@@ -963,19 +975,22 @@ export default {
},
data() {
return {
// 错误类型
Error: Error,
// 表单校验
formRules: {
// 宠物性别非空校验
petSex: [
{ required: true, message: '宠物性别不能为空', trigger: 'change' }
{ required: true, message: '宠物性别不能为空', trigger: 'blur' }
],
// 宠物生日非空校验
petBirthday: [
{ required: true, message: '宠物生日不能为空', trigger: 'change' }
{ required: true, message: '宠物生日不能为空', trigger: 'blur' }
],
// 宠物体重非空校验
petWeight: [
{ required: true, message: '宠物体重不能为空', trigger: 'change' }
{ required: true, message: '宠物体重不能为空', trigger: 'blur' },
{ pattern: /^\d+(\.\d+)?$/, message: '宠物体重必须是数字' }
],
// 绝育情况非空校验
sterilizationStatus: [
......@@ -991,19 +1006,19 @@ export default {
],
// 主诉非空校验
mainSuit: [
{ required: true, message: '主诉不能为空', trigger: 'change' }
{ required: true, message: '主诉不能为空', trigger: 'blur' }
],
// 医嘱非空校验
doctorAdvice: [
{ required: true, message: '医嘱不能为空', trigger: 'change' }
{ required: true, message: '医嘱不能为空', trigger: 'blur' }
],
// 诊断结果非空校验
diagnosisResult: [
{ required: true, message: '诊断结果不能为空', trigger: 'change' }
{ required: true, message: '诊断结果不能为空', trigger: 'blur' }
],
// 回访情况非空校验
followContent: [
{ required: true, message: '回访情况不能为空', trigger: 'change' }
{ required: true, message: '回访情况不能为空', trigger: 'blur' }
],
// 诊位名称
......@@ -1157,6 +1172,7 @@ export default {
this.getTreatItemOptions()
},
methods: {
isEmpty,
// 表单提交
submit() {
const temp = {
......@@ -1777,6 +1793,13 @@ export default {
font-weight: 400;
color: #333333;
}
// 检查信息的表格单元格让其可以显示错误信息
.check-manage-bos__table, .treat-manage-bo__table {
::v-deep .el-table__body-wrapper .el-table__body .el-table__row .el-table__cell .cell {
padding-bottom: 20px;
}
}
</style>
<style lang="scss">
.medical-edit {
......
src/views/medical-record-management/medical-record-management.vue
View file @ b9db9ac3
......@@ -20,7 +20,7 @@
/>
</el-form-item>
<el-form-item prop="doctorName">
<el-select v-model.trim="queryParams.doctorName" clearable placeholder="主治兽医">
<el-select v-model="queryParams.doctorName" clearable placeholder="主治兽医">
<el-option
v-for="item in doctorNameList"
:key="item.doctorId"
......@@ -29,8 +29,8 @@
/>
</el-select>
</el-form-item>
<el-form-item prop="hospitalId">
<el-select v-model.trim="queryParams.hospitalName" clearable placeholder="所属医院">
<el-form-item prop="hospitalName">
<el-select v-model="queryParams.hospitalName" clearable placeholder="所属医院">
<el-option
v-for="item in HospitalList"
:key="item.hospitalId"
......@@ -40,7 +40,7 @@
</el-select>
</el-form-item>
<el-form-item prop="hospitalDepartmentName">
<el-select v-model.trim="queryParams.hospitalDepartmentName" clearable placeholder="兽医所属科室">
<el-select v-model="queryParams.hospitalDepartmentName" clearable placeholder="兽医所属科室">
<el-option
v-for="item in departmentList"
:key="item.deptId"
......@@ -61,17 +61,15 @@
<el-form-item prop="sort">
<el-select
v-model.trim="column"
v-model="queryParams.sort"
clearable
value-key="id"
placeholder="请选择排序方式"
@change="handleSort"
>
<el-option
v-for="item in sortList"
:key="item.id"
:key="item.value"
:label="item.label"
:value="item"
:value="item.value"
/>
</el-select>
</el-form-item>
......@@ -194,7 +192,6 @@ export default {
dicts: ['pet_insure'],
data() {
return {
column: '',
// 所属科室下拉框字典写死
departmentList: [],
// 所属科室下拉框字典写死
......@@ -260,16 +257,12 @@ export default {
// 排序方式下拉框字典写死
sortList: [
{
id: 1,
collation: 'desc',
label: '按就诊日期倒序',
column: 'visit_date'
label: '按挂号日期倒序',
value: '1'
},
{
id: 2,
collation: 'asc',
label: '按就诊日期正序',
column: 'visit_date'
label: '按挂号日期正序',
value: '2'
}
],
// 表单参数
......@@ -400,11 +393,6 @@ export default {
/** 查询病例管理列表 */
getList() {
this.loading = true
if (this.queryParams.orderByColumn === null) {
this.queryParams.orderByColumn = 'visit_date'
this.queryParams.isAsc = 'desc'
}
console.log('查詢--', this.queryParams)
listRecord(this.queryParams).then(response => {
console.log('病历列表的数据：', response)
this.recordList = response.rows.rows
......@@ -466,7 +454,6 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
console.log('参数:', this.queryParams)
this.queryParams.pageNum = 1
this.getList()
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment