From abf59f38e7d11a9a974e5e73dffd6cbd16ac0234 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 30 Mar 2022 14:55:49 +0800
Subject: [PATCH] edit

---
 proxy.conf.js                                 |  2 +-
 .../components/list/list.component.ts         | 41 ++++++++-----------
 .../cancellation-invoice.component.html       |  2 +-
 .../invoice-detail.component.html             |  2 +-
 .../invoice-requested-detail.component.html   |  2 +-
 .../invoice-requested.component.html          |  2 +-
 .../invoice-requested.component.ts            | 11 ++---
 .../driver/detail/detail.component.html       |  2 +-
 .../driver/detail/detail.component.ts         | 19 ++++++---
 9 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index 10071e14..67c15ee2 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
diff --git a/src/app/routes/download/components/list/list.component.ts b/src/app/routes/download/components/list/list.component.ts
index 00b3626b..05f38c4c 100644
--- a/src/app/routes/download/components/list/list.component.ts
+++ b/src/app/routes/download/components/list/list.component.ts
@@ -8,7 +8,7 @@ import { DownloadService } from '../../services/download.service';
 
 @Component({
   selector: 'app-download-center-components-list',
-  templateUrl: './list.component.html',
+  templateUrl: './list.component.html'
 })
 export class DownloadComponentsListComponent implements OnInit {
   ui: SFUISchema = {};
@@ -24,7 +24,7 @@ export class DownloadComponentsListComponent implements OnInit {
   get reqParams() {
     const params = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
-    return { ...params };
+    return { ...params, createTime: params?.createTime?.start, applyEndTime: params?.createTime?.end };
   }
 
   /**
@@ -49,23 +49,18 @@ export class DownloadComponentsListComponent implements OnInit {
       properties: {
         _$expand: {
           type: 'boolean',
-          ui: { hidden: true },
+          ui: { hidden: true }
         },
-        applyStartTime: {
+        createTime: {
           type: 'string',
           title: '创建时间',
           ui: {
-            widget: 'date',
-            format: 'yyyy-MM-dd',
-            end: 'applyEndTime',
-          } as SFDateWidgetSchema,
-        },
-        applyEndTime: {
-          type: 'string',
-          title: '',
-          ui: { widget: 'date', end: 'end' } as SFDateWidgetSchema,
-        },
-      },
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd'
+          } as SFDateWidgetSchema
+        }
+      }
     };
     this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 } } };
   }
@@ -87,8 +82,8 @@ export class DownloadComponentsListComponent implements OnInit {
         enum: {
           0: '生成中',
           1: '已完成',
-          2: '失败',
-        },
+          2: '失败'
+        }
       },
       { title: '下载次数', index: 'downloadCount', width: '120px', className: 'text-center' },
       { title: '创建时间', index: 'createTime', width: '120px', className: 'text-center' },
@@ -98,10 +93,8 @@ export class DownloadComponentsListComponent implements OnInit {
         fixed: 'right',
         width: '170px',
         className: 'text-center',
-        buttons: [
-          { text: '下载', click: (_record) => this.download(_record)},
-        ],
-      },
+        buttons: [{ text: '下载', click: _record => this.download(_record) }]
+      }
     ];
   }
 
@@ -115,12 +108,12 @@ export class DownloadComponentsListComponent implements OnInit {
       nzTitle: '<i>删除确认</i>',
       nzContent: `<b>即将删除 当前行数据,请仔细核对,避免误操作！<br>是否删除？</br>`,
       nzOnOk: () =>
-        this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe((res) => {
+        this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe(res => {
           if (res) {
             this.service.msgSrv.success('数据删除成功！');
             this.st?.reload();
           }
-        }),
+        })
     });
   }
   download(record: STData) {
@@ -129,7 +122,7 @@ export class DownloadComponentsListComponent implements OnInit {
       this.service.encodeUrlHeader(this.service.$api_download_file, headers),
       {},
       { fileKey: record.fileUniqueKey },
-      'POST',
+      'POST'
     );
   }
 }
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
index 80d1837f..04fdad70 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
@@ -12,7 +12,7 @@
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
+            <!-- <button nz-button> 导出</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
index d8db1186..8860232b 100644
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
@@ -99,7 +99,7 @@
         <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
           <button nz-button nzType="primary" [nzLoading]="false" (click)="costST?.load(1)">查询</button>
           <button nz-button (click)="resetSF(2)">重置</button>
-          <button nz-button> 导出</button>
+          <!-- <button nz-button> 导出</button> -->
         </div>
       </div>
 
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
index 14f0808f..2d05f3d4 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
@@ -83,7 +83,7 @@
             class="text-right">
             <button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
+            <!-- <button nz-button> 导出</button> -->
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
index fe0a8b6f..73e9ab48 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
@@ -20,7 +20,7 @@
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
       <button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
-      <button nz-button> 导出</button>
+      <!-- <button nz-button> 导出</button> -->
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
index d3e34775..73345fc2 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@@ -119,17 +119,18 @@ export class InvoiceRequestedComponent {
       this.service.msgSrv.warning('请选择开票申请');
       return;
     }
-    if (item.find(item => item.sts !== '1')) {
-      this.service.msgSrv.warning('请勿选择非待处理订单');
-      return;
-    }
+    // if (item.find(item => item.sts !== '1')) {
+    //   this.service.msgSrv.warning('请勿选择非待处理订单');
+    //   return;
+    // }
     const modal = this.nzModalService.create({
       nzTitle: '修改地址',
       nzContent: UpdateAddressModalComponent,
       nzOkLoading: this.service.http.loading,
       nzOnOk: component => {
         if (!component.sf.valid) {
-          this.service.msgSrv.warning('表单校验错误');
+          component.sf.validator({ emitError: true });
+          // this.service.msgSrv.warning('表单校验错误');
           return false;
         }
         this.service
diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html
index e2ef5ede..ac65fc78 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -334,7 +334,7 @@
         {{ userIdentityDetail?.name }}
       </se>
       <se [col]="1" label="备注" required>
-        <textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" maxlength="120" [(ngModel)]="approvalOpinion"></textarea>
+        <textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" maxlength="120" [(ngModel)]="approvalOpinion" placeholder="请输入驳回原因"></textarea>
       </se>
     </div>
   </div>
diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
index 6dcce146..ad538887 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
@@ -76,7 +76,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   ngOnInit() {
     this.initData();
     this.initDetailByCode();
-    this.changeEndKmAction()
+    this.changeEndKmAction();
   }
   initData() {
     // 获取司机头部信息
@@ -191,6 +191,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
       nzContent: this.redectModal,
       nzOnOk: () => {
         if (!this.approvalOpinion) {
+          this.service.msgSrv.warning('请填写备注');
           return false;
         }
         this.adjuctUser(
@@ -213,7 +214,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
       nzTitle: '审核通过',
       nzContent: `<p>驾驶证号：${this.driverDetail?.licenseNo}</p><p>从业资格证号：${this.licenseDetail?.licenseNo}</p><p>是否确认通过审核`,
       nzOnOk: () => {
-        this.changeEndKmAction()
+        this.changeEndKmAction();
       }
     });
   }
@@ -226,7 +227,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
         },
         '审核成功'
       );
-    })
+    });
   }
   /** 驳回驾驶员信息 */
   rejectedDriver() {
@@ -331,16 +332,22 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
         return;
       }
     }
-    if (!driverDetail.licenseNo  || !driverDetail.driverModel || !driverDetail.validStartTime || !driverDetail.signingOrganization || !driverDetail.certificatePhotoWatermark) {
+    if (
+      !driverDetail.licenseNo ||
+      !driverDetail.driverModel ||
+      !driverDetail.validStartTime ||
+      !driverDetail.signingOrganization ||
+      !driverDetail.certificatePhotoWatermark
+    ) {
       this.service.msgSrv.warning('请完善驾驶证信息');
       return;
     }
 
-    if (!licenseDetail.licenseNo  || !licenseDetail.validStartTime || !licenseDetail.certificatePhotoWatermark) {
+    if (!licenseDetail.licenseNo || !licenseDetail.validStartTime || !licenseDetail.certificatePhotoWatermark) {
       this.service.msgSrv.warning('请完善从业资格证信息');
       return;
     }
- 
+
     const params: any = {
       userId: this.route.snapshot.params.id,
       mobile: this.userDetail?.phone,