From 3a96c3357dfb5d3e3629b65dcec4a7aa9b52fd04 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Wed, 6 Mar 2024 17:53:19 +0800 Subject: [PATCH] djSeo --- .../doctorCheck/PatientRegisterBase.vue | 226 +++----------- .../patientRegister/PatientRegisterEdit.vue | 287 +----------------- .../PatientRegisterEditQuery.vue | 238 +++++++++++++++ .../PatientRegisterForChoose.vue | 286 +++++++++++++++++ .../patientRegister/PatientRegisterList.vue | 10 +- src/store/index.js | 6 + 6 files changed, 582 insertions(+), 471 deletions(-) create mode 100644 src/components/patientRegister/PatientRegisterEditQuery.vue create mode 100644 src/components/patientRegister/PatientRegisterForChoose.vue diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue index 2d4840c..5ec7426 100644 --- a/src/components/doctorCheck/PatientRegisterBase.vue +++ b/src/components/doctorCheck/PatientRegisterBase.vue @@ -66,148 +66,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取消 - 确定 - + @@ -216,10 +77,13 @@ import moment from "moment"; import { mapState, mapMutations} from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; -import { dddw,objCopy, opjCopy } from '../../utlis/proFunc' +import { dddw,deepCopy,objCopy, opjCopy } from '../../utlis/proFunc' +import PatientRegisterForChoose from "../../components/patientRegister/PatientRegisterForChoose.vue"; export default { - components: {}, + components: { + PatientRegisterForChoose, + }, data() { return { dialogVisible: false, @@ -240,9 +104,8 @@ export default { mobileTelephone: '', //手机 }, prBaseInit:{}, - registerVisible:false, //是否显示体检人员列表 - patientRegisters:[], //体检人员列表信息 - patientRegisterChoosed:null, //查询到多人时，选中的记录 + PatientRegisterForChooseParams:{}, // 参数 + }; }, @@ -256,7 +119,7 @@ export default { }, computed: { - ...mapState(["dict","dataTransOpts","patientRegister", "doctorCheck", "sumDoctorCheck"]), + ...mapState(["dict","dialogWin", "dataTransOpts","patientRegister", "doctorCheck", "sumDoctorCheck"]), }, methods: { ...mapMutations(['doctorCheckPrBaseInit','sumPREditInit']), @@ -269,7 +132,9 @@ export default { objCopy(rd,this.prBase) this.dataTransOpts.tableS.patient_register.id = rd.id this.doctorCheck.prBase = Object.assign({},this.doctorCheck.prBase,rd) - this.dataTransOpts.refresh.register_check.M++ + setTimeout(() => { + this.dataTransOpts.refresh.register_check.M++ + }, 20); // objCopy(rd,this.doctorCheck.prBase) // this.sumPREditInit() @@ -287,7 +152,9 @@ export default { this.doctorCheckPrBaseInit() this.dataTransOpts.tableS.patient_register.id = '' - this.dataTransOpts.refresh.register_check.M++ + setTimeout(() => { + this.dataTransOpts.refresh.register_check.M++ + }, 20); this.sumPREditInit() @@ -346,56 +213,30 @@ export default { patientName:v, isFilterPreRegistration:'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效) } - this.patientRegisterChoosed = null - - postapi('/api/app/patientregister/getlistinfilter', body) - .then((res) => { - if (res.code != -1) { - if(res.data.items.length == 0){ - this.unfindPR('patientName') - }else if(res.data.items.length == 1){ - this.findPR(res.data.items[0]) - }else{ - //显示列表，供选择 - this.patientRegisters = res.data.items - this.registerVisible = true - } - } - }); - }, - - // 选中记录 - registerRowClick(row){ - this.patientRegisterChoosed = row - }, - - // 双击选中记录 - rowDblclick(row){ - this.registerRowClick(row) - this.chooseRegister() + this.PatientRegisterForChooseParams = body // 传参 + this.dialogWin.PatientRegisterForChoose = true // 弹窗 + setTimeout(() => { + this.dataTransOpts.refresh.patient_register.M++ + }, 10); }, - chooseRegister(){ - this.findPR(this.patientRegisterChoosed) - this.registerVisible = false + //根据ID 获取 人员信息 + async getPatientRegister(patientRegisterId){ + if(!patientRegisterId){ + this.prBase = deepCopy(this.prBaseInit) + return + } + let res = await postapi(`/api/app/patientregister/getinfoorpatient?PatientRegisterId=${patientRegisterId}`) + this.prBase = res.data }, + lmoment(date, forMat) { return moment(new Date(date)).format(forMat); }, - - //查询 - btnQuery() { - this.doctorCheck.prBase.times++; - console.log("this.doctorCheck.prBase", this.doctorCheck.prBase); - }, - - //读身份证 - readIdCard() { - alert("读身份证"); - }, - + + //回车替代查询 enterToQuery() { // console.log('enterToTab'); @@ -451,7 +292,8 @@ export default { "dataTransOpts.refresh.patient_register.S":{ immediate:true, handler(newVal, oldVal) { - console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`); + console.log(`watch 组合项目列表 newVal: ${newVal} oldVal: ${oldVal} patient_register.id: ${this.dataTransOpts.tableS.patient_register.id}`); + this.getPatientRegister(this.dataTransOpts.tableS.patient_register.id) this.dataTransOpts.refresh.register_check.M++ } }, diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 4f89987..fd3c773 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -3,27 +3,8 @@
-
-
- 查找：  条码号 - -
-
- 档案号 - -
-
- 姓名 - -
-
- 手机号 - -
+
+
@@ -461,152 +442,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取消 - 确定 - - - - + + + + + + +
+ + + diff --git a/src/components/patientRegister/PatientRegisterForChoose.vue b/src/components/patientRegister/PatientRegisterForChoose.vue new file mode 100644 index 0000000..f7a2865 --- /dev/null +++ b/src/components/patientRegister/PatientRegisterForChoose.vue @@ -0,0 +1,286 @@ + + + diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index ead55ff..37ac6cf 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -624,7 +624,7 @@ export default { this.dataTransOpts.tableS.patient_register.id = this.patientRegister.prList[lfind].id // this.getCustomerOrgGroup(this.patientRegister.prList[lfind].customerOrgParentId); setTimeout(() => { - this.dataTransOpts.refresh.register_asbitem.M++ + this.dataTransOpts.refresh.register_asbitem.M++ //触发所选组合项目刷新 }, 20); // 旧的方式 @@ -666,8 +666,8 @@ export default { this.dialogVisible = true; setTimeout(() => { // 触发数据刷新 - this.dataTransOpts.refresh.patient_register.S++ //人员信息 - this.dataTransOpts.refresh.register_asbitem.M++ //人员登记组合项目 + this.dataTransOpts.refresh.patient_register.S++ //触发人员信息刷新 + this.dataTransOpts.plus.clearPatientRegisterQuery++ //触发清空人员登记界面的查询条件 }, 20); }, @@ -723,8 +723,8 @@ export default { //console.log(this.patientRegister.patientRegisterRd,this.patientRegister.prList) this.dialogVisible = true; // 触发数据刷新 - this.dataTransOpts.refresh.patient_register.S++ //人员信息 - this.dataTransOpts.refresh.register_asbitem.M++ //人员登记组合项目 + this.dataTransOpts.refresh.patient_register.S++ //触发人员信息刷新(会同时刷新组合项目) + this.dataTransOpts.plus.clearPatientRegisterQuery++ //触发清空人员登记界面的查询条件 }, diff --git a/src/store/index.js b/src/store/index.js index e853bb0..6dfc7e1 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -331,11 +331,17 @@ export default new Vuex.Store({ register_check: [], register_check_item: [], role_menu_info: [], // 角色对应的菜单 + }, + plus:{ + clearPatientRegisterQuery:0, } + }, // 弹窗控制 dialogWin: { + PatientList: false, // 体检人员档案列表 + PatientRegisterForChoose: false, // 体检人员登记列表 PatientRegisterEditItemBatch: false, //批量调整项目 PatientRegisterEditGroupBatch: false, //批量调整分组 MenuPageSet: false, // 设置角色菜单权限