diff --git a/proxy.conf.js b/proxy.conf.js index f53a3c97..910fdf62 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-21 16:48:06 + * @LastEditTime : 2022-01-25 14:29:55 * @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/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 4d70087b..c4d8a9fe 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @LastEditors : Shiming - * @LastEditTime : 2022-01-19 10:39:55 + * @LastEditTime : 2022-01-25 14:25: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. */ @@ -141,7 +141,8 @@ export class ContractManagementTemplateDetailComponent implements OnInit { save() { console.log(this.sf.value) - console.log(this.sf2.value) + console.log(this.sf2.value) + console.log(this.detailList.templateName) console.log(this.title) if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) { this.service.msgSrv.error('必填参数为空,请检查再重新保存!'); diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html index c0b073c7..bc01eaf3 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html @@ -18,7 +18,7 @@ {{ costInfo?.brmdate }} - {{ costInfo?.brmmodeLabel }} + {{ costInfo?.brmModeLabel }} {{ costInfo?.banktypeLabel }} @@ -36,18 +36,19 @@ {{ costInfo?.recnopay |currency }} - {{ costInfo?.ltdid }} + {{ 0 |currency }} {{ costInfo?.brmmoney |currency }} + {{ costInfo?.brmmoney |currency }} {{ costInfo?.bankreceipt }} - {{ costInfo?.yskmoney |currency}} + {{ costInfo?.brmmoney |currency }} {{ costInfo?.remarks }} diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index d468ea7b..2ca688a9 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -256,7 +256,7 @@ export class ReceiptOrderComponent implements OnInit { { title: '付款人', index: 'artoname', width: 200, className: 'text-left' }, { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' }, { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-left' }, - { title: '创建人', index: 'createUserName', width: 150, className: 'text-left' }, + // { title: '创建人', index: 'createUserName', width: 150, className: 'text-left' }, { title: '收款状态', index: 'stsLabel', width: 200, className: 'text-left' }, { title: '收款备注', index: 'remarks', width: 200, className: 'text-left' }, { diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index c6ef3eed..d958b017 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 14:33:59 + * @LastEditTime : 2022-01-25 14:02:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -108,13 +108,13 @@
- + diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.spec.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.spec.ts index e231763d..61b6bb2e 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.spec.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.spec.ts @@ -1,19 +1,29 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-12-03 15:31:52 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-25 13:28:47 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.spec.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SupplyManagementVehicleComponent } from './vehicle.component'; +import { OrderManagementVehicleComponent } from './vehicle.component'; -describe('SupplyManagementVehicleComponent', () => { - let component: SupplyManagementVehicleComponent; - let fixture: ComponentFixture; +describe('OrderManagementVehicleComponent', () => { + let component: OrderManagementVehicleComponent; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ SupplyManagementVehicleComponent ] + declarations: [ OrderManagementVehicleComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(SupplyManagementVehicleComponent); + fixture = TestBed.createComponent(OrderManagementVehicleComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index 48c2640f..0ee4bd77 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -213,7 +213,7 @@ export class orderManagementVoucherViewComponent implements OnInit { } as SFUploadWidgetSchema, } }, - required: ['time'] + required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ] }; }else { this.schema = { @@ -383,7 +383,6 @@ export class orderManagementVoucherViewComponent implements OnInit { } as SFUploadWidgetSchema, } }, - required: ['time', 'weight' ] }; } this.ui = { @@ -398,17 +397,17 @@ export class orderManagementVoucherViewComponent implements OnInit { }; } save(value: any): void { - if(!value) { + if(!this.sf.valid) { this.service.msgSrv.warning('必填项为空!') return; } console.log(value) const params = { - id: this.i.id, - loadingLadingBillFilePath: value.loadingLadingBillFilePath.data.fullFilePath, - loadingPeopleVehiclesGoodsFilePath: value.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath, - unloadingLadingBillFilePath: value.unloadingLadingBillFilePath.data.fullFilePath, - unloadingPeopleVehiclesGoodsFilePath: value.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath, + id: this.i?.id, + loadingLadingBillFilePath: value?.loadingLadingBillFilePath?.data?.fullFilePath, + loadingPeopleVehiclesGoodsFilePath: value?.loadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath, + unloadingLadingBillFilePath: value?.unloadingLadingBillFilePath?.data?.fullFilePath, + unloadingPeopleVehiclesGoodsFilePath: value?.unloadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath, } console.log(params) this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => {