diff --git a/proxy.conf.js b/proxy.conf.js index ed5e9851..e90106bb 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-05-10 13:41:21 + * @LastEditTime : 2022-05-11 10:12:55 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts index 5b58970b..fc458443 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts @@ -46,27 +46,27 @@ export class PayableOrderDetailComponent implements OnInit { Object.assign(requestOptions.body, { ...this.sf?.value, billTime: { - start: this.sf?.value.billTime?.[0] || null, - end: this.sf?.value.billTime?.[1] || null + start: this.sf?.value.billTime?.[0] || '', + end: this.sf?.value.billTime?.[1] || '' }, feedate: { - start: this.sf?.value.feedate?.[0] || null, - end: this.sf?.value.feedate?.[1] || null + start: this.sf?.value.feedate?.[0] || '', + end: this.sf?.value.feedate?.[1] || '' } }); if (this.sf?.value.billTime) { Object.assign(requestOptions.body, { billTime: { - start: this.sf?.value.billTime?.[0] || null, - end: this.sf?.value.billTime?.[1] || null + start: this.sf?.value.billTime?.[0] || '', + end: this.sf?.value.billTime?.[1] || '' } }); } if (this.sf?.value.feedate) { Object.assign(requestOptions.body, { feedate: { - start: this.sf?.value.feedate?.[0] || null, - end: this.sf?.value.feedate?.[1] || null + start: this.sf?.value.feedate?.[0] || '', + end: this.sf?.value.feedate?.[1] || '' } }); } @@ -134,9 +134,6 @@ export class PayableOrderDetailComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, billTime: { diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 36e7ca2f..72f0d421 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -93,6 +93,20 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit placeholder: '请输入' } }, + billHCode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入' + } + }, + waybillHCode: { + type: 'string', + title: '运单号', + ui: { + placeholder: '请输入' + } + }, ltdId: { type: 'string', title: '网络货运人', @@ -141,13 +155,12 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit sts: { type: 'string', title: '核销状态', - enum: [ - { value: 1, label: '已核销' }, - { value: 0, label: '待核销' } - ], + default: '', ui: { - widget: 'select', - placeholder: '请选择' + widget: 'dict-select', + containsAllLable: true, + params: { dictKey: 'write:off:status' }, + containAllLable: true } }, phxdate: { @@ -166,13 +179,6 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, - billHCode: { - type: 'string', - title: '订单号', - ui: { - placeholder: '请输入' - } - }, feeHCode: { type: 'string', title: '费用号', @@ -195,7 +201,9 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox' }, - { title: '核销单号', index: 'phxcode', type: 'link', width: 140 }, + { title: '核销单号', index: 'phxcode', type: 'link', width: 160 }, + { title: '订单号', index: 'billHCode', width: 160 }, + { title: '运单号', index: 'waybillHCode', width: 160 }, { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '核销日期', index: 'phxdate', type: 'date', width: 160 }, { title: '付款账户', index: 'shipperaccount', width: 170 }, @@ -223,7 +231,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit { title: '银行水单', index: 'bankreceipt', width: 190 }, { title: '创建时间', index: 'createTime', width: 180 }, // { title: '创建人', index: 'createUserIdLabel', width: 120 }, - { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 }, + { title: '核销状态', index: 'stsLabel', width: 120 }, { title: '核销备注', index: 'remarks', width: 120 }, { title: '操作', diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index 09ce1752..289ae40f 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -207,6 +207,13 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI placeholder: '请输入' } }, + waybillHCode: { + type: 'string', + title: '运单号', + ui: { + placeholder: '请输入' + } + }, // orderS3: { // type: 'string', // title: '费用号', @@ -234,6 +241,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI { title: '', index: 'key', type: 'checkbox' }, { title: '核销单号', index: 'ahxcode', type: 'link', width: 210 }, { title: '订单号', index: 'billHCode', type: 'link', width: 180 }, + { title: '运单号', index: 'waybillHCode', width: 180 }, { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 }, { title: '收款账户', index: 'ltdaccountId', width: 200 }, diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index fb1ac5d8..da6cd930 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -152,9 +152,15 @@ export class VoucherManagementComponent extends BasicTableComponent { vctype: { type: 'string', title: '凭证类型', + enum: [ + {label: '全部', value:''}, + {label: 'WLW', value:'WLW'}, + {label: 'YH', value:'YH'}, + {label: 'KP', value:'KP'}, + {label: 'ZZ', value:'ZZ'}, + ], ui: { - widget: 'dict-select', - params: { dictKey: 'credential:type' }, + widget: 'select', placeholder: '请选择' }, default: '' diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index 415a0baa..2826e5fe 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -78,10 +78,10 @@
卸 | {{ item?.unloadingTime }}
-
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + - item?.carNo : '' }}

-
车队长: {{ item?.payeeName ? item?.payeeName + '/' : ''}}{{ - item?.payeePhone }}
+
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + item?.carNo : '' }}
+
+ +
{{ item?.payeeName }}{{ item?.payeePhone ? '/' + item?.payeePhone : '' }}
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index a12d6497..43bca7a9 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -336,6 +336,12 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i index: 'driverName', render: 'driverName' }, + { + title: '车队长', + className: 'text-left', + width: '180px', + render: 'payeeName' + }, { title: '装卸货时间', width: '200px', diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index c6c12082..4ce7847e 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 16:53:07 + * @LastEditTime : 2022-05-11 09:49:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -95,10 +95,10 @@ -
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + - item?.carNo : '' }}

-
车队长: {{ item?.payeeName ? item?.payeeName + '/' : ''}}{{ - item?.payeePhone }}
+
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}{{ item?.carNo ? '/' + item?.carNo : '' }}
+
+ +
{{ item?.payeeName }}{{ item?.payeePhone ? '/' + item?.payeePhone : '' }}
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 65438393..4a0439e0 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -379,8 +379,15 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme title: '承运司机', className: 'text-left', width: '250px', + index: 'driverName', render: 'driverName' }, + { + title: '车队长', + className: 'text-left', + width: '180px', + render: 'payeeName' + }, { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' }, { title: '关联货源编号', index: 'resourceCode', width: '170px', className: 'text-left' }, diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html index ab28c37c..1c6ed118 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-29 17:28:23 * @LastEditors : Shiming - * @LastEditTime : 2022-05-10 11:39:19 + * @LastEditTime : 2022-05-10 15:33:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -93,12 +93,11 @@ {{ selectItem?.channelIdLabel }} diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html index 9387bbd0..b417ad67 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html @@ -9,7 +9,7 @@