From 98ef002f858b59dc0aeaa504d12fbe1c7f49bfb2 Mon Sep 17 00:00:00 2001
From: mch <1332099529@qq.com>
Date: Wed, 26 Jul 2023 09:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic-dictionary/CommonChar.vue     |  2 +-
 src/views/basic-dictionary/CommonCharType.vue |  2 +-
 .../basic-dictionary/CustomerOrgType.vue      |  2 +-
 src/views/basic-dictionary/DeviceType.vue     |  2 +-
 .../basic-dictionary/MedicalConclusion.vue    |  2 +-
 src/views/basic-dictionary/MedicalType.vue    |  2 +-
 src/views/basic-dictionary/PersonnelType.vue  |  2 +-
 src/views/basic-dictionary/SampleType.vue     |  2 +-
 src/views/basic-dictionary/Unit.vue           | 37 +++++++++----------
 src/views/common-settings/SampleGroup.vue     |  2 +-
 src/views/user-list/OrganizationUnits.vue     |  9 ++++-
 src/views/user-list/UserList.vue              |  2 +-
 12 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/views/basic-dictionary/CommonChar.vue b/src/views/basic-dictionary/CommonChar.vue
index a1a7b7d..bd6127d 100644
--- a/src/views/basic-dictionary/CommonChar.vue
+++ b/src/views/basic-dictionary/CommonChar.vue
@@ -146,7 +146,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <el-button
         type="primary"
diff --git a/src/views/basic-dictionary/CommonCharType.vue b/src/views/basic-dictionary/CommonCharType.vue
index 30d9c6f..e931800 100644
--- a/src/views/basic-dictionary/CommonCharType.vue
+++ b/src/views/basic-dictionary/CommonCharType.vue
@@ -134,7 +134,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <el-button
         type="primary"
diff --git a/src/views/basic-dictionary/CustomerOrgType.vue b/src/views/basic-dictionary/CustomerOrgType.vue
index 8c36d72..c86c55b 100644
--- a/src/views/basic-dictionary/CustomerOrgType.vue
+++ b/src/views/basic-dictionary/CustomerOrgType.vue
@@ -136,7 +136,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <el-button
         type="primary"
diff --git a/src/views/basic-dictionary/DeviceType.vue b/src/views/basic-dictionary/DeviceType.vue
index d1cc395..482f151 100644
--- a/src/views/basic-dictionary/DeviceType.vue
+++ b/src/views/basic-dictionary/DeviceType.vue
@@ -166,7 +166,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="editpopup">编辑</el-button>
diff --git a/src/views/basic-dictionary/MedicalConclusion.vue b/src/views/basic-dictionary/MedicalConclusion.vue
index 51aef25..e223af8 100644
--- a/src/views/basic-dictionary/MedicalConclusion.vue
+++ b/src/views/basic-dictionary/MedicalConclusion.vue
@@ -91,7 +91,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 9%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <el-button
         type="primary"
diff --git a/src/views/basic-dictionary/MedicalType.vue b/src/views/basic-dictionary/MedicalType.vue
index b93bf4a..75d6788 100644
--- a/src/views/basic-dictionary/MedicalType.vue
+++ b/src/views/basic-dictionary/MedicalType.vue
@@ -131,7 +131,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="edlits">编辑</el-button>
diff --git a/src/views/basic-dictionary/PersonnelType.vue b/src/views/basic-dictionary/PersonnelType.vue
index 485b330..2492857 100644
--- a/src/views/basic-dictionary/PersonnelType.vue
+++ b/src/views/basic-dictionary/PersonnelType.vue
@@ -129,7 +129,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="edlits">编辑</el-button>
diff --git a/src/views/basic-dictionary/SampleType.vue b/src/views/basic-dictionary/SampleType.vue
index d3a765f..0f722f1 100644
--- a/src/views/basic-dictionary/SampleType.vue
+++ b/src/views/basic-dictionary/SampleType.vue
@@ -129,7 +129,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="editpopup">编辑</el-button>
diff --git a/src/views/basic-dictionary/Unit.vue b/src/views/basic-dictionary/Unit.vue
index 87e3702..66e3131 100644
--- a/src/views/basic-dictionary/Unit.vue
+++ b/src/views/basic-dictionary/Unit.vue
@@ -152,7 +152,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px; margin-top: 10%">
+    <div style="margin-left: 10px; margin-top: 7%">
       <el-button type="primary" @click="add">新增</el-button>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="editpopup">编辑</el-button>
@@ -356,28 +356,25 @@ export default {
     },
     //确定新增或者编辑
     addoredit() {
-      if(this.form.displayName==undefined){
-        this.$message.warning('请输入名称')
-      }else{
-
-     
-      if (this.title == 1) {
-        addunit({ displayName: this.form.displayName }).then((res) => {
-          this.$message.success("新增成功");
-          this.getlist();
-          this.dialogVisible = false;
-        });
-      } else if (this.title == 2) {
-        editunit(this.form.id, { displayName: this.form.displayName }).then(
-          (res) => {
-            this.$message.success("修改成功");
+      if (this.form.displayName == undefined) {
+        this.$message.warning("请输入名称");
+      } else {
+        if (this.title == 1) {
+          addunit({ displayName: this.form.displayName }).then((res) => {
+            this.$message.success("新增成功");
             this.getlist();
             this.dialogVisible = false;
-          }
-        );
-         }
+          });
+        } else if (this.title == 2) {
+          editunit(this.form.id, { displayName: this.form.displayName }).then(
+            (res) => {
+              this.$message.success("修改成功");
+              this.getlist();
+              this.dialogVisible = false;
+            }
+          );
+        }
       }
-      
     },
     //新增弹框
     add() {
diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue
index 25eb623..93e9378 100644
--- a/src/views/common-settings/SampleGroup.vue
+++ b/src/views/common-settings/SampleGroup.vue
@@ -236,7 +236,7 @@
       </el-card>
     </div>
     <!-- 按钮区域 -->
-    <div style="margin-left: 10px">
+    <div style="margin-left: 10px;margin-top:4rem">
       <el-button type="primary" @click="addll">新增</el-button>
       <div style="margin-top: 10px">
         <el-button type="primary" @click="editreport">编辑</el-button>
diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue
index 20399ff..b1098e3 100644
--- a/src/views/user-list/OrganizationUnits.vue
+++ b/src/views/user-list/OrganizationUnits.vue
@@ -72,6 +72,7 @@
         :title="title == 1 ? '新增组织' : '修改组织'"
         :visible.sync="dialogVisible"
         width="50%"
+        @close="closethiebox"
       >
         <el-row>
           <el-col :span="8">
@@ -128,6 +129,10 @@ export default {
     this.getonorganization();
   },
   methods: {
+    //close弹框关闭事件
+    closethiebox(){
+      
+    },
     //关闭弹框
     closethebulletbox() {
       this.dialogVisible = false;
@@ -144,7 +149,7 @@ export default {
           }).then((res) => {
             this.$message.success("新增成功");
             this.dialogVisible = false;
-            this.form = {};
+            // this.form = {};
             this.getonorganization();
           });
         }
@@ -198,6 +203,7 @@ export default {
       this.dialogVisible = true;
       this.title = 1;
       console.log(this.form);
+      this.form.displayName=''
     },
     //新增组织组织
     append(node, data) {
@@ -207,6 +213,7 @@ export default {
         this.form.parentId = data.id;
         this.form.displayName = "";
         console.log(this.form.parentId);
+       
       }
 
       // if(this.natureoptions)
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index d7c50c6..3995409 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -726,7 +726,7 @@ export default {
                     orgId: this.defaultKeys,
                   }).then((res) => {
                     console.log(res);
-                    this.$message.success("修改绑定组织成功");
+                    // this.$message.success("修改绑定组织成功");
                   });
 
                   console.log("aaaaaa");