diff --git a/src/app/routes/account/components/center/center.component.ts b/src/app/routes/account/components/center/center.component.ts index 3298034d..5c6caa5e 100644 --- a/src/app/routes/account/components/center/center.component.ts +++ b/src/app/routes/account/components/center/center.component.ts @@ -151,7 +151,7 @@ export class AccountComponentsCenterComponent implements OnInit { } this.defaultCompany = res if (res.projectId) { - this.getPayPw() + this.getPayPw() } }) } 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 09e3ac81..535d606a 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -19,7 +19,7 @@ import { OrderManagementService } from '../../services/order-management.service' @Component({ selector: 'app-supply-management-vehicle', templateUrl: './vehicle.component.html', - styleUrls: ['../../../commom/less/commom-table.less','./vehicle.component.less'] + styleUrls: ['../../../commom/less/commom-table.less', './vehicle.component.less'] }) export class OrderManagementVehicleComponent extends BasicTableComponent implements OnInit { ui: SFUISchema = {}; @@ -113,10 +113,10 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme const params: any = Object.assign({}, this.sf?.value || this.paramsList); delete params._$expand; this.paramsList = params - Object.assign(requestOptions.body, { - ...a, - ...this.paramsList, - }); + Object.assign(requestOptions.body, { + ...a, + ...this.paramsList, + }); this.loading = true; return requestOptions; }; @@ -197,7 +197,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme type: 'string', title: '运单号', ui: { - placeholder: '最多100个单号,空号隔开', + placeholder: '最多100个单号,空号隔开', } }, resourceCode: { @@ -416,11 +416,13 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme text: '运费变更记录', click: _record => this.OpenPrice(_record), iif: item => - item.billStatus == '4' || - item.billStatus == '5' || - item.billStatus == '2' || - item.billStatus == '3' || - item.billStatus == '6', + item.billType !== '3' && ( + item.billStatus == '4' || + item.billStatus == '5' || + item.billStatus == '2' || + item.billStatus == '3' || + item.billStatus == '6' + ), acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] } }, // { @@ -585,8 +587,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme /** * 导入货源 */ - importGoodsSource() {} - audit(item: any) {} + importGoodsSource() { } + audit(item: any) { } /* * 审核关闭弹窗 @@ -870,8 +872,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme } }); } - // 导出 - exprot() { - this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportWholeList); - } + // 导出 + exprot() { + this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportWholeList); + } }