Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Sinopec-Anxin

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

@@ -68,7 +68,7 @@
                   </nz-form-item>
                 </td> -->
             </tr>
-            <tr>
+            <tr style="height: 35px;">
               <td class="head">区域名称</td>
               <td class="text">
                 <nz-form-item>
@@ -79,13 +79,12 @@
                   </nz-form-control>
                 </nz-form-item>
               </td>
-              <td class="head">公司名称<span style="color: red;">*</span></td>
+              <td class="head">公司名称</td>
               <td class="text">
                 <nz-form-item>
                   <nz-form-control>
                     <nz-input-group>
-                      <input [(ngModel)]="httpBody.companyName" nz-input type="text"
-                        formControlName="companyName" />
+                      <input [(ngModel)]="httpBody.companyName" nz-input type="text" formControlName="companyName" />
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
@@ -700,9 +699,11 @@
             style="color: #fff;margin-right: 30px;">当前审核状态：{{httpBody.auditLog.auditStatusDesc}}</span>
           <span *ngIf="httpBody.auditLog" style="color: #fff;">审核意见：{{httpBody.auditLog.rejectReason}}</span>
           <button [nzLoading]="isSubmitAuditLoading" nz-button type="button"
-            *ngIf="httpBody.auditStatus != 1 && httpBody.auditStatus != 2 && userdata.userName != 'admin'" (click)="submitAudit()">提交审核</button>
+            *ngIf="httpBody.auditStatus != 1 && httpBody.auditStatus != 2 && userdata.userName != 'admin'"
+            (click)="submitAudit()">提交审核</button>
           <button [nzLoading]="isRevocationAuditLoading" nz-button type="button"
-            *ngIf="httpBody.auditStatus == 1 || httpBody.auditStatus == 2 && userdata.userName != 'admin'" (click)="revocationAudit()">撤销审核</button>
+            *ngIf="httpBody.auditStatus == 1 || httpBody.auditStatus == 2 && userdata.userName != 'admin'"
+            (click)="revocationAudit()">撤销审核</button>
           <button [nzLoading]="isLoadingSave" nz-button type="button" (click)="submitForm()"
             *ngIf="httpBody.auditStatus != 1">保存</button>
           <button (click)="exportExcel()" nz-button type="button"><img style="vertical-align: top;margin-right: 6px;"

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

@@ -28,7 +28,7 @@ export class OilStationInfoComponent implements OnInit {
         laneNumber: [null],
         address: [null],
         locationName: [null],
-        companyName: [null, [Validators.required]],
+        companyName: [null],
         leaderName: [null],
         leaderContact: [null],
         stationLevel: [null],
@@ -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
       })

src/app/system-management/organization/addor/addor.component.html

@@ -17,11 +17,11 @@
         </nz-select>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <!-- <nz-form-item>
       <nz-form-control>
         <label nz-checkbox formControlName="isGasStation">是否为加油站</label>
       </nz-form-control>
-    </nz-form-item>
+    </nz-form-item> -->
     <nz-form-item>
       <nz-form-control>
         <label nz-checkbox formControlName="isParticipationAudit">是否参与审核</label>

src/app/system-management/organization/editor/editor.component.html

@@ -17,11 +17,11 @@
         </nz-select>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
+    <!-- <nz-form-item>
       <nz-form-control>
         <label [(ngModel)]="datacopy.isGasStation" nz-checkbox formControlName="isGasStation">是否为加油站</label>
       </nz-form-control>
-    </nz-form-item>
+    </nz-form-item> -->
     <nz-form-item>
       <nz-form-control>
         <label [(ngModel)]="isParticipationAudit" nz-checkbox formControlName="isParticipationAudit">是否参与审核</label>

src/app/system-management/organization/organization.component.ts

@@ -96,7 +96,7 @@ export class OrganizationComponent implements OnInit {
 
 
   addOr(node?: any) {
-    console.log(node)
+    // console.log(node)
     const modal = this.modal.create({
       nzTitle: node ? '新增组织机构' : '新增一级组织机构',
       nzContent: AddorComponent,
@@ -104,13 +104,15 @@ export class OrganizationComponent implements OnInit {
       nzWidth: 288,
       nzComponentParams: {},
       nzOnOk: async () => {
-        console.log('hhhhhhh', instance.validateForm)
+        // console.log('hhhhhhh', instance.validateForm)
         if (instance.validateForm.valid) {
           await new Promise(resolve => {
+            let isGasStation
+            instance.validateForm.value.OrgnizationLevel == 4 ? isGasStation = true : isGasStation = false
             let body = {
               parentId: node ? Number(node.key) : null,
               displayName: instance.validateForm.value.name,
-              isGasStation: instance.validateForm.value.isGasStation,
+              isGasStation: isGasStation,
               isSkipAudit: !instance.validateForm.value.isParticipationAudit,
               level: instance.validateForm.value.OrgnizationLevel,
             }
@@ -147,14 +149,16 @@ export class OrganizationComponent implements OnInit {
         data: node.origin,
       },
       nzOnOk: async () => {
-        console.log('hhhhhhh', instance.validateForm)
+        // console.log('hhhhhhh', instance.validateForm)
         if (instance.validateForm.valid) {
           await new Promise(resolve => {
+            let isGasStation
+            instance.validateForm.value.OrgnizationLevel == 4 ? isGasStation = true : isGasStation = false
             let body = {
               id: node.origin.id,
               parentId: node.origin.parentId,
               displayName: instance.validateForm.value.name,
-              isGasStation: instance.validateForm.value.isGasStation,
+              isGasStation: isGasStation,
               isSkipAudit: !instance.validateForm.value.isParticipationAudit,
               level: instance.validateForm.value.OrgnizationLevel
             }