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

src/app/pages/audit/audit-record/audit-record.component.html

@@ -5,10 +5,10 @@
                 <nz-form-control>
                     <nz-select nzAllowClear formControlName="info" nzPlaceHolder="审批信息"
                         (ngModelChange)="infoChange($event)">
-                        <nz-option nzValue="0" nzLabel="油站信息"></nz-option>
+                        <nz-option *ngIf="!level" nzValue="0" nzLabel="油站信息"></nz-option>
                         <nz-option *ngIf="level" nzValue="1" nzLabel="经营类证照提醒时间"></nz-option>
-                        <nz-option nzValue="2" nzLabel="经营类证照"></nz-option>
-                        <nz-option nzValue="3" nzLabel="资产类证照"></nz-option>
+                        <nz-option *ngIf="!level" nzValue="2" nzLabel="经营类证照"></nz-option>
+                        <nz-option *ngIf="!level" nzValue="3" nzLabel="资产类证照"></nz-option>
                     </nz-select>
                 </nz-form-control>
             </nz-form-item>

src/app/pages/plan-admin/update-license-list/update-license-list.component.ts

@@ -149,19 +149,20 @@ export class UpdateLicenseListComponent implements OnInit {
           let newArr = []
           for (let index = 0; index < newElement.length; index++) {
             const item = newElement[index];
-            if (item.name == '公司名称') {
-              newArr[0] = item
+            let arr = [
+              '公司名称', '区域名称', '油站名称', '营业执照', '成品油零售经营批准证书', '危险化学品经营许可证', '食品经营许可证', '烟草经营许可证', '安全生产标准化认证证书', '排污许可证', '防雷检测报告', '计量检测报告', '职业危害因素检测报告', '安全现状评价报告', '安全应急预案备案回执', '环境应急预案备案回执', '油气回收系统年检报告', '大气污染物合规性监测报告', '主要负责人证书', '安全管理人员资格证书1', '安全管理人员资格证书2'
+            ]
+            for (let i = 0; i < arr.length; i++) {
+              const element = arr[i];
+              if (item.name == element) {
+                newArr[i] = item
                 newElement.splice(index--, 1)
               }
-            if (item.name == '区域名称') {
-              newArr[1] = item
-              newElement.splice(index--, 1)
-            }
-            if (item.name == '油站名称') {
-              newArr[2] = item
-              newElement.splice(index--, 1)
             }
           }
+          newArr = newArr.filter((item) => {
+            return item
+          })
           let atLastArr = newArr.concat(newElement);
           arr.push(atLastArr)
         });