From 7dcba20f5b31cab2dbb3a7c018cabcc81bccc4f9 Mon Sep 17 00:00:00 2001
From: chenjingyu <bobsun@hotmail.com>
Date: Mon, 5 Jul 2021 16:12:04 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=8D=95=E4=BD=8D=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=8E=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create-plan-online-five.component.html    |  18 +++++++----
 .../create-plan-online-five.component.scss    |  28 ++++++++++++++++--
 .../create-plan-online-five.component.ts      |  20 ++++++++-----
 .../entry-plan-look/AddPlanone.html           |   4 +--
 .../plan-template/plan-template.component.ts  |  25 ++++++++++------
 src/assets/images/olddata.png                 | Bin 0 -> 669 bytes
 6 files changed, 70 insertions(+), 25 deletions(-)
 create mode 100644 src/assets/images/olddata.png

diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
index 18feb39..2f12409 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html
@@ -708,8 +708,10 @@
                                             <div class="building" *ngIf="element.surveyName=='单位基本信息'">
                                                 <div *ngFor="let info of element.attinf">
                                                     <div *ngIf="info.completed" class="onetext">
-                                                        <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly *ngIf="pattern == 'edit'">
-                                                        <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'">
+                                                        <input type="text" placeholder="请输入内容" style="width: 30%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly *ngIf="pattern == 'edit'">
+                                                        <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'">
+                                                       <!--  <input type="text"  style="width: 30%;background-color: #FFFFFF;color: #999;" [(ngModel)]="info.olddata" *ngIf="pattern == 'edit'&&oldData" readonly> -->
+                                                       <span style="width: 30%;background-color: #FFFFFF;color: #999;" *ngIf="pattern == 'edit'&&oldData">{{info.olddata||'无原数据'}}</span>
                                                         <table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
                                                             <tr>
                                                                 <th style="border: 1px solid #999;
@@ -730,8 +732,10 @@
                                             <div class="building" *ngIf="element.surveyName=='建筑信息'">
                                                 <div *ngFor="let info of element.attinf">
                                                     <div *ngIf="info.completed" class="onetext">
-                                                        <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly *ngIf="pattern == 'edit'">
-                                                        <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="info.propertyValue" *ngIf="pattern == 'edit'">
+                                                        <input type="text" placeholder="请输入内容" style="width: 30%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly *ngIf="pattern == 'edit'">
+                                                        <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #FFFFFF;" [(ngModel)]="info.propertyValue" *ngIf="pattern == 'edit'">
+                                                        <!-- <input type="text"  style="width: 30%;background-color: #FFFFFF;color: #999;" [(ngModel)]="info.olddata" *ngIf="pattern == 'edit'&&oldData" readonly> -->
+                                                        <span style="width: 30%;background-color: #FFFFFF;color: #999;" *ngIf="pattern == 'edit'&&oldData">{{info.olddata||'无原数据'}}</span>
                                                         <table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
                                                             <tr>
                                                                 <th style="border: 1px solid #999;
@@ -955,12 +959,16 @@
                                 </div>
                             </div>
                         </div>
-
+                        <div class="oldData" *ngIf="pattern == 'edit'" (click)='clickoldData()'>
+                            <img src="../../../assets/images/olddata.png">
+                            <span>原数据</span>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
 
+        
         <div class="toolDiv" *ngIf="pattern == 'look'">
             <button title="下载文档" mat-mini-fab color="primary" (click)="generatingDoc()">
                 <mat-icon>vertical_align_bottom</mat-icon>
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
index ff7d07c..d851806 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
@@ -641,7 +641,7 @@
                                 height: 40px;
                                 width: 40%;
                                 font-size: 16px;
-                                background-color: #e8e9e9;
+                                background-color: #F2F4F5;
                             }
                             input{
                                 height: 40px;
@@ -649,7 +649,7 @@
                                 font-size: 16px;
                                 border: none;
                                 outline: none;
-                                
+                                border-bottom: 1px solid #F2F4F5;
                             }
                             img{
                                 height: 20px;
@@ -853,6 +853,30 @@
                 margin: 5px 0;
             }
         }
+        .oldData{
+            width: 100px;
+            height: 36px;
+            background-color: #FFFFFF;
+            border-radius: 0px 60px 60px 0px;
+            position: fixed;
+            right: 25.3%;
+            top: 120px;
+            display: flex;
+            cursor: pointer;
+            span{
+                color: #2196f3;
+                font-size: 16px;
+                line-height: 36px;
+                margin-left: 5px;
+            }
+            img{
+                width: 18px;
+                height: 15px;
+                position: relative;
+                top: 10px;
+                left: 5px;
+            }
+        }
     }
     .noPadding{
         padding-top: 10px;
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
index 74d2a44..8057c74 100644
--- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
+++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-06-16 13:56:54
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-07-02 14:28:59
+ * @LastEditTime: 2021-07-05 15:36:30
  */
 import { HttpClient } from '@angular/common/http';
 import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core';
@@ -78,13 +78,14 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
       this.getRealPicture()
     } else if (this.selectedItem == '单位概况') {
       this.getAllBuildings()
+      
+      this.planTemplateData[1].attribute[0].attinf[0].value=this.planTemplateData[1].attribute[0].attinf[0].olddata = this.unitData.usci
+      this.planTemplateData[1].attribute[0].attinf[1].value=this.planTemplateData[1].attribute[0].attinf[1].olddata = this.unitData.buildingTypes[0].name
+      this.planTemplateData[1].attribute[0].attinf[2].value=this.planTemplateData[1].attribute[0].attinf[2].olddata = this.unitData.contacts
+      this.planTemplateData[1].attribute[0].attinf[3].value=this.planTemplateData[1].attribute[0].attinf[3].olddata = this.unitData.phone
+      this.planTemplateData[1].attribute[0].attinf[4].value=this.planTemplateData[1].attribute[0].attinf[4].olddata = this.unitData.organizationName
+      this.planTemplateData[1].attribute[0].attinf[5].value=this.planTemplateData[1].attribute[0].attinf[5].olddata = this.unitData.address
       console.log(this.planTemplateData)
-      this.planTemplateData[1].attribute[0].attinf[0].value = this.unitData.usci
-      this.planTemplateData[1].attribute[0].attinf[1].value = this.unitData.buildingTypes[0].name
-      this.planTemplateData[1].attribute[0].attinf[2].value = this.unitData.contacts
-      this.planTemplateData[1].attribute[0].attinf[3].value = this.unitData.phone
-      this.planTemplateData[1].attribute[0].attinf[4].value = this.unitData.organizationName
-      this.planTemplateData[1].attribute[0].attinf[5].value = this.unitData.address
     } /* else if (this.selectedItem == '单位概况') {
       //this.getAllBuildings()
     } */ else if (this.selectedItem == '预案附件') {
@@ -558,6 +559,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
     console.log(666, $(".mainbox"))
     $(".mainbox").wordExport('word文档');
   }
+  //原数据点击
+  oldData=false
+  clickoldData(){
+    this.oldData=!this.oldData
+  }
 }
 
 
diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html
index 3668d9a..c9100ab 100644
--- a/src/app/plan-management/entry-plan-look/AddPlanone.html
+++ b/src/app/plan-management/entry-plan-look/AddPlanone.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-06-21 14:28:53
+ * @LastEditTime: 2021-07-02 16:22:22
 -->
 <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
     <div class="topbox" style="text-align: center;">
@@ -62,7 +62,7 @@
                             <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                         </div>
                         <div *ngIf="inputword">
-                          <!-- <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button> -->
+                          <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button>
                           <!-- <button mat-raised-button *ngIf="isinput" (click)='createWord()'>在线编制预案</button> -->
                         </div>
                         <!-- <div *ngIf="inputword">
diff --git a/src/app/ui/plan-template/plan-template.component.ts b/src/app/ui/plan-template/plan-template.component.ts
index f8bb21a..713664a 100644
--- a/src/app/ui/plan-template/plan-template.component.ts
+++ b/src/app/ui/plan-template/plan-template.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-05-31 10:40:01
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-07-02 14:21:31
+ * @LastEditTime: 2021-07-05 15:15:36
  */
 
 import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core';
@@ -372,7 +372,7 @@ export class PlanTemplateComponent implements OnInit {
               //array[index].attribute[i].completed=false
               attarr[i].attinf.forEach((attinfValue,attinfi,attinfarr) => {
                 if(attinfValue.propertyName==propertyName){
-                  attinfarr[attinfi].splice(attinfi,i)
+                  attinfarr[attinfi].completed=false
                 }
               });
             } 
@@ -774,12 +774,12 @@ defineClick(){
 export class addattinf{
   constructor(private http: HttpClient,public dialogRef: MatDialogRef<addattinf>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
   addAttinf=[
-  {propertyName:'统一社会信用代码',completed:false,propertyType:0,value:''},
-  {propertyName:'单位类型',completed:false,propertyType:0,value:''},
-  {propertyName:'联系人',completed:false,propertyType:0,value:''},
-  {propertyName:'联系电话',completed:false,propertyType:0,value:''},
-  {propertyName:'辖区中队',completed:false,propertyType:0,value:''},
-  {propertyName:'单位地址',completed:false,propertyType:0,value:''},
+  {propertyName:'统一社会信用代码',completed:false,propertyType:0,value:'',olddata:''},
+  {propertyName:'单位类型',completed:false,propertyType:0,value:'',olddata:''},
+  {propertyName:'联系人',completed:false,propertyType:0,value:'',olddata:''},
+  {propertyName:'联系电话',completed:false,propertyType:0,value:'',olddata:''},
+  {propertyName:'辖区中队',completed:false,propertyType:0,value:'',olddata:''},
+  {propertyName:'单位地址',completed:false,propertyType:0,value:'',olddata:''},
   /* {propertyName:'单位照片',completed:false,propertyType:0,value:''} *///,default:'-',must:'是',danwei:'-'
 ]
 addAttinfBuild
@@ -802,11 +802,17 @@ getattinf(){
                 if(dataarr[index].propertyName==arr[i].propertyName){
                   if(dataarr[index].completed==true&&arr[i].completed==false){
                    arr[i].completed= dataarr[index].completed
+                   arr[i].olddata=dataarr[index].value
                   }
                 }
               })
             });
-          }else if(value.surveyName=='建筑信息'&&value.attinf==undefined){
+          }/* else if(value.surveyName=='单位基本信息'&&value.attinf==undefined){
+            this.addAttinf.forEach((data)=>{
+              data.olddata=data.value
+            })
+          } */
+          else if(value.surveyName=='建筑信息'&&value.attinf==undefined){
             let paramsdata:any ={
               categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId
             }
@@ -814,6 +820,7 @@ getattinf(){
               this.addAttinfBuild=data[0].propertyInfos
               this.addAttinfBuild.forEach(element => {
                 element.completed=false
+                element.olddata=element.propertyValue
               });
               console.log(this.addAttinfBuild)
             })
diff --git a/src/assets/images/olddata.png b/src/assets/images/olddata.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce940036d648b862ddbcb636bcf4d0b545d4e6ce
GIT binary patch
literal 669
zcmV;O0%HA%P)<h;3K|Lk000e1NJLTq000sI000jN1^@s6>4u*Y0007HNkl<ZI8U9E
zL1+^}6o&t|yM-jJ;Kf@N4;8F<kthfrD;S%krC2x3txej4*g|`&RAI$Ry{V{pNjC)x
zCfkM@HriaIUJ5-Kj|CNTvI-uXHa5HSWY#96vAsB#VVF1HoA<x}5&m<%u&fRr0!yl@
z%nsk^U8kcssn>RoqEUziI%SMPTy|M4jK+G`CBzT^DuXT)IG)g>%m0APY~dOcKPOPv
zev<P3ej4CqsyJiZuG!5Hd4B*jZ`pGMng*jRSUmi#R5Q1AeOm^m(<{g2ei-Bc$h7Qd
z0F5)SP{q!K1Q>>)ojQLhSlbg{9c{PTT#lluTdwOyl6v$`17v3H2Ozpjj3*<p$dtTT
z$i2Jbx*|j1jl;@GTlO4-rkTh{-VEO-sR;;02ER$_(SdpyBA|UH!iS?Y@qT+QxWb^2
zN*t1)Z%ph|v3sGehiTb^0Aj5WS&rk@j*aU5#d<;xw3Xz0GOfZEgSVSODJ$QlR>ZGn
zVFkn|f>Hu_BB}Q+NYGy|`AY=qpp=ylDNt9LIg^Y<<Mn`MVO7n)<~Y?w09W_i+L>GN
z0nZYqWiJ6VDBxcA+FutAjNx6{$sN+2qL&pkIiiQ3$~W`b!eb&#f@wAp3*T$_C}rix
z)rweb^@(W}X29fg*?l`U)VGmNr+uRR#7hE(nUP7xB3=~@P^;~gHnmi#ZU3w{z|({L
z{a_f<^#p!2vhSe=s1?GlC_`1&h)DzR!*evDlK_puUr6v&VyLgsJg44|q$f^xUwlQx
zIXQsx+}RzBC`3H~&NARAjLjO0_un@^77fF2T8I4)46j#Lx6@?800000NkvXXu0mjf
DlSDPM

literal 0
HcmV?d00001