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

src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html

@@ -43,7 +43,7 @@
         <div *ngIf="data.auditType == 3">
             <p>证件名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
             <div class="cutoffrule"></div>
-            <p>有效期类型: &nbsp;&nbsp;<span *ngIf="data.getData.validatyType == 0">不适用</span><span *ngIf="data.getData.validatyType == 1">无</span><span *ngIf="data.getData.validatyType == 2">有</span></p>
+            <p>有无证照: &nbsp;&nbsp;<span *ngIf="data.getData.validatyType == 0">不适用</span><span *ngIf="data.getData.validatyType == 1">无</span><span *ngIf="data.getData.validatyType == 2">有</span></p>
         </div>
         <div class="cutoffrule"></div>
         <p [hidden]="data.getData.imageUrl === undefined">证件图片: &nbsp;&nbsp;

src/app/pages/home/home.component.html

@@ -34,7 +34,7 @@
         预警记录
       </li>
       <li [routerLink]="['/license/petrolStation']" routerLinkActive="router-link-active">
-        证件
+        证照管理
       </li>
     </div>
 

src/app/pages/license/file-category/details-file-category/details-file-category.component.html

@@ -9,7 +9,7 @@
     <div class="content">
         <p>证件名称: &nbsp;&nbsp;{{data.licenseTypeName}}</p>
         <div class="cutoffrule"></div>
-        <p>有效期类型: &nbsp;&nbsp;<span *ngIf="data.validatyType == 0">不适用</span><span *ngIf="data.validatyType == 1">无</span><span *ngIf="data.validatyType == 2">有</span></p>
+        <p>有无证照: &nbsp;&nbsp;<span *ngIf="data.validatyType == 0">不适用</span><span *ngIf="data.validatyType == 1">无</span><span *ngIf="data.validatyType == 2">有</span></p>
         <div class="cutoffrule"></div>
         <!-- <p>是否年检: &nbsp;&nbsp;是</p>
         <div class="cutoffrule"></div> -->
@@ -19,6 +19,8 @@
             <img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data)">
         </p>
         <div class="cutoffrule"></div>
+        <p>说明: &nbsp;&nbsp;{{data.remark}}</p>
+        <div class="cutoffrule"></div>
         <p class="recordP" style="margin-bottom: 32px">
             <span>审核记录</span>
             <span>

src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html

@@ -10,7 +10,7 @@
 
         <div class="cutoffrule"></div>
 
-        <p>有效期类型<span style="color: red;">*</span></p>
+        <p>适用类型<span style="color: red;">*</span></p>
 
         <nz-form-item>
             <nz-form-control>
@@ -40,8 +40,12 @@
             </div>
         </div>
 
+        <p>说明</p>
+        <textarea style="background: #173350;height: 100px;width: 100%;border-radius: 0;border: 0;color: white;" cols="30" rows="10" [(ngModel)]="data2.remark" formControlName="remark"></textarea>
+
         <div class="btnbox">
-            <button nz-button type="submit" class="ok" (click)="ok()">确定</button>
+            <button nz-button type="submit" class="ok" (click)="submitReview()">提交审核</button>
+            <button nz-button type="submit" class="ok" (click)="ok()">保存</button>
             <button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button>
         </div>
     </form>

src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss

@@ -70,7 +70,7 @@
       }
 
       button:nth-child(2) {
-        margin-left: 16px;
+        margin: 0 15px;
       }
 
       .ok {

src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts

@@ -21,7 +21,8 @@ export class EditFileCategoryComponent implements OnInit {
   data2
   ngOnInit(): void {
     this.validateForm = this.fb.group({
-      type: [null, [Validators.required]]
+      type: [null, [Validators.required]],
+      remark: [null]
     });
     this.data2 = JSON.parse(JSON.stringify(this.data))
     this.validatyType = (this.data2.validatyType).toString()
@@ -38,8 +39,17 @@ export class EditFileCategoryComponent implements OnInit {
   destroyModal() {
     this.modal.destroy({ data: 'this the result data' });
   }
+
+  isSubmit: boolean = false;
   ok() {
-    this.modal.triggerOk()
+    this.isSubmit = false;
+    this.modal.triggerOk();
+  }
+
+  //提交审核
+  submitReview(){
+    this.isSubmit = true;
+    this.modal.triggerOk();
   }
 
 

src/app/pages/license/file-category/file-category.component.html

@@ -5,12 +5,12 @@
             <thead>
                 <tr>
                     <th [nzWidth]="'16%'">
-                        <span style="margin-left: 25%;">证件名称</span>
+                        <span style="margin-left: 25%;">证照名称</span>
                     </th>
-                    <th>有效期类型</th>
+                    <th>有无证照</th>
+                    <!-- <th>提交时间</th>
+                    <th>审核状态</th> -->
                     <th>附件</th>
-                    <th>提交时间</th>
-                    <th>审核状态</th>
                     <th>操作</th>
                 </tr>
             </thead>
@@ -24,20 +24,20 @@
                         <span *ngIf="item.validatyType == 1">无</span>
                         <span *ngIf="item.validatyType == 2">有</span>
                     </td>
+                    <!-- <td>{{item.committedTime | date:"yyyy/MM/dd"}}<span *ngIf="!item.committedTime">未提交审核</span></td>
+                    <td>
+                        <span *ngIf="item.auditLog">{{item.auditLog.auditStatusDesc || ''}}</span>
+                    </td> -->
                     <td>
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item)">
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
                     </td>
-                    <td>{{item.committedTime | date:"yyyy/MM/dd"}}<span *ngIf="!item.committedTime">未提交审核</span></td>
-                    <td>
-                        <span *ngIf="item.auditLog">{{item.auditLog.auditStatusDesc || ''}}</span>
-                    </td>
                     <td class="operation">
                         <span class="blueColor" (click)="edit(item)">编辑</span>
                         <span class="blueColor" (click)="details(item)">详情</span>
                         <span class="blueColor" (click)="cancelReview(item)" *ngIf="item.auditStatus === 1">撤销审核</span>
-                        <span class="blueColor" (click)="submitReview(item)" *ngIf="item.auditStatus != 1">提交审核</span>
+                        <!-- <span class="blueColor" (click)="submitReview(item)" *ngIf="item.auditStatus != 1">提交审核</span> -->
                     </td>
                 </tr>
             </tbody>

src/app/pages/license/file-category/file-category.component.ts

@@ -116,13 +116,24 @@ export class FileCategoryComponent implements OnInit {
       nzFooter: null,
       nzClosable: false,
       nzOnOk: async () => {
+        if (instance.validatyType == '2' && !instance.data2.imageUrl) {
+          this.message.create('warning', '请上传附件！');
+          return false;
+        }
         await new Promise(resolve => {
           instance.data2.validatyType = Number(instance.validatyType)
-          this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe(data => {
-            resolve(data);
-            this.getStationList();
-            this.message.create('success', '修改成功！');
-            return true
+          this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => {
+            if (!instance.isSubmit) {
+              resolve(data);
+              this.getStationList();
+              this.message.create('success', '修改成功！');
+              return true;
+            } else { //提交审核
+              this.submitReview(data.result).then(res=>{
+                resolve(data);
+                return true;
+              });
+            }
           })
         })
       }
@@ -161,10 +172,13 @@ export class FileCategoryComponent implements OnInit {
       this.message.create('warning', '该证照请编辑保存后再提交审核！');
       return
     }
-    let params = { id: item.id }
-    this.http.post('/api/services/app/StationFileLicense/Commit', {}, { params }).subscribe(data => {
-      this.message.create('success', '提交审核成功！');
-      this.getStationList();
+    return new Promise((resolve, reject)=>{
+      let params = { id: item.id }
+      this.http.post('/api/services/app/StationFileLicense/Commit', {}, { params }).subscribe(data => {
+        this.message.create('success', '提交审核成功！');
+        this.getStationList();
+        resolve('success');
+      })
     })
   }
 

src/app/pages/license/nav-bar/nav-bar.component.ts

@@ -9,7 +9,7 @@ export class NavBarComponent implements OnInit {
 
   constructor() { }
 
-  navList = ['通知','更新类证件','档案类证件','历史纪录']
+  navList = ['通知','经营类证照','资产类证照','历史纪录']
   selectedItem = '通知'
   selectNav(item){
     this.selectedItem = item

src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html

@@ -63,7 +63,8 @@
         </div>
 
         <div class="btnbox">
-            <button nz-button type="submit" class="ok" (click)="ok()">确定</button>
+            <button nz-button type="submit" class="ok" (click)="submitReview()">提交审核</button>
+            <button nz-button type="submit" class="ok" (click)="ok()">保存</button>
             <button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button>
         </div>
     </form>

src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss

@@ -70,7 +70,7 @@
       }
 
       button:nth-child(2) {
-        margin-left: 16px;
+        margin: 0 15px;
       }
 
       .ok {

src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts

@@ -57,8 +57,16 @@ export class EditUpdateCategoryComponent implements OnInit {
     this.modal.destroy({ data: 'this the result data' });
   }
 
+  isSubmit: boolean = false;
   ok() {
-    this.modal.triggerOk()
+    this.isSubmit = false;
+    this.modal.triggerOk();
+  }
+
+  //提交审核
+  submitReview(){
+    this.isSubmit = true;
+    this.modal.triggerOk();
   }
 
   //check change

src/app/pages/license/update-category/update-category.component.html

@@ -5,17 +5,17 @@
             <thead>
                 <tr>
                     <th [nzWidth]="'16%'">
-                        <span style="margin-left: 30px;">证件名称</span>
+                        <span style="margin-left: 30px;">证照名称</span>
                     </th>
-                    <th>证件编号</th>
-                    <th>证件有效期</th>
-                    <th>附件</th>
-                    <th>有效期类型</th>
+                    <th>证照编号</th>
+                    <th>证照效期</th>
+                    <th>有效天数</th>
                     <th>办理类型</th>
-                    <!-- <th>是否年检</th> -->
+                    <!-- <th>是否年检</th>
                     <th>提交时间</th>
-                    <th>审核状态</th>
+                    <th>审核状态</th> -->
                     <th>预警状态</th>
+                    <th>附件</th>
                     <th>操作</th>
                 </tr>
             </thead>
@@ -26,11 +26,6 @@
                     </td>
                     <td>{{item.licenseCode || ''}}</td>
                     <td>{{item.isLongTerm ? '长期证照' : (item.validityEndTime | date:"yyyy/MM/dd")}}</td>
-                    <td>
-                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">
-                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item)">
-                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
-                    </td>
                     <td>
                         <ng-container *ngIf="item.isLongTerm; else elseTemplate">
                             长期
@@ -41,22 +36,27 @@
 
                     </td>
                     <td>{{getHandleTypes(item.handleTypes)}}</td>
-                    <!-- <td><span *ngIf="item.isYearlyCheck">是</span><span *ngIf="!item.isYearlyCheck">否</span></td> -->
+                    <!-- <td><span *ngIf="item.isYearlyCheck">是</span><span *ngIf="!item.isYearlyCheck">否</span></td>
                     <td>{{item.committedTime | date:"yyyy/MM/dd"}}<span *ngIf="!item.committedTime">未提交审核</span></td>
                     <td>
                         <span *ngIf="item.auditLog">{{item.auditLog.auditStatusDesc || ''}}</span>
-                    </td>
+                    </td> -->
                     <td>
                         <span *ngIf="item.licenseViolationType == 0">无</span>
                         <span *ngIf="item.licenseViolationType == 1">办理提醒</span>
                         <span *ngIf="item.licenseViolationType == 2">临期提醒</span>
                         <span *ngIf="item.licenseViolationType == 3">逾期报警</span>
                     </td>
+                    <td>
+                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">
+                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item)">
+                        <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
+                    </td>
                     <td class="operation">
                         <span class="blueColor" (click)="edit(item)">编辑</span>
                         <span class="blueColor" (click)="details(item)">详情</span>
                         <span class="blueColor" (click)="cancelReview(item)" *ngIf="item.auditStatus === 1">撤销审核</span>
-                        <span class="blueColor" (click)="submitReview(item)" *ngIf="item.auditStatus != 1">提交审核</span>
+                        <!-- <span class="blueColor" (click)="submitReview(item)" *ngIf="item.auditStatus != 1">提交审核</span> -->
                     </td>
                 </tr>
             </tbody>

src/app/pages/license/update-category/update-category.component.ts

@@ -138,16 +138,23 @@ export class UpdateCategoryComponent implements OnInit {
             let body = instance.data2
             // 日期
             if (body.isLongTerm) {
-              body.validityStartTime = instance.isLongTermTime
+              body.validityStartTime = instance.isLongTermTime || new Date()
             } else {
               body.validityStartTime = instance.isNoLongTermTime[0] || new Date()
               body.validityEndTime = instance.isNoLongTermTime[1] || new Date()
             }
-            this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe(data => {
-              resolve(data);
-              this.getStationList();
-              this.message.create('success', '修改成功！');
-              return true
+            this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe((data:any) => {
+              if (!instance.isSubmit) {
+                resolve(data);
+                this.getStationList();
+                this.message.create('success', '修改成功！');
+                return true;
+              } else { //提交审核
+                this.submitReview(data.result).then(res=>{
+                  resolve(data);
+                  return true;
+                });
+              }
             })
           })
         } else {
@@ -191,10 +198,13 @@ export class UpdateCategoryComponent implements OnInit {
       this.message.create('warning', '该证照请编辑保存后再提交审核！');
       return
     }
-    let params = { id: item.id }
-    this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => {
-      this.message.create('success', '提交审核成功！');
-      this.getStationList();
+    return new Promise((resolve, reject)=>{
+      let params = { id: item.id }
+      this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => {
+        this.message.create('success', '提交审核成功！');
+        this.getStationList();
+        resolve('success');
+      })
     })
   }