fix bug
This commit is contained in:
@ -1,4 +1,5 @@
|
|||||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
import { STColumn, STComponent } from '@delon/abc/st';
|
import { STColumn, STComponent } from '@delon/abc/st';
|
||||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||||
@ -46,7 +47,7 @@ export class SupplyManagementBulkComponent implements OnInit {
|
|||||||
count: 0,
|
count: 0,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
|
constructor(public service: SupplyManagementService, private modal: NzModalService, private router: Router) { }
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.initSF();
|
this.initSF();
|
||||||
@ -103,12 +104,9 @@ export class SupplyManagementBulkComponent implements OnInit {
|
|||||||
settlementBasis: {
|
settlementBasis: {
|
||||||
title: '结算依据',
|
title: '结算依据',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
default: 0,
|
|
||||||
enum: [
|
enum: [
|
||||||
{ label: '未知', value: 0 },
|
{ label: '以收获为准', value: 1 },
|
||||||
{ label: '男', value: 1 },
|
{ label: '以发货为准', value: 2 },
|
||||||
{ label: '女', value: 2 },
|
|
||||||
{ label: '保密', value: 3 },
|
|
||||||
],
|
],
|
||||||
ui: {
|
ui: {
|
||||||
widget: 'select',
|
widget: 'select',
|
||||||
@ -275,26 +273,31 @@ export class SupplyManagementBulkComponent implements OnInit {
|
|||||||
{
|
{
|
||||||
text: '货源审核',
|
text: '货源审核',
|
||||||
click: (_record) => this.audit(_record, 1),
|
click: (_record) => this.audit(_record, 1),
|
||||||
|
// iif: item => item.auditStatus === 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '二维码',
|
text: '二维码',
|
||||||
click: (_record) => this.assignedQrcode(_record),
|
click: (_record) => this.assignedQrcode(_record),
|
||||||
|
// iif: item => item.auditStatus === 1 || item.auditStatus === 2,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '修改单价',
|
text: '修改单价',
|
||||||
click: (_record) => this.updatePrice(_record),
|
click: (_record) => this.modification(_record),
|
||||||
|
// iif: item => item.auditStatus === 1 || item.auditStatus === 2,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '取消货源',
|
text: '取消货源',
|
||||||
// click: (_record) => this.delOne(_record),
|
// click: (_record) => this.delOne(_record),
|
||||||
|
// iif: item => item.auditStatus === 1 || item.auditStatus === 2,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '再下一单',
|
text: '再下一单',
|
||||||
// click: (_record) => this.editOne(_record),
|
click: (_record) => this.nextOrder(_record),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
text: '重新指派',
|
text: '重新指派',
|
||||||
// click: (_record) => this.delOne(_record),
|
// click: (_record) => this.delOne(_record),
|
||||||
|
// iif: item => item.auditStatus === 2,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
@ -413,4 +416,20 @@ export class SupplyManagementBulkComponent implements OnInit {
|
|||||||
handleOK() {
|
handleOK() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
// 修改货源
|
||||||
|
modification(item: any) {
|
||||||
|
this.router.navigate(['/supply-management/vehicle-amend', item.id], {
|
||||||
|
queryParams: {
|
||||||
|
sta: 3
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
// 再下一单
|
||||||
|
nextOrder(item: any) {
|
||||||
|
this.router.navigate(['/supply-management/vehicle-amend', item.id], {
|
||||||
|
queryParams: {
|
||||||
|
sta: 4
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
<page-header-wrapper [title]="'整车发货'" [logo]="logo">
|
<page-header-wrapper [title]="PageStatus" [logo]="logo">
|
||||||
<ng-template #logo>
|
<ng-template #logo>
|
||||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||||
<i nz-icon nzType="left" nzTheme="outline"></i>
|
<i nz-icon nzType="left" nzTheme="outline"></i>
|
||||||
|
|||||||
@ -215,7 +215,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
required: ['goodsName', ]
|
||||||
};
|
};
|
||||||
this.ui3 = {
|
this.ui3 = {
|
||||||
'*': {
|
'*': {
|
||||||
@ -512,7 +513,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
|||||||
placeholder: '请输入',
|
placeholder: '请输入',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
required: ['paymentDays']
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
this.schema7 = {
|
this.schema7 = {
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!--
|
<!--
|
||||||
* @Author: your name
|
* @Author: your name
|
||||||
* @Date: 2021-12-03 11:10:14
|
* @Date: 2021-12-03 11:10:14
|
||||||
* @LastEditTime: 2021-12-09 10:59:41
|
* @LastEditTime: 2021-12-13 14:17:23
|
||||||
* @LastEditors: Please set LastEditors
|
* @LastEditors: Please set LastEditors
|
||||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
* @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\supply-management\components\vehicle\vehicle.component.html
|
||||||
@ -68,16 +68,8 @@ size="small"
|
|||||||
<a [routerLink]="'/supply-management/vehicle-detail/'+item.id">{{item.resourceCode}}</a>
|
<a [routerLink]="'/supply-management/vehicle-detail/'+item.id">{{item.resourceCode}}</a>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="vehicleDemand" let-item let-index="index">
|
<ng-template st-row="vehicleDemand" let-item let-index="index">
|
||||||
|
<div>车型: {{item?.vehicleDemand?.maxWeight}}</div>
|
||||||
<div *ngFor="let i of item?.vehicleDemand">
|
<div class="error">车长: {{item?.vehicleDemand?.maxCube}} 米</div>
|
||||||
<span>{{item?.vehicleDemand.i}}66{{i}}</span>
|
|
||||||
</div>
|
|
||||||
</ng-template>
|
|
||||||
<ng-template st-row="LoadingAddressArr" let-item let-index="index">
|
|
||||||
<div *ngFor="let i of item?.LoadingAddressArr">
|
|
||||||
<span>{{i?.maxCube}}</span>
|
|
||||||
<span>{{i?.maxWeight}}</span>
|
|
||||||
</div>
|
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="serviceType" let-item let-index="index">
|
<ng-template st-row="serviceType" let-item let-index="index">
|
||||||
<span *ngIf="item?.serviceType === 1 || item?.serviceType === '1'">抢单</span>
|
<span *ngIf="item?.serviceType === 1 || item?.serviceType === '1'">抢单</span>
|
||||||
|
|||||||
@ -231,7 +231,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '用车需求',
|
title: '用车需求',
|
||||||
index: 'vehicleDemand',
|
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
width: '120px',
|
width: '120px',
|
||||||
render: 'vehicleDemand'
|
render: 'vehicleDemand'
|
||||||
|
|||||||
Reference in New Issue
Block a user