From 05b4ad46e66d081c847177ca44864f0f8c1949c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 18 Feb 2022 13:50:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0qrious=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- angular.json | 49 ++++++++++++++++++++--------------------------- package-lock.json | 5 +++++ package.json | 3 ++- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/angular.json b/angular.json index 128a45f7..9b9432c4 100644 --- a/angular.json +++ b/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": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], + "fileReplacements": [{ + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + }], "outputHashing": "all", - "budgets": [ - { - "type": "initial", - "maximumWarning": "4mb", - "maximumError": "10mb" - } - ] + "budgets": [{ + "type": "initial", + "maximumWarning": "4mb", + "maximumError": "10mb" + }] }, "dev": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/eascs/environment.dev.ts" - } - ], + "fileReplacements": [{ + "replace": "src/environments/environment.ts", + "with": "src/environments/eascs/environment.dev.ts" + }], "outputHashing": "all", - "budgets": [ - { - "type": "initial", - "maximumWarning": "4mb", - "maximumError": "10mb" - } - ] + "budgets": [{ + "type": "initial", + "maximumWarning": "4mb", + "maximumError": "10mb" + }] }, "development": { "buildOptimizer": false, @@ -160,4 +153,4 @@ } }, "defaultProject": "ng-alain" -} \ No newline at end of file +} diff --git a/package-lock.json b/package-lock.json index 8b42a8f1..ddf3948b 100644 --- a/package-lock.json +++ b/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", diff --git a/package.json b/package.json index 4b8d367f..1d6e533e 100644 --- a/package.json +++ b/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" } -} \ No newline at end of file +} From d985c233b1a5948fe847cf6e1d851dd234c0848d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 18 Feb 2022 14:04:31 +0800 Subject: [PATCH 2/2] fix bug --- .../network-freight.component.ts | 7 +- .../network-freight/new/new.component.html | 4 +- .../network-freight/new/new.component.ts | 66 ++++++++++++++++++- .../sys-setting/services/system.service.ts | 7 +- .../sys-setting/sys-setting-routing.module.ts | 2 +- .../driver-config.component.html | 28 +++++--- .../driver-config/driver-config.component.ts | 32 ++------- .../usercenter/services/usercenter.service.ts | 5 +- src/assets/mocks/menu-data.json | 4 ++ 9 files changed, 109 insertions(+), 46 deletions(-) diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts index fec31a66..c92cddf0 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts +++ b/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: '财务设置', @@ -534,7 +534,8 @@ export class NetworkFreightComponent implements OnInit { } } // 新增 - creat() { - this.router.navigate(['./new'], { relativeTo: this.ar }); + creat(value?: any) { + console.log(value) + this.router.navigate(['./new/'+ value?.id], { relativeTo: this.ar }); } } diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.html b/src/app/routes/sys-setting/components/network-freight/new/new.component.html index e80028b3..88f3aaf1 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html @@ -10,7 +10,7 @@ --> - +
企业基本信息
 @@ -53,7 +53,7 @@ - +
其他信息
 diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index 4e9ca7a6..3dca83ae 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/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) {} - ngOnInit() {} - + constructor(private router: Router, public service: SystemService, private route: ActivatedRoute) {} + 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 }); diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 0ee23f4c..f0fdf2aa 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/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 = ''; diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index 9f8ebd1e..eb30d786 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/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 }, 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 bf084faf..6efa65e1 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,10 +1,10 @@ @@ -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']" >查询 @@ -47,16 +47,26 @@ - - - {{ item.promotersTelephone || '添加' }} - + +
{{item?.monthFreightAmount | currency}}
+ + +
{{item?.dayWithdrawalAmount | currency}}
+ + +
{{item?.monthWithdrawalAmount | currency}}
+ + +
{{item?.monthReceivableAmount | currency}}
+ + +
{{item?.isCaptain == 1 ? '车队长' : '司机'}}
 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 99dffda1..525c9ff9 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 @@ -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', - index: 'identityStatus', - 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: '类型', 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: '操作', width: '170px', className: 'text-center', buttons: [ { - text: '查看', - click: item => { - this.router.navigate(['/usercenter/driver/captain/detail', item.appUserId]); - }, - acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-view'] } - }, - { - text: '基础设置', + text: '配置', click: item => this.settingAction(item), - acl: { ability: ['USERCENTER-DRIVER-CAPTAIN-basicSetting'] } + acl: { ability: ['USERCENTER-DRIVER-CONFIG-config'] } } ] } diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index fd6d7fda..112e3ce3 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/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); } diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 8e5e74af..93580208 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -69,6 +69,10 @@ { "text": "车队长列表", "link": "/usercenter/driver/captain" + }, + { + "text": "司机配置", + "link": "/usercenter/driver/config" } ] }