From d731d3aa319af7f82d70e97e82503d6c2b1db51f Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Tue, 10 Oct 2023 18:01:22 +0800 Subject: [PATCH 1/5] elProgress --- .../customerOrg/customerOrgEdit.vue | 11 +- .../patientRegister/PatientRegisterEdit.vue | 7 +- .../patientRegister/PatientRegisterItem.vue | 248 +++++++++++++++--- .../patientRegister/PatientRegisterList.vue | 118 ++++++--- src/components/report/ElProgressOCX.vue | 43 +++ src/main.js | 1 + src/store/index.js | 6 + 7 files changed, 349 insertions(+), 85 deletions(-) create mode 100644 src/components/report/ElProgressOCX.vue diff --git a/src/components/customerOrg/customerOrgEdit.vue b/src/components/customerOrg/customerOrgEdit.vue index 4cf90c2..2009369 100644 --- a/src/components/customerOrg/customerOrgEdit.vue +++ b/src/components/customerOrg/customerOrgEdit.vue @@ -443,17 +443,18 @@ export default { //console.log('{patientRegisterIds}',{patientRegisterIds}) return deletapi(`/api/app/customer-org/${this.customerOrg.customerOrgRd.id}`); }).then((res) => { - if(res.code != -1) { + if(res.Code != -1) { this.$message.success("删除 操作成功"); this.getCustomerOrgTree('delete',this.customerOrg.customerOrgRd.id); this.setData({ key: "customerOrg.customerOrgRd", value: { id: "" } }); this.$refs[formName].resetFields(); } }).catch((err) => { - this.$message({ - type: "info", - message: "已取消删除", - }); + if(err == 'cancel'){ + this.$message.info("已取消删除"); + }else{ + this.$message.error("操作失败，原因：" + err); + } }); }, }, diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 5c355b8..39a7f25 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -44,12 +44,12 @@ - + - + @@ -923,7 +923,7 @@ export default { }, //根据姓名，身份证号 查询档案信息，用于判断人员多次体检 - query(param) { + Query(param) { //编辑的时候不查重 if (this.form.id || !param) return; @@ -1133,6 +1133,7 @@ export default { this.$message.info("该信息尚未保存，不可执行此操作！"); return; } + this.patientRegister.photo = '/pic/Photo.jpg' this.patientRegister.patientRegisterId = ''; this.form.id = ''; this.form.patientId = '00000000-0000-0000-0000-000000000000'; diff --git a/src/components/patientRegister/PatientRegisterItem.vue b/src/components/patientRegister/PatientRegisterItem.vue index 5a20441..33e232c 100644 --- a/src/components/patientRegister/PatientRegisterItem.vue +++ b/src/components/patientRegister/PatientRegisterItem.vue @@ -1,6 +1,6 @@ - - + + - - - - - + + + + + - + - - + + - + - + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 49560d2..97964df 100644 --- a/src/main.js +++ b/src/main.js @@ -108,6 +108,7 @@ onResize(); // 监听keydown：获取键盘按住事件,code返回按住的键信息 window.addEventListener('keydown', code => { + console.log('keydown',code) if (code.key == "Shift" && code.shiftKey) { store.commit('setData', { key: 'window.shift', value: true });// 标记按住了shift键 } diff --git a/src/store/index.js b/src/store/index.js index acf36e6..e1387fc 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -21,6 +21,12 @@ export default new Vuex.Store({ shift:false, //是否按下 shift键 ctrl:false, //是否按下 ctrl键 }, + elProgress:{ //通用进度条相关参数 + display:false, //是否显示 + textInside:true, + strokeWidth:30, + percentage:0 + }, customerOrg: { //体检单位设置 customerOrgTree: [], //体检单位列表 From 12698ec3bfe7cbab3557e48bc48d830223a7e512 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Tue, 10 Oct 2023 18:19:20 +0800 Subject: [PATCH 2/5] progress --- src/components/patientRegister/PatientRegisterList.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 528aca9..3712d8a 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -855,6 +855,8 @@ export default { return; } + this.elProgress.display = true + this.elProgress.percentage = 0 for (let i = 0; i < this.multipleSelection.length; i++) { groupBatch.patientRegisterId = this.multipleSelection[i].id; try { @@ -862,6 +864,7 @@ export default { } catch (error) { console.log(error); } + this.elProgress.percentage = Math.floor((i+1)*100/this.multipleSelection.length) } this.$message.success("操作成功！"); this.dialogGroup = false; From b156fc465e4f0ed09181f5f08823187127865e02 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Wed, 11 Oct 2023 16:15:07 +0800 Subject: [PATCH 3/5] org --- src/components/customerOrg/ContactPerson.vue | 10 +++++++--- src/components/customerOrg/customerOrgTree.vue | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/components/customerOrg/ContactPerson.vue b/src/components/customerOrg/ContactPerson.vue index b8d33fa..b75653b 100644 --- a/src/components/customerOrg/ContactPerson.vue +++ b/src/components/customerOrg/ContactPerson.vue @@ -262,7 +262,11 @@ export default { this.customerOrg.contactMethodList.splice(index, 1); this.submit('form'); }).catch((err) => { - console.log(`deletapi:/api/app/contact-person/${this.personId}`,err); + if(err == 'cancel'){ + this.$message.info("已取消删除"); + }else{ + this.$message.error("操作失败，原因：" + err); + } }); }, @@ -297,7 +301,7 @@ export default { contactPersonId: this.personId, }); }); - return postapi("/api/app/contact-method/many", contactMethod); + if(contactMethod.length > 0) return postapi("/api/app/contact-method/many", contactMethod); }) .then((res) => { //console.log('api/app/contact-method/many') @@ -320,7 +324,7 @@ export default { contactPersonId: this.personId, }); }); - return postapi("/api/app/contact-method/many", contactMethod); + if(contactMethod.length > 0) return postapi("/api/app/contact-method/many", contactMethod); }) .then((res) => { //console.log('api/app/contact-method/many') diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue index 7dec6a4..7a8d922 100644 --- a/src/components/customerOrg/customerOrgTree.vue +++ b/src/components/customerOrg/customerOrgTree.vue @@ -1,10 +1,12 @@ - + diff --git a/src/store/index.js b/src/store/index.js index e1387fc..606749f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -30,9 +30,12 @@ export default new Vuex.Store({ customerOrg: { //体检单位设置 customerOrgTree: [], //体检单位列表 + defaultExpandedKeys:[], //当前选中树的节点 + treeCurrentNodekey:'', //当前选中树的节点 treeprops: { label: "displayName", value: "id", + id: "id", children: "treeChildren", }, //树形组件的数据结构 customerOrgId: "", //当前单位ID（可根据此值是否为空，判断是新增还是编辑） From bbf789d72ff10958c46484966b51ee7635f0c39e Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Thu, 12 Oct 2023 15:00:27 +0800 Subject: [PATCH 5/5] code --- src/components/customerOrg/customerOrgRegister.vue | 2 +- src/components/patientRegister/MergeAsbitem.vue | 2 +- src/components/patientRegister/PatientRegisterEdit.vue | 10 +++++----- src/components/patientRegister/PatientRegisterList.vue | 4 ++-- src/components/report/PatientRegisterListNobtn.vue | 4 ++-- src/views/basic-dictionary/GuideType.vue | 4 ++-- src/views/doctorCheck/personnelBatch.vue | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/customerOrg/customerOrgRegister.vue b/src/components/customerOrg/customerOrgRegister.vue index 857cdba..d445a78 100644 --- a/src/components/customerOrg/customerOrgRegister.vue +++ b/src/components/customerOrg/customerOrgRegister.vue @@ -122,7 +122,7 @@ export default { try { let result = await getapi(`/api/app/customer-org/parent/${this.customerOrg.customerOrgId}`) postapi(`/api/customerorgregister/createcustomerorgregister?CustomerOrgId=${result.data}`).then((res) => { - if (res.Code != -1) { + if (res.code != -1) { this.getCustomerOrgRegisterList(result.data); this.$message.success("操作成功！"); } diff --git a/src/components/patientRegister/MergeAsbitem.vue b/src/components/patientRegister/MergeAsbitem.vue index fa7ae36..40400d9 100644 --- a/src/components/patientRegister/MergeAsbitem.vue +++ b/src/components/patientRegister/MergeAsbitem.vue @@ -256,7 +256,7 @@ export default { postapi("/api/app/registerasbitem/mergeregisterasbitem", body).then( (res) => { - if (res.Code != -1) { + if (res.code != -1) { this.$message.success("操作成功！"); this.getAsbItemList(this.id); } diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue index 39a7f25..6846d7c 100644 --- a/src/components/patientRegister/PatientRegisterEdit.vue +++ b/src/components/patientRegister/PatientRegisterEdit.vue @@ -838,7 +838,7 @@ export default { this.$peisAPI.peopleIcCard().then(res => { //console.log('peopleIcCard',res) let lres = JSON.parse(res) - if (lres.Code && lres.Code.toLowerCase() == 'success') { + if (lres.code && lres.code.toLowerCase() == 'success') { this.projPriv.idNos = lres let idNos = parsIcCardtoLocal(this.projPriv.idNos, this.dict.sex, this.dict.nation) this.form.patientName = idNos.Name @@ -1184,7 +1184,7 @@ export default { console.log(res) //alert(res) let lres = JSON.parse(res) - if (lres.Code && lres.Code.toLowerCase() == 'success') { + if (lres.code && lres.code.toLowerCase() == 'success') { let uploadPhoto = { patientRegisterId: this.form.id, photo: lres.Photo, @@ -1192,7 +1192,7 @@ export default { this.patientRegister.photo = `data:image/${lres.PhotoFormat};base64,${lres.Photo}` return postapi(`/api/app/patient-register/up-load-img`, uploadPhoto) } else { - this.$message.error("上传照片错误" + lres.Code) + this.$message.error("上传照片错误" + lres.code) } }).then(res => { if (res.code == 1) { @@ -1303,13 +1303,13 @@ export default { } catch (error) { return; } - if (res.Code != -1) { + if (res.code != -1) { this.$message.info("发送检验申请成功！"); isPrintLisRequest = true; } //重复申请，重打 - if (res.Code == -1 && res.Message.indexOf('已申请') > -1) { + if (res.code == -1 && res.message.indexOf('已申请') > -1) { isPrintLisRequest = true; } diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue index 3712d8a..c5b8253 100644 --- a/src/components/patientRegister/PatientRegisterList.vue +++ b/src/components/patientRegister/PatientRegisterList.vue @@ -1095,13 +1095,13 @@ export default { } catch (error) { return; } - if (res.Code != -1) { + if (res.code != -1) { this.$message.info("发送检验申请成功！"); isPrintLisRequest = true; } //重复申请，重打 - if (res.Code == -1 && res.Message.indexOf('已申请') > -1) { + if (res.code == -1 && res.message.indexOf('已申请') > -1) { isPrintLisRequest = true; } diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue index c60ed0a..669df44 100644 --- a/src/components/report/PatientRegisterListNobtn.vue +++ b/src/components/report/PatientRegisterListNobtn.vue @@ -801,13 +801,13 @@ export default { } catch (error) { return; } - if (res.Code != -1) { + if (res.code != -1) { this.$message.info("发送检验申请成功！"); isPrintLisRequest = true; } //重复申请，重打 - if (res.Code == -1 && res.Message.indexOf('已申请') > -1) { + if (res.code == -1 && res.message.indexOf('已申请') > -1) { isPrintLisRequest = true; } diff --git a/src/views/basic-dictionary/GuideType.vue b/src/views/basic-dictionary/GuideType.vue index a13988b..02bd58e 100644 --- a/src/views/basic-dictionary/GuideType.vue +++ b/src/views/basic-dictionary/GuideType.vue @@ -813,8 +813,8 @@ export default { type: "warning", }).then(() => { deletion(this.form.id).then((res) => { - if (res.Code == -1) { - // this.$message.warning(res.Message); + if (res.code == -1) { + // this.$message.warning(res.message); } else { console.log(res); this.$message.success("删除成功"); diff --git a/src/views/doctorCheck/personnelBatch.vue b/src/views/doctorCheck/personnelBatch.vue index 5c89e7d..9f172fa 100644 --- a/src/views/doctorCheck/personnelBatch.vue +++ b/src/views/doctorCheck/personnelBatch.vue @@ -307,8 +307,8 @@ export default { cancelButtonText: "取消", type: "warning", }).then((res) => { - // let targettitle = res.Message; - this.$message.warning(res.Message); + // let targettitle = res.message; + this.$message.warning(res.message); }); } });