健康档案
@@ -175,6 +179,7 @@ export default {
data() {
return {
dataList: [],//列表数据
+ multipleSelection:[], //选中的数据列表
dialogVisible: false,
dialogCamera: false,
};
@@ -190,10 +195,16 @@ export default {
...mapState(['dict', 'patientRegister', 'customerOrg']),
},
methods: {
+
+ handleSelectionChange(val){
+ this.multipleSelection = val;
+ //console.log('this.multipleSelection',this.multipleSelection)
+ },
//点击体检次数行
rowick(row) {
this.patientRegister.patientRegisterId = row.id
this.patientRegister.patientRegisterRd = row
+ //console.log('row',row)
},
//体检次数 相关操作
diff --git a/src/router/index.js b/src/router/index.js
index a5c98cf..921dc74 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -208,6 +208,11 @@ const routes = [
name: '体检人员登记',
component: () => import('../views/customerOrg/patientRegister.vue')
},
+ {
+ path: '/Camera',
+ name: '体检人员登记',
+ component: () => import('../components/patientRegister/Camera.vue')
+ },
{
path: '/patientRegisterSign',
name: '体检人员签到',
diff --git a/src/store/index.js b/src/store/index.js
index 575ba60..21aab1c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -33,6 +33,8 @@ export default new Vuex.Store({
patientRegisterId:'', //当前单位ID（可根据此值是否为空，判断是新增还是编辑）
patientRegisterRd:{}, //体检人员记录
addTimes:0, //用于触发新增时初始化赋值
+ photo:'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg', //单独抽出，拍照时会更新
+ cameraVisble:false, //拍照控件显示
patientRegisterRdInit: {
id: '', //id
patientId: '00000000-0000-0000-0000-000000000000', //档案号ID 选择了档案就传档案号，未选就传00000-0000...
@@ -80,7 +82,7 @@ export default new Vuex.Store({
customerOrgGroup:[], //分组（针对单位）
},
- //公共字典数据 add by pengjun
+ //公共字典数据 add by pengjun
dict:{
personOrgId:'00000000-0000-0000-0000-000000000000', //个人体检单位ID
organization:[], //体检中心
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index bdb2623..079a8d2 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -12,11 +12,14 @@ exports.tcdate = (date) => {
//json 对像赋值 只从 from 对象 赋值 to 中有的 key 项 add by pengjun
exports.objCopy = (from,to) => {
- for(let key in to){
- if(from[key] !== undefined){
- to[key] = from[key]
- }
- }
+ if(from && to){
+ let keys = Object.keys(to)
+ for(let key in keys){
+ if(from[keys[key]] !== undefined){
+ to[keys[key]] = from[keys[key]]
+ }
+ }
+ }
}
//类似PB中的dddw的功能 add by pengjun
@@ -38,7 +41,7 @@ exports.dddw = (arrayData,key,value,display) => {
exports.setNull = (obj,arrayCols) => {
if(arrayCols){
for(let i=0;i
体检人员登记
+
+ 拍照测试
+
体检人员签到
- 照相机拍照
- 
-