From 71dc7f155a8a0c7bdf5dce4d36edc8d88299f674 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Wed, 12 Jun 2024 19:10:13 +0800
Subject: [PATCH] import

---
 .../patientRegister/ImportOrgData.vue         | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/patientRegister/ImportOrgData.vue b/src/components/patientRegister/ImportOrgData.vue
index 65f2602..3c46d94 100644
--- a/src/components/patientRegister/ImportOrgData.vue
+++ b/src/components/patientRegister/ImportOrgData.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="font-size: 14px">
-    <div style="display: flex">
+    <div style="display: flex">      
       <div>
         <span>体检单位：</span>
         <el-select v-model="customerOrgId" placeholder="请选择体检单位" :filter-method="filterMethod" default-first-option
@@ -25,22 +25,22 @@
     </div>
     <div style="margin-top: 15px; height: 240px;overflow-y: auto;">
       <div style="display: flex;justify-content: space-between;">
-        <div>
+        <div style="display: flex">
           <span>导入成功数：</span>
           <div>{{ importState.importSuccessNum }}</div>
         </div>
-        <div>
+        <div style="display: flex">
           <span>导入错误数：</span>
           <div>{{ importState.importErrorNum }}</div>
         </div>
         <div></div>
       </div>
       <div style="margin-top: 5px; display: flex;justify-content: space-between;">
-        <div>
+        <div style="display: flex">
           <span>删除成功数：</span>
           <div>{{ importState.deleteSuccessNum }}</div>
         </div>
-        <div>
+        <div style="display: flex">
           <span>删除错误数：</span>
           <div>{{ importState.deleteErrorNum }}</div>
         </div>
@@ -91,10 +91,10 @@ export default {
       customerOrgRegisterList: [], //体检次数列表
       customerOrgRegisterId: '', //体检次数
       importState: {
-        importSuccessNum: "",
-        importErrorNum: "",
-        deleteSuccessNum: "",
-        deleteErrorNum: "",
+        importSuccessNum: null,
+        importErrorNum: null,
+        deleteSuccessNum: null,
+        deleteErrorNum: null,
         importErrorMessages: "",
         deleteErrorMessages: ""
       },
@@ -168,7 +168,7 @@ export default {
     changeCustomerOrg(v) {
       if (!v) {
         this.customerOrgRegisterList = [];
-        this.customerOrgRegisterId = ""; 
+        this.customerOrgRegisterId = "";
         return;
       }
       getapi(
@@ -200,7 +200,8 @@ export default {
       postapi('/api/app/patientregister/CreatePatientRegisterFromCustomerOrgInterface', body)
         .then(res => {
           if (res.code > -1 && res.data) {
-            this.importState = res.data
+            Object.assign(this.importState,res.data,{importErrorMessages: `${res.data.importErrorMessages}`,
+            deleteErrorMessages: `${res.data.deleteErrorMessages}`})
           }
         })
     },
@@ -218,7 +219,14 @@ export default {
       handler(newVal, oldVal) {
         //console.log(`watch 职业病 newVal: ${newVal}, oldVal: ${oldVal} `);
         if (newVal != oldVal) {
-          this.importState = {}
+          this.importState = {
+            importSuccessNum: null,
+            importErrorNum: null,
+            deleteSuccessNum: null,
+            deleteErrorNum: null,
+            importErrorMessages: "",
+            deleteErrorMessages: ""
+          }
         }
       }
     },