From 6699d1e3a9998a57624e2917e0a04b9a4899aa31 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Sat, 27 Apr 2024 21:18:54 +0800 Subject: [PATCH] login --- src/components/patientRegister/PatientLis.vue | 5 +-- .../patientRegister/PatientRegisterEdit.vue | 20 +++------ src/utlis/proApi.js | 42 ++++++++++++++++++- src/utlis/proFunc.js | 39 ----------------- src/views/doctorCheck/doctorCheck.vue | 3 +- 5 files changed, 49 insertions(+), 60 deletions(-) diff --git a/src/components/patientRegister/PatientLis.vue b/src/components/patientRegister/PatientLis.vue index 7639366..2b2e178 100644 --- a/src/components/patientRegister/PatientLis.vue +++ b/src/components/patientRegister/PatientLis.vue @@ -156,7 +156,7 @@ import moment from "moment"; import { mapState, mapActions } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; -import { photoParse } from "../../utlis/proFunc" +import { photoParse } from "../../utlis/proApi" import Sortable from "sortablejs"; import FileSaver from 'file-saver'; import html2canvas from 'html2canvas'; @@ -164,9 +164,6 @@ import html2canvas from 'html2canvas'; import { getPagePriv, checkPagePriv, dddw, - objCopy, - arrayReduce, - arrayExistObj, deepCopy, } from "../../utlis/proFunc"; diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 2f2df4f..14df26f 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -501,15 +501,18 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { getPagePriv, checkPagePriv, objCopy, setNull, dddw, checkIDCode, parseID, birthdayToAge, ageToBirthday, deepCopy, arrayFilter, arrayReduce, parsIcCardtoLocal, - photoParse, savePeoplePhoto, arrayExistObj + arrayExistObj } from "../../utlis/proFunc"; +import { + photoParse, savePeoplePhoto, +} from "../../utlis/proApi"; import Camera from "./Camera.vue"; import PatientRegisterItem from "./PatientRegisterItem.vue"; import LisRequest from "./LisRequest.vue"; import MergeAsbitem from "./MergeAsbitem.vue"; import Charge from "../../views/charge/charge.vue"; import PatientRegisterEditQuery from "../../components/patientRegister/PatientRegisterEditQuery.vue"; -import proApi from "../../utlis/proApi"; + export default { components: { @@ -1731,19 +1734,6 @@ export default { return } - - // try { - // let res = await proApi.getPrAsb(this.form.id) - // if (res.code == -1) { - // this.$message.warning(`操作失败，原因：${res.message}`) - // return - // } - // } catch (error) { - // this.$message.warning(`操作失败，原因：${error}`) - // return - // } - - //多次重复点击时，刷新处理 this.chargePatientRegisterNo = patientRegisterNo setTimeout(() => { diff --git a/src/utlis/proApi.js b/src/utlis/proApi.js index 49c8c26..d5464da 100644 --- a/src/utlis/proApi.js +++ b/src/utlis/proApi.js @@ -30,9 +30,49 @@ const getPrAsb = async (id) =>{ return result }; +async function savePeoplePhoto(peopleId, photoBase64) { + let lres = { code: -1, msg: '' } + if (!peopleId) return { code: -1, msg: '人员ID不能为空' } + if (!photoBase64 || photoBase64.indexOf('data:image') < 0) return { code: -1, msg: '图像数据不是合法的base64编码数据' } + + + let uploadPhoto = { + patientRegisterId: peopleId, + photo: photoBase64.split(",")[1], + }; + + try { + lres = await postapi(`/api/app/patient-register/up-load-img`, uploadPhoto) + let body = { + patientRegisterId: peopleId, + photo: lres.data, + } + await postapi(`/api/app/patient-register/update-photo`, body) + + } catch (error) { + lres = { code: -1, msg: error } + } + + return lres +}; + +function photoParse(photo) { + //console.log(sysConfig,photo) + let lphoto = '' //data:image、UpLoad/、/pic/Photo.jpg + if (!photo) return '/pic/Photo.jpg' + if (photo.indexOf("UpLoad/") > - 1) { + lphoto = sysConfig.apiurl + '/' + photo + '?' + new Date().getTime() + } else { + lphoto = photo + } + //console.log(lphoto) + return lphoto +}; + + module.exports = { - getPrAsb, + getPrAsb,savePeoplePhoto,photoParse } diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js index 123e1ba..2058b61 100644 --- a/src/utlis/proFunc.js +++ b/src/utlis/proFunc.js @@ -1,5 +1,3 @@ -const { getapi, postapi, putapi, deletapi } = require('../api/api'); -const sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig')) //多级联动选择数据处理 add by pengjun function tcdate(date) { @@ -250,46 +248,9 @@ function parsIcCardtoLocal(idNos, dictSex, dictNation) { }; exports.parsIcCardtoLocal = parsIcCardtoLocal; -function photoParse(photo) { - //console.log(sysConfig,photo) - let lphoto = '' //data:image、UpLoad/、/pic/Photo.jpg - if (!photo) return '/pic/Photo.jpg' - if (photo.indexOf("UpLoad/") > - 1) { - lphoto = sysConfig.apiurl + '/' + photo + '?' + new Date().getTime() - } else { - lphoto = photo - } - //console.log(lphoto) - return lphoto -}; -exports.photoParse = photoParse; -async function savePeoplePhoto(peopleId, photoBase64) { - let lres = { code: -1, msg: '' } - if (!peopleId) return { code: -1, msg: '人员ID不能为空' } - if (!photoBase64 || photoBase64.indexOf('data:image') < 0) return { code: -1, msg: '图像数据不是合法的base64编码数据' } - let uploadPhoto = { - patientRegisterId: peopleId, - photo: photoBase64.split(",")[1], - }; - - try { - lres = await postapi(`/api/app/patient-register/up-load-img`, uploadPhoto) - let body = { - patientRegisterId: peopleId, - photo: lres.data, - } - await postapi(`/api/app/patient-register/update-photo`, body) - - } catch (error) { - lres = { code: -1, msg: error } - } - - return lres -}; -exports.savePeoplePhoto = savePeoplePhoto; // 获取当前用户，当前界面的权限 // roteUrlorPageName 路由或需要控制权限的组件界面名称 diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue index d0e3b5a..c080e55 100644 --- a/src/views/doctorCheck/doctorCheck.vue +++ b/src/views/doctorCheck/doctorCheck.vue @@ -62,7 +62,8 @@