diff --git a/oms/oms-h5/src/assets/common/lang/en.js b/oms/oms-h5/src/assets/common/lang/en.js index 7e96605..0095000 100644 --- a/oms/oms-h5/src/assets/common/lang/en.js +++ b/oms/oms-h5/src/assets/common/lang/en.js @@ -35,14 +35,14 @@ export default { language: 'language', avatar: 'avatar', nickname: 'nickname', - from: 'from', + from: 'from', blacked:'blacked', dayblacked:'twenty four hours blacked', normal:'normal', regsterType:'register type', export:'export excel', black:'ban', - toNoraml:'to normal', + toNoraml:'to normal', sms:'mobile sms', wechat:'wechat', }, @@ -99,24 +99,24 @@ export default { name:'name', phone:'phone', email:'email', - sex:'sex', - delAdminTip:'Confirm to delete this admin?' + sex:'sex', + delAdminTip:'Confirm to delete this admin?' }, - + menu:{ chName:'chinese Name', enName:'english name', icon:'icon', sort:'sort', - url:'url', + url:'url', menuName:'menu name', delMenuTip:'Confirm to delete this menu?' - }, + }, role:{ name:'name', userCount:'user count' }, - faq:{ + title:{ title:'title' } } diff --git a/oms/oms-h5/src/assets/common/lang/zh.js b/oms/oms-h5/src/assets/common/lang/zh.js index e2a09e8..95e6d6a 100644 --- a/oms/oms-h5/src/assets/common/lang/zh.js +++ b/oms/oms-h5/src/assets/common/lang/zh.js @@ -33,7 +33,7 @@ export default{ questionnaire: { title: '问卷调查标题', status: '状态' - + }, member: { mobile: '手机号', @@ -71,7 +71,7 @@ export default{ inputName: '请输入文本名称', nameMaxlength: '文本名称不能超过50个字符', needUpload:'请等待文件上传完成', - max40M:'文件大小不允许超过40MB', + max40M:'文件大小不允许超过40MB', add:'上传固件' }, mes: { @@ -106,7 +106,7 @@ export default{ name:'姓名', phone:'手机号码', email:'邮箱', - sex:'性别', + sex:'性别', delAdminTip:'确认删除该管理员?' }, menu:{ @@ -122,7 +122,7 @@ export default{ name:'名称', userCount:'用户数' }, - faq:{ + title:{ title:'标题' } } diff --git a/oms/oms-h5/src/router/index.js b/oms/oms-h5/src/router/index.js index c54e91f..3b6e71f 100644 --- a/oms/oms-h5/src/router/index.js +++ b/oms/oms-h5/src/router/index.js @@ -59,7 +59,10 @@ export const constantRouterMap = [ { path: '/venue/lesson/info', component: _import('venue/lesson/info'), name: '预约记录', hidden: true }, { path: '/member/add', component: _import('member/add'), name: '添加用户', hidden: true }, { path: '/member/addEdit', component: _import('member/addEdit'), name: '编辑用户', hidden: true }, - { path: '/config/edit', component: _import('config/edit'), name: '编辑参数', hidden: true } + { path: '/config/edit', component: _import('config/edit'), name: '编辑参数', hidden: true }, + { path: '/member/health/index', component: _import('member/health/index'), name: '查询用户报告', hidden: true }, + { path: '/member/health/add', component: _import('member/health/add'), name: '新增报告', hidden: true }, + { path: '/member/health/show', component: _import('member/health/show'), name: '查看报告', hidden: true } ] } ] diff --git a/oms/oms-h5/src/views/member/health/add.vue b/oms/oms-h5/src/views/member/health/add.vue new file mode 100644 index 0000000..dd9dca5 --- /dev/null +++ b/oms/oms-h5/src/views/member/health/add.vue @@ -0,0 +1,87 @@ + + + diff --git a/oms/oms-h5/src/views/member/health/edit.vue b/oms/oms-h5/src/views/member/health/edit.vue deleted file mode 100644 index e7c4973..0000000 --- a/oms/oms-h5/src/views/member/health/edit.vue +++ /dev/null @@ -1,143 +0,0 @@ - - - diff --git a/oms/oms-h5/src/views/member/health/index.vue b/oms/oms-h5/src/views/member/health/index.vue index 0c00491..32ad683 100644 --- a/oms/oms-h5/src/views/member/health/index.vue +++ b/oms/oms-h5/src/views/member/health/index.vue @@ -2,8 +2,7 @@
- - + 搜索 + {{$t('message.add')}}
- + @@ -46,7 +46,7 @@ @@ -57,6 +57,7 @@ import { remove } from '@/api//member/card' import waves from '@/directive/waves.js'// 水波纹指令 import Pagination from '@/components/Pagination' +import hasPermission from '@/utils/permission' export default { name: 'healthDocs_list', @@ -67,8 +68,8 @@ export default { data() { return { params: { - search_eq_doc_type: undefined, - search_like_nickname: undefined, + search_eq_memberId: undefined, + search_eq_docType: undefined }, options: { docType: [ @@ -83,6 +84,8 @@ export default { } }, created() { + // 初始化 + this.params.search_eq_memberId = this.$route.query.memberId }, methods: { /** @@ -92,20 +95,26 @@ export default { this.$refs.pagination.handleSearch() }, + /** + * 是否添加 + */ + hasAddPermission() { + return hasPermission('member:add') + }, + /** * 编辑健康报告 */ handleEdit(id) { - this.$router.push({ path: '/member/card/edit', query: { id: id }}) + this.$router.push({ path: '/member/health/edit', query: { id: id }}) }, /** * 创建用户会员卡 */ handleCreate() { - this.$router.push({ path: '/member/card/edit' }) + this.$router.push({ path: '/member/health/add' }) }, - /** * 删除用户会员卡 */ diff --git a/oms/oms-h5/src/views/member/health/show.vue b/oms/oms-h5/src/views/member/health/show.vue new file mode 100644 index 0000000..1561b43 --- /dev/null +++ b/oms/oms-h5/src/views/member/health/show.vue @@ -0,0 +1,40 @@ + + + + diff --git a/oms/oms-h5/src/views/member/index.vue b/oms/oms-h5/src/views/member/index.vue index d98b521..a2ad9bb 100644 --- a/oms/oms-h5/src/views/member/index.vue +++ b/oms/oms-h5/src/views/member/index.vue @@ -96,6 +96,7 @@ 上传人脸 送卡 扣费 + 上传健康文档 编辑 @@ -286,6 +287,13 @@ export default { this.memberId = id }, + /** + * handleHealthDocs + */ + handleHealthDocs(id) { + this.$router.push({ path: '/member/health/index', query: { memberId: id }}) + }, + /** * 批量送卡弹框 */