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 @@
-
![]()
+
@@ -28,9 +28,7 @@
注册时间:{{ detailData?.createTime }}
-
- 所属城市:{{enterpriseDefaultCityName}}
-
+
所属城市:{{ enterpriseDefaultCityName }}
@@ -40,19 +38,33 @@
-
-
-
-
-
@@ -64,57 +76,116 @@
-
+
-
+
+
+
+
+
+ 合伙人信息
+
+
+
+
+
+
+ 通过
+ 驳回
+
+
+
+
- 合伙人信息
+
-
+
- {{detailData.adminUserInfo.mobile}}
+ {{ detailData.adminUserInfo.mobile }}
-
+
-
+
-
-
+
-
+
-
+
-
+ "
+ >
-
+ "
+ >
-
+
@@ -164,9 +247,17 @@
修改渠道销售记录
-
+
@@ -175,8 +266,7 @@
-
{{ title }}
-
+
{{ title }}
{{ content }}
@@ -184,18 +274,36 @@
-
+
上传
-
+
![]()
-
+
-
\ No newline at end of file
+
diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html
index d20b2fcf..7bcde4e5 100644
--- a/src/app/routes/partner/recorded/components/record/record.component.html
+++ b/src/app/routes/partner/recorded/components/record/record.component.html
@@ -1,16 +1,29 @@
+
-
+
-
+
查询
重置
-
导出
+
导出
{{ !_$expand ? '展开' : '收起' }}
@@ -29,37 +42,49 @@
-
+
已选择
- {{ selectedRows.length }} 条数据,累计入账 {{
- totalCallNo }}
+ {{ selectedRows.length }} 条数据,累计入账 {{ totalCallNo }}
-
审核
+
审核
-
+ [page]="{ show: true, pageSizes: [10, 20, 50, 100, 200, 500] }"
+ >
- {{ item.bankName }}
{{ item.bankCardNumber }}
+ {{ item.bankName }}
+ {{ item.bankCardNumber }}
-
-
合伙人数:
-
入账笔数:
-
开票金额:
-
代缴个税:
-
入账金额:
+
+ 合伙人数:
+ 入账笔数:
+ 开票金额:
+ 代缴个税:
+ 入账金额:
@@ -68,8 +93,13 @@
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
index 7cc254f2..196dbc14 100644
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
@@ -110,13 +110,13 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
}
},
- isOvertime: {
+ overtime: {
title: '是否逾期',
type: 'string',
enum: [
{ value: '', label: '全部' },
- { value: false, label: '否' },
- { value: true, label: '是' }
+ { value: '0', label: '否' },
+ { value: '1', label: '是' }
],
ui: {
placeholder: '请选择',
@@ -178,11 +178,11 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
},
{
title: '是否逾期',
- index: 'overdueStatus',
+ index: 'overtime',
className: 'text-center',
width: '120px',
type: 'enum',
- enum: { false: '否', true: '是' }
+ enum: { '0': '否', '1': '是' }
},
{
title: '税款所属期起',
diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.html b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.html
index 4d858c37..b2653b14 100644
--- a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.html
+++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.html
@@ -1,67 +1,92 @@
+
-
-
-
-
-
+
+
+
+
+
-
-
-
- {{headerInfo?.ltdid}}
-
-
- {{headerInfo?.invdate}}
-
-
-
-
- {{headerInfo?.hrtoName}}
-
-
- {{headerInfo?.invoiceno}}
-
-
-
-
- {{headerInfo?.invtype}}
-
-
- {{headerInfo?.remarks}}
-
-
+
+
+
+ {{ headerInfo?.ltdName }}
+
+
+ {{ headerInfo?.invdate }}
+
+
+
+ {{ headerInfo?.hrtoName }}
+
+
+ {{ headerInfo?.invoiceno }}
+
+
+
+
+ {{ headerInfo?.invtype }}
+
+
+ {{ headerInfo?.remarks }}
+
+
+
-
-
-
-
-
- 查询
- 重置
-
- {{ !_$expand ? '展开' : '收起' }}
-
-
-
+
+
+
+
+ 查询
+ 重置
+
+ {{ !_$expand ? '展开' : '收起' }}
+
+
+
+
-
-
- {{index+1}}
-
-
-
\ No newline at end of file
+
+
+ {{ index + 1 }}
+
+
+ {{ item.invmoney | currency }}
+
+
+ {{ item.invtax | currency }}
+
+
+
diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
index 52286e05..05701c15 100644
--- a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
+++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
@@ -144,8 +144,8 @@ export class InputInvoiceDetailComponent implements OnInit {
{ title: '订单日期', index: 'billTime', width: 150 },
{ title: '结算客户', index: 'cnoName', width: 90 },
{ title: '费用科目', index: 'feesubname', width: 100 },
- { title: '收票金额', index: 'invmoney', width: 140 },
- { title: '收票税额', index: 'invtax', width: 100 }
+ { title: '收票金额', render: 'invmoney', width: 140 },
+ { title: '收票税额', render: 'invtax', width: 100 }
];
}
}
diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
index f5c9dd9a..25c3fed0 100644
--- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
@@ -114,7 +114,7 @@ export class InputInvoiceComponent extends BasicTableComponent {
title: '发票类型',
enum: [
{ value: '', label: '全部' },
- { value: '1', label: '运输专票' }
+ { value: '运输专票', label: '运输专票' }
],
ui: {
widget: 'select',
@@ -212,7 +212,7 @@ export class InputInvoiceComponent extends BasicTableComponent {
},
{ title: '发票类型', index: 'invtype', width: 150, className: 'text-center' },
{ title: '销售方', index: 'hrtoName', width: 200 },
- { title: '创建时间', index: 'createtime', type: 'date', width: 150, className: 'text-center' },
+ { title: '创建时间', index: 'createTime', type: 'date', width: 150, className: 'text-center' },
{ title: '创建人', index: 'createbyname', width: 120 },
{ title: '收票状态', index: 'stsLabel', width: 120, className: 'text-center' },
{
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index 5e4d39ca..b1b9b8b0 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -422,8 +422,8 @@
-
-
-
-
+
-
+
diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
index 4350bd2b..81ab3f4d 100644
--- a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
@@ -78,15 +78,13 @@ export class EditSaleComponentsAddComponent implements OnInit {
if (str) {
console.log(+str);
if(+str) {
- console.log('数字');
params.phoneNumber = str
} else {
- console.log('中文');
params.name = str
}
return this.service
.request(this.service.$api_get_channel, params)
- .pipe(map((res: any) => (res as any[]).map(i => ({ label: `${i.name}/${i.telephone}`, value: i.channelId } as SFSchemaEnum))))
+ .pipe(map((res: any) => (res as any[]).map(i => ({ label: `${i.name}/${i.telephone}`, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html
index afdba959..f51fa90a 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -92,7 +92,7 @@
- {{ item.partnerName }}
+ {{ item.partnerName ? item.partnerName: '--'}}/{{item.partnerMobile ? item.partnerMobile :'--'}}
@@ -102,7 +102,7 @@
- {{ item.channelName }}
+ {{ item.channelName ? item.channelName: '--'}}/{{item.channelMobile ? item.channelMobile :'--'}}
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index 020eb8c4..cfb0dad0 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -263,7 +263,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
widget: 'select'
}
},
- promotersTelephone: {
+ channelName: {
title: '业务员',
type: 'string',
ui: {
@@ -403,9 +403,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
enum: { 10: '整车发货', 20: '大宗发货' },
width: 140
},
- { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 },
- { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
- { title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 150 },
+ { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 200 },
+ { title: '合伙人', className: 'text-center', render: 'partnerName', width: 200 },
+ { title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 200 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
{
title: '注册渠道',