diff --git a/proxy.conf.js b/proxy.conf.js index f53a3c97..445b7e9d 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 15:35: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/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/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 2fc3b452..1a03eb4e 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -240,11 +240,11 @@ export class PaymentOrderComponent implements OnInit { { title: '付款类型', index: 'payType', width: 130 }, { title: '付款方式', index: 'payModeLabel', width: 130 }, { title: '结算客户', index: 'shipperId', width: 160 }, - { title: '收款人', index: 'hrToName', width: 150 }, - { title: '应付已核销', index: 'callNo', width: 150 }, + { title: '收款人', index: 'hrToLabel', width: 150 }, + { title: '应付已核销', index: 'ishrhxLabel', width: 150 }, { title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, { title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, - { title: '创建人', index: 'createUserId', width: 160 }, + { title: '创建人', index: 'createUserIdLabel', width: 160 }, { title: '付款备注', index: 'payRemarks', width: 200 }, { title: '操作', 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-detail/receipt-order-detail.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts index 971b4c0f..17dd85b2 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-20 10:00:39 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-25 15:40:10 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order-detail\\receipt-order-detail.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; @@ -63,7 +73,7 @@ export class ReceiptOrderDetailComponent implements OnInit { ], requested: [ { title: '序号', render: 'no', width: 70, className: 'text-left' }, - { title: '结算客户', index: 'cno', className: 'text-left', width: 200 }, + { title: '结算客户', index: 'cnoName', className: 'text-left', width: 200 }, { title: '预收金额', index: 'yskmoney', diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html index e682ecda..454e1a45 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 18:43:42 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 18:58:32 + * @LastEditTime : 2022-01-25 15:38:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> 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 8fcbb0fe..9df398c0 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 @@ -236,11 +236,11 @@ export class ReceiptOrderComponent implements OnInit { }, { title: '核销金额', - index: 'armoney', + index: 'brmmoney', width: 200, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.brmmoney }) } }, { title: '预收金额', @@ -252,11 +252,11 @@ export class ReceiptOrderComponent implements OnInit { }, { title: '银行类型', index: 'banktypeLabel', width: 200, className: 'text-left' }, { title: '收款类型', index: 'brmtypeLabel', width: 150, className: 'text-left' }, - { title: '收款方式', index: 'brmmode', width: 150, className: 'text-left' }, + { title: '收款方式', index: 'brmmodeLabel', width: 150, className: 'text-left' }, { 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: 'createUserId', 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/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index 876fcce9..e1e49644 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -238,7 +238,7 @@ export class ReceivableOrderComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 }, - { title: '网络货运人', index: 'ltdId', width: 140 }, + { title: '网络货运人', index: 'ltdName', width: 140 }, { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 }, { title: '付款账户', index: 'shipperaccount', width: 120 }, { title: '收款账户', index: 'ltdaccount', width: 120 }, diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 8e449949..4416f1d5 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -622,8 +622,23 @@ export class OrderManagementBulkComponent implements OnInit { /** *查看评价 */ - viewEvaluate(item: any) { - this.isVisibleEvaluate = true; + viewEvaluate(item: any) { + console.log(item) + this.isVisibleEvaluate = true + const params = { + businessCode: item.billCode, + evaluateUserId: item.shipperAppUserId, + } + const params2 = { + businessCode: item.billCode, + passiveUserId: item.shipperAppUserId, + } + this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { + console.log(res) + }); + this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => { + console.log(res) + }); } /** *变更运费 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/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 768b0740..774ad548 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -1,3 +1,4 @@ +import { registerLocaleData } from '@angular/common'; import { Router } from '@angular/router'; import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent } from '@delon/abc/st'; @@ -448,6 +449,10 @@ export class OrderManagementRiskComponent implements OnInit { } else { idList.push(this.sfView.value.billCode) } + if(!this.sfView.value.representationsCause) { + this.service.msgSrv.error('拒绝原因为空！'); + return; + } const parms = { ids: idList, auditRemark: this.sfView.value.representationsCause, @@ -466,12 +471,18 @@ export class OrderManagementRiskComponent implements OnInit { *审核 */ audit(item?: any) { - this.isVisibleRE = true; if (item) { this.auditId = item.id; this.initSTAudit(1); + this.isVisibleRE = true; } else { + if(this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择订单！') + return; + } else { this.initSTAudit(2); + this.isVisibleRE = true; + } } } /** 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/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 46a7f823..8b081670 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -588,6 +588,20 @@ resourceStatus: any; viewEvaluate(item: any) { console.log(item) this.isVisibleEvaluate = true + const params = { + businessCode: item.billCode, + evaluateUserId: item.shipperAppUserId, + } + const params2 = { + businessCode: item.billCode, + passiveUserId: item.shipperAppUserId, + } + this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { + console.log(res) + }); + this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => { + console.log(res) + }); } /** *变更运费 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) => { 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 3facc950..9e2db533 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-29 16:48:16 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:22:24 + * @LastEditTime : 2022-01-24 20:18:38 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\freight-people\\freight-people.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -12,5 +12,5 @@
- +
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 e943dd48..186d9e9d 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-29 16:48:16 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:22:37 + * @LastEditTime : 2022-01-24 20:19:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\freight-people\\freight-people.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -57,7 +57,7 @@ export class VehicleFreightPeopleComponent implements OnInit { } } }, - required: ['enterpriseInfoName'] + required: ['enterpriseInfoId'] }; this.ui = { '*': { @@ -69,9 +69,13 @@ export class VehicleFreightPeopleComponent implements OnInit { save(value: any): void { console.log(this.sf.value); + if(!this.sf.valid) { + this.service.msgSrv.error("请选择网络货运人！") + return; + } const params = { billIds: this.data?.ids, - enterpriseInfoId: this.sf.value?.enterpriseInfoName + enterpriseInfoId: this.sf.value?.enterpriseInfoId }; console.log(params); this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => { 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 02294abf..2b1b0539 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 16:39:11 + * @LastEditTime : 2022-01-25 15:26:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -144,6 +144,14 @@ export class OrderManagementService extends ShipperBaseService { // 获取规则抽查分类统计 public $api_get_getComplianceStatisticalStatus = '/api/sdc/billOperate/getComplianceStatisticalStatus'; + // 货主端-货主查看评价（评价司机的） + public $api_getBillEvaluateByShipper = '/api/sdc/billEvaluate/getBillEvaluateByShipper'; + // 货主端-货主查看评价（司机评价货主的） + public $api_getBillEvaluateDriverByShipper = '/api/sdc/billEvaluate/getBillEvaluateDriverByShipper'; + + + + getDictByKey(dictKey: string) { const params = { dictKey: dictKey }; return this.request(this.$api_getDictValue, params); diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 8dd08b5b..72e00ce5 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -216,6 +216,11 @@
服务信息
+
+
+ +
+
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index f4072d90..ded52605 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { + SFCheckboxWidgetSchema, SFComponent, SFNumberWidgetSchema, SFSchema, @@ -31,6 +32,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { sf3data: any; // 货源单设置回显 sf4data: any; // 货源单设置回显 sf5data: any; // 货源单设置回显 + sf55data: any; // 货源单设置回显 sf6data: any; // 货源单设置回显 sf7data: any; // 货源单设置回显 creatTime: any; // 货源单设置回显 @@ -87,6 +89,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { schema5: SFSchema = {}; ui5!: SFUISchema; + @ViewChild('sf55', { static: false }) sf55!: SFComponent; + schema55: SFSchema = {}; + ui55!: SFUISchema; + @ViewChild('sf6', { static: false }) sf6!: SFComponent; schema6: SFSchema = {}; ui6!: SFUISchema; @@ -105,6 +111,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.initSF3(); this.initSF4(); this.initSF5(); + this.initSF55(); this.initSF6(); this.initSF7(); this.initdata(); @@ -356,7 +363,56 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } }; } - + initSF55() { + this.schema55 = { + properties: { + insuranceType: { + type: 'string', + title: '增值服务套餐', + enum: [ + { label: '不购买', value: '0' }, + { label: '套餐一', value: '1' }, + { label: '套餐二', value: '2' } + ], + ui: { + widget: 'select' + }, + default:'0' + }, + type1: { + type: 'string', + title: '', + enum: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'], + readOnly: true, + ui: { + widget: 'checkbox', + visibleIf: {insuranceType: (value: string) => value ==='1'}, + } as SFCheckboxWidgetSchema, + default: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'], + }, + type2: { + type: 'string', + title: '', + enum: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'], + readOnly: true, + ui: { + widget: 'checkbox', + visibleIf: {insuranceType: (value: string) => value ==='2'}, + } as SFCheckboxWidgetSchema, + default: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'], + } + } + }; + this.ui55 = { + '*': { + spanLabelFixed: 100, + grid: { span: 24 } + }, + $insuranceType: { + grid: { span: 12 } + } + }; + } initSF5() { this.schema5 = { properties: { @@ -810,6 +866,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { loadingTime: this.validateForm1?.value?.loadingTime, unloadingTime: this.validateForm1?.value?.unloadingTime, unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo], + insuranceType:this.sf55.value.insuranceType, goodsInfoDTOList: [ { ...this.sf4.value, @@ -836,6 +893,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.requests(this.service.$api_set_saveAnotherWholeOrder, params, 2); } } + // 补0函数 addPreZero(num: any) { if (num < 10) { return '0' + num; @@ -1040,13 +1098,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.sf5data = { goodsValue: res?.goodsValue }; - console.log(res?.stateReceipt); - // this.sf6data = { - // stateReceipt: res?.stateReceipt, - // receiptType: res?.receiptType, - // receiptUserId: res?.receiptUserId, - // remarks: res?.remarks - // }; + this.sf55data = { + insuranceType: res?.insuranceType || '' + }; this.sf6data = { stateReceipt: res?.stateReceipt, receiptType: res?.receiptType || '', diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index bca4c098..02c0f86c 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -223,6 +223,11 @@
服务信息
+
+
+ +
+
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index a8bd869b..0a546e3b 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -3,6 +3,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router'; import { cacheConf } from '@conf/cache.conf'; import { + SFCheckboxWidgetSchema, SFComponent, SFNumberWidgetSchema, SFSchema, @@ -37,6 +38,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { sf3data: any; // 货源单设置回显 sf4data: any; // 货源单设置回显 sf5data: any; // 货源单设置回显 + sf55data: any; // 货源单设置回显 sf6data: any; // 货源单设置回显 sf7data: any; // 货源单设置回显 id = ''; @@ -86,6 +88,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit { @ViewChild('sf5', { static: false }) sf5!: SFComponent; schema5: SFSchema = {}; ui5!: SFUISchema; + + @ViewChild('sf55', { static: false }) sf55!: SFComponent; + schema55: SFSchema = {}; + ui55!: SFUISchema; @ViewChild('sf6', { static: false }) sf6!: SFComponent; schema6: SFSchema = {}; @@ -100,6 +106,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.initSF3(); this.initSF4(); this.initSF5(); + this.initSF55(); this.initSF6(); this.initSF7(); this.addStartInfo(); @@ -400,6 +407,56 @@ export class SupplyManagementReleasePublishComponent implements OnInit { } }; } + initSF55() { + this.schema55 = { + properties: { + insuranceType: { + type: 'string', + title: '增值服务套餐', + enum: [ + { label: '不购买', value: '0' }, + { label: '套餐一', value: '1' }, + { label: '套餐二', value: '2' } + ], + ui: { + widget: 'select' + }, + default:'0' + }, + type1: { + type: 'string', + title: '', + enum: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'], + readOnly: true, + ui: { + widget: 'checkbox', + visibleIf: {insuranceType: (value: string) => value ==='1'}, + } as SFCheckboxWidgetSchema, + default: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'], + }, + type2: { + type: 'string', + title: '', + enum: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'], + readOnly: true, + ui: { + widget: 'checkbox', + visibleIf: {insuranceType: (value: string) => value ==='2'}, + } as SFCheckboxWidgetSchema, + default: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'], + } + } + }; + this.ui55 = { + '*': { + spanLabelFixed: 100, + grid: { span: 24 } + }, + $insuranceType: { + grid: { span: 12 } + } + }; + } initSF6() { this.schema6 = { properties: { @@ -755,7 +812,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ...this.sf5.value, ...this.sf6.value, expenseDTOList: expenseList, - paymentDays: this.sf7.value.paymentDays + paymentDays: this.sf7.value.paymentDays, + insuranceType:this.sf55.value.insuranceType, }; let reqUrl = this.service.$api_consignWhole; diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 688ef255..8bc8f0f2 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -279,7 +279,7 @@ export class CancellationInvoiceComponent implements OnInit { }, { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, { title: '网络货运人', index: 'ltdName', width: 120 }, - { title: '购买人', index: 'artoName', width: 90 }, + { title: '购买人', index: 'artoname', width: 90 }, { title: '订单数', index: 'ordlines', width: 90, className: 'text-right' }, { title: '价税合计', diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 40ff6972..6040a2ac 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -1,154 +1,179 @@ - - - + + + -
-
- - {{headerInfo?.ltdId}} - - - {{headerInfo?.vatappHCode}} - - - {{headerInfo?.invoiceno}} - - - {{headerInfo?.invoiceno2}} - - - {{headerInfo?.invoicedate}} - - - {{headerInfo?.vatmoney}} - - - {{headerInfo?.vattax}} - -
-
- - {{headerInfo?.artoname}} - - - {{headerInfo?.artotaxno}} - - - {{headerInfo?.artoadd}} - - - {{headerInfo?.artotel}} - - - {{headerInfo?.artobank}} - - - {{headerInfo?.artoacc}} - - - {{headerInfo?.remarks}} - - -
-
- - - - - - - -
+
+ + + + + + + +
+
+ + +
+
+ +
+
+ + + +
+
- - -
-
- -
-
- - - -
-
+ + + +
+
+ +
+
+ + + +
+
- - - -
-
- -
-
- - - -
-
- - - - - - - - - {{ item.vatname }} - - - - {{ item.vatmodel }} - - - - {{ item.vatunit }} - - - - {{ item.vatqty }} - - - - -

顺丰快递: {{routesInfo?.mailNo}} 已签收 -

- - - - - - \ No newline at end of file + + + + + + + + {{ item.vatname }} + + + + {{ item.vatmodel }} + + + + {{ item.vatunit }} + + + + {{ item.vatqty }} + + + + +

顺丰快递: {{ routesInfo?.mailNo }} 已签收

+ + + + diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index 5cc94f2a..67f599e4 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -108,7 +108,7 @@ export class InvoiceDetailComponent implements OnInit { private initOrderSF(): SFSchema { return { properties: { - billHId: { + billHCode: { type: 'string', title: '订单号', ui: { @@ -146,14 +146,14 @@ export class InvoiceDetailComponent implements OnInit { private initOrderST(): STColumn[] { return [ - { title: '订单号', index: 'billHId', width: 140 }, + { title: '订单号', index: 'billHCode', width: 180 }, { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 }, - { title: '所属项目', index: 'projectId', width: 140 }, - { title: '订单类型', index: 'billType', width: 120 }, + { title: '所属项目', index: 'projectId', width: 180 }, + { title: '订单类型', index: 'billTypeLabel', width: 120 }, { title: '装货地', index: 'loadingfrom', width: 200 }, - { title: '卸货地', index: 'loadingto', width: 200 }, + { title: '卸货地', index: 'loadingto', width: 220 }, { title: '货物信息', index: 'goodsinfo', width: 140 }, - { title: '承运司机', index: 'driverinfo', width: 140 }, + { title: '承运司机', index: 'driverinfo', width: 280 }, { title: '申请金额', index: 'billkpnotax', diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 422dcf0c..1b8a2d0f 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -1,10 +1,10 @@ /* * @Author: your name * @Date: 2021-12-23 16:50:17 - * @LastEditTime: 2021-12-31 13:35:22 - * @LastEditors: Please set LastEditors + * @LastEditTime : 2022-01-25 15:53:13 + * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\ticket-management\components\invoice-requested\requested-invoice-modal\requested-invoice-modal.component.ts + * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts */ import { Component, OnInit, ViewChild } from '@angular/core'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; @@ -66,12 +66,12 @@ export class RequestedInvoiceModalComponent implements OnInit { { title: '', index: 'key', type: 'checkbox' }, { title: '订单号', index: 'billHCode', width: 150 }, { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 }, - { title: '所属项目', index: 'projectIdName', width: 160 }, + { title: '所属项目', index: 'projectIdName', width: 250 }, { title: '订单类型', index: 'billTypeName', width: 90 }, { title: '装货地', index: 'loadingfrom', width: 250 }, { title: '卸货地', index: 'loadingto', width: 250 }, { title: '货物信息', index: 'goodsinfo', width: 170 }, - { title: '承运司机', index: 'driverinfo', width: 170 }, + { title: '承运司机', index: 'driverinfo', width: 280 }, { title: '总费用', index: 'billkpmoney', diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index 395f9cf6..7f7c1c1f 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -312,10 +312,6 @@ tabs = { width: '110px', className: 'text-left', buttons: [ - { - text: '查看评价', - click: (_record) => this.viewEvaluate(_record), - }, { text: '确认发车', click: (_record) => this.sureDepart(_record), diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index a0f2caba..a0243691 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -313,10 +313,6 @@ export class WaybillManagementVehicleComponent implements OnInit { width: '110px', className: 'text-left', buttons: [ - { - text: '查看评价', - click: _record => this.viewEvaluate(_record) - }, { text: '确认发车', click: _record => this.sureDepart(_record),