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
2021-12-24 15:26:11 +08:00
parent 8905745828 f45dfc4732
commit 15cb91f21e
7 changed files with 124 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-20 09:29:11
* @LastEditTime: 2021-12-24 13:26: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\supply-management\components\vehicle\vehicle.component.html

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

@ -15,7 +15,6 @@ import { OrderManagementService } from '../../services/order-management.service'
styleUrls: ['./risk.component.less']
})
export class OrderManagementRiskComponent implements OnInit {
url = `/user?_allow_anonymous=true`;
ui: SFUISchema = {};
uiView: SFUISchema = {};
schema: SFSchema = {};
@ -59,10 +58,25 @@ export class OrderManagementRiskComponent implements OnInit {
return this.st?.list.filter(item => item.checked) || [];
}
ngOnInit(): void {
this.getGoodsSourceStatistical()
this.initSF();
this.initST();
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_listStatisticalStatus, {}).subscribe(res => {
if (res) {
res.forEach((element: any) => {
if(element.statusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity
} else if (element.statusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity
} else if (element.statusLabel === '待签收') {
this.tabs.cancelQuantity = element.quantity
}
});
}
})
}
/**
* 初始化查询表单
*/

26
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-23 17:39:40
* @LastEditTime: 2021-12-24 15:12:35
* @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\components\vehicle-detail\vehicle-detail.component.html
@ -117,9 +117,9 @@
<span style="padding: 0 10px"
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
></span>
<span
<!-- <span
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
></span>
></span> -->
</div>
</nz-form-control>
</nz-form-item>
@ -133,10 +133,10 @@
</nz-form-control>
</nz-form-item>
</div>
<button nz-button nzType="primary" (click)="addStartInfo($event)">
<!-- <button nz-button nzType="primary" (click)="addStartInfo($event)">
<i nz-icon nzType="plus"></i>
添加装货地
</button>
</button> -->
</div>
<div nz-col [nzSpan]="8">
<div style="display: flex; justify-content: center">
@ -159,9 +159,9 @@
/>
</nz-input-group>
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
<span
<!-- <span
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
></span>
></span> -->
</div>
</nz-form-control>
</nz-form-item>
@ -175,10 +175,10 @@
</nz-form-control>
</nz-form-item>
</div>
<button nz-button nzType="primary" (click)="addEndInfo($event)">
<!-- <button nz-button nzType="primary" (click)="addEndInfo($event)">
<i nz-icon nzType="plus"></i>
添加卸货地
</button>
</button> -->
</div>
</div>
<div nz-row [nzGutter]="24" style="margin-top: 24px">
@ -327,13 +327,6 @@
</sv-container>
<sv-container col="2" class="mt-md">
<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="formData" button="none"></sf>
<!-- <sv label="装货凭证">
</sv>
<sv label="卸货凭证">
</sv> -->
</sv-container>
</nz-card>
<nz-card nzTitle="补充信息">
@ -356,7 +349,6 @@
</sv-container>
<sv-container col="1" class="mt-md">
<sv label="回单凭证">
<!-- {{i?.goodsResource?.receiptAddress}} -->
<nz-upload
class="avatar-uploader"
[nzAction]="service.$api_upload_url"

127
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 13:15:50
* @LastEditTime: 2021-12-24 14:59:33
* @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\components\vehicle-detail\vehicle-detail.component.ts
@ -92,10 +92,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
initSF() {
this.schema = {
properties: {
imgUrl3: {
loadingLadingBillFilePath: {
type: 'string',
title: '装货凭证',
readOnly: true,
ui: {
widget: 'upload',
action: apiConf.fileUpload,
@ -131,10 +130,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
listType: 'picture-card',
} as SFUploadWidgetSchema,
},
imgUrl4: {
loadingPeopleVehiclesGoodsFilePath: {
type: 'string',
title: '',
readOnly: true,
ui: {
widget: 'upload',
action: apiConf.fileUpload,
@ -178,7 +176,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
},
default: '',
},
imgUrl1: {
unloadingLadingBillFilePath: {
type: 'string',
title: '卸货凭证',
ui: {
@ -216,7 +214,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
listType: 'picture-card',
} as SFUploadWidgetSchema,
},
imgUrl2: {
unloadingPeopleVehiclesGoodsFilePath: {
type: 'string',
title: '',
ui: {
@ -271,22 +269,22 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
default: '',
},
},
required: ['imgUrl3','imgUrl1']
required: ['loadingLadingBillFilePath','unloadingLadingBillFilePath']
};
this.ui = {
'*': {
spanLabelFixed: 100,
grid: { span: 20 }
},
$imgUrl1: { grid: { span: 12} },
$imgUrl2: { grid: { span: 12} },
$imgUrl3: { grid: { span: 12} },
$imgUrl4: { grid: { span: 12} },
$unloadingLadingBillFilePath: { grid: { span: 12} },
$unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
$loadingLadingBillFilePath: { grid: { span: 12} },
$loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
$no5: { grid: { span: 24} },
};
}
initData() {
this.service.request(this.service.$api_get_getWholeBillDetail, {id: this.id}).subscribe(res => {
this.service.request(this.service.$api_set_getWholeOrderDetail, {id: this.id}).subscribe(res => {
console.log(res)
if (res) {
this.i = res;
@ -341,44 +339,61 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
});
// 对装货凭证进行初始化
if (res.imgUrl1) {
if (res.loadingLadingBillFilePath) {
this.formData = {
imgUrl3: [
loadingLadingBillFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res.imgUrl1,
url: res.loadingLadingBillFilePath,
response: {
url: res.imgUrl1,
url: res.loadingLadingBillFilePath,
},
},
],
imgUrl4: [
loadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res.imgUrl2,
url: res.loadingPeopleVehiclesGoodsFilePath,
response: {
url: res.imgUrl2,
url: res.loadingPeopleVehiclesGoodsFilePath,
},
},
],
unloadingLadingBillFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res.unloadingLadingBillFilePath,
response: {
url: res.unloadingLadingBillFilePath,
},
},
],
unloadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res.unloadingPeopleVehiclesGoodsFilePath,
response: {
url: res.unloadingPeopleVehiclesGoodsFilePath,
},
},
],
};
}
// 发车时间到车时间初始化
this.loadingTime = res.loadingTime
this.loadingTime = res.unloadTime
}
})
}
hand() {
this.modalService.create({
nzTitle: '',
// nzContent: OrderManagementGaodeMapComponent,
nzWidth: 1200
});
}
goBack() {
window.history.go(-1);
}
@ -388,7 +403,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
// 保存修改
save() {
console.log(this.sf.value)
let imgList : any= [];
if(this.listImagUrls.length > 0) {
this.listImagUrls?.forEach((res :any) => {
@ -397,52 +411,51 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
})
}
console.log(imgList)
if(typeof(this.validateForm1.value.unloadingTime) !== 'string' ) {
var c = new Date(this.validateForm1.value.unloadingTime);
this.validateForm1.value.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
if(typeof(this.unloadingTime) !== 'string' ){
var c = new Date(this.unloadingTime);
this.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
}
if(typeof(this.validateForm1.value.loadingTime) !== 'string' ) {
var c = new Date(this.validateForm1.value.loadingTime);
this.validateForm1.value.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
if(typeof(this.loadingTime) !== 'string' ) {
var c = new Date(this.loadingTime);
this.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
}
console.log(this.sf3.value)
console.log(this.sf4.value)
console.log(this.sf.value)
const params = {
id: this.id,
unLoadingPlaceList: [...this.startInfo, ...this.endInfo,],
goodsResource: [{
id: '',
enterpriseInfoId: 'xxx',
id: this.i?.goodsResource?.id,
enterpriseInfoId: this.sf3.value?.enterpriseInfoId,
}],
receiptFilePath: imgList,
goodsInfoList: [{
id: '',
goodsName: 'xxx',
weight: '',
volume: '',
number: '',
id: this.i?.goodsInfoList?.[0].id,
goodsName: this.sf3.value?.goodsName,
...this.sf4.value
}],
// 运费信息
expenseList: this.i?.i?.billExpenseDetails,
expenseList: this.i?.billExpenseDetails,
// 收款人
payeeId: '',
银行卡: '',
payeeId: this.dirverPhone,
dirverBankCard: this.dirverBankCard, // 银行卡
// 发车时间
loadPlanTime: '',
loadPlanTime: this.loadingTime,
// 到车时间
unloadPlanTime: '',
loadingLadingBillFilePath: '',
loadingPeopleVehiclesGoodsFilePath: '',
unloadingLadingBillFilePath: '',
unloadingPeopleVehiclesGoodsFilePath: '',
unloadPlanTime: this.loadingTime,
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url,
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath : this.sf.value?.unloadingLadingBillFilePath?.url,
unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url,
}
console.log(params)
// this.service.request(this.service.$api_set_getWholeOrderDetail, params).subscribe((res: any) => {
// console.log(res)
// })
this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => {
console.log(res)
})
}
addPreZero(num: any){
if(num<10){

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-23 17:40:37
* @LastEditTime: 2021-12-24 15:13:40
* @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\components\vehicle-detail\vehicle-detail.component.html
@ -81,13 +81,13 @@
<nz-card nzTitle="运单进度">
<div class="approval-status">
<div style="width: 60%; margin: 0 auto">
<nz-steps [nzLabelPlacement]="'vertical'">
<!-- <nz-steps [nzLabelPlacement]="'vertical'">
<nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
[nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
<nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
[nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step>
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
</nz-steps>
</nz-steps> -->
</div>
</div>
</nz-card>
@ -97,27 +97,27 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<div class="handling-info p-md">
<!-- <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div *ngIf="item?.type === '1'" class="loading-row">
<div class="info">
<h4>装货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
</div>
</div>
</div> -->
</div>
<p class="time-info">计划装货时间：{{i?.goodsResource?.[0]?.loadingTime}}</p>
</div>
</div>
<div nz-col [nzSpan]="12">
<div class="handling-info p-md">
<!-- <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div *ngIf="item?.type === '2'" class="loading-row">
<div class="info">
<h4>卸货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
</div>
</div>
</div> -->
</div>
<p class="time-info">计划卸货时间：{{i?.goodsResource?.[0]?.unloadingTime}}</p>
</div>
</div>
@ -141,7 +141,7 @@
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
</sv>
<sv label="承运司机">
{{i?.driverId}}
<!-- {{i?.driverId}} -->
</sv>
<sv label="车型车长载重">
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
@ -171,11 +171,11 @@
</sv-container>
<sv-container col="2" class="mt-md">
<sv label="装货凭证">
<app-imagelist [imgList]="[i?.goodsResource]">
<app-imagelist [imgList]="[i?.loadingLadingBillFilePath,i?.loadingPeopleVehiclesGoodsFilePath]">
</app-imagelist>
</sv>
<sv label="卸货凭证">
<app-imagelist [imgList]="[i?.goodsResource]">
<app-imagelist [imgList]="[i?.unloadingLadingBillFilePath,i?.unloadingPeopleVehiclesGoodsFilePath]">
</app-imagelist>
</sv>
</sv-container>
@ -201,7 +201,7 @@
</sv-container>
<sv-container col="1" class="mt-md">
<sv label="回单凭证">
<app-imagelist [imgList]="[imges]"></app-imagelist>
<app-imagelist [imgList]="[i?.receiptFilePath]"></app-imagelist>
</sv>
<sv label="备注">
{{i?.goodsResource?.remarks}}

11
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-23 16:35:59
* @LastEditTime: 2021-12-24 13:58:21
* @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\components\vehicle-detail\vehicle-detail.component.ts
@ -22,8 +22,12 @@ import { OrderManagementService } from '../../services/order-management.service'
export class OrderManagementVehicleDetailComponent implements OnInit {
id = this.route.snapshot.params.id;
@ViewChild('distannce3', { static: false })
i: any= {unLoadingPlaceList:[]};
i: any= {
unLoadingPlaceList:[],
billExpenseDetails: [],
goodsInfoList:[],
goodsResource: []
};
imges: any;
isVisible = false;
logColumns: STColumn[] = [
@ -68,6 +72,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
console.log(res)
if (res) {
this.i =res;
console.log(this.i?.unLoadingPlaceList)
}
})
}

12
src/app/routes/order-management/services/order-management.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-23 20:49:05
* @LastEditTime: 2021-12-24 14:43:00
* @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
@ -24,6 +24,8 @@ export class OrderManagementService extends BaseService {
// 风险单：
// 风险单列表查询
$api_get_listRiskPage = `/api/sdc/billRiskOperate/listRiskPage`;
// 风险单列表查询
$api_get_listStatisticalStatus = `/api/sdc/billRiskOperate/listStatisticalStatus`;
// 风险单详情查询
$api_get_getRiskDetail = `/api/sdc/billRiskOperate/getRiskDetail`;
// 风险单审核
@ -89,10 +91,14 @@ export class OrderManagementService extends BaseService {
$api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`;
// 删除装卸货信息
$api_delete_Wholedeletebatch = `/api/sdc/unLoadingPlace/deletebatch`;
// 修改-大宗订单详情
$api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`;
// 修改-大宗订单
$api_set_modifyBulkOrder = `/api/sdc/billOperate/modifyBulkOrder`;
// 修改-整车订单
$api_set_modifyWholeOrder = `/api/sdc/billOperate/modifyWholeOrder`;
// 修改-整车订单详情
$api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`;
// 修改--大宗订单详情
$api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`;
constructor(public injector: Injector) {
super(injector)
}