Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Taric Xin
2022-01-10 16:46:59 +08:00
parent df5a8b71bf ae813263d6
commit fb3a88fd4e
17 changed files with 273 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/routes/contract-management/components/contract-detail/contract-detail.component.html Normal file
View File

@ -0,0 +1,23 @@
<!--
* @Author: your name
* @Date: 2022-01-05 11:01:55
* @LastEditTime: 2022-01-10 15:55:59
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.html
-->
<!-- 页头 -->
<page-header-wrapper [logo]="logo" [title]="textStatus" >
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button>
</ng-template>
</page-header-wrapper>
<nz-card>
<div nz-col nzSpan="20" style="overflow: scroll">
<nz-card class="card-height" >
<div [innerHTML]="detailList?.contractContent | safehtml"></div>
</nz-card>
</div>
</nz-card>

4
src/app/routes/contract-management/components/contract-detail/contract-detail.component.less Normal file
View File

@ -0,0 +1,4 @@
.title {
padding-right: 4px;
padding-left: 14px !important;
}

31
src/app/routes/contract-management/components/contract-detail/contract-detail.component.spec.ts Normal file
View File

@ -0,0 +1,31 @@
/*
* @Author: your name
* @Date: 2021-11-29 20:19:08
* @LastEditTime: 2021-11-29 20:31:00
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\detail\detail.component.spec.ts
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { UserCenterComponentsDriverDetailComponent } from './contract-detail.component';
describe('UserCenterComponentsDriverDetailComponent', () => {
let component: UserCenterComponentsDriverDetailComponent;
let fixture: ComponentFixture<UserCenterComponentsDriverDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [UserCenterComponentsDriverDetailComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(UserCenterComponentsDriverDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

70
src/app/routes/contract-management/components/contract-detail/contract-detail.component.ts Normal file
View File

@ -0,0 +1,70 @@
import { Router } from '@angular/router';
/*
* @Author: your name
* @Date: 2022-01-05 11:01:55
* @LastEditTime: 2022-01-10 15:56:26
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.ts
*/
import { DatePipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { apiConf } from '@conf/api.conf';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFTagWidgetSchema, SFTextWidgetSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { ImageViewComponent } from 'src/app/shared/components/imagelist';
import { ContractManagementService } from '../../services/contract-management.service';
@Component({
selector: 'app-contract-management-detail-complaint',
templateUrl: './contract-detail.component.html',
styleUrls: ['./contract-detail.component.less'],
providers: [DatePipe]
})
export class ContractManagementDetailComponent implements OnInit {
constructor(
private nzModalService: NzModalService,
public service: ContractManagementService,
public route: ActivatedRoute,
private datePipe: DatePipe,
private router: Router
) {}
textStatus = '合同详情'
name: any;
code: any;
templateHTML: any;
detailList: any = {
templateName: ''
};
ngOnInit() {
this.initData(this.service.$api_contract_get)
}
goBack() {
window.history.go(-1)
}
initData(url: string) {
this.service.request(url, {id: this.route.snapshot.params.id}).subscribe((res) => {
console.log(res)
if(res) {
this.detailList = res;
this.detailList = res;
let value :any= JSON.parse(res.contractParameter)
console.log(value['${code}'])
console.log(value['${name}'])
this.code = value['${code}']
this.name =value['${name}']
}
})
}
cancel() {
window.history.go(-1)
}
}

4
src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-07 15:57:49
* @LastEditTime: 2022-01-10 14:20:51
* @LastEditTime: 2022-01-10 14:54:53
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-list\contract-list.component.html
@ -68,7 +68,7 @@
(change)="stChange($event)"
>
<ng-template st-row="contractCode" let-item let-index="index">
<a [routerLink]="'/supply-management/bulk-detail/' + item.id">{{ item?.contractCode }}</a>
<a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
</ng-template>
</st>
</nz-card>

4
src/app/routes/contract-management/components/contract-list/contract-list.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-07 15:57:49
* @LastEditTime: 2022-01-07 18:05:23
* @LastEditTime: 2022-01-10 14:54:33
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-list\contract-list.component.html
@ -68,7 +68,7 @@
(change)="stChange($event)"
>
<ng-template st-row="contractCode" let-item let-index="index">
<a [routerLink]="'/supply-management/bulk-detail/' + item.id">{{ item?.contractCode }}</a>
<a [routerLink]="'/contract-management/index/detail/' + item.id">{{ item?.contractCode }}</a>
</ng-template>
</st>
</nz-card>

16
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.spec.ts
View File

@ -1,26 +1,26 @@
/*
* @Author: your name
* @Date: 2021-11-29 20:19:08
* @LastEditTime: 2021-11-29 20:31:00
* @LastEditors: your name
* @LastEditTime: 2022-01-10 14:49:21
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\detail\detail.component.spec.ts
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { UserCenterComponentsDriverDetailComponent } from './contract-template-detail.component';
import { ContractManagementTemplateDetailComponent } from './contract-template-detail.component';
describe('UserCenterComponentsDriverDetailComponent', () => {
let component: UserCenterComponentsDriverDetailComponent;
let fixture: ComponentFixture<UserCenterComponentsDriverDetailComponent>;
describe('ContractManagementTemplateDetailComponent', () => {
let component: ContractManagementTemplateDetailComponent;
let fixture: ComponentFixture<ContractManagementTemplateDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [UserCenterComponentsDriverDetailComponent],
declarations: [ContractManagementTemplateDetailComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(UserCenterComponentsDriverDetailComponent);
fixture = TestBed.createComponent(ContractManagementTemplateDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

4
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
View File

@ -2,7 +2,7 @@ import { Router } from '@angular/router';
/*
* @Author: your name
* @Date: 2022-01-05 11:01:55
* @LastEditTime: 2022-01-06 21:09:31
* @LastEditTime: 2022-01-10 14:48:32
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.ts
@ -27,7 +27,7 @@ import { ContractManagementService } from '../../services/contract-management.se
styleUrls: ['./contract-template-detail.component.less'],
providers: [DatePipe]
})
export class UserCenterComponentsDriverDetailComponent implements OnInit {
export class ContractManagementTemplateDetailComponent implements OnInit {
constructor(
private nzModalService: NzModalService,

16
src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts
View File

@ -1,27 +1,27 @@
/*
* @Author: your name
* @Date: 2021-12-07 14:27:59
* @LastEditTime: 2021-12-07 14:28:59
* @LastEditors: your name
* @LastEditTime: 2022-01-10 14:47:47
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\risk\risk.component.spec.ts
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementTemplateComponent } from './contract-template.component';
import { ContractManagementTemplateComponent } from './contract-template.component';
describe('OrderManagementTemplateComponent', () => {
let component: OrderManagementTemplateComponent;
let fixture: ComponentFixture<OrderManagementTemplateComponent>;
describe('ContractManagementTemplateComponent', () => {
let component: ContractManagementTemplateComponent;
let fixture: ComponentFixture<ContractManagementTemplateComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ OrderManagementTemplateComponent ]
declarations: [ ContractManagementTemplateComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderManagementTemplateComponent);
fixture = TestBed.createComponent(ContractManagementTemplateComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

2
src/app/routes/contract-management/components/contract-template/contract-template.component.ts
View File

@ -13,7 +13,7 @@ import { ContractManagementService } from '../../services/contract-management.se
templateUrl: './contract-template.component.html',
styleUrls: ['./contract-template.component.less']
})
export class OrderManagementTemplateComponent implements OnInit {
export class ContractManagementTemplateComponent implements OnInit {
ui: SFUISchema = {};
uiView: SFUISchema = {};
schema: SFSchema = {};

12
src/app/routes/contract-management/contract-management-routing.module.ts
View File

@ -1,22 +1,24 @@
/*
* @Author: your name
* @Date: 2021-12-07 15:57:49
* @LastEditTime: 2022-01-05 11:05:16
* @LastEditTime: 2022-01-10 14:50:40
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\contract-management-routing.module.ts
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { ContractManagementDetailComponent } from './components/contract-detail/contract-detail.component';
import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component';
import { UserCenterComponentsDriverDetailComponent } from './components/contract-template-detail/contract-template-detail.component';
import { OrderManagementTemplateComponent } from './components/contract-template/contract-template.component';
import { ContractManagementTemplateDetailComponent } from './components/contract-template-detail/contract-template-detail.component';
import { ContractManagementTemplateComponent } from './components/contract-template/contract-template.component';
import { ContractManagementIndexComponent } from './components/index/index.component';
import { ContractManagementPolicyComponent } from './components/policy/policy.component';
const routes: Routes = [
{ path: 'index', component: ContractManagementIndexComponent },
{ path: 'template', component: OrderManagementTemplateComponent },
{ path: 'template/detail/:id', component: UserCenterComponentsDriverDetailComponent },
{ path: 'index/detail/:id', component: ContractManagementDetailComponent },
{ path: 'template', component: ContractManagementTemplateComponent },
{ path: 'template/detail/:id', component: ContractManagementTemplateDetailComponent },
{ path: 'policy', component: ContractManagementPolicyComponent }
];

14
src/app/routes/contract-management/contract-management.module.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-07 15:57:49
* @LastEditTime: 2022-01-07 13:50:14
* @LastEditTime: 2022-01-10 14:50:00
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\contract-management.module.ts
@ -12,18 +12,20 @@ import { SharedModule } from '@shared';
import { ContractManagementManagementRoutingModule } from './contract-management-routing.module';
import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component';
import { ContractManagementPolicyComponent } from './components/policy/policy.component';
import { OrderManagementTemplateComponent } from './components/contract-template/contract-template.component';
import { UserCenterComponentsDriverDetailComponent } from './components/contract-template-detail/contract-template-detail.component';
import { ContractManagementTemplateComponent } from './components/contract-template/contract-template.component';
import { ContractManagementIndexComponent } from './components/index/index.component';
import { ContractManagementFrameComponent } from './components/contract-frame/contract-frame.component';
import { ContractManagementTemplateDetailComponent } from './components/contract-template-detail/contract-template-detail.component';
import { ContractManagementDetailComponent } from './components/contract-detail/contract-detail.component';
const COMPONENTS: any = [
ContractManagementContractListComponent,
ContractManagementPolicyComponent,
OrderManagementTemplateComponent,
UserCenterComponentsDriverDetailComponent,
ContractManagementTemplateComponent,
ContractManagementTemplateDetailComponent,
ContractManagementIndexComponent,
ContractManagementFrameComponent
ContractManagementFrameComponent,
ContractManagementDetailComponent
];
const NOTROUTECOMPONENTS: any = [];
@NgModule({

4
src/app/routes/contract-management/services/contract-management.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2022-01-04 21:05:49
* @LastEditTime: 2022-01-07 16:33:31
* @LastEditTime: 2022-01-10 14:53:10
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\services\contract-management.service.ts
@ -30,6 +30,8 @@ export class ContractManagementService extends BaseService {
$api_listDetailed_page = `/api/sdc/contract/listDetailed/page`;
// 查询框架合同
$api_listFrame_page = `/api/sdc/contract/listFrame/page`;
// 获取订单合同表
$api_contract_get = `/api/sdc/contract/get`;
constructor(public injector: Injector) {
super(injector);
}

27
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -162,6 +162,24 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
format: 'yyyy-MM-dd HH:mm:ss'
}
},
dispatchPhone: {
type: 'string',
title: '手机号',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchName: {
type: 'string',
title: '名字',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchId: {
type: 'string',
title: '调度员',
@ -169,6 +187,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
change: (value: any, data: any) => {
if(data.label) {
const dat = data.label.split('/')
this.sf1.setValue('/dispatchName', dat[0]);
this.sf1.setValue('/dispatchPhone', dat[1]);
}
},
optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
asyncData: () => this.shipperSrv.getStaffList2()
} as SFSelectWidgetSchema
@ -716,6 +741,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.enterpriseProjectIds = res.enterpriseProjectId
}
this.sf1data = {
dispatchPhone: res?.dispatchPhone,
dispatchName: res?.dispatchName,
// shipperAppUserName: res?.shipperAppUserName || '',
enterpriseProjectId: res?.enterpriseProjectId || '',
enterpriseInfoName: res?.enterpriseInfoName || '',

25
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -182,6 +182,24 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
format: 'yyyy-MM-dd HH:mm:ss'
}
},
dispatchPhone: {
type: 'string',
title: '手机号',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchName: {
type: 'string',
title: '名字',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchId: {
type: 'string',
title: '调度员',
@ -189,6 +207,13 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
change: (value: any, data: any) => {
if(data.label) {
const dat = data.label.split('/')
this.sf1.setValue('/dispatchName', dat[0]);
this.sf1.setValue('/dispatchPhone', dat[1]);
}
},
optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
asyncData: () => this.shipperSrv.getStaffList2()
} as SFSelectWidgetSchema

27
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -168,6 +168,24 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入'
}
},
dispatchPhone: {
type: 'string',
title: '手机号',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchName: {
type: 'string',
title: '名字',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchId: {
type: 'string',
title: '调度员',
@ -176,6 +194,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请选择',
allowClear: true,
optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
change: (value: any, data: any) => {
if(data.label) {
const dat = data.label.split('/')
this.sf1.setValue('/dispatchName', dat[0]);
this.sf1.setValue('/dispatchPhone', dat[1]);
}
},
asyncData: () => this.shipperSrv.getStaffList2()
} as SFSelectWidgetSchema
}
@ -917,6 +942,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
this.sf1data = {
enterpriseInfoName: res?.enterpriseInfoName,
dispatchPhone: res?.dispatchPhone,
dispatchName: res?.dispatchName,
externalResourceCode: res?.externalResourceCode,
dispatchId: res?.dispatchId
};

25
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -181,6 +181,24 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
ui: {
placeholder: '请输入'
}
},
dispatchPhone: {
type: 'string',
title: '手机号',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchName: {
type: 'string',
title: '名字',
maxLength: 30,
ui: {
hidden: true,
placeholder: '请输入'
}
},
dispatchId: {
type: 'string',
@ -189,6 +207,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
change: (value: any, data: any) => {
if(data.label) {
const dat = data.label.split('/')
this.sf1.setValue('/dispatchName', dat[0]);
this.sf1.setValue('/dispatchPhone', dat[1]);
}
},
optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您',
asyncData: () => this.shipperSrv.getStaffList2()
} as SFSelectWidgetSchema