Skip to content

P
pet-business-web
Commit 8d27b385 authored by 盖献康's avatar 盖献康
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 21e3a840 0b974ddf
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 46 deletions
src/router/index.js
View file @ 8d27b385
......@@ -339,12 +339,15 @@ export const constantRoutes = [
name: 'Check-detail',
meta: { title: '检查详情', icon: 'component' }
},
// 病历详情
{
path: 'medical-detail',
path: 'medical-detail/:id',
component: () => import('@/views/medical-record-management/medical-edit'),
name: 'MedicalDetailForData',
props: true,
component: () => import('@/views/medical-record-management/medical-edit.vue'),
name: 'Medical-detail',
meta: { title: '病历详情', icon: 'component' }
meta: {
title: '病历详情', icon: 'component'
}
}
]
},
......
src/views/article-management/article-management.vue
View file @ 8d27b385
......@@ -76,17 +76,6 @@
@click="reverseSelect"
>反向选择
</el-button>
<!--批量导入-->
<!-- <el-button-->
<!-- v-hasPermi="['system:pets:export']"-->
<!-- class="fourWordsBtn"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- >-->
<!-- &lt;!&ndash; 导入svg文件&ndash;&gt;-->
<!-- <svg-icon icon-class="shaixuan_icon_daoru" />-->
<!-- 批量导入-->
<!-- </el-button>-->
<!--批量导出-->
<el-button
v-hasPermi="['system:pets:export']"
......@@ -118,12 +107,17 @@
>
<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 label="文章标题" prop="articleTitle" show-overflow-tooltip min-width="200">
<template slot-scope="scope">
<!--<span style="white-space: pre-wrap">{{ scope.row.articleTitle || '-' }}</span>-->
<span>{{ scope.row.articleTitle || '-' }}</span>
</template>
</el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="文章内容"
prop="articleContent"
width="200"
min-width="200"
/>
<el-table-column label="权重" min-width="55" prop="articleWeight" show-overflow-tooltip />
<el-table-column
......@@ -144,7 +138,7 @@
}}</span>
</template>
</el-table-column>
<el-table-column class-name="small-padding fixed-width" label="操作" min-width="100">
<el-table-column class-name="small-padding fixed-width" label="操作" width="300">
<template slot-scope="scope">
<div style="display: flex;">
<div style="padding-right: 20px;">
......
src/views/data-statistics/other-components/emptyTool.vue
View file @ 8d27b385
......@@ -8,7 +8,7 @@
<div>
<img src="../../../assets/data_statistics/guahao_img_wushuju.png">
</div>
<div>暂无数据</div>
<div>-</div>
</div>
</div>
</div>
......
src/views/data-statistics/other-components/percentTool.vue
View file @ 8d27b385
......@@ -4,7 +4,7 @@
<div class="noRotateProgress">
<el-progress
type="circle"
width="90"
width="110"
:percentage="percentReal"
:stroke-width="strokeWidth"
:format="formatPercent"
......@@ -17,7 +17,7 @@
<el-progress
style="transform: rotateY(180deg);"
type="circle"
width="90"
width="110"
:percentage="percentReal"
:stroke-width="strokeWidth"
:format="formatPercent"
......
src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue
View file @ 8d27b385
......@@ -850,7 +850,7 @@ export default {
},
ownerDetail(row) {
const local = process.env.VUE_APP_WEB
window.location.href = `${local}/customer-management/pet-owner-management/pet-owner-detail/${row.ownId}`
window.location.href = `${local}/data-statistics/pet-owner-detail?id=${row.ownId}`
}
}
}
......
src/views/data-statistics/service-statistics/service-statistics.vue
View file @ 8d27b385
......@@ -297,7 +297,7 @@
</div>
<el-row :gutter="14">
<el-col :span="6">
<div class="service_info_statistics service_info_statistics_hasServicePerson">
<div class="service_info_statistics service_info_statistics_hasServicePerson" :style="{backgroundImage: 'url(' + require('../../../assets/data_statistics/caiwu_img_chongzhu.png') + ')'}">
<div style="display: flex;">
<div class="numberColor">{{ formatNum(businessInformation.serviceOwnerNum || 0) }}</div>
<div class="fontColor">人</div>
......@@ -1001,9 +1001,12 @@ export default {
return now.getMonth()
},
handleRecordDetail(row) {
// this.$router.push({
// name: 'MedicalDetailForData',
// params: { id: row.id }
// })
this.$router.push({
path: '/data-statistics/medical-detail',
params: { id: row.id }
name: 'MedicalDetailForData', params: { id: row.id }
})
},
serviceDetail(row) {
......@@ -1043,7 +1046,7 @@ export default {
}
.service_info_statistics {
width: 100%;
height: 113px;
height: 103px;
padding-top: 20px;
padding-left: 16px;
//padding-right: 16px;
......@@ -1059,7 +1062,7 @@ export default {
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 5px;
padding-top: 10px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
......@@ -1082,7 +1085,6 @@ export default {
}
}
.service_info_statistics_hasServicePerson {
background-image: url("../../../assets/data_statistics/caiwu_img_chongzhu.png");
background-size: 100% 103px;
.numberColor {
font-size: 24px;
......@@ -1092,7 +1094,7 @@ export default {
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 5px;
padding-top: 10px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
......@@ -1125,7 +1127,7 @@ export default {
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 5px;
padding-top: 10px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
......@@ -1158,7 +1160,7 @@ export default {
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 5px;
padding-top: 10px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
......@@ -1191,7 +1193,7 @@ export default {
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 5px;
padding-top: 10px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
......@@ -1224,7 +1226,7 @@ export default {
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 5px;
padding-top: 10px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
......@@ -1257,7 +1259,7 @@ export default {
-webkit-text-fill-color:transparent;
}
.fontColor {
padding-top: 5px;
padding-top: 10px;
padding-left: 2px;
font-size: 12px;
font-weight: bold;
......@@ -1347,7 +1349,7 @@ export default {
}
.percentDiv {
width: 100%;
height: 191px;
height: 181px;
text-align: center;
.cardTitle {
margin-bottom: 10px;
......
src/views/equipment-management/use-management/use-details.vue
View file @ 8d27b385
......@@ -285,8 +285,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴费金额">
<el-input v-model="form.payAmount" :disabled="true" placeholder="-" />
<el-form-item label="支付金额">
<el-input v-model="form.payAmount" :disabled="true" placeholder="-" style=" width: 190px" />
<span style="margin-left: 5px">元</span>
</el-form-item>
</el-col>
<el-col :span="8">
......
src/views/equipment-management/use-management/use-management.vue
View file @ 8d27b385
......@@ -183,7 +183,9 @@
</template>
<script>
import { listUseManagement, listUseManagementAll, selectCheckItem } from '@/api/business/use'
import { listUseManagement, listUseManagementAll } from '@/api/business/use'
import { listItemByType } from '@/api/business/item'
import { getInfo } from '@/api/login'
export default {
name: 'UseManagement',
......@@ -207,6 +209,10 @@ export default {
value: '0'
}
],
// 判断是医院还是平台
type: '',
// 查询检查项目下拉框传递的字段
itemType: '',
// 可以使用的时间段时间范围
daterangeCreateTime: '',
// 多选框选中id
......@@ -273,7 +279,8 @@ export default {
},
created() {
this.getUseList()
this.getCheckList()
// this.getCheckList()
this.getUserInfo()
},
methods: {
// 表格显示病房单价保留两位小数
......@@ -284,13 +291,35 @@ export default {
cellClass(row) {
if (row.columnIndex === 0) { return 'disabledCheck' }
},
// 检查项目下拉框
getCheckList() {
selectCheckItem().then(res => {
// 获取登陆人信息
getUserInfo() {
getInfo().then(res => {
console.log('-------------------', res)
this.type = res.user.dept.level
if (this.type === '2') {
this.itemType = 0
}
if (this.type === '1') {
this.itemType = 3
}
this.getItemByType()
})
},
// 获取检查项目下拉框
getItemByType() {
listItemByType({ itemType: this.itemType }).then(res => {
console.log('检查项目', res)
this.checkList = res
this.checkList = res.rows
console.log('xdddd', this.checkList)
})
},
// // 检查项目下拉框
// getCheckList() {
// selectCheckItem().then(res => {
// console.log('检查项目', res)
// this.checkList = res
// })
// },
// 搜索
handleQuery() {
this.queryParams.pageNum = 1
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ 8d27b385
......@@ -55,7 +55,7 @@
<el-table-column class-name="small-padding fixed-width" label="操作" min-width="160">
<template #default="{row}">
<el-button
:disabled="registrationType !== '0' ? !inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1],row.residueCount) : afterTime(row.hours.split('~')[0], row.hours.split('~')[1],row.residueCount)"
:disabled="registrationType !== '0' ? !inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1],1) : afterTime(row.hours.split('~')[0], row.hours.split('~')[1],1)"
icon="el-icon-document"
plain
size="mini"
......@@ -309,7 +309,15 @@ export default {
checkPet(temp).then(({ msg }) => {
console.log('aaa,这是关键判断是否已存在宠物的数据', msg)
if (msg) {
this.$modal.confirm('当前宠物已经存在是否覆盖数据')
this.$modal.confirmAllConfig('当前宠物已经存在是否覆盖数据', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
confirmButtonClass: 'queryBtn',
type: 'warning',
closeOnClickModal: false
})
.then(_ => {
// 把返参给宠物id赋值
temp.petsId = msg
......
src/views/service-management/registration-queue/registration-queue.vue
View file @ 8d27b385
......@@ -184,7 +184,7 @@
<el-table-column align="left" label="就诊时间" min-width="80" prop="visitDateTime" show-overflow-tooltip />
<el-table-column align="left" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip>
<template slot-scope="scope">
<span :style="showStatus(scope.row.payStatus) === '• 已缴费' ? 'color: #67C23A' : 'color: #F56C6C'">{{
<span :style="showStatus(scope.row.payStatus) === '• 已缴费' ? 'color: #5FB54B' : (showStatus(scope.row.payStatus) === '• 待缴费' ? 'color: #FF9D4E' : 'color: #3490CE')">{{
showStatus(scope.row.payStatus) || '-'
}}</span>
</template>
......
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