[完善]完善油站基本信息

src/app/pages/oil-station-info/oil-station-info.component.html

@@ -70,26 +70,24 @@
             </tr>
             <tr style="height: 35px;">
               <td class="head">区域名称</td>
-              <td class="text organizations">
-                <!-- <nz-form-item>
+              <td class="text">
+                <nz-form-item>
                   <nz-form-control>
                     <nz-input-group>
                       <input [(ngModel)]="httpBody.locationName" nz-input type="text" formControlName="locationName" />
                     </nz-input-group>
                   </nz-form-control>
-                </nz-form-item> -->
-                {{httpBody.locationName}}
+                </nz-form-item>
               </td>
               <td class="head">公司名称</td>
-              <td class="text organizations">
-                <!-- <nz-form-item>
+              <td class="text">
+                <nz-form-item>
                   <nz-form-control>
                     <nz-input-group>
                       <input [(ngModel)]="httpBody.companyName" nz-input type="text" formControlName="companyName" />
                     </nz-input-group>
                   </nz-form-control>
-                </nz-form-item> -->
-                {{httpBody.companyName}}
+                </nz-form-item>
               </td>
             </tr>
             <tr>

src/app/pages/oil-station-info/oil-station-info.component.ts

@@ -71,6 +71,9 @@ export class OilStationInfoComponent implements OnInit {
       }
     }).subscribe((data: any) => {
 
+      this.httpBody.locationName ? null : this.httpBody.locationName = this.httpBody.proposalAreaName
+      this.httpBody.companyName ? null : this.httpBody.companyName = this.httpBody.proposalCompanyName
+
       if (new Date(data.result.openTime).getTime() == -62135625943000) {
         data.result.openTime = null
       }
@@ -153,6 +156,8 @@ export class OilStationInfoComponent implements OnInit {
     locationName: '',
     companyName: '',
     leaderName: '',
+    proposalAreaName: '',
+    proposalCompanyName: '',
     leaderContact: '',
     stationLevel: '',
     sellVariety: '',
@@ -297,7 +302,7 @@ export class OilStationInfoComponent implements OnInit {
       if (!body.hasBuildingInfo) {
         body.otherData = JSON.stringify(this.otherInfoData)
       }
-      // console.log(body)
+
       body.licenses.forEach(item => {
         delete item.isPerpetual
       })