diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index b0140a97..deff7d8c 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-08 14:53:01 + * @LastEditTime : 2022-03-09 13:48:59 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -46,6 +46,10 @@ {{ i?.goodsResource?.serviceTypeLabel }} {{ i?.createUserName }} /{{ i?.createUserPhone }} {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} + {{ i?.externalBillCode }} + {{ i?.goodsResource?.resourceCode }} + {{ i?.wayBillCode }} + {{ i?.goodsResource?.paymentDays }} @@ -220,6 +224,30 @@ + + + + +
+ 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! +
+
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
+
    +
  • 系统识别:司机装货轨迹异常
    • +
  • 司机装货轨迹异常，您可在企业端提交申诉材料或联系客服。
    • +
  • 2021-11-07 03:20:15
    • +
+ + + + + + + + + + + diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 8c6b9800..2daee3a6 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 11:15:45 + * @LastEditTime : 2022-03-09 14:31:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -81,6 +81,12 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE"); } }); + this.service.request(this.service.$api_get_getRiskDetail, { id: this.id }).subscribe(res => { + if (res) { + console.log('风险详情') + console.log(res) + } + }); } goBack() { diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 75078c62..da73e8e5 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-09 10:33:44 + * @LastEditTime : 2022-03-09 13:38:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -48,8 +48,8 @@ {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} {{ i?.externalBillCode }} {{ i?.resourceCode }} - {{ i?.wayBillId }} - {{ i?.goodsResource?.dispatchName }} + {{ i?.wayBillCode }} + {{ i?.paymentDays }} diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index 73f75c21..d9110498 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -135,7 +135,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { let list :any[] = []; points?.forEach((item: any) => { list.push({ - name: item.hgt, + name: `${item.spd}km/h`, lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] }); }); diff --git a/src/app/routes/sys-setting/components/note-management/note-management.component.html b/src/app/routes/sys-setting/components/note-management/note-management.component.html new file mode 100644 index 00000000..042c707d --- /dev/null +++ b/src/app/routes/sys-setting/components/note-management/note-management.component.html @@ -0,0 +1,29 @@ + + + + + +
+
+ +
+
+ + +
+
+ + + + + \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/note-management/note-management.component.less b/src/app/routes/sys-setting/components/note-management/note-management.component.less new file mode 100644 index 00000000..04fd4ba3 --- /dev/null +++ b/src/app/routes/sys-setting/components/note-management/note-management.component.less @@ -0,0 +1,13 @@ +:host::ng-deep{ + .search-box{ + .ant-card-body{ + padding-bottom: 18px; + } + } + + .content-box{ + .ant-card-body{ + padding-top: 14px; + } + } +} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/note-management/note-management.component.ts b/src/app/routes/sys-setting/components/note-management/note-management.component.ts new file mode 100644 index 00000000..f93705dc --- /dev/null +++ b/src/app/routes/sys-setting/components/note-management/note-management.component.ts @@ -0,0 +1,75 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-09 14:05:33 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-09 15:18:38 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\note-management\\note-management.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; +import { SFComponent, SFSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { SystemService } from '../../services/system.service'; + +@Component({ + selector: 'app-note-management', + templateUrl: './note-management.component.html', + styleUrls: ['../../../commom/less/box.less'] +}) +export class NoTeManagementComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + + searchSchema: SFSchema = { + properties: { + cellphone: { + type: 'string', + title: '手机号', + maxLength: 11, + ui: { placeholder: '请输入' } + } + } + }; + + columns: STColumn[] = [ + { title: '手机号', className: 'text-center', index: 'cellphone' }, + { + title: '发送时间', + index: 'createTime', + type: 'date', + className: 'text-center' + }, + { title: '短信内容', className: 'text-center', index: 'content', + // format: (value) => { + // return JSON.parse(value?.templateParam)?.code + // } + }, + ]; + + constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) { + } + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { ...this.sf.value }); + } + return requestOptions; + }; + + + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } +} diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index f5254056..ce4b3cfe 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -167,6 +167,8 @@ export class SystemService extends BaseService { // 营业执照识别 $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense'; + // 短信发送列表 + $api_listSmsSendLog = '/api/mdc/pbc/smsSend/listSmsSendLog'; // 身份证识别 $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; // 获取字典 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 6bf5a8b5..7be49b35 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -24,12 +24,14 @@ import { SystemConfigComponent } from './components/system-config/system-config. import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component'; import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; import { NetworkFreightNewComponent } from './components/network-freight/new/new.component'; +import { NoTeManagementComponent } from './components/note-management/note-management.component'; const routes: Routes = [ { path: 'staff-management', component: StaffManagementComponent }, { path: 'role-management/user/:type', component: RoleManagementComponent }, { path: 'role-management/freight/:type', component: RoleManagementComponent }, { path: 'basic-setting', component: BasicSettingComponent }, + { path: 'note-management', component: NoTeManagementComponent }, { path: 'basic-config', component: BasicConfigComponent }, { path: 'audit-reason-config', component: AuditReasonConfigComponent }, { path: 'cart-config', component: CartConfigComponent }, diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index 3d944bfe..ecb6d87a 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-02-17 15:03:19 + * @LastEditTime : 2022-03-09 14:08:38 * @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\\sys-setting.module.ts @@ -32,6 +32,7 @@ import { CloseAccountComponent } from './components/close-account/close-account. import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component'; import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; import { NetworkFreightNewComponent } from './components/network-freight/new/new.component'; +import { NoTeManagementComponent } from './components/note-management/note-management.component'; const COMPONENTS = [ StaffManagementComponent, @@ -48,7 +49,8 @@ const COMPONENTS = [ CloseAccountComponent, NetworkFreightNewComponent, AnnouncementMessageComponent, - InsuranceSetComponent + InsuranceSetComponent, + NoTeManagementComponent ]; const NOTROUTECOMPONENTS = [ BuyerTranspowerComponent, diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.html b/src/app/routes/ticket-management/components/express-info/express-info.component.html index f8a9aacc..c3724328 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.html +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.html @@ -19,11 +19,6 @@
-<<<<<<< HEAD - -======= ->>>>>>> 9894aafcc1c3326f1d6dcb9a0c3eb42079a623a9 \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.ts b/src/app/routes/ticket-management/components/express-info/express-info.component.ts index 71bcb041..6277ed0a 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.ts +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.ts @@ -40,7 +40,7 @@ export class ExpressInfoComponent implements OnInit { columns: STColumn[] = [ { title: '', index: 'key', type: 'checkbox', width: 50 }, - { title: '快递单号', index: 'expressCode', width: 150 }, + { title: '快递单号', index: 'expressCode', width: 170 }, { title: '快递公司', index: 'expresscompany', width: 120 }, { title: '快递费用', index: 'description', width: 120 }, { diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.less b/src/app/routes/usercenter/components/freight/list/detail/detail.component.less index fb1041ee..21bf7187 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.less +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.less @@ -1,6 +1,5 @@ @import '../../../../less/edit.less'; - .user-info { font-size: 16px; @@ -9,9 +8,9 @@ } img { - width : 64px; - height : 64px; - margin-right : 15px; + width: 64px; + height: 64px; + margin-right: 15px; border-radius: 50%; } @@ -21,22 +20,21 @@ } ::ng-deep { - .affix { position: fixed; - top : 20px !important; - z-index : 999 !important; - right : 25px; - left : 25px; + top: 20px !important; + right: 25px; + left: 25px; + z-index: 999 !important; } .alain-pro__menu-side .alain-pro__main { .affix { position: fixed; - top : 20px !important; - z-index : 999 !important; - right : 25px; - left : 250px; + top: 20px !important; + right: 25px; + left: 250px; + z-index: 999 !important; } } @@ -45,4 +43,4 @@ left: 106px; } } -} \ No newline at end of file +} diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 411cb93b..3bcec474 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -31,6 +31,10 @@ {{i?.enterpriseProject}} {{i?.serviceTypeLabel}} {{i?.dispatch?.name}} /{{i?.dispatch?.phone}} + {{ i?.externalBillCode }} + {{ i?.resourceCode }} + {{ i?.wayBillCode }} + {{ i?.paymentDays }} diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index b18e685b..01766cbf 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,7 +1,7 @@