diff --git a/proxy.conf.js b/proxy.conf.js index 54a93979..ad4d8eaa 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -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/` diff --git a/src/app/routes/account/account-routing.module.ts b/src/app/routes/account/account-routing.module.ts index 3e5662da..8a7ce180 100644 --- a/src/app/routes/account/account-routing.module.ts +++ b/src/app/routes/account/account-routing.module.ts @@ -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'; diff --git a/src/app/routes/account/account.module.ts b/src/app/routes/account/account.module.ts index b25127f7..96606efa 100644 --- a/src/app/routes/account/account.module.ts +++ b/src/app/routes/account/account.module.ts @@ -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'; diff --git a/src/app/routes/account/components/edit-name/edit-name.component.html b/src/app/routes/account/components/edit-name/edit-name.component.html index 57b957b2..a300858e 100644 --- a/src/app/routes/account/components/edit-name/edit-name.component.html +++ b/src/app/routes/account/components/edit-name/edit-name.component.html @@ -1,11 +1,14 @@ +
diff --git a/src/app/routes/account/components/edit-name/edit-name.component.spec.ts b/src/app/routes/account/components/edit-name/edit-name.component.spec.ts index 928e52ed..a5f8d13a 100644 --- a/src/app/routes/account/components/edit-name/edit-name.component.spec.ts +++ b/src/app/routes/account/components/edit-name/edit-name.component.spec.ts @@ -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'; diff --git a/src/app/routes/account/components/edit-password/edit-password.component.html b/src/app/routes/account/components/edit-password/edit-password.component.html index fbcd8e29..0fd3cc15 100644 --- a/src/app/routes/account/components/edit-password/edit-password.component.html +++ b/src/app/routes/account/components/edit-password/edit-password.component.html @@ -1,11 +1,14 @@ +
diff --git a/src/app/routes/account/components/edit-password/edit-password.component.ts b/src/app/routes/account/components/edit-password/edit-password.component.ts index 825a3b82..3f4cd9b7 100644 --- a/src/app/routes/account/components/edit-password/edit-password.component.ts +++ b/src/app/routes/account/components/edit-password/edit-password.component.ts @@ -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'; diff --git a/src/app/routes/account/services/account.service.ts b/src/app/routes/account/services/account.service.ts index 115adde0..69608398 100644 --- a/src/app/routes/account/services/account.service.ts +++ b/src/app/routes/account/services/account.service.ts @@ -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'; diff --git a/src/app/routes/contract-management/components/contract-detail/contract-detail.component.html b/src/app/routes/contract-management/components/contract-detail/contract-detail.component.html index 5a5461b6..dfdcf8f2 100644 --- a/src/app/routes/contract-management/components/contract-detail/contract-detail.component.html +++ b/src/app/routes/contract-management/components/contract-detail/contract-detail.component.html @@ -1,11 +1,14 @@ + diff --git a/src/app/routes/contract-management/components/contract-detail/contract-detail.component.spec.ts b/src/app/routes/contract-management/components/contract-detail/contract-detail.component.spec.ts index 3b8c0b69..e4586857 100644 --- a/src/app/routes/contract-management/components/contract-detail/contract-detail.component.spec.ts +++ b/src/app/routes/contract-management/components/contract-detail/contract-detail.component.spec.ts @@ -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; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ContractManagementDetailComponent } from './contract-detail.component'; + +describe('ContractManagementDetailComponent', () => { + let component: ContractManagementDetailComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [UserCenterComponentsDriverDetailComponent], + declarations: [ContractManagementDetailComponent], }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(UserCenterComponentsDriverDetailComponent); + fixture = TestBed.createComponent(ContractManagementDetailComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/routes/contract-management/components/contract-detail/contract-detail.component.ts b/src/app/routes/contract-management/components/contract-detail/contract-detail.component.ts index 7edb6217..2070a2e2 100644 --- a/src/app/routes/contract-management/components/contract-detail/contract-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-detail/contract-detail.component.ts @@ -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); } } diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html index 0b349f14..46be1da2 100644 --- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html +++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html @@ -1,10 +1,12 @@
diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.html b/src/app/routes/contract-management/components/contract-list/contract-list.component.html index f8a6afb8..939ea0b3 100644 --- a/src/app/routes/contract-management/components/contract-list/contract-list.component.html +++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.html @@ -1,11 +1,14 @@ +
diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html index a99bd9c8..6594186e 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html @@ -1,11 +1,14 @@ + diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.spec.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.spec.ts index 58a5d1e3..0dff5ef3 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.spec.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.spec.ts @@ -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'; diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index 8d46bd68..4b359af4 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -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, - visibleIf: { - templateType: value => value === "MX" + containAllLable: true, + visibleIf: { + templateType: value => value === 'MX' } - } as SFSelectWidgetSchema, - }, - } - ,required: ['templateName','templateType'] + } as SFSelectWidgetSchema + } + }, + 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']); } - }) + }); } } diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.html b/src/app/routes/contract-management/components/contract-template/contract-template.component.html index 20a54a75..53d629a3 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.html +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.html @@ -1,11 +1,14 @@ + diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts index b524c8a5..2ad20bf8 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.spec.ts @@ -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'; diff --git a/src/app/routes/contract-management/components/index/index.component.html b/src/app/routes/contract-management/components/index/index.component.html index 041c9fd1..4f696b97 100644 --- a/src/app/routes/contract-management/components/index/index.component.html +++ b/src/app/routes/contract-management/components/index/index.component.html @@ -1,11 +1,14 @@ + diff --git a/src/app/routes/contract-management/components/index/index.component.ts b/src/app/routes/contract-management/components/index/index.component.ts index 649164b4..dfb5474a 100644 --- a/src/app/routes/contract-management/components/index/index.component.ts +++ b/src/app/routes/contract-management/components/index/index.component.ts @@ -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({ diff --git a/src/app/routes/contract-management/contract-management-routing.module.ts b/src/app/routes/contract-management/contract-management-routing.module.ts index 2031b7c5..1bacd037 100644 --- a/src/app/routes/contract-management/contract-management-routing.module.ts +++ b/src/app/routes/contract-management/contract-management-routing.module.ts @@ -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'; diff --git a/src/app/routes/contract-management/contract-management.module.ts b/src/app/routes/contract-management/contract-management.module.ts index 60c2343c..29c8c72f 100644 --- a/src/app/routes/contract-management/contract-management.module.ts +++ b/src/app/routes/contract-management/contract-management.module.ts @@ -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'; diff --git a/src/app/routes/contract-management/services/contract-management.service.ts b/src/app/routes/contract-management/services/contract-management.service.ts index 8462f3a5..31780182 100644 --- a/src/app/routes/contract-management/services/contract-management.service.ts +++ b/src/app/routes/contract-management/services/contract-management.service.ts @@ -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'; diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index 89a3fbf5..82f0ce06 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -1,10 +1,12 @@ diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index b88c588e..bfd079a5 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -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'; diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index 132bce32..fb7fc2e7 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -1,11 +1,14 @@ + -

订单号: {{ i?.billCode }}

+ +

订单号: {{ i?.billCode }}

-
+
@@ -28,25 +31,19 @@
{{ i?.goodsResource?.enterpriseInfoName }} {{ i?.goodsResource?.shipperAppUserName }} - {{i?.goodsResource?.enterpriseProjectName}} - {{i?.goodsResource?.serviceTypeLabel}} - {{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} - {{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchName}} + {{ i?.goodsResource?.enterpriseProjectName }} + {{ i?.goodsResource?.serviceTypeLabel }} + {{ i?.goodsResource?.createUserName }} /{{ i?.goodsResource?.createUserPhone }} + {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchName }}
- - - - - - - - - - - + + + + + + -
@@ -54,21 +51,28 @@
- + + + - -
- -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
@@ -88,7 +92,7 @@ placeholder="请输入装货地" /> -
@@ -99,7 +103,13 @@
- +
@@ -125,7 +135,7 @@ placeholder="请输入卸货地" /> - +
@@ -134,19 +144,25 @@
- +
-
+
-

计划装货时间：{{i?.loadPlanTime}}

+

计划装货时间：{{ i?.loadPlanTime }}

-

计划卸货时间：{{i?.unloadPlanTime}}

+

计划卸货时间：{{ i?.unloadPlanTime }}

@@ -183,7 +199,7 @@ /> - + - {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCubeLabel}} + {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCubeLabel}} - {{i?.driverId}} - + {{ i?.driverId }} + - + {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 - - + + - - + + -
- - - - -
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
+ +
总计：{{ i?.total | currency: '￥' }}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
收款人：
 @@ -246,72 +258,70 @@ - {{i?.goodsResource?.stateReceipt ?'是':'否'}} + {{ i?.goodsResource?.stateReceipt ? '是' : '否' }} - {{i?.goodsResource?.receiptTypeLabel}} - - - {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}} + {{ i?.goodsResource?.receiptTypeLabel }} + {{ i?.goodsResource?.receiptUserId }} / {{ i?.supplementaryInformationVO?.phon }} - {{i?.goodsResource?.receiptAddress}} + {{ i?.goodsResource?.receiptAddress }} - {{i?.goodsResource?.receiptAddress}} + {{ i?.goodsResource?.receiptAddress }} -
- -
请上传图片
-
- - - - - - + class="avatar-uploader" + [nzAction]="service.$api_upload_url" + [nzName]="'multipartFile'" + nzListType="picture-card" + [(nzFileList)]="listImagUrls" + [nzShowButton]="listImagUrls.length < 5" + [nzPreview]="handlePreview1" + [nzBeforeUpload]="beforeUpload" + (nzChange)="handleChange1($event)" + > +
+ +
请上传图片
+
+ + + + + + - {{i?.goodsResource?.remarks}} + {{ i?.goodsResource?.remarks }}
- -
-
- -
-
- -
-
+
+
+ +
+ - + - + - \ No newline at end of file + diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index 428e99f9..00a3ee11 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -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 { 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 = []; // 卸货信息 + startInfo: any = []; // 装货信息 + endInfo: any = []; // 卸货信息 unloadTime: any; // 货源单设置回显 -loadTime: any; // 货源单设置回显 + loadTime: any; // 货源单设置回显 sf3data: any; // 货源单设置回显 sf4data: any; // 货源单设置回显 dirverPhone: any; // 货源单设置回显 @@ -75,22 +75,22 @@ loadTime: any; // 货源单设置回显 private modalService: NzModalService, private amapService: AmapService, public shipperservice: ShipperBaseService, - fb: FormBuilder, - private envSrv: EAEnvironmentService, + fb: FormBuilder, + private envSrv: EAEnvironmentService ) { this.validateForm1 = fb.group({ - loadTime: [null, []], - unloadTime: [null, []], + loadTime: [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', - }, - default: '', + widget: 'text' + }, + 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,90 +252,90 @@ loadTime: any; // 货源单设置回显 }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema }, no5: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '', + widget: 'text' + }, + default: '' }, no6: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '', - }, + widget: 'text' + }, + 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( { - url: element, - status: 'done', - uid: index - }) + 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, - appUserName: element.appUserName, - contractTelephone: element.contractTelephone, - latitude: element.latitude, - longitude: element.longitude, - province: element.province, - city: element.city, - area: element.area, - type: element.type, - id: element.id - }) + this.startInfo.push({ + detailedAddress: element.detailedAddress, + appUserName: element.appUserName, + contractTelephone: element.contractTelephone, + latitude: element.latitude, + longitude: element.longitude, + province: element.province, + city: element.city, + 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, - appUserName: element?.appUserName, - contractTelephone: element?.contractTelephone, - latitude: element.latitude, - longitude: element.longitude, - province: element.province, - city: element.city, - area: element.area, - type: element.type, - id: element.id - }) + this.endInfo.push({ + detailedAddress: element?.detailedAddress, + appUserName: element?.appUserName, + contractTelephone: element?.contractTelephone, + latitude: element.latitude, + longitude: element.longitude, + province: element.province, + city: element.city, + 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,52 +351,51 @@ loadTime: any; // 货源单设置回显 status: 'done', url: res.loadingLadingBillFilePath, response: { - url: res.loadingLadingBillFilePath, - }, - }, - ], - loadingPeopleVehiclesGoodsFilePath: [ + url: res.loadingLadingBillFilePath + } + } + ], + loadingPeopleVehiclesGoodsFilePath: [ { uid: 'logo', name: 'LOGO', status: 'done', url: res.loadingPeopleVehiclesGoodsFilePath, response: { - url: res.loadingPeopleVehiclesGoodsFilePath, - }, - }, - ], - unloadingLadingBillFilePath: [ + url: res.loadingPeopleVehiclesGoodsFilePath + } + } + ], + unloadingLadingBillFilePath: [ { uid: 'logo', name: 'LOGO', status: 'done', url: res.unloadingLadingBillFilePath, response: { - url: res.unloadingLadingBillFilePath, - }, - }, - ], - unloadingPeopleVehiclesGoodsFilePath: [ + url: res.unloadingLadingBillFilePath + } + } + ], + unloadingPeopleVehiclesGoodsFilePath: [ { uid: 'logo', name: 'LOGO', 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,354 +407,385 @@ 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' ){ - 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()) + 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()); } - 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()) + 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()); } - 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: [{ - id: this.i?.goodsInfoList?.[0].id, - goodsName: this.sf3.value?.goodsName, - ...this.sf4.value - }], + goodsInfoDTOList: [ + { + id: this.i?.goodsInfoList?.[0].id, + goodsName: this.sf3.value?.goodsName, + ...this.sf4.value + } + ], // 运费信息 billExpenseDetailDTOList: this.st._data, // 收款人 payeeId: this.dirverPhone, dirverBankCard: this.dirverBankCard, // 银行卡 // 发车时间 - loadTime: this.loadTime, + 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; + return num; } - } + } // -------------------装卸货信息处理 - // 打开地图 - openMap(type: string, index: number) { - const modalRef = this.modalService.create({ - nzTitle: '', - nzContent: AmapPoiPickerComponent, - nzWidth: 900, - nzOnOk: item => { - const poi = item.poi; - const locList = poi.pois; - switch (type) { - case 'start': - this.startInfo[index].detailedAddress = poi.formattedAddress; - this.startInfo[index].longitude = locList[0]; - this.startInfo[index].latitude = locList[1]; - this.startInfo[index].province = poi.addressComponent.province; - this.startInfo[index].city = poi.addressComponent.city; - this.startInfo[index].area = poi.addressComponent.district; - this.startInfo[index].address = poi.formattedAddress; - break; - case 'end': - this.endInfo[index].detailedAddress = poi.formattedAddress; - this.endInfo[index].longitude = locList[0]; - this.endInfo[index].latitude = locList[1]; - this.endInfo[index].province = poi.addressComponent.province; - this.endInfo[index].city = poi.addressComponent.city; - this.endInfo[index].area = poi.addressComponent.district; - this.endInfo[index].address = poi.formattedAddress; - break; - default: - break; - } - - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } - } - }); -} - -initSF3() { - this.schema3 = { - properties: { - // enterpriseInfoId: { - // title: '网络货运人', - // type: 'string', - // ui: { - // placeholder: '请选择', - // widget: 'select', - // asyncData: () => this.shipperservice.getNetworkFreightForwarder(), - // visibleIf: { - // _$expand: (value: boolean) => value, - // }, - // } - // }, - goodsName: { - type: 'string', - title: '货物名称', - ui: { - widget: 'dict-select', - params: { dictKey: 'GoodsName' }, - placeholder: '请选择' + // 打开地图 + openMap(type: string, index: number) { + const modalRef = this.modalService.create({ + nzTitle: '', + nzContent: AmapPoiPickerComponent, + nzWidth: 900, + nzOnOk: item => { + const poi = item.poi; + const locList = poi.pois; + switch (type) { + case 'start': + this.startInfo[index].detailedAddress = poi.formattedAddress; + this.startInfo[index].longitude = locList[0]; + this.startInfo[index].latitude = locList[1]; + this.startInfo[index].province = poi.addressComponent.province; + this.startInfo[index].city = poi.addressComponent.city; + this.startInfo[index].area = poi.addressComponent.district; + this.startInfo[index].address = poi.formattedAddress; + break; + case 'end': + this.endInfo[index].detailedAddress = poi.formattedAddress; + this.endInfo[index].longitude = locList[0]; + this.endInfo[index].latitude = locList[1]; + this.endInfo[index].province = poi.addressComponent.province; + this.endInfo[index].city = poi.addressComponent.city; + this.endInfo[index].area = poi.addressComponent.district; + this.endInfo[index].address = poi.formattedAddress; + break; + default: + break; } - }, - qita: { - type: 'string', - title: '', - ui: { - visibleIf: { - goodsName: value => value === '3' + + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } + } + }); + } + + initSF3() { + this.schema3 = { + properties: { + // enterpriseInfoId: { + // title: '网络货运人', + // type: 'string', + // ui: { + // placeholder: '请选择', + // widget: 'select', + // asyncData: () => this.shipperservice.getNetworkFreightForwarder(), + // visibleIf: { + // _$expand: (value: boolean) => value, + // }, + // } + // }, + goodsName: { + type: 'string', + title: '货物名称', + ui: { + widget: 'dict-select', + params: { dictKey: 'GoodsName' }, + placeholder: '请选择' + } + }, + qita: { + type: 'string', + title: '', + ui: { + visibleIf: { + goodsName: value => value === '3' + } } } + }, + required: ['goodsName'] + }; + this.ui3 = { + '*': { + spanLabelFixed: 110, + grid: { span: 12 } + }, + $goodsName: { + grid: { span: 12 } + }, + $qita: { + grid: { span: 12 } } - }, - required: ['goodsName',] - }; - this.ui3 = { - '*': { - spanLabelFixed: 110, - grid: { span: 12 } - }, - $goodsName: { - grid: { span: 12 } - }, - $qita: { - grid: { span: 12 } - } - }; -} -initST() { - this.logColumns = [ - { title: '款项', index: 'costName' }, - { title: '总费用（元）', index: 'price' }, - { title: '协议金额（元）', render: 'price' }, - { title: '附加费（元）', index: 'surcharge' }, - { title: '附加费率（%）', render: 'paymentMethodRate' }, - { title: '支付时间', index: ' paymentTime' }, - { - title: '支付状态', - className: 'text-center', - index: 'paymentStatus', - type: 'badge', - width: '120px', - badge: { - '1': { text: '待申请', color: 'warning' }, - '2': { text: '已支付', color: 'success' }, - '3': { text: '已拒绝', color: 'warning' }, - '4': { text: '申请中', color: 'warning' }, - }, - }, - ]; -} -initSF4() { - this.schema4 = { - properties: { - weight: { - type: 'string', - title: '货物数量', - ui: { - widget: 'custom', - placeholder: '请输入', - errors: { required: '必填项' } - } - }, - volume: { - type: 'string', - title: '', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - number: { - type: 'string', - title: '', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - carmand: { - type: 'string', - title: '用车需求', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - drivers: { - type: 'string', - title: '承运司机', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - weightModel: { - type: 'string', - title: '车型车长承重', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - loadTime: { - type: 'string', - title: '发车时间', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - unloadTime: { - type: 'string', - title: '到车时间', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - - }, - required: ['weight','loadTime','unloadTime'] - }; - this.ui4 = { - '*': { - spanLabelFixed: 90, - grid: { span: 24 } - }, - $weight: { - grid: { span: 8 } - }, - $volume: { - grid: { span: 8 } - }, - $number: { - grid: { span: 8 } - }, - $carmand: { - grid: { span: 24 } - }, - $weightModel: { - grid: { span: 12 } - }, - $drivers: { - grid: { span: 12 } - }, - $loadTime: { - grid: { span: 12 } - }, - $unloadTime: { - grid: { span: 12 } - }, - }; -} -// 处理上传图片 -handlePreview1 = async (file: NzUploadFile) => { - if (!file.url && !file.preview) { - file.preview = await getBase64(file.originFileObj!); + }; } - this.previewImage1 = file.url || file.preview; - this.previewVisible1 = true; -}; + initST() { + this.logColumns = [ + { title: '款项', index: 'costName' }, + { title: '总费用（元）', index: 'price' }, + { title: '协议金额（元）', render: 'price' }, + { title: '附加费（元）', index: 'surcharge' }, + { title: '附加费率（%）', render: 'paymentMethodRate' }, + { title: '支付时间', index: ' paymentTime' }, + { + title: '支付状态', + className: 'text-center', + index: 'paymentStatus', + type: 'badge', + width: '120px', + badge: { + '1': { text: '待申请', color: 'warning' }, + '2': { text: '已支付', color: 'success' }, + '3': { text: '已拒绝', color: 'warning' }, + '4': { text: '申请中', color: 'warning' } + } + } + ]; + } + initSF4() { + this.schema4 = { + properties: { + weight: { + type: 'string', + title: '货物数量', + ui: { + widget: 'custom', + placeholder: '请输入', + errors: { required: '必填项' } + } + }, + volume: { + type: 'string', + title: '', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + number: { + type: 'string', + title: '', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + carmand: { + type: 'string', + title: '用车需求', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + drivers: { + type: 'string', + title: '承运司机', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + weightModel: { + type: 'string', + title: '车型车长承重', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + loadTime: { + type: 'string', + title: '发车时间', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + unloadTime: { + type: 'string', + title: '到车时间', + ui: { + widget: 'custom', + placeholder: '请输入' + } + } + }, + required: ['weight', 'loadTime', 'unloadTime'] + }; + this.ui4 = { + '*': { + spanLabelFixed: 90, + grid: { span: 24 } + }, + $weight: { + grid: { span: 8 } + }, + $volume: { + grid: { span: 8 } + }, + $number: { + grid: { span: 8 } + }, + $carmand: { + grid: { span: 24 } + }, + $weightModel: { + grid: { span: 12 } + }, + $drivers: { + grid: { span: 12 } + }, + $loadTime: { + grid: { span: 12 } + }, + $unloadTime: { + grid: { span: 12 } + } + }; + } + // 处理上传图片 + 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 { - switch (info.file.status) { - case 'uploading': - break; - case 'done': - let fileList = [...info.fileList]; - // 2. Read from response and show file link - console.log(fileList) - fileList = fileList.map((file: any) => { - if (file.response) { - file.url = file.response.data.fullFilePath; - } - return file; - }); - break; - case 'error': - this.service.msgSrv.error('网络错误'); - break; + 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); + fileList = fileList.map((file: any) => { + if (file.response) { + file.url = file.response.data.fullFilePath; + } + return file; + }); + break; + case 'error': + this.service.msgSrv.error('网络错误'); + break; + } + } + beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => { + return new Observable((observer: Observer) => { + const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp'; + if (!isJpgOrPng) { + this.service.msgSrv.warning('只能上传图片!'); + observer.complete(); + return; + } + // tslint:disable-next-line: no-non-null-assertion + const isLt2M = file.size! / 1024 / 1024 < 3; + if (!isLt2M) { + this.service.msgSrv.warning('图片大小超过3兆!'); + observer.complete(); + return; + } + observer.next(isJpgOrPng && isLt2M); + observer.complete(); + }); + }; + agreement(value: any) { + if (value === '1') { + this.imges = this.i?.supplementAgreement; + } else if (value === '2') { + this.imges = this.i?.supplementAgreement; + } + this.isVisible = true; + } + 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.className = 'target-fix' + } + console.log(elf); } } -beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => { - return new Observable((observer: Observer) => { - const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp'; - if (!isJpgOrPng) { - this.service.msgSrv.warning('只能上传图片!'); - observer.complete(); - return; - } - // tslint:disable-next-line: no-non-null-assertion - const isLt2M = file.size! / 1024 / 1024 < 3; - if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过3兆!'); - observer.complete(); - return; - } - observer.next(isJpgOrPng && isLt2M); - observer.complete(); - }); -}; -agreement(value: any) { - if(value === '1') { - this.imges = this.i?.supplementAgreement - } else if (value === '2') { - this.imges = this.i?.supplementAgreement - } - this.isVisible = true; -} -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.className = 'target-fix' - } - console.log(elf) -} -} diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index bc29b450..ac5997b1 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,10 +1,12 @@ diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index 4fde3f59..77dcda60 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -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'; diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index c58f87de..383b5426 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -1,10 +1,12 @@ diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html index 0e8c3c41..69595fe2 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -1,11 +1,14 @@ + { return new Promise((resolve, reject) => { const reader = new FileReader(); @@ -38,9 +29,9 @@ function getBase64(file: File): Promise { 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.detailList = res; - let arr : any= [] - res.filePathList.forEach((element: any, index: any) => { - console.log(index) - arr.push( { + this.service.request(this.service.$api_get_getBulkSignForDetail, { id: this.i?.id }).subscribe((res: any) => { + console.log(res); + this.detailList = res; + let arr: any = []; + res.filePathList.forEach((element: any, index: any) => { + console.log(index); + arr.push({ url: element, status: 'done', uid: index - }) }); - this.listImagUrls = arr; - }) - - - + }); + 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('网络错误'); diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html index 5e01abfc..c31843d5 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html @@ -1,20 +1,22 @@

总运费：{{ data.totalFreight |currency }}总运费：{{ data.totalFreight | currency }}

-

运输费：{{ data.freight |currency }}，附加费：{{ data.surcharge |currency}}

+

运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}

diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index 702ba68e..05fcd6d7 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -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,10 +205,10 @@ export class UpdateFreightComponent implements OnInit { } save(value: any): void { - if(!this.sf.valid){ + if (!this.sf.valid) { this.sf.validator({ emitError: true }); return; - } + } this.service.request(this.service.$api_change_bulk, { billId: this.data.billId, ...this.sf.value }).subscribe(res => { if (res) { this.service.msgSrv.success('变更运费成功'); diff --git a/src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts b/src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts index 067e50ab..16e7c1c0 100644 --- a/src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts +++ b/src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts @@ -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 = { diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html index c270eac2..b94a1580 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html @@ -1,10 +1,12 @@ -
{{dataInfo?.driverName}} / {{dataInfo?.driverPhone}}/ {{dataInfo?.carNo}}
+
{{ dataInfo?.driverName }} / {{ dataInfo?.driverPhone }}/ {{ dataInfo?.carNo }}
 -
{{dataInfo?.payeeName}} / {{dataInfo?.payeePhone}}
+
{{ dataInfo?.payeeName }} / {{ dataInfo?.payeePhone }}
 { return new Promise((resolve, reject) => { const reader = new FileReader(); @@ -40,47 +31,52 @@ function getBase64(file: File): Promise { }) 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) { @@ -92,7 +88,7 @@ export class VehicleConfirReceiptComponent implements OnInit { close(): void { this.modal.destroy(); } - + beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => { return new Observable((observer: Observer) => { const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp'; @@ -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.dataInfo = res; - 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 - } - }); - let arr : any= [] - res.filePathList.forEach((element: any, index: any) => { - console.log(index) - arr.push( { + this.service.request(this.service.$api_get_getWholeSignForDetail, { id: this.i?.id }).subscribe((res: any) => { + console.log(res); + this.dataInfo = res; + 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; + } + }); + let arr: any = []; + res.filePathList.forEach((element: any, index: any) => { + console.log(index); + arr.push({ url: element, status: 'done', uid: index - }) }); - this.listImagUrls = arr; - this.costDetail = [cost]; - }) + }); + this.listImagUrls = arr; + this.costDetail = [cost]; + }); } initST() { @@ -169,7 +165,7 @@ export class VehicleConfirReceiptComponent implements OnInit { } ]; } - + handleChange1(info: NzUploadChangeParam): void { switch (info.file.status) { case 'uploading': @@ -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; } } - } diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html index f41ee736..3facc950 100644 --- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html +++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html @@ -1,13 +1,15 @@ - +
diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts index 2168d5f1..e943dd48 100644 --- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts +++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts @@ -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(); } - } diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html index bffd2ddd..dee32307 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html @@ -1,45 +1,38 @@ - +
- - -
- -
- + +
+ +
+
- + - + - - + + - + - - + \ No newline at end of file diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts index ad8f252e..78c7517e 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts @@ -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,9 +58,9 @@ 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', index: 'certificationStatus', @@ -68,11 +70,11 @@ 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', className: 'text-center', @@ -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) + ]; + } + set(value: any): void { + 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]; } }); } diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html index 0bca6cca..49955266 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html @@ -1,14 +1,16 @@ - +
- +
diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts index 8f653ab5..3b8c81a2 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts @@ -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(); } - } diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html index f9b9654f..47ab667b 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html @@ -1,29 +1,30 @@ + -
- -
吨
+
+ +
吨
- + -
- -
方
+
+ +
方
- +
- +
diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html index 231c2e03..6da96d05 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html @@ -1,29 +1,30 @@ + -
- -
吨
+
+ +
吨
- + -
- -
方
+
+ +
方
- +
- +
diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index 4194a0fe..7a407cfa 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -1,11 +1,14 @@ +
@@ -13,7 +16,7 @@ 总运费：{{ data.totalFreight | currency }} - （运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency}}） + （运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}）

diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index e091c142..c9a940a2 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts @@ -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: '￥', @@ -86,7 +77,7 @@ export class VehicleUpdateFreightComponent implements OnInit { // type: 'number', // title: '油卡', // default: 0.0, - // minimum:0, + // minimum:0, // readOnly: this.i.oilCardPayStatus === '1' || this.i.oilCardPayStatus === '3', // 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; } diff --git a/src/app/routes/order-management/order-management-routing.module.ts b/src/app/routes/order-management/order-management-routing.module.ts index a97719e5..d5c62d92 100644 --- a/src/app/routes/order-management/order-management-routing.module.ts +++ b/src/app/routes/order-management/order-management-routing.module.ts @@ -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'; diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index 13a0f831..777746b8 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -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'; diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 27762d94..7b62e750 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -1,29 +1,31 @@ /* - * @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`; // 据 手机号/姓名 查询 车队长/司机 $api_get_getDriverInfo = `/api/mdc/cuc/user/getDriverInfo`; $api_del_driver = ``; - // 获取货主企业列表 + // 获取货主企业列表 public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true'; - // 风险单： + // 风险单： // 风险单列表查询 $api_get_listRiskPage = `/api/sdc/billRiskOperate/listRiskPage`; // 风险单列表查询 @@ -36,35 +38,35 @@ export class OrderManagementService extends ShipperBaseService { $api_get_listWholePage = `/api/sdc/billOperate/listWholePage`; // 整车详情 $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`; - // 查看运费变更记录详情-整车 - $api_get_getChangeRecordWholeDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordWholeDetail`; - // 根据订单ID查看运费变更申请记录 - $api_get_listChangeApply = `/api/sdc/billFreightChangeApplication/listChangeApply`; - // 变更运费页面-整车-整车 - $api_get_getFreightChangeWholeDetail = `/api/sdc/billFreightChangeApplication/getFreightChangeWholeDetail`; - // 订单申请撤销 - $api_get_revokeChangeRecord = `/api/sdc/billFreightChangeApplication/revokeChangeRecord`; - // 运费变更申请-整车 - $api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertFreightChangeWhole`; - // 取消订单 - $api_get_cancelAnOrder = `/api/sdc/billOperate/cancelAnOrder`; - // 批量签收整车订单 - $api_get_batchSignWholeOrder = `/api/sdc/billOperate/batchSignWholeOrder`; - // 批量签收大宗订单 - $api_get_batchSignBulkOrder = `/api/sdc/billOperate/batchSignBulkOrder`; - // 大宗签收详情 - $api_get_getBulkSignForDetail = `/api/sdc/billOperate/getBulkSignForDetail`; - // 整车签收详情 - $api_get_getWholeSignForDetail = `/api/sdc/billOperate/getWholeSignForDetail`; - // 确认签收大宗订单 - $api_get_signBulkOrder = `/api/sdc/billOperate/signBulkOrder`; - // 确认签收整车订单 - $api_get_signWholeOrder = `/api/sdc/billOperate/signWholeOrder`; + // 查询大宗订单列表 + $api_get_listBulkPage = `/api/sdc/billOperate/listBulkPage`; + // 查看运费变更记录详情-整车 + $api_get_getChangeRecordWholeDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordWholeDetail`; + // 根据订单ID查看运费变更申请记录 + $api_get_listChangeApply = `/api/sdc/billFreightChangeApplication/listChangeApply`; + // 变更运费页面-整车-整车 + $api_get_getFreightChangeWholeDetail = `/api/sdc/billFreightChangeApplication/getFreightChangeWholeDetail`; + // 订单申请撤销 + $api_get_revokeChangeRecord = `/api/sdc/billFreightChangeApplication/revokeChangeRecord`; + // 运费变更申请-整车 + $api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertFreightChangeWhole`; + // 取消订单 + $api_get_cancelAnOrder = `/api/sdc/billOperate/cancelAnOrder`; + // 批量签收整车订单 + $api_get_batchSignWholeOrder = `/api/sdc/billOperate/batchSignWholeOrder`; + // 批量签收大宗订单 + $api_get_batchSignBulkOrder = `/api/sdc/billOperate/batchSignBulkOrder`; + // 大宗签收详情 + $api_get_getBulkSignForDetail = `/api/sdc/billOperate/getBulkSignForDetail`; + // 整车签收详情 + $api_get_getWholeSignForDetail = `/api/sdc/billOperate/getWholeSignForDetail`; + // 确认签收大宗订单 + $api_get_signBulkOrder = `/api/sdc/billOperate/signBulkOrder`; + // 确认签收整车订单 + $api_get_signWholeOrder = `/api/sdc/billOperate/signWholeOrder`; // 上传图片 public $api_upload_url = `/api/mdc/pbc/upload/multipartFile/file`; // 根据用户id查用户信息（注意：nickName才是用户名称） @@ -89,66 +91,61 @@ export class OrderManagementService extends ShipperBaseService { $api_calculate_cost = `/api/sdc/billFreightChangeApplication/getBulkSurchargeDetail`; //运费变更申请计算费用-整车 $api_getWholeSurchargeDetail = `/api/sdc/billFreightChangeApplication/getWholeSurchargeDetail`; - //运费变更申请-大宗 - $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`; - // 删除装卸货信息 + //运费变更申请-大宗 + $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`; + // 删除装卸货信息 $api_delete_Wholedeletebatch = `/api/sdc/unLoadingPlace/deletebatch`; - // 修改-大宗订单 + // 修改-大宗订单 $api_set_modifyBulkOrder = `/api/sdc/billOperate/modifyBulkOrder`; - // 修改-整车订单 + // 修改-整车订单 $api_set_modifyWholeOrder = `/api/sdc/billOperate/modifyWholeOrder`; - // 修改-整车订单详情 + // 修改-整车订单详情 $api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`; - // 修改--大宗订单详情 + // 修改--大宗订单详情 $api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`; - // 批量修改网络货运人 + // 批量修改网络货运人 $api_set_updateEnterpriseInfoBatch = `/api/sdc/billOperate/updateEnterpriseInfoBatch`; - // 批量修改附加费率 + // 批量修改附加费率 $api_set_updateAdditionalRateBatch = `/api/sdc/billOperate/updateAdditionalRateBatch`; - - // 查询投诉列表 + // 查询投诉列表 $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`; - // 获取投诉表详情 + // 获取投诉表详情 $api_get_getComplaintDriverDetails = `/api/sdc/complaint/operate/getComplaintDriverDetails`; - // 处理投诉 + // 处理投诉 $api_get_dealWithComplaint = `/api/sdc/complaint/operate/dealWithComplaint`; - // 撤销投诉 + // 撤销投诉 $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'; - /** + // 获取货主企业列表 + public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + /** * 根据企业ID，获取企业历史网络货运人 * @returns */ - getNetworkFreightForwarderHistory(params: any) { - const param = { - enterpriseIds: params.enterpriseInfoIds - } - return this.request(this.$api_get_getEnterpriseNetTransHis, param).pipe( - map((res: any) => { - if (!res) { - return []; - } - const list = res.map((item: any) => ({ - label: item.networkTransporterName, - value: item.networkTransporterId - })); - return [{ value: '', label: '全部' }, ...list]; - }) - ); - } - constructor(public injector: Injector,public eaCacheSrv: EACacheService) { - super(injector,eaCacheSrv) + getNetworkFreightForwarderHistory(params: any) { + const param = { + enterpriseIds: params.enterpriseInfoIds + }; + return this.request(this.$api_get_getEnterpriseNetTransHis, param).pipe( + map((res: any) => { + if (!res) { + return []; + } + const list = res.map((item: any) => ({ + label: item.networkTransporterName, + value: item.networkTransporterId + })); + return [{ value: '', label: '全部' }, ...list]; + }) + ); + } + constructor(public injector: Injector, public eaCacheSrv: EACacheService) { + super(injector, eaCacheSrv); } } diff --git a/src/app/routes/passport/components/login/login.component.html b/src/app/routes/passport/components/login/login.component.html index 44dc0402..79afbdb7 100644 --- a/src/app/routes/passport/components/login/login.component.html +++ b/src/app/routes/passport/components/login/login.component.html @@ -1,16 +1,19 @@ +

- + - --> \ No newline at end of file + --> diff --git a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html index 8afc0c8f..df51267d 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html +++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html @@ -1,13 +1,15 @@ - + +
@@ -25,18 +27,25 @@
- + [loading]="service.http.loading" + [widthMode]="{ type: 'strict' }" + [scroll]="{ x: '600px' }" + style="margin-top: 22px; width: 100%" + > - + - - + @@ -44,11 +53,20 @@
已选择{{ st2Data.length }}位司机
- + {{ item.captainName }} {{ item.captainPhone }}   - 设置 + 设置
@@ -56,4 +74,4 @@
-
\ No newline at end of file +
diff --git a/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.html b/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.html index a307b558..12ffcc4c 100644 --- a/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.html @@ -1,11 +1,14 @@ + +
diff --git a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts index f387e7f7..e04e3858 100644 --- a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.ts @@ -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 = '下单成功！'; } } diff --git a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html index 537dbbe2..99ab2bbe 100644 --- a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html +++ b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.html @@ -1,22 +1,24 @@ + -
+
-

公司名称 : {{i?.enterpriseInfoName}}

+

公司名称 : {{ i?.enterpriseInfoName }}

-
卸货地 : {{address}}
-
装货地 : {{address}}
-
截止时间 : {{i?.deadlineTime}}
+
卸货地 : {{ address }}
+
装货地 : {{ address }}
+
截止时间 : {{ i?.deadlineTime }}
Tips : 二维码用于司机扫码抢单
-
diff --git a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts index 03f637d9..a9567d27 100644 --- a/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts +++ b/src/app/routes/supply-management/components/qrcode-page/qrcode-page.component.ts @@ -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 diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts index 463bf949..49c85b79 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts @@ -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'; diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index 8f9f0b46..62f98e4a 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -1,11 +1,14 @@ +
@@ -94,15 +97,11 @@
- +
- + +
diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index 54070f3b..994dcb65 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -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'; @@ -15,7 +17,7 @@ import { BaseService } from 'src/app/shared/services'; export class SupplyManagementService extends BaseService { $api_get_enterprise_project = `/api/mdc/cuc/enterpriseProject/getEnterpriseProjectList `; // 所属项目列表 // 取消货源 - $api_cancle_goods_source = `/api/sdc/goodsResourceOperate/cancelSource`; + $api_cancle_goods_source = `/api/sdc/goodsResourceOperate/cancelSource`; // 整车获取货源表详情 $api_get_getCompleteVehicleDetail = `/api/sdc/goodsResourceOperate/getWholeDetail`; // 大宗获取货源表详情 @@ -40,12 +42,12 @@ export class SupplyManagementService extends BaseService { $api_get_listModifyPrice = `/api/sdc/goodsInfo/listModifyPrice`; $api_update_price = `/api/sdc/goodsResourceShipper/modifyPrice`; // 根据货物ID修改单价 $api_get_goods_resource_statistical = `/api/sdc/goodsResourceOperate/statisticalStatus`; // 统计整车、大宗货源状态数量 - // 获取货主企业列表 + // 获取货主企业列表 public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true'; public $api_commonAddress = '/api/sdc/commonAddress/list/page'; - // 获取货主企业列表 + // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; - // 取消货源 + // 取消货源 public $api_cancelSource = '/api/sdc/goodsResourceOperate/cancelSource'; // 整车计算附加费 $api_getCalculatedSurcharge = `/api/sdc/expense/getCalculatedSurcharge`; @@ -56,54 +58,51 @@ 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`; // 货主端大宗货源指派熟车 - // 整车再下一单指派熟车 - $api_save_assign_whole = `/api/sdc/goodsResourceOperate/saveAnotherWholeOrderAssign`; - // 代发整车货源指派熟车 - $api_save_consignWholeAssign = `/api/sdc/goodsResourceOperate/consignWholeAssign`; + // 整车再下一单指派熟车 + $api_save_assign_whole = `/api/sdc/goodsResourceOperate/saveAnotherWholeOrderAssign`; + // 代发整车货源指派熟车 + $api_save_consignWholeAssign = `/api/sdc/goodsResourceOperate/consignWholeAssign`; // 货主端大宗货源指派熟车 $api_save_bulk_assign = `/api/sdc/goodsResourceOperate/saveAnotherBulkOrderAssign`; // 代发大宗货源指派熟车 $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`; - // 新增熟车 + // 根据手机号查询车队长/司机 + $api_getCarCaptainByMobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; + // 新增熟车 $api_enterpriseVehicleSave = `/api/mdc/cuc/enterpriseVehicle/save`; // 删除熟车 $api_deletebatch = `/api/mdc/cuc/enterpriseVehicle/deletebatch`; // 熟车详情 $api_getMyDriverUserDetail = `/api/mdc/cuc/enterpriseVehicle/getMyDriverUserDetail`; - // 获取指派熟车列表 - $api_getList_card = '/api/mdc/cuc/enterpriseVehicle/getPracticeCarList'; + // 获取指派熟车列表 + $api_getList_card = '/api/mdc/cuc/enterpriseVehicle/getPracticeCarList'; - - // 根据地区code查询列表 - $api_getRegionByCode = '/api/mdc/pbc/region/getRegionByCode'; - // 识别身份证 + // 根据地区code查询列表 + $api_getRegionByCode = '/api/mdc/pbc/region/getRegionByCode'; + // 识别身份证 $api_checkIdCard = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; // 驾驶证识别 $api_recognizeDriverLicense = `/api/mdc/pbc/hwc/ocr/recognizeDriverLicense`; - // 查询系统配置项 + // 查询系统配置项 public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page'; - // 货源审核 + // 货源审核 public $api_goodsResourceAudit = '/api/sdc/goodsResourceOperate/goodsResourceAudit'; - // 货源审核【批量】 + // 货源审核【批量】 public $api_batchGoodsResourceAudit = '/api/sdc/goodsResourceOperate/batchGoodsResourceAudit'; constructor(public injector: Injector) { - super(injector) + super(injector); } } diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts index ba78a636..a2618c15 100644 --- a/src/app/routes/supply-management/supply-management-routing.module.ts +++ b/src/app/routes/supply-management/supply-management-routing.module.ts @@ -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 {} diff --git a/src/app/routes/supply-management/supply-management.module.ts b/src/app/routes/supply-management/supply-management.module.ts index d4f6d322..7ab115ec 100644 --- a/src/app/routes/supply-management/supply-management.module.ts +++ b/src/app/routes/supply-management/supply-management.module.ts @@ -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[] = [ SupplyManagementIndexComponent, @@ -60,14 +62,10 @@ const COMPONENTS: Type[] = [ SupplyManagementBulkReleasePublishComponent, TranAgreementComponent, SupplyManagementBulkAssignedCarComponent - ]; @NgModule({ - imports: [ - SharedModule, - SupplyManagementRoutingModule - ], - declarations: COMPONENTS, + imports: [SharedModule, SupplyManagementRoutingModule], + declarations: COMPONENTS }) -export class SupplyManagementModule { } +export class SupplyManagementModule {} diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index 3d37838f..8fe435a6 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@

diff --git a/src/app/shared/widget/dict-select/dict-select.widget.ts b/src/app/shared/widget/dict-select/dict-select.widget.ts index 032997b8..57b64ba5 100644 --- a/src/app/shared/widget/dict-select/dict-select.widget.ts +++ b/src/app/shared/widget/dict-select/dict-select.widget.ts @@ -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"; diff --git a/src/index.html b/src/index.html index 7bea57c5..08a1d33c 100644 --- a/src/index.html +++ b/src/index.html @@ -1,10 +1,12 @@ diff --git a/src/style-icons.ts b/src/style-icons.ts index 7649b81f..9d80aace 100644 --- a/src/style-icons.ts +++ b/src/style-icons.ts @@ -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,