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

新增政治面貌等需求

This commit is contained in:
aoli.qu 2023-10-30 00:08:11 +08:00
parent f04d80924f
commit bdf1cabc33
30 changed files with 361 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/honor/honor.js
View File

@ -4,7 +4,8 @@ const honorApi = {
addOrUpdate: '/honor/show/addOrUpdate',
detail: '/honor/show/detail',
del: '/honor/show/del',
list: '/honor/show/list'
list: '/honor/show/list',
setTop: '/honor/show/setTop'
}
export function honorAddOrUpdate (params) {
@ -35,3 +36,10 @@ export function honorPage (params) {
params: params
})
}
export function honorSetTop (params) {
return request({
url: honorApi.setTop,
method: 'post',
data: params
})
}

BIN
src/assets/login.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 542 KiB

1
src/assets/scss/_variables.scss
View File

@ -45,6 +45,7 @@ $font-sizes: (
//flex
.d-flex {
display: flex;
line-height: 1
}
.flex-column {
flex-direction: column;

1
src/common/echart/index.vue
View File

@ -56,6 +56,7 @@ export default {
initChart () {
// 初始化echart
this.chart = this.$echarts.init(this.$el, 'tdTheme')
document.getElementById(this.id).setAttribute('_echarts_instance_', '')
this.chart.setOption(this.options, true)
}
}

4
src/components/DbDynamicRoom/DbDynamicRoom.vue
View File

@ -15,9 +15,9 @@
]"
/>
</a-form-item>
<a-form-item label="床位名称" :labelCol="{span: 8}" :wrapperCol="{span: 16}">
<a-form-item label="床位号" :labelCol="{span: 8}" :wrapperCol="{span: 16}">
<a-input
placeholder="请填写床位名称"
placeholder="请填写床位号"
v-decorator="[
`${title}Name[${item}]`,
{

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

@ -52,7 +52,7 @@
},
yAxis: {
type: 'category',
data: ['房间', '床位'],
data: ['床位','房间'],
axisLabel: {
fontSize: 20
}

2
src/components/echart/bottom/bottomLeftChart/index.vue
View File

@ -35,7 +35,7 @@ export default {
methods: {
// 根据自己的业务情况修改
setData () {
for (let i = 0; i < this.cdata.barData.length - 1; i++) {
for (let i = 0; i <= this.cdata.barData.length - 1; i++) {
const rate = this.cdata.barData[i] / this.cdata.lineData[i]
this.cdata.rateData.push(rate.toFixed(2))
}

3
src/components/echart/centerLeft/centerLeft1Chart/chart.vue
View File

@ -83,7 +83,8 @@
this.$router.push({
name: 'Console',
params: {
nursingLevel: this.cdata.seriesData[index].id
nursingLevel: this.cdata.seriesData[index].id,
supportType: 1
}
})
}

3
src/components/echart/centerLeft/centerLeft2Chart/chart.vue
View File

@ -96,7 +96,8 @@
this.$router.push({
name: 'Console',
params: {
gender: this.cdata.seriesData[index].id
gender: this.cdata.seriesData[index].id,
supportType: 1
}
})
}

3
src/components/echart/centerRight/centerRight1Chart/chart.vue
View File

@ -87,7 +87,8 @@
this.$router.push({
name: 'Console',
params: {
ageRange: this.cdata.seriesData[index].id
ageRange: this.cdata.seriesData[index].id,
supportType: 1
}
})
}

3
src/components/echart/centerRight/centerRight2Chart/chart.vue
View File

@ -96,7 +96,8 @@
this.$router.push({
name: 'Console',
params: {
ifHelpPoor: this.cdata.seriesData[index].id
ifHelpPoor: this.cdata.seriesData[index].id,
supportType: 1
}
})
}

8
src/layouts/UserLayout.vue
View File

@ -5,7 +5,7 @@
<div class="header">
<a href="javascript:void(0);">
<img src="~@/assets/logo.svg" class="logo" alt="logo">
<span class="title">下堡坪乡农村福利院长者信息管理系统</span>
<span class="login_title">夷陵区下堡坪乡农村福利院长者信息管理系统</span>
</a>
</div>
</div>
@ -17,7 +17,7 @@
<a href="_self">条款</a>
</div> -->
<div class="copyright">
Copyright &copy; 2023
Copyright &copy; 2023 湖北道诚科技有限公司
</div>
</div>
</div>
@ -74,7 +74,7 @@ export default {
.top {
text-align: center;
margin-bottom: 40px;
margin-bottom: 70px;
.header {
height: 44px;
line-height: 44px;
@ -96,7 +96,7 @@ export default {
border-style: none;
}
.title {
.login_title {
font-size: 33px;
color: rgba(0, 0, 0, .85);
font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;

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

@ -5,7 +5,7 @@
<span>
<icon name="align-left" class="text-icon"></icon>
</span>
<span class="fs-xl text mx-2" style="font-size: 20px;">入住情况统计</span>
<span class="fs-xl text mx-2" style="font-size: 20px;">院区配置情况统计</span>
</div>
<bottomFj :roomCountList="rzData.roomCountList"/>

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

@ -1,10 +1,11 @@
<template>
<div id="center" style="cursor:pointer;" @click="jumpPage">
<div id="center" style="cursor:pointer;" >
<div class="up" >
<div
class="bg-color-black item"
v-for="item in titleItem"
:key="item.title"
@click="jumpPage(item.type)"
>
<p class="ml-3 colorBlue fw-b fs-xl bt-zh">{{ item.title }}</p>
<div>
@ -16,15 +17,15 @@
</div>
</div>
<div class="down">
<div class="ranking bg-color-black">
<div class="ranking bg-color-black" @click="jumpPage">
<span>
<icon name="chart-pie" class="text-icon"></icon>
</span>
<span class="fs-xl text mx-2 mb-1 pl-3 bt-zh">在院人数村籍榜</span>
<dv-scroll-ranking-board class="dv-scr-rank-board mt-1" :config="ranking" />
<dv-scroll-ranking-board class="dv-scr-rank-board mt-1" :config="ranking" @click="skipto"/>
</div>
<div class="percent">
<div class="item bg-color-black">
<div class="item bg-color-black" @click="jumpWelcome(1)">
<span>集中供养率</span>
<CenterChart
:id="rate[0].id"
@ -32,7 +33,7 @@
:colorObj="rate[0].colorData"
/>
</div>
<div class="item bg-color-black">
<div class="item bg-color-black" @click="jumpWelcome(2)">
<span>分散供养率</span>
<CenterChart
:id="rate[1].id"
@ -65,6 +66,7 @@ export default {
titleItem: [
{
title: '累计入住数',
type: 1,
number: {
number: [this.centerData.countList[0]],
toFixed: 0,
@ -77,6 +79,7 @@ export default {
},
{
title: '今年入住数',
type: 2,
number: {
number: [this.centerData.countList[1]],
toFixed: 0,
@ -89,6 +92,7 @@ export default {
},
{
title: '本月新增数',
type: 3,
number: {
number: [this.centerData.countList[2]],
toFixed: 0,
@ -101,6 +105,7 @@ export default {
},
{
title: '目前在院数',
type: 4,
number: {
number: [this.centerData.countList[3]],
toFixed: 0,
@ -113,6 +118,7 @@ export default {
},
{
title: '外出就医数',
type: 5,
number: {
number: [this.centerData.countList[4]],
toFixed: 0,
@ -125,6 +131,7 @@ export default {
},
{
title: '今年减员数',
type: 6,
number: {
number: [this.centerData.countList[5]],
toFixed: 0,
@ -184,11 +191,46 @@ export default {
CenterChart
},
methods: {
jumpPage () {
jumpPage (type) {
if (type == 5) {
/* 跳转路由 */
this.$router.push({
name: 'Console',
params: {
isInHospital: "0",
supportType: 1
}
})
} else if (type == 6){
this.$router.push({
name: 'room_checkout_mgr',
params: {
returnType: "2"
}
})
} else {
this.$router.push({
path: '/room/checkin'
})
}
},
jumpWelcome (type) {
/* 跳转路由 */
this.$router.push({
name: 'Console',
params: {
supportType: type
}
})
},
skipto(config){
console.log('config', config)
console.log('ceil', config.ceil)
console.log('hang', config.rowIndex)
this.$message.success('查看详情成功，可在控制台查看打印的数据')
},
}
}
</script>
@ -222,6 +264,7 @@ export default {
height: 255px;
justify-content: space-between;
.bg-color-black {
cursor: pointer;
border-radius: 5px;
}
.ranking {

16
src/views/bigScreen/index.vue
View File

@ -10,8 +10,8 @@
<div class="d-flex jc-center">
<dv-decoration-8 class="dv-dec-8" :color="decorationColor" />
<div class="title" @click="handleWelcome" style="cursor: pointer;">
<span class="title-text" style="display: inline-block;width: 100%;line-height: 2;">
下堡坪乡农村福利院长者管理系统
<span class="title-text" style="display: inline-block;width: 100%;line-height: 2;font-size: 27px;">
夷陵区下堡坪乡农村福利院长者管理系统
</span>
<dv-decoration-6 class="dv-dec-6" :reverse="true" :color="['#50e3c2', '#67a1e5']" />
</div>
@ -24,7 +24,7 @@
<div class="d-flex jc-between px-2">
<div class="d-flex aside-width">
<div class="react-left ml-3 fw-b" style="background-color: #1a5cd7;">
<span class="text">数据统计</span>
<span class="text">基本情况</span>
</div>
<div class="react-left ml-3 sx">
<span class="text" @click="jumpPage(1)">数据查询</span>
@ -49,7 +49,7 @@
<div class="body-box">
<!-- 第三行数据 -->
<div class="content-box">
<div class="content-box" v-if="showCharts">
<div>
<dv-border-box-12>
<xb :sexData="mapData.sexList" />
@ -78,7 +78,7 @@
</div>
<!-- 第四行数据 -->
<div class="bottom-box">
<div class="bottom-box" v-if="showCharts">
<dv-border-box-13>
<bottomRight :rzData="mapData.rzData" />
</dv-border-box-13>
@ -117,6 +117,7 @@
mixins: [drawMixin],
data () {
return {
showCharts: false,
timing: null,
loading: true,
dateDay: null,
@ -202,6 +203,7 @@
this.mapData.rzData.roomTypeList = this.mapData.roomTypeList
this.mapData.rzData.roomCountList = this.mapData.roomCountList
this.showCharts = true
} else {
this.$message.error('数据加载失败')
}
@ -273,4 +275,8 @@
.sx :hover {
cursor: pointer;
}
.title {
border-bottom: 0px
}
</style>

6
src/views/bigScreen/jzfp.vue
View File

@ -2,11 +2,11 @@
<div id="centerLeft1">
<div class="bg-color-black">
<div class="d-flex pt-2 pl-2">
<span>
<!-- <span>
<icon name="chart-pie" class="text-icon"></icon>
</span>
</span> -->
<div class="d-flex">
<span class="fs-xl text mx-2">精准扶贫</span>
<span class="fs-xl text mx-2">精准扶贫户</span>
<dv-decoration-1 class="dv-dec-1" />
</div>
</div>

3
src/views/filterMap/sexMap.js
View File

@ -1,5 +1,4 @@
export const sexMap = {
0: '未知',
1: '男',
2: '女'
0: '女'
}

19
src/views/honor/HonorList.vue
View File

@ -32,6 +32,12 @@
</template>
<template slot="action" slot-scope="text, record">
<template v-if="record.ifTop == 0">
<a-popconfirm title="是否确认置顶?" v-if="hasPerm('honor:show:add')" @confirm="() => handleSetTop(record)">
<a href="javascript:;">置顶</a>
</a-popconfirm>
<a-divider type="vertical" />
</template>
<a href="javascript:;" v-if="hasPerm('honor:show:add')" @click="handleEdit(record)">修改</a>
<a-divider type="vertical" />
<a-popconfirm title="是否确认删除?" v-if="hasPerm('honor:show:del')" @confirm="() => handleDel(record)">
@ -46,7 +52,7 @@
</template>
<script>
import { STable } from '@/components'
import { honorPage, honorDel } from '@/api/honor/honor'
import { honorPage, honorDel, honorSetTop } from '@/api/honor/honor'
export default {
components: {
STable
@ -132,6 +138,17 @@
this.$message.success('删除失败')
}
})
},
// 置顶
handleSetTop (record) {
honorSetTop({ id: record.id }).then((res) => {
if (res.code == 200) {
this.$message.success('置顶成功')
this.$refs.table.refresh(false)
} else {
this.$message.success('置顶失败')
}
})
}
}
}

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

@ -3,7 +3,7 @@
<!-- 大头条 -->
<div class="headline" id="headline1" data-fontsize="36" data-fontcolor="">
<div class="part bg-white">
<h1><a>陪孤寡老人跨年守岁20载 特别的爱献给特殊的“家”</a></h1>
<h1 @click="detail(title_id)"><a>{{title}}</a></h1>
</div>
</div>
<div class="area focus" id="focus1">
@ -40,7 +40,7 @@
<div class="focus-newsText bg-white right">
<div class="list list-txt" id="focusListNews1">
<ul>
<li v-for="(item, index) in honorList" :key="index" :class="{ active: index === 0 }">
<li v-for="(item, index) in honorList" :key="index" :class="{ active: index === 1 }" v-if="index > 0">
<span><a target="_blank" @click="detail(item.id)">
{{ item.title }}</a></span></li>
</ul>
@ -61,7 +61,9 @@
data () {
return {
honorList: [],
fileList: []
fileList: [],
title_id: null,
title:null
}
},
created () {
@ -76,16 +78,23 @@
pageNum: 1,
pageSize: 10
}).then((res) => {
console.log(res)
this.honorList = res.rows
if (this.honorList && this.honorList.length>0) {
this.fileList = this.honorList.filter(item => item.files && item.files != '[]')
.map(item => ({
id: item.id,
files: JSON.parse(item.files)
}))
console.log(this.fileList)
// 将置顶第一条数据置为标题
this.title_id = this.honorList[0].id;
this.title = this.honorList[0].title;
}
})
},
// 初始化swiper

94
src/views/index/dataSupportList.vue
View File

@ -61,7 +61,7 @@
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="是否精准扶贫">
<a-form-item label="精准扶贫户">
<a-select v-model="queryParam.ifHelpPoor" placeholder="请选择" default-value="null" style="width: 100%">
<a-select-option value="1">是</a-select-option>
<a-select-option value="0">否</a-select-option>
@ -78,7 +78,7 @@
<a-button type="primary" @click="goback">返回</a-button>
</a-space>
</a-form>
<s-table ref="table" :columns="columns" :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>
@ -94,6 +94,10 @@
<template slot="title" style="font-weight: bold;">
合计人数：{{ totalCount }}
</template>
<template slot="action" slot-scope="text, record">
<a href="javascript:;" v-if="hasPerm('person:support:detail')" @click="handleDetail(record)">详情</a>
</template>
</s-table>
</div>
</a-card>
@ -131,8 +135,33 @@
nursingLevelData: [],
supportTypeData: [],
totalCount: 0,
// 表头
columns: [{
// 加载数据方法 必须为 Promise 对象
loadData: (parameter) => {
return personPage(Object.assign(parameter, this.queryParam, {
type: this.type
})).then((res) => {
this.totalCount = res.total
return res
})
}
}
},
// 生命周期 - 创建完成
created() {
this.dictionaryDropDown()
},
// 生命周期 - 销毁完成
destroyed() {},
// 监控data中的数据变化
watch: {
$route(to, from) { // to是前往的路由 from是去往的路由 同一个组件只会渲染一次
this.$refs.table.refresh(true)
}
},
methods: {
getColumns() {
const columns = [{
title: '姓名',
width: 200,
dataIndex: 'name'
@ -160,17 +189,6 @@
customRender: 'sex'
}
},
{
title: '入院时间',
dataIndex: 'bringTime',
scopedSlots: {
customRender: 'bringTime'
}
},
{
title: '居住房间',
dataIndex: 'roomBed'
},
{
title: '是否在院',
dataIndex: 'isInHospital',
@ -178,35 +196,33 @@
customRender: 'isInHospital'
}
}
],
// 加载数据方法 必须为 Promise 对象
loadData: (parameter) => {
return personPage(Object.assign(parameter, this.queryParam, {
type: this.type
})).then((res) => {
this.totalCount = res.total
return res
]
if (this.queryParam.supportType != 2) {
columns.push({
title: '入院时间',
dataIndex: 'bringTime',
scopedSlots: {
customRender: 'bringTime'
}
}, {
title: '居住房间',
dataIndex: 'roomBed'
})
}
}
},
// 生命周期 - 创建完成
created() {
this.dictionaryDropDown()
console.log(this.$route.params)
console.log(this.$route.params.gender)
},
// 生命周期 - 销毁完成
destroyed() {},
// 监控data中的数据变化
watch: {
$route(to, from) { // to是前往的路由 from是去往的路由 同一个组件只会渲染一次
this.$refs.table.refresh(true)
// 操作栏列
columns.push({
title: '操作',
key: 'operation',
fixed: 'right',
width: 100,
scopedSlots: {
customRender: 'action'
}
})
return columns
},
methods: {
// 详情
handleDetail(record) {
this.$router.push({

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

@ -90,6 +90,21 @@
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item ref="politicalOutlook" label="政治面貌" prop="politicalOutlook" >
<a-select
v-model="form.politicalOutlook"
style="width: 100%"
placeholder="请选择政治面貌">
<a-select-option v-for="(item, index) in politicalOutlookData" :key="index" :value="item.value" :lable="item.name">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col>
<a-form-model-item ref="health" label="身体状况" prop="health" :label-col="{ span: 2 }" :wrapper-col="{ span: 21 }">
@ -196,11 +211,12 @@
age: null,
sex: null,
phone: '',
politicalOutlook: null,
maritalStatus: null,
familyList: []
},
maritalStatusData: [],
politicalOutlookData: [],
jobsData: [],
rules: {
name: [{
@ -356,6 +372,12 @@
}).then(res => {
this.jobsData = res.data
})
// 政治面貌
dictionaryDropDown({
dictionaryCode: '0060'
}).then(res => {
this.politicalOutlookData = res.data
})
},
// 返回
goback () {

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

@ -54,11 +54,7 @@
<a-row>
<a-col :span="12">
<a-form-model-item ref="jobs" label="岗位" prop="jobs">
<a-select
disabled
v-model="form.jobs"
style="width: 100%"
placeholder="请选择岗位">
<a-select disabled v-model="form.jobs" style="width: 100%" placeholder="请选择岗位">
<a-select-option v-for="(item, index) in jobsData" :key="index" :value="item.value" :lable="item.name">
{{ item.name }}
</a-select-option>
@ -68,11 +64,7 @@
<a-col :span="12">
<a-form-model-item ref="maritalStatus" label="婚姻状况" prop="maritalStatus">
<a-select
disabled
v-model="form.maritalStatus"
style="width: 100%"
placeholder="请选择婚姻状况">
<a-select disabled v-model="form.maritalStatus" style="width: 100%" placeholder="请选择婚姻状况">
<a-select-option v-for="(item, index) in maritalStatusData" :key="index" :value="item.value" :lable="item.name">
{{ item.name }}
</a-select-option>
@ -93,6 +85,18 @@
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-model-item ref="politicalOutlook" label="政治面貌" prop="politicalOutlook">
<a-select disabled v-model="form.politicalOutlook" style="width: 100%" placeholder="请选择政治面貌">
<a-select-option v-for="(item, index) in politicalOutlookData" :key="index" :value="item.value" :lable="item.name">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col>
<a-form-model-item ref="health" label="身体状况" prop="health" :label-col="{ span: 2 }" :wrapper-col="{ span: 21 }">
@ -103,11 +107,7 @@
<a-row>
<a-col>
<a-form-model-item
ref="diseaseHistory"
label="疾病史"
prop="diseaseHistory"
:label-col="{ span: 2 }"
<a-form-model-item ref="diseaseHistory" label="疾病史" prop="diseaseHistory" :label-col="{ span: 2 }"
:wrapper-col="{ span: 21 }">
<a-input disabled v-model="form.diseaseHistory" />
</a-form-model-item>
@ -143,17 +143,12 @@
</a-col>
</a-row>
<a-divider orientation="left">家庭成员</a-divider>
<a-table
ref="table"
:columns="columns"
:data-source="form.familyList"
:rowKey="(record) => record.id"
:pagination="false"
>
<a-table ref="table" :columns="columns" :data-source="form.familyList" :rowKey="(record) => record.id"
:pagination="false">
</a-table>
<div class="draw-button-container align-center" style="bottom: auto;">
<a-button @click="onCancel">取消</a-button>
<a-button @click="onCancel">返回</a-button>
</div>
</a-form-model>
</a-card>
@ -199,11 +194,12 @@
age: null,
sex: null,
phone: '',
politicalOutlook: null,
maritalStatus: null,
familyList: []
},
maritalStatusData: [],
politicalOutlookData: [],
jobsData: [],
rules: {
name: [{
@ -229,8 +225,7 @@
}]
},
// 表头
columns: [
{
columns: [{
title: '姓名',
dataIndex: 'familyName'
},
@ -360,12 +355,18 @@
}).then(res => {
this.maritalStatusData = res.data
})
// 婚姻状况
// 岗位
dictionaryDropDown({
dictionaryCode: '0050'
}).then(res => {
this.jobsData = res.data
})
// 政治面貌
dictionaryDropDown({
dictionaryCode: '0060'
}).then(res => {
this.politicalOutlookData = res.data
})
},
// 返回
goback() {

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

@ -545,7 +545,7 @@
}],
nursingLevel: [{
required: true,
message: '请选择护理等级',
message: '请选择护理等级（护理等级参照《养老机构服务安全基本规范》）',
trigger: 'blur'
}],
village: [{

13
src/views/person/SupportDetail.vue
View File

@ -113,7 +113,7 @@
<a-row>
<a-col :span="12">
<a-form-model-item ref="roomId" label="房间" prop="roomId">
<a-select disabled v-model="form.roomId" @change="handleRoomChange">
<a-select disabled v-model="form.roomId" >
<a-select-option v-for="room in roomList" :key="room.id" :value="room.id">{{ room.name }}</a-select-option>
</a-select>
@ -451,7 +451,7 @@
</a-table>
<div class="draw-button-container align-center" style="bottom: auto;">
<a-button @click="onCancel">取消</a-button>
<a-button @click="onCancel">返回</a-button>
<!-- <a-button type="primary" @click="onSubmit">保存</a-button> -->
</div>
</a-form-model>
@ -600,8 +600,8 @@
// 动态回显身份证号相关信息
this.idCardNoBlur()
this.form.supportType = parseInt(form.supportType)
this.form.maritalStatus = parseInt(form.maritalStatus)
/* this.form.supportType = parseInt(form.supportType)
this.form.maritalStatus = parseInt(form.maritalStatus) */
})
},
onSubmit (e) {
@ -718,12 +718,13 @@
},
// 返回
goback () {
this.$router.push({
/* this.$router.push({
path: this.$route.query.type == 1 ? '/person/support' : '/person/care',
query: {
type: this.$route.query.type
}
})
}) */
this.$router.back()
}
}
}

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

@ -18,11 +18,27 @@
<a-input v-model="queryParam.phone" allow-clear placeholder="请输入联系方式" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="供养方式">
<a-select :allowClear="true" v-model="queryParam.supportType" style="width: 100%" placeholder="请选择供养方式">
<a-select-option v-for="(item, index) in supportTypeData" :key="index" :value="item.value" :lable="item.name">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="48">
<a-col :md="6" :sm="24">
</a-col>
<a-col :md="6" :sm="24">
</a-col>
<a-col :md="6" :sm="24">
</a-col>
<a-col :md="6" :sm="24">
<a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
<a-button style="margin-left: 8px" @click="() => {queryParam = {}, $refs.table.refresh(true)}">重置</a-button>
</a-col>
</a-row>
<a-space class="table-operator" direction="horizontal">
@ -51,6 +67,9 @@
<script>
import { STable } from '@/components'
import { personDel, personPage } from '@/api/person/personSupport'
import {
dictionaryDropDown
} from '@/api/sys/dictionaryItem'
export default {
components: {
@ -59,8 +78,9 @@ export default {
data () {
return {
// 查询参数
queryParam: { name: '', idCardNo: '', phone: '' },
queryParam: { name: '', idCardNo: '', phone: '', supportType: 1 },
type: 1,
supportTypeData: [],
// 表头
columns: [
{
@ -139,6 +159,7 @@ export default {
// 生命周期 - 创建完成
created () {
this.changeType()
this.dictionaryDropDown()
},
// 生命周期 - 销毁完成
destroyed () { },
@ -202,6 +223,29 @@ export default {
const str = arr[arr.length - 1]
// 1-供养人员 2-医养结合护理人员
this.type = str == 'support' ? 1 : 2
},
/**
* 获取字典数据
*/
dictionaryDropDown () {
// 所在村
dictionaryDropDown({
dictionaryCode: '0040'
}).then(res => {
this.villageData = res.data
})
// 护理等级
dictionaryDropDown({
dictionaryCode: '0021'
}).then(res => {
this.nursingLevelData = res.data
})
// 供养方式
dictionaryDropDown({
dictionaryCode: '0020'
}).then(res => {
this.supportTypeData = res.data
})
}
}
}

2
src/views/room/RoomCheckinDetail.vue
View File

@ -59,7 +59,7 @@
<person-modal @selectPerson="selectPerson($event)" ref="personModal" :personType="1" :selectedRowKey="selectedRowKeys" />
<div class="draw-button-container align-center" style="bottom: auto;">
<a-button @click="onCancel">取消</a-button>
<a-button @click="onCancel">返回</a-button>
<!-- <a-button type="primary" @click="onSubmit">保存</a-button> -->
</div>
</a-form-model>

10
src/views/room/RoomCheckoutList.vue
View File

@ -8,6 +8,14 @@
<a-input v-model="queryParam.personName" allow-clear placeholder="请输入人员名称" />
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-form-item label="退房时间">
<a-select v-model="queryParam.returnType" placeholder="请选择退房时间" default-value="null" style="width: 100%">
<a-select-option value="1">全部</a-select-option>
<a-select-option value="2">今年</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
<a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
<a-button style="margin-left: 8px" @click="() => {queryParam = {}, $refs.table.refresh(true)}">重置</a-button>
@ -67,7 +75,7 @@ export default {
data () {
return {
// 查询参数
queryParam: { personName: '' },
queryParam: { personName: '', returnType: this.$route.params.returnType, },
roomTypeData: [],
// 表头
columns: [

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

@ -31,7 +31,7 @@
</a-table>
<div class="draw-button-container align-center" style="bottom: auto;">
<a-button @click="onCancel">取消</a-button>
<a-button @click="onCancel">返回</a-button>
</div>
</a-form-model>
</a-card>
@ -99,7 +99,7 @@
// 表头
columns: [
{
title: '床位名称',
title: '床位号',
dataIndex: 'name'
},
{

57
src/views/room/RoomList.vue
View File

@ -32,7 +32,7 @@
<a-button v-if="hasPerm('room:add')" type="primary" icon="plus" @click="handleCreate" >新增</a-button>
</a-space>
</a-form>
<s-table ref="table" :columns="columns" :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>
@ -67,29 +67,6 @@ export default {
// 查询参数
queryParam: { name: '', roomType:this.$route.params.roomType },
roomTypeData: [],
// 表头
columns: [
{
title: '名称',
width: 200,
dataIndex: 'name'
},
{
title: '床位数量',
dataIndex: 'bedNumber'
},
{
title: '房间类型',
dataIndex: 'roomTypeName'
},
{
title: '操作',
key: 'operation',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'action' }
}
],
// 加载数据方法 必须为 Promise 对象
loadData: (parameter) => {
return roomPage(Object.assign(parameter, this.queryParam)).then((res) => {
@ -108,6 +85,38 @@ export default {
watch: {
},
methods: {
getColumns() {
const columns = [{
title: '名称',
width: 200,
dataIndex: 'name'
},
{
title: '房间类型',
dataIndex: 'roomTypeName'
}
]
if (!this.queryParam.roomType || this.queryParam.roomType ==1) {
columns.push(
{
title: '床位数量',
dataIndex: 'bedNumber'
})
}
// 操作栏列
columns.push({
title: '操作',
key: 'operation',
fixed: 'right',
width: 200,
scopedSlots: {
customRender: 'action'
}
})
return columns
},
// 新增
handleCreate () {
this.$router.push({

2
src/views/security/user/UserForm.vue
View File

@ -65,7 +65,7 @@
<a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['sex',{rules: [{ required: true, message: '请选择性别！' }]}]">
<a-radio :value="1">男</a-radio>
<a-radio :value="2">女</a-radio>
<a-radio :value="0">女</a-radio>
</a-radio-group>
</a-form-item>
</a-form>