Skip to content

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

Merge branch 'Shen' into 'master' 

1.添加”用户地址“模块

See merge request !3
parents b1f37954 4ee3a438
Show whitespace changes
Inline Side-by-side
Showing with 248 additions and 12 deletions
public/index.html
View file @ a7aa93ba
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
window.SITE_CONFIG = {}; window.SITE_CONFIG = {};
window.SITE_CONFIG['version'] = 'v1.0.0'; window.SITE_CONFIG['version'] = 'v1.0.0';
window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>'; window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>';
window.SITE_CONFIG['apiURL'] = 'http://192.168.10.225:8088/hmit-admin'; // api请求地址 window.SITE_CONFIG['apiURL'] = 'http://192.168.10.61:8080/hmit-admin'; // api请求地址
window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态） window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态）
window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象 window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象
'name': '', // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径） 'name': '', // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径）
......
src/views/modules/serviceOrder/pensionconsignee-add-or-update.vue 0 → 100644
View file @ a7aa93ba
<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="用户ID" prop="userId">
<el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
</el-form-item>
<el-form-item label="收货人姓名" prop="consigneeName">
<el-input v-model="dataForm.consigneeName" placeholder="收货人姓名"></el-input>
</el-form-item>
<el-form-item label="收货人电话" prop="consigneeMobile">
<el-input v-model="dataForm.consigneeMobile" placeholder="收货人电话"></el-input>
</el-form-item>
<el-form-item label="省份" prop="consigneeProvince">
<el-input v-model="dataForm.consigneeProvince" placeholder="省份"></el-input>
</el-form-item>
<el-form-item label="城市" prop="consigneeCity">
<el-input v-model="dataForm.consigneeCity" placeholder="城市"></el-input>
</el-form-item>
<el-form-item label="区/县" prop="consigneeDistrict">
<el-input v-model="dataForm.consigneeDistrict" placeholder="区/县"></el-input>
</el-form-item>
<el-form-item label="详细地址" prop="consigneeAddress">
<el-input v-model="dataForm.consigneeAddress" placeholder="详细地址"></el-input>
</el-form-item>
<el-form-item label="邮编" prop="consigneeZip">
<el-input v-model="dataForm.consigneeZip" placeholder="邮编"></el-input>
</el-form-item>
<el-form-item label="是否为默认地址" prop="ifDefault">
<el-input v-model="dataForm.ifDefault" placeholder="是否为默认地址"></el-input>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-input v-model="dataForm.status" placeholder="状态"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" 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: '',
userId: '',
consigneeName: '',
consigneeMobile: '',
consigneeProvince: '',
consigneeCity: '',
consigneeDistrict: '',
consigneeAddress: '',
consigneeZip: '',
ifDefault: '',
status: '',
remark: '',
createDate: '',
updateDate: ''
}
}
},
computed: {
dataRule () {
return {
userId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
consigneeName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
consigneeMobile: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
consigneeProvince: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
consigneeCity: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
consigneeDistrict: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
consigneeAddress: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
consigneeZip: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
ifDefault: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
status: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
remark: [
{ required: false, 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/pensionconsignee/${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/pensionconsignee/', 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/pensionconsignee.vue 0 → 100644
View file @ a7aa93ba
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-serviceOrder__pensionconsignee}">
<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:pensionconsignee:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('serviceOrder:pensionconsignee: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="id" header-align="center" align="center"></el-table-column>-->
<!-- <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>-->
<el-table-column prop="consigneeName" label="收货人姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="consigneeMobile" label="收货人电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="consigneeProvince" label="省份" header-align="center" align="center"></el-table-column>
<el-table-column prop="consigneeCity" label="城市" header-align="center" align="center"></el-table-column>
<el-table-column prop="consigneeDistrict" label="区/县" header-align="center" align="center"></el-table-column>
<el-table-column prop="consigneeAddress" label="详细地址" header-align="center" align="center"></el-table-column>
<el-table-column prop="consigneeZip" label="邮编" header-align="center" align="center"></el-table-column>
<el-table-column prop="ifDefault" 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="remark" 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="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:pensionconsignee:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button v-if="$hasPermission('serviceOrder:pensionconsignee: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 './pensionconsignee-add-or-update'
export default {
mixins: [mixinViewModule],
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/serviceOrder/pensionconsignee/page',
getDataListIsPage: true,
exportURL: '/serviceOrder/pensionconsignee/export',
deleteURL: '/serviceOrder/pensionconsignee',
deleteIsBatch: true
},
dataForm: {
id: ''
}
}
},
components: {
AddOrUpdate
}
}
</script>
src/views/modules/serviceOrder/pensionorganization.vue
View file @ a7aa93ba
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
<el-table-column prop="icon" 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="description" label="机构描述" header-align="center" align="center"></el-table-column> <el-table-column prop="description" label="机构描述" header-align="center" align="center"></el-table-column>
<el-table-column prop="serviceArea" label="服务区域" header-align="center" align="center"></el-table-column> <el-table-column prop="serviceArea" label="服务区域" 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="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="createDate" label="创建时间" header-align="center" align="center"></el-table-column>-->
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('serviceOrder:pensionorganization:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button> <el-button v-if="$hasPermission('serviceOrder:pensionorganization:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
......
src/views/modules/serviceOrder/pensionservice.vue
View file @ a7aa93ba
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
data () { data () {
return { return {
mixinViewModuleOptions: { mixinViewModuleOptions: {
getDataListURL: '/serviceOrder/pensionservice/page', getDataListURL: '/serviceOrder/pensionorganizationservice/getOrganizationService',
getDataListIsPage: true, getDataListIsPage: true,
exportURL: '/serviceOrder/pensionservice/export', exportURL: '/serviceOrder/pensionservice/export',
deleteURL: '/serviceOrder/pensionservice', deleteURL: '/serviceOrder/pensionservice',
......
src/views/modules/serviceOrder/user.vue
View file @ a7aa93ba
...@@ -21,22 +21,22 @@ ...@@ -21,22 +21,22 @@
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <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 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="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="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="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="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="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="password" 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="openid" label="微信openid" header-align="center" align="center"></el-table-column> <el-table-column prop="openid" label="微信openid" header-align="center" align="center"></el-table-column>
<el-table-column prop="birthday" label="生日" header-align="center" align="center"></el-table-column> <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="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="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="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="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="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="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="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 prop="familyMemberTel" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope"> <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> <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