From 2f61787f72de02d61bd636ce2c88aa5ad2cdaf1b Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Tue, 30 Aug 2022 10:00:20 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=A1=E7=89=87=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/home/nav/nav.component.html           |  2 +-
 .../station-weekly-plan.component.ts          |  1 +
 .../task-details/task-details.component.html  | 15 +++++-
 .../task-details/task-details.component.scss  | 53 +++++++++++++------
 4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/src/app/home/nav/nav.component.html b/src/app/home/nav/nav.component.html
index 37515db..b89b2e5 100644
--- a/src/app/home/nav/nav.component.html
+++ b/src/app/home/nav/nav.component.html
@@ -19,7 +19,7 @@
             </li>
         </ul>
         <div class="headerbtn">
-            <div>欢迎,{{user}}</div>
+            <div>欢迎 , {{user}}</div>
             <a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzBackdrop]='false'>
                 <i nz-icon nzType="setting"></i>
             </a>
diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts
index 619415b..990088e 100644
--- a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts
+++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts
@@ -534,6 +534,7 @@ export class StationWeeklyPlanComponent implements OnInit {
     }
     this.http.post('/api/PlanTasks/ApprovalMany', null, { params: params }).subscribe({
       next: (data: any) => {
+        this.getTaskListPass(this.stationData[0])
         this.message.create('success', '发布成功');
       },
       error: (err) => {
diff --git a/src/app/home/task/station-weekly-plan/task-details/task-details.component.html b/src/app/home/task/station-weekly-plan/task-details/task-details.component.html
index 2113b00..e44e517 100644
--- a/src/app/home/task/station-weekly-plan/task-details/task-details.component.html
+++ b/src/app/home/task/station-weekly-plan/task-details/task-details.component.html
@@ -2,7 +2,20 @@
     <div class="list">
         <div class="item" *ngFor="let item of data.data">
             <div class="text">
-                {{item.company.companyName}}
+                <p>单位名称 : {{item.company.companyName}}</p>
+                <p>单位级别 : {{item.company.useNature}}</p>
+                <p>主负责人 : {{item.organization.name}}</p>
+                <p>协助人员 :
+                    <span class="assistant">
+                        <span *ngFor="let o of item.supervisors">
+                            <img *ngIf="o.posts && o.posts[0] == '主查人员'" src="../../../../assets/images/icon/main.png"
+                                alt="">
+                            <img *ngIf="o.posts && o.posts[0] == '协查人员'" src="../../../../assets/images/icon/assist.png"
+                                alt="">
+                            {{o.name}}
+                        </span>
+                    </span>
+                </p>
             </div>
             <div class="state">
                 <span class="green" (click)="accept(item)">接受</span>
diff --git a/src/app/home/task/station-weekly-plan/task-details/task-details.component.scss b/src/app/home/task/station-weekly-plan/task-details/task-details.component.scss
index 8b9f9fb..f894b12 100644
--- a/src/app/home/task/station-weekly-plan/task-details/task-details.component.scss
+++ b/src/app/home/task/station-weekly-plan/task-details/task-details.component.scss
@@ -1,20 +1,39 @@
-.list{
-    margin-top: -10px;
-    max-height: 600px;
-    padding: 0 5px;
-    overflow: auto;
-    .item{
-        display: flex;
-        border-bottom: 1px dotted #C7CAD0;
-        height: 50px;
-        line-height: 50px;
-        .text{
-            flex: 1;
+.list {
+  margin-top: -10px;
+  max-height: 600px;
+  padding: 0 5px;
+  overflow: auto;
+
+  .item {
+    display: flex;
+    border-bottom: 1px dotted #C7CAD0;
+    margin-bottom: 10px;
+    .text {
+      flex: 1;
+
+      .assistant {
+
+        span {
+          color: #303133;
+          margin-right: 6px;
         }
-        .state{
-            span{
-                margin-left: 8px;
-            }
+
+        img {
+          width: 16px;
+          height: 16px;
+          vertical-align: text-bottom;
         }
+        text-align: left;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
-}
\ No newline at end of file
+
+    .state {
+      span {
+        margin-left: 8px;
+      }
+    }
+  }
+}