From 0ca4f4acf3cacaf6e2a4e97f139e48e51c838359 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 30 Aug 2022 19:29:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E5=A4=8D=E4=B8=A4?=
 =?UTF-8?q?=E7=B1=BB=E8=AF=81=E7=85=A7=E4=B8=8D=E8=83=BD=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file-category/file-category.component.ts  |  5 +-
 .../update-category.component.ts              |  3 +-
 .../organization/organization.component.ts    |  3 +-
 src/styles.scss                               | 53 +++++++++++++++++++
 4 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/license/file-category/file-category.component.ts b/src/app/pages/license/file-category/file-category.component.ts
index 47e9958..389c510 100644
--- a/src/app/pages/license/file-category/file-category.component.ts
+++ b/src/app/pages/license/file-category/file-category.component.ts
@@ -132,16 +132,17 @@ export class FileCategoryComponent implements OnInit {
           return false;
         }
         instance.data2.validatyType = Number(instance.validatyType)
-        if (instance.data2.imageUrl.indexOf('http') == -1) {
+        if (instance.data2.imageUrl && instance.data2.imageUrl.indexOf('http') == -1) {
           let newUrl = window.location.protocol + '//' + window.location.host + instance.data2.imageUrl
           instance.data2.imageUrl = newUrl
         }
+
         if (!instance.isSubmit) {
           this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => {
             this.getStationList();
             this.message.create('success', '修改成功！');
           })
-          return false;
+          return true;
         } else {
           await new Promise(resolve => {
             this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => {
diff --git a/src/app/pages/license/update-category/update-category.component.ts b/src/app/pages/license/update-category/update-category.component.ts
index da0c0d4..6807fa7 100644
--- a/src/app/pages/license/update-category/update-category.component.ts
+++ b/src/app/pages/license/update-category/update-category.component.ts
@@ -115,6 +115,7 @@ export class UpdateCategoryComponent implements OnInit {
   }
 
   edit(item) {
+    console.log(item)
     if (item.auditStatus === 1) {
       this.message.create('warning', '审核中不允许编辑！');
       return
@@ -163,7 +164,7 @@ export class UpdateCategoryComponent implements OnInit {
             body.attachment = newUrl
           }
 
-          if (body.isYearlyCheck && !body.yearlyCheckDescription) {
+          if (body.isYearlyCheck && !body.yearlyCheckDescription && body.lastLicenseAuditType == 1) {
             this.message.create('warning', '请填写年检更新说明！');
             return false
           }
diff --git a/src/app/system-management/organization/organization.component.ts b/src/app/system-management/organization/organization.component.ts
index facc357..1a2208b 100644
--- a/src/app/system-management/organization/organization.component.ts
+++ b/src/app/system-management/organization/organization.component.ts
@@ -60,8 +60,7 @@ export class OrganizationComponent implements OnInit {
       });
       this.allOrList = data.result.items
       this.nodes = [...this.toTree.toTree(data.result.items)]
-      this.defaultExpandedKeys = [this.nodes[0].id]
-      this.defaultExpandedKeys = [...this.defaultExpandedKeys]
+      this.defaultExpandedKeys.length == 0 ? this.defaultExpandedKeys = [this.nodes[0].id] : this.defaultExpandedKeys = [...this.defaultExpandedKeys]
       console.log(this.nodes)
     })
   }
diff --git a/src/styles.scss b/src/styles.scss
index 11ae818..f758638 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -188,4 +188,57 @@ h1 {
   }
 }
 
+#container {
+  flex: 1;
+  position: relative;
+  height: 46px;
+  overflow: hidden;
+}
+
+#list-wrapper {
+  position: relative;
+}
+
+ul {
+  list-style: none;
+}
+
+.info {
+  flex: 1;
+  display: flex;
+  height: 46px;
+  line-height: 46px;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .infoitem {
+    flex: 1;
+    display: flex;
+    align-items: center;
+
+    img {
+      width: 40px;
+    }
 
+    color: #fff;
+  }
+
+  .btn {
+    color: #36A2FF;
+
+    span {
+      cursor: pointer;
+    }
+
+    span:nth-child(1) {
+      margin-right: 24px;
+    }
+
+    span:nth-child(2) {
+      margin-right: 40px;
+    }
+  }
+
+}