From 44ae7f40c13ce504413cfc2e22c691cd371de4f1 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 9 Mar 2022 16:17:56 +0800
Subject: [PATCH 1/3] fix bug

---
 .../driver-config/driver-config.component.html    |  6 +++---
 .../driver-config/driver-config.component.ts      | 15 ++++++++-------
 .../dynamic-setting-h5.component.html             |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
index f6bd64aa..cbd8e205 100644
--- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
+++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime : 2022-02-18 16:29:43
+ * @LastEditTime : 2022-03-09 16:04:08
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\driver\\driver-config\\driver-config.component.html
@@ -30,8 +30,8 @@
 </nz-card>
 <nz-card>
   <!-- 数据列表 -->
-  <st #st [columns]="columns" [data]="service.$api_configPage" [req]="{  params: reqParams }"
-    [loading]="service.http.loading">
+  <st #st [columns]="columns"  [scroll]="{ x: '1200px' }"[data]="service.$api_configPage" [req]="{  params: reqParams }"
+    [loading]="service.http.loading" [page]={}>
     <ng-template st-row="monthFreightAmount" let-item let-index="index">
       <div>{{item?.monthFreightAmount | currency}}</div>
     </ng-template>
diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
index c399257e..3ae0c418 100644
--- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
+++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
@@ -103,16 +103,17 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       // { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '司机姓名', className: 'text-center', index: 'name' },
-      { title: '手机号', className: 'text-center', index: 'mobile' },
-      { title: '类型', className: 'text-center', render: 'isCaptain' },
-      { title: '月承运金额上限（元）', className: 'text-center', render: 'monthFreightAmount' },
-      { title: '日提现金额上限（元）', className: 'text-center', render: 'dayWithdrawalAmount' },
-      { title: '月提现金额上限（元）', className: 'text-center', render: 'monthWithdrawalAmount' },
-      { title: '月收款金额上限（元）', className: 'text-center', render: 'monthReceivableAmount' },
+      { title: '司机姓名', className: 'text-center', width: '170px', index: 'name' },
+      { title: '手机号', className: 'text-center', width: '170px', index: 'mobile' },
+      { title: '类型', className: 'text-center',  width: '170px',render: 'isCaptain' },
+      { title: '月承运金额上限（元）', className: 'text-center', width: '200px', render: 'monthFreightAmount' },
+      { title: '日提现金额上限（元）', className: 'text-center', width: '200px', render: 'dayWithdrawalAmount' },
+      { title: '月提现金额上限（元）', className: 'text-center', width: '200px', render: 'monthWithdrawalAmount' },
+      { title: '月收款金额上限（元）', className: 'text-center', width: '200px', render: 'monthReceivableAmount' },
       {
         title: '操作',
         width: '170px',
+        fixed: 'right',
         className: 'text-center',
         buttons: [
           {
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
index 06381609..2936fbff 100644
--- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 16:03:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-01 15:31:23
+ * @LastEditTime : 2022-03-09 16:17:28
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -30,7 +30,7 @@
                                 <ng-container *ngSwitchCase="1">
                                     <nz-input-group [nzAddOnAfter]="item.remark?.afterLable" style="width: 155px;"
                                         class="ml-md mr-xl">
-                                        <input type="number" nz-input [(ngModel)]="item.itemValue" placeholder="请输入" />
+                                        <input type="number" [min]="0" max="999"  [(ngModel)]="item.itemValue" placeholder="请输入" />
                                     </nz-input-group>
                                 </ng-container>
                                 <!-- 0-1单选框 -->

From 95604e68dfa40c6b9ebe169502c56b61d4f181a7 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 9 Mar 2022 16:26:01 +0800
Subject: [PATCH 2/3] fix bug

---
 .../captain/captain-detail/captain-detail.component.html      | 4 ++--
 .../usercenter/components/driver/detail/detail.component.html | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
index faa34e76..001fdc2e 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
+++ b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
@@ -12,8 +12,8 @@
         <div style="flex: 1">
           <div style="display: flex; width: 100%; justify-content: space-between">
             <p style="padding-right: 80px; width: 400px">{{ userDetail?.realName }}
-              <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xl"> </nz-badge>
-              <nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"> </nz-badge>
+              <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xs"> </nz-badge>
+              <nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xs"> </nz-badge>
             </p>
             <div style="margin-right: 24px">
               <button *ngIf="userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzType="primary"
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 dce036ac..81aaa6ed 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -12,8 +12,8 @@
         <div style="flex: 1">
           <div style="display: flex;width: 100%;justify-content: space-between;">
             <p style="padding-right: 80px; width: 400px;">{{ userDetail?.realName }}
-              <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xl"></nz-badge>
-              <nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"></nz-badge>
+              <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xs"></nz-badge>
+              <nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xs"></nz-badge>
             </p>
             <div style="margin-right: 24px;">
               <button *ngIf="userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzType="primary"

From 61b73497a61f10708794eb827790b86b9288dab6 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 9 Mar 2022 16:46:42 +0800
Subject: [PATCH 3/3] fix bug

---
 .../components/driver/detail/detail.component.html       | 4 ++--
 .../components/driver/detail/detail.component.ts         | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

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 81aaa6ed..97191cf8 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -217,7 +217,7 @@
         <input nz-input type="text" [(ngModel)]="licenseDetail.licenseNo" [readonly]="!isEditDriver"
           [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
       </sv>
-      <!-- <sv label="公司所在地" >
+      <sv label="公司所在地" >
         <ng-container *ngIf="isEditDriver; else cascaderelseTemplate">
           <nz-select [(ngModel)]="licenseDetail.regionCode">
             <ng-container *ngFor="let item of adressCodeList">
@@ -228,7 +228,7 @@
         <ng-template #cascaderelseTemplate>
           {{licenseDetail?.regionCodeName }}
         </ng-template>
-      </sv> -->
+      </sv>
       <sv label="发证日期" col="2">
         <nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
           [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;"
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 b85faf67..3951e7d5 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
@@ -323,11 +323,16 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
         return;
       }
     }
-    if (!licenseDetail.licenseNo || !licenseDetail.regionCode || !licenseDetail.validStartTime) {
-      this.service.msgSrv.warning('请完善从业资格证信息');
+    if (!driverDetail.licenseNo  || !driverDetail.driverModel || !driverDetail.validStartTime || !driverDetail.signingOrganization || !driverDetail.certificatePhotoWatermark) {
+      this.service.msgSrv.warning('请完善驾驶证信息');
       return;
     }
 
+    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,