fix bug
This commit is contained in:
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2021-12-06 20:20:26
|
* @Date : 2021-12-06 20:20:26
|
||||||
* @LastEditors : Shiming
|
* @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
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -47,9 +47,9 @@
|
|||||||
<sv label="录单员">{{ i?.createUserName }} /{{ i?.createUserPhone }} </sv>
|
<sv label="录单员">{{ i?.createUserName }} /{{ i?.createUserPhone }} </sv>
|
||||||
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
|
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
|
||||||
<sv label="外部订单号">{{ i?.externalBillCode }}</sv>
|
<sv label="外部订单号">{{ i?.externalBillCode }}</sv>
|
||||||
<sv label="货源编号">{{ i?.resourceCode }} </sv>
|
<sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
|
||||||
<sv label="运单号">{{ i?.wayBillCode }}</sv>
|
<sv label="运单号">{{ i?.wayBillCode }}</sv>
|
||||||
<sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
|
<sv label="承诺付款天数">{{ i?.goodsResource?.paymentDays }}</sv>
|
||||||
</div>
|
</div>
|
||||||
<nz-tabset style="margin-top: 15px">
|
<nz-tabset style="margin-top: 15px">
|
||||||
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
|
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
|
||||||
@ -224,6 +224,30 @@
|
|||||||
</ng-template>
|
</ng-template>
|
||||||
</div>
|
</div>
|
||||||
</nz-card>
|
</nz-card>
|
||||||
|
<nz-card>
|
||||||
|
<nz-tabset >
|
||||||
|
<nz-tab nzTitle="风险异常检测">
|
||||||
|
<button nz-button nzType="primary"[disabled]="">申 诉</button>
|
||||||
|
<div>
|
||||||
|
您的订单可能存在交易风险,请及时提交申诉材料,提交成功后,平台将及时完成审核并通知您!
|
||||||
|
</div>
|
||||||
|
<div>如果您的运单没有问题,可以提出申诉,并提供相关资料,我们将24小时内审核反馈</div>
|
||||||
|
<ul>
|
||||||
|
<li>系统识别:司机装货轨迹异常</li>
|
||||||
|
<li>司机装货轨迹异常,您可在企业端提交申诉材料或联系客服。</li>
|
||||||
|
<li>2021-11-07 03:20:15</li>
|
||||||
|
</ul>
|
||||||
|
</nz-tab>
|
||||||
|
<nz-tab nzTitle="异常预警">
|
||||||
|
<st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||||
|
</st>
|
||||||
|
</nz-tab>
|
||||||
|
<nz-tab nzTitle="操作日志">
|
||||||
|
<st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||||
|
</st>
|
||||||
|
</nz-tab>
|
||||||
|
</nz-tabset>
|
||||||
|
</nz-card>
|
||||||
|
|
||||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
|
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
|
||||||
<ng-container *nzModalContent>
|
<ng-container *nzModalContent>
|
||||||
|
|||||||
@ -0,0 +1,29 @@
|
|||||||
|
<!--
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-03-09 14:05:33
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-03-09 14:12:04
|
||||||
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\note-management\\note-management.component.html
|
||||||
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
|
-->
|
||||||
|
<page-header-wrapper [title]="'短信管理'">
|
||||||
|
</page-header-wrapper>
|
||||||
|
|
||||||
|
<nz-card class="search-box">
|
||||||
|
<div nz-row nzGutter="8">
|
||||||
|
<div nz-col [nzSpan]="6">
|
||||||
|
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 24 } }}" [compact]="true"
|
||||||
|
[button]="'none'"></sf>
|
||||||
|
</div>
|
||||||
|
<div nz-col [nzSpan]="8" nzOffset="1">
|
||||||
|
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['SYSTEM-ROLE-list']">查询</button>
|
||||||
|
<button nz-button (click)="resetSF()">重置</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nz-card>
|
||||||
|
|
||||||
|
<nz-card>
|
||||||
|
<st #st [data]="this.service.$api_getAnnouncementInfoList_page" [columns]="columns" [req]="{ process: beforeReq }" [loading]="service.http.loading" [page]="{}" [scroll]="{ y: '370px' }"></st>
|
||||||
|
</nz-card>
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
:host::ng-deep{
|
||||||
|
.search-box{
|
||||||
|
.ant-card-body{
|
||||||
|
padding-bottom: 18px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.content-box{
|
||||||
|
.ant-card-body{
|
||||||
|
padding-top: 14px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,70 @@
|
|||||||
|
/*
|
||||||
|
* @Description :
|
||||||
|
* @Version : 1.0
|
||||||
|
* @Author : Shiming
|
||||||
|
* @Date : 2022-03-09 14:05:33
|
||||||
|
* @LastEditors : Shiming
|
||||||
|
* @LastEditTime : 2022-03-09 14:07:46
|
||||||
|
* @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: {
|
||||||
|
roleName: {
|
||||||
|
type: 'string',
|
||||||
|
title: '角色名称',
|
||||||
|
ui: { placeholder: '请输入' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
columns: STColumn[] = [
|
||||||
|
{ title: '角色名称', className: 'text-center', index: 'roleName' },
|
||||||
|
{
|
||||||
|
title: '创建时间',
|
||||||
|
width: 170,
|
||||||
|
index: 'createTime',
|
||||||
|
type: 'date',
|
||||||
|
className: 'text-center'
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -24,12 +24,14 @@ import { SystemConfigComponent } from './components/system-config/system-config.
|
|||||||
import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component';
|
import { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component';
|
||||||
import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component';
|
import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component';
|
||||||
import { NetworkFreightNewComponent } from './components/network-freight/new/new.component';
|
import { NetworkFreightNewComponent } from './components/network-freight/new/new.component';
|
||||||
|
import { NoTeManagementComponent } from './components/note-management/note-management.component';
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
{ path: 'staff-management', component: StaffManagementComponent },
|
{ path: 'staff-management', component: StaffManagementComponent },
|
||||||
{ path: 'role-management/user/:type', component: RoleManagementComponent },
|
{ path: 'role-management/user/:type', component: RoleManagementComponent },
|
||||||
{ path: 'role-management/freight/:type', component: RoleManagementComponent },
|
{ path: 'role-management/freight/:type', component: RoleManagementComponent },
|
||||||
{ path: 'basic-setting', component: BasicSettingComponent },
|
{ path: 'basic-setting', component: BasicSettingComponent },
|
||||||
|
{ path: 'note-management', component: NoTeManagementComponent },
|
||||||
{ path: 'basic-config', component: BasicConfigComponent },
|
{ path: 'basic-config', component: BasicConfigComponent },
|
||||||
{ path: 'audit-reason-config', component: AuditReasonConfigComponent },
|
{ path: 'audit-reason-config', component: AuditReasonConfigComponent },
|
||||||
{ path: 'cart-config', component: CartConfigComponent },
|
{ path: 'cart-config', component: CartConfigComponent },
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* @Author: your name
|
* @Author: your name
|
||||||
* @Date: 2021-12-03 15:23:05
|
* @Date: 2021-12-03 15:23:05
|
||||||
* @LastEditTime : 2022-02-17 15:03:19
|
* @LastEditTime : 2022-03-09 14:08:38
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
* @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
|
* @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 { AnnouncementMessageComponent } from './components/announcement-message/announcement-message.component';
|
||||||
import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component';
|
import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component';
|
||||||
import { NetworkFreightNewComponent } from './components/network-freight/new/new.component';
|
import { NetworkFreightNewComponent } from './components/network-freight/new/new.component';
|
||||||
|
import { NoTeManagementComponent } from './components/note-management/note-management.component';
|
||||||
|
|
||||||
const COMPONENTS = [
|
const COMPONENTS = [
|
||||||
StaffManagementComponent,
|
StaffManagementComponent,
|
||||||
@ -48,7 +49,8 @@ const COMPONENTS = [
|
|||||||
CloseAccountComponent,
|
CloseAccountComponent,
|
||||||
NetworkFreightNewComponent,
|
NetworkFreightNewComponent,
|
||||||
AnnouncementMessageComponent,
|
AnnouncementMessageComponent,
|
||||||
InsuranceSetComponent
|
InsuranceSetComponent,
|
||||||
|
NoTeManagementComponent
|
||||||
];
|
];
|
||||||
const NOTROUTECOMPONENTS = [
|
const NOTROUTECOMPONENTS = [
|
||||||
BuyerTranspowerComponent,
|
BuyerTranspowerComponent,
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
@import '../../../../less/edit.less';
|
@import '../../../../less/edit.less';
|
||||||
|
|
||||||
|
|
||||||
.user-info {
|
.user-info {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
|
|
||||||
@ -9,9 +8,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
img {
|
img {
|
||||||
width : 64px;
|
width: 64px;
|
||||||
height : 64px;
|
height: 64px;
|
||||||
margin-right : 15px;
|
margin-right: 15px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -21,22 +20,21 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
::ng-deep {
|
::ng-deep {
|
||||||
|
|
||||||
.affix {
|
.affix {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top : 20px !important;
|
top: 20px !important;
|
||||||
z-index : 999 !important;
|
right: 25px;
|
||||||
right : 25px;
|
left: 25px;
|
||||||
left : 25px;
|
z-index: 999 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.alain-pro__menu-side .alain-pro__main {
|
.alain-pro__menu-side .alain-pro__main {
|
||||||
.affix {
|
.affix {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top : 20px !important;
|
top: 20px !important;
|
||||||
z-index : 999 !important;
|
right: 25px;
|
||||||
right : 25px;
|
left: 250px;
|
||||||
left : 250px;
|
z-index: 999 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -474,6 +474,10 @@
|
|||||||
"text": "CRM客户管理",
|
"text": "CRM客户管理",
|
||||||
"link": "/system/crm-management"
|
"link": "/system/crm-management"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"text": "短信管理",
|
||||||
|
"link": "/system/note-management"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"text": "结算客户管理",
|
"text": "结算客户管理",
|
||||||
"link": "/system/close-account"
|
"link": "/system/close-account"
|
||||||
|
|||||||
Reference in New Issue
Block a user