From c6f38f6391256c68498451ba649e676696a015af Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 10:00:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 4 ++-- .../cost-management-detail.component.html | 7 +++++-- .../cost-management-detail.component.ts | 6 +++--- .../cost-management/cost-management.component.html | 5 ++++- .../cost-management/cost-management.component.ts | 8 ++++---- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 3e80aedb..eeaa5ac8 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-19 13:56:39 + * @LastEditTime : 2022-01-19 20:50:35 * @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/cost-management/cost-management-detail/cost-management-detail.component.html b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html index a87fdd69..76564935 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html @@ -12,7 +12,7 @@ 基本信息（应收费用） - {{ costInfo?.ltdid }} + {{ costInfo?.ltdName }} {{ costInfo?.feetype }} @@ -39,7 +39,7 @@ 基本信息（应付费用） - {{ costInfo?.ltdid }} + {{ costInfo?.ltdName }} {{ costInfo?.feetype }} @@ -80,6 +80,9 @@ [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }" > + + {{ costInfo?.artocode}}/{{ costInfo?.artonames}} + {{ item.hrvatmoney | currency}} diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts index 92c8c1b3..277c9412 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts @@ -53,11 +53,11 @@ export class CostManagementDetailComponent implements OnInit { cost: [ { title: '序号', render: 'no', width: 70, className: 'text-left' }, { title: '费用明细号', index: 'feeHId', className: 'text-left', width: 200 }, - { title: '订单号', index: 'billHId', className: 'text-left', width: 200 }, + { title: '订单号', index: 'billHCode', className: 'text-left', width: 200 }, { title: '订单日期', index: 'callNo', className: 'text-left', width: 200 }, - { title: '运单号', index: 'waybillHId', className: 'text-left', width: 200 }, + { title: '运单号', index: 'waybillHCode', className: 'text-left', width: 200 }, { title: '运单日期', index: 'waybillDate', className: 'text-left', width: 200 }, - { title: '结算客户', index: 'callNo', className: 'text-left', width: 200 }, + { title: '结算客户', render: 'artocode', className: 'text-left', width: 200 }, { title: '订单费用类型', index: 'billLType', className: 'text-left', width: 200 }, { title: '费用科目', index: 'feeSubId', className: 'text-left', width: 200 }, { title: '税率', index: 'hrvatrate', className: 'text-right', width: 200 }, diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html index 9e8ec435..e3633ef0 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 19:36:30 * @LastEditors : Shiming - * @LastEditTime : 2022-01-19 13:49:42 + * @LastEditTime : 2022-01-19 20:56:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -50,6 +50,9 @@ {{ item.hrmoney | currency}} + + {{ item.artocode}}/{{ item.artonames}} + {{ item.hrpaymoney | currency}} diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index f4ce440f..c3273433 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -249,13 +249,13 @@ export class CostManagementComponent implements OnInit { private initST(): STColumn[] { return [ { title: '费用单号', fixed: 'left', index: 'feecode', width: 200 ,className: 'text-left',}, - { title: '网络货运人', index: 'ltdId', width: 200 ,className: 'text-left',}, - { title: '订单号', index: 'billHId', width: 200,className: 'text-left', }, - { title: '运单号', index: 'waybillHId', width: 200 ,className: 'text-left',}, + { title: '网络货运人', index: 'ltdName', width: 220 ,className: 'text-left',}, + { title: '订单号', index: 'billHCode', width: 200,className: 'text-left', }, + { title: '运单号', index: 'waybillHCode', width: 200 ,className: 'text-left',}, { title: '费用日期', index: 'feedate', width: 200 ,className: 'text-left',}, { title: '费用类型', index: 'feetypeLabel', width: 150,className: 'text-center', }, { title: '应付核销', index: 'ishrhx', width: 200, type: 'enum', enum: { 0: '否', 1: '是' } ,className: 'text-left',}, - { title: '结算客户', index: 'cno', width: 200 ,className: 'text-left',}, + { title: '结算客户', render: 'artocode', width: 200 ,className: 'text-left',}, { title: '应收对象', index: 'artoname', width: 200 ,className: 'text-left',}, { title: '应付对象', index: 'hrtoname', width: 200 ,className: 'text-left',}, { title: '应收金额', render: 'armoeny', width: 100 ,className: 'text-right',}, From 35feb48d2badaffff7838f64ed6626ba03b37119 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 10:20:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cost-management/cost-management.component.html | 6 +++--- .../cost-management/cost-management.component.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html index e3633ef0..76114f5f 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 19:36:30 * @LastEditors : Shiming - * @LastEditTime : 2022-01-19 20:56:56 + * @LastEditTime : 2022-01-20 10:20:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -32,11 +32,11 @@
- - + -->
this.auditAction(item), iif: item => item.sts === 2 }, - { - text: '修改', - click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } }) - } + // { + // text: '修改', + // click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } }) + // } ] } ]; From 759b05471b25a3fa7b1ff01d1c5e83cecd9d6f21 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 20 Jan 2022 10:30:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/network-freight/network-freight.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts index ec258b79..cb0c9e4d 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts @@ -216,7 +216,6 @@ export class NetworkFreightComponent implements OnInit { type: 'number', title: '营业执照所在地', ui: { - grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, widget: 'cascader', valueProperty: 'regionCode', labelProperty: 'name', @@ -317,6 +316,8 @@ export class NetworkFreightComponent implements OnInit { regioin?.forEach((element: any) => { enterpriseAddressCode.push(Number(element)) }); + console.log(enterpriseAddressCode) + this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode); return enterpriseAddressCode; }); }