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-02-28 11:38:51 +08:00
parent 23df1cc8fc e9c75fdba6
commit cba70f810e
4 changed files with 4 additions and 16 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-02-17 15:57:11 * @LastEditTime : 2022-02-25 17:52:10
* @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-dev.eascs.com', host: 'tms-api-test.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

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

@ -83,12 +83,6 @@
<span>{{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span> <span>{{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div> </div>
</ng-template> </ng-template>
<!-- 我的出价 -->
<ng-template st-row="mybidInfo" let-item let-index="index" class="temp_p">
<div *ngIf="item.mybidInfo.length > 0">
<p *ngFor="let data of item.mybidInfo"> {{ data.expenseName }}：￥{{ data.price | number: '0.2-2' }} </p>
</div>
</ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index"> <ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo.length > 0"> <div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo"> <p *ngFor="let data of item.mybidDetailInfo">

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

@ -353,12 +353,6 @@ resourceStatus: any;
className: 'text-left', className: 'text-left',
render: 'billCode' render: 'billCode'
}, },
{
title: '我的出价',
width: '200px',
className: 'text-right',
render: 'mybidInfo'
},
{ {
title: '运费明细', title: '运费明细',
width: '250px', width: '250px',

4
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-02-24 16:23:02 * @LastEditTime : 2022-02-28 11:31:44
* @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.
*/ */
@ -53,7 +53,7 @@ export class SupplyManagementService extends BaseService {
// 整车计算附加费 // 整车计算附加费
$api_getCalculatedSurcharge = `/api/sdc/expense/getCalculatedSurcharge`; $api_getCalculatedSurcharge = `/api/sdc/expense/getCalculatedSurcharge`;
// 整车计算附加费率 // 整车计算附加费率
$api_getcalculatedServiceRate = `/api/sdc/expense/getcalculatedServiceRate`; $api_getcalculatedServiceRate = `/api/sdc/expense/getAdditionalRate`;
// 代发整车货源 // 代发整车货源
$api_consignWhole = `/api/sdc/goodsResourceOperate/consignWhole`; $api_consignWhole = `/api/sdc/goodsResourceOperate/consignWhole`;
// 代发大宗货源 // 代发大宗货源