From ffb38e9ccf0436db983e1d70e9ce3f5eeae4df4e Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Mon, 2 Dec 2024 15:58:59 +0800 Subject: [PATCH] audit --- .../customerOrg/customerOrgTree.vue | 12 +- .../PatientRegisterEditDoctorBatch.vue | 20 +- .../patientRegister/PatientRegisterList.vue | 533 +++++------------- 3 files changed, 178 insertions(+), 387 deletions(-) diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue index 2f2aae7..ef11e31 100644 --- a/src/components/customerOrg/customerOrgTree.vue +++ b/src/components/customerOrg/customerOrgTree.vue @@ -9,8 +9,8 @@
+ :default-expanded-keys="customerOrg.defaultExpandedKeys" @node-click="treeclick" highlight-current draggable + @allow-drag="allowDrag" @allow-drop="allowDrop" ref="customerOrgTree">
@@ -90,6 +90,14 @@ export default { }); }, + allowDrag(node) { + console.log('node', node) + }, + + allowDrop(draggingNode, dropNode, type) { + console.log('draggingNode, dropNode, type', draggingNode, dropNode, type) + }, + //获取联系方式列表 //api/app/contact-method/in-contact-person-id?ContactPersonId=3a0c08ad-4304-138b-d9e6-a7338739dfc4' \ diff --git a/src/components/patientRegister/PatientRegisterEditDoctorBatch.vue b/src/components/patientRegister/PatientRegisterEditDoctorBatch.vue index e49b546..902230e 100644 --- a/src/components/patientRegister/PatientRegisterEditDoctorBatch.vue +++ b/src/components/patientRegister/PatientRegisterEditDoctorBatch.vue @@ -2,7 +2,7 @@
- 注:检查项目不选医生表示不更新。 + 注:项目的检查(审核)医生不选表示对应项目的检查(审核)医生不更新。
+ + +
@@ -56,7 +63,7 @@ export default { components: { ElProgressOCX, }, - props: ["multipleSelection"], + props: ["multipleSelection","doctorType"], data() { return { tableData: [], @@ -96,15 +103,20 @@ export default { btnOk() { let checkDoctorDetail = [] this.tableData.forEach(e => { - if (e.checkDoctorId) checkDoctorDetail.push(e) + if (!e.checkDoctorId) e.checkDoctorId = null + if (!e.auditorUserId) e.auditorUserId = null }); + checkDoctorDetail = this.tableData if (checkDoctorDetail.length == 0) { this.$message.warning({ showClose: true, message: '没有可更新的数据记录!' }) return } - postapi('/api/app/RegisterCheck/UpdateBatchCheckDoctor', { patientRegisterIds: this.patientRegisterIds, checkDoctorDetail }) + let url = '/api/app/RegisterCheck/UpdateBatchCheckDoctor' + //if(this.doctorType == 'audit') url = '/api/app/RegisterCheck/UpdateBatchAuditDoctor' + + postapi(url, { patientRegisterIds: this.patientRegisterIds, checkDoctorDetail }) .then(res => { if (res.code > -1) { this.dialogWin.PatientRegisterEditDoctorBatch = false; diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 3619a44..e11ff64 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -2,74 +2,40 @@
-
+
- - - + + +