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 e94ae430..cf3bdeca 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 @@ -86,19 +86,6 @@ export class ContractManagementTemplateTextComponent implements OnInit { } } as SFSelectWidgetSchema }, - // contractType: { - // title: '单据类型', - // type: 'string', - // default: '', - // ui: { - // widget: 'dict-select', - // params: { dictKey: 'contract:document:type' }, - // containAllLable: true, - // visibleIf: { - // templateType: value => value === 'MX' - // } - // } as SFSelectWidgetSchema - // }, signingObject: { type: 'string', title: '承包商对象', 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 b163791f..563e1306 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -480,6 +480,7 @@ export class insuranceManagementListComponent implements OnInit { { text: '查看保单', click: _record => this.showImg(_record), + iif: item => item.insureStatus == '2' // acl: { ability: ['VEHICLE-LIST-view'] }, // iif: item => // item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' @@ -487,6 +488,7 @@ export class insuranceManagementListComponent implements OnInit { { text: '退保费', click: _record => this.retreatPrice(_record), + iif: item => item.insureStatus == '2' // acl: { ability: ['VEHICLE-LIST-view'] }, } ] @@ -531,7 +533,7 @@ export class insuranceManagementListComponent implements OnInit { nzContent: '退还后不可撤销，请谨慎操作！', nzCancelText: '取消', nzOnOk: () => { - this.service.request(this.service.$api_del_many, [value.id]).subscribe(res => { + this.service.request(this.service.$api_get_addINPBillRefundApplication, {id: value.id}).subscribe(res => { if (res) { this.service.msgSrv.success('删除菜单成功'); } diff --git a/src/app/routes/insurance-management/services/insurance-management.service.ts b/src/app/routes/insurance-management/services/insurance-management.service.ts index deaea9a6..4dece0b2 100644 --- a/src/app/routes/insurance-management/services/insurance-management.service.ts +++ b/src/app/routes/insurance-management/services/insurance-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-02-10 10:40:56 + * @LastEditTime : 2022-02-28 17:11:54 * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -27,6 +27,8 @@ export class InsuranceManagementService extends ShipperBaseService { // 保险费公司认证 $api_get_submitAuthInfo = `/api/sdc/premiumInfo/submitAuthInfo`; + // 退保费 + $api_get_addINPBillRefundApplication = `/billRefundApplication/addINPBillRefundApplication`; constructor(public injector: Injector, public eaCacheSrv: EACacheService) { super(injector, eaCacheSrv); 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 3547171e..5ff910f6 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 @@ -14,10 +14,11 @@
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
+
-
+
装货地 @@ -25,78 +26,15 @@ - - - -
- - - - 联系人 -
- - - - - - -
- -
-
- -
-
-
-
- -
-
-
-
- - 卸货地 - -
- - - - @@ -109,7 +47,75 @@ + + + + +
+ +
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+ + 卸货地 + +
+ + + + + +
+ + + + 联系人 +
+ +
-
- +
+
+
+ +
- 装货时间 + 装货时间
- 卸货时间 + 卸货时间
- + diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index 35b08935..f6d4bb4f 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -50,7 +50,3 @@ input[type='number']::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } -.hides { - margin-left: 10px; - color: aqua; -} diff --git a/src/app/routes/supply-management/components/update-price/update-price.component.ts b/src/app/routes/supply-management/components/update-price/update-price.component.ts index 41494016..0c41962e 100644 --- a/src/app/routes/supply-management/components/update-price/update-price.component.ts +++ b/src/app/routes/supply-management/components/update-price/update-price.component.ts @@ -79,6 +79,10 @@ export class SupplyManagementUpdatePriceComponent implements OnInit { spanLabelFixed: 100, grid: { span: 16 }, }, + '$rule': { + spanLabelFixed: 120, + grid: { span: 16 }, + }, }; } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 6c978665..2f61905f 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -616,13 +616,14 @@ export class SupplyManagementVehicleComponent implements OnInit { click: _record => this.nextOrder(_record), acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] } }, - {type: 'divider'}, { text: '重新指派　', click: _record => this.assignedCar(_record), iif: item => item.resourceStatus === '1' && item.serviceType === '2', acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] } - } + }, + {type: 'divider'}, + ] } ];