From b042def28cf95cdf6db81c90229276bfa3d2e12a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 13:45:20 +0800 Subject: [PATCH 1/5] fix bug --- .../compliance-audit/compliance-audit.component.html | 5 +++-- .../components/receipts-audit/receipts-audit.component.html | 3 ++- src/app/routes/vehicle/components/list/list.component.ts | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index 34bd3f40..f08ba4b1 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 09:48:40 + * @LastEditTime : 2022-03-25 13:44:42 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -89,11 +89,12 @@ {{ item.billCode }} {{ item.billCode }} + {{ item.billCode }}
{{ item?.billStatusLabel }}
- {{item?.billTypeLabel}}{{item?.serviceTypeLabel}} + {{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index eb52e891..6fa93400 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-25 13:18:34 + * @LastEditTime : 2022-03-25 13:44:11 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -101,6 +101,7 @@ {{ item.billCode }} {{ item.billCode }} + {{ item.billCode }}
{{item?.billStatusLabel}}
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index ead9468e..4a06a3a8 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -211,8 +211,8 @@ export class VehicleComponentsListComponent implements OnInit { false: { text: '空闲', color: 'default' } } }, - { title: '道运证', width: '150px', className: 'text-center', index: 'roadTransportNo' }, - { title: '审核人', width: '150px', className: 'text-center', index: 'approvalUserName' }, + // { title: '道运证', width: '150px', className: 'text-center', index: 'roadTransportNo' }, + // { title: '审核人', width: '150px', className: 'text-center', index: 'approvalUserName' }, { title: '行驶证到期状态', @@ -238,11 +238,11 @@ export class VehicleComponentsListComponent implements OnInit { 3: { text: '已到期', color: 'error' } } }, + { title: '是否入网', width: '200px', className: 'text-center', index: 'carOwner' }, { title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' }, { title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' }, { title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' }, // { title: '是否已备案', className: 'text-center', render: 'putOnRecord', }, - { title: '操作', fixed: 'right', From 24a87e913c9c65e4cd38266349d434f4d998c3aa Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 13:57:30 +0800 Subject: [PATCH 2/5] fix bug --- .../order-agreement.component.html | 6 ++--- .../order-agreement.component.ts | 2 +- .../vehicle/components/list/list.component.ts | 27 ++++++++++++++++++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.html b/src/app/routes/passport/components/order-agreement/order-agreement.component.html index 89e01a91..a9106098 100644 --- a/src/app/routes/passport/components/order-agreement/order-agreement.component.html +++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 21:08:36 * @LastEditors : Shiming - * @LastEditTime : 2022-02-24 10:50:46 + * @LastEditTime : 2022-03-25 13:56:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -13,7 +13,7 @@

{{ agreementContent?.agreementName }}

-

最新版本生效日期：{{ agreementContent?.modifyTime }}

-
+

最新版本生效日期：{{ agreementContent?.modifyTime }}

+
\ No newline at end of file diff --git a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts index 96ac222d..5fa44cad 100644 --- a/src/app/routes/passport/components/order-agreement/order-agreement.component.ts +++ b/src/app/routes/passport/components/order-agreement/order-agreement.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-14 14:17:38 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 19:19:17 + * @LastEditTime : 2022-03-25 13:52:54 * @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\order-agreement\\order-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 4a06a3a8..7f81c557 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -127,6 +127,15 @@ export class VehicleComponentsListComponent implements OnInit { } } }, + carLoad: { + title: '载重', + type: 'string', + ui: { + visibleIf: { + expand: (value: boolean) => value + } + } + }, isSelf: { type: 'string', title: '是否挂靠', @@ -174,7 +183,23 @@ export class VehicleComponentsListComponent implements OnInit { expand: (value: boolean) => value } } - } + }, + isSelfs: { + type: 'string', + title: '是否入网', + enum: [ + { label: '全部', value: '' }, + { label: '是', value: 1 }, + { label: '否', value: 0 } + ], + ui: { + widget: 'select', + allowClear: true, + visibleIf: { + expand: (value: boolean) => value + } + } + }, // putOnRecord: { // type: 'string', // title: '是否已备案', From 3935efb5ab9ba2f80896257203579d59f1c69d6b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 14:22:47 +0800 Subject: [PATCH 3/5] fix bug --- .../compliance-audit.component.ts | 20 ++- .../modal/audit/appeal/appeal.component.html | 7 + .../modal/audit/appeal/appeal.component.ts | 131 ++++++++++++++++++ .../order-management.module.ts | 6 +- .../components/audit/audit.component.ts | 2 +- 5 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 src/app/routes/order-management/modal/audit/appeal/appeal.component.html create mode 100644 src/app/routes/order-management/modal/audit/appeal/appeal.component.ts diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index f4477ef8..8adef7ef 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -10,6 +10,7 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r import { of } from 'rxjs'; import { ShipperBaseService } from '@shared'; import { Router } from '@angular/router'; +import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component'; @Component({ selector: 'app-order-management-compliance-audit', @@ -397,7 +398,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { buttons: [ { text: '查看申诉记录', - click: _record => console.log('1'), + click: _record => this.appeal(_record), // iif: item => item.billStatus == '5' }, { @@ -489,6 +490,23 @@ export class OrderManagementComplianceAuditComponent implements OnInit { get queryFieldCount(): number { return Object.keys(this.schema?.properties || {}).length; } + // 申诉记录 + appeal(item: any) { + const modalRef = this.modal.create({ + nzTitle: '申诉', + nzContent: OneCarOrderAppealComponent, + nzComponentParams: { + i: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe((res) => { + if(res){ + this.resetSF; + this.st.load(); + } + }); + } /** * 浮动费用查看 */ diff --git a/src/app/routes/order-management/modal/audit/appeal/appeal.component.html b/src/app/routes/order-management/modal/audit/appeal/appeal.component.html new file mode 100644 index 00000000..d3e53fd1 --- /dev/null +++ b/src/app/routes/order-management/modal/audit/appeal/appeal.component.html @@ -0,0 +1,7 @@ + + + +
+ + +
diff --git a/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts b/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts new file mode 100644 index 00000000..9a7eada4 --- /dev/null +++ b/src/app/routes/order-management/modal/audit/appeal/appeal.component.ts @@ -0,0 +1,131 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { apiConf } from '@conf/api.conf'; +import { + SFComponent, + SFCustomWidgetSchema, + SFNumberWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSelectWidgetSchema, + SFTextareaWidgetSchema, + SFUISchema, + SFUploadWidgetSchema +} from '@delon/form'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; +import { Observable, Observer } from 'rxjs'; +import { OrderManagementService } from '../../../services/order-management.service'; + +@Component({ + selector: 'app-order-management-appeal', + templateUrl: './appeal.component.html' +}) +export class OneCarOrderAppealComponent implements OnInit { + record: any = {}; + i: any; + @ViewChild('sf', { static: false }) sf!: SFComponent; + schema: SFSchema = {}; + ui: SFUISchema = {}; + constructor( + private modalRef: NzModalRef, + private modal: NzModalService, + private msgSrv: NzMessageService, + public http: _HttpClient, + public service: OrderManagementService + ) {} + + ngOnInit(): void { + this.initSF(); + } + initSF() { + this.schema = { + properties: { + abnormalCause: { + type: 'string', + title: '异常原因', + default: this.i.abnormalCause, + readOnly: true, + ui: { + widget: 'textarea', + autosize: { minRows: 4, maxRows: 6 } + } as SFTextareaWidgetSchema + }, + representationsCause: { + type: 'string', + title: '申诉原因', + ui: { + widget: 'dict-select', + params: { dictKey: 'bill:representation:reason' }, + containsAllLabel: false, + placeholder: '请选择', + errors: { required: '请选择' } + } + }, + representationsDescribe: { + type: 'string', + title: '申诉描述', + maxLength: 100, + ui: { + widget: 'textarea', + autosize: { minRows: 4, maxRows: 6 } + } as SFTextareaWidgetSchema + }, + fileArr: { + type: 'string', + title: '上传凭证', + ui: { + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg', + limit: 5, + limitFileCount: 5, + resReName: 'data.fullFilePath', + urlReName: 'data.fullFilePath', + widget: 'upload', + descriptionI18n: '不超过5张，单张大小不超过5M，支持.jpg、.jpeg和 .png格式', + name: 'multipartFile', + multiple: true, + listType: 'picture-card', + beforeUpload: (file: any, _fileList: any) => { + return new Observable((observer: Observer) => { + const isLt2M = file.size / 1024 / 1024 < 5; + if (!isLt2M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt2M); + observer.complete(); + }); + } + } as SFUploadWidgetSchema + } + }, + required: ['representationsCause', 'representationsDescribe'] + }; + this.ui = { + '*': { + spanLabelFixed: 100, + grid: { span: 20 } + } + }; + } + save(value: any): void { + // if (!this.sf.valid){ + // this.sf.validator({ emitError: true }); + // return; + // } + // this.service.request(this.service.$api_addCompleteVehicleRepresentations, { id: this.i?.id, ...this.sf.value }).subscribe(res => { + // if (res) { + // this.service.msgSrv.success('申诉成功！'); + // this.modalRef.close(true); + // } else { + // this.service.msgSrv.error(res.msg); + // } + // }); + } + + close(): void { + this.modalRef.destroy(); + } +} diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index b71b0fda..87ceaafd 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-06 09:24:00 * @LastEditors : Shiming - * @LastEditTime : 2022-02-22 13:55:06 + * @LastEditTime : 2022-03-25 14:10:36 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -24,6 +24,7 @@ import { OrderManagementVehicleDetailChangeComponent } from './components/vehicl import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component'; +import { OneCarOrderAppealComponent } from './modal/audit/appeal/appeal.component'; import { orderManagementVoucherViewComponent } from './modal/audit/voucher-view/voucher-view.component'; import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component'; import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component'; @@ -64,7 +65,8 @@ const COMPONENTS: Type[] = [ orderManagementVoucherViewComponent, OrderManagementComplianceAuditComponent, OneCarOrderCancelConfirmComponent, - OneCarOrderViewtrackComponent + OneCarOrderViewtrackComponent, + OneCarOrderAppealComponent ]; @NgModule({ diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index cc18a6f5..047604d4 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -14,7 +14,7 @@ import { CarSettleCarauthComponent } from '../list/carauth/carauth.component'; }) export class VehicleComponentsAuditComponent implements OnInit { _$expand = false; - resourceStatus: any; + resourceStatus: any = 1; defaultTabs = 1; ui!: SFUISchema; schema!: SFSchema; From b4423eef37edd9d285d404fc81e3341f5bfc6020 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Mar 2022 14:27:44 +0800 Subject: [PATCH 4/5] fix bug --- .../order-management/components/bulk/bulk.component.ts | 10 ++++++++++ .../components/vehicle/vehicle.component.ts | 7 +++++++ .../components/bulk/bulk.component.ts | 7 +++++++ .../components/vehicle/vehicle.component.ts | 7 +++++++ 4 files changed, 31 insertions(+) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index b4b9f407..064ce130 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -186,6 +186,13 @@ export class OrderManagementBulkComponent implements OnInit { placeholder: '最多100个单号，空号隔开', } }, + wayBillCode: { + type: 'string', + title: '运单号', + ui: { + placeholder: '最多100个单号，空号隔开', + } + }, resourceCode: { type: 'string', title: '货源编号' @@ -199,6 +206,9 @@ export class OrderManagementBulkComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + }, onSearch: (q: any) => { let str =q.replace(/^\s+|\s+$/g,""); if (str) { diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 33879e09..92a29c7c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -203,6 +203,13 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme placeholder: '最多100个单号，空号隔开' } }, + wayBillCode: { + type: 'string', + title: '运单号', + ui: { + placeholder: '最多100个单号，空号隔开', + } + }, resourceCode: { type: 'string', title: '货源编号' diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index 95320b9e..83dcd1f2 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -84,6 +84,13 @@ export class WaybillManagementBulkComponent implements OnInit { placeholder: '最多100个运单，空号隔开' } }, + billCode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '最多100个单号，空号隔开' + } + }, resourceCode: { type: 'string', title: '货源编号' diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index 7e69667e..82410cf3 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -82,6 +82,13 @@ export class WaybillManagementVehicleComponent implements OnInit { placeholder: '最多100个运单，空号隔开' } }, + billCode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '最多100个单号，空号隔开' + } + }, resourceCode: { type: 'string', title: '货源编号' From af6135f1ed5924ae43df557a4a25e3386d7d8fbd Mon Sep 17 00:00:00 2001 From: Lingzi Date: Fri, 25 Mar 2022 14:40:18 +0800 Subject: [PATCH 5/5] fix bug --- .../showService/showService.component.html | 10 ++--- .../list/showService/showservice.component.ts | 42 ++++++++----------- .../usercenter/services/usercenter.service.ts | 2 + 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html index 83ae084c..2c4deeca 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html +++ b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html @@ -1,16 +1,14 @@
-
客服人员
+
* 客服人员
- - - - + +
- +
\ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts index f3e0ad5c..d0e4b01e 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts +++ b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts @@ -16,46 +16,38 @@ import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter }) export class ShowServiceComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; + appUserId = '' record: any = {}; i: any; - + serviceList: any = []; constructor( private modal: NzModalRef, public service: UsermanageService, - private envSrv: EAEnvironmentService, - private eaCacheSrv: EACacheService, ) { } ngOnInit(): void { - + this.initData() } close(): void { this.modal.close(true) } - +initData(){ + this.service.request(this.service.$api_getStaffList).subscribe(res => { + this.serviceList = res + }) +} submitForm(){ - // const params:any = { - // appUserId: this.i.appUserId, - // ...this.sf.value, - // bindType: this.i.bindType - // }; - // params.carFrontPhoto = this.detailData.carFrontPhoto - // params.carProtocal = this.detailData.carProtocal - // params.certificatePhotoFront = this.detailData.certificatePhotoFront - // params.certificatePhotoBack = this.detailData.certificatePhotoBack - // params.roadTransportPhoto = this.detailData.roadTransportPhoto - // delete params.titleA - // delete params.titleB - // this.checked = true - // this.service.request(this.service.$api_updateAssistCertification, params).subscribe(res => { - // this.checked = false - // if(res){ - // this.service.msgSrv.success('添加成功') - // this.modal.close(true) - // } - // }) + const params:any = { + appUserId: this.appUserId, + }; + this.service.request(this.service.$api_getStaffList, params).subscribe(res => { + if(res){ + this.service.msgSrv.success('分配成功') + this.modal.close(true) + } + }) } } diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index 07792f92..47557dbb 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -160,6 +160,8 @@ export class UsermanageService extends ShipperBaseService { $api_findEnterpriceChannelRelLog = '/api/mdc/enterpriceRelLog/findEnterpriceChannelRelLog'; // 查询企业合伙人渠道关系信息 $api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel'; + // 员工列表 + $api_getStaffList = '/api/mdc/cuc/userApp/getStaffList'; constructor(public injector: Injector, public nzModalService: NzModalService, private nzImageService: NzImageService) { super(injector);