From 37108424e63c8eba333c5722fe988f55bafce177 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 14 Jan 2022 15:19:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cost-management/cost-management.component.ts | 6 +++--- .../components/bulk/bulk.component.ts | 12 ++++++------ .../components/vehicle/vehicle.component.ts | 14 +++++++------- .../components/vehicle/vehicle.component.ts | 2 +- .../close-account/close-account.component.ts | 9 --------- .../components/driver/driver.component.ts | 6 +++--- .../components/freight/list/list.component.ts | 6 +++--- .../components/bulk/bulk.component.ts | 3 ++- .../components/vehicle/vehicle.component.ts | 2 +- 9 files changed, 26 insertions(+), 34 deletions(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 8b863b6d..c361456b 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -268,19 +268,19 @@ export class CostManagementComponent implements OnInit { title: '操作', fixed: 'right', className: 'text-center', - width: 90, + width: '90px', buttons: [ { text: '浏览', click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id) }, { - text: '审核', + text: '审核　', click: item => this.auditAction(item), iif: item => item.sts === 2 }, { - text: '修改', + text: '修改　', click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } }) } ] 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 bc3e4d1e..0df8b3e4 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -482,11 +482,11 @@ tabs = { { title: '操作', fixed: 'right', - width: '200px', + width: '120px', className: 'text-left', buttons: [ { - text: '查看评价', + text: '查看评价　', click: (_record) => this.viewEvaluate(_record), iif: item => item.billStatus == '5', }, @@ -496,22 +496,22 @@ tabs = { iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', }, { - text: '变更运费', + text: '变更运费　', click: (_record) => this.updateFreight(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', }, { - text: '确认签收', + text: '确认签收　', click: (_record) => this.confirmReceipt(_record), iif: item => item.billStatus == '4', }, { - text: '取消订单', + text: '取消订单　', click: (_record) => this.cancellation(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1', }, { - text: '修改订单', + text: '修改订单　', click: (_record) => this.changeOrder(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', }, 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 03849dc6..39e964e7 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -424,11 +424,11 @@ resourceStatus: any; { title: '操作', fixed: 'right', - width: '200px', + width: '120px', className: 'text-left', buttons: [ { - text: '查看评价', + text: '查看评价　', click: (_record) => this.viewEvaluate(_record), iif: item => item.billStatus == '5', }, @@ -438,27 +438,27 @@ resourceStatus: any; iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', }, { - text: '变更运费', + text: '变更运费　', click: (_record) => this.updateFreight(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', }, { - text: '确认签收', + text: '确认签收　', click: (_record) => this.confirmReceipt(_record), iif: item => item.billStatus == '4', }, { - text: '取消订单', + text: '取消订单　', click: (_record) => this.cancellation(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1', }, { - text: '修改订单', + text: '修改订单　', click: (_record) => this.changeOrder(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', }, { - text: '查看轨迹', + text: '查看轨迹　', click: (_record) => this.cancellation(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', }, 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 daea7b00..2ce3766f 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -494,7 +494,7 @@ export class SupplyManagementVehicleComponent implements OnInit { click: _record => this.nextOrder(_record) }, { - text: '重新指派', + text: '重新指派　', click: _record => this.assignedCar(_record), iif: item => item.resourceStatus === '1' && item.serviceType === '2' } diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts index 081892fe..5fd15502 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts @@ -34,7 +34,6 @@ export class CloseAccountComponent implements OnInit { { title: '网络货运人', index: 'networkTransporterName' }, { title: '货主名称', index: 'enterpriseName' }, { title: '客户编码', index: 'crmCustomerCode' }, - { title: '供应商编码', index: 'crmSupplierCode' }, { title: '操作', buttons: [ @@ -121,14 +120,6 @@ export class CloseAccountComponent implements OnInit { _$expand: (value: boolean) => value } } }, - crmSupplierCode: { - type: 'string', - title: '供应商编码', - ui: { placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value - } } - }, } }; diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index cbf6b16f..3ec72968 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -296,11 +296,11 @@ export class UserCenterComponentsDriverComponent implements OnInit { { title: '注册时间', className: 'text-center', index: 'createTime' }, { title: '操作', - width: '170px', + width: '110px', className: 'text-center', buttons: [ { - text: '查看', + text: '查看　　', click: item => { this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar }); // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); @@ -311,7 +311,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { click: item => this.settingAction(item) }, { - text: '资金账户', + text: '资金账户　', click: item => this.showAccountDetail(item) } ] diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index e7c01a2e..c9b2ca0a 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -202,11 +202,11 @@ export class FreightComponentsListComponent implements OnInit { }, { title: '操作', - width: '170px', + width: '110px', className: 'text-center', buttons: [ { - text: '查看', + text: '查看　　', click: item => { this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); @@ -217,7 +217,7 @@ export class FreightComponentsListComponent implements OnInit { click: item => this.settingAction(item) }, { - text: '资金账户', + text: '资金账户　', click: item => this.showAccountDetail(item) } ] 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 861400ad..83a6b864 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -428,7 +428,7 @@ tabs = { { title: '操作', fixed: 'right', - width: '200px', + width: '110px', className: 'text-left', buttons: [ { @@ -470,6 +470,7 @@ tabs = { { title: '操作', fixed: 'right', + width: '80px', className: 'text-left', buttons: [ { 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 c1b628f1..f3e054cd 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -372,7 +372,7 @@ export class WaybillManagementVehicleComponent implements OnInit { { title: '操作', fixed: 'right', - width: '200px', + width: '110px', className: 'text-left', buttons: [ {