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

fix bug

Browse Source
This commit is contained in:
wangshiming
2021-12-09 19:21:22 +08:00
parent d4a4b45194
commit b513099359
11 changed files with 177 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -24,7 +24,7 @@
<input nz-input [(ngModel)]="data.detailedAddress" [ngModelOptions]="{ standalone: true }" /> <input nz-input [(ngModel)]="data.detailedAddress" [ngModelOptions]="{ standalone: true }" />
</nz-input-group> </nz-input-group>
<span style="padding: 0 10px" <span style="padding: 0 10px"
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap()"></i ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
></span> ></span>
<span *ngIf="idx !== 0" <span *ngIf="idx !== 0"
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx)">X</i ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx)">X</i
@ -178,6 +178,7 @@
<ng-template sf-template="name5" let-i let-ui="ui">￥0.00</ng-template> <ng-template sf-template="name5" let-i let-ui="ui">￥0.00</ng-template>
<ng-template sf-template="name6" let-i let-ui="ui">￥0.00</ng-template> <ng-template sf-template="name6" let-i let-ui="ui">￥0.00</ng-template>
<ng-template sf-template="name7" let-i let-ui="ui">￥0.00</ng-template> <ng-template sf-template="name7" let-i let-ui="ui">￥0.00</ng-template>
<ng-template sf-template="totalFee" let-i let-ui="ui" >{{totalFees | currency: '￥'}}</ng-template>
<ng-template sf-template="name8" let-i let-ui="ui"> <ng-template sf-template="name8" let-i let-ui="ui">
<div nz-row> <div nz-row>
<div class="align-center"> <div class="align-center">

196
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -30,6 +30,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
sf7data: any; // 货源单设置回显 sf7data: any; // 货源单设置回显
creatTime: any; // 货源单设置回显 creatTime: any; // 货源单设置回显
modifyTime: any; // 货源单设置回显 modifyTime: any; // 货源单设置回显
totalFees: any; // 总数信息
id = this.route.snapshot.params.id; id = this.route.snapshot.params.id;
// // 单位 // // 单位
unit1 = '吨'; unit1 = '吨';
@ -44,7 +45,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
modifyTime: [null, []], modifyTime: [null, []],
}); });
} }
@ViewChild('sf1', { static: false }) sf1!: SFComponent; @ViewChild('sf1', { static: false }) sf1!: SFComponent;
schema1: SFSchema = {}; schema1: SFSchema = {};
ui1!: SFUISchema; ui1!: SFUISchema;
@ -81,25 +81,26 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.initSF6(); this.initSF6();
this.initSF7(); this.initSF7();
this.initdata(); this.initdata();
console.log( this.route.snapshot?.queryParams)
} }
initSF1() { initSF1() {
this.schema1 = { this.schema1 = {
properties: { properties: {
shipperAppUserNmae: { // shipperAppUserName: {
type: 'string', // type: 'string',
title: '货主', // title: '货主',
maxLength: 30, // maxLength: 30,
ui: { // ui: {
placeholder: '请输入' // placeholder: '请输入'
} // }
}, // },
enterpriseProjectName: { enterpriseProjectName: {
type: 'string', type: 'string',
title: '项目', title: '项目',
enum: [ enum: [
{ label: '1', value: '1' }, { label: '项目1', value: '1' },
{ label: '2', value: '2' } { label: '项目2', value: '2' }
], ],
ui: { ui: {
widget: 'select', widget: 'select',
@ -131,12 +132,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入' placeholder: '请输入'
} }
}, },
dispatchName2: { dispatchId: {
type: 'string', type: 'string',
title: '调度员', title: '调度员',
enum: [ enum: [
{ label: '1', value: '1' }, { label: '调度员1', value: '1' },
{ label: '2', value: '2' } { label: '调度员2', value: '2' }
], ],
ui: { ui: {
widget: 'select', widget: 'select',
@ -190,8 +191,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
type: 'string', type: 'string',
title: '货物名称', title: '货物名称',
enum: [ enum: [
{ label: '1', value: '1' }, { label: '真实货物', value: '1' },
{ label: '2', value: '2' } { label: '远程货物', value: '2' },
{ label: '其他', value: '3' }
], ],
ui: { ui: {
widget: 'select', widget: 'select',
@ -207,12 +209,12 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
// change: (i) => this.updateCategory(i, '/categoryId2'), // change: (i) => this.updateCategory(i, '/categoryId2'),
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
name2: { qita: {
type: 'string', type: 'string',
title: '', title: '',
ui: { ui: {
visibleIf: { visibleIf: {
name1: value => value === '1' goodsNameId: value => value === '3'
} }
} }
} }
@ -223,10 +225,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
spanLabelFixed: 90, spanLabelFixed: 90,
grid: { span: 12 } grid: { span: 12 }
}, },
$name1: { $goodsNameId: {
grid: { span: 12 } grid: { span: 12 }
}, },
$name2: { $qita: {
grid: { span: 12 } grid: { span: 12 }
} }
}; };
@ -377,14 +379,24 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
} }
}; };
} }
changeValue() {
this.totalFees = this.sf7?.value?.appendFee + this.sf7?.value?.oilCardPay + this.sf7?.value?.prePay +this.sf7?.value?.receiptPay + this.sf7?.value?.toPay
}
initSF7() { initSF7() {
this.schema7 = { this.schema7 = {
properties: { properties: {
prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥', change: ()=> {
toPay: { type: 'number', title: '到付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, this.changeValue();
oilCardPay: { type: 'number', title: '油卡', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, } } as SFNumberWidgetSchema },
receiptPay: { type: 'number', title: '回单付', default: 0, ui: { prefix: '￥' } as SFNumberWidgetSchema }, toPay: { type: 'number', title: '到付', default: 0, ui: { prefix: '￥',change: ()=> {
this.changeValue();
} } as SFNumberWidgetSchema },
oilCardPay: { type: 'number', title: '油卡', default: 0, ui: { prefix: '￥',change: ()=> {
this.changeValue();
} } as SFNumberWidgetSchema },
receiptPay: { type: 'number', title: '回单付', default: 0, ui: { prefix: '￥',change: ()=> {
this.changeValue();
} } as SFNumberWidgetSchema },
oilCardPay2: { oilCardPay2: {
type: 'string', type: 'string',
title: '小计', title: '小计',
@ -431,7 +443,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.startInfo.push({ this.startInfo.push({
detailedAddress: '', detailedAddress: '',
appUserName: '', appUserName: '',
contractTelephone: '' contractTelephone: '',
type: 1
}); });
} }
subStartInfo(event: any, index: number) { subStartInfo(event: any, index: number) {
@ -442,7 +455,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.endInfo.push({ this.endInfo.push({
detailedAddress: '', detailedAddress: '',
appUserName: '', appUserName: '',
contractTelephone: '' contractTelephone: '',
type: 2
}); });
} }
subEndInfo(event: any, index: number) { subEndInfo(event: any, index: number) {
@ -463,13 +477,34 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.validateForm1.controls[key].updateValueAndValidity(); this.validateForm1.controls[key].updateValueAndValidity();
}); });
console.log(this.validateForm1); console.log(this.validateForm1);
var d = new Date(this.validateForm1.value.createTime);
console.log(d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds()) if(typeof(this.validateForm1.value.modifyTime) !== 'string' ) {
var c = new Date(this.validateForm1.value.modifyTime);
this.validateForm1.value.modifyTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
}
if(typeof(this.validateForm1.value.createTime) !== 'string' ) {
var c = new Date(this.validateForm1.value.createTime);
this.validateForm1.value.createTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
}
console.log(typeof(this.validateForm1.value.createTime) === 'string')
if (this.validateForm1.invalid) { if (this.validateForm1.invalid) {
return; return;
} }
console.log(this.sf1.value) console.log({...this.sf4.value, ...this.sf3.value})
this.startInfo.createTime = this.validateForm1.value.createTime
this.startInfo.modifyTime = this.validateForm1.value.modifyTime
const params = {
...this.sf1.value,
...this.sf5.value,
shippingInformationDTO: {
...this.sf7.value
},
unLoadingPlaceList: [...this.startInfo, ...this.endInfo,],
goodsInfoList: [
{...this.sf4.value, ...this.sf3.value}
]
}
console.log(params)
console.log(this.startInfo) console.log(this.startInfo)
console.log(this.endInfo) console.log(this.endInfo)
console.log(this.validateForm1.value) console.log(this.validateForm1.value)
@ -478,22 +513,35 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
console.log(this.sf5.value) console.log(this.sf5.value)
console.log(this.sf6.value) console.log(this.sf6.value)
console.log(this.sf7.value) console.log(this.sf7.value)
// const data = this.form.value; this.service.request(this.service.$api_set_saveAnotherWholeOrder, params).subscribe((res: any) => {
// this.http.post('/register', data).subscribe(() => { console.log(res)
// this.router.navigateByUrl('/passport/register-result', { })
// // queryParams: { email: data.mail },
// });
// });
// this.router.navigateByUrl('/passport/register-result', {
// // queryParams: { email: data.mail },
// });
} }
openMap() { openMap(type: string, index: number) {
this.modalService.create({ const modalRef = this.modalService.create({
nzTitle: '', nzTitle: '',
nzContent: AmapPoiPickerComponent, nzContent: AmapPoiPickerComponent,
nzWidth: 848 nzWidth: 900,
nzOnOk: item => {
const poi = item.poi;
console.log(item)
const locList = poi.location.toString().split(',');
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.district + poi.name;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
break;
case 'end':
this.endInfo[index].detailedAddress = poi.district + poi.name;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
break;
default:
break;
}
}
}); });
} }
goBack() { goBack() {
@ -502,12 +550,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
// 初始化信息 // 初始化信息
initdata() { initdata() {
console.log(this.id) console.log(this.id)
// this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => { this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
this.service.request(`${this.service.$api_get_getBulkDetail}`, {id:this.id}).subscribe((res) => {
console.log(res) console.log(res)
// this.dataList = res; // this.dataList = res;
this.sf1data = { this.sf1data = {
shipperAppUserNmae: res?.shipperAppUserNmae || '', // shipperAppUserName: res?.shipperAppUserName || '',
enterpriseProjectName: res?.enterpriseProjectName || '', enterpriseProjectName: res?.enterpriseProjectName || '',
enterpriseInfoName: res?.enterpriseInfoName || '', enterpriseInfoName: res?.enterpriseInfoName || '',
externalResourceCode: res?.externalResourceCode || '', externalResourceCode: res?.externalResourceCode || '',
@ -515,43 +562,52 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
} }
res.unLoadingPlaceList.forEach((element: any) => { res.unLoadingPlaceList.forEach((element: any) => {
if(element.type === 1) { if(element.type === 1) {
this.startInfo.push({ if(this.id) {
detailedAddress: element.detailedAddress, this.startInfo.push({
appUserName: element.appUserName, detailedAddress: element.detailedAddress,
contractTelephone: element.contractTelephone, appUserName: element.appUserName,
}) contractTelephone: element.contractTelephone,
console.log(element) type: element.type
})
} else {
this.startInfo.push({
detailedAddress: element.detailedAddress,
appUserName: element.appUserName,
contractTelephone: element.contractTelephone,
type: element.type,
id: element.id
})
}
if(element.createTime) { if(element.createTime) {
this.creatTime = element.createTime this.creatTime = element?.createTime
this.creatTime = element.modifyTime this.modifyTime = element?.modifyTime
} }
} else if(element.type === 2) { } else if(element.type === 2) {
this.endInfo.push({ this.endInfo.push({
detailedAddress: element.detailedAddress, detailedAddress: element?.detailedAddress,
appUserName: element.appUserName, appUserName: element?.appUserName,
contractTelephone: element.contractTelephone, contractTelephone: element?.contractTelephone,
type: element.type
}) })
} }
}); });
this.sf3data = { this.sf3data = {
goodsNameId: res?.goodsInfoList.goodsNameId || '', goodsNameId: res?.goodsInfoList[0]?.goodsNameId || '',
weight: res?.goodsInfoList.weight || '',
volume: res?.goodsInfoList.volume || '',
externalResourceCode: res?.goodsInfoList.goodsNameId || '',
} }
this.sf4data = { this.sf4data = {
goodsNameId: res?.goodsInfoList.goodsNameId || '', weight: res?.goodsInfoList[0]?.weight || '',
weight: res?.goodsInfoList.weight || '', volume: res?.goodsInfoList[0]?.volume || '',
volume: res?.goodsInfoList.volume || '', vehicleDemand: res?.goodsInfoList[0]?.vehicleDemand || '',
externalResourceCode: res?.goodsInfoList.goodsNameId || '',
} }
this.sf5data = { this.sf5data = {
goodsValue: res?.goodsValue || '', goodsValue: res?.goodsValue || '',
} }
this.sf6data = { this.sf6data = {
stateReceipt: res?.supplementaryInformationVO.stateReceipt || '', stateReceipt: res?.supplementaryInformationVO?.stateReceipt || '',
remarks: res?.supplementaryInformationVO.remarks || '', remarks: res?.supplementaryInformationVO?.remarks || '',
} }
console.log('99999')
console.log(res?.shippingInformationVO)
this.sf7data = { this.sf7data = {
prePay: res?.shippingInformationVO?.prePay || '', prePay: res?.shippingInformationVO?.prePay || '',
toPay: res?.shippingInformationVO?.toPay || '', toPay: res?.shippingInformationVO?.toPay || '',
@ -559,9 +615,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
receiptPay: res?.shippingInformationVO?.receiptPay || '', receiptPay: res?.shippingInformationVO?.receiptPay || '',
oilCardPay2: res?.shippingInformationVO?.oilCardPay || '', oilCardPay2: res?.shippingInformationVO?.oilCardPay || '',
appendFee: res?.shippingInformationVO?.appendFee || '', appendFee: res?.shippingInformationVO?.appendFee || '',
totalFee: res?.shippingInformationVO?.totalFee || '',
name8: res?.shippingInformationVO?.appendFee || '', name8: res?.shippingInformationVO?.appendFee || '',
} }
this.totalFees = res?.shippingInformationVO?.totalFee || '0';
// <p>预付：{{dataList?.shippingInformationVO?.prePay | currency: '￥' }}</p> // <p>预付：{{dataList?.shippingInformationVO?.prePay | currency: '￥' }}</p>
// <p>油卡：{{dataList?.shippingInformationVO?.oilCardPay | currency: '￥'}}</p> // <p>油卡：{{dataList?.shippingInformationVO?.oilCardPay | currency: '￥'}}</p>
// <p>到付：{{dataList?.shippingInformationVO?.toPay | currency: '￥'}}</p> // <p>到付：{{dataList?.shippingInformationVO?.toPay | currency: '￥'}}</p>
@ -579,4 +635,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}) })
} }
asds(i: any) {
console.log(i)
}
// const data =
} }

11
src/app/routes/supply-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-08 09:57:47 * @LastEditTime: 2021-12-09 10:59:41
* @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
@ -67,9 +67,16 @@ size="small"
<ng-template st-row="resourceCode" let-item let-index="index"> <ng-template st-row="resourceCode" let-item let-index="index">
<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">
<div *ngFor="let i of item?.vehicleDemand">
<span>{{item?.vehicleDemand.i}}66{{i}}</span>
</div>
</ng-template>
<ng-template st-row="LoadingAddressArr" let-item let-index="index"> <ng-template st-row="LoadingAddressArr" let-item let-index="index">
<div *ngFor="let i of item?.LoadingAddressArr"> <div *ngFor="let i of item?.LoadingAddressArr">
<span>{{item?.LoadingAddressArr[i]}}</span> <span>{{i?.maxCube}}</span>
<span>{{i?.maxWeight}}</span>
</div> </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">

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

@ -238,6 +238,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
index: 'vehicleDemand', index: 'vehicleDemand',
className: 'text-center', className: 'text-center',
width: '120px', width: '120px',
render: 'vehicleDemand'
}, },
{ {
title: '总费用', title: '总费用',
@ -448,8 +449,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
}) })
} }
nextOrder(item: any) { nextOrder(item: any) {
this.router.navigate(['/supply-management/vehicle-amend', item.id], { this.router.navigate(['/supply-management/vehicle-amend', item.id,],{
relativeTo: this.ar queryParams: {
sta: 2
},
}) })
} }
} }

8
src/app/routes/supply-management/services/supply-management.service.ts
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-08 16:55:10 * @LastEditTime: 2021-12-09 10:56:28
* @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\services\supply-management.service.ts * @FilePath: \tms-obc-web\src\app\routes\supply-management\services\supply-management.service.ts
@ -14,13 +14,17 @@ import { BaseService } from 'src/app/shared/services';
}) })
export class SupplyManagementService extends BaseService { export class SupplyManagementService extends BaseService {
// 整车获取货源表详情 // 整车获取货源表详情
$api_get_getCompleteVehicleDetail = `/api/sdc/goodsResourceOperate/getCompleteVehicleDetail`; $api_get_getCompleteVehicleDetail = `/api/sdc/goodsResourceOperate/getWholeDetail`;
// 大宗获取货源表详情 // 大宗获取货源表详情
$api_get_getBulkDetail = `/api/sdc/goodsResourceOperate/getBulkDetail`; $api_get_getBulkDetail = `/api/sdc/goodsResourceOperate/getBulkDetail`;
// 查询运营后台大宗货源列表 // 查询运营后台大宗货源列表
$api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/list/bulkPage`; $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/list/bulkPage`;
// 查询运营后台整车货源列表 // 查询运营后台整车货源列表
$api_get_wholePage_list = `/api/sdc/goodsResourceOperate/list/wholePage`; $api_get_wholePage_list = `/api/sdc/goodsResourceOperate/list/wholePage`;
// 整车再下一单
$api_set_saveAnotherWholeOrder = `/api/sdc/goodsResourceOperate/saveAnotherWholeOrder`;
// 大宗再下一单
$api_set_saveAnotherBulkOrder = `/api/sdc/goodsResourceOperate/saveAnotherBulkOrder`;
constructor(public injector: Injector) { constructor(public injector: Injector) {
super(injector) super(injector)

4
src/app/routes/vehicle/components/list/detail/detail.component.ts
View File

@ -4,7 +4,7 @@ import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme'; import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { UsermanageService } from '../../../services/vehicle.service'; import { VehicleService } from '../../../services/vehicle.service';
import { VehicleComponentsListEditComponent } from '../edit/edit.component'; import { VehicleComponentsListEditComponent } from '../edit/edit.component';
import { VehicleImgViewComponent } from '../img-view/img-view.component'; import { VehicleImgViewComponent } from '../img-view/img-view.component';
@ -68,7 +68,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
constructor( constructor(
private http: _HttpClient, private http: _HttpClient,
private modal: ModalHelper, private modal: ModalHelper,
public service: UsermanageService, public service: VehicleService,
private route: ActivatedRoute, private route: ActivatedRoute,
private modalHelper: ModalHelper, private modalHelper: ModalHelper,
private msgSrv: NzMessageService, private msgSrv: NzMessageService,

4
src/app/routes/vehicle/components/list/edit/edit.component.ts
View File

@ -4,7 +4,7 @@ import { EAEnvironmentService, CaptchaComponent, EAUserService } from '@shared';
import { Observable, Observer } from 'rxjs'; import { Observable, Observer } from 'rxjs';
import { NzMessageService } from 'ng-zorro-antd/message'; import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { UsermanageService } from '../../../services/vehicle.service'; import { VehicleService } from '../../../services/vehicle.service';
@Component({ @Component({
selector: 'app-setting-components-info-edit', selector: 'app-setting-components-info-edit',
templateUrl: './edit.component.html', templateUrl: './edit.component.html',
@ -23,7 +23,7 @@ export class VehicleComponentsListEditComponent implements OnInit {
constructor( constructor(
private modal: NzModalRef, private modal: NzModalRef,
public msgSrv: NzMessageService, public msgSrv: NzMessageService,
public service: UsermanageService, public service: VehicleService,
private envSrv: EAEnvironmentService, private envSrv: EAEnvironmentService,
) {} ) {}

20
src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts
View File

@ -1,18 +1,26 @@
/*
* @Author: your name
* @Date: 2021-12-07 17:30:18
* @LastEditTime: 2021-12-09 17:47:33
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.spec.ts
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { SettingComponentsInfoImgViewComponent } from './img-view.component'; import { VehicleImgViewComponent } from './img-view.component';
describe('SettingComponentsInfoImgViewComponent', () => { describe('VehicleImgViewComponent', () => {
let component: SettingComponentsInfoImgViewComponent; let component: VehicleImgViewComponent;
let fixture: ComponentFixture<SettingComponentsInfoImgViewComponent>; let fixture: ComponentFixture<VehicleImgViewComponent>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [SettingComponentsInfoImgViewComponent], declarations: [VehicleImgViewComponent],
}).compileComponents(); }).compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(SettingComponentsInfoImgViewComponent); fixture = TestBed.createComponent(VehicleImgViewComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });

4
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: 2021-12-01 20:58:57 * @LastEditTime: 2021-12-09 17:56:02
* @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
@ -52,7 +52,7 @@
#st #st
[bordered]="true" [bordered]="true"
[columns]="columns" [columns]="columns"
[data]='datalist' [data]='service.$api_get_operate_list'
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }" [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"

4
src/app/routes/vehicle/components/list/list.component.ts
View File

@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { UsermanageService } from '../../../vehicle/services/vehicle.service'; import { VehicleService } from '../../../vehicle/services/vehicle.service';
@Component({ @Component({
selector: 'app-Freight-components-list', selector: 'app-Freight-components-list',
templateUrl: './list.component.html', templateUrl: './list.component.html',
@ -46,7 +46,7 @@ export class VehicleComponentsListComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {} constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
/** /**
* 查询字段个数navigate * 查询字段个数navigate
*/ */

76
src/app/routes/vehicle/services/vehicle.service.ts
View File

@ -1,8 +1,8 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-29 15:22:34 * @Date: 2021-11-29 15:22:34
* @LastEditTime: 2021-11-29 15:43:42 * @LastEditTime: 2021-12-09 17:55:37
* @LastEditors: your name * @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\services\usercenter.service.ts * @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts
*/ */
@ -15,75 +15,9 @@ import { EAFileUtil } from 'src/app/shared/utils/file.util';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class UsermanageService extends BaseService { export class VehicleService extends BaseService {
public $api_add_one!: string; // 查询车辆认证表
public $api_add_many!: string; $api_get_operate_list = `/api/mdc/cuc/carLicense/operate/list/page`;
public $api_edit_one!: string;
public $api_edit_many!: string;
public $api_del_one!: string;
public $api_del_many!: string;
public $api_get_many!: string;
public $api_get_one!: string;
public $api_get_page!: string;
public $api_export!: string;
public $api_import!: string;
public $api_import_download_tpl!: string;
// 平台用户列表
$api_get_page_user = '/cuc/userApp/getOperatorUserList?_allow_anonymous=true';
// 获取供应商采购商应用
$api_get_supplier_purchaserApp = '/cuc/appInfo/getSupplierPurchaserApp?_allow_anonymous=true';
// 供应商列表
$api_get_supplier_page = '/cuc/operator/list/listSupplierPage?_allow_anonymous=true';
// 供应商详情
$api_get_supplier_info = '/cuc/operator/selectSupplierDetailInfo?_allow_anonymous=true';
// 用户冻结或恢复应用用户
$api_set_freezeOrResume = '/cuc/operator/updateSupplierInfo?_allow_anonymous=true';
// 获取一、二、三级地区详情
$api_getRegionToThree = '/cms/region/getRegionToThree?_allow_anonymous=true';
// 根据地区code查询列表
$api_getRegionByCode = '/cms/region/getRegionByCode?_allow_anonymous=true';
// 根据地区code查询地区详情
$api_get_region_detailByCode = '/cms/region/getRegionDetailByCode?_allow_anonymous=true';
// 查询供应商申请列表分页
$api_get_supplier_audit_page = `/cuc/operator/audit/listSupplierPage?_allow_anonymous=true`;
// 查询供应商入驻详情
$api_get_supplier_entryInfo = `/cuc/operator/selectSupplierEntryDetailInfo?_allow_anonymous=true`;
// 审核供应商
$api_auditSupplier = `/cuc/operator/auditSupplier?_allow_anonymous=true`;
// 查询采购商列表分页
$api_get_purchaserList = `/cuc/operator/list/queryPurchaserPage`;
// 查询采购商申请列表分页
$api_get_purchaserAudit = `/cuc/operator/audit/queryPurchaserPage`;
// 查询采购商认证详情
$api_get_purchaser_detailInfo = `/cuc/operator/selectPurchaserDetailInfo`;
// 查询采购商审核总数
$api_query_purchaser_count = `/cuc/operator/queryPurchaserCount`;
// 获取供应商审核总数
$api_query_supplier_count = `/cuc/operator/querySupplierCount`;
// 审核企业详情
$api_get_cache_enterprise_info = '';
// 获取审核进度
$api_get_progress = '/cuc/reviewRecordInfo/getReviewProgress';
// 查询流程信息列表
$api_get_progressInfoList = '/cuc/processInfo/getProcessInfoList';
// 审核通过
$api_set_audit_pass = '/cuc/reviewRecordInfo/reviewPassed';
// 审核拒绝
$api_set_audit_reject = '/cuc/reviewRecordInfo/reviewRejected';
// 发起签约 //撤回签约
$api_get_startSigning = `/cuc/operator/startSigning?_allow_badcode=true`;
// 发起续约 //撤回续约
$api_get_startRenewalContract = `/cuc/operator/startRenewalContract?_allow_badcode=true`;
// 获取审核记录
$api_get_reviewRecordInfoList = '/cuc/reviewRecordInfo/getReviewRecordInfoList';
// 查看合同详情
$api_get_contract_detail = `/scce/etc/etc/contractDetail/getContractByContractNo`;
constructor(public injector: Injector) { constructor(public injector: Injector) {
super(injector); super(injector);