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

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

Browse Source
This commit is contained in:
Taric Xin
2022-01-20 13:51:22 +08:00
parent a76a9f0718 6bfc719245
commit 3a0ae6a54e
9 changed files with 105 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-01-19 20:50:35
* @LastEditTime : 2022-01-20 11:12:31
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -20,7 +20,7 @@ module.exports = {
// }
'//api': {
target: {
host: 'tms-api-test.eascs.com',
host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},

2
src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
View File

@ -257,7 +257,7 @@ export class ReceiptOrderComponent implements OnInit {
{ title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' },
{ title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-left' },
{ title: '创建人', index: 'createUserId', width: 150, className: 'text-left' },
{ title: '收款状态', index: 'sts', width: 200, className: 'text-left' },
{ title: '收款状态', index: 'stsLabel', width: 200, className: 'text-left' },
{ title: '收款备注', index: 'remarks', width: 200, className: 'text-left' },
{
title: '操作',

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

@ -457,17 +457,17 @@ export class OrderManagementBulkComponent implements OnInit {
width: '120px',
className: 'text-left',
buttons: [
{
text: '查看评价　',
click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5'
},
{
text: '运费变更记录',
click: _record => this.OpenPrice(_record),
iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6'
},
{
text: '查看评价　',
click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5'
},
{
text: '变更运费　',
click: _record => this.updateFreight(_record),

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

@ -413,16 +413,17 @@ resourceStatus: any;
width: '120px',
className: 'text-left',
buttons: [
{
text: '查看评价　',
click: (_record) => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
},
{
text: '运费变更记录',
click: (_record) => this.OpenPrice(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
},
{
text: '查看评价　',
click: (_record) => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
},
{
text: '变更运费　',
click: (_record) => this.updateFreight(_record),

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

@ -14,15 +14,16 @@
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
<div nz-col nzSpan="10">
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
<button nz-button (click)="assignedCar(i)"
*ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'">重新指派</button>
<button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'">重新指派</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)">再下一单</button>
</div>
</div>
<div class="mt-sm mb-sm" nz-row>
<div>
<b>总费用：<span class="text-red-light text-md">{{i?.totalAmount | currency: '¥'}}</span></b>
<b
>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b
>
</div>
</div>
<nz-divider></nz-divider>
@ -39,13 +40,19 @@
<div class="approval-status">
<div style="width: 60%; margin: 0 auto">
<nz-steps style="width: 70%; margin: 0 auto" [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]="i?.resourceStatus === '2'?'已完结':'完结'"></nz-step>
<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]="i?.resourceStatus === '2' ? '已完结' : '完结'"
></nz-step>
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
</nz-steps>
</div>
</div>
@ -58,15 +65,9 @@
<sv label="货物名称">
{{ item?.goodsName }}
</sv>
<sv label="货物数量">
{{item?.weight}}顿 | {{item?.volume}}方
</sv>
<sv label="剩余">
{{10}}顿 | {{10}}方
</sv>
<sv label="用车需求">
{{item?.maxWeight}} | {{item?.maxCube}}米
</sv>
<sv label="货物数量"> {{ item?.weight }}顿 | {{ item?.volume }}方 </sv>
<sv label="剩余"> {{ 10 }}顿 | {{ 10 }}方 </sv>
<sv label="用车需求"> {{ item?.maxWeight }} | {{ item?.maxCube }}米 </sv>
<sv label="承运信息">
{{ i?.carrierInformationVO?.driverName }} / {{ i?.carrierInformationVO?.driverTelephone }} /
{{ i?.carrierInformationVO?.driverLicensePlate }}
@ -77,8 +78,10 @@
</ng-container>
</sv-container>
<div class="mt-md">
<h4 class="text-md">装货卸货信息
<span class="ml-sm text-sm">(
<h4 class="text-md"
>装货卸货信息
<span class="ml-sm text-sm"
>(
<label>{{ i?.loadingCount || '一' }}装</label>
<label>{{ i?.unloadingCount || '一' }}卸</label>
)
@ -123,14 +126,12 @@
<div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
<div>
<p class="text-warning-light mb-xs text-right">到货后{{ i?.paymentDays }}天内支付运费</p>
<p class="mb-xs text-right">
{{settlementBasis[item?.settlementBasis]}}，{{rule[item?.rule]}}</p>
<p class="mb-xs text-right"> {{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}</p>
</div>
<nz-divider class="mb-xs mt-xs"></nz-divider>
<div class="text-right">
<label>单价：</label>
<span class="text-error-dark text-xxl">{{item?.freightPrice | currency: '￥'}}
{{freightType[item?.freightType]}}</span>
<span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }}</span>
</div>
</div>
</div>
@ -139,7 +140,8 @@
<nz-card nzTitle="关联运单">
<sv-container col="5">
<sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
(<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
(<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span
>)
</sv>
<!-- <sv label="运输中">
(<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)
@ -175,7 +177,14 @@
</sv-container>
</nz-card>
<nz-card nzTitle="操作日志">
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [page]="{ show: false, showSize: false }">
<st
#st
[data]="service.$api_getOperationLogRecordsList"
[columns]="logColumns"
[page]="{ show: false, showSize: false }"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
>
</st>
</nz-card>
</div>

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

@ -18,9 +18,9 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
id = this.route.snapshot.params.id;
i: any;
logColumns: STColumn[] = [
{ title: '内容', index: 'theme' },
{ title: '操作人', index: 'operationUserPhone' },
{ title: '操作时间', index: ' createTime' },
{ title: '内容', index: 'operationContent' },
{ title: '操作人', index: 'operator' },
{ title: '操作时间', index: ' operatorTimestamp' },
];
driverColums: STColumn[] = [
{ title: '司机姓名', index: 'theme' },
@ -62,13 +62,18 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
2: '抹除小数',
3: '抹除个数'
} // 取整规则
get reqParams() {
return {
operateObject: this.i?.resourceCode,
operateType: 4,
};
}
currentStatus = 0;
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
public service: SupplyManagementService,
private modal: NzModalService,
private router: Router
) {

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

@ -72,19 +72,6 @@ export class SupplyManagementBulkComponent implements OnInit {
end: this.sf?.value?.deadlineTime?.[1] || '',
},
};
// const a:any = {};
// if(this.resourceStatus) {
// a.resourceStatus = this.resourceStatus
// }
// return {
// ...a,
// ...this.sf?.value,
// createTime: {
// start: this.sf.value.createTime?.[0] || null,
// end: this.sf.value.createTime?.[1] || null,
// }
// };
}
search() {
this.st?.load(1);

6
src/app/routes/supply-management/services/supply-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:29:25
* @LastEditTime : 2022-01-20 10:57:13
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -102,6 +102,10 @@ export class SupplyManagementService extends BaseService {
// 货源审核【批量】
public $api_batchGoodsResourceAudit = '/api/sdc/goodsResourceOperate/batchGoodsResourceAudit';
// 获取操作日志列表
public $api_getOperationLogRecordsList = '/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList';
constructor(public injector: Injector) {
super(injector);
}

36
src/assets/mocks/menu-data.json
View File

@ -263,6 +263,24 @@
"text": "收款单",
"link": "/financial-management/receipt-order"
},
{
"text": "应收核销",
"link": "/financial-management/receivable-order"
},
{
"text": "应收核销详情",
"hide": true,
"link": "/financial-management/receivable-order/detail/:id"
},
{
"text": "应付核销",
"link": "/financial-management/payable-order"
},
{
"text": "应收核销详情",
"hide": true,
"link": "/financial-management/payable-order/detail/:id"
},
{
"text": "货主账户",
"link": "/financial-management/freight-account"
@ -305,24 +323,6 @@
{
"text": "交易流水",
"link": "/financial-management/transaction-flow"
},
{
"text": "应收核销",
"link": "/financial-management/receivable-order"
},
{
"text": "应收核销详情",
"hide": true,
"link": "/financial-management/receivable-order/detail/:id"
},
{
"text": "应付核销",
"link": "/financial-management/payable-order"
},
{
"text": "应收核销详情",
"hide": true,
"link": "/financial-management/payable-order/detail/:id"
}
]
},