diff --git a/proxy.conf.js b/proxy.conf.js index fc9f6f33..9fc3f420 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 16:49:35 + * @LastEditTime : 2022-01-26 09:41:06 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 5520e3e6..0992d1bc 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -227,7 +227,7 @@ export class PayableOrderComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '核销单号', index: 'phxcode', type: 'link', width: 140 }, - { title: '网络货运人', index: 'ltdId', width: 140 }, + { title: '网络货运人', index: 'ltdName', width: 140 }, { title: '核销日期', index: 'phxdate', type: 'date', width: 160 }, { title: '付款账户', index: 'shipperaccount', width: 120 }, { title: '收款账户', index: 'ltdaccount', width: 120 }, @@ -247,7 +247,7 @@ export class PayableOrderComponent implements OnInit { }, { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 }, { title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 }, - { title: '收款人', index: 'artoname', width: 120 }, + { title: '收款人', index: 'driver2IdName', width: 120 }, { title: '结算客户', index: 'cno', width: 120 }, { title: '银行水单', index: 'bankreceipt', width: 120 }, { title: '创建时间', index: 'createTime', width: 160 }, diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index f0f1eccd..59cc68d1 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -473,6 +473,6 @@ export class insuranceManagementListComponent implements OnInit { // 修改订单 changeOrder(value: any) { - this.router.navigate(['order-management/bulk-detailChange', value.id]); + this.router.navigate(['/insurance-management/list-set', value.id]); } } diff --git a/src/app/routes/insurance-management/components/set/set.component.html b/src/app/routes/insurance-management/components/set/set.component.html new file mode 100644 index 00000000..26789bfa --- /dev/null +++ b/src/app/routes/insurance-management/components/set/set.component.html @@ -0,0 +1,20 @@ + + + + + + + + + diff --git a/src/app/routes/insurance-management/components/set/set.component.less b/src/app/routes/insurance-management/components/set/set.component.less new file mode 100644 index 00000000..1d17aeb7 --- /dev/null +++ b/src/app/routes/insurance-management/components/set/set.component.less @@ -0,0 +1,94 @@ +:host { + .btn-size { + font-size: 14px; + } + + .bdr { + border-right: 1px solid #ccc; + } + + .bdl { + border-left: 1px solid #ccc; + } + + .source-info { + p { + margin-bottom: .5em; + } + } + + .freight-info-box { + width: 95%; + } + + .freigth-label { + display : inline-block; + width : 50px; + text-align: right; + } + + ::ng-deep { + .approval-status { + .ant-steps { + width : 70%; + margin: 0 auto; + } + } + + // .ant-tabs-top>.ant-tabs-nav, + // .ant-tabs-bottom>.ant-tabs-nav, + // .ant-tabs-top>div>.ant-tabs-nav, + // .ant-tabs-bottom>div>.ant-tabs-nav { + // margin: 0; + // } + + // .ant-anchor-ink::before { + // width: 0; + // } + + // .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, + // .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, + // .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, + // .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab { + // margin-left: 40px + // } + } + + .leftPadding { + padding-right: 100px; + } + .handling-info { + min-height: 100px; + border: 1px solid #ccc; + + .loading-row { + display: flex; + } + + .handling-info-icon { + width: 32px; + height: 32px; + margin-right: 24px; + color: #fff; + line-height: 32px; + text-align: center; + border-radius: 50%; + + &.loading-bg { + background-color: #50D4AB; + } + + &.unloaing-bg { + background: #F66F6A; + } + } + + .info { + flex: 1; + } + + .time-info { + margin-left: 56px; + } + } +} \ No newline at end of file diff --git a/src/app/routes/insurance-management/components/set/set.component.spec.ts b/src/app/routes/insurance-management/components/set/set.component.spec.ts new file mode 100644 index 00000000..42437440 --- /dev/null +++ b/src/app/routes/insurance-management/components/set/set.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { insuranceManagementSetComponent } from './set.component'; + +describe('insuranceManagementSetComponent', () => { + let component: insuranceManagementSetComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ insuranceManagementSetComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(insuranceManagementSetComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/insurance-management/components/set/set.component.ts b/src/app/routes/insurance-management/components/set/set.component.ts new file mode 100644 index 00000000..7e1055a0 --- /dev/null +++ b/src/app/routes/insurance-management/components/set/set.component.ts @@ -0,0 +1,45 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-12-06 20:20:26 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-25 20:43:37 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\set\\set.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +import { Router } from '@angular/router'; +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STColumn } from '@delon/abc/st'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { InsuranceManagementService } from '../../services/insurance-management.service'; +import { NzCardComponent } from 'ng-zorro-antd/card'; +@Component({ + selector: 'app-insurance-management-set', + templateUrl: './set.component.html', + styleUrls: ['./set.component.less'] +}) +export class insuranceManagementSetComponent implements OnInit { + + constructor( + private route: ActivatedRoute, + private msgSrv: NzMessageService, + private service: InsuranceManagementService, + ) { + + } + + ngOnInit(): void { + this.initData() + } + initData() { + + } + goBack() { + window.history.go(-1); + } + +} diff --git a/src/app/routes/insurance-management/insurance-management-routing.module.ts b/src/app/routes/insurance-management/insurance-management-routing.module.ts index b591a08c..845a621d 100644 --- a/src/app/routes/insurance-management/insurance-management-routing.module.ts +++ b/src/app/routes/insurance-management/insurance-management-routing.module.ts @@ -11,11 +11,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { insuranceManagementListComponent } from './components/list/list.component'; +import { insuranceManagementSetComponent } from './components/set/set.component'; const routes: Routes = [ { path: 'list', component: insuranceManagementListComponent }, - // { path: 'list-detail/:id', component: OrderManagementVehicleDetailComponent }, + { path: 'list-set/:id', component: insuranceManagementSetComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/insurance-management/insurance-management.module.ts b/src/app/routes/insurance-management/insurance-management.module.ts index 7dc3185e..b88a4556 100644 --- a/src/app/routes/insurance-management/insurance-management.module.ts +++ b/src/app/routes/insurance-management/insurance-management.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-06 09:24:00 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 17:22:04 + * @LastEditTime : 2022-01-25 20:45:45 * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\insurance-management.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -12,15 +12,18 @@ import { NgModule, Type } from '@angular/core'; import { SharedModule } from '@shared'; import { insuranceManagementListComponent } from './components/list/list.component'; +import { insuranceManagementSetComponent } from './components/set/set.component'; import { InsuranceManagementRoutingModule } from './insurance-management-routing.module'; const COMPONENTS: Type[] = [ - insuranceManagementListComponent + insuranceManagementListComponent, + insuranceManagementSetComponent ]; @NgModule({ imports: [ SharedModule, - InsuranceManagementRoutingModule + InsuranceManagementRoutingModule, + ], declarations: COMPONENTS, }) diff --git a/src/app/routes/sys-setting/components/role-management/menu/menu.component.html b/src/app/routes/sys-setting/components/role-management/menu/menu.component.html index 5ddab19d..05ab3b8e 100644 --- a/src/app/routes/sys-setting/components/role-management/menu/menu.component.html +++ b/src/app/routes/sys-setting/components/role-management/menu/menu.component.html @@ -6,13 +6,26 @@
- + + +
+ +
+
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index ce133242..4f46c02a 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -1,74 +1,86 @@ - - + -
-
- -
-
- - - - -
+
+
+
+
+ + + + +
+
- - - - - - - - -
-
- 已选择 - {{ selectedRows.length }} 条数据   开票金额总计 - {{totalCallNo }} - 清空 -
- - - -
- + +
+ - - - {{ item.vatappcode }}
- - + + + {{ item.vatappcode }}
+ + + -
-
- - - -
+
+
+ + +
- \ No newline at end of file +
+ diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 5a962ed6..99377d53 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -357,7 +357,7 @@ export class InvoiceRequestedComponent implements OnInit { { title: '', index: 'key', type: 'checkbox' }, { title: '申请编号', render: 'vatappcode', width: 180 }, { title: '网络货运人', index: 'ltdName', width: 120 }, - { title: '购买方', index: 'projectName', width: 90 }, + { title: '购买方', index: 'arto', width: 90 }, { title: '订单数', index: 'ordlines', width: 90 }, { title: '申请金额', diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html index 9f740250..8e20fb35 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html @@ -1,26 +1,36 @@ + - - - {{ item.billHCode }} - + + + {{ item.billHCode }} +
- - - - -
\ No newline at end of file + + + +
diff --git a/src/app/shared/components/insurance-table/index.ts b/src/app/shared/components/insurance-table/index.ts new file mode 100644 index 00000000..2264f1be --- /dev/null +++ b/src/app/shared/components/insurance-table/index.ts @@ -0,0 +1,12 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-25 20:20:07 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-25 20:28:47 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\index.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +export * from './insurance-table.module' +export * from './insurance-table.service' \ No newline at end of file diff --git a/src/app/shared/components/insurance-table/insurance-table.component.html b/src/app/shared/components/insurance-table/insurance-table.component.html new file mode 100644 index 00000000..224b4551 --- /dev/null +++ b/src/app/shared/components/insurance-table/insurance-table.component.html @@ -0,0 +1,63 @@ +
+
+
+ + +
+ + + + + 公里数 + 计算方式 + 车长（米） + 操作 + + + +
+ + + + +
+ + + + + + +
+ + + + +
+ + {{computeMode[item.computeMode] }} + +
+ + + + + + +
+ + + 删除 + + + + + + +
+
\ No newline at end of file diff --git a/src/app/shared/components/insurance-table/insurance-table.component.less b/src/app/shared/components/insurance-table/insurance-table.component.less new file mode 100644 index 00000000..d2c457ab --- /dev/null +++ b/src/app/shared/components/insurance-table/insurance-table.component.less @@ -0,0 +1,14 @@ +:host::ng-deep { + nz-input-number { + width: 85px; + + input { + width : 100%; + margin: 0; + } + + .ant-input-number-handler-wrap { + display: none; + } + } +} \ No newline at end of file diff --git a/src/app/shared/components/insurance-table/insurance-table.component.ts b/src/app/shared/components/insurance-table/insurance-table.component.ts new file mode 100644 index 00000000..caa38ef9 --- /dev/null +++ b/src/app/shared/components/insurance-table/insurance-table.component.ts @@ -0,0 +1,136 @@ +import { Component, OnInit } from '@angular/core'; +import { BaseService } from '@shared'; + +@Component({ + selector: 'app-insurance-table', + templateUrl: './insurance-table.component.html', + styleUrls: ['./insurance-table.component.less'] +}) +export class InsuranceTableComponent implements OnInit { + data: any[] = []; + headers: any[] = []; + + formatterDollar = (value: number): string => `${value} （含）`; + computeMode: any = { + 0: '总运价', + 1: '单公里运价' + }; + constructor(public service: BaseService) {} + + ngOnInit(): void { + this.loadHeaders(); + this.loadData(); + } + + loadHeaders() { + this.service.request('/api/mdc/cuc/freightConfigItem/list').subscribe(res => { + if (res) { + this.headers = res; + } + }); + } + + loadData() { + this.service.request('/api/mdc/cuc/freightConfig/list').subscribe(res => { + if (res) { + this.data = res; + } + }); + } + + /** + * 修改结束车长 + * @param event 车长 + * @param i 下标 + */ + changeEndLength(event: any, i: number) { + if (event <= this.headers[i].startLength) { + this.headers[i].endLength = this.headers[i].startLength + 1; + this.changeNextStartLength(event, i + 1); + return; + } + this.headers[i].endLength = event; + this.changeNextStartLength(event, i + 1); + } + + /** + * 修改结束公里数 + * @param event 车长 + * @param i 下标 + */ + changeEndKm(event: any, i: number) { + if (event <= this.data[i].startKm) { + this.data[i].endKm = this.data[i].startKm + 1; + this.changeNextStartKm(event, i + 1); + return; + } + this.data[i].endKm = event; + this.changeNextStartKm(event, i + 1); + } + + add() { + console.log(this.data); + + const tem = this.data[this.data?.length - 1]; + if (tem && tem.endKm) { + const list = this.headers.map(item => ({ + ewPrice: null, + itemId: item.id, + maxPrice: null + })); + this.data.push({ + computeMode: 1, + configValue: list, + endKm: '', + startKm: tem.endKm + }); + this.data = [...this.data]; + } else { + this.service.msgSrv.warning('请填写完整公里数'); + } + } + + deleteRow(index: number) { + this.data = this.data.filter((d, i) => index !== i); + } + + save() { + this.service.request('/api/mdc/cuc/freightConfig/saveBatch', this.data).subscribe(res => { + if (res) { + console.log(res); + this.service.msgSrv.success('修改成功'); + this.loadData(); + } + }); + } + + /** + * 遍历同步后置位车长 + * @param event 车长 + * @param i 下标 + */ + private changeNextStartLength(event: number, i: number) { + if (this.headers[i]) { + this.headers[i].startLength = event; + if (this.headers[i].endLength <= event) { + this.headers[i].endLength = this.headers[i].startLength + 0.5; + this.changeNextStartLength(event + 0.5, i + 1); + } + } + } + + /** + * 遍历同步后置位公里数 + * @param event 车长 + * @param i 下标 + */ + private changeNextStartKm(event: number, i: number) { + if (this.data[i]) { + this.data[i].startKm = event; + if (this.data[i].endKm <= event) { + this.data[i].endKm = this.data[i].startKm + 1; + this.changeNextStartKm(event + 1, i + 1); + } + } + } +} diff --git a/src/app/shared/components/insurance-table/insurance-table.module.ts b/src/app/shared/components/insurance-table/insurance-table.module.ts new file mode 100644 index 00000000..e44d543e --- /dev/null +++ b/src/app/shared/components/insurance-table/insurance-table.module.ts @@ -0,0 +1,30 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-25 20:23:54 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-25 20:35:32 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { NzInputNumberModule } from 'ng-zorro-antd/input-number'; +import { NzTableModule } from 'ng-zorro-antd/table'; +import { InsuranceTableComponent } from './insurance-table.component'; + + +const COMPONENTS = [InsuranceTableComponent]; +const COMPONENTSs = [ + NzTableModule, + NzInputNumberModule +]; + +@NgModule({ + declarations: COMPONENTS, + imports: [CommonModule, FormsModule,COMPONENTSs], + exports: COMPONENTS +}) +export class InsuranceTableModule {} diff --git a/src/app/shared/components/insurance-table/insurance-table.service.ts b/src/app/shared/components/insurance-table/insurance-table.service.ts new file mode 100644 index 00000000..1d8c52fd --- /dev/null +++ b/src/app/shared/components/insurance-table/insurance-table.service.ts @@ -0,0 +1,18 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-25 20:21:04 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-25 20:35:52 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.service.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +import { Injectable } from '@angular/core'; + + + +@Injectable({ providedIn: 'root' }) + +export class InsuranceService { +} diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts index bc5f4295..c4f6f3e2 100644 --- a/src/app/shared/index.ts +++ b/src/app/shared/index.ts @@ -1,10 +1,10 @@ /* * @Author: your name * @Date: 2021-11-29 10:04:12 - * @LastEditTime: 2021-12-13 10:42:19 - * @LastEditors: Please set LastEditors + * @LastEditTime : 2022-01-25 20:34:23 + * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\shared\index.ts + * @FilePath : \\tms-obc-web\\src\\app\\shared\\index.ts */ // Modules export * from './components/delay/index'; @@ -19,6 +19,7 @@ export * from './components/captcha/index'; export * from './components/amap/index'; export * from './components/dict-select/index'; export * from './components/dynamic-setting'; +export * from './components/insurance-table/index'; // Utils export * from './utils';