Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
		| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-01-12 10:52:50 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-26 11:08:44 | ||||
|  * @LastEditTime : 2022-02-10 10:40:17 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| @ -53,7 +53,7 @@ | ||||
|     #st | ||||
|     [bordered]="true" | ||||
|     [scroll]="{ x: '2000px' }" | ||||
|     [data]="service.$api_get_listBulkPage" | ||||
|     [data]="service.$api_premiumInfo_list" | ||||
|     [columns]="columns" | ||||
|     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" | ||||
|     [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-03 15:31:52 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-25 17:23:04 | ||||
|  * @LastEditTime : 2022-02-10 10:40:56 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
|  */ | ||||
| @ -17,12 +17,14 @@ import { map } from 'rxjs/operators'; | ||||
|   providedIn: 'root' | ||||
| }) | ||||
| export class InsuranceManagementService extends ShipperBaseService { | ||||
|  // 获取货主企业列表 | ||||
|  public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; | ||||
|   // 获取货主企业列表 | ||||
|   public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; | ||||
|  // 查询保险费信息表 | ||||
|   public $api_premiumInfo_list = '/api/sdc/premiumInfo/list/page'; | ||||
|  | ||||
|   | ||||
|   //  查询大宗订单列表 | ||||
|   $api_get_listBulkPage = `/api/sdc/billOperate/listBulkPage`; | ||||
|   //  保险费公司认证 | ||||
|   $api_get_submitAuthInfo = `/api/sdc/premiumInfo/submitAuthInfo`; | ||||
|  | ||||
|   constructor(public injector: Injector, public eaCacheSrv: EACacheService) { | ||||
|     super(injector, eaCacheSrv); | ||||
|  | ||||
| @ -4,11 +4,11 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-06 20:20:26 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-02-10 10:30:22 | ||||
|  * @LastEditTime : 2022-02-10 14:44:36 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent"> | ||||
| <page-header-wrapper [title]="'大宗订单详情'" [logo]="logo" [content]="headerContent"> | ||||
|   <ng-template #logo> | ||||
|     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> | ||||
|       <i nz-icon nzType="left" nzTheme="outline"></i> | ||||
| @ -138,7 +138,12 @@ | ||||
| <nz-card nzTitle="运费信息" #distannce3> | ||||
|   <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}(以发货为准,保留小数)</h2> | ||||
|   <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> | ||||
|  | ||||
|     <ng-template st-row="price" let-item let-index="index"> | ||||
|       {{ item.price | currency}} | ||||
|     </ng-template> | ||||
|     <ng-template st-row="surcharge" let-item let-index="index"> | ||||
|       {{ item.surcharge | currency}} | ||||
|     </ng-template> | ||||
|   </st> | ||||
|   <div> | ||||
|     <div> | ||||
|  | ||||
| @ -33,8 +33,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit { | ||||
|   isVisible = false; | ||||
|   logColumns: STColumn[] = [ | ||||
|     { title: '款项', index: 'expenseName' }, | ||||
|     { title: '运输费(元)', index: 'price' }, | ||||
|     { title: '附加费(元)', index: 'surcharge' }, | ||||
|     { title: '运输费(元)', render: 'price' }, | ||||
|     { title: '附加费(元)', render: 'surcharge' }, | ||||
|     { title: '支付时间', index: ' paymentTime' }, | ||||
|     { | ||||
|       title: '支付状态', | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-01-12 10:52:50 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-25 16:52:29 | ||||
|  * @LastEditTime : 2022-02-10 13:35:33 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| @ -80,7 +80,7 @@ | ||||
|       </div> | ||||
|       </ng-template> | ||||
|     <ng-template st-row="billCode" let-item let-index="index"> | ||||
|       <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a> | ||||
|       <a [routerLink]="'bulk-detail/'+item.id">{{item.billCode}}</a> | ||||
|       <div> | ||||
|         <span>{{item?.billStatusLabel}}</span> | ||||
|       </div> | ||||
|  | ||||
| @ -4,11 +4,11 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-28 14:42:03 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-02-10 10:30:23 | ||||
|  * @LastEditTime : 2022-02-10 14:45:46 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent"> | ||||
| <page-header-wrapper [title]="'整车订单详情'" [logo]="logo" [content]="headerContent"> | ||||
|   <ng-template #logo> | ||||
|     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> | ||||
|       <i nz-icon nzType="left" nzTheme="outline"></i> | ||||
| @ -128,7 +128,14 @@ | ||||
| </nz-card> | ||||
|  | ||||
| <nz-card nzTitle="运费信息" #distannce3> | ||||
|   <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st> | ||||
|   <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> | ||||
|     <ng-template st-row="price" let-item let-index="index"> | ||||
|       {{ item.price | currency}} | ||||
|     </ng-template> | ||||
|     <ng-template st-row="surcharge" let-item let-index="index"> | ||||
|       {{ item.surcharge | currency}} | ||||
|     </ng-template> | ||||
|   </st> | ||||
|   <div> | ||||
|     总计:<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> | ||||
|      (运费{{i?.totalFreight | currency}}, | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-28 14:42:03 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-20 20:09:47 | ||||
|  * @LastEditTime : 2022-02-10 14:45:47 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
|  */ | ||||
| @ -35,9 +35,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { | ||||
|   isVisible = false; | ||||
|   logColumns: STColumn[] = [ | ||||
|     { title: '款项', index: 'expenseCodeLabel' }, | ||||
|     { title: '小计(元)', index: 'price' }, | ||||
|     { title: '运输费(元)', index: 'price' }, | ||||
|     { title: '附加费(元)', index: 'surcharge' }, | ||||
|     { title: '小计(元)', render: 'price' }, | ||||
|     { title: '运输费(元)', render: 'price' }, | ||||
|     { title: '附加费(元)', render: 'surcharge' }, | ||||
|     { title: '支付时间', index: 'paymentTime' }, | ||||
|     { | ||||
|       title: '支付状态', | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-01-12 10:52:50 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-25 16:34:30 | ||||
|  * @LastEditTime : 2022-02-10 13:36:07 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| @ -64,7 +64,7 @@ | ||||
|   | ||||
|     > | ||||
|     <ng-template st-row="billCode" let-item let-index="index"> | ||||
|       <a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.billCode}}</a> | ||||
|       <a [routerLink]="'vehicle-detail/'+item.id">{{item.billCode}}</a> | ||||
|       <div> | ||||
|         <span>{{item?.billStatusLabel}}</span> | ||||
|       </div> | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-01-06 09:24:00 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-19 17:10:16 | ||||
|  * @LastEditTime : 2022-02-10 11:34:03 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
|  */ | ||||
| @ -25,10 +25,10 @@ import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.co | ||||
|  | ||||
| const routes: Routes = [ | ||||
|   { path: 'vehicle', component: OrderManagementVehicleComponent }, | ||||
|   { path: 'vehicle-detail/:id', component: OrderManagementVehicleDetailComponent }, | ||||
|   { path: 'vehicle/vehicle-detail/:id', component: OrderManagementVehicleDetailComponent }, | ||||
|   { path: 'vehicle-detailChange/:id', component: OrderManagementVehicleDetailChangeComponent }, | ||||
|   { path: 'bulk', component: OrderManagementBulkComponent }, | ||||
|   { path: 'bulk-detail/:id', component: OrderManagementBulkeDetailComponent }, | ||||
|   { path: 'bulk/bulk-detail/:id', component: OrderManagementBulkeDetailComponent }, | ||||
|   { path: 'bulk-detailChange/:id', component: OrderManagementBulkDetailChangeComponent }, | ||||
|   { path: 'risk', component: OrderManagementRiskComponent }, | ||||
|   { path: 'risk-detail/:id', component: OrderManagementRiskDetailComponent }, | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| <div *ngIf="i"> | ||||
|   <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent"> | ||||
|   <page-header-wrapper [title]="'大宗货源详情'" [logo]="logo" [content]="headerContent"> | ||||
|     <ng-template #logo> | ||||
|       <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> | ||||
|         <i nz-icon nzType="left" nzTheme="outline"></i> | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-01-12 10:52:50 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-18 17:27:39 | ||||
|  * @LastEditTime : 2022-02-10 14:39:20 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| @ -81,7 +81,7 @@ | ||||
|       </ng-template> | ||||
|       <!--货源编号  --> | ||||
|       <ng-template st-row="resourceCode" let-item let-index="index"> | ||||
|         <a [routerLink]="'/supply-management/bulk-detail/' + item.id">{{ item?.resourceCode }}</a> | ||||
|         <a [routerLink]="'bulk-detail/' + item.id">{{ item?.resourceCode }}</a> | ||||
|       </ng-template> | ||||
|       <!-- 服务类型 --> | ||||
|       <ng-template st-row="serviceType" let-item let-index="index"> | ||||
|  | ||||
| @ -1,5 +1,5 @@ | ||||
| <div *ngIf="i"> | ||||
|   <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent"> | ||||
|   <page-header-wrapper [title]="'整车货源详情'" [logo]="logo" [content]="headerContent"> | ||||
|     <ng-template #logo> | ||||
|       <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> | ||||
|         <i nz-icon nzType="left" nzTheme="outline"></i> | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-01-12 10:52:50 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-18 17:29:15 | ||||
|  * @LastEditTime : 2022-02-10 14:39:40 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| @ -63,7 +63,7 @@ | ||||
|       [scroll]="{ x: '1200px', y: '500px' }" | ||||
|     > | ||||
|       <ng-template st-row="resourceCode" let-item let-index="index"> | ||||
|         <a [routerLink]="'/supply-management/vehicle-detail/' + item.id">{{ item.resourceCode }}</a> | ||||
|         <a [routerLink]="'vehicle-detail/' + item.id">{{ item.resourceCode }}</a> | ||||
|         <p>{{ item.resourceTypeLabel }}{{ item.serviceTypeLabel }}</p> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="totalAmount" let-item let-index="index"> | ||||
|  | ||||
| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-03 11:10:14 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-01-18 17:26:31 | ||||
|  * @LastEditTime : 2022-02-10 14:39:00 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management-routing.module.ts | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
|  */ | ||||
| @ -22,9 +22,8 @@ import { SupplyManagementVehicleDetailComponent } from './components/vehicle-det | ||||
|  | ||||
| const routes: Routes = [ | ||||
|   { path: 'index', component: SupplyManagementIndexComponent }, | ||||
|   { path: 'bulk-detail/:id', component: SupplyManagementBulkDetailComponent }, | ||||
|   { path: 'vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent }, | ||||
|   { path: 'vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent }, | ||||
|   { path: 'index/bulk-detail/:id', component: SupplyManagementBulkDetailComponent }, | ||||
|   { path: 'index/vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent }, | ||||
|   { path: 'add-drivers', component: SupplyManagementAddDriversComponent }, | ||||
|   { path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent }, | ||||
|   { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent }, | ||||
|  | ||||
| @ -1,12 +1,12 @@ | ||||
| <!-- | ||||
|  * @Author: your name | ||||
|  * @Date: 2021-12-03 15:31:52 | ||||
|  * @LastEditTime : 2022-01-19 20:28:12 | ||||
|  * @LastEditTime : 2022-02-10 14:23:33 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html | ||||
| --> | ||||
| <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent"> | ||||
| <page-header-wrapper [title]="'大宗运单详情'" [logo]="logo" [content]="headerContent"> | ||||
|   <ng-template #logo> | ||||
|     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> | ||||
|       <i nz-icon nzType="left" nzTheme="outline"></i> | ||||
| @ -27,7 +27,7 @@ | ||||
|    <div> | ||||
|       <div sv-container> | ||||
|         <sv label="网络货运人">{{ i?.enterpriseInfoName }} </sv> | ||||
|         <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv> | ||||
|         <sv label="货主">{{ i?.shippername }} </sv> | ||||
|         <sv label="所属项目">{{i?.enterpriseProject}}</sv> | ||||
|         <sv label="服务类型">{{i?.serviceTypeLabel}}</sv> | ||||
|         <sv label="调度员">{{i?.dispatch?.name}} /{{i?.dispatch?.phone}}</sv> | ||||
| @ -83,10 +83,10 @@ | ||||
|       {{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}} | ||||
|     </sv> | ||||
|     <sv label="计划装货时间"> | ||||
|       {{i?.loadingTime}} | ||||
|       {{i?.loadPlanTime}} | ||||
|     </sv> | ||||
|     <sv label="计划卸货时间"> | ||||
|       {{i?.unloadingTime}} | ||||
|       {{i?.unloadPlanTime}} | ||||
|     </sv> | ||||
|     <sv label="接单数量"> | ||||
|       {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| <!-- | ||||
|  * @Author: your name | ||||
|  * @Date: 2021-12-03 11:10:14 | ||||
|  * @LastEditTime : 2022-01-19 14:36:08 | ||||
|  * @LastEditTime : 2022-02-10 14:21:32 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html | ||||
| @ -58,7 +58,7 @@ | ||||
|     [loading]="service.http.loading" | ||||
|     > | ||||
|       <ng-template st-row="wayBillCode" let-item let-index="index"> | ||||
|         <a [routerLink]="'/waybill-management/bulk-detail/'+item.id">{{item.wayBillCode}}</a> | ||||
|         <a [routerLink]="'bulk-detail/'+item.id">{{item.wayBillCode}}</a> | ||||
|         <div> | ||||
|           <span *ngIf="item?.wayBillStatus == 1">待接单</span> | ||||
|           <span *ngIf="item?.wayBillStatus == 2">待发车</span> | ||||
|  | ||||
| @ -1,12 +1,12 @@ | ||||
| <!-- | ||||
|  * @Author: your name | ||||
|  * @Date: 2021-12-03 15:31:52 | ||||
|  * @LastEditTime : 2022-01-19 20:28:13 | ||||
|  * @LastEditTime : 2022-02-10 14:16:02 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html | ||||
| --> | ||||
| <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent"> | ||||
| <page-header-wrapper [title]="'整车运单详情'" [logo]="logo" [content]="headerContent"> | ||||
|   <ng-template #logo> | ||||
|     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> | ||||
|       <i nz-icon nzType="left" nzTheme="outline"></i> | ||||
| @ -27,7 +27,7 @@ | ||||
|    <div> | ||||
|       <div sv-container> | ||||
|         <sv label="网络货运人">{{ i?.enterpriseInfoName }} </sv> | ||||
|         <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv> | ||||
|         <sv label="货主">{{ i?.shippername }} </sv> | ||||
|         <sv label="所属项目">{{i?.enterpriseProject}}</sv> | ||||
|         <sv label="服务类型">{{i?.serviceTypeLabel}}</sv> | ||||
|         <sv label="调度员">{{i?.dispatch?.name}} /{{i?.dispatch?.phone}}</sv> | ||||
| @ -77,7 +77,7 @@ | ||||
|       {{i?.goodsInfos?.[0]?.maxWeightLabel}}/{{i?.goodsInfos?.[0]?.maxCube}} | ||||
|     </sv> | ||||
|     <sv label="承运司机"> | ||||
|       {{i?.driver?.name}}/{{i?.driver?.phone}} | ||||
|       {{i?.driverVo?.name}}/{{i?.driverVo?.phone}} | ||||
|     </sv> | ||||
|     <sv label="车型车长载重"> | ||||
|       {{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}} | ||||
|  | ||||
| @ -1,10 +1,10 @@ | ||||
| <!-- | ||||
|  * @Author: your name | ||||
|  * @Date: 2021-12-03 11:10:14 | ||||
|  * @LastEditTime: 2022-01-18 16:57:54 | ||||
|  * @LastEditors: Please set LastEditors | ||||
|  * @LastEditTime : 2022-02-10 14:21:52 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||||
|  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html | ||||
| --> | ||||
| <!-- 搜索表单 --> | ||||
| <page-header-wrapper [title]="''"> | ||||
| @ -68,7 +68,7 @@ | ||||
|         </div> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="wayBillCode" let-item let-index="index"> | ||||
|         <a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a> | ||||
|         <a [routerLink]="'vehicle-detail/'+item.id">{{item.wayBillCode}}</a> | ||||
|         <div> | ||||
|           <span *ngIf="item?.wayBillStatus == 1">待接单</span> | ||||
|           <span *ngIf="item?.wayBillStatus == 2">待发车</span> | ||||
| @ -79,7 +79,7 @@ | ||||
|         </div> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="wayBill" let-item let-index="index"> | ||||
|         <a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.billCode}}</a> | ||||
|         <a [routerLink]="'/vehicle-detail/'+item.id">{{item.billCode}}</a> | ||||
|       </ng-template> | ||||
|       <ng-template st-row="goodsInfos" let-item let-index="index"> | ||||
|         <div>{{item?.goodsInfos?.goodsName}}</div> | ||||
|  | ||||
| @ -16,9 +16,9 @@ import { WaybillManagementVehicleComponent } from './components/vehicle/vehicle. | ||||
|  | ||||
| const routes: Routes = [ | ||||
|   { path: 'vehicle', component: WaybillManagementVehicleComponent }, | ||||
|   { path: 'vehicle-detail/:id', component: WaybillManagementVehicleDetailComponent }, | ||||
|   { path: 'vehicle/vehicle-detail/:id', component: WaybillManagementVehicleDetailComponent }, | ||||
|   { path: 'bulk', component: WaybillManagementBulkComponent }, | ||||
|   { path: 'bulk-detail/:id', component: WaybillManagementBulkeDetailComponent }, | ||||
|   { path: 'bulk/bulk-detail/:id', component: WaybillManagementBulkeDetailComponent }, | ||||
|   { path: 'abnormal-appear', component: WaybillManagementAbnormalAppearComponent }, | ||||
| ] | ||||
| @NgModule({ | ||||
|  | ||||
		Reference in New Issue
	
	Block a user