Skip to content

P
pension-vue
Commit 8a668c82 authored by mengmeng's avatar mengmeng
Browse files
Options

add cloumn & pensionCommunity Modules

parent bb583dc7
Hide whitespace changes
Inline Side-by-side
Showing with 290 additions and 14 deletions
src/views/modules/serviceOrder/pensioncommunity-add-or-update.vue 0 → 100644
View file @ 8a668c82
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="" prop="name">
<el-input v-model="dataForm.name" placeholder=""></el-input>
</el-form-item>
<el-form-item label="创建者dept_id" prop="deptId">
<el-input v-model="dataForm.deptId" placeholder="创建者dept_id"></el-input>
</el-form-item>
<el-form-item label="更新者" prop="updater">
<el-input v-model="dataForm.updater" placeholder="更新者"></el-input>
</el-form-item>
<el-form-item label="更新时间" prop="updateDate">
<el-input v-model="dataForm.updateDate" placeholder="更新时间"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
export default {
data () {
return {
visible: false,
dataForm: {
id: '',
name: '',
deptId: '',
creator: '',
createDate: '',
updater: '',
updateDate: ''
}
}
},
computed: {
dataRule () {
return {
name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
deptId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updater: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updateDate: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
// 获取信息
getInfo () {
this.$http.get(`/serviceOrder/pensioncommunity/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
// 表单提交
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.id ? 'post' : 'put']('/serviceOrder/pensioncommunity/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {})
})
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>
src/views/modules/serviceOrder/pensioncommunity.vue 0 → 100644
View file @ 8a668c82
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-serviceOrder__pensioncommunity}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('serviceOrder:pensioncommunity:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('serviceOrder:pensioncommunity:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="id" label="" header-align="center" align="center"></el-table-column>
<el-table-column prop="name" label="" header-align="center" align="center"></el-table-column>
<el-table-column prop="deptId" label="创建者dept_id" header-align="center" align="center"></el-table-column>
<el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="updater" label="更新者" header-align="center" align="center"></el-table-column>
<el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('serviceOrder:pensioncommunity:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('serviceOrder:pensioncommunity:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './pensioncommunity-add-or-update'
export default {
mixins: [mixinViewModule],
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/serviceOrder/pensioncommunity/page',
getDataListIsPage: true,
exportURL: '/serviceOrder/pensioncommunity/export',
deleteURL: '/serviceOrder/pensioncommunity',
deleteIsBatch: true
},
dataForm: {
id: ''
}
}
},
components: {
AddOrUpdate
}
}
</script>
src/views/modules/serviceOrder/pensionorder-add-or-update.vue
View file @ 8a668c82
......@@ -4,8 +4,8 @@
<el-form-item label="订单编号" prop="orderNum">
<el-input v-model="dataForm.orderNum" placeholder="订单编号"></el-input>
</el-form-item>
<el-form-item label="订单状态" prop="status">
<el-input v-model="dataForm.status" placeholder="订单状态"></el-input>
<el-form-item label="订单状态 0未接单 ，1已接单 2已完成 3已取消" prop="status">
<el-input v-model="dataForm.status" placeholder="订单状态 0未接单 ，1已接单 2已完成 3已取消"></el-input>
</el-form-item>
<el-form-item label="订单状态名称" prop="statusName">
<el-input v-model="dataForm.statusName" placeholder="订单状态名称"></el-input>
......@@ -42,6 +42,15 @@
</el-form-item>
<el-form-item label="接单人电话" prop="orderRecipientPhone">
<el-input v-model="dataForm.orderRecipientPhone" placeholder="接单人电话"></el-input>
</el-form-item>
<el-form-item label="订单实际金额" prop="actPrice">
<el-input v-model="dataForm.actPrice" placeholder="订单实际金额"></el-input>
</el-form-item>
<el-form-item label="所属社区名称" prop="communityName">
<el-input v-model="dataForm.communityName" placeholder="所属社区名称"></el-input>
</el-form-item>
<el-form-item label="所属社区id" prop="communityId">
<el-input v-model="dataForm.communityId" placeholder="所属社区id"></el-input>
</el-form-item>
<el-form-item label="部门ID" prop="deptId">
<el-input v-model="dataForm.deptId" placeholder="部门ID"></el-input>
......@@ -88,6 +97,9 @@ export default {
orderRecipientName: '',
orderRecipientTime: '',
orderRecipientPhone: '',
actPrice: '',
communityName: '',
communityId: '',
deptId: '',
creator: '',
creatorName: '',
......@@ -143,6 +155,15 @@ export default {
orderRecipientPhone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
actPrice: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
communityName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
communityId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
deptId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
......
src/views/modules/serviceOrder/pensionorder.vue
View file @ 8a668c82
......@@ -22,7 +22,7 @@
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="id" label="id" header-align="center" align="center"></el-table-column>
<el-table-column prop="orderNum" label="订单编号" header-align="center" align="center"></el-table-column>
<el-table-column prop="status" label="订单状态" header-align="center" align="center"></el-table-column>
<el-table-column prop="status" label="订单状态 0未接单 ，1已接单 2已完成 3已取消" header-align="center" align="center"></el-table-column>
<el-table-column prop="statusName" label="订单状态名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="address" label="详细地址" header-align="center" align="center"></el-table-column>
<el-table-column prop="serviceId" label="订单所属的服务id" header-align="center" align="center"></el-table-column>
......@@ -35,6 +35,9 @@
<el-table-column prop="orderRecipientName" label="接单人姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="orderRecipientTime" label="接单时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="orderRecipientPhone" label="接单人电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="actPrice" label="订单实际金额" header-align="center" align="center"></el-table-column>
<el-table-column prop="communityName" label="所属社区名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="communityId" label="所属社区id" header-align="center" align="center"></el-table-column>
<el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
<el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
<el-table-column prop="creatorName" label="订单发起人" header-align="center" align="center"></el-table-column>
......
src/views/modules/serviceOrder/pensionservice-add-or-update.vue
View file @ 8a668c82
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="服务名称" prop="name">
<el-input v-model="dataForm.name" placeholder="服务名称"></el-input>
<el-form-item label="服务名称" prop="serviceName">
<el-input v-model="dataForm.serviceName" placeholder="服务名称"></el-input>
</el-form-item>
<el-form-item label="服务类型" prop="serviceTypeId">
<el-input v-model="dataForm.serviceTypeId" placeholder="服务类型"></el-input>
<el-form-item label="服务父类id" prop="serviceParentId">
<el-input v-model="dataForm.serviceParentId" placeholder="服务父类id"></el-input>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model="dataForm.sort" placeholder="排序"></el-input>
......@@ -18,6 +18,9 @@
</el-form-item>
<el-form-item label="价格" prop="price">
<el-input v-model="dataForm.price" placeholder="价格"></el-input>
</el-form-item>
<el-form-item label="是否免费" prop="isFree">
<el-input v-model="dataForm.isFree" placeholder="是否免费"></el-input>
</el-form-item>
<el-form-item label="积分值" prop="giftPoint">
<el-input v-model="dataForm.giftPoint" placeholder="积分值"></el-input>
......@@ -27,6 +30,9 @@
</el-form-item>
<el-form-item label="服务时间" prop="serviceTime">
<el-input v-model="dataForm.serviceTime" placeholder="服务时间"></el-input>
</el-form-item>
<el-form-item label="服务内容介绍" prop="serviceContent">
<el-input v-model="dataForm.serviceContent" placeholder="服务内容介绍"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
......@@ -56,15 +62,17 @@ export default {
visible: false,
dataForm: {
id: '',
name: '',
serviceTypeId: '',
serviceName: '',
serviceParentId: '',
sort: '',
icon: '',
detailPicture: '',
price: '',
isFree: '',
giftPoint: '',
timesNum: '',
serviceTime: '',
serviceContent: '',
remark: '',
deptId: '',
creator: '',
......@@ -77,10 +85,10 @@ export default {
computed: {
dataRule () {
return {
name: [
serviceName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
serviceTypeId: [
serviceParentId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
sort: [
......@@ -95,6 +103,9 @@ export default {
price: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
isFree: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
giftPoint: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
......@@ -104,6 +115,9 @@ export default {
serviceTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
serviceContent: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
remark: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
......
src/views/modules/serviceOrder/pensionservice.vue
View file @ 8a668c82
......@@ -21,15 +21,17 @@
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="id" label="id" header-align="center" align="center"></el-table-column>
<el-table-column prop="name" label="服务名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="serviceTypeId" label="服务类型" header-align="center" align="center"></el-table-column>
<el-table-column prop="serviceName" label="服务名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="serviceParentId" label="服务父类id" header-align="center" align="center"></el-table-column>
<el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
<el-table-column prop="icon" label="首页图标地址" header-align="center" align="center"></el-table-column>
<el-table-column prop="detailPicture" label="详情页大图地址" header-align="center" align="center"></el-table-column>
<el-table-column prop="price" label="价格" header-align="center" align="center"></el-table-column>
<el-table-column prop="isFree" label="是否免费" header-align="center" align="center"></el-table-column>
<el-table-column prop="giftPoint" label="积分值" header-align="center" align="center"></el-table-column>
<el-table-column prop="timesNum" label="服务次数" header-align="center" align="center"></el-table-column>
<el-table-column prop="serviceTime" label="服务时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="serviceContent" label="服务内容介绍" header-align="center" align="center"></el-table-column>
<el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
<el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
<el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
......
src/views/modules/serviceOrder/user-add-or-update.vue
View file @ 8a668c82
......@@ -6,6 +6,9 @@
</el-form-item>
<el-form-item label="用户名" prop="username">
<el-input v-model="dataForm.username" placeholder="用户名"></el-input>
</el-form-item>
<el-form-item label="头像图片路径" prop="headUrl">
<el-input v-model="dataForm.headUrl" placeholder="头像图片路径"></el-input>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
......@@ -24,6 +27,24 @@
</el-form-item>
<el-form-item label="详细地址" prop="address">
<el-input v-model="dataForm.address" placeholder="详细地址"></el-input>
</el-form-item>
<el-form-item label="所属社区名称" prop="communityName">
<el-input v-model="dataForm.communityName" placeholder="所属社区名称"></el-input>
</el-form-item>
<el-form-item label="所属社区id" prop="communityId">
<el-input v-model="dataForm.communityId" placeholder="所属社区id"></el-input>
</el-form-item>
<el-form-item label="身体状态" prop="healthStatus">
<el-input v-model="dataForm.healthStatus" placeholder="身体状态"></el-input>
</el-form-item>
<el-form-item label="联系家属" prop="familyMemberName">
<el-input v-model="dataForm.familyMemberName" placeholder="联系家属"></el-input>
</el-form-item>
<el-form-item label="家属身份" prop="familyMemberRole">
<el-input v-model="dataForm.familyMemberRole" placeholder="家属身份"></el-input>
</el-form-item>
<el-form-item label="家属联系电话" prop="familyMemberTel">
<el-input v-model="dataForm.familyMemberTel" placeholder="家属联系电话"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
......@@ -43,13 +64,20 @@ export default {
id: '',
userId: '',
username: '',
headUrl: '',
mobile: '',
password: '',
createDate: '',
openid: '',
birthday: '',
addressArea: '',
address: ''
address: '',
communityName: '',
communityId: '',
healthStatus: '',
familyMemberName: '',
familyMemberRole: '',
familyMemberTel: ''
}
}
},
......@@ -62,6 +90,9 @@ export default {
username: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
headUrl: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
mobile: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
......@@ -79,6 +110,24 @@ export default {
],
address: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
communityName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
communityId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
healthStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
familyMemberName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
familyMemberRole: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
familyMemberTel: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
......
src/views/modules/serviceOrder/user.vue
View file @ 8a668c82
......@@ -23,6 +23,7 @@
<el-table-column prop="id" label="id" header-align="center" align="center"></el-table-column>
<el-table-column prop="userId" label="关联sys_user中的id" header-align="center" align="center"></el-table-column>
<el-table-column prop="username" label="用户名" header-align="center" align="center"></el-table-column>
<el-table-column prop="headUrl" label="头像图片路径" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
<el-table-column prop="password" label="密码" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
......@@ -30,6 +31,12 @@
<el-table-column prop="birthday" label="生日" header-align="center" align="center"></el-table-column>
<el-table-column prop="addressArea" label="地址_地区" header-align="center" align="center"></el-table-column>
<el-table-column prop="address" label="详细地址" header-align="center" align="center"></el-table-column>
<el-table-column prop="communityName" label="所属社区名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="communityId" label="所属社区id" header-align="center" align="center"></el-table-column>
<el-table-column prop="healthStatus" label="身体状态" header-align="center" align="center"></el-table-column>
<el-table-column prop="familyMemberName" label="联系家属" header-align="center" align="center"></el-table-column>
<el-table-column prop="familyMemberRole" label="家属身份" header-align="center" align="center"></el-table-column>
<el-table-column prop="familyMemberTel" label="家属联系电话" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button v-if="$hasPermission('serviceOrder:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
......
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