Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
weiyu
2022-04-24 14:19:27 +08:00
parent e2e744bcd2
commit b2d7d8e817
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/account/components/center/center.component.ts
View File

@ -151,7 +151,7 @@ export class AccountComponentsCenterComponent implements OnInit {
} }
this.defaultCompany = res this.defaultCompany = res
if (res.projectId) { if (res.projectId) {
this.getPayPw() this.getPayPw()
} }
}) })
} }

36
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

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