icon

src/pages/report/outGoingReport/outGoingReport.html

@@ -4,7 +4,7 @@
     </ion-navbar>
 </ion-header>
 
-<ion-content scrollbar-y="true" direction="y">
+<ion-content scrollbar-y="true" direction="y" class="bgc-e7e8ed">
   <ion-refresher (ionRefresh)="doRefresh($event)">
     <ion-refresher-content pullingIcon="arrow-dropdown" pullingText="Pull to refresh" refreshingSpinner="circles" refreshingText="正在刷新！">
     </ion-refresher-content>
@@ -44,10 +44,13 @@
         </ion-item>
 
         <ion-item *ngIf="item.isOverTimeFlag">
-          <div class="content-box" (click)="goDetail(item)">
+        <div class="content-box" (click)="goDetail(item)">
               <div class="content-item-box">
                 <label class="left-title">发布科室：</label>
-                <div class="data">{{item.fbDept}}</div>
+                <span class="data">{{item.fbDept}}</span>
+                  <span float-right class="item-span color-24bafc" (click)="goReport(item); $event.stopPropagation()" *ngIf="!item.reported  && !item.isOverTimeFlag">报备</span>
+                  <span float-right class="item-span color-24bafc" (click)="goReport(item); $event.stopPropagation()" *ngIf="item.reported  && !item.isOverTimeFlag">修改报备</span>
+                  <span float-right class="item-span color-24bafc" (click)="goDetail(item); $event.stopPropagation()" *ngIf="item.isOverTimeFlag">查看详情 > </span>
               </div>
               <div class="content-item-box">
                 <label class="left-title">报备截止：</label>
@@ -62,10 +65,7 @@
             </div>
       </ion-item>
 
-        <button class="sign-up" (click)="goReport(item); $event.stopPropagation()" *ngIf="!item.reported  && !item.isOverTimeFlag">报备</button>
-        <button class="sign-up" (click)="goReport(item); $event.stopPropagation()" *ngIf="item.reported  && !item.isOverTimeFlag">修改报备</button>
 
-        <button class="sign-up" (click)="goDetail(item); $event.stopPropagation()" *ngIf="item.isOverTimeFlag">查看详情</button>
 
       </div>
     </ion-item>

src/pages/report/outGoingReport/outGoingReport.scss

@@ -13,6 +13,9 @@ page-outGoingReport {
         align-items: center;
         justify-content: space-between;
         box-sizing: border-box;
+        font-size: 2rem;
+        padding: 10px 0;
+        border-bottom: 1px solid #ddd;
     }
 
     .item-header-style{
@@ -44,33 +47,23 @@ page-outGoingReport {
     .btn1{
         border: 1px solid #69c4e2;
         color: #69c4e2;
+        border-radius: 3px;
     }
 
     .btn2{
         border: 1px solid #90da91;
         color: #90da91;
+        border-radius: 3px;
     }
 
-    // .item-content{
-    //     display: flex;
-    //     flex-direction: row;
-    //     align-items: flex-end;
-    //     justify-content: space-between;
-    //     box-sizing: border-box;
-    // }
-
-    // .left{
-    //     color: #cccccc;
-    //     font-size: 8px;
-    //     // height: 70px;
-    //     display: inline-block;
-    //     margin-left: 20px;
-    // }
+    .list-ios > .item-block{
+        margin-bottom: 10px;
+    }
+    .list-ios .item-block .item-inner{
+        border: none;
+    }
 
     .content-box{
-        margin-left: 25px;
-        margin-top: 15px;
-        margin-bottom: 15px;
         padding-bottom: 15px;
         border-bottom: 1px solid #f1f2f3;
     }
@@ -81,11 +74,19 @@ page-outGoingReport {
         align-items: flex-start;
         justify-content: left;
         box-sizing: border-box;
+        margin: 5px 0;
+        font-size: 1.5rem;
+        position: relative;
+        .item-span{
+            position: absolute;
+            right: 0;
+            top: 0;
+            font-size: 1.4rem;
+        }
     }
 
     .left-title{
-        color: #8b8c8d;
-        font-size: 14px;
+        font-size: 1.5rem;
     }
 
     .data{

src/pages/report/outGoingReportDetail/outGoingReportDetail.html

@@ -52,8 +52,8 @@
     </ion-item>
 
     <ion-item>
-      <div>离沪说明</div>
-      <textarea class="description" placeholder="请输入" [(ngModel)]="temp_userpre.managerDesc"></textarea>
+      <ion-label style="font-size: 1.7rem" stacked>离沪说明</ion-label>
+      <ion-textarea placeholder="请输入" [(ngModel)]="temp_userpre.managerDesc"></ion-textarea>
     </ion-item>
   </ion-list>
   <button ion-button block class="save" (click)="saveFieldValue()">保存</button>

src/pages/report/outGoingReportDetail/outGoingReportDetail.scss

@@ -6,7 +6,21 @@ page-outGoingReportDetail {
         justify-content: left;
         box-sizing: border-box;
     }
-    
+    .item-ios{
+        padding-left: 0px;
+    }
+    .list-ios .item-block .item-inner{
+        padding-left: 16px;
+    }
+    .list-ios > .item-block:last-child, .list-ios > .item-wrapper:last-child .item-block{
+        border:none;
+    }
+    .label-ios + ion-textarea .text-input{
+        padding: 10px;
+        min-height: 100px;
+        border: 1px solid #ddd;
+        border-radius: 4px;
+    }
     .report-item{
         display: flex;
         flex-direction: row;

src/pages/report/reportTrack/reportTrack.html

@@ -3,7 +3,7 @@
 		<ion-title text-center>报备跟踪</ion-title>
 	</ion-navbar>
 </ion-header>
-<ion-content>
+<ion-content class="bgc-e7e8ed">
 	<ion-list>
 		<ion-item *ngFor="let item of all" (click)="goDetail(item.id,item.title)">
 			<div class="item">

src/pages/report/reportTrack/reportTrack.scss

 page-ReportTrack {
-  
+
+    .list-ios > .item-block{
+        margin-bottom: 10px;
+    }
+    .list-ios .item-block .item-inner{
+        border: none;
+    }
 
     .searchToolBar{
         display: flex;
@@ -32,6 +38,7 @@ page-ReportTrack {
         color: #90da91;
         margin: 0 0;
         font-size: 6px;
+        border-radius: 3px;
     }
 
     .left{

src/pages/tabs/home/home.html

@@ -40,7 +40,7 @@
         <img src="./assets/imgs/home/icon-hdgz.png" alt="">
         <label class="label2-2">活动跟踪</label>
       </div>
-      <div class="card"  (click)="wait()">
+      <div class="card"  (click)="goReportTrack()">
         <img src="./assets/imgs/home/icon-bbgz.png" alt="">
         <label class="label2-2">报备跟踪</label>
       </div>

src/pages/tabs/home/home.ts

@@ -15,6 +15,7 @@ import { Storage } from '@ionic/storage';
 import { OutGoingReportEditPage } from '../../report/outGoingReportEdit/outGoingReportEdit';
 import { AnnouncementViewPage } from '../../announcementView/announcementView';
 import {MoreAppPage} from "../../home/more-app/more-app";
+import {ReportTrackPage} from "../../report/reportTrack/reportTrack";
 
 @IonicPage()
 @Component({
@@ -190,6 +191,11 @@ export class HomePage {
         this.navCtrl.push("ActivityTrackPage");
     }
 
+    //报备跟踪
+    goReportTrack(){
+        this.navCtrl.push("ReportTrackPage");
+    }
+
   wait() {
     this.isWait = true;
   }