Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

angular.json

@@ -39,7 +39,8 @@
             ],
             "scripts": [
               "node_modules/quill/dist/quill.min.js",
-              "node_modules/perfect-scrollbar/dist/perfect-scrollbar.js"
+              "node_modules/perfect-scrollbar/dist/perfect-scrollbar.js",
+              "node_modules/qrious/dist/qrious.min.js"
             ],
             "allowedCommonJsDependencies": [
               "ajv",
@@ -48,36 +49,28 @@
           },
           "configurations": {
             "production": {
-              "fileReplacements": [
+              "fileReplacements": [{
-                {
+                "replace": "src/environments/environment.ts",
-                  "replace": "src/environments/environment.ts",
+                "with": "src/environments/environment.prod.ts"
-                  "with": "src/environments/environment.prod.ts"
+              }],
-                }
-              ],
               "outputHashing": "all",
-              "budgets": [
+              "budgets": [{
-                {
+                "type": "initial",
-                  "type": "initial",
+                "maximumWarning": "4mb",
-                  "maximumWarning": "4mb",
+                "maximumError": "10mb"
-                  "maximumError": "10mb"
+              }]
-                }
-              ]
             },
             "dev": {
-              "fileReplacements": [
+              "fileReplacements": [{
-                {
+                "replace": "src/environments/environment.ts",
-                  "replace": "src/environments/environment.ts",
+                "with": "src/environments/eascs/environment.dev.ts"
-                  "with": "src/environments/eascs/environment.dev.ts"
+              }],
-                }
-              ],
               "outputHashing": "all",
-              "budgets": [
+              "budgets": [{
-                {
+                "type": "initial",
-                  "type": "initial",
+                "maximumWarning": "4mb",
-                  "maximumWarning": "4mb",
+                "maximumError": "10mb"
-                  "maximumError": "10mb"
+              }]
-                }
-              ]
             },
             "development": {
               "buildOptimizer": false,
@@ -160,4 +153,4 @@
     }
   },
   "defaultProject": "ng-alain"
-}
+}

package-lock.json

@@ -14811,6 +14811,11 @@
       "integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
       "dev": true
     },
+    "qrious": {
+      "version": "4.0.2",
+      "resolved": "http://npm.eascs.com/qrious/-/qrious-4.0.2.tgz",
+      "integrity": "sha1-CcTUB50rlhYX9ixpz/O5u2ajlpM="
+    },
     "qs": {
       "version": "6.7.0",
       "resolved": "https://registry.nlark.com/qs/download/qs-6.7.0.tgz",

package.json

@@ -63,6 +63,7 @@
     "ngx-tinymce": "^12.0.0",
     "ngx-trend": "^7.0.0",
     "perfect-scrollbar": "^1.5.2",
+    "qrious": "^4.0.2",
     "quill": "^1.3.7",
     "quill-image-resize-module": "^3.0.0",
     "rxjs": "~6.6.0",
@@ -133,4 +134,4 @@
     "name": "pro",
     "version": "12.0.0"
   }
-}
+}

src/app/routes/sys-setting/components/network-freight/network-freight.component.ts

@@ -111,7 +111,7 @@ export class NetworkFreightComponent implements OnInit {
       buttons: [
         {
           text: '基础设置',
-          click: item => this.ticket(item)
+          click: item => this.creat(item)
         },
         {
           text: '财务设置',
@@ -573,7 +573,8 @@ export class NetworkFreightComponent implements OnInit {
     }
   }
   // 新增
-  creat() {
+  creat(value?: any) {
-    this.router.navigate(['./new'], { relativeTo: this.ar });
+    console.log(value)
+    this.router.navigate(['./new/'+ value?.id], { relativeTo: this.ar });
   }
 }

src/app/routes/sys-setting/components/network-freight/new/new.component.html

@@ -10,7 +10,7 @@
 -->
 <page-header-wrapper [title]="'新增网络货运人'"></page-header-wrapper>
 <nz-card>
-  <sf #sf1 [ui]="ui" [schema]="schema1" [button]="'none'">
+  <sf #sf1 [ui]="ui" [schema]="schema1" [formData]="sf1FormData" [button]="'none'">
     <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
       <div class="form-title">企业基本信息</div>
     </ng-template>
@@ -53,7 +53,7 @@
     </ng-template>
   </sf>
 
-  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
+  <sf #sf [ui]="ui" [schema]="schema" [formData]="sf2FormData" [button]="'none'">
     <ng-template sf-template="title99" let-me let-ui="ui" let-schema="schema">
       <div class="form-title">其他信息</div>
     </ng-template>

src/app/routes/sys-setting/components/network-freight/new/new.component.ts

@@ -1,3 +1,4 @@
+import { query } from '@angular/animations';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
@@ -48,6 +49,11 @@ export class NetworkFreightNewComponent implements OnInit {
   sf!: SFComponent;
   @ViewChild('sf1', { static: false })
   sf1!: SFComponent;
+  sf1FormData: any  = {
+    legalPersonIdentityDTO: {
+    },
+  };;
+  sf2FormData: any = {};
   schema: SFSchema = this.initOthersSF();
   schema1: SFSchema = this.initBasicInfoSF();
   ui: SFUISchema = {
@@ -77,9 +83,63 @@ export class NetworkFreightNewComponent implements OnInit {
     }
   };
 
-  constructor(private router: Router, public service: SystemService) {}
+  constructor(private router: Router, public service: SystemService, private route: ActivatedRoute) {}
-  ngOnInit() {}
+  ngOnInit() {
-
+    console.log(this.route.snapshot.params.id == 'undefined')
+    if(this.route.snapshot.params.id !== 'undefined') {
+      this.dataListInit(this.route.snapshot.params.id)
+    }
+  }
+  dataListInit(id: any) {
+    this.service.request(this.service.$api_get_networkTransporter_getDetail,{id: id}).subscribe((res) => {
+      console.log(res);
+      this.sf2FormData = res
+      this.sf1FormData = res.enterpriseInfoVO
+      this.sf1FormData.licensePhotoWatermark = [
+        {
+          uid: -1,
+          name: 'LOGO',
+          status: 'done',
+          url: this.sf1FormData.licensePhotoWatermark,
+          response: this.sf1FormData.licensePhotoWatermark
+        },
+      ];
+      // 营业执照法人信息
+      console.log(this.sf1FormData.legalPersonIdentityVO.certificatePhotoFrontWatermark)
+      // this.sf1FormData.legalPersonIdentityDTO.certificatePhotoFrontWatermark = [
+      //   {
+      //     uid: -1,
+      //     name: 'LOGO',
+      //     status: 'done',
+      //     url:  this.sf1FormData.legalPersonIdentityDTO.certificatePhotoFrontWatermark,
+      //     response:  this.sf1FormData.legalPersonIdentityDTO.certificatePhotoFrontWatermark
+      //   },
+      // ];
+      this.sf1FormData.certificatePhotoBackWatermark = [
+        {
+          uid: -1,
+          name: 'LOGO',
+          status: 'done',
+          url: this.sf1FormData.certificatePhotoBackWatermark,
+          response: this.sf1FormData.certificatePhotoBackWatermark,
+        },
+      ];
+      const province = this.sf1FormData.fullRegionVO.provinceCode
+      const city = this.sf1FormData.fullRegionVO.cityCode
+      const area = this.sf1FormData.fullRegionVO.areaCode
+      this.sf1FormData.enterpriseAddressCode = [parseInt(province), parseInt(city), parseInt(area)];
+      this.getRegionToThree();
+    })
+  }
+  getRegionToThree() {
+    // 获取一、二、三级地区详情
+    this.service.http.post(this.service.$api_getRegionToThree).subscribe((res) => {
+      if(this.sf1){
+        this.sf1.getProperty('/enterpriseAddressCode')!.schema.enum = res.data;
+        this.sf1?.getProperty('/enterpriseAddressCode')?.widget.reset(res.data);
+      }
+    });
+  }
   submitForm() {
     if (!this.sf1.valid || !this.sf.valid) {
       this.sf.validator({ emitError: true });

src/app/routes/sys-setting/services/system.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-20 17:18:43
- * @LastEditTime : 2022-02-18 09:49:06
+ * @LastEditTime : 2022-02-18 13:42:49
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\services\\system.service.ts
@@ -67,6 +67,8 @@ export class SystemService extends BaseService {
   $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page';
   // 获取网络货运信息表(id)
   $api_get_networkTransporter = '/api/mdc/cuc/networkTransporter/get';
+  // 获取网络货运信息表(id)
+  $api_get_networkTransporter_getDetail = '/api/mdc/cuc/networkTransporter/getDetail';
   // 批量获取网络货运信息
   $api_findNetworkTransporterByIds = '/api/mdc/cuc/networkTransporter/findNetworkTransporterByIds';
   // 查找所有网络货运信息(下拉)
@@ -167,7 +169,8 @@ export class SystemService extends BaseService {
  $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard';
  // 获取字典
  $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue';
-
+  // 获取一、二、三级地区详情
+  $api_getRegionToThree = '/api/mdc/pbc/region/getRegionToThree';
   $api_getRoleTemplateInfo: string = '';
   $api_getFunctionButtonInfo: string = '/api/mdc/cuc/functionButton/getFunctionButtonByFunctionId';
   $api_getFunctionDataInfo: string = '';

src/app/routes/sys-setting/sys-setting-routing.module.ts

@@ -37,7 +37,7 @@ const routes: Routes = [
   { path: 'goods-name-config', component: GoodsNameConfigComponent },
   { path: 'crm-management', component: CrmManagementComponent },
   { path: 'network-freight', component: NetworkFreightComponent },
-  { path: 'network-freight/new', component: NetworkFreightNewComponent },
+  { path: 'network-freight/new/:id', component: NetworkFreightNewComponent },
   { path: 'close-account', component: CloseAccountComponent },
   // { path: 'btn-management', component: BtnManagementComponent },
   { path: 'announcement-message', component: AnnouncementMessageComponent },

src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html

@@ -1,10 +1,10 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime : 2022-02-16 09:58:52
+ * @LastEditTime : 2022-02-18 11:20:48
  * @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\\captain\\captain.component.html
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\driver\\driver-config\\driver-config.component.html
 -->
 <!-- 页头 -->
 <page-header-wrapper></page-header-wrapper>
@@ -22,7 +22,7 @@
         [nzLoading]="service.http.loading"
         (click)="st?.load(1)"
         acl
-        [acl-ability]="['USERCENTER-DRIVER-CAPTAIN-list']"
+        [acl-ability]="['USERCENTER-DRIVER-CONFIG-search']"
         >查询</button
       >
       <button
@@ -31,7 +31,7 @@
         [disabled]="service.http.loading"
         (click)="exportList()"
         acl
-        [acl-ability]="['USERCENTER-DRIVER-CAPTAIN-export']"
+        [acl-ability]="['USERCENTER-DRIVER-CONFIG-export']"
         >导出</button
       >
       <button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
@@ -47,16 +47,26 @@
   <st
     #st
     [columns]="columns"
-    [data]="service.$api_get_user_expand"
+    [data]="service.$api_configPage"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading"
   >
-    <ng-template st-row="promotersTelephone" let-item let-index="index">
+    <ng-template st-row="monthFreightAmount" let-item let-index="index">
-      <a (click)="addPromoter(item)" acl [acl-ability]="['USERCENTER-DRIVER-CAPTAIN-promoter']">
+    <div>{{item?.monthFreightAmount | currency}}</div>
-        {{ item.promotersTelephone || '添加' }}
+    </ng-template>
-      </a>
+    <ng-template st-row="dayWithdrawalAmount" let-item let-index="index">
+    <div>{{item?.dayWithdrawalAmount | currency}}</div>
+    </ng-template>
+    <ng-template st-row="monthWithdrawalAmount" let-item let-index="index">
+    <div>{{item?.monthWithdrawalAmount | currency}}</div>
+    </ng-template>
+    <ng-template st-row="monthReceivableAmount" let-item let-index="index">
+    <div>{{item?.monthReceivableAmount | currency}}</div>
+    </ng-template>
+    <ng-template st-row="isCaptain" let-item let-index="index">
+    <div>{{item?.isCaptain == 1 ? '车队长' : '司机'}}</div>
     </ng-template>
   </st>
 </nz-card>

src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts

@@ -194,38 +194,20 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
       // { title: '', type: 'checkbox', className: 'text-center' },
       { title: '司机姓名', className: 'text-center', index: 'name' },
       { title: '手机号', className: 'text-center', index: 'mobile' },
-      { title: '身份证号', className: 'text-center', index: 'identityNo' },
+      { title: '类型', className: 'text-center', render: 'isCaptain' },
-      {
+      { title: '月承运金额上限（元）', className: 'text-center', render: 'monthFreightAmount' },
-        title: '实名认证状态',
+      { title: '日提现金额上限（元）', className: 'text-center', render: 'dayWithdrawalAmount', },
-        className: 'text-center',
+      { title: '月提现金额上限（元）', className: 'text-center', render: 'monthWithdrawalAmount' },
-        index: 'identityStatus',
+      { title: '月收款金额上限（元）', className: 'text-center', render: 'monthReceivableAmount' },
-        type: 'badge',
-        badge: {
-          '-1': { text: '未提交', color: 'default' },
-          0: { text: '待审核', color: 'processing' },
-          1: { text: '审核通过', color: 'success' },
-          2: { text: '驳回', color: 'warning' }
-        }
-      },
-      { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
-      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' , 3: '运营添加'} },
-      { title: '注册时间', className: 'text-center', index: 'createTime' },
       {
         title: '操作',
         width: '170px',
         className: 'text-center',
         buttons: [
           {
-            text: '查看',
+            text: '配置',
-            click: item => {
-              this.router.navigate(['/usercenter/driver/captain/detail', item.appUserId]);
-            },
-            acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-view'] }
-          },
-          {
-            text: '基础设置',
             click: item => this.settingAction(item),
-            acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-basicSetting'] }
+            acl: { ability: ['USERCENTER-DRIVER-CONFIG-config'] }
           }
         ]
       }

src/app/routes/usercenter/services/usercenter.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime : 2022-02-17 14:13:13
+ * @LastEditTime : 2022-02-18 11:15:16
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\usercenter\\services\\usercenter.service.ts
@@ -131,6 +131,9 @@ export class UsermanageService extends ShipperBaseService {
   // 添加车队长
   $api_saveCaptainr_new = '/api/mdc/userDriverExpand/saveCaptainr';
   
+  // 查询司机配置列表
+  $api_configPage= '/api/mdc/cuc/driver/list/configPage';
+  
   constructor(public injector: Injector, private nzModalService: NzModalService, public eaCacheSrv: EACacheService) {
     super(injector, eaCacheSrv);
   }

src/assets/mocks/menu-data.json

@@ -69,6 +69,10 @@
                   {
                     "text": "车队长列表",
                     "link": "/usercenter/driver/captain"
+                  },
+                  {
+                    "text": "司机配置",
+                    "link": "/usercenter/driver/config"
                   }
                 ]
               }