diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html new file mode 100644 index 00000000..9722a48a --- /dev/null +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.html @@ -0,0 +1,57 @@ + + + + + + + +
+
+ + +
+
+ + + + + + + + + +
+ +
+
+
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + \ No newline at end of file diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.less b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.spec.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.spec.ts new file mode 100644 index 00000000..965f26ea --- /dev/null +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.spec.ts @@ -0,0 +1,31 @@ +/* + * @Author: your name + * @Date: 2021-11-29 20:19:08 + * @LastEditTime: 2021-11-29 20:31:00 + * @LastEditors: your name + * @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\detail\detail.component.spec.ts + */ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { UserCenterComponentsDriverDetailComponent } from './contract-template-detail.component'; + +describe('UserCenterComponentsDriverDetailComponent', () => { + let component: UserCenterComponentsDriverDetailComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [UserCenterComponentsDriverDetailComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UserCenterComponentsDriverDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts new file mode 100644 index 00000000..2ce18fb9 --- /dev/null +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -0,0 +1,135 @@ +/* + * @Author: your name + * @Date: 2022-01-05 11:01:55 + * @LastEditTime: 2022-01-05 13:51:44 + * @LastEditors: Please set LastEditors + * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + * @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.ts + */ +import { DatePipe } from '@angular/common'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { apiConf } from '@conf/api.conf'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFTagWidgetSchema, SFTextWidgetSchema, SFUISchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { of } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { ImageViewComponent } from 'src/app/shared/components/imagelist'; +import { ContractManagementService } from '../../services/contract-management.service'; + +@Component({ + selector: 'app-contract-management-template-detail-complaint', + templateUrl: './contract-template-detail.component.html', + styleUrls: ['./contract-template-detail.component.less'], + providers: [DatePipe] +}) +export class UserCenterComponentsDriverDetailComponent implements OnInit { + + constructor( + private nzModalService: NzModalService, + public service: ContractManagementService, + public route: ActivatedRoute, + private datePipe: DatePipe + ) {} + textStatus = '新建模板' + @ViewChild('sf', { static: false }) sf!: SFComponent; + schema: SFSchema = {}; + @ViewChild('sf2', { static: false }) sf2!: SFComponent; + schema2: SFSchema = {}; + ui!: SFUISchema; + sfdata: any; + title: any; + templateHTML: any; + isUpdate = false; + ngOnInit() { + this.initSF() + this.initSF2() + if(this.route.snapshot.queryParams.status == 3) { + console.log('进来了吗') + // 新建 + this.isUpdate = false; + } else { + // 编辑 + this.textStatus = '编辑模板'; + this.isUpdate =true; + } + + console.log(this.route.snapshot.params.id) + console.log(this.route.snapshot.queryParams.status) + } + goBack() { + window.history.go(-1) + } + initSF() { + this.schema = { + properties: { + phon: { + type: 'string', + title: '模版名称', + }, + stateReceipt: { + type: 'string', + title: '是否回单', + enum: [ + { label: '需要', value: true }, + { label: '不需要', value: false } + ], + ui: { + widget: 'select', + errors: { required: '请选择' }, + placeholder: '请选择' + } + }, + enterpriseProjectId: { + type: 'string', + title: '项目', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + stateReceipt: value => value === true + } + } as SFSelectWidgetSchema + }, + } + }; + this.ui = { + '*': { + spanLabelFixed: 120, + grid: { span: 8 } + } + }; + } + initSF2(data?: any) { + this.schema2 = { + properties: { + content: { + type: 'string', + title: '', + ui: { + widget: 'tinymce', + loadingTip: 'loading...', + config: { + height: 650 + } + }, + default: data?.agreementContent || '' + } + } + }; + } + + cancel() { + + } + + save () { + console.log(this.sf.value); + console.log(this.sfdata); + console.log(this.sf2.value); + console.log(this.title); + } +} diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.html b/src/app/routes/contract-management/components/contract-template/contract-template.component.html index d1adb932..5b9ec49e 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.html +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.html @@ -1,7 +1,7 @@ - -
{{item.no}}
- - -
- {{item.no}} -
- - -
-

预付：¥200.00

-

到付：¥200.00

-

油卡：¥200.00

-

回单付：¥200.00

-

小计：¥200.00

-

附加费：¥200.00

-
- - -
- -
- diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.less b/src/app/routes/contract-management/components/contract-template/contract-template.component.less index e69de29b..9df98f26 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.less +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.less @@ -0,0 +1,4 @@ +.NewBtn{ + float: right; + margin-bottom: 15px; +} \ No newline at end of file diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index e52b65e8..31beb7a2 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -124,11 +124,11 @@ export class OrderManagementTemplateComponent implements OnInit { buttons: [ { text: '编辑', - click: (_record) => this.view(_record), + click: (_record) => this.edit(_record), }, { text: '删除', - click: (_record) => this.view(_record), + click: (_record) => this.delete(_record), }, ], }, @@ -203,10 +203,40 @@ export class OrderManagementTemplateComponent implements OnInit { viewEvaluate(item: any) { this.channelId = item.id; } - view(value: any) { - this.router.navigate(['/order-management/complaint-detail/' + value.id]) + edit(value: any) { + this.router.navigate(['/contract-management/template/detail/' + value.id],{ + queryParams: { + status: 2 + } + }) } creatTemplate() { - + this.router.navigate(['/contract-management/template/detail/' + 0], { + queryParams: { + status: 1 + } + }) + } + goBack() { + window.history.go(-1) + } + view(value: any) { + this.router.navigate(['/contract-management/template/detail/' + value.id],{ + queryParams: { + status: 3 + } + }) + } + delete(value: any) { + this.modal.confirm({ + nzTitle: '删除确认', + nzOnOk: () => + // this.service.delMany(ids).subscribe(res => { + // if (res === true) { + // this.service.msgSrv.success('删除成功！'); + // } + // }) + console.log(value) + }); } } diff --git a/src/app/routes/contract-management/contract-management-routing.module.ts b/src/app/routes/contract-management/contract-management-routing.module.ts index 835ba827..62515ebb 100644 --- a/src/app/routes/contract-management/contract-management-routing.module.ts +++ b/src/app/routes/contract-management/contract-management-routing.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-07 15:57:49 - * @LastEditTime: 2022-01-05 09:50:37 + * @LastEditTime: 2022-01-05 11:05:16 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\contract-management\contract-management-routing.module.ts @@ -9,12 +9,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component'; +import { UserCenterComponentsDriverDetailComponent } from './components/contract-template-detail/contract-template-detail.component'; import { OrderManagementTemplateComponent } from './components/contract-template/contract-template.component'; import { ContractManagementPolicyComponent } from './components/policy/policy.component'; const routes: Routes = [ { path: 'list', component: ContractManagementContractListComponent }, { path: 'template', component: OrderManagementTemplateComponent }, - { path: 'policy', component: ContractManagementPolicyComponent }]; + { path: 'template/detail/:id', component: UserCenterComponentsDriverDetailComponent }, + { path: 'policy', component: ContractManagementPolicyComponent } +]; @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/contract-management/contract-management.module.ts b/src/app/routes/contract-management/contract-management.module.ts index 4e31b24f..3ed303fd 100644 --- a/src/app/routes/contract-management/contract-management.module.ts +++ b/src/app/routes/contract-management/contract-management.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-07 15:57:49 - * @LastEditTime: 2022-01-05 09:50:29 + * @LastEditTime: 2022-01-05 11:05:11 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\contract-management\contract-management.module.ts @@ -13,11 +13,13 @@ import { ContractManagementManagementRoutingModule } from './contract-management import { ContractManagementContractListComponent } from './components/contract-list/contract-list.component'; import { ContractManagementPolicyComponent } from './components/policy/policy.component'; import { OrderManagementTemplateComponent } from './components/contract-template/contract-template.component'; +import { UserCenterComponentsDriverDetailComponent } from './components/contract-template-detail/contract-template-detail.component'; const COMPONENTS: any = [ ContractManagementContractListComponent, ContractManagementPolicyComponent, - OrderManagementTemplateComponent + OrderManagementTemplateComponent, + UserCenterComponentsDriverDetailComponent ]; const NOTROUTECOMPONENTS: any = []; @NgModule({ diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index adc90205..7073674d 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -1,7 +1,7 @@ - +

{{i?.freightPrice}}{{i?.freightTypeLabel}}（以发货为准，保留小数）

@@ -272,7 +244,7 @@
收款人：
 - + @@ -334,7 +306,7 @@
- +
+ +
+ +

订单号: {{ i?.billCode }}

+
+
+
+ + +
+
+ +
+
+ {{ i?.goodsResource?.enterpriseInfoName }} + {{ i?.goodsResource?.shipperAppUserName }} + {{i?.goodsResource?.enterpriseProjectName}} + {{i?.goodsResource?.serviceTypeLabel}} + {{i?.goodsResource?.dispatchName}} 18100000000 + {{i?.goodsResource?.dispatchName}} +
+ + + + + + + + + + + + + + +
- +
@@ -95,7 +133,7 @@ -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
@@ -179,29 +217,7 @@
- - +
@@ -272,26 +288,7 @@ - - - + @@ -299,7 +296,7 @@
收款人：
 - + @@ -361,7 +358,7 @@
- +
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 49ab06fa..50015f65 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -407,7 +407,7 @@ resourceStatus: any; }, { text: '修改订单', - click: (_record) => this.amendlation(_record), + click: (_record) => this.changeOrder(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', }, { @@ -761,8 +761,8 @@ resourceStatus: any; } }); } - // 修改订单 - amendlation(value: any) { - this.router.navigate(['order-management/vehicle-detailChange', value.id]) - } + // 修改订单 + changeOrder(value: any) { + this.router.navigate(['order-management/vehicle-detailChange', value.id]); + } } diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html index d1235fec..bffd2ddd 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html @@ -1,7 +1,7 @@ diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts index 4527dbec..ad8f252e 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-14 14:03:07 - * @LastEditTime: 2021-12-30 16:57:01 + * @LastEditTime: 2022-01-05 16:27:22 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts @@ -25,8 +25,9 @@ export class VehicleModifyCaptainComponent implements OnInit { ui: SFUISchema = {}; Columns: STColumn[] =[] aggreechecked = false; - + dataList: any =[] data: any; + bankData: any; constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, ) {} @@ -38,13 +39,13 @@ export class VehicleModifyCaptainComponent implements OnInit { initSF() { this.schema = { properties: { - enterpriseInfoName: { + mobile: { type: 'string', title: '车队长手机号', maxLength: 11 }, }, - required: ['enterpriseInfoName'] + required: ['mobile'] }; this.ui = { '*': { @@ -53,48 +54,72 @@ export class VehicleModifyCaptainComponent implements OnInit { } }; } - get reParams() { - return { - ...this.sf?.value, - }; - } initST() { this.Columns = [ - { title: '司机头像', index: 'auditStatusLabel',width: '120px', }, - { title: '司机姓名', index: 'auditStatusLabel' ,width: '120px',}, + { title: '司机头像', render: 'avatar',width: '120px', }, + { title: '司机姓名', index: 'name' ,width: '120px',}, { title: '实名认证状态', className: 'text-center', - index: 'settlementBasis', + index: 'certificationStatus', type: 'badge', width: '120px', badge: { - '1': { text: '待申请', color: 'warning' }, - '2': { text: '已支付', color: 'success' }, - '3': { text: '已拒绝', color: 'warning' }, - '4': { text: '申请中', color: 'warning' }, + '-1': { text: '未提交', color: 'warning' }, + '0': { text: '待审核', color: 'warning' }, + '1': { text: '通过', color: 'success' }, + '2': { text: '驳回', color: 'error' }, }, }, - { title: '收款账户',width: '200px', render: 'shipperAppUserId' }, - { title: '操作', width: '120px',}, + { title: '收款账户',width: '200px', render: 'bankList' }, + { + title: '操作', + width: '120px', + className: 'text-center', + buttons: [ + { + text: '设置', + click: item => { + this.set(item) + } + } + ] + } ]; } - save(value: any): void { + set(value: any): void { console.log(this.st?._data) + console.log(this.data) + console.log(value) + console.log(this.bankData) const params = { + billIds: this.data?.ids, + carCaptainId: value.id, + bankData: this.bankData }; - - this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => { + this.service.request(this.service.$api_get_updateCarCaptainBatch, params).subscribe((res: any) => { if (res) { this.modal.destroy(); - this.service.msgSrv.success('变更运费成功'); + this.service.msgSrv.success('修改成功'); + } else { + this.service.msgSrv.error(res?.msg); + } + }); + } + initDate() { + const params = { + fetchBank: 1, + ...this.sf?.value, + }; + this.service.request(this.service.$api_get_getCarCaptainByMobile, params).subscribe((res: any) => { + console.log(res) + if (res) { + this.dataList = [res] } }); } - close(): void { this.modal.destroy(); } - } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index c26fa35a..ec95044e 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2022-01-04 16:30:06 + * @LastEditTime: 2022-01-05 15:46:04 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\services\order-management.service.ts @@ -117,6 +117,12 @@ export class OrderManagementService extends ShipperBaseService { $api_get_canelComplaint = `/api/sdc/complaint/operate/canelComplaint`; + // 批量修改车队长 + $api_get_updateCarCaptainBatch = `/api/sdc/billOperate/updateCarCaptainBatch`; + // 根据手机号查询车队长/司机 + $api_get_getCarCaptainByMobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; + + diff --git a/src/app/routes/supply-goods/components/large-amount/large-amount.component.ts b/src/app/routes/supply-goods/components/large-amount/large-amount.component.ts index 4ff565d1..50ac2849 100644 --- a/src/app/routes/supply-goods/components/large-amount/large-amount.component.ts +++ b/src/app/routes/supply-goods/components/large-amount/large-amount.component.ts @@ -12,6 +12,7 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { ModalHelper } from '@delon/theme'; +import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { filter } from 'rxjs/operators'; @@ -58,6 +59,8 @@ export class SupplyGoodsComponentListLargeAmountComponent implements OnInit, Aft private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper, + public shipperSrv: ShipperBaseService + ) {} ngOnInit(): void { @@ -106,21 +109,18 @@ export class SupplyGoodsComponentListLargeAmountComponent implements OnInit, Aft }, }, }, - enStatus2: { + createUserId: { type: 'string', title: '录单员', - enum: [ - { label: '全部', value: '' }, - { label: '正常', value: 0 }, - { label: '冻结', value: 1 }, - { label: '废弃', value: 2 }, - ], default: '', ui: { widget: 'select', + placeholder: '请选择', visibleIf: { - expand: (value: boolean) => value, + _$expand: (value: boolean) => value, }, + asyncData: () => this.shipperSrv.getStaffList(), + allowClear: true, }, }, }, diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index ac6a6cfa..49066ebe 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -206,8 +206,8 @@
- - +
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index f86a954a..0201c9e8 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -36,6 +36,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { totalFees: any; // 总数信息 totalDistance = 0.0; //总里程 totalTime = 0.0; //路程总时间 + currentGoodsTypeName: any; enterpriseProjectIds: any; id = this.route.snapshot.params.id; // // 单位 @@ -46,7 +47,15 @@ export class SupplyManagementBulkPublishComponent implements OnInit { endInfo: any = []; PageStatus = ''; dataList: any; - constructor(private http: _HttpClient, fb: FormBuilder, private router: Router, private route: ActivatedRoute, private modalService: NzModalService, public service: SupplyManagementService, private amapService: AmapService, public service2: ShipperBaseService,) { + constructor( + private http: _HttpClient, + fb: FormBuilder, + private router: Router, + private route: ActivatedRoute, + private modalService: NzModalService, + public service: SupplyManagementService, + private amapService: AmapService, + public shipperSrv: ShipperBaseService,) { this.validateForm1 = fb.group({ createTime: [null, []], modifyTime: [null, []], @@ -155,23 +164,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit { dispatchId: { type: 'string', title: '调度员', - enum: [ - { label: '调度员1', value: '1' }, - { label: '调度员2', value: '2' } - ], ui: { widget: 'select', placeholder: '请选择', - allowClear: true - // asyncData: () => - // this.service.loadChildData2('0', '2').pipe( - // map((data: any) => { - // return data.map((m: any) => { - // return { label: m.name, value: m.id }; - // }); - // }), - // ), - // change: (i) => this.updateCategory(i, '/categoryId2'), + allowClear: true, + optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您', + asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema } }, @@ -231,37 +229,76 @@ export class SupplyManagementBulkPublishComponent implements OnInit { initSF3() { this.schema3 = { properties: { - goodsName: { + goodsTypeId: { type: 'string', title: '货物名称', ui: { - widget: 'dict-select', - params: { dictKey: 'GoodsName' }, - placeholder: '请选择' - } + widget: 'select', + placeholder: '请选择', + errors: { required: '请选择货物类型' }, + asyncData: () => + this.shipperSrv.loadConfigByKey('goods.name.config.type').pipe( + map((data: any) => { + return data[0].children?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ), + change: (value, data: any) => { + this.changeGoodsType(value, data); + this.sf3.setValue('/goodsTypeName', data.label); + } + } as SFSelectWidgetSchema }, - qita: { + goodsTypeName: { type: 'string', title: '', ui: { + hidden: true + } + }, + goodsNameId: { + type: 'string', + title: '', + ui: { + widget: 'select', + placeholder: '请选择', + errors: { required: '请填写货物名称' }, + change: (value: any, data: any) => { + this.sf3.setValue('/goodsName', data.label); + }, visibleIf: { - goodsName: value => value === '3' + goodsTypeName: (value: any) => value && value !== '其它' + } + } + }, + goodsName: { + type: 'string', + title: '', + ui: { + hidden: true, + visibleIf: { + goodsTypeName: (value: any) => value && value !== '其它' + } + } + }, + goodsName1: { + type: 'string', + title: '', + ui: { + errors: { required: '请填写货物名称' }, + visibleIf: { + goodsTypeName: (value: any) => value && value === '其它' } } } }, - required: ['goodsName', ] + required: ['goodsTypeId', 'goodsName', 'goodsNameId'] }; this.ui3 = { '*': { spanLabelFixed: 90, grid: { span: 12 } - }, - $goodsName: { - grid: { span: 12 } - }, - $qita: { - grid: { span: 12 } } }; } @@ -550,6 +587,35 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } }); } + changeGoodsType(value: string, data: any) { + if (data.label === '其它') return; + const params = { + pageIndex: 1, + pageSize: 100, + configId: value + }; + this.service + .request(this.service.$api_get_config_item_page, params) + .pipe( + map(data => { + return data.records?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ) + .subscribe(res => { + if (res) { + this.sf3.getProperty('/goodsNameId')!.schema.enum = res; + this.sf3.getProperty('/goodsNameId')!.widget.reset(res); + if(this.sf3data.goodsNameId){ + this.sf3.setValue('/goodsNameId',this.sf3data.goodsNameId); + } + } else { + this.service.msgSrv.error(res.msg); + } + }); + } + // 打开地图 openMap(type: string, index: number) { const modalRef = this.modalService.create({ @@ -704,8 +770,16 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } }); this.sf3data = { + goodsTypeId: res?.goodsInfoVOList[0]?.goodsTypeId || '', + goodsTypeName: res?.goodsInfoVOList[0]?.goodsTypeName || '', + goodsNameId: res?.goodsInfoVOList[0]?.goodsNameId || '', goodsName: res?.goodsInfoVOList[0]?.goodsName || '', + }; + if (this.sf3data.goodsTypeName === '其它') { + this.sf3data.goodsName1 = res?.goodsInfoVOList[0]?.goodsName || ''; } + this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId }); + this.sf4data = { freightPrice: res?.goodsInfoVOList[0]?.freightPrice || '', freightType: res?.goodsInfoVOList[0]?.freightType || '', diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index b7cdae43..b7bc1c75 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -1,4 +1,10 @@ - + + + + +
货源单设置
@@ -206,10 +212,11 @@
-
-
+
+
-
+
天内支付运费
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 01ce703f..09a51693 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -12,6 +12,7 @@ import { SFUISchema } from '@delon/form'; import { SettingsService, _HttpClient } from '@delon/theme'; +import { ShipperBaseService } from '@shared'; import format from 'date-fns/format'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; @@ -64,7 +65,8 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { private service: SupplyManagementService, private router: Router, private route: ActivatedRoute, - private amapService: AmapService + private amapService: AmapService, + public shipperSrv: ShipperBaseService ) { this.validateForm1 = fb.group({ loadAddress0: [null, [Validators.required]], @@ -166,13 +168,26 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { allowClear: true, } as SFSelectWidgetSchema }, + // enterpriseInfoName: { + // type: 'string', + // title: '网络货运人', + // ui: { + // widget: 'custom' + // }, + // default: '天津市怡亚通XXXX有限公司' + // }, enterpriseInfoName: { type: 'string', title: '网络货运人', ui: { - widget: 'custom' + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value, + }, + allowClear: true, + asyncData: () => this.shipperSrv.getNetworkFreightForwarder(), }, - default: '天津市怡亚通XXXX有限公司' }, deadlineTime: { title: '截至日期', @@ -186,24 +201,12 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { dispatchId: { type: 'string', title: '调度员', - enum: [ - { label: '周涛', value: 1 }, - { label: '李诞', value: 2 } - ], ui: { widget: 'select', placeholder: '请选择', allowClear: true, - optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您' - // asyncData: () => - // this.service.loadChildData2('0', '2').pipe( - // map((data: any) => { - // return data.map((m: any) => { - // return { label: m.name, value: m.id }; - // }); - // }), - // ), - // change: (i) => this.updateCategory(i, '/categoryId2'), + optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您', + asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema } }, @@ -226,42 +229,68 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { goodsTypeId: { type: 'string', title: '货物名称', - enum: [ - { label: '服装', value: '1' }, - { label: '电子产品', value: '2' }, - { label: '其他', value: '3' } - ], + ui: { + widget: 'select', + placeholder: '请选择', + errors: { required: '请选择货物类型' }, + asyncData: () => + this.shipperSrv.loadConfigByKey('goods.name.config.type').pipe( + map((data: any) => { + return data[0].children?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ), + change: (value, data: any) => { + this.changeGoodsType(value, data); + this.sf3.setValue('/goodsTypeName', data.label); + } + } as SFSelectWidgetSchema + }, + goodsTypeName: { + type: 'string', + title: '', + ui: { + hidden: true + } + }, + goodsNameId: { + type: 'string', + title: '', ui: { widget: 'select', placeholder: '请选择', errors: { required: '请填写货物名称' }, - change: (value, data) => { - this.currentGoodsTypeName = data; + change: (value: any, data: any) => { + this.sf3.setValue('/goodsName', data.label); + }, + visibleIf: { + goodsTypeName: (value: any) => value && value !== '其它' } - // asyncData: () => - // this.categoryService.loadChildData2('0', '2').pipe( - // map((data: any) => { - // return data.map((m: any) => { - // return { label: m.name, value: m.id }; - // }); - // }), - // ), - // change: (i) => this.updateCategory(i, '/categoryId2'), - } as SFSelectWidgetSchema + } }, goodsName: { type: 'string', title: '', - maxLength: 20, + ui: { + hidden: true, + visibleIf: { + goodsTypeName: (value: any) => value && value !== '其它' + } + } + }, + goodsName1: { + type: 'string', + title: '', ui: { errors: { required: '请填写货物名称' }, visibleIf: { - goodsType: value => value === '其他' + goodsTypeName: (value: any) => value && value === '其它' } } } }, - required: ['goodsTypeId', 'goodsName'] + required: ['goodsTypeId', 'goodsName', 'goodsNameId'] }; this.ui3 = { '*': { @@ -453,13 +482,15 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { // //装卸货信息 const LoadingList = this.startInfo.concat(this.endInfo); - // // 货物信息 + // 货物信息 + const sf3Values = { ...this.sf3.value }; + if (sf3Values.goodsTypeName === '其它') { + sf3Values.goodsName = sf3Values.goodsName1; + delete sf3Values.goodsName1; + } const goodsInfoList = [ { - ...this.sf3.value, - goodsTypeName: this.currentGoodsTypeName.label, - goodsName: '电子', - goodsNameId: '1', + ...sf3Values, ...this.sf4.value, maxWeight: this.sf4.value.maxWeight.join(','), maxCube: this.sf4.value.maxCube.join(',') @@ -592,4 +623,35 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } }); } + goBack() { + window.history.go(-1); + } + changeGoodsType(value: string, data: any) { + if (data.label === '其它') return; + const params = { + pageIndex: 1, + pageSize: 100, + configId: value + }; + this.service + .request(this.service.$api_get_config_item_page, params) + .pipe( + map(data => { + return data.records?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ) + .subscribe(res => { + if (res) { + this.sf3.getProperty('/goodsNameId')!.schema.enum = res; + this.sf3.getProperty('/goodsNameId')!.widget.reset(res); + if(this.sf3data.goodsNameId){ + this.sf3.setValue('/goodsNameId',this.sf3data.goodsNameId); + } + } else { + this.service.msgSrv.error(res.msg); + } + }); + } } diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index b63ce950..696ada23 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@
- - + +
@@ -249,7 +244,9 @@
- - + + + +
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index b16516d3..1f480877 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -169,23 +169,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { dispatchId: { type: 'string', title: '调度员', - enum: [ - { label: '调度员1', value: '1' }, - { label: '调度员2', value: '2' } - ], ui: { widget: 'select', placeholder: '请选择', - allowClear: true - // asyncData: () => - // this.service.loadChildData2('0', '2').pipe( - // map((data: any) => { - // return data.map((m: any) => { - // return { label: m.name, value: m.id }; - // }); - // }), - // ), - // change: (i) => this.updateCategory(i, '/categoryId2'), + allowClear: true, + optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您', + asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema } } @@ -221,37 +210,76 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { initSF3() { this.schema3 = { properties: { - goodsName: { + goodsTypeId: { type: 'string', title: '货物名称', ui: { - // widget: 'dict-select', - // params: { dictKey: 'GoodsName' }, - placeholder: '请选择' - } + widget: 'select', + placeholder: '请选择', + errors: { required: '请选择货物类型' }, + asyncData: () => + this.shipperSrv.loadConfigByKey('goods.name.config.type').pipe( + map((data: any) => { + return data[0].children?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ), + change: (value, data: any) => { + this.changeGoodsType(value, data); + this.sf3.setValue('/goodsTypeName', data.label); + } + } as SFSelectWidgetSchema }, - qita: { + goodsTypeName: { type: 'string', title: '', ui: { + hidden: true + } + }, + goodsNameId: { + type: 'string', + title: '', + ui: { + widget: 'select', + placeholder: '请选择', + errors: { required: '请填写货物名称' }, + change: (value: any, data: any) => { + this.sf3.setValue('/goodsName', data.label); + }, visibleIf: { - goodsName: value => value === '3' + goodsTypeName: (value: any) => value && value !== '其它' + } + } + }, + goodsName: { + type: 'string', + title: '', + ui: { + hidden: true, + visibleIf: { + goodsTypeName: (value: any) => value && value !== '其它' + } + } + }, + goodsName1: { + type: 'string', + title: '', + ui: { + errors: { required: '请填写货物名称' }, + visibleIf: { + goodsTypeName: (value: any) => value && value === '其它' } } } }, - required: ['goodsName'] + required: ['goodsTypeId', 'goodsName', 'goodsNameId'] }; this.ui3 = { '*': { spanLabelFixed: 90, grid: { span: 12 } - }, - $goodsName: { - grid: { span: 12 } - }, - $qita: { - grid: { span: 12 } } }; } @@ -374,6 +402,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } }; } + initSF6() { this.schema6 = { properties: { @@ -396,7 +425,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'receipt:type' }, - containsAllLable: false, + containsAllLabel: false, placeholder: '请选择', errors: { required: '请选择' }, visibleIf: { @@ -600,6 +629,34 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.validateForm1.removeControl(`loadName${index}`); this.validateForm1.removeControl(`loadPhone${index}`); } + changeGoodsType(value: string, data: any) { + if (data.label === '其它') return; + const params = { + pageIndex: 1, + pageSize: 100, + configId: value + }; + this.service + .request(this.service.$api_get_config_item_page, params) + .pipe( + map(data => { + return data.records?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ) + .subscribe(res => { + if (res) { + this.sf3.getProperty('/goodsNameId')!.schema.enum = res; + this.sf3.getProperty('/goodsNameId')!.widget.reset(res); + if(this.sf3data.goodsNameId){ + this.sf3.setValue('/goodsNameId',this.sf3data.goodsNameId); + } + } else { + this.service.msgSrv.error(res.msg); + } + }); + } addEndInfo(event: any) { if (this.addEndInfo.length < 5) { @@ -689,6 +746,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { // if (this.validateForm1.invalid) { // return; // } + console.log(this.sf7.value) const params: any = { ...this.sf1.value, ...this.sf5.value, @@ -888,8 +946,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }); this.sf3data = { - goodsName: res?.goodsInfoVOList[0]?.goodsName + goodsTypeId: res?.goodsInfoVOList[0]?.goodsTypeId || '', + goodsTypeName: res?.goodsInfoVOList[0]?.goodsTypeName || '', + goodsNameId: res?.goodsInfoVOList[0]?.goodsNameId || '', + goodsName: res?.goodsInfoVOList[0]?.goodsName || '', }; + if (this.sf3data.goodsTypeName === '其它') { + this.sf3data.goodsName1 = res?.goodsInfoVOList[0]?.goodsName || ''; + } + this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId }); this.sf4data = { weight: res?.goodsInfoVOList[0]?.weight, volume: res?.goodsInfoVOList[0]?.volume, @@ -917,11 +982,21 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { goodsValue: res?.goodsValue }; console.log(res?.stateReceipt); + // this.sf6data = { + // stateReceipt: res?.stateReceipt, + // receiptType: res?.receiptType, + // receiptUserId: res?.receiptUserId, + // remarks: res?.remarks + // }; this.sf6data = { stateReceipt: res?.stateReceipt, - receiptType: res?.receiptType, - receiptUserId: res?.receiptUserId, - remarks: res?.remarks + receiptType: res?.receiptType || '', + receiptAddressId: res?.receiptAddressId || '', + receiptUserName: res?.receiptUserName || '', + area: res?.area || '', + phon: res?.phon || '', + address: res?.address || '', + remarks: res?.remarks || '', }; this.sf7data = { prePay: res?.shippingInformationVO?.prePay, @@ -944,11 +1019,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { nzOnOk: item => { const data = item.seleteData; if (JSON.stringify(data) === '{}') return; - this.sf6.setValue('/name4', data.contactName); - this.sf6.setValue('/name5', data.contactTelephone); - this.sf6.setValue('/name6', `${data.province}-${data.city}-${data.area}`); - this.sf6.setValue('/receiptAddress', data.detailedAddress); + this.sf6.setValue('/receiptAddressId', data.id); + this.sf6.setValue('/receiptUserName', data.contactName); + this.sf6.setValue('/phon', data.contactTelephone); + this.sf6.setValue('/area', `${data.province}-${data.city}-${data.area}`); + this.sf6.setValue('/address', data.detailedAddress); } }); } + choose(){ + window.history.go(-1); + } } diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index 302e7ee4..7eaa1c9f 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -1,4 +1,10 @@ - + + + + +
货源单设置
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 626b3cfe..6a3e4bb1 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -13,7 +13,7 @@ import { SFUISchema } from '@delon/form'; import { SettingsService, _HttpClient } from '@delon/theme'; -import { EACacheService } from '@shared'; +import { EACacheService, ShipperBaseService } from '@shared'; import format from 'date-fns/format'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; @@ -70,7 +70,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { private router: Router, private route: ActivatedRoute, private eaCacheSrv: EACacheService, - private amapService: AmapService + private amapService: AmapService, + public service2: ShipperBaseService ) { this.validateForm1 = fb.group({ loadingTime: [null, [Validators.required]], @@ -151,14 +152,27 @@ export class SupplyManagementReleasePublishComponent implements OnInit { allowClear: true, } as SFSelectWidgetSchema }, - enterpriseInfoName: { - type: 'string', - title: '网络货运人', - ui: { - widget: 'custom' - }, - default: '天津市怡亚通XXXX有限公司' - }, + // enterpriseInfoName: { + // type: 'string', + // title: '网络货运人', + // ui: { + // widget: 'custom' + // }, + // default: '天津市怡亚通XXXX有限公司' + // }, + enterpriseInfoName: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value, + }, + allowClear: true, + asyncData: () => this.service2.getNetworkFreightForwarder(), + }, + }, externalResourceCode: { type: 'string', title: '外部货源号', @@ -808,4 +822,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { close() { window.history.go(-1); } + goBack() { + window.history.go(-1); + } } diff --git a/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.html deleted file mode 100644 index 0accc6a0..00000000 --- a/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.html +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - -
-
- - {{ dataList?.resourceCode }} - - 待接单 - 已接单 - 已取消 - - - - - -
-
- - - - -
-
- -
- {{ dataList?.enterpriseProjectId }} - {{ dataList?.externalResourceCode }} - {{ dataList?.enterpriseProjectId }} - {{ dataList?.dispatchName }} -
- -
-
-
-
-

装卸货信息

-
-

装货地：{{item?.detailedAddress}}

-

联系人：{{item?.appUserName}}/{{item?.contractTelephone}}

-

发货日期：{{item?.createTime}}

- -
-
-

卸货地：{{item?.detailedAddress}}

-

联系人：{{item?.appUserName}}/{{item?.contractTelephone}}

-

卸货日期：{{item?.modifyTime}}

-
-
-
-
-
-
-
-

货物信息

-

货物名称：{{item?.goodsName}}

-

货物数量：{{item?.weight}}吨/{{item?.volume}}立方

-

用车需求：{{item?.vehicleDemand}}

-
-
-
-
-
-

承运信息

-

网络货运人：{{dataList?.carrierInformationVO?.enterpriseInfoName}}

-

服务类型：{{dataList?.carrierInformationVO?.serviceType === 1 ? '抢单' : '指派'}}

-

司机姓名：{{dataList?.carrierInformationVO?.driverName}}

-

手机号：{{dataList?.carrierInformationVO?.driverTelephone}}

-

车牌号：{{dataList?.carrierInformationVO?.driverLicensePlate}}

-
-
-
-
-

服务信息

-

货物价值：{{dataList?.goodsInfoList?.goodsName}}

-

保价费金额：{{dataList?.goodsInfoList?.goodsName}}

-
-
-
-

补充信息

-

{{dataList?.supplementaryInformationVO?.stateReceipt === 2 ? '不需要回单' : '需要回单'}}

-

联系人：{{dataList?.supplementaryInformationVO?.receiptUserId}}

-

联系电话：{{dataList?.supplementaryInformationVO?.remarks}}

-

所在地区：{{dataList?.supplementaryInformationVO?.remarks}}

-

详细地址：{{dataList?.supplementaryInformationVO?.receiptAddress}}

-

备注：{{dataList?.supplementaryInformationVO?.remarks}}

-
-
- -
-
-

运费信息

-
-

预付：{{dataList?.shippingInformationVO?.prePay | currency: '￥' }}

-

油卡：{{dataList?.shippingInformationVO?.oilCardPay | currency: '￥'}}

-

到付：{{dataList?.shippingInformationVO?.toPay | currency: '￥'}}

-

回单付：{{dataList?.shippingInformationVO?.receiptPay | currency: '￥'}}

-

保险费：{{dataList?.shippingInformationVO?.insuranceFee | currency: '￥'}}

-

附加费保险费：{{dataList?.shippingInformationVO?.appendFee | currency: '￥'}}

-
-
- -
-
-

{{dataList?.shippingInformationVO?.totalFee | currency: '￥' }}

-
- -
-
- -
- - - - -
- \ No newline at end of file diff --git a/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.less b/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.less deleted file mode 100644 index a1566606..00000000 --- a/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.less +++ /dev/null @@ -1,37 +0,0 @@ -:host{ - .btn-size{ - font-size: 14px; - } - .bdr{ - border-right: 1px solid #ccc; - } - .bdl{ - border-left: 1px solid #ccc; - } - .title{ - font-size: 26; - font-weight: bold; - } - .source-info{ - p{ - margin-bottom: .5em; - } - } - .freight-info-box{ - width: 95%; - } - .freigth-label{ - display: inline-block; - width: 50px; - text-align: right; - } - - ::ng-deep{ - .approval-status{ - .ant-steps{ - width: 70%; - margin: 0 auto; - } - } - } -} \ No newline at end of file diff --git a/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.spec.ts b/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.spec.ts deleted file mode 100644 index eae95066..00000000 --- a/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SupplyManagementVehicleDetailComponent } from './vehicle-detail.component'; - -describe('SupplyManagementVehicleDetailComponent', () => { - let component: SupplyManagementVehicleDetailComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ SupplyManagementVehicleDetailComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SupplyManagementVehicleDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.ts deleted file mode 100644 index bd2a83c0..00000000 --- a/src/app/routes/supply-management/components/vehicle-detail-old/vehicle-detail.component.ts +++ /dev/null @@ -1,80 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-12-03 11:10:14 - * @LastEditTime: 2021-12-09 20:54:28 - * @LastEditors: Please set LastEditors - * @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-detail\vehicle-detail.component.ts - */ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn } from '@delon/abc/st'; -import { _HttpClient } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; -import { SupplyManagementService } from '../../services/supply-management.service'; - -@Component({ - selector: 'app-supply-management-vehicle-detail', - templateUrl: './vehicle-detail.component.html', - styleUrls: ['./vehicle-detail.component.less'] -}) -export class SupplyManagementVehicleDetailComponentOld implements OnInit { - - id = this.route.snapshot.params.id; - i: any; - dataList: any; - logColumns: STColumn[] = [ - { title: '内容', index: 'theme' }, - { title: '操作人', index: 'operationUserPhone' }, - { title: '操作时间', index: ' createTime' }, - ]; - - constructor( - private route: ActivatedRoute, - private msgSrv: NzMessageService, - private service: SupplyManagementService, - private router: Router,private ar: ActivatedRoute - ) { - - } - - ngOnInit(): void { - console.log(this.id) - if(this.id) { - this.getDetailList(this.id) - } - } - - // 获取录单员 - getDetailList(id: any) { - const params = { - id: id - }; - this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, params).subscribe((res) => { - console.log(res) - this.dataList = res - }) - } - // 修改货源 - modification() { - this.router.navigate(['/supply-management/vehicle-amend', this.id], { - queryParams: { - sta: 1 - }, - }) - } - // 再下一单 - nextOrder() { - this.router.navigate(['/supply-management/vehicle-amend', this.id], { - queryParams: { - sta: 2 - }, - }) - } - - - - goBack() { - window.history.go(-1); - } -} diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 1df08eff..4baced7c 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -128,7 +128,7 @@ - + + + + +
+ {{(item.price * item.rate) | currency}} + (含附加费） +
+ + +
+ 总计：{{ totalObj?.price | currency: '￥' }} （运费￥{{ + totalObj?.price - attObj?.price + }}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%） +
+
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
 diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index cf0a1578..92cced62 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -26,6 +26,8 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { 1: '抢单', 2: '指派' } + totalObj: any; + attObj: any; status: any = { 1: '待接单', 2: '已接单', 3: '已取消' }; totalExpensePrice = 0; expenseColumns: STColumn[] = [ @@ -67,6 +69,8 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { this.service.request(this.service.$api_get_getCompleteVehicleDetail, { id: this.id }).subscribe(res => { const expenseList = res?.expenseList || []; this.totalExpensePrice = 0; + this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0]; + this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; expenseList.forEach((e: any) => { this.totalExpensePrice += e?.price * e?.rate; }); diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index cadd966d..32004b22 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -1,8 +1,8 @@ @@ -56,9 +56,14 @@

{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}

-
￥{{item.totalAmount}} + +
￥{{item.totalAmount}}
+ +
车型: {{item.carModelLabel}}
+
车长: {{item.expand}} 米
+

预付：¥200.00

diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 4d37b56c..43fc8e88 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -398,9 +398,9 @@ export class SupplyManagementVehicleComponent implements OnInit { }, { title: '用车需求', + className: 'text-center', width: '120px', - format: (item: any) => `

车型: ${item.vehicleDemand?.maxWeight || ''}

车长: ${item.vehicleDemand?.maxCube || ''}米

`, - index: 'vehicleDemand' + render: 'useCarDemand' }, { title: '总费用', @@ -411,9 +411,10 @@ export class SupplyManagementVehicleComponent implements OnInit { }, { title: '总运费', - className: 'text-center', width: '120px', - index: '总运费' + className: 'text-center', + index: 'totalAmount', + render: 'totalAmount' }, { title: '附加费', diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index fa3d959e..73791b95 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 11:10:14 - * @LastEditTime: 2022-01-04 13:27:16 + * @LastEditTime: 2022-01-05 16:45:24 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\supply-management\services\supply-management.service.ts @@ -42,6 +42,7 @@ export class SupplyManagementService extends BaseService { $api_get_goods_resource_statistical = `/api/sdc/goodsResourceOperate/statisticalStatus`; // 统计整车、大宗货源状态数量 // 获取货主企业列表 public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true'; + public $api_commonAddress = '/api/sdc/commonAddress/list/page'; // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; // 取消货源 @@ -79,6 +80,9 @@ export class SupplyManagementService extends BaseService { $api_checkIdCard = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; // 驾驶证识别 $api_recognizeDriverLicense = `/api/mdc/pbc/hwc/ocr/recognizeDriverLicense`; + // 查询系统配置项 + public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page'; + constructor(public injector: Injector) { super(injector) } diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 3edf95f1..4f0258b8 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -13,7 +13,8 @@ export class ShipperBaseService extends BaseService { $api_get_staff_list = `/api/mdc/cuc/userApp/getStaffList`; //查询企业项目员工列表(录单员) $api_get_network_freight_forwarder_list = `/api/mdc/cuc/networkTransporter/findAll`; // 获取网络货运人 $api_get_network_freight_forwarder_one = `/api/mdc/cuc/networkTransporter/get`; // 获取网络货运人 - + // 根据FullKey获取系统子配置(树) + $api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`; envCache: any; constructor(public injector: Injector, public eaCacheSrv: EACacheService) { super(injector); @@ -65,7 +66,7 @@ export class ShipperBaseService extends BaseService { * 获取录单员 * @returns */ - getStaffList(params = {},containerAll = true) { + getStaffList(params = {},containerAll = true) { return this.request(this.$api_get_staff_list, params).pipe( map((res: any) => { if (!res) { @@ -139,5 +140,17 @@ export class ShipperBaseService extends BaseService { getNetworkTransporterById(id: string) { return this.request(this.$api_get_network_freight_forwarder_one, { id }); } - + // 根据FullKey获取系统子配置(树) + loadConfigByKey(configFullKey:string ='') { + return this.http.post(this.$api_getSysConfigTreeByParentFullKey, { configFullKey }).pipe( + map((m: any) => { + if (m.success === true) { + return (m.data as any[]) || []; + } else { + this.msgSrv.warning(m.msg); + return []; + } + }), + ); + } }