From 24036df22ab65c5719d82de8eebccb69f02ff364 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Wed, 12 Jun 2024 00:14:43 +0800 Subject: [PATCH] dj --- public/sysConfig.json | 3 +- .../patientRegister/ImportOrgData.vue | 105 ++++++++++++------ .../patientRegister/PatientRegisterList.vue | 2 +- src/views/Home.vue | 16 ++- src/views/login/Login.vue | 19 ++-- 5 files changed, 94 insertions(+), 51 deletions(-) diff --git a/public/sysConfig.json b/public/sysConfig.json index b84432d..3f20f28 100644 --- a/public/sysConfig.json +++ b/public/sysConfig.json @@ -1,3 +1,4 @@ { - "apiurl": "http://10.1.12.140:9529" + "apiurl": "http://10.1.12.140:9529", + "softName":"创业体检管理系统" } \ No newline at end of file diff --git a/src/components/patientRegister/ImportOrgData.vue b/src/components/patientRegister/ImportOrgData.vue index 27f508f..65f2602 100644 --- a/src/components/patientRegister/ImportOrgData.vue +++ b/src/components/patientRegister/ImportOrgData.vue @@ -13,26 +13,49 @@
单位体检次数： - - + +
开始导入
-
- - - - - - - - - +
+
+
+ 导入成功数： +
{{ importState.importSuccessNum }}
+
+
+ 导入错误数： +
{{ importState.importErrorNum }}
+
+
+
+
+
+ 删除成功数： +
{{ importState.deleteSuccessNum }}
+
+
+ 删除错误数： +
{{ importState.deleteErrorNum }}
+
+
+
+
+ 导入错误信息： + +
+
+ 删除错误信息： + +
@@ -67,7 +90,14 @@ export default { customerOrgId: "", //当前选中的体检单位id customerOrgRegisterList: [], //体检次数列表 customerOrgRegisterId: '', //体检次数 - + importState: { + importSuccessNum: "", + importErrorNum: "", + deleteSuccessNum: "", + deleteErrorNum: "", + importErrorMessages: "", + deleteErrorMessages: "" + }, }; }, computed: { @@ -90,10 +120,6 @@ export default { dddw, deepCopy, - - - - //选中颜色 handleRowClassName({ row, rowIndex }) { // highLightBg 为 'selected'的高亮 @@ -142,13 +168,7 @@ export default { changeCustomerOrg(v) { if (!v) { this.customerOrgRegisterList = []; - this.customerOrgRegister = {}; - this.customerOrgGroups = []; - this.isDrag = false; - this.form.id = ""; - setTimeout(() => { - this.dataTransOpts.refresh.customer_org_group_detail.M++; - }, 20); + this.customerOrgRegisterId = ""; return; } getapi( @@ -157,32 +177,30 @@ export default { if (res.code != -1) { this.customerOrgRegisterList = res.data; if (res.data.length > 0) { - this.customerOrgRegister = res.data[res.data.length - 1]; - this.getCustomerOrgGroup(this.customerOrgRegister.id); + this.customerOrgRegisterId = res.data[res.data.length - 1].id; } else { - this.customerOrgRegister = {}; - this.customerOrgGroups = []; - this.isDrag = false; + this.customerOrgRegisterId = ''; } } }); }, - //选择体检次数 - changeTimes(v) { - this.getCustomerOrgGroup(v.id); - }, // 开始导入 btnImport() { + if (!this.customerOrgRegisterId) { + this.$message.warning({ showClose: true, message: '请选择体检次数' }) + return + } + let body = { customerOrgRegisterId: this.customerOrgRegisterId } postapi('/api/app/patientregister/CreatePatientRegisterFromCustomerOrgInterface', body) .then(res => { - if (res.code > -1) { - // + if (res.code > -1 && res.data) { + this.importState = res.data } }) }, @@ -193,6 +211,19 @@ export default { }, }, + //监听事件() + watch: { + "dataTransOpts.plus.ImportOrgData": { + // immediate:true, + handler(newVal, oldVal) { + //console.log(`watch 职业病 newVal: ${newVal}, oldVal: ${oldVal} `); + if (newVal != oldVal) { + this.importState = {} + } + } + }, + + }, };