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

批量审核

Browse Source
This commit is contained in:
wangshiming
2022-01-18 17:44:03 +08:00
parent a8a9565b40
commit 8bf3a60425
94 changed files with 2205 additions and 2001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
proxy.conf.js
View File

@ -1,18 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-07 19:42:53
* @LastEditTime: 2022-01-14 16:05:45
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\proxy.conf.js
*/
/**
* For more configuration, please refer to https://angular.io/guide/build#proxying-to-a-backend-server
*
* 更多配置描述请参考 https://angular.cn/guide/build#proxying-to-a-backend-server
*
* Note: The proxy is only valid for real requests, Mock does not actually generate requests, so the priority of Mock will be higher than the proxy
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:13:58
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
module.exports = {
/**
* The following means that all requests are directed to the backend `https://localhost:9000/`

15
src/app/routes/account/account-routing.module.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-11-29 11:06:01
* @LastEditTime: 2021-11-29 14:21:56
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\account\account-routing.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-05 20:15:41
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:30
* @FilePath : \\tms-obc-web\\src\\app\\routes\\account\\account-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { AccountComponentsCenterComponent } from './components/center/center.component';

15
src/app/routes/account/account.module.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-11-29 11:06:01
* @LastEditTime: 2021-11-29 15:42: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\account\account.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-11-29 11:06:01
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\account\\account.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { SharedModule } from '@shared';
import { AccountRoutingModule } from './account-routing.module';

15
src/app/routes/account/components/edit-name/edit-name.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-11-29 11:06:01
* @LastEditTime: 2022-01-10 17:01:56
* @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\account\components\edit-name\edit-name.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-11-29 11:06:01
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:39
* @FilePath : \\tms-obc-web\\src\\app\\routes\\account\\components\\edit-name\\edit-name.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" [formData]="formData">
<ng-template sf-template="smsVerifyCode" let-me let-ui="ui" let-schema="schema">
<div class="valid-code">

15
src/app/routes/account/components/edit-name/edit-name.component.spec.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-11-29 11:06:01
* @LastEditTime: 2021-11-29 11:08:35
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\account\components\edit-name\edit-name.component.spec.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-11-29 11:06:01
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\account\\components\\edit-name\\edit-name.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AccountComponentsEditNameComponent } from './edit-name.component';

15
src/app/routes/account/components/edit-password/edit-password.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-11-29 13:50:46
* @LastEditTime: 2022-01-10 16:51: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\account\components\edit\edit.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-11-29 13:50:46
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\account\\components\\edit-password\\edit-password.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert style="margin-bottom: 15px;" nzType="info" nzMessage="密码为字母和数字组成的8-16个字符，支持符号“_”和“-”。" nzShowIcon></nz-alert>
<form nz-form [formGroup]="validateForm">
<nz-form-item>

15
src/app/routes/account/components/edit-password/edit-password.component.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-11-29 13:50:46
* @LastEditTime: 2022-01-18 16:37:42
* @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\account\components\edit\edit.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-27 10:30:56
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:54
* @FilePath : \\tms-obc-web\\src\\app\\routes\\account\\components\\edit-password\\edit-password.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Inject, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';

15
src/app/routes/account/services/account.service.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-11-02 11:12:21
* @LastEditTime: 2021-12-28 13:52:35
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \scm-ows-ui\src\app\routes\account\services\account.service.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-27 10:30:56
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:59
* @FilePath : \\tms-obc-web\\src\\app\\routes\\account\\services\\account.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Injectable, Injector } from '@angular/core';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';

15
src/app/routes/contract-management/components/contract-detail/contract-detail.component.html
View File

@ -1,11 +1,14 @@
<!--
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-10 14:44:57
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:15:13
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-detail\\contract-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 页头 -->
<page-header-wrapper [logo]="logo" [title]="textStatus" >
<ng-template #logo>

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

@ -1,26 +1,29 @@
/*
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-10 14:44:57
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:15:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-detail\\contract-detail.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { UserCenterComponentsDriverDetailComponent } from './contract-detail.component';
describe('UserCenterComponentsDriverDetailComponent', () => {
let component: UserCenterComponentsDriverDetailComponent;
let fixture: ComponentFixture<UserCenterComponentsDriverDetailComponent>;
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ContractManagementDetailComponent } from './contract-detail.component';
describe('ContractManagementDetailComponent', () => {
let component: ContractManagementDetailComponent;
let fixture: ComponentFixture<ContractManagementDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [UserCenterComponentsDriverDetailComponent],
declarations: [ContractManagementDetailComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(UserCenterComponentsDriverDetailComponent);
fixture = TestBed.createComponent(ContractManagementDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

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

@ -1,24 +1,17 @@
import { Router } from '@angular/router';
/*
* @Author: your name
* @Date: 2022-01-05 11:01:55
* @LastEditTime: 2022-01-18 16:37: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-template-detail\contract-template-detail.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-10 14:44:57
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:15:43
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-detail\\contract-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
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 { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
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({
@ -28,7 +21,6 @@ import { ContractManagementService } from '../../services/contract-management.se
providers: [DatePipe]
})
export class ContractManagementDetailComponent implements OnInit {
constructor(
private nzModalService: NzModalService,
public service: ContractManagementService,
@ -36,7 +28,7 @@ export class ContractManagementDetailComponent implements OnInit {
private datePipe: DatePipe,
private router: Router
) {}
textStatus = '合同详情'
textStatus = '合同详情';
name: any;
code: any;
templateHTML: any;
@ -44,24 +36,24 @@ export class ContractManagementDetailComponent implements OnInit {
templateName: ''
};
ngOnInit() {
this.initData(this.service.$api_contract_get)
this.initData(this.service.$api_contract_get);
}
goBack() {
window.history.go(-1)
window.history.go(-1);
}
initData(url: string) {
this.service.request(url, {id: this.route.snapshot.params.id}).subscribe((res) => {
if(res) {
this.service.request(url, { id: this.route.snapshot.params.id }).subscribe(res => {
if (res) {
this.detailList = res;
this.detailList = res;
let value :any= JSON.parse(res.contractParameter)
this.code = value['${code}']
this.name =value['${name}']
let value: any = JSON.parse(res.contractParameter);
this.code = value['${code}'];
this.name = value['${name}'];
}
})
});
}
cancel() {
window.history.go(-1)
window.history.go(-1);
}
}

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

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-07 15:57:49
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-07 13:29:57
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:04
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-frame\\contract-frame.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-card>
<div nz-row nzGutter="8">

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

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-07 15:57:49
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-07 15:57:49
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-list\\contract-list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->

15
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2022-01-05 11:01:55
* @LastEditTime: 2022-01-06 20:47: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\components\contract-template-detail\contract-template-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:27
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 页头 -->
<page-header-wrapper [logo]="logo" [title]="textStatus" [content]="headerContent">
<ng-template #logo>

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

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-11-29 20:19:08
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ContractManagementTemplateDetailComponent } from './contract-template-detail.component';

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

@ -1,24 +1,18 @@
import { Router } from '@angular/router';
/*
* @Author: your name
* @Date: 2022-01-05 11:01:55
* @LastEditTime: 2022-01-18 16:38:01
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
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 { ActivatedRoute, Router } from '@angular/router';
import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
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({
@ -28,7 +22,6 @@ import { ContractManagementService } from '../../services/contract-management.se
providers: [DatePipe]
})
export class ContractManagementTemplateDetailComponent implements OnInit {
constructor(
private nzModalService: NzModalService,
public service: ContractManagementService,
@ -36,7 +29,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
private datePipe: DatePipe,
private router: Router
) {}
textStatus = '新建模板'
textStatus = '新建模板';
@ViewChild('sf', { static: false }) sf!: SFComponent;
schema: SFSchema = {};
@ViewChild('sf2', { static: false }) sf2!: SFComponent;
@ -51,32 +44,32 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
};
isUpdate = false;
ngOnInit() {
this.initSF()
this.initSF2()
if(this.route.snapshot.queryParams.status == 1) {
this.initSF();
this.initSF2();
if (this.route.snapshot.queryParams.status == 1) {
// 新建
this.isUpdate = true;
} else if(this.route.snapshot.queryParams.status == 2) {
} else if (this.route.snapshot.queryParams.status == 2) {
// 编辑
this.textStatus = '编辑模板';
this.isUpdate =true;
this.initData(this.service.$api_get_contractTemplate)
}else if(this.route.snapshot.queryParams.status == 3) {
this.isUpdate = true;
this.initData(this.service.$api_get_contractTemplate);
} else if (this.route.snapshot.queryParams.status == 3) {
// 编辑
this.textStatus = '查看模板';
this.isUpdate =false;
this.initData(this.service.$api_get_contractTemplate)
this.isUpdate = false;
this.initData(this.service.$api_get_contractTemplate);
}
}
goBack() {
window.history.go(-1)
window.history.go(-1);
}
initSF() {
this.schema = {
properties: {
templateName: {
type: 'string',
title: '模版名称',
title: '模版名称'
},
templateType: {
title: '模板类型',
@ -85,11 +78,11 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'contract:template:type' },
containAllLable:true,
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
contractType: {
title: '单据类型',
@ -98,14 +91,14 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'contract:type' },
containAllLable:true,
containAllLable: true,
visibleIf: {
templateType: value => value === "MX"
templateType: value => value === 'MX'
}
} as SFSelectWidgetSchema
}
} as SFSelectWidgetSchema,
},
}
,required: ['templateName','templateType']
required: ['templateName', 'templateType']
};
this.ui = {
'*': {
@ -133,26 +126,26 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
};
}
initData(url: string) {
this.service.request(url, {id: this.route.snapshot.params.id}).subscribe((res) => {
if(res) {
this.service.request(url, { id: this.route.snapshot.params.id }).subscribe(res => {
if (res) {
this.detailList = res;
this.sfdata = res;
this.sfdata2 = res;
}
})
});
}
cancel() {
window.history.go(-1)
window.history.go(-1);
}
save () {
if( !this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
this.service.msgSrv.error("必填参数为空，请检查再重新保存！");
save() {
if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
return;
}
if(this.sf.value.templateType == 'MX' ) {
if(this.sf.value.contractType == '') {
this.service.msgSrv.error("必填参数为空，请检查再重新保存！");
if (this.sf.value.templateType == 'MX') {
if (this.sf.value.contractType == '') {
this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
return;
}
}
@ -160,12 +153,12 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
...this.sf.value,
...this.sf2.value,
templateTitle: this.title
}
};
this.service.request(this.service.$api_save_contractTemplate, params).subscribe((res: any) => {
if(res) {
this.service.msgSrv.success("保存成功！")
this.router.navigate(['/contract-management/template'])
if (res) {
this.service.msgSrv.success('保存成功！');
this.router.navigate(['/contract-management/template']);
}
})
});
}
}

15
src/app/routes/contract-management/components/contract-template/contract-template.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-06 20:38:46
* @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\supply-management\components\vehicle\vehicle.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template\\contract-template.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="'合同模板'">
</page-header-wrapper>

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

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-07 14:27:59
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-05 09:45:47
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:22
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template\\contract-template.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { ContractManagementTemplateComponent } from './contract-template.component';

15
src/app/routes/contract-management/components/index/index.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2022-01-07 13:27:10
* @LastEditTime: 2022-01-07 13:50:55
* @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\index\index.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-07 13:27:10
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:16:56
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\index\\index.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper title="合同管理" [tab]="tpTab">
</page-header-wrapper>
<ng-template #tpTab>

19
src/app/routes/contract-management/components/index/index.component.ts
View File

@ -1,14 +1,15 @@
/*
* @Author: your name
* @Date: 2022-01-07 13:27:10
* @LastEditTime: 2022-01-07 13:28:59
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\components\index\index.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-07 13:27:10
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\index\\index.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFSchema } from '@delon/form';
import { Component, OnInit } from '@angular/core';
import { ModalHelper, _HttpClient } from '@delon/theme';
@Component({

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

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-07 15:57:49
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-04 21:05:49
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:15:03
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\contract-management-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { ContractManagementDetailComponent } from './components/contract-detail/contract-detail.component';

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

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-07 15:57:49
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-04 21:05:49
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:15:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\contract-management.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@shared';

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

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2022-01-04 21:05:49
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-04 21:05:49
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\services\\contract-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Injectable, Injector } from '@angular/core';
import { BaseService } from 'src/app/shared/services';

14
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2022-01-05 20:15:41
* @LastEditTime: 2022-01-17 14:41:17
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\financial-management\components\withdrawals-record\withdrawals-detail\withdrawals-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-05 20:15:41
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'提现详情'" [logo]="logo">
<ng-template #logo>

14
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-30 19:36:30
* @LastEditTime: 2022-01-04 10:34:31
* @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\financial-management\services\freight-account.service.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Injectable, Injector } from '@angular/core';
import { BaseService, EACacheService, ShipperBaseService } from '@shared';

15
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 15:29: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\order-management\components\vehicle-detail\vehicle-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:29
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">

16
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -1,12 +1,14 @@
import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-05 14:33:56
* @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\vehicle-detail\vehicle-detail.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:37
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { ViewChild } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';

14
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 19:44: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\order-management\components\vehicle-detail\vehicle-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>

16
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -1,12 +1,14 @@
import { Router } from '@angular/router';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 10:10: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\order-management\components\vehicle-detail\vehicle-detail.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Router } from '@angular/router';
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn } from '@delon/abc/st';

14
src/app/routes/order-management/components/bulk/bulk.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-18 14:43:58
* @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\supply-management\components\vehicle\vehicle.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:56
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">

23
src/app/routes/order-management/components/bulk/bulk.component.spec.ts
View File

@ -1,19 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-06 20:03:28
* @LastEditTime: 2021-12-06 20:03:29
* @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\bulk\bulk.component.spec.ts
*/
/*
* @Author: your name
* @Date: 2021-12-06 19:39:49
* @LastEditTime: 2021-12-06 19:41:08
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-06 20:03:28
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:06
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementBulkComponent } from './bulk.component';

14
src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-16 10:19:08
* @LastEditTime: 2022-01-13 14:44:29
* @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-detail\risk-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-04 17:29:18
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:54
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint-detail\\complaint-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'投诉管理'" [logo]="logo">
<ng-template #logo>

14
src/app/routes/order-management/components/complaint-detail/complaint-detail.component.spec.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2022-01-04 17:29:18
* @LastEditTime: 2022-01-04 17:31:21
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\complaint-detail\complaint-detail.component.spec.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-04 17:29:18
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint-detail\\complaint-detail.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementComplaintDetailComponent } from './complaint-detail.component';

15
src/app/routes/order-management/components/complaint/complaint.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-13 20:59:08
* @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\supply-management\components\vehicle\vehicle.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:42
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>

14
src/app/routes/order-management/components/complaint/complaint.component.spec.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-07 14:27:59
* @LastEditTime: 2021-12-07 14:28:59
* @LastEditors: your name
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-07 14:46:19
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementComplaintComponent } from './complaint.component';

19
src/app/routes/order-management/components/risk-detail/risk-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-16 10:19:08
* @LastEditTime: 2021-12-17 11:21:28
* @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-detail\risk-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-16 10:19:08
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:25
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo">
<ng-template #logo>
@ -31,16 +33,11 @@
<sv label="异常原因" col="1">
<div class="bg-grey-lighter p-sm">
{{datailList?.abnormalCause}}
<!-- <div *ngFor="let item of abnormalReason">{{item}}</div> -->
</div>
</sv>
</sv-container>
</nz-card>
<!-- [nzExtra]="extraTemplate" -->
<nz-card nzTitle="申诉信息" >
<!-- <ng-template #extraTemplate>
<button nzType="primary" (click)="edit(i)" nzGhost nz-button>编辑</button>
</ng-template> -->
<sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="datailList">
<ng-template sf-template="enterpriseQualificationCe" let-schema="schema" let-item let-ui="ui">
<app-imagelist [imgList]="datailList?.fileArr"></app-imagelist>

14
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-24 15:36:09
* @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\supply-management\components\vehicle\vehicle.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">

14
src/app/routes/order-management/components/risk/risk.component.spec.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-07 14:27:59
* @LastEditTime: 2021-12-07 14:28:59
* @LastEditors: your name
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-07 14:27:59
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementRiskComponent } from './risk.component';

116
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-17 15:01:35
* @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\vehicle-detail\vehicle-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:14
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@ -14,10 +17,10 @@
</ng-template>
<ng-template #headerContent>
<div class="mb-xs" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.billStatusLabel}}</button>
<h4 class="ml-md" style="font-size: 18px;">订单号: {{ i?.billCode }}</h4>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.billStatusLabel }}</button>
<h4 class="ml-md" style="font-size: 18px">订单号: {{ i?.billCode }}</h4>
</div>
<div nz-row style="display: flex; justify-content: end;">
<div nz-row style="display: flex; justify-content: end">
<div nz-col nzSpan="10">
<button nz-button (click)="cancelChange()">取消修改</button>
<button nz-button nzType="primary" (click)="save()" nzGhost>保存修改</button>
@ -28,25 +31,19 @@
<div sv-container>
<sv label="网络货运人">{{ i?.goodsResource?.enterpriseInfoName }} </sv>
<sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
<sv label="录单员">{{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} </sv>
<sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchName}} </sv>
<sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
<sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
<sv label="录单员">{{ i?.goodsResource?.createUserName }} /{{ i?.goodsResource?.createUserPhone }} </sv>
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchName }} </sv>
</div>
<nz-tabset style="margin-top: 15px;">
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
</nz-tab>
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)">
</nz-tab>
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
</nz-tab>
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
</nz-tab>
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)">
</nz-tab>
<nz-tabset style="margin-top: 15px">
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)"> </nz-tab>
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab>
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)"> </nz-tab>
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)"> </nz-tab>
</nz-tabset>
</div>
</ng-template>
</page-header-wrapper>
@ -54,11 +51,19 @@
<div class="approval-status">
<div style="width: 60%; margin: 0 auto">
<nz-steps [nzLabelPlacement]="'vertical'">
<nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
[nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
<nz-step
[nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
nzIcon="solution"
[nzDescription]="i?.createAt"
nzTitle="下单"
></nz-step>
<nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
[nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step>
<nz-step
*ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
[nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
nzIcon="file-done"
[nzTitle]="'接单'"
></nz-step>
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
</nz-steps>
@ -66,7 +71,6 @@
</div>
</nz-card>
<nz-card>
<div class="card-title"
>装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
@ -99,7 +103,13 @@
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
<div class="align-center">
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
<input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
<input
style="margin-left: 12px"
nz-input
[(ngModel)]="data.contractTelephone"
[ngModelOptions]="{ standalone: true }"
maxlength="11"
/>
</div>
</nz-form-control>
</nz-form-item>
@ -134,7 +144,13 @@
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
<div class="align-center">
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
<input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
<input
style="margin-left: 12px"
nz-input
[(ngModel)]="data.contractTelephone"
[ngModelOptions]="{ standalone: true }"
maxlength="11"
/>
</div>
</nz-form-control>
</nz-form-item>
@ -143,10 +159,10 @@
</div>
<div nz-row [nzGutter]="24" style="margin-top: 24px">
<div nz-col [nzSpan]="9">
<p class="time-info">计划装货时间：{{i?.loadPlanTime}}</p>
<p class="time-info">计划装货时间：{{ i?.loadPlanTime }}</p>
</div>
<div nz-col [nzSpan]="8">
<p class="time-info">计划卸货时间：{{i?.unloadPlanTime}}</p>
<p class="time-info">计划卸货时间：{{ i?.unloadPlanTime }}</p>
</div>
</div>
<ng-template #endInconTemp1><i nz-icon nzType="global"></i></ng-template>
@ -203,7 +219,7 @@
</ng-template>
<ng-template sf-template="drivers" let-item let-ui="ui">
{{i?.driverId}}
{{ i?.driverId }}
</ng-template>
<ng-template sf-template="weightModel" let-item let-ui="ui">
@ -216,18 +232,14 @@
<ng-template sf-template="unloadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker>
</ng-template>
</sf>
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
<div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
<div>总计：{{ i?.total | currency: '￥' }}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
<div>收款人：</div>
</nz-card>
@ -246,19 +258,17 @@
<nz-card nzTitle="补充信息">
<sv-container>
<sv label="是否回单">
{{i?.goodsResource?.stateReceipt ?'是':'否'}}
{{ i?.goodsResource?.stateReceipt ? '是' : '否' }}
</sv>
<sv label="回单类型">
{{i?.goodsResource?.receiptTypeLabel}}
</sv>
<sv label="联系人">
{{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
{{ i?.goodsResource?.receiptTypeLabel }}
</sv>
<sv label="联系人"> {{ i?.goodsResource?.receiptUserId }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
<sv label="所在地区">
{{i?.goodsResource?.receiptAddress}}
{{ i?.goodsResource?.receiptAddress }}
</sv>
<sv label="详细地址">
{{i?.goodsResource?.receiptAddress}}
{{ i?.goodsResource?.receiptAddress }}
</sv>
</sv-container>
<sv-container col="1" class="mt-md">
@ -286,20 +296,20 @@
</nz-modal>
</sv>
<sv label="备注">
{{i?.goodsResource?.remarks}}
{{ i?.goodsResource?.remarks }}
</sv>
</sv-container>
</nz-card>
<nz-card>
<div nz-row>
<nz-card nzTitle="轨迹信息" style="width: 100%;" #distannce5>
<div nz-row >
<div nz-col [nzSpan]='12'>
<nz-card nzTitle="轨迹信息" style="width: 100%" #distannce5>
<div nz-row>
<div nz-col [nzSpan]="12">
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st> -->
</div>
<div nz-col [nzSpan]='12'>
<div nz-col [nzSpan]="12">
<amap-path-simplifier></amap-path-simplifier>
</div>
</div>

306
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -1,26 +1,26 @@
import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-05 14:38:14
* @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\vehicle-detail\vehicle-detail.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { apiConf } from '@conf/api.conf';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { SFComponent, SFSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/form';
import { AmapPoiPickerComponent, AmapService, EAEnvironmentService, ShipperBaseService } from '@shared';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer } from 'rxjs';
import { apiConf } from '@conf/api.conf';
import { OrderManagementService } from '../../services/order-management.service';
import { NzCardComponent } from 'ng-zorro-antd/card';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {
return new Promise((resolve, reject) => {
const reader = new FileReader();
@ -38,14 +38,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
validateForm1: FormGroup;
id = this.route.snapshot.params.id;
@ViewChild('distannce3', { static: false })
i: any= {unLoadingPlaceList:[]};
logColumns: STColumn[] =[]
i: any = { unLoadingPlaceList: [] };
logColumns: STColumn[] = [];
totalDistance = 0.0; //总里程
totalTime = 0.0; //路程总时间
startInfo: any = []; // 装货信息
endInfo: any = []; // 卸货信息
unloadTime: any; // 货源单设置回显
loadTime: any; // 货源单设置回显
loadTime: any; // 货源单设置回显
sf3data: any; // 货源单设置回显
sf4data: any; // 货源单设置回显
dirverPhone: any; // 货源单设置回显
@ -76,21 +76,21 @@ loadTime: any; // 货源单设置回显
private amapService: AmapService,
public shipperservice: ShipperBaseService,
fb: FormBuilder,
private envSrv: EAEnvironmentService,
private envSrv: EAEnvironmentService
) {
this.validateForm1 = fb.group({
loadTime: [null, []],
unloadTime: [null, []],
unloadTime: [null, []]
});
}
ngOnInit(): void {
console.log(this.id)
console.log(this.id);
this.initST();
this.initSF();
this.initSF3();
this.initSF4();
this.initData()
this.initData();
}
initSF() {
this.schema = {
@ -108,7 +108,7 @@ loadTime: any; // 货源单设置回显
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
appId: this.envSrv.env.appId,
appId: this.envSrv.env.appId
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -130,8 +130,8 @@ loadTime: any; // 货源单设置回显
});
},
multiple: false,
listType: 'picture-card',
} as SFUploadWidgetSchema,
listType: 'picture-card'
} as SFUploadWidgetSchema
},
loadingPeopleVehiclesGoodsFilePath: {
type: 'string',
@ -146,7 +146,7 @@ loadTime: any; // 货源单设置回显
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
appId: this.envSrv.env.appId,
appId: this.envSrv.env.appId
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -168,16 +168,16 @@ loadTime: any; // 货源单设置回显
});
},
multiple: false,
listType: 'picture-card',
} as SFUploadWidgetSchema,
listType: 'picture-card'
} as SFUploadWidgetSchema
},
no4: {
type: 'string',
title: '',
ui: {
widget: 'text',
widget: 'text'
},
default: '',
default: ''
},
unloadingLadingBillFilePath: {
type: 'string',
@ -192,7 +192,7 @@ loadTime: any; // 货源单设置回显
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
appId: this.envSrv.env.appId,
appId: this.envSrv.env.appId
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -214,8 +214,8 @@ loadTime: any; // 货源单设置回显
});
},
multiple: false,
listType: 'picture-card',
} as SFUploadWidgetSchema,
listType: 'picture-card'
} as SFUploadWidgetSchema
},
unloadingPeopleVehiclesGoodsFilePath: {
type: 'string',
@ -230,7 +230,7 @@ loadTime: any; // 货源单设置回显
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
appId: this.envSrv.env.appId,
appId: this.envSrv.env.appId
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -252,60 +252,60 @@ loadTime: any; // 货源单设置回显
});
},
multiple: false,
listType: 'picture-card',
} as SFUploadWidgetSchema,
listType: 'picture-card'
} as SFUploadWidgetSchema
},
no5: {
type: 'string',
title: '',
ui: {
widget: 'text',
widget: 'text'
},
default: '',
default: ''
},
no6: {
type: 'string',
title: '',
ui: {
widget: 'text',
widget: 'text'
},
default: '',
default: ''
}
},
},
required: ['loadingLadingBillFilePath','unloadingLadingBillFilePath']
required: ['loadingLadingBillFilePath', 'unloadingLadingBillFilePath']
};
this.ui = {
'*': {
spanLabelFixed: 100,
grid: { span: 20 }
},
$unloadingLadingBillFilePath: { grid: { span: 12} },
$unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
$loadingLadingBillFilePath: { grid: { span: 12} },
$loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
$no5: { grid: { span: 24} },
$unloadingLadingBillFilePath: { grid: { span: 12 } },
$unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
$loadingLadingBillFilePath: { grid: { span: 12 } },
$loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
$no5: { grid: { span: 24 } }
};
}
initData() {
this.service.request(this.service.$api_set_getWholeOrderDetail, {id: this.id}).subscribe(res => {
console.log(res)
this.service.request(this.service.$api_set_getWholeOrderDetail, { id: this.id }).subscribe(res => {
console.log(res);
if (res) {
this.i = res;
// 对装货凭证进行初始化
let arr : any= []
let arr: any = [];
res?.receiptFilePath.forEach((element: any, index: any) => {
console.log(index)
arr.push( {
console.log(index);
arr.push({
url: element,
status: 'done',
uid: index
})
});
});
this.listImagUrls = arr;
this.sf4data = res?.goodsInfoList?.[0]
this.sf4data = res?.goodsInfoList?.[0];
// 对装卸货信息进行初始化
res?.unLoadingPlaceList.forEach((element: any) => {
if(element.type === 1 || element.type === '1') {
if (element.type === 1 || element.type === '1') {
const controlId = this.startInfo.length;
this.startInfo.push({
detailedAddress: element.detailedAddress,
@ -318,11 +318,11 @@ loadTime: any; // 货源单设置回显
area: element.area,
type: element.type,
id: element.id
})
});
this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required));
} else if(element.type === 2 || element.type === '2') {
} else if (element.type === 2 || element.type === '2') {
const controlId = this.endInfo.length;
this.endInfo.push({
detailedAddress: element?.detailedAddress,
@ -335,7 +335,7 @@ loadTime: any; // 货源单设置回显
area: element.area,
type: element.type,
id: element.id
})
});
this.validateForm1.addControl(`unloadAddress${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required));
@ -351,9 +351,9 @@ loadTime: any; // 货源单设置回显
status: 'done',
url: res.loadingLadingBillFilePath,
response: {
url: res.loadingLadingBillFilePath,
},
},
url: res.loadingLadingBillFilePath
}
}
],
loadingPeopleVehiclesGoodsFilePath: [
{
@ -362,9 +362,9 @@ loadTime: any; // 货源单设置回显
status: 'done',
url: res.loadingPeopleVehiclesGoodsFilePath,
response: {
url: res.loadingPeopleVehiclesGoodsFilePath,
},
},
url: res.loadingPeopleVehiclesGoodsFilePath
}
}
],
unloadingLadingBillFilePath: [
{
@ -373,9 +373,9 @@ loadTime: any; // 货源单设置回显
status: 'done',
url: res.unloadingLadingBillFilePath,
response: {
url: res.unloadingLadingBillFilePath,
},
},
url: res.unloadingLadingBillFilePath
}
}
],
unloadingPeopleVehiclesGoodsFilePath: [
{
@ -384,19 +384,18 @@ loadTime: any; // 货源单设置回显
status: 'done',
url: res.unloadingPeopleVehiclesGoodsFilePath,
response: {
url: res.unloadingPeopleVehiclesGoodsFilePath,
},
},
],
url: res.unloadingPeopleVehiclesGoodsFilePath
}
}
]
};
}
// 发车时间到车时间初始化
this.loadTime = res.loadTime
this.unloadTime = res.unloadTime
this.loadTime = res.loadTime;
this.unloadTime = res.unloadTime;
this.dirvingMessage = res.billExpenseDetails;
}
})
});
}
goBack() {
@ -408,34 +407,58 @@ loadTime: any; // 货源单设置回显
}
// 保存修改
save() {
let imgList : any= [];
if(this.listImagUrls.length > 0) {
this.listImagUrls?.forEach((res :any) => {
if(res.url) {
imgList.push(res.url)
let imgList: any = [];
if (this.listImagUrls.length > 0) {
this.listImagUrls?.forEach((res: any) => {
if (res.url) {
imgList.push(res.url);
}
})
});
}
if(typeof(this.unloadTime) !== 'string' ){
if (typeof this.unloadTime !== 'string') {
var c = new Date(this.unloadTime);
this.unloadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
this.unloadTime =
c.getFullYear() +
'-' +
this.addPreZero(c.getMonth() + 1) +
'-' +
this.addPreZero(c.getDate()) +
' ' +
this.addPreZero(c.getHours()) +
':' +
this.addPreZero(c.getMinutes()) +
':' +
this.addPreZero(c.getSeconds());
}
if(typeof(this.loadTime) !== 'string' ) {
if (typeof this.loadTime !== 'string') {
var c = new Date(this.loadTime);
this.loadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
this.loadTime =
c.getFullYear() +
'-' +
this.addPreZero(c.getMonth() + 1) +
'-' +
this.addPreZero(c.getDate()) +
' ' +
this.addPreZero(c.getHours()) +
':' +
this.addPreZero(c.getMinutes()) +
':' +
this.addPreZero(c.getSeconds());
}
console.log('dirvingMessage=>>>>>>'+ this.dirvingMessage)
console.log( this.dirvingMessage)
console.log( this.st._data)
console.log('dirvingMessage=>>>>>>' + this.dirvingMessage);
console.log(this.dirvingMessage);
console.log(this.st._data);
const params = {
id: this.id,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
receiptFilePath: imgList,
goodsInfoDTOList: [{
goodsInfoDTOList: [
{
id: this.i?.goodsInfoList?.[0].id,
goodsName: this.sf3.value?.goodsName,
...this.sf4.value
}],
}
],
// 运费信息
billExpenseDetailDTOList: this.st._data,
// 收款人
@ -445,28 +468,36 @@ loadTime: any; // 货源单设置回显
loadTime: this.loadTime,
// 到车时间
unloadTime: this.unloadTime,
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url,
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data
? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath
: this.sf.value?.loadingLadingBillFilePath?.url,
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data
? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath : this.sf.value?.unloadingLadingBillFilePath?.url,
unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data
? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath
: this.sf.value?.unloadingLadingBillFilePath?.url,
unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url,
}
console.log(params)
unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data
? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url
};
console.log(params);
this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => {
console.log(res)
if(res) {
console.log(res);
if (res) {
this.service.msgSrv.success('修改成功！');
this.router.navigate(['/order-management/vehicle']);
} else {
this.service.msgSrv.error(res?.msg);
}
})
});
}
addPreZero(num: any){
if(num<10){
return '0'+num;
addPreZero(num: any) {
if (num < 10) {
return '0' + num;
} else {
return num;
}
@ -512,9 +543,9 @@ loadTime: any; // 货源单设置回显
}
}
});
}
}
initSF3() {
initSF3() {
this.schema3 = {
properties: {
// enterpriseInfoId: {
@ -548,7 +579,7 @@ initSF3() {
}
}
},
required: ['goodsName',]
required: ['goodsName']
};
this.ui3 = {
'*': {
@ -562,8 +593,8 @@ initSF3() {
grid: { span: 12 }
}
};
}
initST() {
}
initST() {
this.logColumns = [
{ title: '款项', index: 'costName' },
{ title: '总费用（元）', index: 'price' },
@ -581,12 +612,12 @@ initST() {
'1': { text: '待申请', color: 'warning' },
'2': { text: '已支付', color: 'success' },
'3': { text: '已拒绝', color: 'warning' },
'4': { text: '申请中', color: 'warning' },
},
},
'4': { text: '申请中', color: 'warning' }
}
}
];
}
initSF4() {
}
initSF4() {
this.schema4 = {
properties: {
weight: {
@ -653,10 +684,9 @@ initSF4() {
widget: 'custom',
placeholder: '请输入'
}
}
},
},
required: ['weight','loadTime','unloadTime']
required: ['weight', 'loadTime', 'unloadTime']
};
this.ui4 = {
'*': {
@ -686,26 +716,26 @@ initSF4() {
},
$unloadTime: {
grid: { span: 12 }
},
}
};
}
// 处理上传图片
handlePreview1 = async (file: NzUploadFile) => {
}
// 处理上传图片
handlePreview1 = async (file: NzUploadFile) => {
if (!file.url && !file.preview) {
file.preview = await getBase64(file.originFileObj!);
}
this.previewImage1 = file.url || file.preview;
this.previewVisible1 = true;
};
};
handleChange1(info: NzUploadChangeParam): void {
handleChange1(info: NzUploadChangeParam): void {
switch (info.file.status) {
case 'uploading':
break;
case 'done':
let fileList = [...info.fileList];
// 2. Read from response and show file link
console.log(fileList)
console.log(fileList);
fileList = fileList.map((file: any) => {
if (file.response) {
file.url = file.response.data.fullFilePath;
@ -717,8 +747,8 @@ handleChange1(info: NzUploadChangeParam): void {
this.service.msgSrv.error('网络错误');
break;
}
}
beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
}
beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
return new Observable((observer: Observer<boolean>) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp';
if (!isJpgOrPng) {
@ -736,26 +766,26 @@ beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
observer.next(isJpgOrPng && isLt2M);
observer.complete();
});
};
agreement(value: any) {
if(value === '1') {
this.imges = this.i?.supplementAgreement
};
agreement(value: any) {
if (value === '1') {
this.imges = this.i?.supplementAgreement;
} else if (value === '2') {
this.imges = this.i?.supplementAgreement
this.imges = this.i?.supplementAgreement;
}
this.isVisible = true;
}
handleCancel() {
this.isVisible = false
}
handleOK() {
this.isVisible = false
}
goDistance(elf: NzCardComponent) {
}
handleCancel() {
this.isVisible = false;
}
handleOK() {
this.isVisible = false;
}
goDistance(elf: NzCardComponent) {
if (elf) {
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , });
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
// elf['elementRef'].nativeElement.className = 'target-fix'
}
console.log(elf)
}
console.log(elf);
}
}

14
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-18 14:41:30
* @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\vehicle-detail\vehicle-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:41
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>

16
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -1,16 +1,16 @@
import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-18 14:41:28
* @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\vehicle-detail\vehicle-detail.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';

14
src/app/routes/order-management/components/vehicle/vehicle.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-18 14:38:28
* @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\supply-management\components\vehicle\vehicle.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:12:59
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">

15
src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-12 14:01: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\order-management\modal\bulk\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 15:02:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert
style="padding-bottom: 15px;"
nzType="warning"

99
src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts
View File

@ -1,29 +1,20 @@
import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-18 16:34: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\order-management\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 15:02:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { Component, OnInit } from '@angular/core';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer } from 'rxjs';
import { OrderManagementService } from '../../../services/order-management.service';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {
return new Promise((resolve, reject) => {
const reader = new FileReader();
@ -38,9 +29,9 @@ function getBase64(file: File): Promise<string | ArrayBuffer | null> {
styleUrls: ['./confir-receipt.component.less']
})
export class ConfirReceiptComponent implements OnInit {
i:any;
Status:any;
detailList:any;
i: any;
Status: any;
detailList: any;
data: any = {};
driverList: any;
payeeList: any;
@ -48,63 +39,63 @@ export class ConfirReceiptComponent implements OnInit {
listImagUrls: any[] = [];
previewImage1 = '';
previewVisible1 = false;
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService) {}
constructor(
private modal: NzModalRef,
private msgSrv: NzMessageService,
public http: _HttpClient,
public service: OrderManagementService
) {}
ngOnInit(): void {
this.initData()
this.initData();
}
save(): void {
// 大宗
console.log(this.listImagUrls)
let imgList : any= [];
if(this.listImagUrls.length > 0) {
this.listImagUrls.forEach((res :any) => {
if(res.url) {
imgList.push(res.url)
console.log(this.listImagUrls);
let imgList: any = [];
if (this.listImagUrls.length > 0) {
this.listImagUrls.forEach((res: any) => {
if (res.url) {
imgList.push(res.url);
}
})
});
}
console.log(imgList)
console.log(imgList);
const params = {
id: this.i?.id,
filePathList: imgList,
}
console.log(params)
filePathList: imgList
};
console.log(params);
this.service.request(this.service.$api_get_signBulkOrder, params).subscribe((res: any) => {
console.log(res.success)
if(res) {
this.service.msgSrv.success('确认签收成功！')
console.log(res.success);
if (res) {
this.service.msgSrv.success('确认签收成功！');
this.modal.destroy(true);
}
})
});
}
initData() {
// 大宗
this.service.request(this.service.$api_get_getBulkSignForDetail, {id: this.i?.id}).subscribe((res: any) => {
console.log(res)
this.service.request(this.service.$api_get_getBulkSignForDetail, { id: this.i?.id }).subscribe((res: any) => {
console.log(res);
this.detailList = res;
let arr : any= []
let arr: any = [];
res.filePathList.forEach((element: any, index: any) => {
console.log(index)
arr.push( {
console.log(index);
arr.push({
url: element,
status: 'done',
uid: index
})
});
});
this.listImagUrls = arr;
})
});
}
close(): void {
this.modal.destroy(true);
}
userAction() {
}
userAction() {}
handlePreview1 = async (file: NzUploadFile) => {
if (!file.url && !file.preview) {
file.preview = await getBase64(file.originFileObj!);
@ -119,14 +110,14 @@ export class ConfirReceiptComponent implements OnInit {
case 'done':
let fileList = [...info.fileList];
// 2. Read from response and show file link
console.log(fileList)
console.log(fileList);
fileList = fileList.map((file: any) => {
if (file.response) {
file.url = file.response.data.fullFilePath;
}
return file;
});
console.log(this.listImagUrls)
console.log(this.listImagUrls);
break;
case 'error':
this.service.msgSrv.error('网络错误');

18
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
View File

@ -1,20 +1,22 @@
<!--
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-17 17:02:31
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:21:21
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 24 } } }" [button]="'none'"> </sf>
<nz-divider style="margin-top: 0"></nz-divider>
<div>
<p style="font-size: 16px">
<span style="font-weight: bolder"
>总运费：<span style="color: #dc112a">{{ data.totalFreight |currency }}</span></span
>总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span
>
</p>
<p style="margin-bottom: 0"> 运输费：{{ data.freight |currency }}，附加费：{{ data.surcharge |currency}}</p>
<p style="margin-bottom: 0"> 运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}</p>
</div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>

44
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
View File

@ -1,17 +1,15 @@
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-17 17:02:25
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:21:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {
SFComponent, SFNumberWidgetSchema, SFSchema,
SFSelectWidgetSchema,
SFStringWidgetSchema, SFTextWidgetSchema
} from '@delon/form';
import { SFComponent, SFNumberWidgetSchema, SFSchema, SFSelectWidgetSchema, SFStringWidgetSchema, SFTextWidgetSchema } from '@delon/form';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { Subscription } from 'rxjs';
import { OrderManagementService } from '../../../services/order-management.service';
@ -29,7 +27,7 @@ export class UpdateFreightComponent implements OnInit {
data: any;
calculateSub!: Subscription;
constructor(private service: OrderManagementService,private modal: NzModalRef, ) {}
constructor(private service: OrderManagementService, private modal: NzModalRef) {}
ngOnInit(): void {
this.schema = this.initSF(this.data);
@ -47,8 +45,8 @@ export class UpdateFreightComponent implements OnInit {
freightPrice: {
type: 'number',
title: '运费单价',
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
addOnAfter: data.freightTypeLabel,
placeholder: '请输入',
@ -107,8 +105,8 @@ export class UpdateFreightComponent implements OnInit {
type: 'number',
title: '装货重量',
default: data.acceptWeight,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -123,8 +121,8 @@ export class UpdateFreightComponent implements OnInit {
type: 'number',
title: '装货体积',
default: data.acceptVolume,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -139,8 +137,8 @@ export class UpdateFreightComponent implements OnInit {
type: 'number',
title: '卸货重量',
default: data.settlementWeight,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -155,8 +153,8 @@ export class UpdateFreightComponent implements OnInit {
type: 'number',
title: '卸货体积',
default: data.settlementVolume,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -207,7 +205,7 @@ export class UpdateFreightComponent implements OnInit {
}
save(value: any): void {
if(!this.sf.valid){
if (!this.sf.valid) {
this.sf.validator({ emitError: true });
return;
}

25
src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts
View File

@ -1,27 +1,22 @@
/*
* @Author: your name
* @Date: 2021-12-21 10:14:52
* @LastEditTime: 2022-01-18 16:35:03
* @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\modal\vehicle\cancel\cancel.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-21 10:14:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:21:43
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel\\cancel.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFComponent, SFSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
@Component({
selector: 'app-order-management-cancel',
templateUrl: './cancel.component.html'
@ -36,7 +31,7 @@ export class OneCarOrderCancelComponent implements OnInit {
ngOnInit(): void {
this.initSF();
console.log(this.i.billStatusLabel)
console.log(this.i.billStatusLabel);
}
initSF() {
this.schema = {

18
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-12 14:04:38
* @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\modal\vehicle\confir-receipt\confir-receipt.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:21:57
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert
style="padding-bottom: 15px"
@ -18,10 +20,10 @@
<st #st [widthMode]="{ type: 'strict' }" [data]="costDetail" [columns]="columns" bordered="true" [page]="{ show: false }"></st>
</sv>
<sv label="司机车辆">
<div>{{dataInfo?.driverName}} / {{dataInfo?.driverPhone}}/ {{dataInfo?.carNo}}</div>
<div>{{ dataInfo?.driverName }} / {{ dataInfo?.driverPhone }}/ {{ dataInfo?.carNo }}</div>
</sv>
<sv label="收款人">
<div>{{dataInfo?.payeeName}} / {{dataInfo?.payeePhone}}</div>
<div>{{ dataInfo?.payeeName }} / {{ dataInfo?.payeePhone }}</div>
</sv>
<sv label="回单凭证">
<nz-upload

119
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts
View File

@ -1,30 +1,21 @@
/*
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-18 16:35:11
* @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\modal\vehicle\confir-receipt\confir-receipt.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:22:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
import { Component, OnInit } from '@angular/core';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer } from 'rxjs';
import { STColumn } from '@delon/abc/st';
import { OrderManagementService } from '../../../services/order-management.service';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {
return new Promise((resolve, reject) => {
const reader = new FileReader();
@ -40,47 +31,52 @@ function getBase64(file: File): Promise<string | ArrayBuffer | null> {
})
export class VehicleConfirReceiptComponent implements OnInit {
record: any = {};
i:any;
Status: any
costDetail: any // 费用明细
i: any;
Status: any;
costDetail: any; // 费用明细
columns!: STColumn[];
previewVisible1 = false;
dataInfo: any;
detailList: any
detailList: any;
data: any = {};
previewImage1 = '';
listImagUrls: any[] = [];
payeeList: any;
driverList: any;
carList: any;
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient,public service: OrderManagementService) {}
constructor(
private modal: NzModalRef,
private msgSrv: NzMessageService,
public http: _HttpClient,
public service: OrderManagementService
) {}
ngOnInit(): void {
this.initST()
this.initData()
this.initST();
this.initData();
}
save(): void {
let imgList : any= [];
if(this.listImagUrls.length > 0) {
this.listImagUrls.forEach((res :any) => {
if(res.url) {
imgList.push(res.url)
let imgList: any = [];
if (this.listImagUrls.length > 0) {
this.listImagUrls.forEach((res: any) => {
if (res.url) {
imgList.push(res.url);
}
})
});
}
console.log(imgList)
console.log(imgList);
const params = {
id: this.i?.id,
filePathList: imgList,
}
filePathList: imgList
};
this.service.request(this.service.$api_get_signWholeOrder, params).subscribe((res: any) => {
console.log(res)
if(res) {
this.service.msgSrv.success('确认签收成功！')
console.log(res);
if (res) {
this.service.msgSrv.success('确认签收成功！');
this.modal.destroy();
}
})
});
}
handlePreview1 = async (file: NzUploadFile) => {
if (!file.url && !file.preview) {
@ -114,35 +110,35 @@ export class VehicleConfirReceiptComponent implements OnInit {
};
initData() {
// 大宗
this.service.request(this.service.$api_get_getWholeSignForDetail, {id: this.i?.id}).subscribe((res: any) => {
console.log(res)
this.service.request(this.service.$api_get_getWholeSignForDetail, { id: this.i?.id }).subscribe((res: any) => {
console.log(res);
this.dataInfo = res;
const cost: any = {}
const cost: any = {};
res.mybidDetailInfo.forEach((element: any) => {
if(element.expenseName === "预付" || element.expenseCode === 'PRE') {
cost.PRE = element.price
} else if(element.expenseName === "到付" || element.expenseCode === 'RECE') {
cost.RECE = element.price
} else if(element.expenseName === "回单付" || element.expenseCode === 'BACK') {
cost.BACK = element.price
} else if(element.expenseName === "油卡" || element.expenseCode === 'OIL') {
cost.OIL = element.price
} else if(element.expenseName === "总费用") {
cost.traiPrice = element.price
if (element.expenseName === '预付' || element.expenseCode === 'PRE') {
cost.PRE = element.price;
} else if (element.expenseName === '到付' || element.expenseCode === 'RECE') {
cost.RECE = element.price;
} else if (element.expenseName === '回单付' || element.expenseCode === 'BACK') {
cost.BACK = element.price;
} else if (element.expenseName === '油卡' || element.expenseCode === 'OIL') {
cost.OIL = element.price;
} else if (element.expenseName === '总费用') {
cost.traiPrice = element.price;
}
});
let arr : any= []
let arr: any = [];
res.filePathList.forEach((element: any, index: any) => {
console.log(index)
arr.push( {
console.log(index);
arr.push({
url: element,
status: 'done',
uid: index
})
});
});
this.listImagUrls = arr;
this.costDetail = [cost];
})
});
}
initST() {
@ -177,19 +173,18 @@ export class VehicleConfirReceiptComponent implements OnInit {
case 'done':
let fileList = [...info.fileList];
// 2. Read from response and show file link
console.log(fileList)
console.log(fileList);
fileList = fileList.map((file: any) => {
if (file.response) {
file.url = file.response.data.fullFilePath;
}
return file;
});
console.log(this.listImagUrls)
console.log(this.listImagUrls);
break;
case 'error':
this.service.msgSrv.error('网络错误');
break;
}
}
}

16
src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html
View File

@ -1,13 +1,15 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2021-12-29 20:23:18
* @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\modal\vehicle\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 16:48:16
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:22:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\freight-people\\freight-people.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert>
<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf?.value)" [disabled]="sf?.valid">确定</button>

39
src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
View File

@ -1,19 +1,19 @@
import { Params } from '@angular/router';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-17 16:20:06
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 16:48:16
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:22:37
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\freight-people\\freight-people.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema} from '@delon/form';
import { Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { ShipperBaseService } from '@shared';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
import { ShipperBaseService } from '@shared';
@Component({
selector: 'app-order-management-vehicle-freight-people',
@ -33,11 +33,11 @@ export class VehicleFreightPeopleComponent implements OnInit {
private modal: NzModalRef,
private msgSrv: NzMessageService,
public service: OrderManagementService,
public shipperservice: ShipperBaseService,
public shipperservice: ShipperBaseService
) {}
ngOnInit(): void {
console.log(this.data)
console.log(this.data);
this.initSF();
}
initSF() {
@ -50,12 +50,12 @@ export class VehicleFreightPeopleComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
_$expand: (value: boolean) => value
},
allowClear: true,
asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
},
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
}
},
required: ['enterpriseInfoName']
};
@ -68,12 +68,12 @@ export class VehicleFreightPeopleComponent implements OnInit {
}
save(value: any): void {
console.log(this.sf.value)
console.log(this.sf.value);
const params = {
billIds: this.data?.ids,
enterpriseInfoId: this.sf.value?.enterpriseInfoName
};
console.log(params)
console.log(params);
this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => {
if (res) {
this.modal.destroy();
@ -85,5 +85,4 @@ export class VehicleFreightPeopleComponent implements OnInit {
close(): void {
this.modal.destroy();
}
}

47
src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html
View File

@ -1,45 +1,38 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-05 16:38: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\order-management\modal\vehicle\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 17:27:37
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:22:55
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '条订单,未认证司机不可设置为车队长，合同单车队长需绑定收款账户！'" nzShowIcon></nz-alert>
<nz-alert
nzType="info"
[nzMessage]="'已选择' + data?.ids?.length + '条订单,未认证司机不可设置为车队长，合同单车队长需绑定收款账户！'"
nzShowIcon
></nz-alert>
<div nz-row>
<div nz-col [nzSpan]="16">
<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button='none'>
</sf>
<sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"> </sf>
</div>
<div nz-col [nzSpan]="1" style="margin-top: 15px;" >
<button style="display: inline-block;" nz-button nzType="primary" (click)="initDate()">搜索</button>
<div nz-col [nzSpan]="1" style="margin-top: 15px">
<button style="display: inline-block" nz-button nzType="primary" (click)="initDate()">搜索</button>
</div>
</div>
<st #st
[data]="dataList"
[columns]="Columns"
[loadingDelay]="500"
>
<st #st [data]="dataList" [columns]="Columns" [loadingDelay]="500">
<ng-template st-row="avatar" let-item let-index="index">
<img style="height: 20px;" [src]="item?.avatar" alt="">
<img style="height: 20px" [src]="item?.avatar" alt="" />
</ng-template>
<ng-template st-row="bankList" let-item let-index="index">
<nz-select [(ngModel)]="bankData" style="width: 200px;">
<nz-option
*ngFor="let i of item.bankList"
[nzLabel]="i.bankCardNumber"
[nzValue]="i.id"
></nz-option>
<nz-select [(ngModel)]="bankData" style="width: 200px">
<nz-option *ngFor="let i of item.bankList" [nzLabel]="i.bankCardNumber" [nzValue]="i.id"></nz-option>
</nz-select>
</ng-template>
<ng-template st-row="paymentMethodRate" let-item let-index="index">
<input nz-input [ngModel]="item?.paymentMethodRate" (ngModelChange)="st.setRow(index, { paymentMethodRate: $event })" />
</ng-template>
</st>
<!-- <div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="sf.valid">确定</button>
</div> -->

55
src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts
View File

@ -1,14 +1,16 @@
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-05 16:27:22
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-30 14:45:39
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:11
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
import {SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema} from '@delon/form';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
@ -23,16 +25,16 @@ export class VehicleModifyCaptainComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent;
schema: SFSchema = {};
ui: SFUISchema = {};
Columns: STColumn[] =[]
Columns: STColumn[] = [];
aggreechecked = false;
dataList: any =[]
dataList: any = [];
data: any;
bankData: any;
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, ) {}
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}
ngOnInit(): void {
console.log(this.data)
console.log(this.data);
this.initSF();
this.initST();
}
@ -43,7 +45,7 @@ export class VehicleModifyCaptainComponent implements OnInit {
type: 'string',
title: '车队长手机号',
maxLength: 11
},
}
},
required: ['mobile']
};
@ -56,8 +58,8 @@ export class VehicleModifyCaptainComponent implements OnInit {
}
initST() {
this.Columns = [
{ title: '司机头像', render: 'avatar',width: '120px', },
{ title: '司机姓名', index: 'name' ,width: '120px',},
{ title: '司机头像', render: 'avatar', width: '120px' },
{ title: '司机姓名', index: 'name', width: '120px' },
{
title: '实名认证状态',
className: 'text-center',
@ -68,10 +70,10 @@ export class VehicleModifyCaptainComponent implements OnInit {
'-1': { text: '未提交', color: 'warning' },
'0': { text: '待审核', color: 'warning' },
'1': { text: '通过', color: 'success' },
'2': { text: '驳回', color: 'error' },
'2': { text: '驳回', color: 'error' }
}
},
},
{ title: '收款账户',width: '200px', render: 'bankList' },
{ title: '收款账户', width: '200px', render: 'bankList' },
{
title: '操作',
width: '120px',
@ -80,19 +82,18 @@ export class VehicleModifyCaptainComponent implements OnInit {
{
text: '设置',
click: item => {
this.set(item)
this.set(item);
}
}
]
}
];
}
set(value: any): void {
console.log(this.st?._data)
console.log(this.data)
console.log(value)
console.log(this.bankData)
console.log(this.st?._data);
console.log(this.data);
console.log(value);
console.log(this.bankData);
const params = {
billIds: this.data?.ids,
carCaptainId: value.id,
@ -110,12 +111,12 @@ export class VehicleModifyCaptainComponent implements OnInit {
initDate() {
const params = {
fetchBank: 1,
...this.sf?.value,
...this.sf?.value
};
this.service.request(this.service.$api_get_getCarCaptainByMobile, params).subscribe((res: any) => {
console.log(res)
console.log(res);
if (res) {
this.dataList = [res]
this.dataList = [res];
}
});
}

18
src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
View File

@ -1,14 +1,16 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-04 11:10:46
* @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\modal\vehicle\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 14:51:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:25
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert>
<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" >确定</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)">确定</button>
</div>

46
src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
View File

@ -1,24 +1,16 @@
import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-04 11:21:29
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 14:51:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:46
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
@ -41,7 +33,7 @@ export class VehicleModifyRateComponent implements OnInit {
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}
ngOnInit(): void {
console.log(this.data)
console.log(this.data);
this.initSF();
}
initSF() {
@ -53,9 +45,9 @@ export class VehicleModifyRateComponent implements OnInit {
ui: {
unit: '%',
widgetWidth: 200,
precision: 2,
precision: 2
} as SFNumberWidgetSchema
},
}
},
required: ['additionalRate']
};
@ -68,23 +60,22 @@ export class VehicleModifyRateComponent implements OnInit {
}
save(value: any): void {
if(!this.sf.value?.additionalRate) {
this.service.msgSrv.warning('请填写附加费！')
if (!this.sf.value?.additionalRate) {
this.service.msgSrv.warning('请填写附加费！');
return;
}
console.log(this.sf.value)
console.log(this.sf.value);
const params = {
ids: this.data?.ids,
...this.sf.value
};
console.log(params)
console.log(params);
this.service.request(this.service.$api_set_updateAdditionalRateBatch, params).subscribe((res: any) => {
if (res) {
this.modal.close(true);
this.service.msgSrv.success('变更运费成功');
} else {
this.service.msgSrv.error(res?.msg)
this.service.msgSrv.error(res?.msg);
}
});
}
@ -92,5 +83,4 @@ export class VehicleModifyRateComponent implements OnInit {
close(): void {
this.modal.destroy();
}
}

23
src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html
View File

@ -1,20 +1,23 @@
<!--
* @Author: your name
* @Date: 2021-12-14 15:53:03
* @LastEditTime: 2021-12-20 19:53:23
* @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\modal\bulk\sure-depart\sure-depart.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:52
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-arrive\\sure-arrive.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="formData" button="none">
<ng-template sf-template="weight" let-me let-ui="ui" let-schema="schema">
<div style="display: flex;">
<div style="display: flex">
<nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
<div class="left_btn">吨</div>
</div>
</ng-template>
<ng-template sf-template="volume" let-me let-ui="ui" let-schema="schema">
<div style="display: flex;">
<div style="display: flex">
<nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
<div class="left_btn">方</div>
</div>
@ -23,7 +26,5 @@
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading"
>确认到车</button
>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading">确认到车</button>
</div>

23
src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html
View File

@ -1,20 +1,23 @@
<!--
* @Author: your name
* @Date: 2021-12-14 15:53:03
* @LastEditTime: 2021-12-21 18:55:37
* @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\modal\bulk\sure-depart\sure-depart.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-depart\\sure-depart.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
<ng-template sf-template="weight" let-me let-ui="ui" let-schema="schema">
<div style="display: flex;">
<div style="display: flex">
<nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="999999" [nzStep]="1"></nz-input-number>
<div class="left_btn">吨</div>
</div>
</ng-template>
<ng-template sf-template="volume" let-me let-ui="ui" let-schema="schema">
<div style="display: flex;">
<div style="display: flex">
<nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="999999" [nzStep]="1"></nz-input-number>
<div class="left_btn">方</div>
</div>
@ -23,7 +26,5 @@
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading"
>确认发车</button
>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading">确认发车</button>
</div>

17
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-17 14:52:34
* @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\modal\vehicle\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<nz-divider></nz-divider>
<div>
@ -13,7 +16,7 @@
<span style="font-weight: bolder"
>总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span
>
（运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency}}）
（运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}）
</p>
<p>
<label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label>

43
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
View File

@ -1,28 +1,19 @@
import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-13 15:26:14
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { SFComponent, SFNumberWidgetSchema, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
import { Subscription } from 'rxjs';
import { OrderManagementService } from '../../../services/order-management.service';
@Component({
selector: 'app-order-management-vehicle-update-freight',
@ -58,8 +49,8 @@ export class VehicleUpdateFreightComponent implements OnInit {
type: 'number',
title: '预付',
default: info.prePay?.price || 0,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
readOnly: info.prePay?.paymentStatus === '2' || info.prePay?.paymentStatus === '4',
ui: {
prefix: '￥',
@ -72,8 +63,8 @@ export class VehicleUpdateFreightComponent implements OnInit {
type: 'number',
title: '到付',
default: info.toPay?.price || 0,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
readOnly: info.toPay?.paymentStatus === '2' || info.toPay?.paymentStatus === '4',
ui: {
prefix: '￥',
@ -98,9 +89,9 @@ export class VehicleUpdateFreightComponent implements OnInit {
receiptPay: {
type: 'number',
title: '回单付',
maximum:99999,
maximum: 99999,
default: info.receiptPay?.price || 0,
minimum:0,
minimum: 0,
readOnly: info.receiptPay?.paymentStatus === '2' || info.receiptPay?.paymentStatus === '4',
ui: {
prefix: '￥',
@ -130,7 +121,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
}
save(value: any): void {
if(!this.sf.valid) {
if (!this.sf.valid) {
this.service.msgSrv.error('请填写必填项！');
return;
}

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

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-04 17:31:44
* @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\order-management-routing.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-06 09:24:00
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

15
src/app/routes/order-management/order-management.module.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-04 17:31:58
* @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\order-management.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-06 09:24:00
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule, Type } from '@angular/core';
import { SharedModule } from '@shared';
import { OrderManagementBulkDetailChangeComponent } from './components/bulk-detail-change/bulk-detail-change.component';

31
src/app/routes/order-management/services/order-management.service.ts
View File

@ -1,20 +1,22 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 14:08:57
* @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\services\order-management.service.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Injectable, Injector } from '@angular/core';
import { map } from 'rxjs/operators';
import { EACacheService, ShipperBaseService } from '@shared';
import { map } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
export class OrderManagementService extends ShipperBaseService {
$api_get_getEnterpriseNetTransHis = `/api/mdc/enterpriseNetTransHis/getEnterpriseNetTransHis`;
$api_get_catalogue_member = `/user?_allow_anonymous=true`;
$api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`;
@ -37,7 +39,7 @@ export class OrderManagementService extends ShipperBaseService {
// 整车详情
$api_get_getWholeBillDetail = `/api/sdc/billOperate/getWholeBillDetail`;
// 根据车牌号查询车辆信息
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;
$api_get_getCarLicenseListByCarNo = `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;
// 查询大宗订单列表
$api_get_listBulkPage = `/api/sdc/billOperate/listBulkPage`;
@ -106,7 +108,6 @@ export class OrderManagementService extends ShipperBaseService {
// 批量修改附加费率
$api_set_updateAdditionalRateBatch = `/api/sdc/billOperate/updateAdditionalRateBatch`;
// 查询投诉列表
$api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`;
// 获取投诉表详情
@ -116,15 +117,11 @@ export class OrderManagementService extends ShipperBaseService {
// 撤销投诉
$api_get_canelComplaint = `/api/sdc/complaint/operate/canelComplaint`;
// 批量修改车队长
$api_get_updateCarCaptainBatch = `/api/sdc/billOperate/updateCarCaptainBatch`;
// 根据手机号查询车队长/司机
$api_get_getCarCaptainByMobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`;
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
/**
@ -134,7 +131,7 @@ export class OrderManagementService extends ShipperBaseService {
getNetworkFreightForwarderHistory(params: any) {
const param = {
enterpriseIds: params.enterpriseInfoIds
}
};
return this.request(this.$api_get_getEnterpriseNetTransHis, param).pipe(
map((res: any) => {
if (!res) {
@ -148,7 +145,7 @@ export class OrderManagementService extends ShipperBaseService {
})
);
}
constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
super(injector,eaCacheSrv)
constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);
}
}

121
src/app/routes/passport/components/login/login.component.html
View File

@ -1,16 +1,19 @@
<!--
* @Author: your name
* @Date: 2022-01-10 19:33:37
* @LastEditTime: 2022-01-10 19:56:52
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\passport\components\login\login.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-10 19:33:37
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:43
* @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\components\\login\\login.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div class="body-box">
<div></div>
<div>
<div class="box-content d-flex">
<img src="./assets/images/user/login-image.png" class="login-logo" alt="">
<img src="./assets/images/user/login-image.png" class="login-logo" alt="" />
<div class="login-box">
<div class="login-box-content">
<nz-tabset (nzSelectChange)="switch($event)">
@ -18,24 +21,57 @@
<sf #accountSF [layout]="'vertical'" [schema]="accountSchema" [ui]="accountUI" [button]="'none'">
<ng-template sf-template="username" let-i let-ui="ui" let-schema="schema">
<nz-input-group [nzSuffix]="inputClearTpl">
<input type="text" nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)"
(keyup.enter)="submit()" placeholder="请输入手机号" />
<input
type="text"
nz-input
[ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
(keyup.enter)="submit()"
placeholder="请输入手机号"
/>
</nz-input-group>
<ng-template #inputClearTpl>
<i nz-icon class="ant-input-clear-icon" nzTheme="fill" nzType="close-circle" *ngIf="i.value"
style="font-size: 16px;" (click)="i.setValue(null)"></i>
<i
nz-icon
class="ant-input-clear-icon"
nzTheme="fill"
nzType="close-circle"
*ngIf="i.value"
style="font-size: 16px"
(click)="i.setValue(null)"
></i>
</ng-template>
</ng-template>
<ng-template sf-template="password" let-i let-ui="ui" let-schema="schema">
<nz-input-group [nzSuffix]="inputClearTpl">
<input [type]="isPasswordType?'password':'text'" nz-input [ngModel]="i.value"
(ngModelChange)="i.setValue($event)" placeholder="请输入密码" (keyup.enter)="submit()" />
<input
[type]="isPasswordType ? 'password' : 'text'"
nz-input
[ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
placeholder="请输入密码"
(keyup.enter)="submit()"
/>
</nz-input-group>
<ng-template #inputClearTpl>
<i *ngIf="i.value && isPasswordType" nz-icon class="ant-input-clear-icon" style="font-size: 18px;"
nzType="eye" nzTheme="fill" (click)="isPasswordType=false"></i>
<i *ngIf="i.value && !isPasswordType" nz-icon class="ant-input-clear-icon" style="font-size: 18px;"
nzType="eye-invisible" nzTheme="fill" (click)="isPasswordType=true"></i>
<i
*ngIf="i.value && isPasswordType"
nz-icon
class="ant-input-clear-icon"
style="font-size: 18px"
nzType="eye"
nzTheme="fill"
(click)="isPasswordType = false"
></i>
<i
*ngIf="i.value && !isPasswordType"
nz-icon
class="ant-input-clear-icon"
style="font-size: 18px"
nzType="eye-invisible"
nzTheme="fill"
(click)="isPasswordType = true"
></i>
</ng-template>
</ng-template>
</sf>
@ -44,26 +80,57 @@
<sf #captchaSF [layout]="'vertical'" [schema]="captchaSchema" [ui]="captchaUI" [button]="'none'">
<ng-template sf-template="phone" let-i let-ui="ui" let-schema="schema">
<nz-input-group [nzSuffix]="inputClearTpl">
<input type="text" nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)"
(keyup.enter)="submit()" placeholder="请输入手机号" />
<input
type="text"
nz-input
[ngModel]="i.value"
(ngModelChange)="i.setValue($event)"
(keyup.enter)="submit()"
placeholder="请输入手机号"
/>
</nz-input-group>
<ng-template #inputClearTpl>
<i nz-icon class="ant-input-clear-icon" nzTheme="fill" nzType="close-circle" *ngIf="i.value"
style="font-size: 16px;" (click)="i.setValue(null)"></i>
<i
nz-icon
class="ant-input-clear-icon"
nzTheme="fill"
nzType="close-circle"
*ngIf="i.value"
style="font-size: 16px"
(click)="i.setValue(null)"
></i>
</ng-template>
</ng-template>
<ng-template sf-template="smsCode" let-me let-ui="ui" let-schema="schema">
<nz-input-group nzSearch [nzSuffix]="suffixTemplateInfo">
<input nz-input type="text" [maxLength]="6" placeholder="验证码" [attr.id]="me.id" [disabled]="me.disabled"
[attr.disabled]="me.disabled" [nzSize]="ui.size" [ngModel]="me.formProperty.value"
(ngModelChange)="me.setValue($event)" (keyup.enter)="submit()" />
<input
nz-input
type="text"
[maxLength]="6"
placeholder="验证码"
[attr.id]="me.id"
[disabled]="me.disabled"
[attr.disabled]="me.disabled"
[nzSize]="ui.size"
[ngModel]="me.formProperty.value"
(ngModelChange)="me.setValue($event)"
(keyup.enter)="submit()"
/>
</nz-input-group>
</ng-template>
</sf>
</nz-tab>
</nz-tabset>
<button nz-button type="button" nzType="primary" nzSize="large" (click)="submit()"
[nzLoading]="userSrv?.http?.loading" nzBlock class="mt-md">
<button
nz-button
type="button"
nzType="primary"
nzSize="large"
(click)="submit()"
[nzLoading]="userSrv?.http?.loading"
nzBlock
class="mt-md"
>
登录
</button>
<p class="forgetPwd mt-xl" routerLink="/passport/retrieve-password">忘记密码</p>
@ -83,7 +150,7 @@
<ng-template #suffixTemplateInfo>
<ng-container *ngIf="count < 1; else intervalTemplate">
<span class="msg-btn" style="color: #26282A; cursor: pointer;font-size: 14px;" (click)="getCaptcha()">获取验证码</span>
<span class="msg-btn" style="color: #26282a; cursor: pointer; font-size: 14px" (click)="getCaptcha()">获取验证码</span>
</ng-container>
<ng-template #intervalTemplate> 请等待{{ count }}s </ng-template>
</ng-template>

17
src/app/routes/passport/services/passport.service.ts
View File

@ -1,16 +1,15 @@
/*
* @Author: your name
* @Date: 2021-12-27 21:08:36
* @LastEditTime: 2022-01-10 17:36:25
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\passport\services\passport.service.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-27 21:08:36
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:52
* @FilePath : \\tms-obc-web\\src\\app\\routes\\passport\\services\\passport.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Injectable, Injector } from '@angular/core';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { BaseService } from 'src/app/shared/services/core/base.service';
import { EAFileUtil } from 'src/app/shared/utils/file.util';
@Injectable({
providedIn: 'root'

15
src/app/routes/routes-routing.module.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-11-29 10:20:33
* @LastEditTime: 2021-12-07 16:12:50
* @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\routes-routing.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-13 19:22:47
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:25
* @FilePath : \\tms-obc-web\\src\\app\\routes\\routes-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
// layout

93
src/app/routes/supply-goods/components/carload/carload.component.html
View File

@ -1,28 +1,20 @@
<!--
* @Author: your name
* @Date: 2021-12-01 09:58:58
* @LastEditTime: 2021-12-01 20:00: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\supply-goods\components\carload\carload.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-01 09:58:58
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:25:29
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-goods\\components\\carload\\carload.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-card>
<!-- 搜索区 -->
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
</div>
<!-- [loading]="service.http.loading" -->
@ -32,7 +24,6 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -90,54 +81,54 @@
<tbody>
<tr *ngFor="let data of nzTable.data">
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
<div><span style="color: #52c41a;">●</span>已接单</div>
<div><span >●</span>已取消</div>
<div><span style="color: #f59a23;">●</span>待接单</div>
<div><span style="color: #52c41a">●</span>已接单</div>
<div><span>●</span>已取消</div>
<div><span style="color: #f59a23">●</span>待接单</div>
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
<div>
<div><span style="color: #52c41a;">●</span>审核通过</div>
<div><span style="color: #d9001b;">●</span>不通过</div>
<div><span style="color: #f59a23;">●</span>待审核</div>
<div><span style="color: #52c41a">●</span>审核通过</div>
<div><span style="color: #d9001b">●</span>不通过</div>
<div><span style="color: #f59a23">●</span>待审核</div>
<!-- <span>待审核</span> -->
</div>
</td>
@ -156,12 +147,18 @@
</nz-tabset>
</nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="修改运费" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('suppliersType')">
<nz-modal
[(nzVisible)]="isVisible"
[nzFooter]="nzModalFooter"
nzTitle="修改运费"
(nzOnOk)="handleOK()"
(nzOnCancel)="handleCancel('suppliersType')"
>
<ng-container *nzModalContent>
<sf #sfFre [schema]="freightSchema" [ui]="uiFre" [compact]="false" [button]="'none'">
<ng-template sf-template="manys" let-me let-ui="ui" let-schema="schema">
<div>
<span>{{this.sfFre.value.contactsName}}</span>
<span>{{ this.sfFre.value.contactsName }}</span>
</div>
</ng-template>
<ng-template sf-template="unifiedSocia" let-me let-ui="ui" let-schema="schema">
@ -171,15 +168,13 @@
[nzMax]="30"
nzPlaceHolder="请输入1-30"
id="margin"
width=400
width="400"
ngDefaultControl
required
></nz-input-number
>&nbsp; &nbsp;天内支付运费。
</ng-template>
<ng-template sf-template="fujia" let-me let-ui="ui" let-schema="schema">
15.00（费率：<a href="javaccript:;">5.3</a> ）
</ng-template>
<ng-template sf-template="fujia" let-me let-ui="ui" let-schema="schema"> 15.00（费率：<a href="javaccript:;">5.3</a> ） </ng-template>
</sf>
</ng-container>
<ng-template #nzModalFooter>
@ -188,10 +183,16 @@
</ng-template>
</nz-modal>
<nz-modal [(nzVisible)]="isVisibleAssign" [nzWidth]="900" [nzFooter]="nzModalFooter" nzTitle="指派熟车" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('assign')">
<nz-modal
[(nzVisible)]="isVisibleAssign"
[nzWidth]="900"
[nzFooter]="nzModalFooter"
nzTitle="指派熟车"
(nzOnOk)="handleOK()"
(nzOnCancel)="handleCancel('assign')"
>
<ng-container *nzModalContent>
<sf #sfAssign [schema]="schemaAssign" [ui]="ui" [mode]="'search'" (formSubmit)="stAssign?.load(1)"
(formReset)="resetSFAssign()"></sf>
<sf #sfAssign [schema]="schemaAssign" [ui]="ui" [mode]="'search'" (formSubmit)="stAssign?.load(1)" (formReset)="resetSFAssign()"></sf>
<st
#stAssign
multiSort

68
src/app/routes/supply-goods/components/large-amount/large-amount.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-01 09:58:58
* @LastEditTime: 2021-12-01 20:00:41
* @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\supply-goods\components\carload\carload.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-01 14:58:57
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:25:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-goods\\components\\large-amount\\large-amount.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-card>
@ -13,16 +15,7 @@
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
</div>
<!-- [loading]="service.http.loading" -->
@ -32,7 +25,6 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -92,61 +84,61 @@
<tbody>
<tr *ngFor="let data of nzTable.data">
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
<div><span style="color: #52c41a;">●</span>已接单</div>
<div><span >●</span>已取消</div>
<div><span style="color: #f59a23;">●</span>待接单</div>
<div><span style="color: #52c41a">●</span>已接单</div>
<div><span>●</span>已取消</div>
<div><span style="color: #f59a23">●</span>待接单</div>
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
{{data.id3}}
{{ data.id3 }}
</td>
<td>
<div>
<div><span style="color: #52c41a;">●</span>审核通过</div>
<div><span style="color: #d9001b;">●</span>不通过</div>
<div><span style="color: #f59a23;">●</span>待审核</div>
<div><span style="color: #52c41a">●</span>审核通过</div>
<div><span style="color: #d9001b">●</span>不通过</div>
<div><span style="color: #f59a23">●</span>待审核</div>
<!-- <span>待审核</span> -->
</div>
</td>

21
src/app/routes/supply-goods/components/list/list.component.html
View File

@ -1,17 +1,20 @@
<!--
* @Author: your name
* @Date: 2021-12-01 09:25:32
* @LastEditTime: 2021-12-01 10:55:15
* @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\supply-goods\components\list\list.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-01 09:25:32
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:25:54
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-goods\\components\\list\\list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" ></page-header-wrapper>
<nz-tabset [nzSelectedIndex]="nzSelectedIndex">
<page-header-wrapper [title]="''"></page-header-wrapper>
<nz-tabset [nzSelectedIndex]="nzSelectedIndex">
<nz-tab nzTitle="整车货源">
<app-supply-goods-components-list-carload></app-supply-goods-components-list-carload>
</nz-tab>
<nz-tab nzTitle="大宗货源">
<app-supply-goods-components-list-large-amount></app-supply-goods-components-list-large-amount>
</nz-tab>
</nz-tabset>
</nz-tabset>

17
src/app/routes/supply-goods/components/list/list.component.spec.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-01 09:25:32
* @LastEditTime: 2021-12-01 09:55:39
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-goods\components\list\list.component.spec.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-01 09:25:32
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:26:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-goods\\components\\list\\list.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { SupplyGoodsComponentListComponent } from './list.component';
@ -15,7 +18,7 @@ describe('SupplyGoodsComponentListComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [SupplyGoodsComponentListComponent],
declarations: [SupplyGoodsComponentListComponent]
}).compileComponents();
}));

19
src/app/routes/supply-goods/components/list/list.component.ts
View File

@ -1,17 +1,20 @@
/*
* @Author: your name
* @Date: 2021-12-01 09:25:32
* @LastEditTime: 2021-12-01 09:49:32
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-goods\components\list\list.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-01 09:25:32
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:26:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-goods\\components\\list\\list.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-supply-goods-components-list',
templateUrl: './list.component.html',
templateUrl: './list.component.html'
})
export class SupplyGoodsComponentListComponent implements OnInit {
constructor(private ar: ActivatedRoute) {}

21
src/app/routes/supply-goods/services/supply-goods.service.ts
View File

@ -1,22 +1,21 @@
/*
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime: 2021-12-01 10:33: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\usercenter\services\usercenter.service.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-01 09:24:09
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:26:22
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-goods\\services\\supply-goods.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Injectable, Injector } from '@angular/core';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { BaseService } from 'src/app/shared/services/core/base.service';
import { EAFileUtil } from 'src/app/shared/utils/file.util';
@Injectable({
providedIn: 'root',
providedIn: 'root'
})
export class SupplyGoodsService extends BaseService {
constructor(public injector: Injector) {
super(injector);
}

22
src/app/routes/supply-goods/supply-goods-routing.module.ts
View File

@ -1,22 +1,22 @@
/*
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime: 2021-12-01 09:52:45
* @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\usercenter-routing.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-01 09:24:09
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:25:04
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-goods\\supply-goods-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { SupplyGoodsComponentListComponent } from './components/list/list.component';
const routes: Routes = [
{ path: 'list', component: SupplyGoodsComponentListComponent}
];
const routes: Routes = [{ path: 'list', component: SupplyGoodsComponentListComponent }];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
exports: [RouterModule]
})
export class SupplyGoodsRoutingModule {}

18
src/app/routes/supply-goods/supply-goods.module.ts
View File

@ -1,18 +1,22 @@
/*
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime: 2021-12-01 15:03:22
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-01 09:24:09
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:25:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-goods\\supply-goods.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { SharedModule } from '@shared';
import { SupplyGoodsComponentListCarloadComponent } from './components/carload/carload.component';
import { SupplyGoodsComponentListLargeAmountComponent } from './components/large-amount/large-amount.component';
import { SupplyGoodsComponentListComponent } from './components/list/list.component';
import { SupplyGoodsRoutingModule } from './supply-goods-routing.module';
const COMPONENTS = [
SupplyGoodsComponentListComponent,
SupplyGoodsComponentListCarloadComponent,
@ -21,6 +25,6 @@ const COMPONENTS = [
@NgModule({
imports: [SharedModule, SupplyGoodsRoutingModule],
declarations: [...COMPONENTS],
declarations: [...COMPONENTS]
})
export class SupplyGoodsModule {}

22
src/app/routes/supply-management/components/add-driver/add-driver.component.html
View File

@ -1,15 +1,17 @@
<!--
* @Author: your name
* @Date: 2021-12-21 10:58:48
* @LastEditTime: 2021-12-28 10:16:29
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\add-driver\add-driver.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-21 10:58:48
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:26:52
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\add-driver\\add-driver.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div class="modal-header">
<div class="modal-title">添加司机</div>
</div>
<!-- <nz-spin *ngIf="!i" class="modal-spin"></nz-spin> -->
<div class="sfBox">
<sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema">
<ng-template sf-template="tipsA" let-me let-ui="ui" let-schema="schema">
@ -31,10 +33,8 @@
</div>
</ng-template>
</sf>
<sf #sf1 [compact]="true" [ui]="ui" [schema]="schema1" [button]="'none'" *ngIf="schema1">
</sf>
<sf #sf2 [compact]="true" [ui]="ui" [schema]="schema2" [button]="'none'" *ngIf="schema2">
</sf>
<sf #sf1 [compact]="true" [ui]="ui" [schema]="schema1" [button]="'none'" *ngIf="schema1"> </sf>
<sf #sf2 [compact]="true" [ui]="ui" [schema]="schema2" [button]="'none'" *ngIf="schema2"> </sf>
<img class="drivercard" height="104" src="/assets/images/drivercard.png" />
<img class="jopcard" height="104" src="/assets/images/jopcard.png" />
<!-- <div class="example" (click)="showExample()">

49
src/app/routes/supply-management/components/addmodal/addmodal.component.html
View File

@ -1,21 +1,32 @@
<!--
* @Author: your name
* @Date: 2021-12-21 10:57:48
* @LastEditTime: 2022-01-06 16:51:38
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\addmodal\addmodal.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-21 10:57:48
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:27:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\addmodal\\addmodal.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div class="modal-header">
<div class="modal-title">添加熟车</div>
</div>
<!-- <nz-spin *ngIf="!i" class="modal-spin"></nz-spin> -->
<div>
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading" (formSubmit)="initData(true)" (formReset)="resetSF()"></sf>
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="initData(true)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -36,8 +47,18 @@
<!-- 数据列表 -->
<!-- [data]="service.$api_getCarCaptainByMobile" -->
<div *ngIf="sf?.value?.mobile && tableData?.length > 0">
<st #st multiSort bordered [columns]="columns" [ps]="20" [req]="{ method: 'POST', allInBody: true, reName: { pi: '', ps: '' }, params: reqParams }" [res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"
[loading]="service.http.loading" [data]="tableData">
<st
#st
multiSort
bordered
[columns]="columns"
[ps]="20"
[req]="{ method: 'POST', allInBody: true, reName: { pi: '', ps: '' }, params: reqParams }"
[res]="{ reName: { list: 'data', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"
[loading]="service.http.loading"
[data]="tableData"
>
<ng-template st-row="certificationStatus" let-item let-index="index">
<div *ngIf="item.certificationStatus === -1">
<span class="ng-tns-c230-1239 ant-badge-status-dot ant-badge-status-processing ng-star-inserted"></span> 未认证
@ -53,15 +74,13 @@
</div>
</ng-template>
<ng-template st-row="carModel" let-item let-index="index">
<span>{{item.carModelLabel}}-{{item.carLengthLabel}}米-{{item.carLoad}}吨</span>
<span>{{ item.carModelLabel }}-{{ item.carLengthLabel }}米-{{ item.carLoad }}吨</span>
</ng-template>
</st>
</st>
</div>
<div class="noContent" *ngIf="sf?.value?.mobile && tableData?.length === 0 && flag">
抱歉，该手机号还未注册，仍然需要添加请点击 <span (click)="addModal()">继续添加
</span>
抱歉，该手机号还未注册，仍然需要添加请点击 <span (click)="addModal()">继续添加 </span>
</div>
</div>
<div class="modal-footer">

55
src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
View File

@ -1,45 +1,53 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-06 14:55:47
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\assigned-car\assigned-car.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:27:30
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\assigned-car\\assigned-car.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div>
<div nz-row>
<div nz-col nzSpan="18">
<sf #sf [schema]="schema" mode="search" [ui]="ui" [compact]="true" (formSubmit)="st.load(1)"
(formReset)="reset()"></sf>
<sf #sf [schema]="schema" mode="search" [ui]="ui" [compact]="true" (formSubmit)="st.load(1)" (formReset)="reset()"></sf>
</div>
<div nz-col nzSpan="6">
<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="addDriver()"><i nz-icon
nzType="plus"></i>添加司机</button>
<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="addDriver()"><i nz-icon nzType="plus"></i>添加司机</button>
</div>
</div>
<div>
<st #st [data]="service.$api_get_practice_car_list"
<st
#st
[data]="service.$api_get_practice_car_list"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[columns]="columns" [res]="{ reName: { list: 'data.records', total: 'data.total' },process:dataProcess }"
[columns]="columns"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
(change)="changeSt($event)">
(change)="changeSt($event)"
>
<ng-template st-row="carId" let-item let-index="index">
<nz-select [(ngModel)]="item.carId" style="width: 280px;">
<nz-select [(ngModel)]="item.carId" style="width: 280px">
<nz-option [nzValue]="''" nzLabel="不限"></nz-option>
<nz-option [nzValue]="car.carId" [nzLabel]="car.carNo"
*ngFor="let car of item.userCarLicenseDesensitizationVOList" [nzCustomContent]="true">
<span>{{car.carNo}} -</span>
<span>{{car.carLength}}米,{{car.carLoad}}顿 -</span>
<span *ngIf="car?.approvalStatus === 20 && !car.carStatus " class="text-success-dark">空闲</span>
<span *ngIf="car?.approvalStatus === 20 && car.carStatus " class="text-warning-dark">已被指派</span>
<nz-option
[nzValue]="car.carId"
[nzLabel]="car.carNo"
*ngFor="let car of item.userCarLicenseDesensitizationVOList"
[nzCustomContent]="true"
>
<span>{{ car.carNo }} -</span>
<span>{{ car.carLength }}米,{{ car.carLoad }}顿 -</span>
<span *ngIf="car?.approvalStatus === 20 && !car.carStatus" class="text-success-dark">空闲</span>
<span *ngIf="car?.approvalStatus === 20 && car.carStatus" class="text-warning-dark">已被指派</span>
<span *ngIf="car?.approvalStatus !== 20" class="text-red-dark">未认证</span>
<!-- <span [ngClass]="cardBADGE[car.carStatus]?.color">{{cardBADGE[car.carStatus]?.text}}</span> -->
</nz-option>
</nz-select>
</ng-template>
<ng-template st-row="carCaptain" let-item let-index>
<span>{{item.captainName}} {{item.captainPhone}}</span>
<span>{{ item.captainName }} {{ item.captainPhone }}</span>
<a (click)="setCarCaptain(item)">设置</a>
</ng-template>
<ng-template st-row="driverStatus" let-item let-index>
@ -51,7 +59,8 @@
</div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save()" [disabled]="!selectedRows"
[nzLoading]="service.http.loading">发布并指派给司机</button>
<button nz-button type="submit" nzType="primary" (click)="save()" [disabled]="!selectedRows" [nzLoading]="service.http.loading"
>发布并指派给司机</button
>
</div>
</div>

74
src/app/routes/supply-management/components/bulk/bulk.component.html
View File

@ -1,18 +1,28 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-17 14:29: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\supply-management\components\bulk\bulk.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:27:39
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-card>
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -21,10 +31,8 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"
>导入</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导入</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
@ -36,16 +44,16 @@
</nz-card>
<ng-template #extraTemplate>
<div>
<button (click)="audit('',2)" nz-button nzType="primary">批量审核</button>
<button (click)="audit('', 2)" nz-button nzType="primary">批量审核</button>
<button (click)="releaseGoods()" nz-button nzType="primary">代发货源</button>
</div>
</ng-template>
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部('+tabs?.totalQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'进行中('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完结('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'进行中(' + tabs?.stayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已完结(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
</nz-tabset>
<div style="position: relative">
<nz-alert
@ -56,7 +64,7 @@
>
</nz-alert>
</div>
<div style="margin-top: 15px;">
<div style="margin-top: 15px">
<st
#st
[scroll]="{ x: '2000px' }"
@ -69,12 +77,11 @@
>
<!--运费单价 -->
<ng-template st-row="freightPrice" let-item let-index="index">
<div class="mr-xs" >{{item.freightPrice | currency}}
</div>
<div class="mr-xs">{{ item.freightPrice | currency }} </div>
</ng-template>
<!--货源编号 -->
<ng-template st-row="resourceCode" let-item let-index="index">
<a [routerLink]="'/supply-management/bulk-detail/'+item.id">{{item?.resourceCode}}</a>
<a [routerLink]="'/supply-management/bulk-detail/' + item.id">{{ item?.resourceCode }}</a>
</ng-template>
<!-- 服务类型 -->
<ng-template st-row="serviceType" let-item let-index="index">
@ -84,20 +91,21 @@
<!-- 关联订单 -->
<ng-template st-row="orderSn" let-item let-index="index">
<div *ngFor="let item of item?.wayBillClassifiedStatisticsVOList">
<label>{{item.wayBillStatusLabel}}</label>
(<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>)
<label>{{ item.wayBillStatusLabel }}</label>
(<span [ngStyle]="{ color: item?.count > 0 ? '#1890FF' : '' }">{{ item?.count }}</span
>)
</div>
</ng-template>
<!-- 货物信息 -->
<ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{item?.goodsInfos?.goodsName}}</div>
<div>货源：{{item?.goodsInfos?.goodsResource}}</div>
<div class="text-error-dark">剩余: {{item?.goodsInfos?.remainingAmount}}</div>
<div>{{ item?.goodsInfos?.goodsName }}</div>
<div>货源：{{ item?.goodsInfos?.goodsResource }}</div>
<div class="text-error-dark">剩余: {{ item?.goodsInfos?.remainingAmount }}</div>
</ng-template>
<!-- 用车需求 -->
<ng-template st-row="useCarDemand" let-item let-index="index">
<div>车型: {{item.carModelLabel}}</div>
<div class="error">车长: {{item.carLenghtLabel}} 米</div>
<div>车型: {{ item.carModelLabel }}</div>
<div class="error">车长: {{ item.carLenghtLabel }} 米</div>
</ng-template>
</st>
</div>
@ -105,16 +113,10 @@
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
<ng-container *nzModalContent>
<div style="position: relative" *ngIf="auditMany">
<nz-alert
nzType="info"
[nzMessage]="'已选择' + selectedRows?.length + '项'"
nzShowIcon
[ngStyle]="{ margin: '0 0 1rem 0' }"
>
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }">
</nz-alert>
</div>
<sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'">
</sf>
<sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'"> </sf>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK(1)">通过</button>

56
src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html
View File

@ -1,13 +1,15 @@
<!--
* @Author: your name
* @Date: 2021-12-06 15:17:52
* @LastEditTime: 2022-01-06 16:42:37
* @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\supply-management\components\choose-famifiar\choose-famifiar.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:27:53
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\choose-famifiar.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon
nzType="plus"></i>添加司机</button>
<button nz-button nzType="primary" style="margin-bottom: 24px" (click)="add()"><i nz-icon nzType="plus"></i>添加司机</button>
<!-- 搜索区 -->
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="12">
@ -25,18 +27,25 @@
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="12">
<!-- 数据列表 -->
<st #st *ngIf="columns" [bordered]="true" [data]="service.$api_getList_card" [columns]="columns" size="small"
<st
#st
*ngIf="columns"
[bordered]="true"
[data]="service.$api_getList_card"
[columns]="columns"
size="small"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } , process: reqProcess}"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: reqProcess }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [widthMode]="{ type: 'strict' }" [scroll]="{ x: '600px' }"
style="margin-top: 22px;width: 100%;">
[loading]="service.http.loading"
[widthMode]="{ type: 'strict' }"
[scroll]="{ x: '600px' }"
style="margin-top: 22px; width: 100%"
>
<ng-template st-row="userCarLicenseDesensitizationVOList" let-item let-index="index">
<nz-select [(ngModel)]="item.default" (ngModelChange)="carChange($event, item)" style="width: 100%;">
<nz-select [(ngModel)]="item.default" (ngModelChange)="carChange($event, item)" style="width: 100%">
<nz-option nzValue="" nzLabel="不限"></nz-option>
<nz-option [nzValue]="cart" [nzLabel]="cart.carNo"
*ngFor="let cart of item.userCarLicenseDesensitizationVOList">
</nz-option>
<nz-option [nzValue]="cart" [nzLabel]="cart.carNo" *ngFor="let cart of item.userCarLicenseDesensitizationVOList"> </nz-option>
</nz-select>
</ng-template>
</st>
@ -44,11 +53,20 @@
<div nz-col [nzSpan]="12">
<!-- 选中列表 -->
<div>已选择{{ st2Data.length }}位司机</div>
<st #st2 *ngIf="columns2" [bordered]="true" [data]="st2Data" [columns]="columns2" size="small"
[page]="{ show: false }" [scroll]="{ x: '600px',y:'300px' }" style="width: 100%;">
<st
#st2
*ngIf="columns2"
[bordered]="true"
[data]="st2Data"
[columns]="columns2"
size="small"
[page]="{ show: false }"
[scroll]="{ x: '600px', y: '300px' }"
style="width: 100%"
>
<ng-template st-row="captain" let-item let-index="index">
<span>{{ item.captainName }}&nbsp;{{ item.captainPhone }}</span> &nbsp;
<a (click)="setCaptain(item,index)">设置</a>
<a (click)="setCaptain(item, index)">设置</a>
</ng-template>
</st>
</div>

15
src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-14 20:08:17
* @LastEditTime: 2022-01-05 17:38:44
* @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\supply-management\components\onecar-publish\address-list\address-list.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:27:59
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\onecar-publish\\address-list\\address-list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<st
#st
[bordered]="true"

15
src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-14 20:08:17
* @LastEditTime: 2022-01-05 17:35:37
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\onecar-publish\address-list\address-list.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 20:08:17
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:28:07
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\onecar-publish\\address-list\\address-list.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st';

15
src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-14 20:39:34
* @LastEditTime: 2021-12-28 20:49:04
* @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\supply-management\components\onecar-publish\publish-success\publish-success.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 20:39:34
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:28:17
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\onecar-publish\\publish-success\\publish-success.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div style="margin-top: 64px">
<nz-result nzStatus="success" [nzTitle]="title">
<div nz-result-extra>

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

@ -1,12 +1,15 @@
/*
* @Author: your name
* @Date: 2021-12-14 20:39:34
* @LastEditTime: 2022-01-12 11:24:07
* @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\supply-management\components\onecar-publish\publish-success\publish-success.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 20:39:34
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:28:26
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\onecar-publish\\publish-success\\publish-success.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { NzMessageService } from 'ng-zorro-antd/message';
@ -24,10 +27,10 @@ export class PublishSuccessComponent {
this.type = route.snapshot.queryParams.type || 'onecar';
}
ngOnInit() {
console.log(this.change)
if(this.change == 1) {
console.log(this.change);
if (this.change == 1) {
this.title = '保存成功！';
} else if(this.change == 2) {
} else if (this.change == 2) {
this.title = '下单成功！';
}
}

26
src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html
View File

@ -1,22 +1,24 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-28 17:24:48
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\qrcode-page\qrcode-page.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:28:37
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\qrcode-page\\qrcode-page.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
<div style="width: 50%;margin: 0 auto;">
<div style="width: 50%; margin: 0 auto">
<div class="">
<h2>公司名称 : {{i?.enterpriseInfoName}}</h2>
<h2>公司名称 : {{ i?.enterpriseInfoName }}</h2>
<qr [value]="i.id" #qr></qr>
<div class="mb-sm" *ngFor="let address of i?.loadingAddressArr">卸货地 : {{address}}</div>
<div class="mb-sm" *ngFor="let address of i?.unloadingAddressArr">装货地 : {{address}}</div>
<div class="mb-sm">截止时间 : {{i?.deadlineTime}}</div>
<div class="mb-sm" *ngFor="let address of i?.loadingAddressArr">卸货地 : {{ address }}</div>
<div class="mb-sm" *ngFor="let address of i?.unloadingAddressArr">装货地 : {{ address }}</div>
<div class="mb-sm">截止时间 : {{ i?.deadlineTime }}</div>
<div>Tips : 二维码用于司机扫码抢单</div>
</div>
</div>
<div class="modal-footer text-center">
<button nz-button type="submit" nzType="primary" (click)="downLoadQrcode('二维码')">下载二维码</button>

38
src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts
View File

@ -1,20 +1,22 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-28 17:24:54
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\qrcode-page\qrcode-page.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:28:46
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\qrcode-page\\qrcode-page.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import { QRComponent } from '@delon/abc/qr';
import { SFSchema, SFUISchema } from '@delon/form';
import { NzModalRef } from 'ng-zorro-antd/modal';
@Component({
selector: 'app-supply-management-qrcode-page',
templateUrl: './qrcode-page.component.html',
templateUrl: './qrcode-page.component.html'
})
export class SupplyManagementQrcodePageComponent implements OnInit {
@ViewChild('qr') qr!: QRComponent;
@ -24,40 +26,36 @@ export class SupplyManagementQrcodePageComponent implements OnInit {
ui: SFUISchema = {
'*': {
spanLabelFixed: 100,
grid: { span: 12 },
grid: { span: 12 }
},
$no: {
widget: 'text'
},
$href: {
widget: 'string',
widget: 'string'
},
$description: {
widget: 'textarea',
grid: { span: 24 },
},
grid: { span: 24 }
}
};
constructor(
private modal: NzModalRef,
) { }
constructor(private modal: NzModalRef) {}
ngOnInit(): void {
console.log(this.i);
}
downLoadQrcode(downloadName: any): void {
let aLink = document.createElement('a');
const content = this.qr.dataURL;
let blob = this.base64ToBlob(content); //new Blob([content]);
let evt = document.createEvent("HTMLEvents");
evt.initEvent("click", true, true);//initEvent 不加后两个参数在IE下会报错 事件类型，是否冒泡，是否阻止浏览器的默认行为
let evt = document.createEvent('HTMLEvents');
evt.initEvent('click', true, true); //initEvent 不加后两个参数在IE下会报错 事件类型，是否冒泡，是否阻止浏览器的默认行为
aLink.download = downloadName;
aLink.href = URL.createObjectURL(blob);
// aLink.dispatchEvent(evt);
aLink.click()
aLink.click();
}
//base64转blob

14
src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2022-01-06 15:01:40
* @LastEditTime: 2022-01-10 11:20:22
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\tran-agreement\tran-agreement.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-06 15:01:40
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:29:05
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component } from '@angular/core';
import { NzModalRef } from 'ng-zorro-antd/modal';

25
src/app/routes/supply-management/components/vehicle/vehicle.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-22 11:28:28
* @LastEditTime: 2022-01-17 14:14: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\supply-management\components\vehicle\vehicle.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:29:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<nz-card>
<div nz-row nzGutter="8">
@ -94,15 +97,11 @@
</div>
</ng-template>
<nz-modal
[(nzVisible)]="isVisible"
[nzFooter]="nzModalFooter"
nzTitle="货源审核"
(nzOnCancel)="handleCancel('suppliersType')"
>
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
<ng-container *nzModalContent>
<div style="position: relative" *ngIf="auditMany">
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length+ '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }"> </nz-alert>
<nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }">
</nz-alert>
</div>
<sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'"> </sf>
</ng-container>

23
src/app/routes/supply-management/services/supply-management.service.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-17 14:19:12
* @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\supply-management\services\supply-management.service.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:29:25
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Injectable, Injector } from '@angular/core';
import { BaseService } from 'src/app/shared/services';
@ -56,13 +58,11 @@ export class SupplyManagementService extends BaseService {
// 代发大宗货源
$api_consignBulk = `/api/sdc/goodsResourceOperate/consignBulk`;
$api_get_practice_car_list = `/api/mdc/cuc/enterpriseVehicle/getPracticeCarList`; // 获取熟车列表
$api_add_car_caption = `/api/mdc/userDriverExpand/addCarCaptainForShiper`; // 设置为车队长
$api_get_goods_resource_shipper = `/api/sdc/goodsResourceShipper/modifyPricePre`; // 修改单价页面根据货源ID获取货物表
$api_get_car_captain_by_mobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; // 查询车队长或者司机列表
$api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`;// 货主端大宗货源重新指派
$api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`; // 货主端大宗货源重新指派
$api_save_assign_bulk = `/api/sdc/goodsResourceShipper/reAssignBulk`; // 货主端大宗货源指派熟车
// 整车再下一单指派熟车
@ -74,7 +74,7 @@ export class SupplyManagementService extends BaseService {
// 代发大宗货源指派熟车
$api_save_consignBulkAssign = `/api/sdc/goodsResourceOperate/consignBulkAssign`;
$api_get_has_assigned_car_list = `/api/sdc/goodsResourceShipper/getCarDriverIdsByResourceId`;// 大宗货源根据货源id获取司机和车辆的id集合
$api_get_has_assigned_car_list = `/api/sdc/goodsResourceShipper/getCarDriverIdsByResourceId`; // 大宗货源根据货源id获取司机和车辆的id集合
// 根据手机号查询车队长/司机
$api_getCarCaptainByMobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`;
@ -88,7 +88,6 @@ export class SupplyManagementService extends BaseService {
// 获取指派熟车列表
$api_getList_card = '/api/mdc/cuc/enterpriseVehicle/getPracticeCarList';
// 根据地区code查询列表
$api_getRegionByCode = '/api/mdc/pbc/region/getRegionByCode';
// 识别身份证
@ -104,6 +103,6 @@ export class SupplyManagementService extends BaseService {
public $api_batchGoodsResourceAudit = '/api/sdc/goodsResourceOperate/batchGoodsResourceAudit';
constructor(public injector: Injector) {
super(injector)
super(injector);
}
}

31
src/app/routes/supply-management/supply-management-routing.module.ts
View File

@ -1,23 +1,24 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-28 20:07:09
* @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\supply-management\supply-management-routing.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:26:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { SupplyManagementIndexComponent } from './components/index/index.component';
import { SupplyManagementBulkComponent } from './components/bulk/bulk.component';
import { SupplyManagementVehicleComponent } from './components/vehicle/vehicle.component';
import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { SupplyManagementAddDriversComponent } from './components/add-drivers/add-drivers.component';
import { SupplyManagementOnecarPublishComponent } from './components/onecar-publish/onecar-publish.component';
import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/bulk-publish.component';
import { SupplyManagementBulkDetailComponent } from './components/bulk-detail/bulk-detail.component';
import { SupplyManagementReleasePublishComponent } from './components/release-publish/release-publish.component';
import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/bulk-publish.component';
import { SupplyManagementBulkReleasePublishComponent } from './components/bulk-release-publish/bulk-release-publish.component';
import { SupplyManagementIndexComponent } from './components/index/index.component';
import { SupplyManagementOnecarPublishComponent } from './components/onecar-publish/onecar-publish.component';
import { SupplyManagementReleasePublishComponent } from './components/release-publish/release-publish.component';
import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
const routes: Routes = [
{ path: 'index', component: SupplyManagementIndexComponent },
@ -28,11 +29,11 @@ const routes: Routes = [
{ path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent },
{ path: 'vehicle-release', component: SupplyManagementReleasePublishComponent },
{ path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent },
{ path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent },
{ path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent }
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class SupplyManagementRoutingModule { }
export class SupplyManagementRoutingModule {}

62
src/app/routes/supply-management/supply-management.module.ts
View File

@ -1,39 +1,41 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-06 16:19: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\supply-management\supply-management.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-20 10:13:02
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:26:40
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule, Type } from '@angular/core';
import { SharedModule } from '@shared';
import { SupplyManagementRoutingModule } from './supply-management-routing.module';
import { SupplyManagementIndexComponent } from './components/index/index.component';
import { SupplyManagementBulkComponent } from './components/bulk/bulk.component';
import { SupplyManagementVehicleComponent } from './components/vehicle/vehicle.component';
import { SupplyManagementUpdatePriceComponent } from './components/update-price/update-price.component';
import { SupplyManagementUpdateFreightComponent } from './components/update-freight/update-freight.component';
import { SupplyManagementVehicleAssignedCarComponent } from './components/assigned-car/assigned-car.component';
import { SupplyManagementQrcodePageComponent } from './components/qrcode-page/qrcode-page.component';
import { SupplyManagementUpdateExternalSnComponent } from './components/update-external-sn/update-external-sn.component';
import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { CarAddDriverComponent } from './components/add-driver/add-driver.component';
import { SupplyManagementAddDriversComponent } from './components/add-drivers/add-drivers.component';
import { SupplyManagementOnecarPublishComponent } from './components/onecar-publish/onecar-publish.component';
import { CarAddmodalComponent } from './components/addmodal/addmodal.component';
import { SupplyManagementBulkAssignedCarComponent } from './components/assigned-car-bulk/assigned-car-bulk.component';
import { SupplyManagementVehicleAssignedCarComponent } from './components/assigned-car/assigned-car.component';
import { SupplyManagementBulkDetailComponent } from './components/bulk-detail/bulk-detail.component';
import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/bulk-publish.component';
import { SupplyManagementBulkReleasePublishComponent } from './components/bulk-release-publish/bulk-release-publish.component';
import { SupplyManagementBulkComponent } from './components/bulk/bulk.component';
import { PublishchooseFamifiarAddComponent } from './components/choose-famifiar/add/add.component';
import { PublishGoodsChooseFamifiarComponent } from './components/choose-famifiar/choose-famifiar.component';
import { PublishchooseFamifiarSetCaptainComponent } from './components/choose-famifiar/set-captain/set-captain.component';
import { PublishchooseFamifiarAddComponent } from './components/choose-famifiar/add/add.component';
import { SupplyManagementBulkPublishComponent } from './components/bulk-publish/bulk-publish.component';
import { SupplyManagementIndexComponent } from './components/index/index.component';
import { PublishAddressListComponent } from './components/onecar-publish/address-list/address-list.component';
import { SupplyManagementOnecarPublishComponent } from './components/onecar-publish/onecar-publish.component';
import { PublishSuccessComponent } from './components/onecar-publish/publish-success/publish-success.component';
import { CarAddDriverComponent } from './components/add-driver/add-driver.component';
import { CarAddmodalComponent } from './components/addmodal/addmodal.component';
import { SupplyManagementBulkDetailComponent } from './components/bulk-detail/bulk-detail.component';
import { SupplyManagementQrcodePageComponent } from './components/qrcode-page/qrcode-page.component';
import { SupplyManagementReleasePublishComponent } from './components/release-publish/release-publish.component';
import { SupplyManagementBulkReleasePublishComponent } from './components/bulk-release-publish/bulk-release-publish.component';
import { TranAgreementComponent } from './components/tran-agreement/tran-agreement.component';
import { SupplyManagementBulkAssignedCarComponent } from './components/assigned-car-bulk/assigned-car-bulk.component';
import { SupplyManagementUpdateExternalSnComponent } from './components/update-external-sn/update-external-sn.component';
import { SupplyManagementUpdateFreightComponent } from './components/update-freight/update-freight.component';
import { SupplyManagementUpdatePriceComponent } from './components/update-price/update-price.component';
import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
import { SupplyManagementVehicleComponent } from './components/vehicle/vehicle.component';
import { SupplyManagementRoutingModule } from './supply-management-routing.module';
const COMPONENTS: Type<void>[] = [
SupplyManagementIndexComponent,
@ -60,14 +62,10 @@ const COMPONENTS: Type<void>[] = [
SupplyManagementBulkReleasePublishComponent,
TranAgreementComponent,
SupplyManagementBulkAssignedCarComponent
];
@NgModule({
imports: [
SharedModule,
SupplyManagementRoutingModule
],
declarations: COMPONENTS,
imports: [SharedModule, SupplyManagementRoutingModule],
declarations: COMPONENTS
})
export class SupplyManagementModule { }
export class SupplyManagementModule {}

7
src/app/routes/waybill-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-18 16:55:43
* @LastEditTime: 2022-01-18 16:57:54
* @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\supply-management\components\vehicle\vehicle.component.html
@ -52,11 +52,6 @@
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading">
<!-- <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
<span>{{i?.costName}}：{{i?.price}}</span>
</div>
</ng-template> -->
<ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">

14
src/app/shared/widget/dict-select/dict-select.widget.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-13 10:36:49
* @LastEditTime: 2021-12-16 20:40:03
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\shared\widget\dict-select\dict-select.widget.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-13 10:36:49
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:13:29
* @FilePath : \\tms-obc-web\\src\\app\\shared\\widget\\dict-select\\dict-select.widget.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit } from "@angular/core";
import { ControlWidget } from "@delon/form";

14
src/index.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-11-29 10:04:12
* @LastEditTime: 2021-12-07 15:29:56
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\index.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-08 13:38:19
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:09
* @FilePath : \\tms-obc-web\\src\\index.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!DOCTYPE html>
<html>

16
src/style-icons.ts
View File

@ -1,13 +1,13 @@
/*
* @Author: your name
* @Date: 2021-11-29 20:03:55
* @LastEditTime: 2022-01-12 13:39:29
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\style-icons.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-11-29 20:03:55
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:14:19
* @FilePath : \\tms-obc-web\\src\\style-icons.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
// Custom icon static resources
import {
BulbOutline,
ExceptionOutline,