oms 新增健康报告上传页面

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'
   }
 }

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:'标题'
   }
 }

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 }
     ]
   }
 ]

oms/oms-h5/src/views/member/health/add.vue

@@ -0,0 +1,87 @@
+<template>
+  <div class="app-container app-edit">
+    <el-form class="small-space" :model="form" :rules="rules" ref="form" label-position="right" label-width="120px" style="width: 700px;">
+      <!-- 用户ID -->
+      <el-form-item label="用户ID" prop="memberId">
+        <el-input v-model="form.memberId" placeholder="请输入用户ID"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" :loading="onSubmit" @click="handleSave">保存</el-button>
+        <el-button @click="handleCancel">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { save } from '@/api//member/card'
+
+export default {
+  data() {
+    return {
+      form: {
+        memberId: undefined,
+        cardType: '',
+        veneuType: '',
+        venueId: '',
+        startTime: '',
+        endTime: '',
+        status: 1,
+        platformId: ''
+      },
+
+      onSubmit: false,
+
+      // 表单验证规则
+      rules: {
+//        mobile: [
+//          { required: true, message: '请输入手机号码', trigger: 'blur' }
+//        ],
+//        username: [
+//          { required: true, message: '请输入姓名', trigger: 'blur' },
+//          { max: 15, message: '姓名长度不能超过15个字符', trigger: 'blur' }
+//        ],
+//        email: [
+//          { required: true, message: '请输入邮箱', trigger: 'blur' },
+//          { type: 'email', message: '您输入的邮箱格式不正确', trigger: 'blur' }
+//        ],
+//        password: [
+//          { required: true, message: '请输入密码', trigger: 'blur' },
+//          { min: 6, message: '密码长度不能少于6个字符', trigger: 'blur' }
+//        ]
+      }
+    }
+  },
+  created() {
+    alert(this.$route.query.id)
+    if (this.$route.query.id) {
+      this.form.memberId = this.$route.query.id
+    }
+  },
+  methods: {
+    /**
+     * 保存用户会员卡
+     */
+    handleSave() {
+      this.$refs.form.validate(valid => {
+        if (!valid) {
+          return false
+        }
+        this.onSubmit = true
+        save(this.form).then(response => {
+          this.$router.go(-1)
+        }).finally(() => {
+          this.onSubmit = false
+        })
+      })
+    },
+
+    /**
+     * 取消
+     */
+    handleCancel() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>

oms/oms-h5/src/views/member/health/edit.vue

@@ -1,143 +0,0 @@
-<template>
-  <div class="app-container app-edit">
-    <el-form class="small-space" :model="form" :rules="rules" ref="form" label-position="right" label-width="120px" style="width: 700px;">
-
-      <!-- 用户ID -->
-      <el-form-item label="用户ID" prop="memberId">
-        <el-input v-model="form.memberId" placeholder="请输入用户ID"></el-input>
-      </el-form-item>
-
-      <!-- 会员卡类型 -->
-      <el-form-item label="会员卡类型" prop="cardType">
-        <el-input v-model="form.cardType" placeholder="请输入会员卡类型"></el-input>
-      </el-form-item>
-
-      <!-- 场馆类型 -->
-      <el-form-item label="场馆类型" prop="veneuType">
-        <el-input v-model="form.veneuType" placeholder="请输入场馆类型"></el-input>
-      </el-form-item>
-
-      <!-- 场馆ID -->
-      <el-form-item label="场馆ID" prop="venueId">
-        <el-input v-model="form.venueId" placeholder="请输入场馆ID"></el-input>
-      </el-form-item>
-
-      <!-- 有效开始时间 -->
-      <el-form-item label="有效开始时间" prop="startTime">
-        <el-input v-model="form.startTime" placeholder="请输入有效开始时间"></el-input>
-      </el-form-item>
-
-      <!-- 有效结束时间 -->
-      <el-form-item label="有效结束时间" prop="endTime">
-        <el-input v-model="form.endTime" placeholder="请输入有效结束时间"></el-input>
-      </el-form-item>
-
-      <!-- 状态 -->
-      <el-form-item label="状态">
-        <el-radio class="radio" v-model="form.status" :label="1">可用</el-radio>
-        <el-radio class="radio" v-model="form.status" :label="0">禁用</el-radio>
-      </el-form-item>
-
-      <!-- 平台来源ID -->
-      <el-form-item label="平台来源ID" prop="platformId">
-        <el-input v-model="form.platformId" placeholder="请输入平台来源ID"></el-input>
-      </el-form-item>
-
-      <el-form-item>
-        <el-button type="primary" :loading="onSubmit" @click="handleSave">保存</el-button>
-        <el-button @click="handleCancel">取消</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import { find, save } from '@/api//member/card'
-
-export default {
-  data() {
-    return {
-      form: {
-        id: undefined,
-        memberId: '',
-        cardType: '',
-        veneuType: '',
-        venueId: '',
-        startTime: '',
-        endTime: '',
-        status: 1,
-        platformId: ''
-      },
-
-      onSubmit: false,
-
-      // 表单验证规则
-      rules: {
-//        mobile: [
-//          { required: true, message: '请输入手机号码', trigger: 'blur' }
-//        ],
-//        username: [
-//          { required: true, message: '请输入姓名', trigger: 'blur' },
-//          { max: 15, message: '姓名长度不能超过15个字符', trigger: 'blur' }
-//        ],
-//        email: [
-//          { required: true, message: '请输入邮箱', trigger: 'blur' },
-//          { type: 'email', message: '您输入的邮箱格式不正确', trigger: 'blur' }
-//        ],
-//        password: [
-//          { required: true, message: '请输入密码', trigger: 'blur' },
-//          { min: 6, message: '密码长度不能少于6个字符', trigger: 'blur' }
-//        ]
-      }
-    }
-  },
-  created() {
-    if (this.$route.query.id) {
-      this.form.id = this.$route.query.id
-      this.findById(this.form.id)
-    }
-  },
-  methods: {
-    /**
-     * 查询用户会员卡
-     */
-    findById(id) {
-      find(id).then(response => {
-        this.form.memberId = response.memberCard.memberId
-        this.form.cardType = response.memberCard.cardType
-        this.form.veneuType = response.memberCard.veneuType
-        this.form.venueId = response.memberCard.venueId
-        this.form.startTime = response.memberCard.startTime
-        this.form.endTime = response.memberCard.endTime
-        this.form.status = response.memberCard.status
-        this.form.platformId = response.memberCard.platformId
-      })
-    },
-
-    /**
-     * 保存用户会员卡
-     */
-    handleSave() {
-      this.$refs.form.validate(valid => {
-        if (!valid) {
-          return false
-        }
-
-        this.onSubmit = true
-        save(this.form).then(response => {
-          this.$router.go(-1)
-        }).finally(() => {
-          this.onSubmit = false
-        })
-      })
-    },
-
-    /**
-     * 取消
-     */
-    handleCancel() {
-      this.$router.go(-1)
-    }
-  }
-}
-</script>

oms/oms-h5/src/views/member/health/index.vue

@@ -2,8 +2,7 @@
 <div class="app-container calendar-list-container">
   <!-- 筛选条件 -->
   <div class="filter-container">
-    <el-input @keyup.enter.native="handleSearch" style="width: 200px;" clearable class="filter-item" placeholder="昵称" v-model="params.search_like_nickname"></el-input>
-    <el-select v-model="params.veneuType" style="width: 120px" class="filter-item" clearable placeholder="文档类型">
+    <el-select v-model="params.search_eq_docType" style="width: 120px" class="filter-item" clearable placeholder="文档类型">
       <el-option v-for="item in options.docType"
         :key="item.value"
         :label="item.label"
@@ -11,10 +10,11 @@
       </el-option>
     </el-select>
     <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleSearch">搜索</el-button>
+    <el-button v-if="hasAddPermission()" class="filter-item pull-right" type="success" icon="add" @click="handleCreate">{{$t('message.add')}}</el-button>
   </div>
 
   <!-- 列表数据 -->
-  <Pagination uri="/member/cards" :request-params="params" ref="pagination">
+  <Pagination uri="/member/health/docs" :request-params="params" ref="pagination">
 
       <!-- 用户ID -->
       <el-table-column align="center" label="用户昵称">
@@ -46,7 +46,7 @@
 
       <el-table-column label="操作" align="center" width="150">
         <template scope="scope">
-          <el-button size="small" type="text" @click="handleEdit(scope.row.id)">查看</el-button>
+          <el-button size="small" type="text" @click="handleEdit(scope.row.docPath)">查看</el-button>
         </template>
       </el-table-column>
   </Pagination>
@@ -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' })
     },
-
     /**
      * 删除用户会员卡
      */

oms/oms-h5/src/views/member/health/show.vue

@@ -0,0 +1,40 @@
+<template>
+<div class="app-container calendar-list-container">
+  <el-form class="small-space" :model="form" :rules="rules" ref="form" label-position="right">
+    <el-form-item>
+      <el-button style="float: right;margin-top: -25px;" @click="handleCancel">返回</el-button>
+    </el-form-item>
+  </el-form>
+  <div id="iframe-container">
+    <iframe :src="search_eq_docPath" scrolling="auto" frameborder="0" id="iframe"></iframe>
+  </div>
+</div>
+</template>
+
+<script>
+import waves from '@/directive/waves.js'// 水波纹指令
+
+export default {
+  directives: {
+    waves
+  },
+  data() {
+    return {
+      search_eq_docPath: undefined
+    }
+  },
+  created() {
+    // 初始化
+    this.search_eq_docPath = this.$route.query.docPath
+  },
+  methods: {
+    /**
+     * 取消
+     */
+    handleCancel() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+

oms/oms-h5/src/views/member/index.vue

@@ -96,6 +96,7 @@
         <el-button size="small" type="text" @click="showUploadFace(scope.row.id)">上传人脸</el-button>
         <el-button size="small" type="text" @click="showimg(scope.row.id)">送卡</el-button>
         <el-button size="small" type="text" @click="miniMoney(scope.row.id,scope.row.money)">扣费</el-button>
+        <el-button size="small" type="text" @click="handleHealthDocs(scope.row.id)">上传健康文档</el-button>
         <el-button v-if="hasEditPermission() && scope.row.status === 0" size="small" type="text" @click="handleAddEdit(scope.row.id)">编辑</el-button>
       </template>
     </el-table-column>
@@ -286,6 +287,13 @@ export default {
       this.memberId = id
     },
 
+    /**
+     * handleHealthDocs
+     */
+    handleHealthDocs(id) {
+      this.$router.push({ path: '/member/health/index', query: { memberId: id }})
+    },
+
     /**
      * 批量送卡弹框
      */