Skip to content

P
pet-business-web
Commit b23d0d10 authored by 王飞龙's avatar 王飞龙
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents bcff64ec ca4f0352
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 136 deletions
src/components/ImageUpload/index.vue
View file @ b23d0d10
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
<div class="component-upload-image"> <div class="component-upload-image">
<el-upload <el-upload
ref="imageUpload" ref="imageUpload"
multiple
:action="uploadImgUrl" :action="uploadImgUrl"
list-type="picture-card" list-type="picture-card"
:on-success="handleUploadSuccess" :on-success="handleUploadSuccess"
:before-upload="handleBeforeUpload" :before-upload="handleBeforeUpload"
:limit="limit" :limit="1"
:on-error="handleUploadError" :on-error="handleUploadError"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:on-remove="handleDelete" :on-remove="handleDelete"
......
src/views/article-management/article-detail.vue
View file @ b23d0d10
...@@ -3,12 +3,9 @@ ...@@ -3,12 +3,9 @@
<div class="pet-owner-detail"> <div class="pet-owner-detail">
<el-card class="box-card"> <el-card class="box-card">
<!-- 头部标题--> <!-- 头部标题-->
<div style="padding-top:32px;text-align: center;"> <div style="padding-top:20px;text-align: center;">
<span <span
style="font-size: 24px; class="top-title-style"
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;"
>详情</span> >详情</span>
</div> </div>
<div style="padding: 20px;"> <div style="padding: 20px;">
...@@ -16,7 +13,7 @@ color: #333333;" ...@@ -16,7 +13,7 @@ color: #333333;"
<!-- 文章信息 --> <!-- 文章信息 -->
<div class="tip-green" /> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei;font-weight: bold;color: #333333;" class="title-font-style"
>文章信息 >文章信息
</div> </div>
</div> </div>
...@@ -65,7 +62,7 @@ color: #333333;" ...@@ -65,7 +62,7 @@ color: #333333;"
<!-- 文章内容--> <!-- 文章内容-->
<div class="tip-green" /> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei;font-weight: bold;color: #333333;" class="title-font-style"
>文章内容 >文章内容
</div> </div>
</div> </div>
...@@ -199,8 +196,12 @@ export default { ...@@ -199,8 +196,12 @@ export default {
//模块tip样式--绿色 //模块tip样式--绿色
.tip-green { .tip-green {
height: 30px; margin-right: 13px;
border-left: 5px solid #5fb54b; width: 3px;
height: 24px;
background: #5FB54B;
border-radius: 10px 10px 10px 10px;
opacity: 1;
} }
//模块tip样式--橙色 //模块tip样式--橙色
...@@ -240,4 +241,26 @@ export default { ...@@ -240,4 +241,26 @@ export default {
::v-deep .el-card__body { ::v-deep .el-card__body {
padding: unset !important; padding: unset !important;
} }
//权重里面的数字位置
::v-deep .el-input-number.is-controls-right .el-input__inner {
display: flex;
text-align: left;
}
//小标题样式
.title-font-style {
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
line-height: 24px;
}
//最上方文字样式
.top-title-style{
font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
}
</style> </style>
src/views/article-management/article-edit.vue
View file @ b23d0d10
...@@ -3,19 +3,16 @@ ...@@ -3,19 +3,16 @@
<div class="pet-owner-detail"> <div class="pet-owner-detail">
<el-card class="box-card"> <el-card class="box-card">
<!-- 头部标题--> <!-- 头部标题-->
<div style="padding-top:32px;text-align: center;"> <div style="padding-top:20px;text-align: center;">
<span <span
style="font-size: 24px; class="top-title-style"
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;"
>编辑</span> >编辑</span>
</div> </div>
<div style="padding: 20px;"> <div style="padding: 20px;">
<div style="display: flex"> <div style="display: flex">
<!-- 0-- 文章信息--标签头 --> <!-- 0-- 文章信息--标签头 -->
<div class="tip-green" /> <div class="tip-green" />
<div style="padding-top: 3px;padding-left: 18px; color: #666666; font-weight: 600; font-size: 17px;">文章信息 <div class="title-font-style">文章信息
</div> </div>
</div> </div>
<!-- 0-- 文章信息的页面--修改文章信息 --> <!-- 0-- 文章信息的页面--修改文章信息 -->
...@@ -153,7 +150,7 @@ export default { ...@@ -153,7 +150,7 @@ export default {
submitForm() { submitForm() {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
this.$confirm('确认修改?', '提示', { this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
...@@ -241,10 +238,22 @@ export default { ...@@ -241,10 +238,22 @@ export default {
//模块tip样式--绿色 //模块tip样式--绿色
.tip-green { .tip-green {
height: 30px; margin-right: 13px;
border-left: 5px solid #5fb54b; width: 3px;
height: 24px;
background: #5FB54B;
border-radius: 10px 10px 10px 10px;
opacity: 1;
} }
//小标题样式
.title-font-style {
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
line-height: 24px;
}
//模块tip样式--橙色 //模块tip样式--橙色
.tip-orange { .tip-orange {
height: 30px; height: 30px;
...@@ -283,4 +292,16 @@ export default { ...@@ -283,4 +292,16 @@ export default {
::v-deep .el-form-item__content { ::v-deep .el-form-item__content {
width: 700px; width: 700px;
} }
//权重里面的数字位置
::v-deep .el-input-number.is-controls-right .el-input__inner {
display: flex;
text-align: left;
}
//最上方文字样式
.top-title-style{
font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
}
</style> </style>
src/views/article-management/article-insert.vue
View file @ b23d0d10
...@@ -3,19 +3,16 @@ ...@@ -3,19 +3,16 @@
<div class="pet-owner-detail"> <div class="pet-owner-detail">
<el-card class="box-card"> <el-card class="box-card">
<!-- 头部标题--> <!-- 头部标题-->
<div style="padding-top:32px;text-align: center;"> <div style="padding-top:20px;text-align: center;">
<span <span
style="font-size: 24px; class="top-title-style"
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;"
>新增</span> >新增</span>
</div> </div>
<div style="padding: 20px;"> <div style="padding: 20px;">
<div style="display: flex"> <div style="display: flex">
<!-- 0-- 文章信息--标签头 --> <!-- 0-- 文章信息--标签头 -->
<div class="tip-green" /> <div class="tip-green" />
<div style="padding-top: 3px;padding-left: 18px; color: #666666; font-weight: 600; font-size: 17px;">文章信息 <div class="title-font-style">文章信息
</div> </div>
</div> </div>
<!-- 0-- 文章信息的页面--新增文章信息 --> <!-- 0-- 文章信息的页面--新增文章信息 -->
...@@ -203,8 +200,12 @@ export default { ...@@ -203,8 +200,12 @@ export default {
//模块tip样式--绿色 //模块tip样式--绿色
.tip-green { .tip-green {
height: 30px; margin-right: 13px;
border-left: 5px solid #5fb54b; width: 3px;
height: 24px;
background: #5FB54B;
border-radius: 10px 10px 10px 10px;
opacity: 1;
} }
//模块tip样式--橙色 //模块tip样式--橙色
...@@ -250,4 +251,25 @@ export default { ...@@ -250,4 +251,25 @@ export default {
width: 700px; width: 700px;
} }
//权重里面的数字位置
::v-deep .el-input-number.is-controls-right .el-input__inner {
display: flex;
text-align: left;
}
//小标题样式
.title-font-style {
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
line-height: 24px;
}
//最上方文字样式
.top-title-style{
font-size: 24px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei;
font-weight: bold;
color: #333333;
}
</style> </style>
src/views/article-management/article-management.vue
View file @ b23d0d10
...@@ -13,17 +13,8 @@ ...@@ -13,17 +13,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="articleCreateTime"> <el-form-item style="margin-left: 10px;" prop="articleStatus">
<el-date-picker <el-select v-model.trim="queryParams.articleStatus" clearable placeholder="状态">
v-model.trim="queryParams.articleCreateTime"
clearable
placeholder="请选择创建时间"
type="date"
value-format="yyyy-MM-dd"
/>
</el-form-item>
<el-form-item prop="articleStatus">
<el-select v-model.trim="queryParams.articleStatus" clearable placeholder="请选择文章状态">
<el-option <el-option
v-for="item in dict.type.article_status" v-for="item in dict.type.article_status"
:key="item.value" :key="item.value"
...@@ -32,7 +23,17 @@ ...@@ -32,7 +23,17 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="sort">
<el-form-item style="margin-left: 10px;" prop="articleCreateTime">
<el-date-picker
v-model.trim="queryParams.articleCreateTime"
clearable
placeholder="请选择创建日期"
type="date"
value-format="yyyy-MM-dd"
/>
</el-form-item>
<el-form-item style="margin-left: 10px;" prop="sort">
<el-select <el-select
v-model.trim="queryParams.params.sort" v-model.trim="queryParams.params.sort"
clearable clearable
...@@ -267,20 +268,20 @@ export default { ...@@ -267,20 +268,20 @@ export default {
// 排序方式下拉框字典写死 // 排序方式下拉框字典写死
sortList: [ sortList: [
{ {
label: '按创建时间倒序', label: '按权重倒序排序',
value: '01' value: '11'
}, },
{ {
label: '按创建时间正序', label: '按权重正序排序',
value: '02' value: '12'
}, },
{ {
label: '按权重倒序', label: '按创建日期倒序',
value: '11' value: '01'
}, },
{ {
label: '按权重正序', label: '按创建日期正序',
value: '12' value: '02'
} }
], ],
// 遮罩层 // 遮罩层
...@@ -501,7 +502,7 @@ export default { ...@@ -501,7 +502,7 @@ export default {
/** 功能按钮--导出按钮操作 */ /** 功能按钮--导出按钮操作 */
handleExport() { handleExport() {
console.log('queryParams', this.queryParams) console.log('queryParams', this.queryParams)
if (this.total || this.ids) { if (!this.total || !this.ids.length) {
this.$message.warning('请选择至少一条数据导出') this.$message.warning('请选择至少一条数据导出')
return return
} }
...@@ -529,9 +530,10 @@ export default { ...@@ -529,9 +530,10 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.app-container { .app-container {
padding: 0 0.5rem; padding: 0 1.5rem;
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
/*表格超出行宽省略号显示并悬浮状态显示全文*/ /*表格超出行宽省略号显示并悬浮状态显示全文*/
::v-deep .el-tooltip__popper .is-dark { ::v-deep .el-tooltip__popper .is-dark {
background: #f1f1f1 !important; background: #f1f1f1 !important;
...@@ -558,6 +560,7 @@ export default { ...@@ -558,6 +560,7 @@ export default {
::v-deep .el-table .disabledCheck .cell .el-checkbox__inner { ::v-deep .el-table .disabledCheck .cell .el-checkbox__inner {
display: none; display: none;
} }
.el-tab-pane { .el-tab-pane {
padding-bottom: 15px; padding-bottom: 15px;
} }
......
src/views/equipment-management/use-management/use-details.vue
View file @ b23d0d10
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="设备名称" prop="deviceName"> <el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.deviceName" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="设备ID" prop="ruleId"> <el-form-item label="设备ID" prop="ruleId">
<el-input v-model="form.ruleId" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.ruleId" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -37,12 +37,12 @@ ...@@ -37,12 +37,12 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="负责人" prop="head"> <el-form-item label="负责人" prop="head">
<el-input v-model="form.head" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.head" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="手机号" prop="phone"> <el-form-item label="手机号" prop="phone">
<el-input v-model="form.headPhone" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.headPhone" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -73,12 +73,12 @@ ...@@ -73,12 +73,12 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="上午开始时间"> <el-form-item label="上午开始时间">
<el-input v-model="useTime.ame" :disabled="true" placeholder="暂无数据"/> <el-input v-model="useTime.ame" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="上午结束时间" prop="wardPrice"> <el-form-item label="上午结束时间" prop="wardPrice">
<el-input v-model="useTime.ams" :disabled="true" placeholder="暂无数据"/> <el-input v-model="useTime.ams" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -88,24 +88,24 @@ ...@@ -88,24 +88,24 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="下午开始时间"> <el-form-item label="下午开始时间">
<el-input v-model="useTime.ame" :disabled="true" placeholder="暂无数据"/> <el-input v-model="useTime.ame" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="下午结束时间" prop="wardPrice"> <el-form-item label="下午结束时间" prop="wardPrice">
<el-input v-model="useTime.ams" :disabled="true" placeholder="暂无数据"/> <el-input v-model="useTime.ams" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="权重"> <el-form-item label="权重">
<el-input v-model="form.sort" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.sort" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-input v-model="createTime" :disabled="true" placeholder="暂无数据"/> <el-input v-model="createTime" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="支持服务地区" prop="serviceArea"> <el-form-item label="支持服务地区" prop="serviceArea">
<el-input v-model="form.serviceArea" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.serviceArea" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -156,17 +156,17 @@ ...@@ -156,17 +156,17 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物昵称"> <el-form-item label="宠物昵称">
<el-input v-model="form.petNickname" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.petNickname" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物ID"> <el-form-item label="宠物ID">
<el-input v-model="form.petsId" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.petsId" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物品种"> <el-form-item label="宠物品种">
<el-input v-model="form.pet_breed" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.pet_breed" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -185,19 +185,19 @@ ...@@ -185,19 +185,19 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物年龄"> <el-form-item label="宠物年龄">
<el-input v-model="form.petAgeHis" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.petAgeHis" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物体重"> <el-form-item label="宠物体重">
<el-input v-model="form.petWeight" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.petWeight" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物毛色"> <el-form-item label="宠物毛色">
<el-input v-model="form.petColor" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.petColor" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -246,17 +246,17 @@ ...@@ -246,17 +246,17 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠主姓名"> <el-form-item label="宠主姓名">
<el-input v-model="form.ownersName" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.ownersName" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="用户ID"> <el-form-item label="用户ID">
<el-input v-model="form.ownersId" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.ownersId" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model="form.phonenumber" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.phonenumber" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -268,12 +268,12 @@ ...@@ -268,12 +268,12 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="检查项目"> <el-form-item label="检查项目">
<el-input v-model="form.checkItemsName" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.checkItemsName" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="缴费金额"> <el-form-item label="缴费金额">
<el-input v-model="form.payAmount" :disabled="true" placeholder="暂无数据"/> <el-input v-model="form.payAmount" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -292,12 +292,12 @@ ...@@ -292,12 +292,12 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="使用日期"> <el-form-item label="使用日期">
<el-input v-model="checkDate" :disabled="true" placeholder="暂无数据"/> <el-input v-model="checkDate" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="使用时间"> <el-form-item label="使用时间">
<el-input v-model="checkTime" :disabled="true" placeholder="暂无数据"/> <el-input v-model="checkTime" :disabled="true" placeholder="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
src/views/equipment-management/use-management/use-management.vue
View file @ b23d0d10
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" :header-cell-class-name="cellClass"> <el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" :header-cell-class-name="cellClass" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" /> <el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
<el-table-column type="index" label="序号" min-width="60" /> <el-table-column type="index" label="序号" min-width="60" />
<el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true"> <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<span>{{ scope.row.deviceCode || '-' }}</span> <span>{{ scope.row.deviceCode || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检查项目" align="left" prop="checkItemsName" min-width="80" :show-overflow-tooltip="true"> <el-table-column label="检查项目" align="left" prop="checkItemsName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.checkItemsName || '-' }}</span> <span>{{ scope.row.checkItemsName || '-' }}</span>
</template> </template>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<span>{{ scope.row.ownerNikename || '-' }}</span> <span>{{ scope.row.ownerNikename || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="宠主手机号" align="left" prop="phoneNumber" > <el-table-column label="宠主手机号" align="left" prop="phoneNumber">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.phoneNumber || '-' }}</span> <span>{{ scope.row.phoneNumber || '-' }}</span>
</template> </template>
...@@ -133,10 +133,10 @@ ...@@ -133,10 +133,10 @@
</el-table-column> </el-table-column>
<el-table-column label="检查时间" align="left" prop="checkStartTime"> <el-table-column label="检查时间" align="left" prop="checkStartTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{h}:{m}') || '-'}}</span> <span>{{ parseTime(scope.row.checkStartTime, '{h}:{m}') || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="缴费金额" align="left" prop="payAmount" > <el-table-column label="缴费金额" align="left" prop="payAmount">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.payAmount || '-' }}</span> <span>{{ scope.row.payAmount || '-' }}</span>
</template> </template>
......
src/views/medical-record-management/medical-record-management.vue
View file @ b23d0d10
...@@ -118,16 +118,16 @@ ...@@ -118,16 +118,16 @@
@select="selectChange" @select="selectChange"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column align="center" type="selection" width="55"/> <el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index"/> <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip/> <el-table-column align="center" label="病历号" min-width="80" prop="medicalRecordNo" show-overflow-tooltip />
<el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip/> <el-table-column align="center" label="宠物昵称" min-width="80" prop="petNickname" show-overflow-tooltip />
<el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip/> <el-table-column align="center" label="宠物ID" prop="petsId" show-overflow-tooltip />
<el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip/> <el-table-column align="center" label="宠主姓名" prop="petNickname" show-overflow-tooltip />
<el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip/> <el-table-column align="center" label="宠主手机号" prop="petOwnerPhone" show-overflow-tooltip />
<el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip/> <el-table-column align="center" label="归档医院" prop="hospitalName" show-overflow-tooltip />
<el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip/> <el-table-column align="center" label="主治兽医" prop="doctorName" show-overflow-tooltip />
<el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip/> <el-table-column align="center" label="所属科室" prop="hospitalDepartmentName" show-overflow-tooltip />
<el-table-column align="center" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180"> <el-table-column align="center" label="就诊日期" prop="visitDate" show-overflow-tooltip width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="宠物保险" prop="insure" show-overflow-tooltip> <el-table-column align="center" label="宠物保险" prop="insure" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.pet_insure" :value="scope.row.insure"/> <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -335,12 +335,6 @@ export default { ...@@ -335,12 +335,6 @@ export default {
} }
}, },
/** 功能按钮--导出按钮操作 */ /** 功能按钮--导出按钮操作 */
handleExport() { handleExport() {
console.log('queryParams', this.queryParams) console.log('queryParams', this.queryParams)
......
src/views/service-management/medical-record-management/check-subscribe.vue
View file @ b23d0d10
...@@ -119,14 +119,14 @@ ...@@ -119,14 +119,14 @@
<el-date-picker <el-date-picker
v-model="queryParams.checkDate" v-model="queryParams.checkDate"
type="date" type="date"
@change="changeDate"
placeholder="请选择检查日期" placeholder="请选择检查日期"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@change="changeDate"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-show="subscribeMessage.checkType === '2'"> <el-col v-show="subscribeMessage.checkType === '2'" :span="8">
<el-form-item label="支出账户余额"> <el-form-item label="支出账户余额">
11800.00 11800.00
</el-form-item> </el-form-item>
......
src/views/service-management/medical-record-management/medical-record-management.vue
View file @ b23d0d10
...@@ -154,8 +154,8 @@ ...@@ -154,8 +154,8 @@
class="bookNow" class="bookNow"
size="mini" size="mini"
icon="el-icon-check" icon="el-icon-check"
@click="handleSubscribe(scope.row)"
:disabled="scope.row.deviceId !== null" :disabled="scope.row.deviceId !== null"
@click="handleSubscribe(scope.row)"
>立即预约</el-button> >立即预约</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -190,10 +190,10 @@ ...@@ -190,10 +190,10 @@
<el-date-picker <el-date-picker
v-model="form.checkDate" v-model="form.checkDate"
type="date" type="date"
@change="changeDate"
placeholder="请选择检查日期" placeholder="请选择检查日期"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@change="changeDate"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -206,7 +206,8 @@ ...@@ -206,7 +206,8 @@
</el-form> </el-form>
<el-table <el-table
:data="deviceList" :data="deviceList"
style="width: 100%"> style="width: 100%"
>
<el-table-column prop="deviceName" align="left" label="设备名称" /> <el-table-column prop="deviceName" align="left" label="设备名称" />
<el-table-column prop="checkDate" align="left" label="检查日期" /> <el-table-column prop="checkDate" align="left" label="检查日期" />
<el-table-column prop="checkTime" align="left" label="检查时段" /> <el-table-column prop="checkTime" align="left" label="检查时段" />
...@@ -229,10 +230,10 @@ ...@@ -229,10 +230,10 @@
:limit.sync="deviceQueryParams.pageSize" :limit.sync="deviceQueryParams.pageSize"
@pagination="getDevice" @pagination="getDevice"
/> />
<!-- <div slot="footer" class="dialog-footer">--> <!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>--> <!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
<!-- <el-button @click="cancel">取 消</el-button>--> <!-- <el-button @click="cancel">取 消</el-button>-->
<!-- </div>--> <!-- </div>-->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
......
src/views/service-management/registration-queue/components/doctor-card.vue
View file @ b23d0d10
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div v-if="docList.length>0" class="doctor-card"> <div v-if="docList.length>0" class="doctor-card">
<!--标签--> <!--标签-->
<div class="progress-tip"> <div class="progress-tip">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-content" class="tip-content"
>挂号信息 >挂号信息
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
</div> </div>
<!--分割线--> <!--分割线-->
<div class="divider"/> <div class="divider" />
<!--卡片中间部分--> <!--卡片中间部分-->
<div class="mid-bottom-framework"> <div class="mid-bottom-framework">
<div <div
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
> >
<div class="detail" @click="doctorDetail(item.id)"> <div class="detail" @click="doctorDetail(item.id)">
<div class="detail-img"> <div class="detail-img">
<el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_xiangqing@2x.png')" />
</div> </div>
<el-button <el-button
type="text" type="text"
...@@ -119,16 +119,16 @@ ...@@ -119,16 +119,16 @@
</el-button> </el-button>
</div> </div>
<!--给它传一个userId,一个类型--> <!--给它传一个userId,一个类型-->
<div class="register" @click="registration(item.userId,'0',item,0)"> <div class="register" @click="registration(item.userId,'0',item,0)">
<div class="register-img"> <div class="register-img">
<el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_guahaohui@2x.png')" />
</div> </div>
<el-button type="text">挂号</el-button> <el-button type="text">挂号</el-button>
</div> </div>
<!--给它传一个userId,一个类型和一个默认页数--> <!--给它传一个userId,一个类型和一个默认页数-->
<div class="add" @click="registration(item.userId, '1',item,0)"> <div class="add" @click="registration(item.userId, '1',item,0)">
<div class="add-img"> <div class="add-img">
<el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_jiahao@2x.png')" />
</div> </div>
<el-button type="text">加号</el-button> <el-button type="text">加号</el-button>
</div> </div>
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<div v-else class="doctor-card"> <div v-else class="doctor-card">
<!--标签--> <!--标签-->
<div class="progress-tip"> <div class="progress-tip">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-content" class="tip-content"
>挂号信息 >挂号信息
...@@ -162,7 +162,7 @@ border: 1px solid #E5E5E5; ...@@ -162,7 +162,7 @@ border: 1px solid #E5E5E5;
flex-direction: column;margin-top: 9%;" flex-direction: column;margin-top: 9%;"
> >
<div style=" width:115px;height: 74px;"> <div style=" width:115px;height: 74px;">
<el-image :src="require('@/assets/register/guahao_img_wushuju@2x.png')"/> <el-image :src="require('@/assets/register/guahao_img_wushuju@2x.png')" />
</div> </div>
<div <div
style="font-size: 14px; style="font-size: 14px;
......
src/views/service-management/registration-queue/components/schedule-info.vue
View file @ b23d0d10
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="schedule-info"> <div class="schedule-info">
<!-- 1--tip样式--> <!-- 1--tip样式-->
<div class="progress-tip"> <div class="progress-tip">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-content" class="tip-content"
>进度信息 >进度信息
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
<div <div
class="avatar" class="avatar"
> >
<el-image :src="require('@/assets/register/xinzengguahao_yuyue@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_yuyue@2x.png')" />
</div> </div>
<div <div
class="title" class="title"
>1.预约/现场挂号 >1.预约/现场挂号
</div> </div>
<div class="status-on" v-if="scheduleKey.registrationTime!=null">{{ scheduleKey.registrationTime }}</div> <div v-if="scheduleKey.registrationTime!=null" class="status-on">{{ scheduleKey.registrationTime }}</div>
<div class="status-off" v-else>暂未挂号</div> <div v-else class="status-off">暂未挂号</div>
</div> </div>
</div> </div>
<!-- 箭头指示--> <!-- 箭头指示-->
<div class="arrow"> <div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div> </div>
<!-- 2--单个的背景,,后面按状态位切换样式--> <!-- 2--单个的背景,,后面按状态位切换样式-->
<div <div
...@@ -46,19 +46,19 @@ ...@@ -46,19 +46,19 @@
<div <div
class="avatar" class="avatar"
> >
<el-image :src="require('@/assets/register/xinzengguahao_luru@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_luru@2x.png')" />
</div> </div>
<div <div
class="title" class="title"
>2.录入诊断信息 >2.录入诊断信息
</div> </div>
<div class="status-on" v-if="scheduleKey.diagnosisTime!=null">{{ scheduleKey.diagnosisTime }}</div> <div v-if="scheduleKey.diagnosisTime!=null" class="status-on">{{ scheduleKey.diagnosisTime }}</div>
<div class="status-off" v-else>暂未录入</div> <div v-else class="status-off">暂未录入</div>
</div> </div>
</div> </div>
<!-- 箭头指示--> <!-- 箭头指示-->
<div class="arrow"> <div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div> </div>
<!-- 3--单个的背景,,后面按状态位切换样式--> <!-- 3--单个的背景,,后面按状态位切换样式-->
<div <div
...@@ -71,19 +71,19 @@ ...@@ -71,19 +71,19 @@
<div <div
class="avatar" class="avatar"
> >
<el-image :src="require('@/assets/register/xinzengguahao_shengchengbaogao@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_shengchengbaogao@2x.png')" />
</div> </div>
<div <div
class="title" class="title"
>3.生成病例报告 >3.生成病例报告
</div> </div>
<div class="status-on" v-if="scheduleKey.reportTime!=null">{{ scheduleKey.reportTime }}</div> <div v-if="scheduleKey.reportTime!=null" class="status-on">{{ scheduleKey.reportTime }}</div>
<div class="status-off" v-else>暂未生成</div> <div v-else class="status-off">暂未生成</div>
</div> </div>
</div> </div>
<!-- 箭头指示--> <!-- 箭头指示-->
<div class="arrow"> <div class="arrow">
<el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_jaintou@2x.png')" />
</div> </div>
<!-- 4--单个的背景,,后面按状态位切换样式--> <!-- 4--单个的背景,,后面按状态位切换样式-->
<div <div
...@@ -96,19 +96,19 @@ ...@@ -96,19 +96,19 @@
<div <div
class="avatar" class="avatar"
> >
<el-image :src="require('@/assets/register/xinzengguahao_kaichuangfdan@2x.png')"/> <el-image :src="require('@/assets/register/xinzengguahao_kaichuangfdan@2x.png')" />
</div> </div>
<div <div
class="title" class="title"
>4.开具处方单 >4.开具处方单
</div> </div>
<div class="status-on" v-if="scheduleKey.recipelTime!=null">{{ scheduleKey.recipelTime }}</div> <div v-if="scheduleKey.recipelTime!=null" class="status-on">{{ scheduleKey.recipelTime }}</div>
<div class="status-off" v-else>暂未开具</div> <div v-else class="status-off">暂未开具</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
......
src/views/service-management/registration-queue/registration-queue.vue
View file @ b23d0d10
...@@ -117,13 +117,13 @@ ...@@ -117,13 +117,13 @@
</el-row> </el-row>
<el-table <el-table
ref="table"
v-loading="loading" v-loading="loading"
:data="registerList" :data="registerList"
ref="table"
@select="selectChange" @select="selectChange"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column align="center" type="selection" width="55"/> <el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" /> <el-table-column align="center" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" />
<el-table-column align="center" label="挂号方式" min-width="70" prop="type" show-overflow-tooltip> <el-table-column align="center" label="挂号方式" min-width="70" prop="type" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -429,7 +429,6 @@ export default { ...@@ -429,7 +429,6 @@ export default {
this.$router.push('/service-management/registration-add') this.$router.push('/service-management/registration-add')
}, },
// 选择全部 // 选择全部
checkAll() { checkAll() {
this.registerIds = this.registerIdsForever this.registerIds = this.registerIdsForever
...@@ -489,8 +488,6 @@ export default { ...@@ -489,8 +488,6 @@ export default {
} }
}, },
/** 功能按钮--导出按钮操作 */ /** 功能按钮--导出按钮操作 */
handleExport() { handleExport() {
console.log('queryParams', this.queryParams) console.log('queryParams', this.queryParams)
......
src/views/service-management/treatment-management/treatment-subscribe.vue
View file @ b23d0d10
<template> <template>
<div>11</div> <div>11</div>
</template> </template>
<script> <script>
......
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