diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 4a05bdfb..9e589e88 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@ - + {{item.no}} 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 be9887ca..d294562b 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -13,7 +13,6 @@ import { SupplyManagementService } from '../../services/order-management.service styleUrls: ['./bulk.component.less'] }) export class OrderManagementBulkComponent implements OnInit { - url = `/user?_allow_anonymous=true`; ui: SFUISchema = {}; uiView: SFUISchema = {}; schema: SFSchema = {}; @@ -110,7 +109,7 @@ export class OrderManagementBulkComponent implements OnInit { _$expand: { type: 'boolean', ui: { hidden: true } }, no: { type: 'string', - title: '运单号', + title: '订单号', }, no2: { type: 'string', @@ -118,7 +117,7 @@ export class OrderManagementBulkComponent implements OnInit { }, no1: { type: 'string', - title: '托运公司' + title: '货主' }, no3: { type: 'string', @@ -158,7 +157,7 @@ export class OrderManagementBulkComponent implements OnInit { }, no10: { type: 'string', - title: '收款人', + title: '车队长', ui: { visibleIf: { _$expand: (value: boolean) => value, @@ -207,6 +206,58 @@ export class OrderManagementBulkComponent implements OnInit { asyncData: () => this.getCatalogueMember(), }, }, + appId2: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value, + }, + allowClear: true, + asyncData: () => this.getCatalogueMember(), + }, + }, + appId3: { + type: 'string', + title: '结算依据', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value, + }, + allowClear: true, + asyncData: () => this.getCatalogueMember(), + }, + }, + appId4: { + type: 'string', + title: '货物名称', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value, + }, + allowClear: true, + asyncData: () => this.getCatalogueMember(), + }, + }, + appId5: { + type: 'string', + title: '服务类型', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value, + }, + allowClear: true, + asyncData: () => this.getCatalogueMember(), + }, + }, }, type: 'object', }; @@ -262,17 +313,20 @@ export class OrderManagementBulkComponent implements OnInit { this.columns = [ { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, { - title: '运单号', + title: '订单号', width: '100px', className: 'text-center', render: 'goodsId' }, { - title: '货源编号', + title: '运费明细', width: '100px', className: 'text-center', }, - { title: '托运公司', index: 'externalSn', width: '120px', className: 'text-center' }, + { title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' }, + { title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' }, + { title: '关联运单号', index: 'externalSn', width: '120px', className: 'text-center' }, + { title: '货源编号', index: 'externalSn', width: '120px', className: 'text-center' }, { title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' }, { title: '卸货地', @@ -280,88 +334,53 @@ export class OrderManagementBulkComponent implements OnInit { width: '120px', }, { - title: '货物名称', + title: '货物信息', className: 'text-center', width: '120px', }, - { - title: '承运司机', - className: 'text-center', - width: '120px', - }, - { - title: '车牌号', - className: 'text-center', - width: '120px', - }, { title: '运费单价', className: 'text-center', width: '120px', }, + { + title: '接单数量', + className: 'text-center', + width: '120px', + }, + { + title: '结算重量', + className: 'text-center', + width: '120px', + }, { title: '接单重量', className: 'text-center', width: '120px', }, { - title: '运费变更记录', + title: '承运司机', className: 'text-center', width: '120px', render: 'feiong' }, { - title: '结算重量', + title: '收款人', className: 'text-center', width: '120px', }, { - title: '成交金额', + title: '装卸货时间', className: 'text-center', width: '120px', render: 'enStatusStr27878' }, { - title: '收款人', + title: '创建时间', className: 'text-center', width: '120px', }, - { - title: '支付状态', - className: 'text-center', - width: '120px', - }, - { - title: '创建时间', - className: 'text-center', - index: 'enStatusStr3', - type: 'badge', - width: '100px', - badge: { - 正常: { text: '正常', color: 'success' }, - 冻结: { text: '冻结', color: 'warning' }, - 废弃: { text: '废弃', color: 'default' }, - }, - }, - { - title: '异常原因', - className: 'text-center', - index: 'enStatusStr3', - width: '100px', - }, - { - title: '运单状态', - className: 'text-center', - index: 'enStatusStr3', - type: 'badge', - width: '100px', - badge: { - 正常: { text: '正常', color: 'success' }, - 冻结: { text: '冻结', color: 'warning' }, - 废弃: { text: '废弃', color: 'default' }, - }, - }, { title: '操作', fixed: 'right', @@ -372,6 +391,10 @@ export class OrderManagementBulkComponent implements OnInit { text: '查看评价', click: (_record) => this.viewEvaluate(_record), }, + { + text: '运费变更记录', + click: (_record) => this.viewEvaluate(_record), + }, ], }, ]; diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index c3fd33ee..e53ae13c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@ - + - {{item.no}} + {{item.id}}

预付:¥200.00

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 a56f072c..77d6950b 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -276,6 +276,7 @@ export class OrderManagementVehicleComponent implements OnInit { title: '运费明细', width: '100px', className: 'text-center', + index: 'externalSn', }, { title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' }, { title: '货主', index: 'externalSn', width: '120px', className: 'text-center' }, @@ -327,12 +328,15 @@ export class OrderManagementVehicleComponent implements OnInit { title: '操作', fixed: 'right', width: '200px', - className: 'text-left', buttons: [ { text: '查看评价', click: (_record) => this.viewEvaluate(_record), }, + { + text: '运费变更记录', + click: (_record) => this.OpenPrice(), + }, ], }, ]; 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 80882fb7..e3340610 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -1,3 +1,11 @@ +/* + * @Author: your name + * @Date: 2021-12-03 15:31:52 + * @LastEditTime: 2021-12-14 10:14:22 + * @LastEditors: your name + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\order-management\services\order-management.service.ts + */ import { Injectable, Injector } from '@angular/core'; import { BaseService } from 'src/app/shared/services'; @@ -7,6 +15,7 @@ import { BaseService } from 'src/app/shared/services'; export class SupplyManagementService extends BaseService { $api_get_catalogue_member = `/user?_allow_anonymous=true`; + $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`; $api_del_driver = ``; constructor(public injector: Injector) { super(injector)