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 * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-01-19 20:50:35 * @LastEditTime : 2022-01-20 11:12:31
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -20,7 +20,7 @@ module.exports = {
// } // }
'//api': { '//api': {
target: { target: {
host: 'tms-api-test.eascs.com', host: 'tms-api-dev.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 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: 'bankreceipt', width: 200, className: 'text-left' },
{ title: '创建时间', index: 'createTime', type: 'date', 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: '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: '收款备注', index: 'remarks', width: 200, className: 'text-left' },
{ {
title: '操作', 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', width: '120px',
className: 'text-left', className: 'text-left',
buttons: [ buttons: [
{
text: '查看评价　',
click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5'
},
{ {
text: '运费变更记录', text: '运费变更记录',
click: _record => this.OpenPrice(_record), click: _record => this.OpenPrice(_record),
iif: item => iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6' 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: '变更运费　', text: '变更运费　',
click: _record => this.updateFreight(_record), 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', width: '120px',
className: 'text-left', className: 'text-left',
buttons: [ buttons: [
{
text: '查看评价　',
click: (_record) => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
},
{ {
text: '运费变更记录', text: '运费变更记录',
click: (_record) => this.OpenPrice(_record), click: (_record) => this.OpenPrice(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', 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: '变更运费　', text: '变更运费　',
click: (_record) => this.updateFreight(_record), click: (_record) => this.updateFreight(_record),

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

@ -7,31 +7,32 @@
</ng-template> </ng-template>
<ng-template #headerContent> <ng-template #headerContent>
<div class="mb-xs" nz-row> <div class="mb-xs" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.resourceStatusLabel}}</button> <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4> <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
</div> </div>
<div nz-row> <div nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.shipperAppUserName}}</div> <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
<div nz-col nzSpan="10"> <div nz-col nzSpan="10">
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button> <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
<button nz-button (click)="assignedCar(i)" <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'">重新指派</button>
*ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'">重新指派</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'">修改单价</button> <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)">再下一单</button> <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)">再下一单</button>
</div> </div>
</div> </div>
<div class="mt-sm mb-sm" nz-row> <div class="mt-sm mb-sm" nz-row>
<div> <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>
</div> </div>
<nz-divider></nz-divider> <nz-divider></nz-divider>
<div sv-container *ngIf="i"> <div sv-container *ngIf="i">
<sv label="项目">{{i?.enterpriseProjectId}}</sv> <sv label="项目">{{ i?.enterpriseProjectId }}</sv>
<sv label="截止时间">{{i?.deadlineTime}}</sv> <sv label="截止时间">{{ i?.deadlineTime }}</sv>
<sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv> <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
<sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv> <sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
<sv label="服务类型">{{i?.serviceTypeLabel}} </sv> <sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
</div> </div>
</ng-template> </ng-template>
</page-header-wrapper> </page-header-wrapper>
@ -39,13 +40,19 @@
<div class="approval-status"> <div class="approval-status">
<div style="width: 60%; margin: 0 auto"> <div style="width: 60%; margin: 0 auto">
<nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'"> <nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
<nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution" <nz-step
[nzDescription]="i?.createAt" nzTitle="下单"></nz-step> [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
<nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' " nzIcon="solution"
[nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzDescription]="i?.createAt"
[nzTitle]="i?.resourceStatus === '2'?'已完结':'完结'"></nz-step> 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-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
</nz-steps> </nz-steps>
</div> </div>
</div> </div>
@ -56,20 +63,14 @@
<sv-title>货物信息</sv-title> <sv-title>货物信息</sv-title>
<ng-container *ngFor="let item of i?.goodsInfoList"> <ng-container *ngFor="let item of i?.goodsInfoList">
<sv label="货物名称"> <sv label="货物名称">
{{item?.goodsName}} {{ item?.goodsName }}
</sv>
<sv label="货物数量">
{{item?.weight}}顿 | {{item?.volume}}方
</sv>
<sv label="剩余">
{{10}}顿 | {{10}}方
</sv>
<sv label="用车需求">
{{item?.maxWeight}} | {{item?.maxCube}}米
</sv> </sv>
<sv label="货物数量"> {{ item?.weight }}顿 | {{ item?.volume }}方 </sv>
<sv label="剩余"> {{ 10 }}顿 | {{ 10 }}方 </sv>
<sv label="用车需求"> {{ item?.maxWeight }} | {{ item?.maxCube }}米 </sv>
<sv label="承运信息"> <sv label="承运信息">
{{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} / {{ i?.carrierInformationVO?.driverName }} / {{ i?.carrierInformationVO?.driverTelephone }} /
{{i?.carrierInformationVO?.driverLicensePlate}} {{ i?.carrierInformationVO?.driverLicensePlate }}
</sv> </sv>
<!-- <sv label="当前指派"> <!-- <sv label="当前指派">
<a (click)="viewCurrentAssign(i)">查看</a> <a (click)="viewCurrentAssign(i)">查看</a>
@ -77,10 +78,12 @@
</ng-container> </ng-container>
</sv-container> </sv-container>
<div class="mt-md"> <div class="mt-md">
<h4 class="text-md">装货卸货信息 <h4 class="text-md"
<span class="ml-sm text-sm">( >装货卸货信息
<label>{{i?.loadingCount || '一'}}装</label> <span class="ml-sm text-sm"
<label>{{i?.unloadingCount || '一'}}卸</label> >(
<label>{{ i?.loadingCount || '一' }}装</label>
<label>{{ i?.unloadingCount || '一' }}卸</label>
) )
</span> </span>
</h4> </h4>
@ -91,8 +94,8 @@
<div *ngIf="item?.type === '1'" class="loading-row"> <div *ngIf="item?.type === '1'" class="loading-row">
<div class="handling-info-icon loading-bg">装</div> <div class="handling-info-icon loading-bg">装</div>
<div class="info"> <div class="info">
<h4>装货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4> <h4>装货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p> <p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -105,8 +108,8 @@
<div *ngIf="item?.type === '2'" class="loading-row"> <div *ngIf="item?.type === '2'" class="loading-row">
<div class="handling-info-icon unloaing-bg">卸</div> <div class="handling-info-icon unloaing-bg">卸</div>
<div class="info"> <div class="info">
<h4>卸货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4> <h4>卸货地：{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}</h4>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p> <p>联系人：{{ item?.appUserName }}/{{ item?.contractTelephone }}</p>
</div> </div>
</div> </div>
</div> </div>
@ -122,15 +125,13 @@
<div nz-row> <div nz-row>
<div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24"> <div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
<div> <div>
<p class="text-warning-light mb-xs text-right">到货后{{i?.paymentDays}}天内支付运费</p> <p class="text-warning-light mb-xs text-right">到货后{{ i?.paymentDays }}天内支付运费</p>
<p class="mb-xs text-right"> <p class="mb-xs text-right"> {{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}</p>
{{settlementBasis[item?.settlementBasis]}}，{{rule[item?.rule]}}</p>
</div> </div>
<nz-divider class="mb-xs mt-xs"></nz-divider> <nz-divider class="mb-xs mt-xs"></nz-divider>
<div class="text-right"> <div class="text-right">
<label>单价：</label> <label>单价：</label>
<span class="text-error-dark text-xxl">{{item?.freightPrice | currency: '￥'}} <span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }}</span>
{{freightType[item?.freightType]}}</span>
</div> </div>
</div> </div>
</div> </div>
@ -139,7 +140,8 @@
<nz-card nzTitle="关联运单"> <nz-card nzTitle="关联运单">
<sv-container col="5"> <sv-container col="5">
<sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList"> <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>
<!-- <sv label="运输中"> <!-- <sv label="运输中">
(<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>) (<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)
@ -158,24 +160,31 @@
<nz-card nzTitle="补充信息"> <nz-card nzTitle="补充信息">
<sv-container> <sv-container>
<sv label="是否回单"> <sv label="是否回单">
{{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
</sv> </sv>
<sv label="回单类型"> <sv label="回单类型">
{{i?.supplementaryInformationVO?.receiptTypeLabel}} {{ i?.supplementaryInformationVO?.receiptTypeLabel }}
</sv> </sv>
<sv label="所在地区"> <sv label="所在地区">
{{i?.supplementaryInformationVO?.area}} {{ i?.supplementaryInformationVO?.area }}
</sv> </sv>
<sv label="详细地址"> <sv label="详细地址">
{{i?.supplementaryInformationVO?.address}} {{ i?.supplementaryInformationVO?.address }}
</sv> </sv>
<sv label="备注"> <sv label="备注">
{{i?.supplementaryInformationVO?.remarks}} {{ i?.supplementaryInformationVO?.remarks }}
</sv> </sv>
</sv-container> </sv-container>
</nz-card> </nz-card>
<nz-card nzTitle="操作日志"> <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> </st>
</nz-card> </nz-card>
</div> </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; id = this.route.snapshot.params.id;
i: any; i: any;
logColumns: STColumn[] = [ logColumns: STColumn[] = [
{ title: '内容', index: 'theme' }, { title: '内容', index: 'operationContent' },
{ title: '操作人', index: 'operationUserPhone' }, { title: '操作人', index: 'operator' },
{ title: '操作时间', index: ' createTime' }, { title: '操作时间', index: ' operatorTimestamp' },
]; ];
driverColums: STColumn[] = [ driverColums: STColumn[] = [
{ title: '司机姓名', index: 'theme' }, { title: '司机姓名', index: 'theme' },
@ -62,13 +62,18 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
2: '抹除小数', 2: '抹除小数',
3: '抹除个数' 3: '抹除个数'
} // 取整规则 } // 取整规则
get reqParams() {
return {
operateObject: this.i?.resourceCode,
operateType: 4,
};
}
currentStatus = 0; currentStatus = 0;
constructor( constructor(
private route: ActivatedRoute, private route: ActivatedRoute,
private msgSrv: NzMessageService, private msgSrv: NzMessageService,
private service: SupplyManagementService, public service: SupplyManagementService,
private modal: NzModalService, private modal: NzModalService,
private router: Router 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] || '', 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() { search() {
this.st?.load(1); this.st?.load(1);

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-03 11:10:14 * @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * 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_batchGoodsResourceAudit = '/api/sdc/goodsResourceOperate/batchGoodsResourceAudit';
// 获取操作日志列表
public $api_getOperationLogRecordsList = '/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList';
constructor(public injector: Injector) { constructor(public injector: Injector) {
super(injector); super(injector);
} }

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

@ -263,6 +263,24 @@
"text": "收款单", "text": "收款单",
"link": "/financial-management/receipt-order" "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": "货主账户", "text": "货主账户",
"link": "/financial-management/freight-account" "link": "/financial-management/freight-account"
@ -305,24 +323,6 @@
{ {
"text": "交易流水", "text": "交易流水",
"link": "/financial-management/transaction-flow" "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"
} }
] ]
}, },