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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-03-02 17:29:16 +08:00
parent a017104170 67e54f2a13
commit f5c85c6cfc
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -13,20 +13,12 @@
<div nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
<div nz-col nzSpan="10">
<<<<<<< HEAD <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
=======
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
>>>>>>> 82c3801cc6ea10d8f6b895d85fe5553850672cea
</div>
</div>
<div class="mt-sm mb-sm" nz-row>

2
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -459,7 +459,7 @@ export class SupplyManagementBulkComponent implements OnInit {
* 审核通过按钮
*/
handleOK(value: any) {
if(this.selectedRows.length <= 0) {
if(this.auditMany === false) {
const params: any = {
id: this.auditID,
remarks: this.sfFre.value.remarks,

5
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -227,9 +227,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
* 审核通过按钮
*/
handleOK(value: any) {
console.log(this.sfFre.valid);
console.log(this.sfFre.value);
if (this.selectedRows.length <= 0) {
if (this.auditMany === false) {
const params: any = {
id: this.auditID,
remarks: this.sfFre.value.remarks
@ -239,6 +237,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
} else {
params.auditStatus = 3;
}
console.log('999');
console.log(params);
this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => {
if (res === true) {

7
src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
View File

@ -326,7 +326,10 @@ export class NetworkFreightComponent implements OnInit {
'drawer'
]
};
this.ui3 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
this.ui3 = {
'*': { spanLabelFixed: 120, grid: { span: 24 } },
'$taxClassificationVersion': { spanLabelFixed: 150, grid: { span: 24 } },
};
}
initSFTax() {
this.TaxSchema = {
@ -574,7 +577,7 @@ export class NetworkFreightComponent implements OnInit {
}
// 新增
creat(value?: any) {
console.log(value)
console.log(value);
this.router.navigate(['./new/' + value?.id], { relativeTo: this.ar });
}
}