diff --git a/proxy.conf.js b/proxy.conf.js index e4a414cb..445b7e9d 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 15:20:08 + * @LastEditTime : 2022-01-25 15:35:06 * @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-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts index 971b4c0f..17dd85b2 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-20 10:00:39 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-25 15:40:10 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order-detail\\receipt-order-detail.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; @@ -63,7 +73,7 @@ export class ReceiptOrderDetailComponent implements OnInit { ], requested: [ { title: '序号', render: 'no', width: 70, className: 'text-left' }, - { title: '结算客户', index: 'cno', className: 'text-left', width: 200 }, + { title: '结算客户', index: 'cnoName', className: 'text-left', width: 200 }, { title: '预收金额', index: 'yskmoney', diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html index e682ecda..454e1a45 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 18:43:42 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 18:58:32 + * @LastEditTime : 2022-01-25 15:38:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 2ca688a9..9df398c0 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -236,11 +236,11 @@ export class ReceiptOrderComponent implements OnInit { }, { title: '核销金额', - index: 'armoney', + index: 'brmmoney', width: 200, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.brmmoney }) } }, { title: '预收金额', @@ -252,7 +252,7 @@ export class ReceiptOrderComponent implements OnInit { }, { title: '银行类型', index: 'banktypeLabel', width: 200, className: 'text-left' }, { title: '收款类型', index: 'brmtypeLabel', width: 150, className: 'text-left' }, - { title: '收款方式', index: 'brmmode', width: 150, className: 'text-left' }, + { title: '收款方式', index: 'brmmodeLabel', width: 150, className: 'text-left' }, { title: '付款人', index: 'artoname', width: 200, className: 'text-left' }, { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' }, { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-left' }, diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 688ef255..8bc8f0f2 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -279,7 +279,7 @@ export class CancellationInvoiceComponent implements OnInit { }, { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, { title: '网络货运人', index: 'ltdName', width: 120 }, - { title: '购买人', index: 'artoName', width: 90 }, + { title: '购买人', index: 'artoname', width: 90 }, { title: '订单数', index: 'ordlines', width: 90, className: 'text-right' }, { title: '价税合计', diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 40ff6972..6040a2ac 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -1,154 +1,179 @@ - - - + + + -
-
- - {{headerInfo?.ltdId}} - - - {{headerInfo?.vatappHCode}} - - - {{headerInfo?.invoiceno}} - - - {{headerInfo?.invoiceno2}} - - - {{headerInfo?.invoicedate}} - - - {{headerInfo?.vatmoney}} - - - {{headerInfo?.vattax}} - -
-
- - {{headerInfo?.artoname}} - - - {{headerInfo?.artotaxno}} - - - {{headerInfo?.artoadd}} - - - {{headerInfo?.artotel}} - - - {{headerInfo?.artobank}} - - - {{headerInfo?.artoacc}} - - - {{headerInfo?.remarks}} - - -
-
- - - - - - - -
+
+ + + + + + + +
+
+ + +
+
+ +
+
+ + + +
+
- - -
-
- -
-
- - - -
-
+ +
+ +
+
+ +
+
+ + + +
+
- -
- -
-
- -
-
- - - -
-
- - -
- - - - - - {{ item.vatname }} - - - - {{ item.vatmodel }} - - - - {{ item.vatunit }} - - - - {{ item.vatqty }} - - - - -

顺丰快递: {{routesInfo?.mailNo}} 已签收 -

- -
-
- - -
\ No newline at end of file + + + + + + + + {{ item.vatname }} + + + + {{ item.vatmodel }} + + + + {{ item.vatunit }} + + + + {{ item.vatqty }} + + + + +

顺丰快递: {{ routesInfo?.mailNo }} 已签收

+ +
+ + diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index 5cc94f2a..67f599e4 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -108,7 +108,7 @@ export class InvoiceDetailComponent implements OnInit { private initOrderSF(): SFSchema { return { properties: { - billHId: { + billHCode: { type: 'string', title: '订单号', ui: { @@ -146,14 +146,14 @@ export class InvoiceDetailComponent implements OnInit { private initOrderST(): STColumn[] { return [ - { title: '订单号', index: 'billHId', width: 140 }, + { title: '订单号', index: 'billHCode', width: 180 }, { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 }, - { title: '所属项目', index: 'projectId', width: 140 }, - { title: '订单类型', index: 'billType', width: 120 }, + { title: '所属项目', index: 'projectId', width: 180 }, + { title: '订单类型', index: 'billTypeLabel', width: 120 }, { title: '装货地', index: 'loadingfrom', width: 200 }, - { title: '卸货地', index: 'loadingto', width: 200 }, + { title: '卸货地', index: 'loadingto', width: 220 }, { title: '货物信息', index: 'goodsinfo', width: 140 }, - { title: '承运司机', index: 'driverinfo', width: 140 }, + { title: '承运司机', index: 'driverinfo', width: 280 }, { title: '申请金额', index: 'billkpnotax', diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 422dcf0c..1b8a2d0f 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -1,10 +1,10 @@ /* * @Author: your name * @Date: 2021-12-23 16:50:17 - * @LastEditTime: 2021-12-31 13:35:22 - * @LastEditors: Please set LastEditors + * @LastEditTime : 2022-01-25 15:53:13 + * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\ticket-management\components\invoice-requested\requested-invoice-modal\requested-invoice-modal.component.ts + * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts */ import { Component, OnInit, ViewChild } from '@angular/core'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; @@ -66,12 +66,12 @@ export class RequestedInvoiceModalComponent implements OnInit { { title: '', index: 'key', type: 'checkbox' }, { title: '订单号', index: 'billHCode', width: 150 }, { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 }, - { title: '所属项目', index: 'projectIdName', width: 160 }, + { title: '所属项目', index: 'projectIdName', width: 250 }, { title: '订单类型', index: 'billTypeName', width: 90 }, { title: '装货地', index: 'loadingfrom', width: 250 }, { title: '卸货地', index: 'loadingto', width: 250 }, { title: '货物信息', index: 'goodsinfo', width: 170 }, - { title: '承运司机', index: 'driverinfo', width: 170 }, + { title: '承运司机', index: 'driverinfo', width: 280 }, { title: '总费用', index: 'billkpmoney',