diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index a9f44da..a356004 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -205,6 +205,24 @@ :editTimes="editTimes" :refFuncSetData="refFuncSetData" /> + + +
+
+ {{ upBaseInfo.label }} + +
+
+
+
+ 提交 + 关闭 +
+
+
+ + @@ -375,6 +393,14 @@ export default { maxResultCount: 100, }, loadOptsInit: {}, + + upBaseInfo: { + visble: false, + label: "姓名", + value: "", + colName: "patientName", + patientRegisterId: "" + } }; }, @@ -978,6 +1004,48 @@ export default { } }) }, + + + close_dialogWin_upBaseInfo(){ + this.upBaseInfo.visble = false + this.close_dialogWin_PatientRegisterEdit() + }, + btnUpBaseInfo() { + let body = { + patientRegisterId: this.upBaseInfo.patientRegisterId, + // "patientName": "string", + // "mobileTelephone": "string", + // "idNo": "string" + } + body[this.upBaseInfo.colName] = this.upBaseInfo.value + + postapi('/api/app/PatientRegister/UpdatePatientRegisterBaseInfoByPatientRegisterId',body).then(res => { + if(res.code > -1){ + this.close_dialogWin_upBaseInfo() + } + }) + }, + // 修改基本信息 + fnUpBaseInfo(row, baseInfoType) { + this.dataTransOpts.tableS.patient_register.id = row.id + this.upBaseInfo.visble = true + this.upBaseInfo.patientRegisterId = row.id + this.upBaseInfo.colName = baseInfoType + switch (baseInfoType) { + case "idNo": + this.upBaseInfo.label = "新身份证号" + break; + case "mobileTelephone": + this.upBaseInfo.label = "新手机号" + break; + default: + this.upBaseInfo.label = "新姓名" + break; + } + this.upBaseInfo.value = row[baseInfoType] + + }, + //右击菜单 onCellRightClick(row, column) { this.rClickRow = { ...row }; //右击的行记录 @@ -990,6 +1058,27 @@ export default { let row = { ...this.rClickRow }; let items = [] //菜单项 + if (checkPagePriv(this.pagePriv.privs, '修改姓名') && row.completeFlag != '0') + items.push({ + label: "修改姓名", + onClick: () => { + this.fnUpBaseInfo(row, 'patientName'); + }, + }) + if (checkPagePriv(this.pagePriv.privs, '修改手机号') && row.completeFlag != '0') + items.push({ + label: "修改手机号", + onClick: () => { + this.fnUpBaseInfo(row, 'mobileTelephone'); + }, + }) + if (checkPagePriv(this.pagePriv.privs, '修改身份证号') && row.completeFlag != '0') + items.push({ + label: "修改身份证号", + onClick: () => { + this.fnUpBaseInfo(row, 'idNo'); + }, + }) if (checkPagePriv(this.pagePriv.privs, '发送检验申请') && row.completeFlag != '0') items.push({ label: "发送检验申请", diff --git a/src/components/report/TurnoverReport.vue b/src/components/report/TurnoverReport.vue index d7f5731..4ba1478 100644 --- a/src/components/report/TurnoverReport.vue +++ b/src/components/report/TurnoverReport.vue @@ -35,10 +35,11 @@
- 查询 + 查询 + 导出
-
+
@@ -59,6 +60,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { deepCopy } from "../../utlis/proFunc" import CusOrgOCX from "./CusOrgOCX.vue" import moment from "moment"; +import FileSaver from 'file-saver'; export default { components: { @@ -156,6 +158,15 @@ export default { }); }, + //通用导出 + btnExport(elId) { + let table = document.getElementById(elId); + let tableData = table.innerHTML + let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls' + let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" }); + FileSaver.saveAs(blob, fileName); + }, + // 单位过滤 filterMethod(keyWords) { if (keyWords) { diff --git a/src/views/customerOrg/patientRegisterImport.vue b/src/views/customerOrg/patientRegisterImport.vue index 0159f6f..6d3471e 100644 --- a/src/views/customerOrg/patientRegisterImport.vue +++ b/src/views/customerOrg/patientRegisterImport.vue @@ -1449,7 +1449,10 @@ export default { } } }) - if(this.seq > 30) body.isOccupationalDisease = 'Y' + if(this.seq > 30){ + body.isOccupationalDisease = 'Y' + body.isDefaultMedicalType = 'Y' + } return body }, diff --git a/src/views/workload/deskwork.vue b/src/views/workload/deskwork.vue index 12d10a5..59fe7cd 100644 --- a/src/views/workload/deskwork.vue +++ b/src/views/workload/deskwork.vue @@ -104,11 +104,11 @@ - + - + @@ -137,11 +137,11 @@ - + - + @@ -171,11 +171,11 @@ - + - + diff --git a/src/views/workload/doctorstaionworkload.vue b/src/views/workload/doctorstaionworkload.vue index b4994f7..0052db0 100644 --- a/src/views/workload/doctorstaionworkload.vue +++ b/src/views/workload/doctorstaionworkload.vue @@ -147,11 +147,11 @@ > - + - + diff --git a/src/views/workload/peisworkload.vue b/src/views/workload/peisworkload.vue index baeb34f..4918b45 100644 --- a/src/views/workload/peisworkload.vue +++ b/src/views/workload/peisworkload.vue @@ -117,11 +117,11 @@ > - + - +