lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

从本地电脑提交

This commit is contained in:
giaogiao 2023-12-21 10:20:45 +08:00
parent bdf1cabc33
commit bfa7669e66
10 changed files with 9832 additions and 10056 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/echart/bottom/bottomFj/chart.vue
View File

@ -52,7 +52,7 @@
},
yAxis: {
type: 'category',
data: ['床位','房间'],
data: ['供养床位','供养房间'],
axisLabel: {
fontSize: 20
}
@ -70,7 +70,7 @@
data: this.cdata.seriesData.map(item => item.value2)
},
{
name: '总数',
name: '剩余数',
type: 'bar',
stack: 'total',
label: {

32
src/views/bigScreen/bottomRight.vue
View File

@ -22,6 +22,16 @@
</div>
</div>
</div>
<div class="service-bag" @click="jumpPage(1)">
<div class="service-img"><img alt="" src="@/assets/user_head.png" /></div>
<div class="service-comtemt">
<div class="servive-title">供养床位</div>
<div class="service-cont">
<div class="num">{{ rzData.roomTypeList[7].value }}</div>
<div class="unit">间</div>
</div>
</div>
</div>
<div class="service-bag" @click="jumpPage(4)">
<div class="service-img"><img alt="" src="@/assets/user_head.png" /></div>
@ -70,9 +80,29 @@
</div>
</div>
<div class="service-bag">
<div class="service-bag" @click="jumpPage(6)">
<div class="service-img"><img alt="" src="@/assets/build.png" /></div>
<div class="service-comtemt">
<div class="servive-title">档案室</div>
<div class="service-cont">
<div class="num">{{ rzData.roomTypeList[5].value }}</div>
<div class="unit">间</div>
</div>
</div>
</div>
<div class="service-bag" @click="jumpPage(7)">
<div class="service-img"><img alt="" src="@/assets/build.png" /></div>
<div class="service-comtemt">
<div class="servive-title">消防室</div>
<div class="service-cont">
<div class="num">{{ rzData.roomTypeList[6].value }}</div>
<div class="unit">间</div>
</div>
</div>
</div>
</div>
</div>
</div>

2
src/views/bigScreen/center.vue
View File

@ -117,7 +117,7 @@ export default {
}
},
{
title: '外出就医数',
title: '外出就医寄养数',
type: 5,
number: {
number: [this.centerData.countList[4]],

12
src/views/honor/HonorShow.vue
View File

@ -76,7 +76,7 @@
getData () {
honorPage({
pageNum: 1,
pageSize: 10
pageSize: 100
}).then((res) => {
this.honorList = res.rows
@ -131,4 +131,14 @@
margin: 0;
padding: 0;
}
/*首先，我们需要为需要隐藏滚动条的元素添加样式*/
#focusListNews1 {
overflow-y: auto; /*将竖直方向滚动条设置为自动出现*/
scrollbar-width: none; /*隐藏系统默认的滚动条*/
}
/*最后，我们需要添加webkit内核的滚动条样式，以确保在Chrome、Safari等浏览器下也可以正常工作*/
#focusListNews1::-webkit-scrollbar {
display: none; /*隐藏滚动条*/
}
</style>

2
src/views/honor/css/index.css
View File

@ -736,7 +736,7 @@ html {
z-index:5
}
.headline .part {
padding:20px 20px;
padding:20px 10px;
position:relative
}
.headline .tag {

2
src/views/person/ServiceAdd.vue
View File

@ -278,7 +278,7 @@
// 动态回显身份证号相关信息
this.idCardNoBlur()
this.form.maritalStatus = parseInt(form.maritalStatus)
/* this.form.maritalStatus = parseInt(form.maritalStatus) */
this.dataLoaded = true;
})

2
src/views/person/ServiceDetail.vue
View File

@ -269,7 +269,7 @@
// 动态回显身份证号相关信息
this.idCardNoBlur()
this.form.maritalStatus = parseInt(form.maritalStatus)
/* this.form.maritalStatus = parseInt(form.maritalStatus)*/
})
},
onSubmit(e) {

148
src/views/person/SupportList.vue
View File

@ -45,7 +45,7 @@
<a-button v-if="hasPerm('person:support:add')" type="primary" icon="plus" @click="handleCreate" >新增</a-button>
</a-space>
</a-form>
<s-table ref="table" :columns="type==1?columns:columns2" :data="loadData" :rowKey="(record) => record.id" >
<s-table ref="table" :columns="getColumns()" :data="loadData" :rowKey="(record) => record.id" >
<template slot="bringTime" slot-scope="text, record">
{{ record.bringTime | moment('YYYY-MM-DD') }}
</template>
@ -81,71 +81,6 @@ export default {
queryParam: { name: '', idCardNo: '', phone: '', supportType: 1 },
type: 1,
supportTypeData: [],
// 表头
columns: [
{
title: '姓名',
width: 200,
dataIndex: 'name'
},
{
title: '身份证号',
dataIndex: 'idCardNo'
},
{
title: '村组',
dataIndex: 'villageName'
},
{
title: '护理等级',
dataIndex: 'nursingLevelName'
},
{
title: '供养类型',
dataIndex: 'supportTypeName'
},
{
title: '入院时间',
dataIndex: 'bringTime',
scopedSlots: { customRender: 'bringTime' }
},
{
title: '操作',
key: 'operation',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'action' }
}
],
// 表头
columns2: [
{
title: '姓名',
width: 200,
dataIndex: 'name'
},
{
title: '身份证号',
dataIndex: 'idCardNo'
},
{
title: '联系方式',
dataIndex: 'phone'
},
{
title: '入住时间',
dataIndex: 'bringTime',
scopedSlots: { customRender: 'bringTime' }
},
{
title: '操作',
key: 'operation',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'action' }
}
],
// 加载数据方法 必须为 Promise 对象
loadData: (parameter) => {
return personPage(Object.assign(parameter, this.queryParam,
@ -171,6 +106,87 @@ export default {
}
},
methods: {
getColumns() {
const columns = [{
title: '姓名',
width: 200,
dataIndex: 'name'
},
{
title: '身份证号',
dataIndex: 'idCardNo'
},
{
title: '村组',
dataIndex: 'villageName'
},
{
title: '护理等级',
dataIndex: 'nursingLevelName'
},
{
title: '供养类型',
dataIndex: 'supportTypeName'
}
]
if (this.queryParam.supportType != 2) {
columns.push({
title: '入院时间',
dataIndex: 'bringTime',
scopedSlots: {
customRender: 'bringTime'
}
})
}
// 操作栏列
columns.push({
title: '操作',
key: 'operation',
fixed: 'right',
width: 200,
scopedSlots: {
customRender: 'action'
}
})
const columns2 = [
{
title: '姓名',
width: 200,
dataIndex: 'name'
},
{
title: '身份证号',
dataIndex: 'idCardNo'
},
{
title: '联系方式',
dataIndex: 'phone'
},
{
title: '入院时间',
dataIndex: 'bringTime',
scopedSlots: {
customRender: 'bringTime'
}
},
{
title: '操作',
key: 'operation',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'action' }
}
]
if(this.type == 1) {
return columns
} else {
return columns2
}
},
// 新增
handleCreate () {
this.$router.push({

22
src/views/room/RoomDetail.vue
View File

@ -28,6 +28,9 @@
:rowKey="(record) => record.id"
:pagination="false"
>
<template slot="action" slot-scope="text, record">
<a href="javascript:;" @click="handleDetail(record)" >{{record.personName}}</a>
</template>
</a-table>
<div class="draw-button-container align-center" style="bottom: auto;">
@ -105,6 +108,15 @@
{
title: '备注',
dataIndex: 'remark'
},
{
title: '入住信息',
key: 'operation',
fixed: 'right',
width: 200,
scopedSlots: {
customRender: 'action'
}
}
]
}
@ -161,6 +173,16 @@
path: '/room/list',
query: {}
})
},
// 详情
handleDetail (record) {
this.$router.push({
path: '/person/support/detail',
query: {
type: 1,
id: record.personId
}
})
}
}
}

19658
yarn.lock
View File

File diff suppressed because it is too large Load Diff