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-01-12 13:57:07 +08:00
parent e6900e79fd 9dd5d07c15
commit f31144e246
12 changed files with 102 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -658,6 +658,9 @@ tabs = {
}, },
nzFooter: null nzFooter: null
}); });
modalRef.afterClose.subscribe((result: any) => {
this.st.load(1);
});
} }
userAction() { userAction() {
let params: any[] = []; let params: any[] = [];
@ -668,6 +671,7 @@ tabs = {
console.log(params) console.log(params)
this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => { this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => {
if (res) { if (res) {
this.st.load(1);
console.log(res); console.log(res);
} else { } else {
this.service.msgSrv.error(res.msg); this.service.msgSrv.error(res.msg);
@ -684,7 +688,7 @@ tabs = {
this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => { this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
if (res === true) { if (res === true) {
this.service.msgSrv.success('操作成功！'); this.service.msgSrv.success('操作成功！');
this.st?.reload(); this.st?.reload(1);
this.initST(); this.initST();
} }
}), }),
@ -699,6 +703,7 @@ tabs = {
if(res) { if(res) {
this.service.msgSrv.success('撤销成功！') this.service.msgSrv.success('撤销成功！')
this.stFloat.reload() this.stFloat.reload()
this.st?.reload(1);
} else { } else {
this.service.msgSrv.error(res.msg) this.service.msgSrv.error(res.msg)
} }

18
src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts
View File

@ -67,6 +67,24 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
change: (value, orgData) => console.log(value, orgData), change: (value, orgData) => console.log(value, orgData),
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema,
}, },
complainantName: {
title: '投诉人',
type: 'string',
maxLength: 30,
ui: {
widget: 'text',
change: (value, orgData) => console.log(value, orgData),
} as SFSelectWidgetSchema,
},
complainantPartyLabel: {
title: '被投诉人',
type: 'string',
maxLength: 30,
ui: {
widget: 'text',
change: (value, orgData) => console.log(value, orgData),
} as SFSelectWidgetSchema,
},
complaintDetails: { complaintDetails: {
title: '投诉详情', title: '投诉详情',
type: 'string', type: 'string',

9
src/app/routes/order-management/components/vehicle/vehicle.component.html
View File

@ -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-29 15:00:48 * @LastEditTime: 2022-01-12 13:30:48
* @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
@ -116,15 +116,12 @@
<span class="mr-xs">{{111111}}</span> <span class="mr-xs">{{111111}}</span>
<a (click)="editEnternalSn(item)">编辑</a> <a (click)="editEnternalSn(item)">编辑</a>
</ng-template> --> </ng-template> -->
<ng-template st-row="enStatusStr27878" let-item let-index="index">
<div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
</ng-template>
<!-- <ng-template st-row="feiong" let-item let-index="index"> <!-- <ng-template st-row="feiong" let-item let-index="index">
<div style="color: aqua;" (click)="OpenPrice()"> <div style="color: aqua;" (click)="OpenPrice()">
{{item.no}} {{item.no}}
</div> </div>
</ng-template> --> </ng-template> -->
<ng-template #contentTemplate> <!-- <ng-template #contentTemplate>
<div> <div>
<p>预付：¥200.00</p> <p>预付：¥200.00</p>
<p>到付：¥200.00</p> <p>到付：¥200.00</p>
@ -133,7 +130,7 @@
<p>小计：¥200.00</p> <p>小计：¥200.00</p>
<p>附加费：¥200.00</p> <p>附加费：¥200.00</p>
</div> </div>
</ng-template> </ng-template> -->
</st> </st>
</div> </div>
</nz-card> </nz-card>

26
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts
View File

@ -1,7 +1,7 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-12-15 13:17:42 * @Date: 2021-12-15 13:17:42
* @LastEditTime: 2021-12-22 19:19:25 * @LastEditTime: 2022-01-12 13:37:05
* @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\order-management\modal\vehicle\confir-receipt\confir-receipt.component.ts * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\confir-receipt\confir-receipt.component.ts
@ -143,18 +143,18 @@ export class VehicleConfirReceiptComponent implements OnInit {
}) })
}); });
this.listImagUrls = arr; this.listImagUrls = arr;
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => { // this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => {
console.log(res) // console.log(res)
this.payeeList = res; // this.payeeList = res;
}) // })
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.driverId}).subscribe((res: any) => { // this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.driverId}).subscribe((res: any) => {
console.log(res) // console.log(res)
this.driverList = res; // this.driverList = res;
}) // })
this.service.request(this.service.$api_getCarLicenseByIds, {id: this.dataInfo?.carId}).subscribe((res: any) => { // this.service.request(this.service.$api_getCarLicenseByIds, {id: this.dataInfo?.carId}).subscribe((res: any) => {
console.log(res) // console.log(res)
this.carList = res; // this.carList = res;
}) // })
console.log(cost) console.log(cost)
this.costDetail = [cost]; this.costDetail = [cost];
}) })

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

@ -102,13 +102,14 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
nzTitle: '<b>确定取消货源吗?</b>', nzTitle: '<b>确定取消货源吗?</b>',
nzContent: `<b>取消后不可恢复，谨慎操作</b>`, nzContent: `<b>取消后不可恢复，谨慎操作</b>`,
nzOnOk: () => nzOnOk: () =>
this.service.msgSrv.success('操作成功！') console.log('1')
// this.service.request(this.service.$api_cancle_goods_source, { id: this.i.id }).subscribe((res) => { // this.service.request(this.service.$api_cancle_goods_source, {id: record.id}).subscribe(res => {
// if (res === true) { // if (res === true) {
// this.service.msgSrv.success('操作成功！'); // this.service.msgSrv.success('操作成功！');
// this.getGoodsSourceDetail(); // this.st?.reload();
// } // this.getGoodsSourceStatistical();
// }), // }
// })
}) })
} }

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

@ -236,7 +236,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
nzTitle: '<b>确定取消货源吗?</b>', nzTitle: '<b>确定取消货源吗?</b>',
nzContent: `<b>取消后不可恢复，谨慎操作</b>`, nzContent: `<b>取消后不可恢复，谨慎操作</b>`,
nzOnOk: () => nzOnOk: () =>
this.service.request(this.service.$api_cancle_goods_source, [record.id]).subscribe(res => { this.service.request(this.service.$api_cancle_goods_source, {id: record.id}).subscribe(res => {
if (res === true) { if (res === true) {
this.service.msgSrv.success('操作成功！'); this.service.msgSrv.success('操作成功！');
this.st?.reload(); this.st?.reload();

15
src/app/routes/vehicle/components/list/list.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-29 15:22:34 * @Date: 2021-11-29 15:22:34
* @LastEditTime: 2022-01-11 13:36:02 * @LastEditTime: 2022-01-12 13:54:01
* @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\usercenter\components\freight\list\list.component.html * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
@ -73,12 +73,13 @@
</ng-template> </ng-template>
<ng-template st-row="approvalAuditStatus" let-item let-index="index"> <ng-template st-row="approvalAuditStatus" let-item let-index="index">
<div> <div>
<span *ngIf="item?.auditStatusEnum === -1 || item?.auditStatusEnum === '-1' && item?.isSelf">未上传</span> <span *ngIf="item?.approvalAuditStatus === -1 || item?.approvalAuditStatus === '-1' && item?.isSelf">未上传</span>
<span *ngIf="item?.auditStatusEnum === 0 || item?.auditStatusEnum === '0' && item?.isSelf">草稿</span> <span *ngIf="item?.approvalAuditStatus === 0 || item?.approvalAuditStatus === '0' && item?.isSelf">草稿</span>
<span *ngIf="item?.auditStatusEnum === 10 || item?.auditStatusEnum === '10' && item?.isSelf">待审核</span> <span *ngIf="item?.approvalAuditStatus === 10 || item?.approvalAuditStatus === '10' && item?.isSelf">待审核</span>
<span *ngIf="item?.auditStatusEnum === 20 || item?.auditStatusEnum === '20' && item?.isSelf">已审核</span> <span *ngIf="item?.approvalAuditStatus === 15 || item?.approvalAuditStatus === '15' && item?.isSelf">已撤销</span>
<span *ngIf="item?.auditStatusEnum === 30 || item?.auditStatusEnum === '30' && item?.isSelf">已驳回</span> <span *ngIf="item?.approvalAuditStatus === 20 || item?.approvalAuditStatus === '20' && item?.isSelf">已审核</span>
<span *ngIf="item?.auditStatusEnum === 40 || item?.auditStatusEnum === '40' && item?.isSelf">证件过期</span> <span *ngIf="item?.approvalAuditStatus === 30 || item?.approvalAuditStatus === '30' && item?.isSelf">已驳回</span>
<span *ngIf="item?.approvalAuditStatus === 40 || item?.approvalAuditStatus === '40' && item?.isSelf">证件过期</span>
<span *ngIf="!item?.isSelf">-</span> <span *ngIf="!item?.isSelf">-</span>
</div> </div>
</ng-template> </ng-template>

20
src/app/routes/waybill-management/components/vehicle/vehicle.component.spec.ts
View File

@ -1,19 +1,27 @@
/*
* @Author: your name
* @Date: 2021-12-07 14:52:29
* @LastEditTime: 2022-01-12 13:14:49
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\waybill-management\components\vehicle\vehicle.component.spec.ts
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { SupplyManagementVehicleComponent } from './vehicle.component'; import { WaybillManagementVehicleComponent } from './vehicle.component';
describe('SupplyManagementVehicleComponent', () => { describe('WaybillManagementVehicleComponent', () => {
let component: SupplyManagementVehicleComponent; let component: WaybillManagementVehicleComponent;
let fixture: ComponentFixture<SupplyManagementVehicleComponent>; let fixture: ComponentFixture<WaybillManagementVehicleComponent>;
beforeEach(waitForAsync(() => { beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ SupplyManagementVehicleComponent ] declarations: [ WaybillManagementVehicleComponent ]
}) })
.compileComponents(); .compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(SupplyManagementVehicleComponent); fixture = TestBed.createComponent(WaybillManagementVehicleComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });

26
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -86,7 +86,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
this.schema = { this.schema = {
properties: { properties: {
_$expand: { type: 'boolean', ui: { hidden: true } }, _$expand: { type: 'boolean', ui: { hidden: true } },
wayBillCodeno: { wayBillCode: {
type: 'string', type: 'string',
title: '运单号' title: '运单号'
}, },
@ -94,9 +94,29 @@ export class WaybillManagementVehicleComponent implements OnInit {
type: 'string', type: 'string',
title: '货源编号' title: '货源编号'
}, },
no1: { shipperAppUserId: {
type: 'string', type: 'string',
title: '货主' title: '货主',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
visibleIf: {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => {
console.log(q)
if (!!q) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q})
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
} as SFSelectWidgetSchema,
}, },
loadingPlace: { loadingPlace: {
type: 'string', type: 'string',

4
src/app/shared/shared-zorro.module.ts
View File

@ -1,7 +1,7 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-29 10:20:33 * @Date: 2021-11-29 10:20:33
* @LastEditTime: 2021-12-23 09:55:27 * @LastEditTime: 2022-01-12 13:38:38
* @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\shared\shared-zorro.module.ts * @FilePath: \tms-obc-web\src\app\shared\shared-zorro.module.ts
@ -81,5 +81,5 @@ export const SHARED_ZORRO_MODULES = [
NzUploadModule, NzUploadModule,
NzCascaderModule, NzCascaderModule,
NzAnchorModule, NzAnchorModule,
NzAffixModule NzAffixModule,
]; ];

6
src/style-icons-auto.ts
View File

@ -59,7 +59,8 @@ import {
EyeFill, EyeFill,
EyeInvisibleFill, EyeInvisibleFill,
SolutionOutline, SolutionOutline,
MinusCircleOutline MinusCircleOutline,
FileTwoTone
} from '@ant-design/icons-angular/icons'; } from '@ant-design/icons-angular/icons';
export const ICONS_AUTO = [ export const ICONS_AUTO = [
@ -118,5 +119,6 @@ export const ICONS_AUTO = [
EyeInvisibleFill, EyeInvisibleFill,
SwapOutline, SwapOutline,
SolutionOutline, SolutionOutline,
MinusCircleOutline MinusCircleOutline,
FileTwoTone
]; ];

4
src/style-icons.ts
View File

@ -1,7 +1,7 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-29 20:03:55 * @Date: 2021-11-29 20:03:55
* @LastEditTime: 2021-12-28 20:35:15 * @LastEditTime: 2022-01-12 13:39:29
* @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\style-icons.ts * @FilePath: \tms-obc-web\src\style-icons.ts
@ -49,5 +49,5 @@ export const ICONS = [
MenuOutline, MenuOutline,
SwapOutline, SwapOutline,
EnvironmentOutline, EnvironmentOutline,
ExclamationCircleOutline ExclamationCircleOutline,
]; ];